ddd

qa_shell_script/2_get_code_by_name.sh

@@ -13,6 +13,7 @@ if [ -n "$project_folder" ];then
 	sh $config_server/show_info.sh $project_name pull代码 $desc
 	cd ./$project_name
 	git checkout ./
+	git fetch
 	git pull
 	if [ -n "$git_branch" ]; then
 		echo "checkout specified branch $git_branch"

qa_shell_script/2_get_code_by_type.sh

@@ -18,6 +18,7 @@ function getCode()
 			sh $config_server/show_info.sh $project pull代码 $desc
 			cd ./$project
 			git checkout ./
+			git fetch
 			git pull
 			if [ -n "$git_branch" ]; then
 				git checkout -f $git_branch
@@ -49,4 +50,4 @@ else
 	getCode python
 	getCode java
 fi
-	
\ No newline at end of file
+	

qa_shell_script/exception_sub_shell.sh

@@ -62,12 +62,11 @@ tranceConfig java "hubei.api.url=http:\/\/192.168.100.185:8585" "hubei.api.url=h
 
 
 #tranceConfig java "192.168.4.14:7007" "139.198.2.95:1407" "192.168.4.14" "gu-bei.properties"
+#tranceConfig java "paycenter.exception.debug=1" "paycenter.exception.debug=0" "192.168.4.15" "gu-bei.properties"
 
 
-
-
-
-
-
-
+#tranceConfig java "192.168.4.14:3306" "192.168.4.20:3306" "192.168.4.14" "*"
+#tranceConfig python "192.168.4.14" "192.168.4.20" "192.168.4.14" "qin-qiong.*"
+tranceConfig java "spider-center.host=http:\/\/192.168.4.12:7021\/" "spider-center.host=http:\/\/spider-center-12.ss.xyqb.loan\/" "192.168.4.12" "spider-center.properties" 
+tranceConfig java "qgbc-ui.url=http:\/\/192.168.4.152:7002" "qgbc-ui.url=http:\/\/192.168.4.152:7050" "192.168.4.152" "xyqb.properties" 
 

qa_shell_script/ngrok/ngrok_confg.yml

+server_addr: ss.xyqb.loan:4443
+trust_host_root_certs: false
+tunnels:
+      xyqb-iplast:
+        proto:
+           http: "7003"
+      baitiao-iplast:
+        proto:
+           http: "7025"
+      xyqb-mall-iplast:
+        proto:
+           http: "7019"
+      xyqb-offline-iplast:
+        proto:
+           http: "7010"
+      xyqb-user2-iplast:
+        proto:
+           http: "7042"
+      di-ting-iplast:
+        proto:
+           http: "7005"
+      han-gu-guan-iplast:
+        proto:
+           http: "7013"
+      jian-men-guan-iplast:
+        proto:
+           http: "7015"
+      black-hole-iplast:
+        proto:
+           http: "7028"
+      gu-bei-iplast:
+        proto:
+           http: "7006"
+      xyqb-quartz-iplast:
+        proto:
+           http: "7023"
+      spider-center-iplast:
+        proto:
+           http: "7021"
+      cash-loan-flow-iplast:
+        proto:
+           http: "7037"
+      financial-system-iplast:
+        proto:
+           http: "7012"
+      fund-manage-iplast:
+        proto:
+           http: "7034"
+      gyxd-iplast:
+        proto:
+           http: "7029"
+      merchant-backend-iplast:
+        proto:
+           http: "7038"
+      redpacket-iplast:
+        proto:
+           http: "7031"
+      finance-api-iplast:
+        proto:
+           http: "7044"
+      check-accounts-iplast:
+        proto:
+           http: "7045"
+      du-jiang-yan-iplast:
+        proto:
+           http: "7014"
+      op-ui-iplast:
+        proto:
+           http: "7032"
+      activity-ui-iplast:
+        proto:
+           http: "7040"
+      financial-system-ui-iplast:
+        proto:
+           http: "7011"
+      gyxd-ui-iplast:
+        proto:
+           http: "7030"
+      offline-ui-iplast:
+        proto:
+           http: "7008"
+      funding-corp-op-ui-iplast:
+        proto:
+           http: "7035"
+      paycenter-ui-iplast:
+        proto:
+           http: "7007"
+      xyqb-user-ui-iplast:
+        proto:
+           http: "7043"
+      merchant-op-ui-iplast:
+        proto:
+           http: "7039"
+      di-ting-ui-iplast:
+        proto:
+           http: "7004"
+      spider-center-ui-iplast:
+        proto:
+           http: "7020"
+      qgbc-ui-iplast:
+        proto:
+           http: "7002"
+      xyqb-ui-iplast:
+        proto:
+           http: "7001"
+      activity-op-ui-iplast:
+        proto:
+           http: "7046"
+      order-op-ui-iplast:
+        proto:
+           http: "7048"
+      bt-ui-iplast:
+        proto:
+           http: "7050"
+      AppBackend-iplast:
+        proto:
+           http: "7018"
+      activity-op-iplast:
+        proto:
+           http: "7041"
+      op-api-iplast:
+        proto:
+           http: "7047"
+      fe-api-iplast:
+        proto:
+           http: "7049"
+      qin-qiong-iplast:
+        proto:
+           http: "7022"
+      xyqb-query-iplast:
+        proto:
+           http: "7033"