hhh

qa_shell_script/config_server/get_project_config.js

@@ -151,9 +151,9 @@ process.argv.forEach(function(val, index, array) {
 function getListAttr(projects, attr) {
 	var list = [];
 	for (var i = 0; i < projects.length; i++) {
-		if (projects[i].is_active) {
+//		if (projects[i].is_active) {
 			list.push(projects[i][attr])
-		}
+//		}
 	}
 	return list.join(" ");
 }

qa_shell_script/exception_sub_shell.sh

@@ -51,7 +51,7 @@ tranceConfig java "baitiao_redpacket_notify_url=http:\/\/192.168.4.12:7031\/redp
 # 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:\/\/192.168.4.241\/" "192.168.4.12" "gu-bei.properties"
 
 #4.13
 #tranceConfig java "pay.debug=0" "pay.debug=1" "192.168.4.13" "xyqb-mall.properties"
@@ -124,7 +124,7 @@ tranceConfig java "xyqb.is.debug=0" "xyqb.is.debug=1" "192.168.4.23" "baitiao.pr
 #tranceConfig java "sms.is.debug=1" "sms.is.debug=0" "192.168.4.24" "di-ting.properties"
 #tranceConfig java "xyqb.is.debug=1" "xyqb.is.debug=0" "192.168.4.24" "xyqb.properties"
 tranceConfig node "112233445512345.ittun.com" "activity-op-24.ss.xyqb.loan" "192.168.4.24" "activity-op.js"
-tranceConfig java "192.168.4.24:7058" "wechattest2.xyqb.com" "192.168.4.24" "xyqb.properties"
+#tranceConfig java "192.168.4.24:7058" "wechattest2.xyqb.com" "192.168.4.24" "xyqb.properties"
 #微信环境修改，请勿删除，可以注释
 tranceConfig java "wx89894cd83d117b26" "wx9d259d369c88bf31" "192.168.4.24" "xyqb-user2.properties"
 tranceConfig java "11fb7f6a8b8edf2776a72c2f5624229c" "2c1603ace1d6e7ae1f0c376cf7bcd72e" "192.168.4.24" "xyqb-user2.properties"
@@ -132,12 +132,17 @@ tranceConfig ui "wx89894cd83d117b26" "wx9d259d369c88bf31" "192.168.4.24" "xyqb-u
 tranceConfig ui "11fb7f6a8b8edf2776a72c2f5624229c" "2c1603ace1d6e7ae1f0c376cf7bcd72e" "192.168.4.24" "xyqb-user-ui.js"
 tranceConfig ui "wx89894cd83d117b26" "wx9d259d369c88bf31" "192.168.4.24" "activity-ui.js"
 
+#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"
+
 #4.72
 #tranceConfig java "sms.is.debug=1" "sms.is.debug=0" "192.168.4.24" "di-ting.properties"
 #tranceConfig java "xyqb.is.debug=1" "xyqb.is.debug=0" "192.168.4.24" "xyqb.properties"
 #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 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"
 
 #4.151
 tranceConfig java "xyqb.is.debug=0" "xyqb.is.debug=1" "192.168.4.151" "xyqb.properties"

qa_shell_script/script_by_Contorller/1_diting_tijiaozijinfangshenhe.sh

@@ -2,7 +2,11 @@
 ip=$1
 phone_no=$2
 date=`date "+%Y-%m-%d %H:%M:%S"`
-
+len=`echo $phone_no|awk '{print length($0)}'`
+if [ $len -ne 11 ];then
+	echo "请输入11位手机号!"
+	exit -1
+fi
 mysql -h"$ip" -p"3306" -u"qa" -p"qatest" <<EOF
 update xyqb.loan_application_history
 set xyqb.loan_application_history.progress=40 

qa_shell_script/script_by_Contorller/2_diting_huoquzijinfangshenhe.sh

@@ -5,6 +5,12 @@ fund_id=$3
 PORT="3306"
 USERNAME="qa"
 PASSWORD="qatest"
+len=`echo $phone_no|awk '{print length($0)}'`
+if [ $len -ne 11 ];then
+	echo "请输入11位手机号!"
+	exit -1
+fi
+
 if [ -z $fund_id ];then
         fund_id=140
 fi

qa_shell_script/script_by_Contorller/3_diting_zhitoudakuan.sh

@@ -3,6 +3,12 @@ ip=$1
 phone_no=$2
 date=`date "+%Y-%m-%d %H:%M:%S"`
 
+len=`echo $phone_no|awk '{print length($0)}'`
+if [ $len -ne 11 ];then
+	echo "请输入11位手机号!"
+	exit -1
+fi
+
 mysql -h"$ip" -p"3306" -u"qa" -p"qatest" <<EOF
 use xyqb;
 update xyqb.loan_application_history

qa_shell_script/script_by_Contorller/4_diting_fangkuanjieguo.sh

@@ -2,6 +2,12 @@
 ip=$1
 phone_no=$2
 
+len=`echo $phone_no|awk '{print length($0)}'`
+if [ $len -ne 11 ];then
+	echo "请输入11位手机号!"
+	exit -1
+fi
+
 #把资金方放款时间更新为昨天，便于测试
 date=`date -d yesterday  "+%Y-%m-%d %H:%M:%S"`
 

qa_shell_script/script_by_Contorller/landing_url.sh

@@ -2,11 +2,13 @@
 ip=$1
 phone_no=$2
 registerFrom=$3
+date=`date "+%Y-%m-%d %H:%M:%S"`
 
 #"请输入用户手机号:" phone_no
 len=`echo $phone_no|awk '{print length($0)}'`
 if [ $len -ne 11 ];then
 	echo "请输入11位手机号!"
+	exit -1
 fi
 
 if [ -z "$registerFrom" ];then
@@ -15,6 +17,11 @@ fi
 
 #ip=`/sbin/ifconfig -a|grep inet|grep -v 127.0.0.1|grep -v inet6|awk '{print $2}'|tr -d "addr:"`
 resp=`curl "http://$ip:7037/app/login?registerFrom=$registerFrom&phoneNo=$phone_no" 2>/dev/null`
-token=`echo $resp | jq ".data.token" | sed "s/\"//g"`
-echo "token: $token"
-echo "http://$ip:7001/app-landing?token=$token&registerFrom=$registerFrom&channelId=1"
+result=$(echo $resp | grep "成功")
+if [ -n "$result" ];then
+	token=`echo $resp | jq ".data.token" | sed "s/\"//g"`
+	#echo "token: $token"
+	echo "$date http://$ip:7001/app-landing?token=$token&registerFrom=$registerFrom&channelId=1"
+else
+	echo "获取token失败，请检查$ip的cash-loan-flow"
+fi

qa_shell_script/script_by_Contorller/paycenter_delete_bankcard_xjd.sh

@@ -2,7 +2,11 @@
 ip=$1
 card_no=$2
 
-#"请输入要删除的银行卡号或者该银行卡绑卡的手机号:" card_no 
+len=`echo $phone_no|awk '{print length($0)}'`
+if [ $len -ne 11 ];then
+	echo "请输入11位手机号!"
+	exit -1
+fi
 
 mysql -h"$ip" -p"3306" -u"qa" -p"qatest" <<EOF
 delete from payment_center.bank_card where card_no=$card_no;

qa_shell_script/script_by_Contorller/paycenter_insert_bankcard_xjd.sh

 #!/bin/bash
 ip=$1
 phone_no=$2
+len=`echo $phone_no|awk '{print length($0)}'`
+if [ $len -ne 11 ];then
+	echo "请输入11位手机号!"
+	exit -1
+fi
+
 card_no=622700000`date +%s`
 echo $card_no
 card_last=`echo ${card_no:(-4):4}`

qa_shell_script/script_by_Contorller/pushloanprogress.sh

@@ -23,12 +23,12 @@ function pushloanprogress(){
 			echo "user_id=$user_id"
 
 			#查找loanid
-			loanid="select id from ${TABLENAME} where user_id=${user_id}"
+			loanid="select id from ${TABLENAME} where user_id=${user_id} and is_active = 1"
 			loan_id=`mysql -N $mysqld ${DBNAME} -e "${loanid}"`
 			echo "loan_id=$loan_id"
 
 			#查询订单状态
-			progressid="select progress from ${TABLENAME} where user_id=${user_id}"
+			progressid="select progress from ${TABLENAME} where user_id=${user_id} and is_active = 1"
 			progress_id=`mysql -N $mysqld ${DBNAME} -e "${progressid}"`
 			#echo "progress=$progress_id"
 
@@ -82,4 +82,4 @@ function pushloanprogress(){
 
 }
 
-pushloanprogress $ip $phone_no
+pushloanprogress $ip $phone_no
\ No newline at end of file

qa_shell_script/script_by_Contorller/redpacket_insert_coupon_xjd.sh

@@ -2,6 +2,12 @@
 ip=$1
 phone_no=$2
 account=$3
+len=`echo $phone_no|awk '{print length($0)}'`
+if [ $len -ne 11 ];then
+	echo "请输入11位手机号!"
+	exit -1
+fi
+
 if [ -z $account ];then
         account=100
 fi

qa_shell_script/script_by_Contorller/user_delete_contact.sh

@@ -3,6 +3,12 @@ ip=$1
 phone_no=$2
 mysqld="-h$ip -p3306 -uqa -pqatest"
 
+len=`echo $phone_no|awk '{print length($0)}'`
+if [ $len -ne 11 ];then
+	echo "请输入11位手机号!"
+	exit -1
+fi
+
 user_id=`mysql -N $mysqld xyqb_user -e "select id from user where phone_no=$phone_no"`
 echo "user.id:"$user_id
 mysql -N $mysqld xyqb_user -e "delete from contact where user_id=$user_id"

qa_shell_script/special_env_make/wechat_make.sh

@@ -5,6 +5,13 @@ dev_secury=$3
 user_url=$4
 pay_url=$5
 base_path=/home/sub_config_file_dont_rm
+echo "
+evn_ip:$evn_ip
+dev_appid:$dev_appid
+dev_secury:$dev_secury
+user_url:$user_url
+pay_url:$pay_url
+"
 function tranceConfig()
 {       
         type_=$1