f

qa_shell_script/base_script/restartJava.sh

@@ -106,7 +106,7 @@ mv $project_path/logs/$log_name $project_path/logs/$log_name.$time
 
 command1=${run_commands[0]//\^/ }
 command2=${run_commands[1]//\^/ }
-echo "nohup java $command1 -jar ${project}.jar $command2"
+echo "nohup java $command1 $wechat_config -jar ${project}.jar $command2"
 nohup java $command1 $wechat_config -jar ${project}.jar $command2 > /dev/null 2>&1 &
 echo "日志名称：$log_name"
 

qa_shell_script/special_env_make/wechat_make.sh

@@ -59,7 +59,7 @@ function reStartProject()
   expect \"]#\"
     send \"cd /home/qa-deploy-utils/qa_shell_script/\r\"
   expect \"]#\"
-    send \"sh 6_restart_by_wechat.sh $1 "$3"\r\"
+    send \"sh 6_restart_by_wechat.sh $1 '$3'\r\"
   expect \"]#\"
     send \"exit\r\"
   expect eof;"
@@ -79,12 +79,14 @@ echo "部署xyqb-user2"
 # 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"
-comd=" -Dwechat.secret=$dev_secury -Dwechat.appid=$dev_appid "
-reStartProject "xyqb-user2" "$env_ip" "$comd"
+cmd=" -Dwechat.secret=$dev_secury -Dwechat.appid=$dev_appid "
+echo "$cmd"
+reStartProject "xyqb-user2" "$env_ip" "$cmd"
 
 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"
 cmd=" -Dh5-ui.url=http://$pay_url -Dwechat.secret=$dev_secury "
+echo "$cmd"
 reStartProject "xyqb" "$env_ip" "$cmd"
 echo "部署结束，如果之后修改代码，部署project后，请重新执行该部署脚本，否则有可能出现测试环境配置文件被回退的可能。"