update

db-utils/db_schema_sync.sh

@@ -102,8 +102,8 @@ function run_sql_file()
         sh $work_dir/db_execute_sql.sh $target_db_host $sync_db_name
 }
 
-database_list='cash_loan_flow contract dujiangyan financial_system financial_system_api fund_manage gyxd mall merchant offline payment_center qinqiong quartz redpacket risk_control spider_center xyqb xyqb_app xyqb_btzt xyqb_user'
-database_list2='cash_loan_flow contract dujiangyan financial_system financial_system_api fund_manage gyxd merchant offline payment_center qinqiong quartz redpacket risk_control spider_center xyqb xyqb_app xyqb_btzt xyqb_user'
+database_list='cash_loan_flow contract dujiangyan financial_system financial_system_api fund_manage gyxd mall merchant notify offline payment_center qinqiong quartz redpacket risk_control spider_center xyqb xyqb_app xyqb_btzt xyqb_user'
+database_list2='cash_loan_flow contract dujiangyan financial_system financial_system_api fund_manage gyxd merchant notify offline payment_center qinqiong quartz redpacket risk_control spider_center xyqb xyqb_app xyqb_btzt xyqb_user'
 if [[ "$sync_db_name" = "all" ]]
 then
 	echo "sync all database schema"

qa_shell_script/config_server/get_project_config.js

