up

qa_shell_script/exception_sub_shell.sh

@@ -164,7 +164,8 @@ tranceConfig java "11fb7f6a8b8edf2776a72c2f5624229c" "e30380e9ade07f361e51a643f9
 tranceConfig ui "wx89894cd83d117b26" "wxc94ca68b353e90d0" "192.168.4.24" "xyqb-user-ui.js"
 tranceConfig ui "11fb7f6a8b8edf2776a72c2f5624229c" "e30380e9ade07f361e51a643f94d8817" "192.168.4.24" "xyqb-user-ui.js"
 tranceConfig ui "wx89894cd83d117b26" "wxc94ca68b353e90d0" "192.168.4.24" "activity-ui.js"
-
+tranceConfig ui "wechattest.xyqb.com" "xyqb-user2-24.q-gp.com" "192.168.4.24" "new-xyqb-user-ui.js"
+tranceConfig ui "wx89894cd83d117b26" "wxc94ca68b353e90d0" "192.168.4.24" "new-xyqb-user-ui.js"
 #4.25
 tranceConfig ui "wechattest.xyqb.com" "xyqb-user2-25.q-gp.com" "192.168.4.25" "xyqb-user-ui.js"
 tranceConfig java "wx89894cd83d117b26" "wx9d259d369c88bf31" "192.168.4.25" "xyqb-user2.properties"
@@ -172,6 +173,8 @@ tranceConfig java "11fb7f6a8b8edf2776a72c2f5624229c" "2c1603ace1d6e7ae1f0c376cf7
 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://mock.q-gp.com/receiver/grequest" "192.168.4.26" "fund-manage.properties"
+tranceConfig ui "wechattest.xyqb.com" "xyqb-user2-26.q-gp.com" "192.168.4.26" "new-xyqb-user-ui.js"
+tranceConfig ui "wx89894cd83d117b26" "wxc94ca68b353e90d0" "192.168.4.26" "new-xyqb-user-ui.js"
 
 #4.28
 
@@ -188,7 +191,9 @@ tranceConfig ui "wx89894cd83d117b26" "wx89894cd83d117b26" "192.168.4.28" "new-xy
 #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"
 tranceConfig node "http://139.198.2.95:38099" "http://192.168.4.48:8099" "192.168.4.72" "AppBackend.js"
 tranceConfig ui "//192.168.4.72:7054/" "//192.168.4.72:18000/mallapi/" "192.168.4.72" "new-mall-ui.js"
-
+#4.88
+tranceConfig ui "wechattest.xyqb.com" "xyqb-user2-88.q-gp.com" "192.168.4.88" "new-xyqb-user-ui.js"
+tranceConfig ui "wx89894cd83d117b26" "wxc94ca68b353e90d0" "192.168.4.88" "new-xyqb-user-ui.js"
 #4.151
 tranceConfig java "xyqb.is.debug=0" "xyqb.is.debug=1" "192.168.4.151" "xyqb.properties"
 tranceConfig java "liebao.aes.key=0123456789abcdef" "liebao.aes.key=e2XNtnB8QEEuvhEW" "192.168.4.151" "cash-loan-flow.properties"

qa_shell_script/migrate_ENV/enable_mq_plugin.sh

 #!/bin/bash
 cd /usr/lib/rabbitmq/lib/rabbitmq_server-3.6.0/plugins/
 scp root@192.168.4.15:/usr/lib/rabbitmq/lib/rabbitmq_server-3.6.0/plugins/rabbitmq_delayed_message_exchange-0.0.1.ez .
-/usr/lib/bin/rabbitmq-plugins enable rabbitmq_delayed_message_exchange
-sh /home/qa-deploy-utils/qa_shell_script/rabbitmq/restart_mq.sh
\ No newline at end of file
+/usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_delayed_message_exchange
+sh /home/qa-deploy-utils/qa_shell_script/rabbitmq/restart_mq.sh

qa_shell_script/ngrok/docker_env_name.sh

- qa20|192.168.167.5 qa1|192.168.167.2 qa3|192.168.167.6 qa4|192.168.167.3 qa21|192.168.167.4 156|192.168.167.3 qa5|192.168.167.4 xjd001|192.168.167.6 zhangbin|192.168.167.7
+ qa20|192.168.167.5 qa1|192.168.167.2 qa3|192.168.167.6 qa4|192.168.167.3 qa21|192.168.167.4 156|192.168.167.3 qa5|192.168.167.4 xjd001|192.168.167.6 zhangbin|192.168.167.7 qa6|192.168.167.3

qa_shell_script/ngrok/make_frp_ini.sh

@@ -61,15 +61,15 @@ addFrpcLoc local_ http 8000 q-gp.com / $filename
 
 
 addFrpcSub store http 127.0.0 1 8001 store  $filename
-addFrpcSub h5 http 192.168.4 16 7051 h5 $filename
+addFrpcSub h5 http 192.168.4 88 7051 h5 $filename
 addFrpcSub mock http 192.168.4 27 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 192.168.4 27 10087 company-241 $filename
 addFrpcSub bp http 192.168.4 27 10084 bp $filename
 addFrpcSub qahelp http 192.168.4 27 8000 qahelp $filename
