update

qa_shell_script/config_server/get_project_config.js

@@ -87,7 +87,7 @@ new pClass().init(false, "java", "7014", "", "du-jiang-yan", false, "QG", "du_ji
 new pClass().init(false, "java", "8051", "", "msg", false, "micro-service", "msg.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "新版消息中心", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(false, "java", "7052", "", "xyqb-btzt", true, "qg-op-backend", "xyqb-btzt.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "白条直投外部", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(false, "java", "7053", "", "xyqb-btzt-internal", true, "qg-op-backend", "xyqb-btzt-internal.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "白条直投内部", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
-new pClass().init(false, "java", "7060", "", "xyqb-backend", true, "qg-op-backend", "xyqb-backend.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "运营系统服务", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
+new pClass().init(false, "java", "7060", "", "baitiao-op-backend", true, "baitiao", "baitiao-op-backend.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "运营系统服务", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(true, "java", "7062", "", "xyqb-user2-query", true, "head_group", "xyqb_user_query.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "用户系统查询服务", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(false, "java", "7063", "", "traffic-webapp", true, "qg-op-backend", "traffic.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "流量分发系统", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(false, "java", "7017", "", "silk-road-eureka", true, "baitiao", "silk-road-eureka.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "Eureka 服务注册发现微服务", "魏巍", "mvn clean package -Ptest -Dmaven.test.skip=true", "");

qa_shell_script/ngrok/make_frp_ini.sh

@@ -26,6 +26,14 @@ function addFileHead()
         echo "local_port = 8099" >> $1
         echo "subdomain = auth-center-38" >> $1
         echo " " >> $1
+
+	echo "[local]" >> $1
+	echo "type = http" >> $1
+	echo "local_ip = 127.0.0.1" >> $1
+	echo "local_port = 10081" >> $1
+	echo "subdomain = " >> $1
+	echo " " >> $1
+
 }
 
 addFileHead $filename

qa_shell_script/special_env_make/wechat_make.sh

@@ -25,7 +25,7 @@ expect -c "
                  expect \"]#\"
                  send \"sed -i \\\"N;s#$source_str#$target_str#g\\\"  $base_path/$ip_host/$type_/$file_name\r\"
                  expect \"]#\"
-		 						 send \"sed -i \\\"N;s#$source_str#$target_str#g\\\"  $base_path/$ip_host/public/$type_/$file_name\r\"
+		 send \"sed -i \\\"N;s#$source_str#$target_str#g\\\"  $base_path/$ip_host/public/$type_/$file_name\r\"
                  expect \"]#\" 
                  send \"exit\r\"
             expect eof;"
@@ -33,10 +33,10 @@ expect -c "
 }
 echo "部署时间大约需要10分钟,请确保重启应用时，配置文件不再更改。。。"
 echo "step 1 更改配置文件"
+tranceConfig java "wechat.secret=.*" "wechat.secret=$dev_secury" "$evn_ip" "xyqb-user2.properties"
 tranceConfig java "wechat.appid=.*" "wechat.appid=$dev_appid" "$evn_ip" "xyqb-user2.properties"
 tranceConfig java "h5-ui.url=.*" "h5-ui.url=http://$pay_url" "$evn_ip" "xyqb.properties"
 tranceConfig ui   "weixinAppid:.*" "weixinAppid:'$dev_appid'," "$evn_ip" "xyqb-user-ui.js"
-tranceConfig java "wechat.secret=.*" "wechat.secret=$dev_secury" "$evn_ip" "xyqb-user2.properties"
 tranceConfig ui "wechattest.xyqb.com" "$user_url" "$evn_ip" "xyqb-user-ui.js"
 echo "step 2 重新部署环境"
 function reBuildProject(){