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

qa_shell_script/config_server/get_project_config.js

@@ -84,7 +84,7 @@ var hosts = {
 	"pinjamancepat-config"	:"pinja-config.xyqb.com",
 	"clotho":"clotho.xyqb.com",
 	"cuishou-ui-new":"urge-ui.quantgroup.cn",
-	"urge-dispatcher":"urge.quantgroup.cn",
+	"urge_dispatcher":"urge.quantgroup.cn",
 	"cuishou_external":"cuishouoperation.quantgroup.cn",
 	"mall-settlement":"settlementapi.xyqb.com",
 	"baitiao-op-backend":"backend.xyqb.com",
@@ -96,7 +96,7 @@ var hosts = {
 
 var pClass = function() {};
 pClass.prototype = {
-		init: function(group, isActive, projectType, port, projectName, gitPathHead, logName, configFile, command, nodeVersion, desc, auth, command2, java_target_path) {
+		init: function(group, isActive, projectType, port, projectName, gitPathHead, logName, configFile, command, node_version, desc, auth, command2, target_path) {
 			this.project_group = group; //项目所属组  1: 技术部  2: 数据部
 			this.name = projectName; //项目名称
 			this.type = projectType; //项目类型
@@ -119,12 +119,12 @@ pClass.prototype = {
 			this.command = ""; //项目命令1
 			this.command_=""; //java项目build过程冲需要的，传参可以不考虑
 			this.command2 = command2; //项目命令2
-			this.node_version = nodeVersion; //项目的node版本,JAVA 项目里面，这个是启动命令的前缀……
+			this.node_version = node_version; //项目的node版本,JAVA 项目里面，这个是启动命令的前缀……
 			this.port = port; //项目占用端口
 			this.desc = desc; //项目描述
 			this.is_active = isActive; //项目是否必要项目
 			this.auth = auth; // 项目负责人
-			this.target_path = java_target_path; //项目java打包后的jar文件路径
+			this.target_path = target_path; //项目java打包后的jar文件路径
 			projects[projectName] = this;
 			switch (projectType) {
 				case "java":
@@ -167,7 +167,7 @@ new pClass().init(1,true,"java", "7037", "cash-loan-flow", "QG", "cash_loan_flow
 new pClass().init(2,true, "java", "7012", "financial-system", "QG", "financial_system.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "财务系统-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(1,false, "java", "7034", "fund-manage", "QG", "fund_manage.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "债转系统-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(1,true,"java", "7029", "gyxd", "QG", "gyxd.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "广源小贷-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
-new pClass().init(1,false, "java", "7038", "merchant-backend", "QG", "merchant.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "商户后台-server", "陈东亮", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
+new pClass().init(1,false, "java", "7038", "merchant-backend", "QG", "merchant.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(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", "");
@@ -190,7 +190,7 @@ new pClass().init(1,false, "java", "7071", "mall-settlement", "baitiao", "mall-s
 new pClass().init(2,false, "java", "7072", "data-taurus", "data-riskcontrol", "data-taurus.log", "application.properties", "", " ", "质保金-server", "","mvn clean package -Ptest -Dmaven.test.skip=true","");
 new pClass().init(1,false, "java", "7074", "account-center", "QG", "account_center.log", "application.properties", "", " -Denv=dev -Didc=default -Dtech.localhost=", "账户中心-server", "","mvn clean package -Ptest -Dmaven.test.skip=true","");
 new pClass().init(1,false, "java", "7079", "user-credit", "QG", "user_credit.log", "application.properties", "", " ", "用户升级-server", "","mvn clean package -Ptest -Dmaven.test.skip=true","");
-new pClass().init(2,false, "java", "7076", "urge-dispatcher", "data-riskcontrol", "dispatcher.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "催收系统", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
+new pClass().init(2,false, "java", "7076", "urge_dispatcher", "data-riskcontrol", "dispatcher.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "催收系统", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(1,false, "java", "7081", "wechat-config", "fund_pay", "wechat-config.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts ", " ", "微信消息推送系统", "",     "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(1,false, "java", "7082", "clotho", "funding", "clotho.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", "7085", "mall-canal", "baitiao", "mall_canal.log", "application.properties", "-l 152 -w 2 &", " ", "商城订单监控", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
@@ -206,7 +206,7 @@ new pClass().init(1,false,"java", "9004", "pinjamancepat-collection", "QG", "",
 new pClass().init(1,false,"java", "7100", "pinjamancepat-config", "QG", "", "application.properties", " --worker 1 --curr entWorker 1 -t ", " -Denv=dev -Didc=empty ", "mimi", "", "", "");
 
 // ui----
-new pClass().init(1,true, "ui", "7032", "op-ui", "QG", null, "src/js/env.config.js", "npm run build", "node7", "运营系统-ui", "", "", "");
+new pClass().init(1,true, "ui", "7032", "op-ui", "QG", null, "src/config/env.config.js", "npm run qa", "node7", "运营系统-ui", "", "", "");
 new pClass().init(1,true, "ui", "7040", "activity-ui", "QG", null, "src/app/config.js", "npm run qa", "node7", "活动中心-ui", "", "", "");
 new pClass().init(1,true, "ui", "7011", "financial-system-ui", "QG", null, "src/js/env.config.js", "npm run build", "node7", "财务系统-ui", "", "", "");
 new pClass().init(1,true, "ui", "7030", "gyxd-ui", "QG", null, "src/js/env.config.js", "npm run build", "node7", "广源小贷-ui", "", "");

qa_shell_script/config_server/get_project_config_server.js

@@ -25,7 +25,13 @@ var attrs = {
 	projectAuth:"auth",
 	projectDesc:"desc",
 	logName:"log_name",
-	jarFilePath:"target_path"
+	jarFilePath:"target_path",
+	auth:"auth",
+	port:"port",
+	start_command:"",
+	stop_command:"",
+	command2:"command2",
+	node_version:"node_version"
 }
 var attrComs = Object.keys(attrs)
 var attrComsArr = [];
@@ -125,6 +131,7 @@ admin.get('/get_systems_by_type', function (req, res) {
 		backend:server_str
 	});
 });
+
 // 给jenkins使用根据类型获取系统名称
 admin.get('/get_systems_by_type_for_jenkins/:_type', function (req, res) {
 	let str = ""
@@ -142,6 +149,26 @@ admin.get('/get_systems_by_type_for_jenkins/:_type', function (req, res) {
 	str = str.replace(/\n/g,"").replace(/\s+/g,"\n");
 	res.send(str);
 });
+
+// 给jenkins使用根据类型获取系统名称
+admin.get('/get_systems_by_type_for_temp', function (req, res) {
+		var ui_str = execSync(`node ./get_project_config.js  -type ui -attr name`)
+		ui_str =	String(ui_str).split(/\s+/)
+		var java_str = execSync(`node ./get_project_config.js  -type java -attr name`)
+	java_str =	String(java_str).split(/\s+/)
+		var node_str = execSync(`node ./get_project_config.js  -type node -attr name`)
+	node_str =	String(node_str).split(/\s+/)
+		var python_str = execSync(`node ./get_project_config.js  -type python -attr name`)
+	python_str =	String(python_str).split(/\s+/)
+	res.send({
+		ui:ui_str,
+		java:java_str,
+		node:node_str,
+		python:python_str
+	});
+});
+
+
 // 增加一个新的nginx映射
 admin.post('/add_new_proxy', function (req, res) {
 	let request = req.body;

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
+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

qa_shell_script/ngrok/make_frp_ini_V2.sh

@@ -21,7 +21,7 @@ function createNginxHttpAndSSLConf()
 	http_port=$4
 	https_port=$5
 	file_name=$6
-	
+	echo "$project_name"
 	touch $file_name
 	echo "############----${project_name}----############" >> $file_name
 	echo "server {" >> $file_name
@@ -60,33 +60,36 @@ function createNginxHttpAndSSLConf()
 	
 }
 
-
-# addFrpcSub h5 http 192.168.4 25 7051 h5 $filename
-# addFrpcSub mock http 192.168.4 27 80 mock $filename
-# addFrpcSub atm http 192.168.4 18 3000 atm $filename
-# addFrpcSub auth-center http 192.168.4 193 8099 auth-center-38 $filename
-# addFrpcSub company http 192.168.4 27 10087 company-241 $filename
-# addFrpcSub bp http 192.168.4 27 10084 bp $filename
-# addFrpcSub qahelp http 192.168.4 27 8000 qahelp $filename
-# addFrpcSub h5sp http 192.168.4 25 7057  h5sp-25 $filename
-# addFrpcSub qg1 http 192.168.4 21 9019 qg1-21 $filename
-# addFrpcSub uanguang http 192.168.4 124 80 uanguang $filename
-# createNginxHttpAndSSLConf store 192.168.4.27 9000 $nginxname/store.conf
-
-createNginxHttpAndSSLConf h5 h5 192.168.4.25 7051 7051 $nginxname/base.conf
-createNginxHttpAndSSLConf mock mock 192.168.4.27 80 80 $nginxname/base.conf
-createNginxHttpAndSSLConf atm atm 192.168.4.18 3000 3000 $nginxname/base.conf
+# 数据部要求地址
 createNginxHttpAndSSLConf auth-center auth-center-38 192.168.4.193 8099 8099 $nginxname/base.conf
-createNginxHttpAndSSLConf company company-241 192.168.4.27 10087 10087 $nginxname/base.conf
-createNginxHttpAndSSLConf bp bp 192.168.4.27 10084 10084 $nginxname/base.conf
-createNginxHttpAndSSLConf qahelp qahelp 192.168.4.27 8000 8000 $nginxname/base.conf
 createNginxHttpAndSSLConf h5sp h5sp-25 192.168.4.25 7057 7057 $nginxname/base.conf
+
+
+# 业务要求
+createNginxHttpAndSSLConf h5 h5 192.168.4.26 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 store store 192.168.4.27 9000 9000 $nginxname/base.conf
 createNginxHttpAndSSLConf gongyucheng gongyucheng 192.168.4.254 80 80 $nginxname/base.conf
+
+# 工作目录
 createNginxHttpAndSSLConf jen jen 192.168.4.2 8080 8080 $nginxname/base.conf
 
+
+# 自定义服务
+createNginxHttpAndSSLConf qa qa 172.30.220.22  80 80 $nginxname/base.conf
+createNginxHttpAndSSLConf qg qg 172.30.220.22 10087 10087 $nginxname/base.conf
+createNginxHttpAndSSLConf bp bp 172.30.220.22 10084 10084 $nginxname/base.conf
+createNginxHttpAndSSLConf qahelp qahelp 172.30.220.22 8000 8000 $nginxname/base.conf
+createNginxHttpAndSSLConf store store 172.30.220.22 9000 9000 $nginxname/base.conf
+createNginxHttpAndSSLConf mock mock 172.30.220.22 8080 8080 $nginxname/base.conf
+createNginxHttpAndSSLConf atm atm 172.30.220.43 80 80 $nginxname/base.conf
+createNginxHttpAndSSLConf mockapi mockapi 172.30.220.22 80 80 $nginxname/base.conf
+createNginxHttpAndSSLConf acs acs 172.30.220.43 8585 8585 $nginxname/base.conf
+
+
+
+
+
 for ip_last in ${ips[@]}
 do
 	IP_host=`sh $pwd_path_0/get-ip.sh $ip_last`
@@ -139,3 +142,4 @@ done
 
 nginx -s reload
 # sh ${frp_file_path}/restart.sh
+

qa_shell_script/script_by_Contorller/kill_big_log_file.sh

+#!/n/ibash
+
+cd /home/quant_group/logs
+find . -type f -size +50M -print0 | xargs -0 du -h | sort -nr | awk  '{print $2}' | xargs rm  -rf {} \;

qa_shell_script/script_by_Contorller/shanfu_activiate.sh

+ip=$1
+phone_no=$2
+num=$3  #激活白条的数量
+merchant_id=$4 #渠道编号
+bill_num_a=0
+PORT=$5
+USERNAME="qa"
+PASSWORD="qatest"
+mysqld="-h${ip} -P${PORT} -u${USERNAME} -p${PASSWORD}"
+date_now=`date "+%Y-%m-%d %H:%M:%S"`
+
+function activate()
+{
+    len=`echo $phone_no|awk '{print length($0)}'`
+    if [ $len -ne 11 ] ; then
+       echo "请输入11位手机号 ！"
+    else
+       if [ -z $num ];then
+          num=1
+       fi
+       if [ -z ${merchant_id} ];then
+          merchant_id=7
+       fi
+
+       i=0
+       while [ $i -lt $num ]; do
+           uuid='928ba526-29f1-4ef8-8bb8-'${phone_no}
+           insert_xyqb_user="INSERT INTO user( "phone_no", "password", "registered_from", "uuid", "enable", "created_at", "updated_at")VALUES ( ${phone_no}, '318e235d3e52648b236faa3f748000d5', '222', '${uuid}', '1', '$date_now', '$date_now')"
+           mysql  $mysqld xyqb_user -e "set names utf8;${insert_xyqb_user}"
+
+           select_user_id="SELECT id  from user where user.phone_no=${phone_no}"
+           xyqb_user_id=`mysql -N $mysqld xyqb_user -e "set names utf8;${select_user_id}"`
+
+           #：用户信息表增加数据
+          insert_user_detail="INSERT INTO user_detail("user_id", "phone_no", "name", "id_no", "id_type", "is_authenticated", "gender", "email", "qq", "created_at", "updated_at")VALUES (${xyqb_user_id}, ${phone_no}, '滕尘', '532523198811050620', 0, 0, 1, '', 'undefined', '$date_now', '$date_now')"
+          mysql  $mysqld xyqb_user -e "set names utf8;${insert_user_detail}"
+          # 贷款记录表增加数据
+          insert_history="INSERT INTO loan_application_history ("user_id", "channel_id", "bank_card_id", "is_active", "progress", "created_from", "business_type", "pay_approach", "baitiao_merchant_id", "created_at", "updated_at")VALUES (${xyqb_user_id}, 222, 100, 1, 39, 222, 1, NULL, ${merchant_id}, '${date_now}', '${date_now}')"
+          mysql  $mysqld xyqb -e "set names utf8;${insert_history}"
+          insert_bill_day="INSERT INTO baitiao_bill_day ("user_id", "day", "created_at", "updated_at") VALUES ($xyqb_user_id, 28, '$date_now', '$date_now')"
+          mysql  $mysqld xyqb -e "set names utf8;${insert_bill_day}"
+          #激活记录表增加数据
+          insert_step_info="INSERT INTO loan_step_info ("user_id", "merchant_id", "status_code", "created_at")VALUES (${xyqb_user_id}, ${merchant_id}, 0, '$date_now'), (${xyqb_user_id}, ${merchant_id}, 5, '$date_now')"
+          mysql  $mysqld xyqb -e "set names utf8;${insert_step_info}"
+
+          #白条额度表修改数据
+          insert_account="INSERT INTO baitiao_account( "user_id", "registered_from", "pay_pwd", "pay_pwd_salt", "credit_amount", "status", "created_at", "updated_at")VALUES ( ${xyqb_user_id}, ${merchant_id}, '55cfe3b492c6528ef2ba27a52b439a93', 'Q0I0QTQzRjcxNTExMDUyQjAwNTY2MTI2', '16000.00', '1', '$date_now', '$date_now')"
+          mysql  $mysqld xyqb -e "set names utf8;${insert_account}"
+
+          #白条额度变化表增加数据
+          consume_seq='XYBT201708051511458'${phone_no}
+          insert_consume="INSERT INTO baitiao_consume_history ("user_id", "order_id", "order_amount", "remaining_amount", "consume_type", "consume_seq", "created_at", "updated_at")VALUES (${xyqb_user_id}, -1, 16000.00, 16000.00, 0, '${consume_seq}','$date_now', '$date_now' )"
+          mysql  $mysqld xyqb -e "set names utf8;${insert_consume}"
+
+          #授信用户表
+          uuid1='69891c47-e8c7-4b96-8a8d-'${phone_no}
+          insert_spider="INSERT INTO user ("phone_no", "password", "registered_from", "uuid", "enable", "created_at", "updated_at")VALUES (${phone_no}, '4c00961baa8857e558c10db0e58c003e', 222, '${uuid1}', 1, '$date_now', '$date_now')"
+          mysql  $mysqld spider_center -e "set names utf8;${insert_spider}"
+         #授权表增加数据
+         select_spider_user_id="select id  FROM user WHERE user.phone_no=${phone_no}"
+         spider_user_id=`mysql -N $mysqld spider_center -e "${select_spider_user_id}"`
+         insert_authorization="INSERT INTO user_authorization ("auth_type", "last_auth_time", "auth_account_name", "user_id", "auth_status")VALUES(0, '$date_now', NULL, ${spider_user_id}, 1),(3, '$date_now', NULL, ${spider_user_id}, 1)"
+         mysql  $mysqld spider_center -e "set names utf8;${insert_authorization}"
+
+         #mall用户表
+         uuid2='3a324e8b-78dc-45a7-bf16-'${phone_no}
+         insert_mall="INSERT INTO user("phone_no", "password", "registered_from", "uuid", "enable", "created_at", "updated_at")VALUES ( ${phone_no}, '318e235d3e52648b236faa3f748000d5', '214', '${uuid2}', '1', '$date_now', '$date_now')"
+         mysql  $mysqld mall -e "set names utf8;${insert_mall}"
+         select_mall_user_id="select  id  FROM user WHERE  phone_no=${phone_no}"
+         mall_user_id=`mysql -N  $mysqld mall -e "${select_mall_user_id}"`
+         insert_mall_user_detail="INSERT INTO user_detail ( "user_id", "phone_no", "name", "id_no", "id_type", "is_authenticated", "gender", "created_at", "updated_at")VALUES (${mall_user_id}, ${phone_no}, '滕尘', '532523198811050620', '0', '0', '1', '$date_now', '$date_now')"
+         mysql  $mysqld mall -e "set names utf8;${insert_mall_user_detail}"
+         #mall.baitiao_card
+         insert_mall_card="INSERT INTO baitiao_card ( "user_id", "phone_no", "baitiao_activate_status", "created_at", "updated_at", "available_credit", "overdue_qgbc", "overdue_xyqb", "credit_enough", "next_redirect", "risk_control_message", "original_credit", "pass_risk_control")VALUES ( ${mall_user_id}, ${phone_no}, '2', '$date_now', '$date_now', '16000.00', '0', '0', '1', NULL,NULL, '16000.00', '1')"
+         mysql  $mysqld mall -e "set names utf8;${insert_mall_card}"
+
+         #白条闪付白名单表
+         insert_white="INSERT INTO baitiao_epay_user_white_list("user_id", "created_at", "updated_at")VALUES(${xyqb_user_id}, '$date_now', '$date_now');"
+         
+              
+       echo "mysql  $mysqld xyqb -e \"set names utf8;${insert_white}\""
+mysql  $mysqld xyqb -e "set names utf8;${insert_white}"
+
+         #闪付用户表
+         sub_acct_no='6231850'${phone_no}
+         insert_epay_user="INSERT INTO baitiao_epay_user("coop_cust_no", "uuid", "cust_name", "id_no", "phone_no", "bind_card_no", "reserved_phone", "sub_acct_no", "acct_open_result", "user_profile_status", "acct_open_desc", "created_at", "updated_at", "reference_time")VALUES(${xyqb_user_id}, '${uuid}', '滕尘', '441223198609205028', ${phone_no}, '6227000001508231159',${phone_no}, '${sub_acct_no}', 1, 1, '', '$date_now', '$date_now', '$date_now');"
+             echo "mysql  $mysqld xyqb -e \"set names utf8;${insert_epay_user}\""
+         mysql  $mysqld xyqb -e "set names utf8;${insert_epay_user}"         
+
+         i=$(( $i + 1 ))
+         phone_no=$(( $phone_no + 1 ))
+      done
+   
+   if [ $i -eq $num ];then
+     echo "successful done! `date`"
+   else 
+     echo "failed! `date` 建议输入合适的手机号基数"
+   fi
+ fi
+}
+activate $ip $phone_no $num $merchant_id
+