Merge branch 'master' of http://git.quantgroup.cn/QA/qa-deploy-utils

qa_shell_script/app/XyqbAndroidBuild.sh

@@ -122,8 +122,8 @@ function upload_toLocalAppStore()
     echo "apk正在本地appstore，请等待......"
     #cd ${StroeApk_path}
     echo "当前上传apk包的路径是 `pwd`"
-    echo "curl -F \"file=@${git_branch}_${product_flavors}_${build_time}.apk\" -F \"type=${apk_type}\" -F \"version=${apk_version}\" http://172.30.199.2:9000/android/upload"
-    curl -F "file=@${git_branch}_${product_flavors}_${build_time}.apk" -F "type=${apk_type}" -F "version=${apk_version}" http://172.30.199.2:9000/android/upload
+    echo "curl -F \"file=@${git_branch}_${product_flavors}_${build_time}.apk\" -F \"type=${apk_type}\" -F \"version=${apk_version}\" http://store.xrtai/android/upload"
+    curl -F "file=@${git_branch}_${product_flavors}_${build_time}.apk" -F "type=${apk_type}" -F "version=${apk_version}" http://store.xrtai/android/upload
     if [ $? != 0 ]; then
         echo "上传 stpre.q-gp.com 失败，请联系管理员查看"
     fi

qa_shell_script/config_server/get_project_config.js