-
-
+addFrpcSub h5sp http 192.168.4 25 7057  h5sp-25 $filename
+addFrpcSub qg1 http 192.168.4 21 9019 qg1-21 $filename
 
 
 

qa_shell_script/script_by_Contorller/2_diting_huoquzijinfangshenhe.sh

@@ -27,7 +27,7 @@ delete from xyqb.loan_application_manifest_history
 where loan_application_history_id =111112222233333;
 
 INSERT INTO xyqb.loan_application_manifest_history (user_id, loan_application_history_id, channel_id, product_id, transaction_flow_id, funding_corp_id, funding_corp_name, contract_loan_amount, contract_term, service_fee_per_term, one_time_service_fee, monthly_interest_rate, total_repayment_amount, monthly_repayment, real_loan_amount, annual_interest_rate, principal_and_interest_per_term, total_principal_and_interest, company_income, loan_received_at, loan_paid_at, transaction_status, remark, red_packet_strategy) 
-VALUES (1, 111112222233333, 1, 32, 0, $fund_id, N'测试资金方', 2000.00, 3, 150.00, 0.00, 0.011675, 2496.88, 832.29, 2000.00, 0.140100, 682.29, 2046.88, 46.88, '2017-06-08 18:39:33', '1989-09-29 00:00:00', 0, '', NULL);
+VALUES (1, 111112222233333, 1, 32, 0, $fund_id, N'测试资金方', 2000.00, 3, 50.00, 0.00, 0.011675, 2496.88, 832.29, 2000.00, 0.140100, 682.29, 2046.88, 46.88, '2017-06-08 18:39:33', '1989-09-29 00:00:00', 0, '', NULL);
 
 delete from xyqb.loan_application_manifest_history
 where loan_application_history_id=(select id from xyqb.loan_application_history where business_type=0 and user_id=(select id from xyqb_user.user where phone_no =$phone_no) and is_active=1);

qa_shell_script/script_by_Contorller/baitiao_user_delete.sh

@@ -170,6 +170,12 @@ function baitiaoDeleteOrder(){
 
 #paycenter
   fi 
+
+redis-cli -h $ip -p 6379 FLUSHALL
+redis-cli -h $ip -p 6380 FLUSHALL
+redis-cli -h $ip -p 6381 FLUSHALL
+redis-cli -h $ip -p 6382 FLUSHALL
+redis-cli -h $ip -p 6383 FLUSHALL
  echo "done!!! `date`"
 }
 baitiaoDeleteOrder $ip $phone_no

qa_shell_script/script_by_Contorller/mall_deliveryOrder.sh

@@ -17,7 +17,7 @@ mysql -N $mysqld mall -e "update mall_order set order_state='3' where order_id='
 
 # 更新mall.digital_order_detail表的物流信息
 mallOrderId=`mysql -N $mysqld mall -e "select id from mall_order where order_id='$orderId'"`;
-mysql -N $mysqld mall -e "update digital_order_detail set logistics_company='韵达',logistics_phone='18800001111',
+mysql -N $mysqld mall -e "set names utf-8; update digital_order_detail set logistics_company='韵达',logistics_phone='18800001111',
 logistics_delivery_code='1234567890',logistics_delivery_time='$seq' where order_id='$mallOrderId'";
 
 # 更新merchant.supplier_order表的订单状态
@@ -32,7 +32,7 @@ values
 
 # 更新merchant.supplier_order_logistics表的物流信息
 orderStatusId=`mysql -N $mysqld merchant -e "select id from supplier_order_status_history where supplier_order_id='$supplierOrderId'"`;
-mysql -N $mysqld merchant -e "insert into supplier_order_logistics
+mysql -N $mysqld merchant -e "set names utf-8; insert into supplier_order_logistics
 ( order_id, order_status_id, mall_order_no, operator, created_at, updated_at, logistics_order_no, express_company, express_phone, delivery_at) 
 values
 ( '$supplierOrderId', '$orderStatusId', '$orderId', '38', '$seq', '$seq',  '789211463752', '韵达', '18800001111', '$seq')";

qa_shell_script/script_by_Contorller/mall_faxian_tab.sh

