Merge branch 'master' of http://gitabc.xyqb.com/QA/qa-deploy-utils

db-utils/db_gen_config.sh

@@ -44,11 +44,11 @@ if [[ $database_name = 'xyqb' ]]; then
 	# 信用钱包database
 	# repay v_manifest v_repay 是view类型的
 	# secure_proxy 表里面的数据需要被同步
-	sys_table_list='baitiao_merchant baitiao_secure_key channel funding_contract funding_corp loan_product merchant_channel payeco_return_url_info red_packet t_phonenum zmxy_return_url configuration repay v_manifest v_repay secure_proxy'
+	sys_table_list='baitiao_merchant baitiao_secure_key channel funding_contract funding_corp loan_product merchant_channel payeco_return_url_info red_packet t_phonenum zmxy_return_url configuration repay v_manifest v_repay secure_proxy funding_corp_config'
 	port='3306'
 elif [[ $database_name = 'xyqb_app' ]]; then
 	# app-backend使用的数据库
-	sys_table_list='activities app_banners app_config app_versions banners blanknote_entries credit_questions hot_games loan_banners loan_questions migrations sharings widgets'
+	sys_table_list='activities app_banners app_config app_versions banners blanknote_entries credit_questions hot_games loan_banners loan_questions migrations sharings widgets js_patch upgrade_version'
 	port='3307'
 elif [[ $database_name = 'payment_center' ]]; then
 	# 支付中心
@@ -64,7 +64,7 @@ elif [[  $database_name = 'dujiangyan'  ]]; then
 	port='3310'
 elif [[  $database_name = 'mall'  ]]; then
 	# 白条商城
-	sys_table_list='mall_config activity_3c_product ad_detail new_3c_product supplier 3c_product 3c_product_spec apix_phone_recharge_detail apix_recharge_project apix_recharge_project_bak category configuration course_detail_info course_info merchant pay19_recharge_project product'
+	sys_table_list='mall_config activity_3c_product ad_detail new_3c_product supplier 3c_product 3c_product_spec apix_phone_recharge_detail apix_recharge_project apix_recharge_project_bak category configuration course_detail_info course_info merchant pay19_recharge_project mall_category product product_sku product_sku_image product_spu product_nature nature_value product_category spu_image product_nature_value'
 	port='3310'
 elif [[  $database_name = 'qinqiong'  ]]; then
 	# qinqiong

sh-utils/center/database_backup.sh

@@ -25,11 +25,11 @@ if [[ $database_name = 'xyqb' ]]; then
 	# 信用钱包database
 	# repay v_manifest v_repay 是view类型的
 	# secure_proxy 表里面的数据需要被同步
-	sys_table_list='baitiao_merchant baitiao_secure_key channel funding_contract funding_corp loan_product merchant_channel payeco_return_url_info red_packet t_phonenum zmxy_return_url configuration repay v_manifest v_repay secure_proxy'
+	sys_table_list='baitiao_merchant baitiao_secure_key channel funding_contract funding_corp loan_product merchant_channel payeco_return_url_info red_packet t_phonenum zmxy_return_url configuration repay v_manifest v_repay secure_proxy funding_corp_config'
 	port='3306'
 elif [[ $database_name = 'xyqb_app' ]]; then
 	# app-backend使用的数据库
-	sys_table_list='activities app_banners app_config app_versions banners blanknote_entries credit_questions hot_games loan_banners loan_questions migrations sharings widgets'
+	sys_table_list='activities app_banners app_config app_versions banners blanknote_entries credit_questions hot_games loan_banners loan_questions migrations sharings widgets js_patch upgrade_version'
 	port='3307'
 elif [[ $database_name = 'payment_center' ]]; then
 	# 支付中心
@@ -45,7 +45,7 @@ elif [[  $database_name = 'dujiangyan'  ]]; then
 	port='3310'
 elif [[  $database_name = 'mall'  ]]; then
 	# 白条商城
-	sys_table_list='activity_3c_product ad_detail new_3c_product supplier 3c_product 3c_product_spec apix_phone_recharge_detail apix_recharge_project apix_recharge_project_bak category configuration course_detail_info course_info merchant pay19_recharge_project product'
+	sys_table_list='mall_config activity_3c_product ad_detail new_3c_product supplier 3c_product 3c_product_spec apix_phone_recharge_detail apix_recharge_project apix_recharge_project_bak category configuration course_detail_info course_info merchant pay19_recharge_project product product_sku product_sku_image product_spu product_nature nature_value'
 	port='3310'
 elif [[  $database_name = 'qinqiong'  ]]; then
 	# qinqiong
@@ -77,7 +77,7 @@ elif [[  $database_name = 'sms-center'  ]]; then
 	port='3311'
 elif [[  $database_name = 'spider_center'  ]]; then
 	# 授信中心
-	sys_table_list='merchant merchant_config'
+	sys_table_list='merchant merchant_config notify_message'
 	port='3312'
 elif [[  $database_name = 'xyqb_user'  ]]; then
 	# 用户中心

sh-utils/center/database_replace_ip.sh

@@ -65,7 +65,8 @@ sed -i "s/https\:\/\/scapi.xyqb.com/http\:\/\/${server_host}:7021/g" ${database_
 sed -i "s/http\:\/\/gyxdapi.xyqb.com/http\:\/\/${server_host}:7029/g" ${database_name}_${mysql_host}.sql
 sed -i "s/https\:\/\/gyxdapi.xyqb.com/http\:\/\/${server_host}:7029/g" ${database_name}_${mysql_host}.sql
 
-
+sed -i "s/http\:\/\/btapi.xyqb.com/http\:\/\/${server_host}:7025/g" ${database_name}_${mysql_host}.sql
+sed -i "s/https\:\/\/btapi.xyqb.com/http\:\/\/${server_host}:7025/g" ${database_name}_${mysql_host}.sql
 
 
 if [[ "${use_public_ip}" = true ]]; then