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

qa_shell_script/exception_sub_shell.sh

@@ -136,7 +136,7 @@ tranceConfig java "wx89894cd83d117b26" "wxd019cd24f6edae9f" "192.168.4.22" "xyqb
 tranceConfig java "11fb7f6a8b8edf2776a72c2f5624229c" "79f4e915dd37690b17c2f8fd6e6023ad" "192.168.4.22" "xyqb-user2.properties"
 tranceConfig ui "wx89894cd83d117b26" "wxd019cd24f6edae9f" "192.168.4.22" "new-xyqb-user-ui.js"
 tranceConfig ui "11fb7f6a8b8edf2776a72c2f5624229c" "79f4e915dd37690b17c2f8fd6e6023ad" "192.168.4.22" "new-xyqb-user-ui.js"
-tranceConfig ui "wx89894cd83d117b26" "wx5b2e77c58fdcf1a5" "192.168.4.22" "activity-ui.js" 
+tranceConfig ui "wx89894cd83d117b26" "wx5b2e77c58fdcf1a5" "192.168.4.22" "new-activity-ui.js" 
 
 #tranceConfig java "rabbitmq.connection.host=192.168.4.22" "rabbitmq.connection.host=192.168.4.152" "192.168.4.22" "baitiao.properties"
 

qa_shell_script/ngrok/docker_env_name.sh

-dongmeifeng|192.168.4.78|32093|32093 tower|192.168.4.78|30886|30084 zhanghong|192.168.4.77|31826|32324 wangzhen|192.168.4.77|31809|30100 zhangbo|192.168.4.77|31091|32056 	wangfei|192.168.4.18|32589|32182 renmingxing|192.168.4.78|30169|32509 tianyawei|192.168.4.77|32718|32701 daidekun|192.168.4.77|30082|30359
+dongmeifeng|192.168.4.78|32093|32093 tower|192.168.4.78|30886|30084 zhanghong|192.168.4.77|31826|32324 wangzhen|192.168.4.77|31809|30100 zhangbo|192.168.4.77|31091|32056 	wangfei|192.168.4.18|32589|32182 renmingxing|192.168.4.78|30169|32509 tianyawei|192.168.4.77|32718|32701 hemengying|192.168.4.32|30067|30660 songruili|192.168.4.18|32355|30265

qa_shell_script/ngrok/make_frp_ini_V2.sh

@@ -73,7 +73,7 @@ function createNginxHttpAndSSLConf()
 # addFrpcSub uanguang http 192.168.4 124 80 uanguang $filename
 # createNginxHttpAndSSLConf store 192.168.4.27 9000 $nginxname/store.conf
 
-createNginxHttpAndSSLConf h5 h5 192.168.4.24 7051 7051 $nginxname/base.conf
+createNginxHttpAndSSLConf h5 h5 192.168.4.25 7051 7051 $nginxname/base.conf
 createNginxHttpAndSSLConf mock mock 192.168.4.27 80 80 $nginxname/base.conf
 createNginxHttpAndSSLConf atm atm 192.168.4.18 3000 3000 $nginxname/base.conf
 createNginxHttpAndSSLConf auth-center auth-center-38 192.168.4.193 8099 8099 $nginxname/base.conf
@@ -85,6 +85,7 @@ createNginxHttpAndSSLConf qg1 qg1-21 192.168.4.21 9019 9019 $nginxname/base.conf
 createNginxHttpAndSSLConf uanguang uanguang 192.168.4.124 80 80 $nginxname/base.conf
 createNginxHttpAndSSLConf store store 192.168.4.27 9000 9000 $nginxname/base.conf
 createNginxHttpAndSSLConf gongyucheng gongyucheng 192.168.4.254 80 80 $nginxname/base.conf
+createNginxHttpAndSSLConf jen jen 192.168.4.2 8080 8080 $nginxname/base.conf
 
 for ip_last in ${ips[@]}
 do

qa_shell_script/script_by_Contorller/2_diting_huoquzijinfangshenhe.sh

@@ -17,7 +17,7 @@ fi
 
 date=`date "+%Y-%m-%d %H:%M:%S"`
 
-mysql -h"$ip" -P${PORT} -u${USERNAME} -p${PASSWORD} <<EOF
+mysql -h"$ip" -P"${PORT}" -u${USERNAME} -p${PASSWORD} <<EOF
 use xyqb;
 update xyqb.loan_application_history
 set xyqb.loan_application_history.progress=9