+#!/bin/bash
+ip=$1
+
+mysqld="-h$ip -p3306 -uqa -pqatest"
+
+# 先删除display库的discovery_config表
+mysql -N $mysqld display -e "DROP TABLE IF EXISTS discovery_config";
+
+# 再创建display库的discovery_config表
+mysql -N $mysqld display -e "CREATE TABLE discovery_config (
+  id bigint(11) NOT NULL AUTO_INCREMENT,
+  name varchar(50) NOT NULL,
+  sort int(4) NOT NULL,
+  config_key varchar(50) NOT NULL,
+  config_value text NOT NULL,
+  PRIMARY KEY (id)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8"
+
+# 给display库的discovery_config表灌入基础数据
+mysql -N $mysqld display -e "set names utf-8; insert into discovery_config ( name, sort, config_key, config_value) 
+values ( '信用分', '1', 'credit_score', '{\"firstDynamic\":\"信用钱包让有信用的人更有尊严，守护信用，守护尊严！\",\"fixedText\":\"信用分越高，额度越高，费率越低\",\"secondDynamic\":\"我们通过深度学习，汇总得出每位用户的信用分\",\"thirdDynamic\":\"钱包君会综合评估您的额度和动态费率\"}')";
+
+mysql -N $mysqld display -e "set names utf-8; insert into discovery_config ( name, sort, config_key, config_value) 
+values ( '授权入口', '2', 'authorize_entrance', '{\"authorizeEntranceModels\":[{\"authorize\":\"运营商认证\",\"enable\":true,\"id\":1,\"imgUrl1\":\"https://oic74zs8j.qnssl.com/FuR2uVd5QLmLJRsJVgZNgwcrHzX2\",\"imgUrl2\":\"https://oic74zs8j.qnssl.com/Fi1E87xv63-DaMrng9GJZROJZcgO\",\"name\":\"运营商\",\"sort\":1},{\"authorize\":\"芝麻分\",\"enable\":true,\"id\":4,\"imgUrl1\":\"https://oic74zs8j.qnssl.com/Fri_qH1foasXr_bj1ku2HMzontm5\",\"imgUrl2\":\"https://oic74zs8j.qnssl.com/FlGwkdPtIqwx2609gPxS7ft9Aly_\",\"name\":\"芝麻分\",\"sort\":2},{\"authorize\":\"拍照\",\"enable\":true,\"id\":11,\"imgUrl1\":\"https://oic74zs8j.qnssl.com/Fj5vj3j1ErbfpkHgUQCCb9J2HrjN\",\"imgUrl2\":\"https://oic74zs8j.qnssl.com/FkvkF6Zkagx1RJoTcHbryC745SCt\",\"name\":\"拍照\",\"sort\":3},{\"authorize\":\"央行征信\",\"enable\":true,\"id\":5,\"imgUrl1\":\"https://oic74zs8j.qnssl.com/FvE0QwGO6ItHI0K97X3vNpG9Q25B\",\"imgUrl2\":\"https://oic74zs8j.qnssl.com/FlrpNAxigybGfH2tfmDHs35p8prl\",\"name\":\"央行征信\",\"sort\":4},{\"authorize\":\"京东\",\"enable\":true,\"id\":6,\"imgUrl1\":\"https://oic74zs8j.qnssl.com/Fsqnv3E7VgZn5QZe67ZXGx1Xba7w\",\"imgUrl2\":\"https://oic74zs8j.qnssl.com/Fi1Y084ZNGZpIzmEr3P_U5YjYBzy\",\"name\":\"京东\",\"sort\":5},{\"authorize\":\"社保\",\"enable\":true,\"id\":7,\"imgUrl1\":\"https://oic74zs8j.qnssl.com/FsLueJDcYziInejyNTYbA5UNNhxH\",\"imgUrl2\":\"https://oic74zs8j.qnssl.com/FvKE3iBvrW-eXb18_OPxi4bMeivT\",\"name\":\"社保\",\"sort\":6},{\"authorize\":\"公积金\",\"enable\":true,\"id\":8,\"imgUrl1\":\"https://oic74zs8j.qnssl.com/Fk-hdu1vNBc4GZY2fqJ_5F3JUedH\",\"imgUrl2\":\"https://oic74zs8j.qnssl.com/FuPLTSROy-ItHMY_rAFey1xsTr9l\",\"name\":\"公积金\",\"sort\":7},{\"authorize\":\"信用卡邮箱\",\"enable\":true,\"id\":9,\"imgUrl1\":\"https://oic74zs8j.qnssl.com/Fl4pPhkWzZVztZwgWShFimkNi-VK\",\"imgUrl2\":\"https://oic74zs8j.qnssl.com/Fu5hH_p0mUuDoLejLxWGQSydJIC5\",\"name\":\"信用卡邮箱\",\"sort\":8},{\"authorize\":\"学信\",\"enable\":true,\"id\":10,\"imgUrl1\":\"https://oic74zs8j.qnssl.com/FgZPJRaMYD5tdWFaVp5LBhveYNC5\",\"imgUrl2\":\"https://oic74zs8j.qnssl.com/FoVq0wwJnoZc9ej7Io-oRl2nciU9\",\"name\":\"学信\",\"sort\":9},{\"authorize\":\"支付宝认证\",\"enable\":false,\"id\":2,\"imgUrl1\":\"https://oic74zs8j.qnssl.com/FlwCceUKFeUaMAt5MmqAjisHeADm\",\"imgUrl2\":\"https://oic74zs8j.qnssl.com/Ft-ac0avX9Zel1m-b9JIrc6BA7fn\",\"name\":\"支付宝\",\"sort\":10},{\"authorize\":\"淘宝认证\",\"enable\":false,\"id\":3,\"imgUrl1\":\"https://oic74zs8j.qnssl.com/FknH_6SvvwEJefTQD_SNktEdaXQ7\",\"imgUrl2\":\"https://oic74zs8j.qnssl.com/FooCgQXhVDE5ktMENnlbj3dzah89\",\"name\":\"淘宝\",\"sort\":11}],\"authorizeText\":\"授权信息有助于提升信用分\"}')";
+
+mysql -N $mysqld display -e "set names utf-8; insert into discovery_config ( name, sort, config_key, config_value) 
+values ( '贷款大全', '3', 'loan_book', '{\"bannerConfig\":{\"banners\":[{\"enable\":true,\"imgUrl\":\"https://oic74zs8j.qnssl.com/FlFNylgooXgd7wtZS7Ij84wW1a5J\",\"name\":\"贷款大全\",\"navUrl\":\"https://h5.xyqb.com/leadflow/static/home?version=4\"}],\"isShow\":true},\"entranceModels\":[{\"enable\":true,\"imgUrl\":\"https://oic74zs8j.qnssl.com/FgnXRbMz7FypRELrRDsPwLiQWvVV\",\"name\":\"大额专区\",\"navUrl\":\"http://h5.xyqb.com/leadflow/next?nextTitle=%E5%A4%A7%E9%A2%9D%E7%8E%B0%E9%87%91%E8%B4%B7&levelCode=5&version=4\"},{\"enable\":true,\"imgUrl\":\"https://oic74zs8j.qnssl.com/FkObOKD-SE68yvQVDFqmD5cIiZbh\",\"name\":\"小额专区\",\"navUrl\":\"http://h5.xyqb.com/leadflow/next?nextTitle=%E5%B0%8F%E9%A2%9D%E6%9E%81%E9%80%9F%E8%B4%B7&levelCode=6&version=4\"},{\"enable\":true,\"imgUrl\":\"https://oic74zs8j.qnssl.com/FoILJE-_-RdDOn1tvcqZR9Zso9sh\",\"name\":\"新品专区\",\"navUrl\":\"http://h5.xyqb.com/leadflow/next?nextTitle=%E6%96%B0%E5%93%81%E9%80%9F%E9%80%92&levelCode=7&version=4\"},{\"enable\":true,\"imgUrl\":\"https://oic74zs8j.qnssl.com/Fnj7JdABns7BwO9GsjHE-fZRAT5D\",\"name\":\"更多\",\"navUrl\":\"https://h5.xyqb.com/leadflow/static/home?version=4\"}],\"loanStates\":\"7,1,2,3,4,5,6\",\"title\":\"贷款大全\"}')";
+
+mysql -N $mysqld display -e "set names utf-8; insert into discovery_config ( name, sort, config_key, config_value) 
+values ( '活动中心', '4', 'activity_center', '{\"bannerConfig\":{\"banners\":[{\"enable\":true,\"imgUrl\":\"https://oic74zs8j.qnssl.com/FvwfjR2jhjYxZI9Z-5Ti5Oiu3n91\",\"name\":\"关注公众号\",\"navUrl\":\"https://activity.xyqb.com/activity/598bfd94195c4f0486d7b3d9\"}],\"isShow\":true},\"entranceModels\":[{\"imgUrl\":\"https://oic74zs8j.qnssl.com/FvwfjR2jhjYxZI9Z-5Ti5Oiu3n91\",\"name\":\"呵呵\",\"navUrl\":\"http://www.baidu.com\",\"sort\":1}],\"imageEntrances\":[{\"imgUrl\":\"https://oic74zs8j.qnssl.com/FrGkkhGyS4ytrFhcihpEChmSauFD\",\"navUrl\":\"https://activity.xyqb.com/activity/59c4b522c0883151901ecde5\"},{\"imgUrl\":\"https://oic74zs8j.qnssl.com/FrscDbUuvBDliVAjztpagXon9J59\",\"navUrl\":\"https://activity.xyqb.com/share-money?userPhone%3D%7Bphone%7D%26token%3D%7Btoken%7D\"}],\"title\":\"活动中心\",\"type\":1}')";
+
+mysql -N $mysqld display -e "set names utf-8; insert into discovery_config ( name, sort, config_key, config_value) 
+values ( '扫一扫', '0', 'scan', '{\"isShow\":true}')";
+
+
+echo "成功创建display库、discovery_config表并灌入基础数据"

