format update execution sequence

qa_shell_script/special_env_make/wechat_make.sh

@@ -19,7 +19,7 @@ function tranceConfig()
   target_str=$3
   ip_host=$4
   file_name=$5
-expect -c "
+  expect -c "
   set timeout 10
   spawn ssh root@192.168.4.3
   expect \"]#\"
@@ -29,18 +29,10 @@ expect -c "
   expect \"]#\" 
     send \"exit\r\"
   expect eof;"
-
 }
-echo "部署时间大约需要10分钟,请确保重启应用时，配置文件不再更改。。。"
-echo "step 1 更改配置文件"
-#tranceConfig java "wechat.appid=.*" "wechat.appid=$dev_appid" "$env_ip" "xyqb-user2.properties"
-#tranceConfig java "wechat.secret=.*" "wechat.secret=$dev_secury" "$env_ip" "xyqb-user2.properties"
-#tranceConfig java "h5-ui.url=.*" "h5-ui.url=http://$pay_url" "$env_ip" "xyqb.properties"
-#tranceConfig ui   "weixinAppid:.*" "weixinAppid:\'$dev_appid\'," "$env_ip" "xyqb-user-ui.js"
-#tranceConfig ui "wechattest.xyqb.com" "$user_url" "$env_ip" "xyqb-user-ui.js"
 
-echo "step 2 重新部署环境"
-function reBuildProject(){
+function reBuildProject()
+{
   expect -c "
   set timeout 10
   spawn ssh root@$2
@@ -58,30 +50,25 @@ function reBuildProject(){
     send \"exit\r\"
   expect eof;"
 }
+
+echo "部署时间大约需要10分钟,请确保重启应用时，配置文件不再更改。。。"
+
+echo "部署new-xyqb-user-ui"
 ssh root@192.168.4.3 "sed -i \"s#weixinAppid:.*#weixinAppid:\'$dev_appid\',#g\" $base_path/$env_ip/ui/new-xyqb-user-ui.js"
 ssh root@192.168.4.3 "sed -i \"s#weixinAppid:.*#weixinAppid:\'$dev_appid\',#g\" $base_path/$env_ip/public/ui/new-xyqb-user-ui.js"
 ssh root@192.168.4.3 "sed -i \"s#wechattest.xyqb.com#$user_url#g\" $base_path/$env_ip/ui/new-xyqb-user-ui.js"
 ssh root@192.168.4.3 "sed -i \"s#wechattest.xyqb.com#$user_url#g\" $base_path/$env_ip/public/ui/new-xyqb-user-ui.js"
 reBuildProject "new-xyqb-user-ui" "$env_ip"
 
+echo "部署xyqb-user2"
 ssh root@192.168.4.3 "sed -i \"s#wechat.appid=.*#wechat.appid=$dev_appid#g\" $base_path/$env_ip/java/xyqb-user2.properties"
 ssh root@192.168.4.3 "sed -i \"s#wechat.appid=.*#wechat.appid=$dev_appid#g\" $base_path/$env_ip/public/java/xyqb-user2.properties"
 ssh root@192.168.4.3 "sed -i \"s#wechat.secret=.*#wechat.secret=$dev_secury#g\" $base_path/$env_ip/java/xyqb-user2.properties"
 ssh root@192.168.4.3 "sed -i \"s#wechat.secret=.*#wechat.secret=$dev_secury#g\" $base_path/$env_ip/public/java/xyqb-user2.properties"
 reBuildProject "xyqb-user2" "$env_ip"
 
+echo "部署xyqb"
 ssh root@192.168.4.3 "sed -i \"s#h5-ui.url=.*#h5-ui.url=http://$pay_url#g\" $base_path/$env_ip/java/xyqb.properties"
 ssh root@192.168.4.3 "sed -i \"s#wechat.secret=.*#wechat.secret=$dev_secury#g\" $base_path/$env_ip/public/java/xyqb.properties"
 reBuildProject "xyqb" "$env_ip"
 echo "部署结束，如果之后修改代码，部署project后，请重新执行该部署脚本，否则有可能出现测试环境配置文件被回退的可能。"
-
-
-
-
-
-
-
-
-
-
-