a

qa_shell_script/base_script/restartJava.sh

@@ -63,7 +63,7 @@ function ack()
     done
 }
 
-max_wait_log_generate_time=10
+max_wait_log_generate_time=20
 max_wait_ack_time=700
 ack_phrase="JVM\ running\ for"
 project=$1

qa_shell_script/config_server/get_project_config.js

@@ -139,7 +139,7 @@ pClass.prototype = {
 		}
 	}
 // --java
-new pClass().init(1,true,"java", "7042", "xyqb-user2", "head_group", "xyqb_user.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts", "-Dtest=true", "用户注册登录-V2-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
+new pClass().init(1,true,"java", "7042", "xyqb-user2", "head_group", "xyqb_user.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts", "-Denv=dev -Didc=default -Dtech.localhost= -Dtest=true", "用户注册登录-V2-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(1,true,"java", "7003", "xyqb", "QG", "xyqb.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", "-Denv=dev -Dtech.localhost=", "现金贷-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(1,true,"java", "7025", "baitiao", "baitiao", "baitiao.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts", " -Denv=dev -Dtech.localhost= ", "白条-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "baitiao-api/target");
 new pClass().init(1,true,"java", "7019", "xyqb-mall", "QG", "mall.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "商城后台-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
@@ -176,11 +176,11 @@ new pClass().init(2,false, "java", "7068", "customer_helpdesk", "data-riskcontro
 new pClass().init(1,false, "java", "7069", "notify", "fund_pay", "notify.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", "-Denv=dev -Dtech.localhost=", "支付中心消息通知系统-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(1,false, "java", "7071", "mall-settlement", "baitiao", "mall-settlement.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "商户结算系统", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(2,false, "java", "7072", "data-taurus", "data-riskcontrol", "data-taurus.log", "application.properties", "", " ", "质保金-server", "","mvn clean package -Ptest -Dmaven.test.skip=true","");
-new pClass().init(1,false, "java", "7074", "account-center", "QG", "account_center.log", "application.properties", "", " ", "账户中心-server", "","mvn clean package -Ptest -Dmaven.test.skip=true","");
+new pClass().init(1,false, "java", "7074", "account-center", "QG", "account_center.log", "application.properties", "", " -Denv=dev -Didc=empty -Dtech.localhost=", "账户中心-server", "","mvn clean package -Ptest -Dmaven.test.skip=true","");
 new pClass().init(1,false, "java", "7079", "user-credit", "QG", "user_credit.log", "application.properties", "", " ", "用户升级-server", "","mvn clean package -Ptest -Dmaven.test.skip=true","");
 new pClass().init(2,false, "java", "7076", "urge_dispatcher", "data-riskcontrol", "dispatcher.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "催收系统", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(1,false, "java", "7081", "wechat-config", "fund_pay", "wechat-config.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "微信消息推送系统", "",     "mvn clean package -Ptest -Dmaven.test.skip=true", "");
-new pClass().init(1,false, "java", "7082", "clotho", "funding", "clotho.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts "," ", "资金方统计相关功能", "",     "mvn clean package -Ptest -Dmaven.test.skip=true", "");
+new pClass().init(1,false, "java", "7082", "clotho", "funding", "clotho.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ","-Denv=dev -Didc=default -Dtech.localhost=", "资金方统计相关功能", "",     "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(1,false, "java", "7085", "mall-canal", "baitiao", "mall_canal.log", "application.properties", "-l 152 -w 2 &", " ", "商城订单监控", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(1,false, "java", "7087", "xyqb-display", "baitiao", "display.log", "application.properties", "&", " ", "信用钱包显示配置", "陈东亮", "mvn clean package -Ptest     -Dmaven.test.skip=true", "./display-api/target/");
 new pClass().init(1,true, "java", "7087", "user-credit-schedule", "QG", "user_credit_schedule.log", "application.properties", "", " ", "用户升级-server", "","mvn clean package     -Ptest -Dmaven.test.skip=true",    "");
@@ -229,6 +229,11 @@ new pClass().init(2,true, "ui", "7094", "cuishou_external", "data", null, "app/c
 new pClass().init(1,true, "ui", "7095", "fund-operate-ui", "ui", null, "src/config/env.config.js", "npm run qa", "node7", "资金运营系统-ui", "徐胜男", "", "");
 new pClass().init(1,false, "ui", "9050", "pinjamancepat-credit-review-ui", "ui", null, "src/config/env.config.js", "npm run qa", "", "mimi", "", "", "");
 new pClass().init(1,false, "ui", "9051", "pinjamancepat-collection-ui", "ui", null, "src/config/env.config.js", "npm run qa", "", "mimi", "", "", "");
+new pClass().init(1,true, "ui", "7097", "new-activity-ui", "ui", null, "src/app/config/env.config.js", "npm run qa", "node7", "新版活动中心-ui", "张振武", "", "");
+
+new pClass().init(1,true, "ui", "7098", "user-manage-ui", "ui", null, "src/config/env.config.js", "npm run qa", "node7", "用户管理系统ui", "李丽华", "", "");
+
+
 
 // node
 new pClass().init(1,true, "node", "7018", "app-backend", "QG", null, "config/environment/test.js", "forever start -a -s --uid AppBackend bin/www", null, "APP后台服务-server", "", "forever stop AppBackend", "");

qa_shell_script/mock/mock_yeepay.sh

@@ -81,8 +81,8 @@ command1=${run_commands[0]//\^/ }
 command2=${run_commands[1]//\^/ }
 
 if [[ $1 = "yes" ]]; then
-	echo "java -Denv=dev -Dtech.localhost= -Xmx512m -XX:PermSize64m -Xloggc:/tmp/gu-bei.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -jar ${project}.jar $command2"
-	java -Denv=dev -Dtech.localhost= -Xmx512m -XX:PermSize64m -Xloggc:/tmp/gu-bei.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -jar ${project}.jar $command2 > /dev/null 2>&1 &
+	echo "java -Denv=dev -Didc=default_mock -Dtech.localhost= -Xmx512m -XX:PermSize64m -Xloggc:/tmp/gu-bei.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -jar ${project}.jar $command2"
+	java -Denv=dev -Didc=default_mock -Dtech.localhost= -Xmx512m -XX:PermSize64m -Xloggc:/tmp/gu-bei.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -jar ${project}.jar $command2 > /dev/null 2>&1 &
 else
 	echo "java $command1 -jar ${project}.jar $command2"
 	java $command1 -jar ${project}.jar $command2 > /dev/null 2>&1 &
@@ -95,4 +95,4 @@ if [ $? -ne 0 ]
 then
     echo "Fail to start"
     exit -1
-fi
+fi
\ No newline at end of file

qa_shell_script/ngrok/docker_env_name.sh

-qa6|192.168.167.3  dongmeifeng|192.168.167.4 tower|192.168.167.5  zhiyong|192.168.167.7   tianyawei|192.168.166.28
+ dongmeifeng|192.168.167.32

qa_shell_script/script_by_Contorller/baitiao_order.sh

+#!/bin/bash
+ip=$1
+phone_no=$2
+bill_num=3
+bill_num_a=0
+PORT="3306"
+USERNAME="qa"
+PASSWORD="qatest"
+mysqld="-h${ip} -P${PORT} -u${USERNAME} -p${PASSWORD}"
+date_now=`date "+%Y-%m-%d %H:%M:%S"`
+
+ function baitiao_order()
+  {
+  		len=`echo $phone_no|awk '{print length($0)}'`
+  		if [ $len -ne 11 ] ; then
+  				echo "请输入11位手机号 ！"
+  		else 
+
+
+
+                       #生成订单
+                       
+                      #白条订单表增加数据
+
+                       select_user_id="SELECT id  from user where user.phone_no=${phone_no}"
+                       xyqb_user_id=`mysql -N $mysqld xyqb_user -e "set names utf8;${select_user_id}"`
+                     #  echo $select_user_id
+
+                       order_no='xyqb'${phone_no}
+                       order="INSERT INTO baitiao_order( "user_id", "merchant_id", "order_no", "order_name", "order_amount", "repay_term", "status", "created_at", "updated_at", "baitiao_order_type") VALUES (${xyqb_user_id}, 7, '${order_no}', '信用钱包订单', 2499.000000, 1,1, '$date_now', '$date_now', 0)"
+                       mysql  $mysqld xyqb -e "set names utf8;${order}"
+                      # echo " order=$order"
+
+
+                       select_order_id="SELECT id  from baitiao_order where user_id=${xyqb_user_id}"
+                       baitiao_order_id=`mysql -N $mysqld xyqb -e "set names utf8;${select_order_id}"`
+                       #echo "select_order_id=$select_order_id"
+                      # echo "baitiao_order_id=$baitiao_order_id"
+                       insert_fund="INSERT INTO baitiao_fund_order ( "order_id", "status", "rate", "refund_status", "start_interest_date", "fund_id", "finance_record_id", "created_at", "updated_at") VALUES ( $baitiao_order_id, 0, 0.060200, 0, NULL, '3', NULL, '$date_now', '$date_now')"
+                      # echo "insert_fund=$insert_fund"
+                        mysql  $mysqld xyqb -e "set names utf8;${insert_fund}"
+                       #白条还款计划表增加数据
+                       repayment_plan1="INSERT INTO baitiao_bill_repayment_plan ("bill_id", "user_id", "user_phone", "order_id", "order_no", "order_name", "order_time", "merchant_id", "order_amount", "deadline", "term_no", "contract_term", "rate", "principal", "interest", "penalty_interest", "red_packet_amount", "collection_reduction", "repay_amount", "repay_amount_compute_time", "lock_time", "repaid_at", "repayment_received_at", "repayment_status", "pay_center_order_no", "enable", "created_at", "updated_at") VALUES (NULL, ${xyqb_user_id}, '${phone_no}', ${baitiao_order_id},'信用钱包订单', '手机', '$date_now', 7, 2499.000000, '2018-01-20 23:59:59', 1, 3, 0.030000, 833.000000, 74.970000, 0.000000, 0.000000, 0.000000, 907.970000, '$date_now', NULL, '$date_now', NULL, '0', NULL, 1, '$date_now', '$date_now')"
+                       mysql  $mysqld xyqb -e "set names utf8;${repayment_plan1}"
+                     # echo "plan1=$repayment_plan1"
+                                                           
+
+                       repayment_plan2="INSERT INTO baitiao_bill_repayment_plan ("bill_id", "user_id", "user_phone", "order_id", "order_no", "order_name", "order_time", "merchant_id", "order_amount", "deadline", "term_no", "contract_term", "rate", "principal", "interest", "penalty_interest", "red_packet_amount", "collection_reduction", "repay_amount", "repay_amount_compute_time", "lock_time", "repaid_at", "repayment_received_at", "repayment_status", "pay_center_order_no", "enable", "created_at", "updated_at") VALUES (NULL, ${xyqb_user_id}, '${phone_no}', ${baitiao_order_id}, '信用钱包订单', '手机','$date_now', 7, 2499.000000, '2018-02-20 23:59:59', 2, 3, 0.030000, 833.000000, 74.970000, 0.000000, 0.000000, 0.000000, 907.970000, '$date_now', NULL, '$date_now',NULL, '0', NULL, 1,'$date_now', '$date_now')"
+
+                       mysql  $mysqld xyqb -e "set names utf8;${repayment_plan2}"
+                      #echo "plan2=$repayment_plan2"
+                       repayment_plan3="INSERT INTO baitiao_bill_repayment_plan ("bill_id", "user_id", "user_phone", "order_id", "order_no", "order_name", "order_time", "merchant_id", "order_amount", "deadline", "term_no", "contract_term", "rate", "principal", "interest", "penalty_interest", "red_packet_amount", "collection_reduction", "repay_amount", "repay_amount_compute_time", "lock_time", "repaid_at", "repayment_received_at", "repayment_status", "pay_center_order_no", "enable", "created_at", "updated_at") VALUES (NULL, ${xyqb_user_id}, ${phone_no}, ${baitiao_order_id}, '信用钱包订单', '手机', '$date_now', 7, '2499.000000', '2018-03-20 23:59:59', '3', '3', '0.030000', '833.000000', '74.970000', '0.000000', '0.000000', '0.000000', '907.970000', '$date_now', NULL,'$date_now', NULL, '0', NULL, '1', '$date_now','$date_now')"
+                       mysql  $mysqld xyqb -e "set names utf8;${repayment_plan3}"
+
+                       #echo "plan3=$repayment_plan3"
+                       #白条额度表变化表增加数据
+
+                       consume_seq1='ABCD201708051511458'${phone_no}
+
+                       consume="INSERT INTO baitiao_consume_history("user_id", "order_id", "order_amount", "remaining_amount", "consume_type", "consume_seq", "created_at", "updated_at") VALUES(${xyqb_user_id}, ${baitiao_order_id}, '2499.00', '13501.00', '1', '${consume_seq1}', '$date_now','$date_now')"
+           #            echo "consume=$consume"
+                       mysql  $mysqld xyqb -e "set names utf8;${consume}"
+          fi
+}
+ baitiao_order $ip $phone_no