update

db-utils/db_gen_config.sh

@@ -74,6 +74,7 @@ elif [[  $database_name = 'qinqiong'  ]]; then
 	port='3310'
 elif [[  $database_name = 'cash_loan_flow'  ]]; then
 	# qinqiong
+<<<<<<< HEAD
 	sys_table_list='order_callback callback_configuration channel_configuration'
 	source_db_host='192.168.4.80'
 	port='8001'

qa_shell_script/base_script/restartJava.sh

@@ -77,7 +77,7 @@ cd $project_path/$project
 P_UUID=`ps -ef|grep ${project}.jar |grep -v 'grep'|awk '{print $2}'`
 if [ -n "${P_UUID}" ];then
     echo "Kill $project PPID=${P_UUID}"
-    kill ${P_UUID}
+    kill -9 ${P_UUID}
     sleep 2s
 fi
 

qa_shell_script/base_script/restartPython.sh

@@ -15,7 +15,7 @@ python_project_path=$project_path/$project${setup_path_temp/\.\//\/}
 P_UUID=`ps -ef|grep port=$port |grep -v 'grep'|awk '{print $2}'`
 if [[ "${P_UUID}" != "" ]];then
 	echo "KILL $project PPID=${P_UUID}"
-	kill ${P_UUID}
+	kill  -9 ${P_UUID}
 	sleep 3
 fi
 mv $project_path/logs/${project}.log $project_path/logs/${project}.log.$time

qa_shell_script/exception_sub_shell.sh

@@ -171,7 +171,7 @@ tranceConfig java "ygziguan.api.url=http://139.198.0.253/receiver/grequest" "ygz
 #4.28
 
 tranceConfig java "wx.api_host=https:\/\/api.mch.weixin.qq.com\/" "wx.api_host=http:\/\/mock.q-gp.com\/" "192.168.4.28" "gu-bei.properties"
-tranceConfig node "http://139.198.2.95:38099" "http://192.168.4.48:8099" "192.168.4.28" "AppBackend.js"
+tranceConfig node "http://139.198.2.95:38099" "http://192.168.4.48:8088" "192.168.4.28" "AppBackend.js"
 
 #4.72
 #tranceConfig java "sms.is.debug=1" "sms.is.debug=0" "192.168.4.24" "di-ting.properties"
@@ -180,7 +180,7 @@ tranceConfig node "http://139.198.2.95:38099" "http://192.168.4.48:8099" "192.16
 #tranceConfig node ":7013/app/login" ":7042/app/login2" "192.168.4.72" "AppBackend.js"
 #tranceConfig node ":7013" ":7042" "192.168.4.72" "AppBackend.js"
 #tranceConfig java "wx.api_host=https:\/\/api.mch.weixin.qq.com\/" "wx.api_host=http:\/\/mock.q-gp.com\/" "192.168.4.72" "gu-bei.properties"
-tranceConfig node "http://139.198.2.95:38099" "http://192.168.4.48:8088" "192.168.4.72" "AppBackend.js"
+tranceConfig node "http://139.198.2.95:38099" "http://192.168.4.48:8099" "192.168.4.72" "AppBackend.js"
 #4.151
 tranceConfig java "xyqb.is.debug=0" "xyqb.is.debug=1" "192.168.4.151" "xyqb.properties"
 tranceConfig java "liebao.aes.key=0123456789abcdef" "liebao.aes.key=e2XNtnB8QEEuvhEW" "192.168.4.151" "cash-loan-flow.properties"

qa_shell_script/ngrok/docker_env_name.sh

- qa20|192.168.167.5
+ qa20|192.168.167.5 qa1|192.168.167.2 qa3|192.168.167.6 qa4|192.168.167.3 qa21|192.168.167.4

qa_shell_script/ngrok/make_frp_ini.sh

@@ -169,7 +169,7 @@ do
 		var=(${projectAndPort//|/ })
 		namespace=(${host_name//|/ })
 		addFrpcSub ${var[0]}-${var[2]} http 127.0.0 1 8000 ${var[2]}-${namespace[0]} $filename
-		createNginxHttpAndSSLConf ${var[2]}-qa${namespace[0]} ${namespace[1]} ${var[1]} $nginxname/${var[0]}-${namespace[0]}.conf
+		createNginxHttpAndSSLConf ${var[2]}-${namespace[0]} ${namespace[1]} ${var[1]} $nginxname/${var[0]}-${namespace[0]}.conf
 	done	
 	basePorts="redis|80 db|3306 rabbitmq|80"
 	for basePort in ${basePorts[@]}