some update

qa_shell_script/2_get_code_by_type.sh

@@ -44,7 +44,7 @@ function getCode()
 				git clone $git_path
 				cd ./$project
 			fi
-			if [ -n "$git_branch" ] && $git_branch != "originalBBB"; then
+			if [ -n "$git_branch" ] && [ $git_branch != "originalBBB" ]; then
 				echo "git checkout -f $git_branch"
 				git checkout -f $git_branch
 				git_branch=$2

qa_shell_script/exception_sub_shell.sh

@@ -60,8 +60,8 @@ tranceConfig java "xyqb.model.url=http:\/\/192.168.4.202\/Model\/openapi" "xyqb.
 #tranceConfig java "192.168.4.14:7007" "139.198.2.95:1407" "192.168.4.14" "gu-bei.properties"
 #tranceConfig python "192.168.4.14" "192.168.4.20" "192.168.4.14" "qin-qiong.*"
 #tranceConfig java "pay.debug=0" "pay.debug=1" "192.168.4.14" "xyqb-mall.properties"
-
-
+tranceConfig java "www.q-gp.com:1462" "192.168.4.14:7062" "192.168.4.14" "xyqb-user2.properties"
+tranceConfig java "www.q-gp.com:2181" "192.168.4.14:2181" "192.168.4.14" "xyqb-user2.properties"
 
 #4.15
 #tranceConfig java "192.168.4.15:7007" "139.198.2.95:1507" "192.168.4.15" "gu-bei.properties"
@@ -73,8 +73,8 @@ tranceConfig java "xyqb.model.url=http:\/\/192.168.4.202\/Model\/openapi" "xyqb.
 #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 "loanorder" "loanstatus" "192.168.4.15" "xyqb.properties"
-#tranceConfig java "xyqb-ui.url=http://192.168.4.15:7001" "xyqb-ui.url=http://192.168.4.15:7057" "192.168.4.15" "xyqb.properties"
-tranceConfig java "mall-ui.url=http://192.168.4.15:7058" "mall-ui.url=http://wechattest1.xyqb.com" "192.168.4.15" "xyqb.properties"
+tranceConfig java "xyqb-ui.url=http://192.168.4.15:7001" "xyqb-ui.url=http://192.168.4.15:7057" "192.168.4.15" "xyqb.properties"
+#tranceConfig java "mall-ui.url=http://192.168.4.15:7058" "mall-ui.url=http://wechattest1.xyqb.com" "192.168.4.15" "xyqb.properties"
 
 #4.16
 
@@ -87,7 +87,6 @@ tranceConfig java "mall-ui.url=http://192.168.4.15:7058" "mall-ui.url=http://wec
 #tranceConfig node "112233445512345.ittun.com" "activity-op-22.ss.xyqb.loan" "192.168.4.22" "activity-op.js"
 #tranceConfig java "xyqb.is.debug=1" "xyqb.is.debug=0" "192.168.4.22" "baitiao.properties"
 #tranceConfig java "7002" "7050" "192.168.4.22" "baitiao.properties"
-tranceConfig java "xyqb.is.debug=1" "xyqb.is.debug=0" "192.168.4.22" "xyqb.properties"
 #tranceConfig node "7002" "7050" "192.168.4.22" "AppBackend.js"
 
 #4.23
@@ -99,6 +98,7 @@ tranceConfig java "xyqb.is.debug=1" "xyqb.is.debug=0" "192.168.4.22" "xyqb.prope
 #tranceConfig java "qatest" "Uiwb@o^fR&nHOa5t" "192.168.4.23" "redpacket.properties"
 #tranceConfig java "redpacket.data.mysql.user=qa" "redpacket.data.mysql.user=xyqb_query" "192.168.4.23" "redpacket.properties"
 tranceConfig node "192.168.4.50:9050" "192.168.4.23:7060" "192.168.4.23" "op-api.js"
+tranceConfig java "xyqb.is.debug=1" "xyqb.is.debug=0" "192.168.4.23" "baitiao.properties"
 
 #4.24
 #tranceConfig java "sms.is.debug=1" "sms.is.debug=0" "192.168.4.24" "di-ting.properties"

qa_shell_script/rabbitmq/initial_mq.sh

@@ -69,6 +69,7 @@ add_queues /black_hole  waiting_generate
 add_queues /black_hole  waiting_oneway
 add_queues /funding     approval_suc
 add_queues /loan_order  loan_order_queue
+add_queues /loan_order  loan_state_msg_queue
 add_queues baitiao_debt qunar_baitiaodebt
 add_queues baitiao_debt xyqbBaitiaoQueue
 add_queues financial_system     baitiaoOrder

qa_shell_script/sub_shell.sh

@@ -41,8 +41,12 @@ do
 	sed -i "s/target_mq_host_name/${IP_host_first}${ip_last_num}/" $dir/public/java/*
 	sed -i "s/${public_ip}:3306/${IP_host_first}${ip_last_num}:3306/g" $dir/public/java/*
 
+
 	sed -i "s/redis.master.host=${public_ip}/redis.master.host=${IP_host_first}${ip_last_num}/g" $dir/public/java/*
 	sed -i "s/zk.connect.url=${public_ip}/zk.connect.url=${IP_host_first}${ip_last_num}/g" $dir/public/java/*
+	sed -i "s/registry.address=${public_ip}:2181/registry.address=${IP_host_first}${ip_last_num}:2181/g" $dir/public/java/*
+	sed -i "s/${public_ip}:${ip_last_num}62/${IP_host_first}${ip_last_num}:7062/g" $dir/public/java/*
+
 
 	sed -i "s/ip_last/$ip_last_num/g" $dir/public/java/*
 	sed -i "s/ip_last/$ip_last_num/g" $dir/java/*