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

# Conflicts:
#	qa_shell_script/config_server/get_project_config.js

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://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
+    echo "curl -F \"file=@${git_branch}_${product_flavors}_${build_time}.apk\" -F \"type=${apk_type}\" -F \"version=${apk_version}\" http://172.30.220.22:9000/android/upload"
+    curl -F "file=@${git_branch}_${product_flavors}_${build_time}.apk" -F "type=${apk_type}" -F "version=${apk_version}" http://172.30.220.22:9000/android/upload
     if [ $? != 0 ]; then
         echo "上传 stpre.q-gp.com 失败，请联系管理员查看"
     fi

qa_shell_script/config_server/get_project_config.js

@@ -11,7 +11,8 @@ var param = {
 var hosts = {
   "activity-op": "actapi.xyqb.com",
   "activity-op-ui": "activity-op.xyqb.com",
-  "activity-ui": "activity.xyqb.com",
+  //"activity-ui": "activity.xyqb.com",
+	"new-activity-ui":"activity.xyqb.com",
   "xyqb": "api.xyqb.com",
   "han-gu-guan": "auth.xyqb.com",
   "xyqb-ui": "m.xyqb.com",

qa_shell_script/script_by_Contorller/closeloan.sh

@@ -24,7 +24,7 @@ function closeloan()
 		echo "user_id=$user_id"
 
 		#更新loan_application_history表中的is_active=0
-		update_sql="update ${TABLENAME} set is_active=0 where user_id=${user_id} and is_active=1 and business_type=0"
+		update_sql="update ${TABLENAME} set is_active=0,progress=16 where user_id=${user_id} and is_active=1 and business_type=0"
 		mysql $mysqld ${DBNAME} -e "${update_sql}"
 		echo "done!!! $date"
 		break

qa_shell_script/script_by_Contorller/pushloanprogress.sh

@@ -31,12 +31,12 @@ function pushloanprogress(){
 			#cho "user_id=$user_id"
 
 			#查找loanid
-			loanid="select id from ${TABLENAME} where user_id=${user_id} and is_active = 1"
+			loanid="select id from ${TABLENAME} where user_id=${user_id} order by id desc limit 1"
 			loan_id=`mysql -N $mysqld ${DBNAME} -e "${loanid}"`
-			#cho "loan_id=$loan_id"
+			#echo "loan_id=$loan_id"
 
 			#查询订单状态
-			progressid="select progress from ${TABLENAME} where user_id=${user_id} and is_active = 1"
+			progressid="select progress from ${TABLENAME} where user_id=${user_id} order by id desc limit 1"
 			progress_id=`mysql -N $mysqld ${DBNAME} -e "${progressid}"`
 			echo "progress=$progress_id"
 

qa_shell_script/script_by_Contorller/pushloanprogress_dock.sh

-#!/bin/bash
-ip=$1
-phone_no=$2
-PORT=$3
-USERNAME="qa"
-PASSWORD="qatest"
-DBNAME="xyqb"
-TABLENAME="loan_application_history"
-DBNAME1="xyqb_user"
-TABLENAME1="user"
-mysqld="-h${ip} -P${PORT} -u${USERNAME} -p${PASSWORD}"
-date=`date "+%Y-%m-%d %H:%M:%S"`
-
-function pushloanprogress(){
-	len=`echo $phone_no|awk '{print length($0)}'`
-        if [ $len -ne 11 ]
-        	then
-                echo "请输入11位手机号!"     
-        else
-			#echo "开始修改"
-			#查询userID
-			select_sql="select id from ${TABLENAME1} where phone_no=${phone_no}"
-			user_id=`mysql -N $mysqld ${DBNAME1} -e "${select_sql}"`
-			#cho "user_id=$user_id"
-
-			#查找loanid
-			loanid="select id from ${TABLENAME} where user_id=${user_id} and is_active = 1"
-			loan_id=`mysql -N $mysqld ${DBNAME} -e "${loanid}"`
-			#cho "loan_id=$loan_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"
-
-			
-
-			#push订单状态
-			#终审中
-			if [ $progress_id -eq 7 ]; then
-				curl -d "loanId=${loan_id}&loanProgress=FINAL_SCREENING" "http://qapi-zhangbo.q-gp.com/test/loanMq/one"
-				echo "推送成功 $date"
-
-			#终审拒绝
-			elif [ $progress_id -eq 8 ]; then
-				curl -d "loanId=${loan_id}&loanProgress=FINAL_SCREENING_REJECT" "http://qapi-zhangbo.q-gp.com/test/loanMq/one"
-				echo "推送成功 $date"
-
-			#未通过初筛
-			elif [ $progress_id -eq 19 ]; then
-				curl -d "loanId=${loan_id}&loanProgress=FILTERING_DECLINED" "http://qapi-zhangbo.q-gp.com/test/loanMq/one"
-				echo "推送成功 $date"
-
-			#借款清单生成完成
-			elif [ $progress_id -eq 9 ]; then
-				curl -d "loanId=${loan_id}&loanProgress=LOAN_APPLICATION_MANIFEST_COMPLETE" "http://qapi-zhangbo.q-gp.com/test/loanMq/one"
-				echo "推送成功 $date"
-
-			#等待资金方放款
-			elif [ $progress_id -eq 20 ]; then
-				curl -d "loanId=${loan_id}&loanProgress=WAITING_FUND" "http://qapi-zhangbo.q-gp.com/test/loanMq/one"
-				echo "推送成功 $date"
-
-			#查看还款计划
-			elif [ $progress_id -eq 15 ]; then
-				curl -d "loanId=${loan_id}&loanProgress=CHECK_REPAYMENT_PLAN" "http://qapi-zhangbo.q-gp.com/test/loanMq/one"
-				echo "推送成功 $date"
-
-			#马上金融放款失败
-			elif [ $progress_id -eq 23 ]; then
-				curl -d "loanId=${loan_id}&loanProgress=FINAL_FUNDED_APPROVAL_FAIL" "http://qapi-zhangbo.q-gp.com/test/loanMq/one"
-				echo "推送成功 $date"
-
-			#借款完成
-			elif [ $progress_id -eq 16 ]; then
-				curl -d "loanId=${loan_id}&loanProgress=LOAN_COMPLETE" "http://qapi-zhangbo.q-gp.com/test/loanMq/one"
-			else
-				echo "progress=$progress_id,订单状态不对"
-			fi
-			
-			break
-        fi
-
-}
-
-pushloanprogress $ip $phone_no