fi

qa_shell_script/config_server/get_project_config_server.js

@@ -89,7 +89,7 @@ admin.post('/add_new_proxy', function (req, res) {
 				res.send({msg:"已经存在的配置"});
 				return 
 			}else{
-				targetstr = request["namespace"] + "|" +  request["ip"];
+				targetstr = request["namespace"] + "|" +  request["ip"] + "|" + request["port"];
 				newstr = str.replace(sourcestr,targetstr);
 			}
 		}else{

qa_shell_script/ngrok/docker_env_name.sh

- dongmeifeng|192.168.167.32
+ dongmeifeng|192.168.4.77|32648

qa_shell_script/ngrok/make_frp_ini.sh

@@ -119,7 +119,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:$cus_port;" >> $file_name
 	echo "    }" >> $file_name
 	echo "}" >> $file_name
 	echo "" >> $file_name
@@ -174,7 +174,7 @@ do
 		namespace=(${host_name//|/ })
 		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]} ${var[1]} $nginxname/${var[0]}-${namespace[0]}.conf
+			createNginxHttpAndSSLConf ${var[2]}-${namespace[0]} ${namespace[1]} ${namespace[2]} $nginxname/${var[0]}-${namespace[0]}.conf
 		fi
 	done	
 	basePorts="redis|80 db|3306 rabbitmq|80"