namespace

qa_shell_script/script_by_Contorller/landing_url.sh

@@ -19,7 +19,7 @@ fi
 cash_domain="qapi-$namespace.q-gp.com"
 xyqb_domain="api-$namespace.q-gp.com"
 
-if [ -z "$domainName" ];then
+if [ -z "$namespace" ];then
 	cash_domain=$ip:7037
 	xyqb_domain=$ip:7001
 fi

qa_shell_script/script_by_Contorller/pushloanprogress.sh

@@ -2,6 +2,7 @@
 ip=$1
 phone_no=$2
 PORT=$3
+namespace=$4
 USERNAME="qa"
 PASSWORD="qatest"
 DBNAME="xyqb"
@@ -11,6 +12,12 @@ TABLENAME1="user"
 mysqld="-h${ip} -P${PORT} -u${USERNAME} -p${PASSWORD}"
 date=`date "+%Y-%m-%d %H:%M:%S"`
 
+cash_domain="qapi-$namespace.q-gp.com"
+
+if [ -z "$namespace" ];then
+	cash_domain=$ip:7037
+fi
+
 function pushloanprogress(){
 	len=`echo $phone_no|awk '{print length($0)}'`
         if [ $len -ne 11 ]
@@ -38,42 +45,42 @@ function pushloanprogress(){
 			#push订单状态
 			#终审中
 			if [ $progress_id -eq 7 ]; then
-				curl -d "loanId=${loan_id}&loanProgress=FINAL_SCREENING" "http://${ip}:7037/test/loanMq/one"
+				curl -d "loanId=${loan_id}&loanProgress=FINAL_SCREENING" "http://${cash_domain}/test/loanMq/one"
 				echo "推送成功 $date"
 
 			#终审拒绝
 			elif [ $progress_id -eq 8 ]; then
-				curl -d "loanId=${loan_id}&loanProgress=FINAL_SCREENING_REJECT" "http://${ip}:7037/test/loanMq/one"
+				curl -d "loanId=${loan_id}&loanProgress=FINAL_SCREENING_REJECT" "http://${cash_domain}/test/loanMq/one"
 				echo "推送成功 $date"
 
 			#未通过初筛
 			elif [ $progress_id -eq 19 ]; then
-				curl -d "loanId=${loan_id}&loanProgress=FILTERING_DECLINED" "http://${ip}:7037/test/loanMq/one"
+				curl -d "loanId=${loan_id}&loanProgress=FILTERING_DECLINED" "http://${cash_domain}/test/loanMq/one"
 				echo "推送成功 $date"
 
 			#借款清单生成完成
 			elif [ $progress_id -eq 9 ]; then
-				curl -d "loanId=${loan_id}&loanProgress=LOAN_APPLICATION_MANIFEST_COMPLETE" "http://${ip}:7037/test/loanMq/one"
+				curl -d "loanId=${loan_id}&loanProgress=LOAN_APPLICATION_MANIFEST_COMPLETE" "http://${cash_domain}/test/loanMq/one"
 				echo "推送成功 $date"
 
 			#等待资金方放款
 			elif [ $progress_id -eq 20 ]; then
-				curl -d "loanId=${loan_id}&loanProgress=WAITING_FUND" "http://${ip}:7037/test/loanMq/one"
+				curl -d "loanId=${loan_id}&loanProgress=WAITING_FUND" "http://${cash_domain}/test/loanMq/one"
 				echo "推送成功 $date"
 
 			#查看还款计划
 			elif [ $progress_id -eq 15 ]; then
-				curl -d "loanId=${loan_id}&loanProgress=CHECK_REPAYMENT_PLAN" "http://${ip}:7037/test/loanMq/one"
+				curl -d "loanId=${loan_id}&loanProgress=CHECK_REPAYMENT_PLAN" "http://${cash_domain}/test/loanMq/one"
 				echo "推送成功 $date"
 
 			#马上金融放款失败
 			elif [ $progress_id -eq 23 ]; then
-				curl -d "loanId=${loan_id}&loanProgress=FINAL_FUNDED_APPROVAL_FAIL" "http://${ip}:7037/test/loanMq/one"
+				curl -d "loanId=${loan_id}&loanProgress=FINAL_FUNDED_APPROVAL_FAIL" "http://${cash_domain}/test/loanMq/one"
 				echo "推送成功 $date"
 
 			#借款完成
 			elif [ $progress_id -eq 16 ]; then
-				curl -d "loanId=${loan_id}&loanProgress=LOAN_COMPLETE" "http://${ip}:7037/test/loanMq/one"
+				curl -d "loanId=${loan_id}&loanProgress=LOAN_COMPLETE" "http://${cash_domain}/test/loanMq/one"
 			else
 				echo "progress=$progress_id,订单状态不对"
 			fi

qa_shell_script/script_by_Contorller/spidercenter_authorization_new.sh

@@ -2,6 +2,7 @@
 ip=$1
 phone_no=$2
 PORT=$3
+namespace=$4
 USERNAME="qa"
 PASSWORD="qatest"
 DBNAME="spider_center"
@@ -10,6 +11,12 @@ TABLENAME1="user"
 mysqld="-h${ip} -P${PORT} -u${USERNAME} -p${PASSWORD}"
 date=`date "+%Y-%m-%d %H:%M:%S"`
 
+spider_center_domain="sc-$namespace.q-gp.com"
+
+if [ -z "$namespace" ];then
+	spider_center_domain=$ip:7021
+fi
+
 function authorization()
 {
 	len=`echo $phone_no|awk '{print length($0)}'`
@@ -45,7 +52,7 @@ function authorization()
 		mysql $mysqld ${DBNAME} -e "${insert_sql00}"
 		mysql $mysqld ${DBNAME} -e "${insert_sql03}"
 		
-		curl -s "http://${ip}:7021/ex/quartz/notity_generate_report_new"
+		curl -s "http://${spider_center_domain}/ex/quartz/notity_generate_report_new"
 		
 		echo "done!!! $date"
 	fi