@@ -101,11 +101,13 @@ new pClass().init(false, true, "java", "7068", "", "customer_helpdesk", true, "d
 new pClass().init(true, false, "java", "7069", "", "notify", true, "fund_pay", "notify.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", "7071", "", "mall-settlement", true, "baitiao", "mall-settlement.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "商户结算系统", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(true, false, "java", "7072", "", "data-taurus",true, "data-riskcontrol", "data-taurus.log", "application.properties", " /dev/null 2>&1 &", null, 2, "质保金-server", "","mvn clean package -Ptest -Dmaven.test.skip=true","");
+new pClass().init(true,true, "node", "7073", "","statistics-api", true, "ui", "", "src/dev.config.js", "sh start.sh", null, 1, "数据可视化-server", "","sh stop.sh","");
 new pClass().init(true, false, "java", "7074", "", "account-center",false, "QG", "account_center.log", "application.properties", " /dev/null 2>&1 &", null, 2, "账户中心-server", "","mvn clean package -Ptest -Dmaven.test.skip=true","");
 new pClass().init(true, false, "java", "7079", "", "user_credit",false, "QG", "user_credit.log", "application.properties", " /dev/null 2>&1 &", null, 2, "用户升级-server", "","mvn clean package -Ptest -Dmaven.test.skip=true","");
 new pClass().init(true, false, "java", "7076", "", "urge_dispatcher", true, "data-riskcontrol", "dispatcher.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "催收系统", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(true, false, "java", "7081", "", "wechat-config", true, "fund_pay", "wechat-config.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "微信消息推送系统", "",     "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(false, false, "java", "7082", "", "clotho", true, "funding", "clotho.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &",     null, 2, "资金方统计相关功能", "",     "mvn clean package -Ptest -Dmaven.test.skip=true", "");
+new pClass().init(false, true, "java", "7085", "", "mall-canal", true, "baitiao", "mall_canal.log", "application.properties", "-l 152 -w 2 &", null, 2, "商城订单监控", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 
 // ui----
 new pClass().init(true, false, "ui", "7032", "", "op-ui", false, "QG", null, "src/js/env.config.js", "npm run build", "node7", 1, "运营系统-ui", "", "", "");

qa_shell_script/exception_sub_shell.sh

@@ -49,14 +49,14 @@ tranceConfig ui "wechattest.xyqb.com" "wechattest2.xyqb.com" "192.168.4.12" "xyq
 tranceConfig java "kamen.customerid=test" "kamen.phone.customerid=803571" "192.168.4.12" "xyqb-mall.properties"
 tranceConfig java "kamen.secretkey=12345678901234567890" "kamen.secretkey=281383FDF56E65D3FDA88343113B3631" "192.168.4.12" "xyqb-mall.properties"
 tranceConfig java "kamen.customerid=test" "kamen.phone.customerid=803571" "192.168.4.12" "xyqb-mall.properties"
-#tranceConfig java "bt.order.notify.url=http:\/\/192.168.4.12:7019\/ex\/baitiao\/result\/order" "bt.order.notify.url=http:\/\/192.168.4.241\/ex\/baitiao\/result\/order" "192.168.4.12" "xyqb-mall.properties"
+#tranceConfig java "bt.order.notify.url=http:\/\/192.168.4.12:7019\/ex\/baitiao\/result\/order" "bt.order.notify.url=http:\/\/mock.q-gp.com\/ex\/baitiao\/result\/order" "192.168.4.12" "xyqb-mall.properties"
 tranceConfig java  "xyqb-user.ui=http:\/\/192.168.4.12:7043" "xyqb-user.ui=http:\/\/xyqb-user-ui-12.q-gp.com" "192.168.4.12" "xyqb-user2.properties"
 tranceConfig ui  "192.168.4.12:7043" "xyqb-user-ui-12.q-gp.com" "192.168.4.12" "mall-ui.js"
 
 # tranceConfig node "host: \'http:\/\/192.168.4.12:7013" "host: \'http:\/\/192.168.4.12:7042" "192.168.4.12" "AppBackend.js"
 # tranceConfig node "host.*7042" "host: 'http:\/\/192.168.4.12:7013" "192.168.4.12" "AppBackend.js"
 
-#tranceConfig java "wx.api_host=https:\/\/api.mch.weixin.qq.com\/" "wx.api_host=http:\/\/192.168.4.241\/" "192.168.4.12" "gu-bei.properties"
+#tranceConfig java "wx.api_host=https:\/\/api.mch.weixin.qq.com\/" "wx.api_host=http:\/\/mock.q-gp.com\/" "192.168.4.12" "gu-bei.properties"
 
 #4.13
 #tranceConfig java "pay.debug=0" "pay.debug=1" "192.168.4.13" "xyqb-mall.properties"
@@ -102,7 +102,7 @@ tranceConfig java "www.q-gp.com:2181" "192.168.4.14:2181" "192.168.4.14" "xyqb-u
 
 #4.17
 #tranceConfig java "192.168.4.3" "192.168.4.17" "192.168.4.17" "*"
-tranceConfig java "ygziguan.api.url=http://139.198.0.253/receiver/grequest" "ygziguan.api.url=http://192.168.4.241/receiver/grequest" "192.168.4.17" "fund-manage.properties"
+tranceConfig java "ygziguan.api.url=http://139.198.0.253/receiver/grequest" "ygziguan.api.url=http://mock.q-gp.com/receiver/grequest" "192.168.4.17" "fund-manage.properties"
 #4.18
 
 #4.22
@@ -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"
 
 
 #4.23
@@ -154,11 +154,11 @@ tranceConfig java "wx89894cd83d117b26" "wx9d259d369c88bf31" "192.168.4.25" "xyqb
 tranceConfig java "11fb7f6a8b8edf2776a72c2f5624229c" "2c1603ace1d6e7ae1f0c376cf7bcd72e" "192.168.4.25" "xyqb-user2.properties"
 tranceConfig ui "wx89894cd83d117b26" "wx9d259d369c88bf31" "192.168.4.25" "xyqb-user-ui.js"
 #4.26
-tranceConfig java "ygziguan.api.url=http://139.198.0.253/receiver/grequest" "ygziguan.api.url=http://192.168.4.241/receiver/grequest" "192.168.4.26" "fund-manage.properties"
+tranceConfig java "ygziguan.api.url=http://139.198.0.253/receiver/grequest" "ygziguan.api.url=http://mock.q-gp.com/receiver/grequest" "192.168.4.26" "fund-manage.properties"
 
 #4.28
 
-tranceConfig java "wx.api_host=https:\/\/api.mch.weixin.qq.com\/" "wx.api_host=http:\/\/192.168.4.241\/" "192.168.4.28" "gu-bei.properties"
+tranceConfig java "wx.api_host=https:\/\/api.mch.weixin.qq.com\/" "wx.api_host=http:\/\/mock.q-gp.com\/" "192.168.4.28" "gu-bei.properties"
 
 #4.72
 #tranceConfig java "sms.is.debug=1" "sms.is.debug=0" "192.168.4.24" "di-ting.properties"
@@ -166,7 +166,7 @@ tranceConfig java "wx.api_host=https:\/\/api.mch.weixin.qq.com\/" "wx.api_host=h
 #tranceConfig node "host.*7042" "host: 'http:\/\/192.168.4.72:7013" "192.168.4.72" "AppBackend.js"
 #tranceConfig node ":7013/app/login" ":7042/app/login2" "192.168.4.72" "AppBackend.js"
 #tranceConfig node ":7013" ":7042" "192.168.4.72" "AppBackend.js"
-#tranceConfig java "wx.api_host=https:\/\/api.mch.weixin.qq.com\/" "wx.api_host=http:\/\/192.168.4.241\/" "192.168.4.72" "gu-bei.properties"
+#tranceConfig java "wx.api_host=https:\/\/api.mch.weixin.qq.com\/" "wx.api_host=http:\/\/mock.q-gp.com\/" "192.168.4.72" "gu-bei.properties"
 
 #4.151
 tranceConfig java "xyqb.is.debug=0" "xyqb.is.debug=1" "192.168.4.151" "xyqb.properties"
@@ -186,7 +186,7 @@ tranceConfig ui "192.168.4.152:7019" "171910sn46.iask.in" "192.168.4.152" "bt-ui
 tranceConfig java "139.198.2.95:2231" "192.168.4.22:7031" "192.168.4.22" "xyqb.properties"
 
 #4.156
-tranceConfig java  "http:\/\/192.168.4.241\/" "http:\/\/221.207.229.3:17500\/wlpf\/HttpServer\/XFXD_INPUT_SVR\/" "192.168.4.156"  "baitiao-zhitou.properties"
+tranceConfig java  "http:\/\/mock.q-gp.com\/" "http:\/\/221.207.229.3:17500\/wlpf\/HttpServer\/XFXD_INPUT_SVR\/" "192.168.4.156"  "baitiao-zhitou.properties"
 #tranceConfig java  "http:\/\/192.168.4.156:7017\/eureka\/" "http:\/\/192.168.4.152:7017\/eureka\/" "192.168.4.156"  "baitiao.properties"
 #tranceConfig java "eureka.client.serviceUrl.defaultZone=http://192.168.4.156:7017/eureka/" "eureka.client.serviceUrl.defaultZone=http://192.168.4.17:7017/eureka/" "192.168.4.156" "baitiao-zhitou.properties"
 #微信环境修改，请勿删除，可以注释

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://192.168.4.241:10086/tzt-api/api/" >> /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
 
 }
 

qa_shell_script/ngrok/make_frp_ini.sh

@@ -62,7 +62,7 @@ addFrpcSub h5 http 192.168.4 15 7051 h5-15 $filename
 addFrpcSub mock http 172.30.199 2 8080 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 192.168.4 241 10087 company-241 $filename
+addFrpcSub company http 172.30.199 2 10087 company-241 $filename
 
 function createNginxSSLConf()
 {

qa_shell_script/ngrok/store

+
+[store]
+type = http
+local_port = 127.0.0
+custom_domains = 1
+locations = 8001

qa_shell_script/rabbitmq/initial_mq.sh

@@ -134,6 +134,7 @@ add_queues mall refundFeed
 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 appbackend sync_req_id 'arguments={"x-message-ttl":120000}'
 add_queues offline      Test
 add_queues orderstatus_vhost    orderstatus_queue
@@ -191,6 +192,7 @@ add_queues financial_system hengfengInfo
 add_binding mall refresh_cache h5_refresh h5_refresh
 add_binding mall refresh_cache appbackend_refresh appbackend_refresh
 add_binding mall digital refundFailedQueue refundFailedQueue 
+add_binding mall digital jdOrder jdOrder
 add_binding backend backend_message_rewrite_exc backend_message_rewrite_queue backend_message_rewrite_route
 add_binding backend backend_file_exc backend_file_queue backend_file_route
 add_binding /black_hole contract generate_auth_success generate_auth_success

qa_shell_script/script_by_Contorller/mall_update_ad_detail.sh

@@ -11,7 +11,7 @@ date=`date "+%Y-%m-%d %H:%M:%S"`
 date_next_year=`date -d "next year" "+%Y-%m-%d %H:%M:%S"`
 function doMysql()
 {
-	update_sql="update ${TABLENAME} set enable=0 where type=16 and sort=1"
+	update_sql="update ${TABLENAME} set enable=0 where type=16 "
 	mysql $mysqld ${DBNAME} -e "${update_sql}"
 	insert_sql="INSERT INTO ${TABLENAME} (type, sort, start_date, end_date, image_url, nav_url, name, text, removed, created_at, updated_at, enable, min_version, expand_data, code)
 VALUES