a

qa_shell_script/config_server/get_project_config_server.js

@@ -83,13 +83,19 @@ admin.post('/add_new_proxy', function (req, res) {
 			res.send({msg:"错误，请检查 docket_env_name.sh 文件"})
 			return
 		}
+		
+		// proxy_ports = {
+		//         "http_port": http_port,
+		//         "https_port": https_port
+		//     }
+		
 		if(sourcestr != undefined){
 			var items = sourcestr.split("|");
 			if(items[1] == request["ip"]){
 				res.send({msg:"已经存在的配置"});
 				return 
 			}else{
-				targetstr = request["namespace"] + "|" +  request["ip"] + "|" + request["port"];
+				targetstr = request["namespace"] + "|" +  request["ip"] + "|" + request["proxy_ports"]["http_port"]+ "|" + request["proxy_ports"]["https_port"];
 				newstr = str.replace(sourcestr,targetstr);
 			}
 		}else{
@@ -97,7 +103,7 @@ admin.post('/add_new_proxy', function (req, res) {
 			return 
 		}
 	}else{
-		newstr = str + " " + request["namespace"] + "|" +  request["ip"] + "|" + request["port"];
+		newstr = str + " " + request["namespace"] + "|" +  request["ip"] + "|" + request["proxy_ports"]["http_port"]+ "|" + request["proxy_ports"]["https_port"];
 		//文件添加到这里面
 	}
 	newstr = newstr.replace(/\n/,"");

qa_shell_script/ngrok/docker_env_name.sh

- dongmeifeng|192.168.4.77|32648  |30168
+dongmeifeng|192.168.4.77|32648|31021

qa_shell_script/ngrok/make_frp_ini.sh

@@ -6,10 +6,14 @@ frp_file_path="/home/quant_group/frp_0.12.0_linux_amd64"
 filename="$frp_file_path/frpc_custom_new_1.ini"
 nginxname="/usr/local/openresty/nginx/conf/conf.d"
 pwd_path_0="/home/qa-deploy-utils"
- 
+
 dockernamespace=`cat $pwd_path/ngrok/docker_env_name.sh` 
 ips=`cat $config_server/get_env_ip.sh`
 rm -rf $filename
+
+rm -rf $nginxname/*
+
+
 function addFrpcHead()
 {
 	echo "[common]" >> $1
@@ -107,10 +111,10 @@ function createNginxHttpAndSSLConf()
 {
 	cus_domain=$1
 	cus_ip=$2
-	cus_port=$3
-	file_name=$4
+	http_port=$3
+	https_port=$4
+	file_name=$5
 	
-	rm -rf $file_name
 	touch $file_name
 	
 	echo "server {" >> $file_name
@@ -119,7 +123,7 @@ function createNginxHttpAndSSLConf()
 	echo "    proxy_set_header Host  \$host;"  >> $file_name
 	echo "" >> $file_name
 	echo "    location / {" >> $file_name
-	echo "        proxy_pass http://$cus_ip:$cus_port;" >> $file_name
+	echo "        proxy_pass http://$cus_ip:$http_port;" >> $file_name
 	echo "    }" >> $file_name
 	echo "}" >> $file_name
 	echo "" >> $file_name
@@ -138,7 +142,7 @@ function createNginxHttpAndSSLConf()
 	echo "    proxy_set_header Host  \$host;"  >> $file_name
 	echo "" >> $file_name
 	echo "    location / {" >> $file_name
-	echo "        proxy_pass http://$cus_ip;" >> $file_name
+	echo "        proxy_pass http://$cus_ip:$https_port;" >> $file_name
 	echo "    }" >> $file_name
 	echo "}" >> $file_name
 	
@@ -172,9 +176,10 @@ do
 	do
 		var=(${projectAndPort//|/ })
 		namespace=(${host_name//|/ })
+		echo "$namespace"
 		if [[ ${var[0]} != "xyqb-ui" ]] && [[  ${var[0]} != "paycenter-ui"  ]];then
 			addFrpcSub ${var[0]}-${var[2]} http 127.0.0 1 8000 ${var[2]}-${namespace[0]} $filename
-			createNginxHttpAndSSLConf ${var[2]}-${namespace[0]} ${namespace[1]} ${namespace[2]} $nginxname/${var[0]}-${namespace[0]}.conf
+			createNginxHttpAndSSLConf ${var[2]}-${namespace[0]} ${namespace[1]} ${namespace[2]} ${namespace[3]} $nginxname/${var[0]}-${namespace[0]}.conf
 		fi
 	done	
 	basePorts="redis|80 db|3306 rabbitmq|80"