qa_shell_script/script_by_Contorller/mall_jiekuan_tab.sh

+#!/bin/bash
+ip=$1
+
+seq=`date "+%Y-%m-%d %H:%M:%S"`
+mysqld="-h$ip -p3306 -uqa -pqatest"
+
+# 0.未登录：先删除未登录状态下loan_config表数据，再插入新数据
+mysql -N $mysqld mall -e "delete from loan_config where loan_state='0' and config_key='buttonConfig'";
+mysql -N $mysqld mall -e "set names utf-8; insert into loan_config ( id, loan_state, config_key, config_value, removed, update_at) 
+values ( '76', '0', 'buttonConfig', '{\n    \"isShow\":true,\n    \"buttonColor\":\"464B53\",\n   \"buttonTitle\":\"立即申请\",\n \"navUrl\":\"http://$ip:7001/app-landing?registerFrom={registerFrom}&channelId=1&token={token}&appChannel={appChannel}&appName={appName}\",\n    \"typefaceColor\":\"ffffff\"\n}', '0', '$seq')";
+
+# 1.申请借款：先删除未登录状态下loan_config表数据，再插入新数据
+mysql -N $mysqld mall -e "delete from loan_config where loan_state='1' and config_key='buttonConfig'";
+mysql -N $mysqld mall -e "set names utf-8; insert into loan_config ( id, loan_state, config_key, config_value, removed, update_at) 
+values ( '12', '1', 'buttonConfig', '{\n\"isShow\": true,\n\"buttonColor\":\"464B53\",\n\"buttonTitle\":\"立即拿钱\",\n \"navUrl\":\"http://$ip:7001/app-landing?registerFrom={registerFrom}&channelId=1&token={token}&appChannel={appChannel}&appName={appName}\",\n\"typefaceColor\":\"ffffff\"\n}', '0', '$seq')";
+
+# 2.贷款审核中：先删除未登录状态下loan_config表数据，再插入新数据
+mysql -N $mysqld mall -e "delete from loan_config where loan_state='2' and config_key='buttonConfig'";
+mysql -N $mysqld mall -e "set names utf-8; insert into loan_config ( id, loan_state, config_key, config_value, removed, update_at) 
+values ( '19', '2', 'buttonConfig', '{\n\"isShow\":true,\n\"buttonColor\":\"464B53\",\n\"buttonTitle\":\"去提额\",\n \"navUrl\":\"http://$ip:7001/app-landing?registerFrom={registerFrom}&channelId=1&token={token}&appChannel={appChannel}&appName={appName}\",\n\"typefaceColor\":\"ffffff\"\n}', '0', '$seq')";
+
+# 3.审核通过：先删除未登录状态下loan_config表数据，再插入新数据
+mysql -N $mysqld mall -e "delete from loan_config where loan_state='3' and config_key='buttonConfig'";
+mysql -N $mysqld mall -e "set names utf-8; insert into loan_config ( id, loan_state, config_key, config_value, removed, update_at) 
+values ( '27', '3', 'buttonConfig', '{\n\"isShow\":true,\n\"buttonColor\":\"464B53\",\n\"buttonTitle\":\"立即提现\",\n \"navUrl\":\"http://$ip:7001/app-landing?registerFrom={registerFrom}&channelId=1&token={token}&appChannel={appChannel}&appName={appName}\",\n\"typefaceColor\":\"ffffff\"\n}', '0', '$seq')";
+
+# 4.放款中：先删除未登录状态下loan_config表数据，再插入新数据
+mysql -N $mysqld mall -e "delete from loan_config where loan_state='4' and config_key='buttonConfig'";
+mysql -N $mysqld mall -e "set names utf-8; insert into loan_config ( id, loan_state, config_key, config_value, removed, update_at) 
+values ( '36', '4', 'buttonConfig', '{\n\"isShow\":true,\n\"buttonColor\":\"464B53\",\n\"buttonTitle\":\"一键催款\",\n \"navUrl\":\"http://$ip:7001/app-landing?registerFrom={registerFrom}&channelId=1&token={token}&appChannel={appChannel}&appName={appName}\",\n\"typefaceColor\":\"ffffff\"\n}', '0', '$seq')";
+
+# 5.放款失败：先删除未登录状态下loan_config表数据，再插入新数据
+mysql -N $mysqld mall -e "delete from loan_config where loan_state='5' and config_key='buttonConfig'";
+mysql -N $mysqld mall -e "set names utf-8; insert into loan_config ( id, loan_state, config_key, config_value, removed, update_at) 
+values ( '46', '5', 'buttonConfig', '{\n\"isShow\":true,\n\"buttonColor\":\"464B53\",\n\"buttonTitle\":\"立即申请\",\n \"navUrl\":\"http://$ip:7001/app-landing?registerFrom={registerFrom}&channelId=1&token={token}&appChannel={appChannel}&appName={appName}\",\n\"typefaceColor\":\"ffffff\"\n}', '0', '$seq')";
+
+# 6.还款中：先删除未登录状态下loan_config表数据，再插入新数据
+mysql -N $mysqld mall -e "delete from loan_config where loan_state='6' and config_key='buttonConfig'";
+mysql -N $mysqld mall -e "set names utf-8; insert into loan_config ( id, loan_state, config_key, config_value, removed, update_at) 
+values ( '54', '6', 'buttonConfig', '{\n\"isShow\":true,\n\"buttonColor\":\"464B53\",\n\"buttonTitle\":\"去还款\",\n \"navUrl\":\"http://$ip:7001/app-landing?registerFrom={registerFrom}&channelId=1&token={token}&appChannel={appChannel}&appName={appName}\",\n\"typefaceColor\":\"ffffff\"\n}', '0', '$seq')";
+
+# 7.审核拒绝：先删除未登录状态下loan_config表数据，再插入新数据
+mysql -N $mysqld mall -e "delete from loan_config where loan_state='7' and config_key='buttonConfig'";
+mysql -N $mysqld mall -e "set names utf-8; insert into loan_config ( id, loan_state, config_key, config_value, removed, update_at) 
+values ( '65', '7', 'buttonConfig', '{\n\"isShow\":true,\n\"buttonColor\":\"464B53\",\n\"buttonTitle\":\"去借款\",\n \"navUrl\":\"http://$ip:7001/app-landing?registerFrom={registerFrom}&channelId=1&token={token}&appChannel={appChannel}&appName={appName}\",\n\"typefaceColor\":\"ffffff\"\n}', '0', '$seq')";
+
+redis-cli -p 6379 flushall
+
+echo "mall库的loan_config表，按钮配置更新完成"
+
+

