update

qa_shell_script/check/check.sh

@@ -70,7 +70,13 @@ function check(){
 
 
 function info(){
-	echo "echo -e '\033[31m ----  \033[0m\t\t\t|\t$1'   "  >>$servicetatus
+    process=`ps -ef |grep $1|grep -v grep |wc -l`
+    if [ $process -eq 0 ];then
+        _status='\033[31m stop  \033[0m'
+    else
+        _status='\033[32m start \033[0m'
+    fi
+    echo "echo -e '${_status}\t\t\t|\t$1'   "  >>$servicetatus
 }
 
 rm -rf $servicetatus
@@ -84,6 +90,7 @@ projectStr=`node /home/qa-deploy-utils/qa_shell_script/check/project_item.js`
 
 for line in ${projectStr[@]}; do
 
+    echo "check ${line//|@|/ } $1"
     check ${line//|@|/ } $1
 
 done

qa_shell_script/special_env_make/wechat_make.sh

@@ -23,9 +23,9 @@ expect -c "
                  set timeout 10
            spawn ssh root@192.168.4.3
                  expect \"]#\"
-                 send \"sed -i \\\"N;s#$source_str#$target_str#g\\\"  $base_path/$ip_host/$type_/$file_name\r\"
+                 send \"sed -i "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 "s#$source_str#$target_str#g"  $base_path/$ip_host/public/$type_/$file_name\r\"
                  expect \"]#\" 
                  send \"exit\r\"
             expect eof;"
@@ -33,8 +33,8 @@ 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 "wechat.secret=.*" "wechat.secret=$dev_secury" "$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 ui "wechattest.xyqb.com" "$user_url" "$evn_ip" "xyqb-user-ui.js"