Merge branch 'master' of http://gitabc.xyqb.com/QA/qa-deploy-utils

qa_shell_script/script_by_Contorller/delete_All_Data.sh

@@ -47,7 +47,7 @@ function deleteAlldata()
                 	mysql  $mysqld ${DBNAME2} -e "delete from pay_center_bank_card where phone_no=$phone_no"
                 	mysql  $mysqld ${DBNAME2} -e "delete from pay_center_biao_tiao_bank_card where phone_no=$phone_no"
                 	mysql  $mysqld ${DBNAME2} -e "delete from repayment_plan where user_id=$xyqb_user_id"
-			if [ -n $loan_id ];then
+			if [ -n "$loan_id" ];then
                 		mysql  $mysqld ${DBNAME2} -e "delete from loan_demand_history where loan_application_history_id in ($loan_id)"
                 		mysql  $mysqld ${DBNAME2} -e "delete from loan_submit_info where loan_id in ($loan_id)"
                 		mysql  $mysqld ${DBNAME2} -e "delete from user_authorization_history where loan_application_history_id in ($loan_id)"
@@ -102,8 +102,21 @@ function deleteAlldata()
 		mysql  $mysqld risk_control -e "delete from review_history where phone_no=$phone_no"
 
 		echo "删除redis缓存"
-		redis-cli -h $ip -p 6379 keys *$phone_no* | xargs redis-cli -h $ip -p 6379 del
-		redis-cli -h $ip -p 6379 keys *$xyqb_user_id* | xargs redis-cli -h $ip -p 6379 del
+		redis_key=`redis-cli -h $ip -p 6379 keys *$phone_no*`
+		if [ -n "$redis_key" ];then
+			echo $redis_key
+			redis-cli -h $ip -p 6379 del $redis_key
+		fi
+		redis_key=`redis-cli -h $ip -p 6379 keys *$xyqb_user_id*`
+		if [ -n "$redis_key" ];then
+			echo $redis_key
+			token=`redis-cli -h $ip -p 6379 get userid-sessionvalue:cache::$xyqb_user_id:xyqb`
+			redis-cli -h $ip -p 6379 del $redis_key
+			redis_key=`redis-cli -h $ip -p 6379 keys *$token*`
+			echo $redis_key
+			redis-cli -h $ip -p 6379 del $redis_key
+			#redis-cli -h $ip -p 6379 keys *$token* | xargs redis-cli -h $ip -p 6379 del
+		fi
         fi
 }
  

qa_shell_script/script_by_Contorller/pushloanprogress.sh

@@ -38,30 +38,37 @@ function pushloanprogress(){
 			#终审中
 			if [ $progress_id -eq 7 ]; then
 				curl -d "loanId=${loan_id}&loanProgress=FINAL_SCREENING" "http://${ip}:7037/test/loanMq/one"
+				echo "推送成功"
 
 			#终审拒绝
 			elif [ $progress_id -eq 8 ]; then
 				curl -d "loanId=${loan_id}&loanProgress=FINAL_SCREENING_REJECT" "http://${ip}:7037/test/loanMq/one"
+				echo "推送成功"
 
 			#未通过初筛
 			elif [ $progress_id -eq 19 ]; then
 				curl -d "loanId=${loan_id}&loanProgress=FILTERING_DECLINED" "http://${ip}:7037/test/loanMq/one"
+				echo "推送成功"
 
 			#借款清单生成完成
 			elif [ $progress_id -eq 9 ]; then
 				curl -d "loanId=${loan_id}&loanProgress=LOAN_APPLICATION_MANIFEST_COMPLETE" "http://${ip}:7037/test/loanMq/one"
+				echo "推送成功"
 
 			#等待资金方放款
 			elif [ $progress_id -eq 20 ]; then
 				curl -d "loanId=${loan_id}&loanProgress=WAITING_FUND" "http://${ip}:7037/test/loanMq/one"
+				echo "推送成功"
 
 			#查看还款计划
 			elif [ $progress_id -eq 15 ]; then
 				curl -d "loanId=${loan_id}&loanProgress=CHECK_REPAYMENT_PLAN" "http://${ip}:7037/test/loanMq/one"
+				echo "推送成功"
 
 			#马上金融放款失败
 			elif [ $progress_id -eq 23 ]; then
 				curl -d "loanId=${loan_id}&loanProgress=FINAL_FUNDED_APPROVAL_FAIL" "http://${ip}:7037/test/loanMq/one"
+				echo "推送成功"
 
 			#借款完成
 			elif [ $progress_id -eq 16 ]; then
@@ -69,8 +76,7 @@ function pushloanprogress(){
 			else
 				echo "progress=$progress_id,订单状态不对"
 			fi
-			echo "修改成功"
-
+			
 			break
         fi