qa_shell_script/script_by_Contorller/mall_makeMallOrder.sh

@@ -24,7 +24,7 @@ supplierAmount=`expr $amount - $difference`
 seq=`date "+%Y-%m-%d %H:%M:%S"`
 
 mysql -h"$ip" -p"3306" -u"qa" -p"qatest" <<EOF
-use mall;
+use mall set names utf-8;
 
 insert into mall.mall_order
 (order_id, user_id, order_state, is_active, product_id,  pay_approach,  pay_amount, created_at, updated_at)
@@ -41,7 +41,7 @@ values
 '北京市','海淀区','三环以内','丹棱街',205741,'61.50.0.0',1,'3845',13,
 '$seq','$seq','$seq','$seq','$seq','$amount',1.00,0.03);
 
-use merchant;
+use merchant set names utf-8;
 
 insert into merchant.supplier_order
 (order_no,mall_order_no,supplier_id,mall_order_time,order_status,created_at,updated_at, goods_name,

qa_shell_script/script_by_Contorller/redpacket_coupon.sh

@@ -2,7 +2,7 @@
 set -e
 ip=$1
 phone_no=$2
-coupon_type=$3 # 1-友宝满减券;2-商城购物满减券;3-商城购物折扣券;4-商城购物实物折扣券;5-商城购物实物满减券;6-商城购物充值折扣券;7-现金贷还款折扣券;8-现金贷还款抵扣券;9-现金贷还款免息券;10-白条购物满减券;11-外部白条满减券（深圳通）
+coupon_type=$3 # 1-友宝满减券;2-商城购物满减券;3-商城购物折扣券;4-商城购物实物折扣券;5-商城购物实物满减券;6-商城购物充值折扣券;7-现金贷还款折扣券;8-现金贷还款抵扣券;9-现金贷还款免息券;10-白条购物满减券;11-外部白条满减券（深圳通）;12-白条外部满减券【环球黑卡】；13-白条外部免息券【环球黑卡】；14-外部白条免息券【e袋洗】；15-外部白条满减券【e袋洗】；16-外部白条免息券【武汉一卡通】;17-外部白条满减券【武汉一卡通】；18-白条外部免息券【深圳通】；19-白条外部免息券【友宝】；20-白条外部免息券【新氧】；21-外部白条满减券【新氧】；22-白条外部满减券【全部渠道】；23-白条外部免息券【全部渠道】
 
 HOSTNAME="$ip"   #数据库信息
 PORT="3306"
@@ -13,7 +13,8 @@ DBNAME="redpacket"    #数据库名称
 TABLENAME="tb-coupon"
 
 date="`date +%Y%m%d%H%M%S`"
-
+date_now=`date +"%Y-%m-%d %T"`
+echo $date_now
 
 len=`echo $phone_no|awk '{print length($0)}'`
 if [ $len -ne 11 ];then
@@ -154,7 +155,167 @@ else
 	echo "深圳通白条购物券满减券增加失败！！1"
 fi
 ;;
+
+12)coupon_12="INSERT INTO redpacket.tb_coupon (unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid)
+VALUES
+	(concat('OUT_BAITIAO2017120115315499231decb56',$date), '$phone_no', 10000625, '白条外部满减券【环球黑卡】', 9, '{\"firstChannel\":6}', 1, '{\"full\":\"300\",\"cut\":\"10\"}', NOW(), '2028-01-20 00:00:00', 0, 2, NOW(), NULL, NOW(), NULL, 1002150);"
+mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_12}"
+return=$?
+if [ "$return" = "0" ];then
+        echo "白条外部满减券【环球黑卡】新增成功！！！"
+else
+        echo "白条外部满减券【环球黑卡】新增失败！！！"
+fi
+;;
+
+13)
+coupon_13="INSERT INTO redpacket.tb_coupon (unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid)
+VALUES
+	(concat('OUT_BAITIAO20171201151342841868ebe8',$date), '$phone_no', 10000626, '白条外部免息券【环球黑卡】', 9, '{\"firstChannel\":6}', 5, '{\"discount\":80,\"priceRange\":\"10-5000\",\"terms\":{\"1\":[1],\"3\":[1,2,3],\"6\":[1,2,3,4,5,6]}}', NOW(), '2029-11-01 23:59:00', 0, 2,  NOW(), NULL, NOW(), NULL, 1002150);
+"
+mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_13}"
+return=$?
+if [ "$return" = "0" ];then
+        echo "白条外部免息券【环球黑卡】新增成功！！！"
+else
+        echo "白条外部免息券【环球黑卡】新增失败！！！"
+fi
+;;
+
+14)
+coupon_14="INSERT INTO redpacket.tb_coupon (unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid)
+VALUES
+	(concat('OUT_BAITIAO201712011540111686168c8d4',$date), '$phone_no', 10000628, '外部白条免息券【e袋洗】', 9, '{\"firstChannel\":7}', 5, '{\"discount\":50,\"priceRange\":\"10-5000\",\"terms\":{\"1\":[1],\"3\":[1,2,3],\"6\":[1,2,3,4,5,6]}}', NOW(), '2019-11-01 23:59:00', 0, 2, NOW(), NULL, NOW(), NULL, 1002150);"
+mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_14}"
+return=$?
+if [ "$return" = "0" ];then
+        echo "外部白条免息券【e袋洗】新增成功！！！"
+else
+        echo "外部白条免息券【e袋洗】新增失败！！！"
+fi
+;;
+
+15)
+coupon_15="INSERT INTO redpacket.tb_coupon (unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid)
+VALUES
+	(concat('OUT_BAITIAO20171201154018003c5cdb50c',$date), '$phone_no', 10000627, '外部白条满减券【e袋洗】', 9, '{\"firstChannel\":7}', 1, '{\"full\":\"20\",\"cut\":\"10\"}', NOW(), '2029-11-01 23:59:00', 0, 2, NOW(), NULL, NOW(), NULL, 1002150);"
+mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_15}"
+return=$?
+if [ "$return" = "0" ];then
+        echo "外部白条满减券【e袋洗】新增成功！！！"
+else
+        echo "外部白条满减券【e袋洗】新增失败！！！"
+fi
+;;
+
+16)
+coupon_16="INSERT INTO redpacket.tb_coupon (unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid)
+VALUES
+	(concat('OUT_BAITIAO2017120115404289280bc0f11',$date), '$phone_no', 10000622, '外部白条免息券【武汉一卡通】', 9, '{\"firstChannel\":4}', 5, '{\"discount\":3,\"priceRange\":\"10-1000\",\"terms\":{\"1\":[1],\"3\":[1,2,3],\"6\":[1,2,3,4,5,6]}}', NOW(), '2019-11-01 23:59:00', 0, 2, NOW(), NULL, NOW(), NULL, 1002150);"
+mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_16}"
+return=$?
+if [ "$return" = "0" ];then
+        echo "外部白条免息券【武汉一卡通】新增成功！！！"
+else
+        echo "外部白条免息券【武汉一卡通】新增失败！！！"
+fi
+;;
+
+17)
+coupon_17="INSERT INTO redpacket.tb_coupon (unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid)
+VALUES
+	(concat('OUT_BAITIAO2017120115404810701a78979',$date), '$phone_no', 10000621, '外部白条满减券【武汉一卡通】', 9, '{\"firstChannel\":4}', 1, '{\"full\":500,\"cut\":50}', NOW(), '2019-11-01 23:59:00', 0, 2, NOW(), NULL, NOW(), NULL, 1002150);
+
+"
+mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_17}"
+return=$?
+if [ "$return" = "0" ];then
+        echo "外部白条满减券【武汉一卡通】新增成功！！！"
+else
+        echo "外部白条满减券【武汉一卡通】新增失败！！！"
+fi
+;;
+
+18)
+coupon_18="INSERT INTO redpacket.tb_coupon (unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid)
+VALUES
+	(concat('OUT_BAITIAO20171201154341628a620cb4',$date), '$phone_no', 10000632, '白条外部免息券【深圳通】', 9, '{\"firstChannel\":3}', 5, '{\"discount\":50,\"priceRange\":\"10-5000\",\"terms\":{\"1\":[1],\"3\":[1,2,3],\"6\":[1,2,3,4,5,6]}}', NOW(), '2019-11-01 23:59:00', 0, 3, NOW(), NULL, NOW(), NULL, 1002150);"
+mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_18}"
+return=$?
+if [ "$return" = "0" ];then  
+        echo "白条外部免息券【深圳通】新增成功！！！"
+else
+        echo "白条外部免息券【深圳通】新增失败！！！"
+fi
+;;
+
+19)
+coupon_19="INSERT INTO redpacket.tb_coupon (unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid)
+VALUES
+	(concat('OUT_BAITIAO20171201154334993355afb19',$date), '$phone_no', 10000631, '白条外部免息券【友宝】', 9, '{\"firstChannel\":2}', 5, '{\"discount\":20,\"priceRange\":\"10-1000\",\"terms\":{\"1\":[1],\"3\":[1,2,3],\"6\":[1,2,3,4,5,6]}}', NOW(), '2019-11-01 23:59:00', 0, 2, NOW(), NULL, NOW(), NULL, 1002150);"
+mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_19}"
+return=$?
+if [ "$return" = "0" ];then
+        echo "白条外部免息券【友宝】新增成功！！！"
+else
+        echo "白条外部免息券【友宝】新增失败！！！"
+fi
+;;
+
+20)
+coupon_20="INSERT INTO redpacket.tb_coupon (unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid)
+VALUES
+	(concat('OUT_BAITIAO2017120115402614693f5f8ab',$date), '$phone_no', 10000624, '白条外部免息券【新氧】', 9, '{\"firstChannel\":5}', 5, '{\"discount\":10,\"priceRange\":\"10-1000\",\"terms\":{\"1\":[1],\"3\":[1,2,3],\"6\":[1,2,3,4,5,6]}}', NOW(), '2028-01-06 00:00:00', 0, 2, NOW(), NULL, NOW(), NULL, 1002150);"
+mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_20}"
+return=$?
+if [ "$return" = "0" ];then
+        echo "白条外部免息券【新氧】新增成功！！！"
+else
+        echo "白条外部免息券【新氧】新增失败！！！"
+fi
+;;
+
+21)
+coupon_21="INSERT INTO redpacket.tb_coupon (unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid)
+VALUES
+	(concat('OUT_BAITIAO20171201154036703398cb9fe',$date), '$phone_no', 10000623, '外部白条满减券【新氧】', 9, '{\"firstChannel\":5}', 1, '{\"full\":\"100\",\"cut\":\"10\"}', NOW(), '2026-01-06 00:00:00', 0, 2, NOW(), NULL, NOW(), NULL, 1002150);"
+mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_21}"
+return=$?
+if [ "$return" = "0" ];then
+        echo "外部白条满减券【新氧】新增成功！！！"
+else
+        echo "外部白条满减券【新氧】新增失败！！！"
+fi
+;;
+
+22)
+coupon_22="INSERT INTO redpacket.tb_coupon (unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid)
+VALUES
+	(concat('OUT_BAITIAO201712011537207501ce2f54f',$date), '$phone_no', 10000630, '白条外部满减券【全部渠道】', 9, '{\"firstChannel\":1}', 1, '{\"full\":\"500\",\"cut\":\"30\"}', NOW(), '2019-11-01 23:59:00', 0, 2, NOW(), NULL, NOW(), NULL, 1002150);
+"
+mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_22}"
+return=$?
+if [ "$return" = "0" ];then
+        echo "白条外部满减券【全部渠道】新增成功！！！"
+else
+        echo "白条外部满减券【全部渠道】新增失败！！！"
+fi
+;;
+
+23)
+coupon_23="INSERT INTO redpacket.tb_coupon (unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid)
+VALUES
+	(concat('OUT_BAITIAO20171201153729670ae48cb40',$date), '$phone_no', 10000629, '白条外部免息券【全部渠道】', 9, '{\"firstChannel\":1}', 5, '{\"discount\":50,\"priceRange\":\"10-5000\",\"terms\":{\"1\":[1],\"3\":[1,2,3],\"6\":[1,2,3,4,5,6]}}', NOW(), '2019-11-01 23:59:00', 0, 3, NOW(), NULL, NOW(), NULL, 1002150);"
+mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_23}"
+return=$?
+if [ "$return" = "0" ];then
+        echo "白条外部免息券【全部渠道】新增成功！！！"
+else
+        echo "白条外部免息券【全部渠道】新增失败！！！"
+fi
+;;
+
 *)
-echo "优惠券类型请输入1~11"
+echo "优惠券类型请输入1~23"
 ;;
 esac

qa_shell_script/script_by_Contorller/spidercenter_authorization_new.sh

@@ -37,7 +37,7 @@ function authorization()
 		mysql $mysqld ${DBNAME} -e "${insert_sql00}"
 		mysql $mysqld ${DBNAME} -e "${insert_sql03}"
 		
-		curl "http://${ip}:7021/ex/quartz/notity_generate_report_new"
+		curl -s "http://${ip}:7021/ex/quartz/notity_generate_report_new"
 		
 		echo "done!!! $date"
 	fi

qa_shell_script/sub_shell.sh

@@ -24,7 +24,7 @@ ips=`cat $config_server/get_env_ip.sh`
 counts=`echo $ips | awk '{print NF}'`
 
 mkdir -p /home/sub_config_file_dont_rm
-multis=`node $config_server/get_project_config.js  -type multi -attr port`
+multis=`node $config_server/get_project_config.js  -type multi -attr port -attr2 true`
 
 trap "exec 1000>&-;exec 1000<&-;exit 0" 2
 tempfifo=$$.fifo