update

.gitignore

@@ -6,3 +6,4 @@
 *.swm
 *.swk
 .DS_Store
+qa_shell_script/config_server/node_modules

qa_shell_script/config_server/get_project_config.js

@@ -74,7 +74,7 @@ new pClass().init(false, true, "java", "7005", "rapi.xyqb.com", "di-ting", false
 new pClass().init(true, false, "java", "7013", "auth.xyqb.com", "han-gu-guan", false, "QG", "han-gu-guan.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "用户注册登录-V1-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(true, false, "java", "7015", "", "jian-men-guan", false, "QG", "jian_men_guan.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "信审服务-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(true, true, "java", "7028", "", "black-hole", false, "QG", "black-hole.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "合同中心-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
-new pClass().init(true, true, "java", "7006", "payapi.xyqb.com", "gu-bei", true, "funding", "pay-center.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "支付中心-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
+new pClass().init(false, true, "java", "7006", "payapi.xyqb.com", "gu-bei", true, "funding", "pay-center.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "支付中心-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(true, false, "java", "7023", "", "xyqb-quartz", false, "QG", "quartz.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "定时任务-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(true, true, "java", "7021", "scapi.xyqb.com", "spider-center", false, "QG", "spider-center.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "授信-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(true, true, "java", "7037", "qapi.xyqb.com", "cash-loan-flow", false, "QG", "cash_loan_flow.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "现金贷流量对接-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");

qa_shell_script/config_server/package-lock.json

@@ -344,7 +344,7 @@
     },
     "express": {
       "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz",
+      "resolved": "http://registry.npm.taobao.org/express/download/express-4.16.2.tgz",
       "integrity": "sha1-41xt/i1kt9ygpc1PIXgb4ymeB2w=",
       "requires": {
         "accepts": "1.3.4",

qa_shell_script/exception_sub_shell.sh

@@ -110,9 +110,9 @@ tranceConfig java "ygziguan.api.url=http://139.198.0.253/receiver/grequest" "ygz
 #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 node "7002" "7050" "192.168.4.22" "AppBackend.js"
-tranceConfig ui "192.168.4.22:7040" "139.198.2.95:2240" "192.168.4.22" "activity-ui.js"
-tranceConfig ui "192.168.4.22:7003/api/coupon/activity/wechat/rent_house/bargain" "wechattest1.xyqb.com/wechat/active_redirect" "192.168.4.22" "activity-ui.js"
-tranceConfig java "http://192.168.4.22:7040/to-share" "http://139.198.2.95:7040/to-share" "192.168.4.22" "xyqb.properties"
+#tranceConfig ui "192.168.4.22:7040" "139.198.2.95:2240" "192.168.4.22" "activity-ui.js"
+#tranceConfig ui "192.168.4.22:7003/api/coupon/activity/wechat/rent_house/bargain" "wechattest1.xyqb.com/wechat/active_redirect" "192.168.4.22" "activity-ui.js"
+#tranceConfig java "http://192.168.4.22:7040/to-share" "http://139.198.2.95:7040/to-share" "192.168.4.22" "xyqb.properties"
 tranceConfig ui "wechattest.xyqb.com" "wechattest1.xyqb.com" "192.168.4.22" "xyqb-user-ui.js"
 tranceConfig java "xyqb-user-ui-22.ss.xyqb.loan" "139.198.2.95:2243" "192.168.4.22" "xyqb-user2.properties"
 tranceConfig java "wx89894cd83d117b26" "wxd019cd24f6edae9f" "192.168.4.22" "xyqb-user2.properties"
@@ -121,7 +121,7 @@ tranceConfig ui "wx89894cd83d117b26" "wxd019cd24f6edae9f" "192.168.4.22" "xyqb-u
 tranceConfig ui "11fb7f6a8b8edf2776a72c2f5624229c" "79f4e915dd37690b17c2f8fd6e6023ad" "192.168.4.22" "xyqb-user-ui.js"
 tranceConfig ui "wx89894cd83d117b26" "wxd019cd24f6edae9f" "192.168.4.22" "activity-ui.js" 
 
-tranceConfig java "rabbitmq.connection.host=192.168.4.22" "rabbitmq.connection.host=192.168.4.152" "192.168.4.22" "baitiao.properties"
+#tranceConfig java "rabbitmq.connection.host=192.168.4.22" "rabbitmq.connection.host=192.168.4.152" "192.168.4.22" "baitiao.properties"
 
 
 #4.23
@@ -133,7 +133,7 @@ tranceConfig java "rabbitmq.connection.host=192.168.4.22" "rabbitmq.connection.h
 #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=0" "xyqb.is.debug=1" "192.168.4.23" "baitiao.properties"
+#tranceConfig java "xyqb.is.debug=0" "xyqb.is.debug=1" "192.168.4.23" "baitiao.properties"
 #tranceConfig java "pay.debug=0" "pay.debug=1" "192.168.4.23" "xyqb-mall.properties"
 
 #4.24

qa_shell_script/mock_yeepay.sh

@@ -58,7 +58,7 @@ function mock()
 		echo "yeepay.v2.xyqb.merchant=10000449633" >> /home/quant_group/gu-bei/config/application.properties
 		echo "yeepay.v2.xyqb.privateKey=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBANSBQSc0Hlr+mS7uoIjYS71X2DJ6ZrCcbB1uICqty9QY6W16nZ8tLN/d9k2Z+e2rGG8s7PskpU2T+WuJeDSXs/vpPllG8/tSRVaWcr9EzPaSti3ltSUH0QOLSypZEjTT/slscExj4PMOmQXUXP3gewjNWz1cYRI7dGnKPm+ZFah/AgMBAAECgYB8AcFngz6DkzcI8C+2K6JnJ6/+JPdv8JgWxID45tqfNrphLMB2dwJM0VY+CrCSRNnJZsoT9FqSXtuaKWqAJlbchhPZjupA9RkWFzlGpCQ63/CC71RYYY03eCnc7AIpn52whkjfWG/yf57jKzEwUT+U034uvXdaA+lVvJ0xqpj3gQJBAOmLODjecn450TJbNQaop+7Q5Hz2TUIxbYakzPpcLGv1QYgHa657r7PJ23ZltDBGldMaNTZfqJrtDcq0rTA4lBECQQDo8CcdUhMZ3JbR2UZN0CG8ljMbNWgNWBa37ebE3ZG5yYldc7zY9US/+/7lhxNDqG0saTvM9pJwEc3ccVMvksOPAkEAqq7V+zIQKVJmItBn06MFgNNoei+kTUFEk8f0CvG8gXYwW5NYzp+UzOg1HbW82B9uNmeMBl4pInknwEMF5B0lkQJAdRxQPgCGk+kAdo6LNxHd9Ed7eEF4h8Ty3xQfgnh3DHYTtsU6e8WMBA24kENB3zEtejeKFjkdVHTPD/Z1wSRDZwJAAvNuq0YuRDsESOAerkBZKonA5CD0M4vHTRqihHrjBohv6yxBU8P7gALrX7qmoaZ3aLmN8wHdOAGTR6LZjQdkoQ==" >> /home/quant_group/gu-bei/config/application.properties
 		echo "yeepay.v2.xyqb.yeepay.publicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDUgUEnNB5a/pku7qCI2Eu9V9gyemawnGwdbiAqrcvUGOltep2fLSzf3fZNmfntqxhvLOz7JKVNk/lriXg0l7P76T5ZRvP7UkVWlnK/RMz2krYt5bUlB9EDi0sqWRI00/7JbHBMY+DzDpkF1Fz94HsIzVs9XGESO3Rpyj5vmRWofwIDAQAB" >> /home/quant_group/gu-bei/config/application.properties
-		echo "yeepay.v2.apihost=http://172.30.199.2:10086/tzt-api/api/" >> /home/quant_group/gu-bei/config/application.properties
+		echo "yeepay.v2.apihost=http://172.30.199.2:10085/tzt-api/api/" >> /home/quant_group/gu-bei/config/application.properties
 
 }
 
@@ -101,13 +101,13 @@ if [[ $1 = "yes" ]]; then
 else
 	unmock
 fi
-sh /home/qa-deploy-utils/qa_shell_script/2_get_code_by_name.sh gu-bei
-if [ $? = 0 ]; then
-	echo "2_get_code_by_name ok"
-else
-	echo "2_get_code_by_name fail"
-	exit -1
-fi
+#sh /home/qa-deploy-utils/qa_shell_script/2_get_code_by_name.sh gu-bei
+#if [ $? = 0 ]; then
+#	echo "2_get_code_by_name ok"
+#else
+#	echo "2_get_code_by_name fail"
+#	exit -1
+#fi
 sh /home/qa-deploy-utils/qa_shell_script/3_link_config_file_by_name.sh gu-bei
 if [ $? = 0 ]; then
 	echo "3_link_config_file_by_name ok"

qa_shell_script/ngrok/make_frp_ini.sh

@@ -31,7 +31,7 @@ function addFrpcSub()
 	sub_file=$7
 	
 	echo "" >>$sub_file
-	echo "[$sub_domain-$sub_ip_last]" >> $sub_file
+	echo "[$sub_domain-$sub_custom_domain]" >> $sub_file
 	echo "type = $sub_type" >> $sub_file
 	echo "local_ip = $sub_ip_first.$sub_ip_last" >> $sub_file
 	echo "local_port = $sub_port" >> $sub_file
@@ -58,11 +58,18 @@ addFrpcLoc local_ http 8000 q-gp.com / $filename
 
 
 addFrpcSub store http 127.0.0 1 8001 store  $filename
-addFrpcSub h5 http 192.168.4 15 7051 h5-15 $filename
-addFrpcSub mock http 172.30.199 2 8080 mock $filename
+addFrpcSub h5 http 192.168.4 26 7051 h5 $filename
+addFrpcSub mock http 172.30.199 2 80 mock $filename
 addFrpcSub atm http 192.168.4 18 3000 atm $filename
 addFrpcSub auth-center http 192.168.4 193 8099 auth-center-38 $filename
 addFrpcSub company http 172.30.199 2 10087 company-241 $filename
+addFrpcSub bp http 172.30.199 2 10084 bp $filename
+addFrpcSub qahelp http 172.30.199 2 8000 qahelp $filename
+
+
+
+
+
 
 function createNginxSSLConf()
 {
@@ -108,6 +115,14 @@ do
 	done
 done 
 
+for host_name in {0..30}
+do 
+	projectAndPort=`node $config_server/get_project_config.js  -type multi -attr port -attr2 true`
+	for projectAndPort in ${projectAndPort[@]}
+	do
+        	var=(${projectAndPort//|/ })
+        	addFrpcSub ${var[0]} http 127.0.0 1 8000 ${var[0]}-qa${host_name} $filename
 
+	done	
 
-
+done

qa_shell_script/ngrok/make_ngrok_yml.sh

-#!/bin/bash
-pwd_path="/home/qa-deploy-utils/qa_shell_script"
-config_shell_path="$pwd_path"
-config_server="$pwd_path/config_server"
-filename=/home/config_files/special/ngrok_confg.yml
-vipfilename=/home/config_files/special/ngrok_vip_confg.yml
-IP_host_first="192.168.4."
-ips=`cat $config_server/get_env_ip.sh`
-
-function addFileHead()
-{
-	rm -rf $1
-	echo "server_addr: ss.xyqb.loan:4443" >> $1
-	echo "trust_host_root_certs: false" >> $1
-	echo "tunnels:" >> $1
-}
-addFileHead $filename
-addFileHead $vipfilename
-
-function addFile()
-{
-	echo "$1   : $2  "
- 	if [ -n $4 ]
-	then
-		echo "      $1-$4:" >> $3
-	else
-		echo "      $1-iplast:" >> $3
-	fi
-	echo "        proto:" >> $3
-	echo "           http: \"$2\"" >> $3
-}
-
-#projects=(`node $config_server/get_project_config.js  -type java -attr name`)
-#for project in ${projects[@]}
-#do
-#	port=`node $config_server/get_project_config.js  -name $project -attr port`
-#	addFile $project $port $filename
-#done
-
-#projects=(`node $config_server/get_project_config.js  -type ui -attr name`)
-#for project in ${projects[@]}
-#do
-#	port=`node $config_server/get_project_config.js  -name $project -attr port`
-#	addFile $project $port $filename
-#done
-
-#projects=(`node $config_server/get_project_config.js  -type node -attr name`)
-#for project in ${projects[@]}
-#do
-#	port=`node $config_server/get_project_config.js  -name $project -attr port`
-#	addFile $project $port $filename
-#done
-
-#projects=(`node $config_server/get_project_config.js  -type python -attr name`)
-#for project in ${projects[@]}
-#do
-#	port=`node $config_server/get_project_config.js  -name $project -attr port`
-#	addFile $project $port $filename
-#done
-projects_of_out_proxy=( AppBackend  mall-ui ka-spider-center-ui  activity-ui gu-bei activity-op op-api spider-center di-ting merchant-backend cash-loan-flow xyqb xyqb-quartz xyqb-query qgbc-ui bt-ui xyqb-user2 xyqb-ui xyqb-user-ui xyqb-mall )
-
-
-for ip_last in ${ips[@]}
-do
-	for project in ${projects_of_out_proxy[@]}
-	do
-		port=`node $config_server/get_project_config.js  -name $project -attr port`
-		addFile $project $IP_host_first$ip_last:$port $vipfilename $ip_last
-	done
-done 
-
-
-
-

qa_shell_script/rabbitmq/initial_mq.sh

@@ -37,6 +37,7 @@ add_vhost baitiao_debt
 add_vhost financial_system
 add_vhost feature 
 add_vhost mall
+add_vhost msg_center_op
 add_vhost appbackend #tower 
 add_vhost offline
 add_vhost orderstatus_vhost
@@ -52,7 +53,7 @@ add_vhost /trans_order
 add_vhost /user_register
 add_vhost notify
 add_vhost SILKROAD
- 
+add_vhost bt_data_visualization
 #add_vhost baitiao_zhitou
 #add exchange
 add_exchange /  hello-exchange  direct
@@ -60,6 +61,7 @@ add_exchange /black_hole        contract        direct
 add_exchange /black_hole        contractExchange        direct
 add_exchange /funding   assignment      direct
 add_exchange /loan_order        loan_order_exchange     fanout
+add_exchange /loan_order        loan_vest_exchange     fanout
 add_exchange /loan_order        loan_repay_status     topic
 add_exchange /loan_order        loan_repay_status     topic
 add_exchange baitiao_debt       baitiaodebt_orderinfo   direct
@@ -85,6 +87,7 @@ add_exchange /trans_order trans_order_exchange direct
 add_exchange /user_register user_register_exchange direct
 add_exchange notify notify-control direct
 add_exchange /clotho clotho_exchange direct
+add_exchange bt_data_visualization  bt_data_visualization_exchange direct
 #add_exchange baitiao_zhitou btzt_orderStatus_exc direct
 #add_exchange baitiao_zhitou btzt_repay_rewrite_exc direct
 #add_exchange baitiao_zhitou btzt_sendfund_exc direct
@@ -131,10 +134,11 @@ add_queues mall deliver
 add_queues mall mallOrder
 add_queues mall refund
 add_queues mall refundFeed
+add_queues msg_center_op notify_task 'arguments={"durable":true, "x-message-ttl":2592000000}'
 add_queues mall appbackend_refresh 'arguments={"x-message-ttl":120000}'
 add_queues mall h5_refresh 'arguments={"x-message-ttl":120000}'
 add_queues mall refundFailedQueue
-add_queues mall jdOrder
+add_queues mall jdOrder 'arguments={"x-message-ttl":120000}'
 add_queues appbackend sync_req_id 'arguments={"x-message-ttl":120000}'
 add_queues offline      Test
 add_queues orderstatus_vhost    orderstatus_queue
@@ -161,6 +165,8 @@ add_queues /pay_center result_single_service_fee_queue
 add_queues backend backend_message_rewrite_queue
 add_queues backend backend_file_queue
 add_queues /loan_order ka_loan_progress_queue
+add_queues /loan_order loan_vest_msg_queue
+add_queues /loan_order loan_vest_queue
 add_queues /funding generate_contract
 add_queues baitiao_debt xyqb_baitiao_queue
 add_queues spider_center feature_calculate
@@ -169,6 +175,7 @@ add_queues /trans_order trans_order_queue
 add_queues /user_register user_register_queue
 add_queues notify notify
 add_queues /clotho clotho_notify_record
+add_queues bt_data_visualization bt_data_visualization_queue
 #add_queues baitiao_zhitou btzt_orderStatus_queue
 #add_queues baitiao_zhitou btzt_repay_rewrite_queue
 #add_queues baitiao_zhitou btzt_sendfund_queue
@@ -205,6 +212,7 @@ add_binding /trans_order trans_order_exchange trans_order_queue trans-routing-ke
 add_binding /loan_order loan_repay_status repay_status_urge repayment_status
 add_binding /loan_order loan_repay_status push_urge push_urge
 add_binding notify notify-control notify notify
+add_binding bt_data_visualization  bt_data_visualization_exchange  bt_data_visualization_queue  bt_data_visualization_queue
 #add_binding baitiao_zhitou btzt_repay_rewrite_exc order_approval_query_queue btzt_repay_rewrite_route
 #add_binding baitiao_zhitou order_approval_query_exchange  order_approval_query_queue order_approval_query_routing
 #add_binding baitiao_zhitou delay_order_approval_query_exchange delay_order_approval_query_queue delay_order_approval_query_routing

qa_shell_script/script_by_Contorller/baitiao_delete_order.sh

@@ -23,7 +23,7 @@ order_id_sql="select id  from baitiao_order where user_id=${user_id} LIMIT 1";
 echo $order_id_sql
 order_id=`mysql -N $mysqld xyqb -e "${order_id_sql}"`
 echo "order_id=${order_id}"
-fund_id_sql="SELECT fund_id from xyqb.baitiao_fund_order WHERE order_id=${order_id} limit 1";
+fund_id_sql="SELECT id from xyqb.baitiao_fund_order WHERE order_id=${order_id} limit 1";
 echo $fund_id_sql
 fund_id=`mysql -N $mysqld xyqb -e "${fund_id_sql}"`
 echo "fund_id=$fund_id"

qa_shell_script/sub_shell.sh

@@ -45,7 +45,7 @@ for ip_last_num in ${ips[@]}
 do
     read -u1000
     {
-	echo "`date +%T:%N` 开始生成 ${IP_host_first}${ip_last_num}"
+	echo "`date +%T.%N` 开始生成 ${IP_host_first}${ip_last_num}"
 	cd /home/sub_config_file_dont_rm
 	#不能直接RM 整个文件，会造成mount失效
 	#rm -rf ${IP_host_first}${ip_last_num}
@@ -130,7 +130,7 @@ do
 	mkdir -p $dir/pem_file
 	cp -rf /home/config_files/pem_file/* $dir/pem_file/
 	# sed -i "s/target_host_name/${IP_host_first}${ip_last_num}/" $dir/nginx_conf.d/*
-	echo "`date +%T:%N` 结束 ${IP_host_first}${ip_last_num}"
+	echo "`date +%T.%N` 结束 ${IP_host_first}${ip_last_num}"
 	echo "---------"
 	echo >&1000
     }&