Merge branch 'master' of http://git.quantgroup.cn/QA/qa-deploy-utils

db-utils/db_gen_config.sh

@@ -124,7 +124,7 @@ elif [[  $database_name = 'xyqb_user'  ]]; then
 	port='3313'
 elif [[ $database_name = 'merchant' ]]; then
 	# 商户
-	sys_table_list='authority product_nature role role_authority role_supplier user'
+	sys_table_list='authority product_nature role role_authority role_supplier role_user user'
 	port='3314'
 elif [[ $database_name = 'xyqb_btzt' ]]; then
 	# 白条直投

qa_shell_script/config_server/get_project_config.js

@@ -76,8 +76,9 @@ var hosts = {
   "pinjamancepat-credit-review": "pinja-cr-api.xyqb.com",
   "zero-gateway-zuul": "gapi.xyqb.com",
 	"xyqb-display": "displayapi.xyqb.com",
-	"pinjamancepat-collection-ui":"pinja-collection",
-	"pinjamancepat-collection":"pinja-collection-api"
+	"pinjamancepat-collection-ui":"pinja-collection.xyqb.com",
+	"pinjamancepat-collection":"pinja-collection-api.xyqb.com",
+	"translate":"translate.xyqb.com"
 }
 
 var pClass = function() {};
@@ -184,7 +185,7 @@ new pClass().init(1,false, "java", "7087", "xyqb-display", "baitiao", "display.l
 new pClass().init(1,true, "java", "7087", "user-credit-schedule", "QG", "user_credit_schedule.log", "application.properties", "", " ", "用户升级-server", "","mvn clean package     -Ptest -Dmaven.test.skip=true",    "");
 new pClass().init(1,true,"java", "7089", "baitiao-guangda", "baitiao", "baitiao-guangda.log", "application.properties", "--worker 1 --currentWorker 1 -t ", " ", "guangda-server", "宋志超", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(1,false,"java", "7093", "account-center-helper", "QG", "account_center_helper.log", "application.properties", "--worker 1 --curr entWorker 1 -t ", " ", "历史数据处理", "高淑盈", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
-new pClass().init(1,true, "java", "7096", "card", "baitiao", "card.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts","", "白条量卡", "刘志国","mvn clean package -Ptest -Dmaven.test.skip=t    rue", "");
+new pClass().init(1,true, "java", "7096", "card", "baitiao", "card.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts","", "白条量卡", "刘志国","mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(1,false,"java", "9001", "pinjamancepat", "QG", "", "application.properties", "--worker 1 --curr entWorker 1 -t ", "", "mimi", "mimi", "", "");
 new pClass().init(1,false,"java", "9002", "pinjamancepat-credit-review", "QG", "", "application.properties", "--worker 1 --curr entWorker 1 -t ", "", "mimi", "", "", "");
 new pClass().init(1,false,"java", "9003", "zero-gateway-zuul", "QG", "", "", "", "", "mimi", "", "", "");
@@ -209,7 +210,7 @@ new pClass().init(1,true, "ui", "7001", "xyqb-ui", "QG", null, "client/app/confi
 new pClass().init(1,true, "ui", "7046", "activity-op-ui", "QG", null, "src/config/env.config.js", "npm run build", "node7", "优惠券管理后台-ui", "", "", "");
 new pClass().init(1,true, "ui", "7048", "order-op-ui", "OP", null, "src/js/env.config.js", "gulp build", "node7", "订单系统-ui", "", "", "");
 // new pClass().init(false, "ui", "7002", "", "qgbc-ui", false, "QG", null, "src/app/config/env.config.js", "npm run build_production", "node7", "白条-ui", "", "", "");
-new pClass().init(1,true, "ui", "7057", "xjd-ui", "QG", null, "src/app/config/env.config.js", "npm run qa", "node7", "新版现金贷-ui", "", "", "");
+new pClass().init(1,true, "ui", "7057", "xjd-ui", "QG", null, "src/app/config/env.config.js", "yarn run qa ", "node7", "新版现金贷-ui", "", "", "");
 new pClass().init(1,true, "ui", "7007", "new-paycenter-ui", "QG", null, "src/app/config/env.config.js", "npm run qa", "node7", "新版支付中心-ui", "", "", "");
 new pClass().init(1,false, "ui", "7061", "wind-control-op-ui", "ui", null, "src/app/config/env.config.js", "npm run qa", "node7", "临时项目，未来删除风控平台-ui", "", "", "");
 new pClass().init(1,false, "ui", "7016", "flow-op-ui", "ui", null, "src/config/env.config.js", "npm run build", "node7", "导流UI页面", "", "", "");
@@ -226,7 +227,7 @@ new pClass().init(1,true, "ui", "7080", "new-mall-ui", "ui", null, "src/app/conf
 new pClass().init(2,true, "ui", "7094", "cuishou_external", "data", null, "app/config/production.config.js", "npm run build", "node7", "催收对外平台-ui", "李斌", "", "");
 new pClass().init(1,true, "ui", "7095", "fund-operate-ui", "ui", null, "src/config/env.config.js", "npm run qa", "node7", "资金运营系统-ui", "徐胜男", "", "");
 new pClass().init(1,true, "ui", "9050", "pinjamancepat-credit-review-ui", "ui", null, "src/config/env.config.js", "npm run qa", "", "mimi", "", "", "");
-new pClass().init(1,true, "ui", "9051", "pinjamancepat-collection-ui", "ui", null, "src/config/env.config.js", "grunt build", "", "mimi", "", "", "");
+new pClass().init(1,true, "ui", "9051", "pinjamancepat-collection-ui", "ui", null, "src/config/env.config.js", "npm run qa", "", "mimi", "", "", "");
 
 // node
 new pClass().init(1,true, "node", "7018", "app-backend", "QG", null, "config/environment/test.js", "forever start -a -s --uid AppBackend bin/www", null, "APP后台服务-server", "", "forever stop AppBackend", "");