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

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",
@@ -91,7 +92,8 @@ var hosts = {
 	"bospinjaman-ui": "pinjaman.xyqb.com",
 	"fund-operate-ui":"clotho-ui.xyqb.com",
 	"business-op-ui":"business-op.xyqb.com",
-	"new-activity-ui":"new-activity.xyqb-com"
+	"new-activity-ui":"new-activity.xyqb.com",
+	"xyqb-user2-query":"userqry.xyqb.com"
 }
 
 var pClass = function() {};
@@ -171,7 +173,7 @@ new pClass().init(1,false, "java", "7038", "merchant-backend", "QG", "merchant.l
 new pClass().init(1,true,"java", "7031", "redpacket", "baitiao", "redpacket.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", "-Denv=dev -Didc=default -Dtech.localhost=", "红包系统-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(2,false, "java", "7044", "finance-api", "bo.wang", "finance-api.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "财务系统-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(2,false, "java", "7045", "check-accounts", "QG", "check_accounts.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "对账系统-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
-new pClass().init(1,false, "java", "7014", "du-jiang-yan", "QG", "du_jiang_yan.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "第三方对接导流-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
+new pClass().init(2,false, "java", "7014", "du-jiang-yan", "QG", "du_jiang_yan.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "第三方对接导流-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(1,false, "java", "8051", "msg", "fund_pay", "msg.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", "7052", "xyqb-btzt", "qg-op-backend", "xyqb-btzt.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "白条直投外部", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(1,false, "java", "7053", "xyqb-btzt-internal", "qg-op-backend", "xyqb-btzt-internal.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "白条直投内部", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
@@ -221,7 +223,7 @@ new pClass().init(1,true, "ui", "7020", "spider-center-ui", "QG", null, "src/app
 new pClass().init(1,true, "ui", "7050", "bt-ui", "QG", null, "src/app/config/env.config.js", "npm --registry http://172.16.3.15:4873 run qa", "node7", "新版白条-ui", "", "", "");
 new pClass().init(1,true, "ui", "7058", "mall-ui", "ui", null, "src/app/config/env.config.js", "npm run build", "node7", "商城-ui", "", "", "");
 new pClass().init(1,true, "ui", "7001", "xyqb-ui", "QG", null, "client/app/config.js", "grunt build", "node7", "现金贷和白条-现金贷-ui", "", "", "");
-new pClass().init(1,true, "ui", "7046", "activity-op-ui", "QG", null, "src/config/env.config.js", "npm run build", "node7", "优惠券管理后台-ui", "", "", "");
+new pClass().init(1,true, "ui", "7046", "activity-op-ui", "QG", null, "src/config/env.config.js", "npm run qa", "node7", "优惠券管理后台-ui", "", "", "");
 new pClass().init(1,true, "ui", "7048", "order-op-ui", "OP", null, "src/js/env.config.js", "gulp build", "node7", "订单系统-ui", "", "", "");
 // new pClass().init(false, "ui", "7002", "", "qgbc-ui", false, "QG", null, "src/app/config/env.config.js", "npm run build_production", "node7", "白条-ui", "", "", "");
 new pClass().init(1,true, "ui", "7057", "xjd-ui", "QG", null, "src/app/config/env.config.js", "npm run qa", "node7", "新版现金贷-ui", "", "", "");
@@ -258,6 +260,7 @@ new pClass().init(1,true, "node", "7055", "statistics", "OP", null, "src/config.
 new pClass().init(1,true, "node", "7086", "message-center-op", "ui", null, "config/env/test.js", "sh start.sh", null, "处理营销时消息处理与发送", "", "sh stop.sh", "");
 new pClass().init(1,true, "node", "7073", "statistics-api", "ui", null, "src/dev.config.js", "sh start.sh", null, "数据可视化-server", "","sh stop.sh","");
 new pClass().init(1,true, "node", "8073", "translate", "ui", null, "src/config/develop.config.js", "node app.js", null, "", "","","");
+new pClass().init(1,true, "node", "7099", "qg-web", "ui", null, "src/app/config/index.js", "sh start.sh", null, "网站后台", "", "sh stop.sh", "");
 
 
 //python

qa_shell_script/config_server/get_project_config_server.js

@@ -202,7 +202,14 @@ admin.post('/remove_proxy', function (req, res) {
 	s = s.replace("\n","")
 	execSync(`echo "${s}" > ../ngrok/docker_env_name.sh`)
 	cproc.exec("../ngrok/make_frp_ini_V2.sh");
-	res.send({msg:"执行完成"});
+	var last_str = String(execSync(`cat ../ngrok/docker_env_name.sh`))
+	res.setHeader("Content-Type","application/json");
+	res.send({
+        "details": {
+					name_spaces:last_str
+				},
+        "success": true
+      });
 });
 
 // 获取现有映射关系

qa_shell_script/ngrok/docker_env_name.sh

-dongmeifeng|192.168.4.78|32093|32093 tower|192.168.4.78|30886|30084 zhanghong|192.168.4.77|31826|32324 wangzhen|192.168.4.77|31809|30100 zhangbo|192.168.4.77|31091|32056 	wangfei|192.168.4.18|32589|32182 renmingxing|192.168.4.78|30169|32509 tianyawei|192.168.4.77|32718|32701 hemengying|192.168.4.32|30067|30660 songruili|192.168.4.18|32355|30265 yiwei|192.168.4.77|30352|30286 lishuang|192.168.4.77|30011|31185
+dongmeifeng|192.168.4.78|32093|32093 tower|192.168.4.78|30886|30084 zhanghong|192.168.4.77|31826|32324 wangzhen|192.168.4.77|31809|30100 zhangbo|192.168.4.77|31091|32056 	wangfei|192.168.4.77|32389|31374 renmingxing|192.168.4.78|30169|32509 tianyawei|192.168.4.77|32718|32701 hemengying|192.168.4.32|30067|30660 songruili|192.168.4.18|32355|30265 yiwei|192.168.4.77|30352|30286 lishuang|192.168.4.77|30011|31185 chenyadong|192.168.4.77|30384|32523 chenxingchun|192.168.4.33|30445|30583

qa_shell_script/ngrok/make_frp_ini_V2.sh

@@ -66,7 +66,7 @@ createNginxHttpAndSSLConf h5sp h5sp-25 192.168.4.25 7057 7057 $nginxname/base.co
 
 
 # 业务要求
-createNginxHttpAndSSLConf h5 h5 192.168.4.26 7051 7051 $nginxname/base.conf
+createNginxHttpAndSSLConf h5 h5 192.168.4.13 7051 7051 $nginxname/base.conf
 createNginxHttpAndSSLConf qg1 qg1-21 192.168.4.21 9019 9019 $nginxname/base.conf
 createNginxHttpAndSSLConf uanguang uanguang 192.168.4.124 80 80 $nginxname/base.conf
 createNginxHttpAndSSLConf gongyucheng gongyucheng 192.168.4.254 80 80 $nginxname/base.conf

qa_shell_script/script_by_Contorller/1_diting_tijiaozijinfangshenhe.sh

@@ -3,7 +3,7 @@ ip=$1
 phone_no=$2
 port=$3
 date=`date "+%Y-%m-%d %H:%M:%S"`
-mysqld="-h$ip -p$port -uqa -pqatest"
+mysqld="-h$ip -P$port -uqa -pqatest"
 len=`echo $phone_no|awk '{print length($0)}'`
 if [ $len -ne 11 ];then
 	echo "请输入11位手机号!"

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/delete_All_Data.sh

@@ -7,7 +7,7 @@ DBNAME1="payment_center"
 DBNAME2="xyqb"
 DBNAME3="spider_center"
 TABLENAME="user"
-mysqld="-h$ip -p$port -uqa -pqatest"
+mysqld="-h$ip -P$port -uqa -pqatest"
 date=`date "+%Y-%m-%d %H:%M:%S"`
 
 len=`echo $phone_no|awk '{print length($0)}'`

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"