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

qa_shell_script/config_server/get_project_config.js

@@ -84,10 +84,12 @@ var hosts = {
 	"pinjamancepat-config"	:"pinja-config.xyqb.com",
 	"clotho":"clotho.xyqb.com",
 	"cuishou-ui-new":"urge-ui.quantgroup.cn",
-	"urge_dispatcher":"urge.quantgroup.cn",
+	"urge-dispatcher":"urge.quantgroup.cn",
 	"cuishou_external":"cuishouoperation.quantgroup.cn",
 	"mall-settlement":"settlementapi.xyqb.com",
-	"baitiao-op-backend":"backend.xyqb.com"
+	"baitiao-op-backend":"backend.xyqb.com",
+	"fund-operate-ui":"clotho-ui.xyqb.com",
+	"business-op-ui":"business-op.xyqb.com"
 }
 
 var pClass = function() {};
@@ -186,7 +188,7 @@ new pClass().init(1,false, "java", "7071", "mall-settlement", "baitiao", "mall-s
 new pClass().init(2,false, "java", "7072", "data-taurus", "data-riskcontrol", "data-taurus.log", "application.properties", "", " ", "质保金-server", "","mvn clean package -Ptest -Dmaven.test.skip=true","");
 new pClass().init(1,false, "java", "7074", "account-center", "QG", "account_center.log", "application.properties", "", " -Denv=dev -Didc=default -Dtech.localhost=", "账户中心-server", "","mvn clean package -Ptest -Dmaven.test.skip=true","");
 new pClass().init(1,false, "java", "7079", "user-credit", "QG", "user_credit.log", "application.properties", "", " ", "用户升级-server", "","mvn clean package -Ptest -Dmaven.test.skip=true","");
-new pClass().init(2,false, "java", "7076", "urge_dispatcher", "data-riskcontrol", "dispatcher.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "催收系统", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
+new pClass().init(2,false, "java", "7076", "urge-dispatcher", "data-riskcontrol", "dispatcher.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "催收系统", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(1,false, "java", "7081", "wechat-config", "fund_pay", "wechat-config.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "微信消息推送系统", "",     "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(1,false, "java", "7082", "clotho", "funding", "clotho.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ","-Denv=dev -Didc=default -Dtech.localhost=", "资金方统计相关功能", "",     "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(1,false, "java", "7085", "mall-canal", "baitiao", "mall_canal.log", "application.properties", "-l 152 -w 2 &", " ", "商城订单监控", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
@@ -229,12 +231,12 @@ new pClass().init(1,true, "ui", "7057", "ka-spider-center-ui", "ui", null, "src/
 new pClass().init(1,true, "ui", "7067", "new-op-ui", "ui", null, "src/config/env.config.js", "npm run build", "node7", "运营系统 vue", "孙小英", "", "");
 new pClass().init(1,true, "ui", "7070", "customer-op-ui", "ui", null, "src/config/env.config.js", "npm run build", "node7", "外部查询-ui", "", "", "");
 new pClass().init(1,true, "ui", "7075", "business-op-ui", "ui", null, "src/config/env.config.js", "npm run build", "node7", "商城结算系统-ui", "王丽英", "", "");
-new pClass().init(2,true, "ui", "7077", "cuishou-ui-new", "data", null, "src/Config/config.jsx", "npm run dist", "node7", "催收系统-ui", "李斌", "", "");
+new pClass().init(2,true, "ui", "7077", "cuishou-ui-new", "data", null, "src/Config/config.jsx", "npm --registry https://registry.npm.taobao.org run dist", "node7", "催收系统-ui", "李斌", "", "");
 new pClass().init(1,true, "ui", "7078", "ka-factory-ui", "ui", null, "src/config/env.config.js", "npm run build", "node7", "KA工厂-ui", "张振武", "", "");
 new pClass().init(1,false, "ui", "7064", "statistics-op-ui", "ui", null, "src/app/config/env.config.js", "npm run qa", "node7", "流量统计平台-ui", "刘威", "", "");
 new pClass().init(1,true, "ui", "7084", "gdxd-op-ui", "ui", null, "src/config/env.config.js", "npm run qa", "node7", "广达小贷后台-ui", "薛志杰", "", "");
 new pClass().init(1,true, "ui", "7080", "new-mall-ui", "ui", null, "src/app/config/env.config.js", "npm run qa", "node7", "微信商城-ui", "郑少文，周珊", "", "");
-new pClass().init(2,true, "ui", "7094", "cuishou_external", "data", null, "app/config/production.config.js", "npm run build", "node7", "催收对外平台-ui", "李斌", "", "");
+new pClass().init(2,true, "ui", "7094", "cuishou_external", "data", null, "app/config/production.config.js", "npm --registry https://registry.npm.taobao.org  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,false, "ui", "9050", "pinjamancepat-credit-review-ui", "ui", null, "src/config/env.config.js", "npm run qa", "", "mimi", "", "", "");
 new pClass().init(1,false, "ui", "9051", "pinjamancepat-collection-ui", "ui", null, "src/config/env.config.js", "npm run qa", "", "mimi", "", "", "");

qa_shell_script/ngrok/make_frp_ini_V2.sh

@@ -28,6 +28,8 @@ function createNginxHttpAndSSLConf()
 	echo "    listen 80;" >> $file_name
 	echo "    server_name  $cus_domain.q-gp.com;" >> $file_name
 	echo "    proxy_set_header Host  \$host;"  >> $file_name
+	echo "    	proxy_set_header QT_TOKEN  \$http_QT_TOKEN;"  >> $file_name
+
 	echo "" >> $file_name
 	echo "    location / {" >> $file_name
 	echo "        proxy_pass http://$cus_ip:$http_port;" >> $file_name
@@ -38,6 +40,7 @@ function createNginxHttpAndSSLConf()
 	echo "    listen       443 ssl;" >> $file_name
 	echo "    server_name  $cus_domain.q-gp.com;" >> $file_name
 	echo "" >> $file_name
+	echo "    	proxy_set_header QT_TOKEN  \$http_QT_TOKEN;"  >> $file_name
 	echo "    ssl_certificate      /home/q-gp/ssl/certificate.crt;" >> $file_name
 	echo "    ssl_certificate_key  /home/q-gp/ssl/private.key;" >> $file_name
 	echo "" >> $file_name