@@ -177,7 +177,7 @@ new pClass().init(1,false, "java", "7052", "xyqb-btzt", "qg-op-backend", "xyqb-b
 new pClass().init(1,false, "java", "7053", "xyqb-btzt-internal", "qg-op-backend", "xyqb-btzt-internal.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "白条直投内部", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(1,false, "java", "7060", "baitiao-op-backend", "baitiao", "baitiao-op-backend.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "运营系统服务", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "xyqb-backend/target");
 new pClass().init(1,true, "java", "7062", "xyqb-user2-query", "head_group", "xyqb-user2-query.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts  -Dtest=true ", " ", "用户系统查询服务", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
-new pClass().init(2,false, "java", "7063", "qg-op-backend", "traffic.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "流量分发系统", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
+new pClass().init(2,false, "java", "7063", "traffic-webapp", "qg-op-backend", "traffic.log","application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "流量分发系统", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(1,false, "java", "7017", "silk-road-eureka", "baitiao", "silk-road-eureka.log", "application.properties", "-Denv=dev --worker 1 --currentWorker 1 -t -ts ", "-DLOG_HOME=/home/quant_group/logs ", "通用注册发现服务", "魏巍", "mvn clean package -U -Dmaven.test.skip=true", "");
 new pClass().init(1,false, "java", "7027", "silk-road-caller", "baitiao", "silk-road-caller.log", "application.properties", "-Denv=dev --worker 1 --currentWorker 1 -t -ts ", " -DLOG_HOME=/home/quant_group/logs ", "通用消息调用服务", "魏巍", "mvn clean package -U -Dmaven.test.skip=true", "");
 new pClass().init(1,false, "java", "7056", "score", "baitiao", "score.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "积分系统", "刑志超", "mvn clean package -Ptest -Dmaven.test.skip=true", "");

qa_shell_script/cron/4.2_daily_backup_db.sh

+sh /home/qa-deploy-utils/db-utils/daily_db_backup.sh "192.168.4.39" "xyqb_query" "default" "" "qa" "qatest" all
\ No newline at end of file

qa_shell_script/cron/4.2_rm_db_backup_file.sh

+find /home/db_sync_configs/* -ctime 0.3 -exec rm -rf {} \;
+find /home/db_backups/* -ctime 0.3 -exec rm -rf {} \;
\ No newline at end of file

qa_shell_script/exception_sub_shell.sh

@@ -136,7 +136,7 @@ tranceConfig java "wx89894cd83d117b26" "wxd019cd24f6edae9f" "192.168.4.22" "xyqb
 tranceConfig java "11fb7f6a8b8edf2776a72c2f5624229c" "79f4e915dd37690b17c2f8fd6e6023ad" "192.168.4.22" "xyqb-user2.properties"
 tranceConfig ui "wx89894cd83d117b26" "wxd019cd24f6edae9f" "192.168.4.22" "new-xyqb-user-ui.js"
 tranceConfig ui "11fb7f6a8b8edf2776a72c2f5624229c" "79f4e915dd37690b17c2f8fd6e6023ad" "192.168.4.22" "new-xyqb-user-ui.js"
-tranceConfig ui "wx89894cd83d117b26" "wx5b2e77c58fdcf1a5" "192.168.4.22" "activity-ui.js" 
+tranceConfig ui "wx89894cd83d117b26" "wx5b2e77c58fdcf1a5" "192.168.4.22" "new-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"
 

qa_shell_script/ngrok/docker_env_name.sh

-dongmeifeng|192.168.4.78|32093|32093 tower|192.168.4.78|30886|30084 zhanghong|192.168.4.77|31826|32324 wangzhen|192.168.4.77|31809|30100 zhangbo|192.168.4.77|31091|32056 	wangfei|192.168.4.18|32589|32182 renmingxing|192.168.4.78|30169|32509 tianyawei|192.168.4.77|32718|32701 daidekun|192.168.4.77|30082|30359
+dongmeifeng|192.168.4.78|32093|32093 tower|192.168.4.78|30886|30084 zhanghong|192.168.4.77|31826|32324 wangzhen|192.168.4.77|31809|30100 zhangbo|192.168.4.77|31091|32056 	wangfei|192.168.4.18|32589|32182 renmingxing|192.168.4.78|30169|32509 tianyawei|192.168.4.77|32718|32701 hemengying|192.168.4.32|30067|30660 songruili|192.168.4.18|32355|30265

qa_shell_script/ngrok/make_frp_ini_V2.sh

@@ -73,7 +73,7 @@ function createNginxHttpAndSSLConf()
 # addFrpcSub uanguang http 192.168.4 124 80 uanguang $filename
 # createNginxHttpAndSSLConf store 192.168.4.27 9000 $nginxname/store.conf
 
-createNginxHttpAndSSLConf h5 h5 192.168.4.24 7051 7051 $nginxname/base.conf
+createNginxHttpAndSSLConf h5 h5 192.168.4.25 7051 7051 $nginxname/base.conf
 createNginxHttpAndSSLConf mock mock 192.168.4.27 80 80 $nginxname/base.conf
 createNginxHttpAndSSLConf atm atm 192.168.4.18 3000 3000 $nginxname/base.conf
 createNginxHttpAndSSLConf auth-center auth-center-38 192.168.4.193 8099 8099 $nginxname/base.conf
@@ -85,6 +85,7 @@ createNginxHttpAndSSLConf qg1 qg1-21 192.168.4.21 9019 9019 $nginxname/base.conf
 createNginxHttpAndSSLConf uanguang uanguang 192.168.4.124 80 80 $nginxname/base.conf
 createNginxHttpAndSSLConf store store 192.168.4.27 9000 9000 $nginxname/base.conf
 createNginxHttpAndSSLConf gongyucheng gongyucheng 192.168.4.254 80 80 $nginxname/base.conf
+createNginxHttpAndSSLConf jen jen 192.168.4.2 8080 8080 $nginxname/base.conf
 
 for ip_last in ${ips[@]}
 do

qa_shell_script/script_by_Contorller/2_diting_huoquzijinfangshenhe.sh

@@ -17,7 +17,7 @@ fi
 
 date=`date "+%Y-%m-%d %H:%M:%S"`
 
-mysql -h"$ip" -P${PORT} -u${USERNAME} -p${PASSWORD} <<EOF
+mysql -h"$ip" -P"${PORT}" -u${USERNAME} -p${PASSWORD} <<EOF
 use xyqb;
 update xyqb.loan_application_history
 set xyqb.loan_application_history.progress=9
@@ -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, 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);
+VALUES (1, 111112222233333, 1, 32, 0, $fund_id, N'测试资金方', 2000.00, 3, 50.00, 0.00, 0.011675, 2490.94, 830.31, 2000.00, 0.140100, 680.31, 2040.94, 40.94, '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);
@@ -37,6 +37,8 @@ set user_id=(select id from xyqb_user.user where phone_no =$phone_no),
 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),
 loan_received_at='$date',
 product_id=(select distinct(product_id) from risk_control.product_strategy_dispatcher where funding_corp_id=$fund_id),
+monthly_interest_rate=(select monthly_interest_rate from xyqb.funding_corp where id=$fund_id),
+annual_interest_rate=(select monthly_interest_rate from xyqb.funding_corp where id=$fund_id)*12,
 loan_paid_at='$date' 
 where loan_application_history_id =111112222233333;