a

qa_shell_script/4_build_by_name.sh

@@ -66,15 +66,15 @@ function buildUiProject()
 		cp -r $config_path/ui/$project.* $project_path/$project/$config_file
 	fi
 	
-	imagemin_dist=`grep -n -A3 "imagemin"  *.js|awk '{print $1}'`
+#	imagemin_dist=`grep -n -A3 "imagemin"  *.js|awk '{print $1}'`
 	
-	if [ -n "$imagemin_dist" ];then
-		echo "npm install gruntjs/grunt-contrib-imagemin"
-		${node4_path}/npm --registry http://192.168.3.7:4873 install gruntjs/grunt-contrib-imagemin
-
-	else
-		echo "dont install imagemin"
-	fi
+#	if [ -n "$imagemin_dist" ];then
+#		echo "npm install gruntjs/grunt-contrib-imagemin"
+		#${node4_path}/npm --registry http://192.168.3.7:4873 install gruntjs/grunt-contrib-imagemin
+		#${node4_path}/npm --registry http://192.168.3.7:4873 install async
+#	else
+#		echo "dont install imagemin"
+#	fi
 
 	if [ "$node_version" = "node4" ] ;then
 		echo "----node-V4---${node4_path}/npm --registry http://192.168.3.7:4873 install"

qa_shell_script/4_build_by_type.sh

@@ -59,15 +59,15 @@ function buildUiProject()
 		cp $config_path/ui/$project.* $project_path/$project/$config_file
 	fi
 	
-	imagemin_dist=`grep -n -A3 "imagemin"  *.js|awk '{print $1}'`
+#	imagemin_dist=`grep -n -A3 "imagemin"  *.js|awk '{print $1}'`
 	
-	if [ -n "$imagemin_dist" ];then
-		echo "npm install gruntjs/grunt-contrib-imagemin"
-		${node4_path}/npm --registry http://192.168.3.7:4873 install gruntjs/grunt-contrib-imagemin
-
-	else
-		echo "dont install imagemin"
-	fi
+#	if [ -n "$imagemin_dist" ];then
+#		echo "npm install gruntjs/grunt-contrib-imagemin"
+#		${node4_path}/npm --registry http://192.168.3.7:4873 install gruntjs/grunt-contrib-imagemin
+#
+#	else
+#		echo "dont install imagemin"
+#	fi
 
 	if [ "$node_version" = "node4" ] ;then
 		echo "----node-V4---${node4_path}/npm --registry http://192.168.3.7:4873 install"

qa_shell_script/config_server/get_project_config.js

@@ -81,7 +81,7 @@ new pClass().init(true, "ui", "7035", "funding-corp-op-ui", "QG", null, "src/js/
 new pClass().init(true, "ui", "7007", "paycenter-ui", "QG", null, "src/app/config/env.config.js", "npm run build", "node7", 1, "支付中心-ui","");
 new pClass().init(true, "ui", "7043", "xyqb-user-ui", "head_group", null, "src/app/config.js", "npm run qa", "node7", 1, "用户注册登录-V2-ui","");
 new pClass().init(true, "ui", "7039", "merchant-op-ui", "QG", null, "src/js/env.config.js", "npm run build", "node7", 1, "商户系统-ui","");
-new pClass().init(true, "ui", "7004", "di-ting-ui", "QG", null, "client/app/config.js", "grunt build", "node4", 1, "信审-ui","");
+new pClass().init(true, "ui", "7004", "di-ting-ui", "QG", null, "client/app/config.js", "grunt build", "node7", 1, "信审-ui","");
 new pClass().init(true, "ui", "7020", "spider-center-ui", "QG", null, "src/app/config/env.config.js", "npm run qa", "node7", 1, "授信中心-ui","");
 new pClass().init(true, "ui", "7002", "qgbc-ui", "QG", null, "src/app/config/env.config.js", "npm run build_production", "node7", 1, "现金贷和白条-白条-ui","");
 new pClass().init(true, "ui", "7001", "xyqb-ui", "QG", null, "client/app/config.js", "grunt build", "node4", 1, "现金贷和白条-现金贷-ui","");

qa_shell_script/exception_sub_shell.sh

@@ -37,7 +37,7 @@ function tranceConfig()
 }
 
 
-#tranceConfig java "pay.debug=0" "pay.debug=1" "192.168.4.13" "xyqb-mall.properties"
+#tranceConfig java "pay.debug=0" "pay.debug=1" "192.168.4.12" "xyqb-mall.properties"
 tranceConfig java "pay.debug=0" "pay.debug=1" "192.168.4.151" "xyqb-mall.properties"
 #tranceConfig java "pay.debug=0" "pay.debug=1" "192.168.4.152" "xyqb-mall.properties"
 #tranceConfig java "192.168.4.3" "192.168.4.17" "192.168.4.17" "*"
@@ -49,12 +49,14 @@ tranceConfig java "xyqb.is.debug=1" "xyqb.is.debug=0" "192.168.4.151" "xyqb.prop
 #tranceConfig ui "7047" "12047"  "192.168.4.12" "merchant-op-ui.js"
 tranceConfig node "d45o0qd" "5exp2xo" "192.168.4.152" "op-api.js"
 tranceConfig java "192.168.4.15:7007" "139.198.2.95:1507" "192.168.4.15" "gu-bei.properties"
-#tranceConfig java "hubei.api.url=http:\/\/192.168.100.185:8585" "hubei.api.url=http:\/\/192.168.4.251:8585" "192.168.4.16" "di-ting.properties"
-#tranceConfig java "wxcdf6077af8127559" "wx0a7c0bce0c3ac523" "192.168.4.15" "xyqb-user2.properties"
-#tranceConfig java "16eaec16084d0d9c52d4114f359cc72c" "85d9d59d29d8ed24c361f73d4f35ff91" "192.168.4.15" "xyqb-user2.properties"
-
-
-
+tranceConfig java "hubei.api.url=http:\/\/192.168.100.185:8585" "hubei.api.url=http:\/\/192.168.4.251:8585" "192.168.4.16" "di-ting.properties"
+tranceConfig java "wxcdf6077af8127559" "wx0a7c0bce0c3ac523" "192.168.4.15" "xyqb-user2.properties"
+tranceConfig java "16eaec16084d0d9c52d4114f359cc72c" "10131fe347f88e0affabe45b7ee4ca6c" "192.168.4.15" "xyqb-user2.properties"
+#这个配置是微信支付的时候，需要修改成线上的沙箱环境
+tranceConfig java "e1dd0780c93aae56c2d786184421cfc8" "10131fe347f88e0affabe45b7ee4ca6c" "192.168.4.15" "gu-bei.properties"
+tranceConfig java "paycenter.host.url=http:\/\/192.168.4.15:7007" "paycenter.host.url=http:\/\/wechattest1.xyqb.com" "192.168.4.15" "gu-bei.properties"
+tranceConfig java "139.198.2.95:1507" "wechattest1.xyqb.com" "192.168.4.15" "gu-bei.properties"
+#tranceConfig java "192.168.4.14:7007" "139.198.2.95:1407" "192.168.4.14" "gu-bei.properties"
 
 
 

qa_shell_script/sub_shell.sh

@@ -4,7 +4,7 @@ public_ip="139.198.2.95"
 
 mkdir /home/sub_config_file_dont_rm
 
-for ip_last_num in  12 13 14 15 16 17 24 151 152
+for ip_last_num in  12 13 14 15 16 17 24 50 151 152
 do
 	cd /home/sub_config_file_dont_rm
 	mkdir ${IP_host_first}${ip_last_num}