增加api2

qa_shell_script/ngrok/make_frp_ini_V2.sh

@@ -87,15 +87,16 @@ do
 	ip_arr=(${IP_host//./ })
 	ipfirst="${ip_arr[0]}.${ip_arr[1]}.${ip_arr[2]}"
 	iplast="${ip_arr[3]}"
+	ip_last_repeat=${ip_last//./-}
 	projectAndPorts=`node $config_server/get_project_config.js  -type multi -attr port -attr2 true`
 	for projectAndPort in ${projectAndPorts[@]}
 	do
 		var=(${projectAndPort//|/ })
-		ip_last_repeat=${ip_last//./-}  
+
 			
 		project_name="${var[0]}"
 		sub_doman="${var[0]}-${ip_last}"
-		target_ip="$ipfirst.$iplast"
+		target_ip="$ipfirst.$ip_last_repeat"
 		http_port="${var[1]}"
 		https_port="${var[1]}"
 		file_name="$nginxname/$target_ip.conf"
@@ -109,10 +110,11 @@ done
 for host_name in ${dockernamespace[@]}
 do 
 	projectAndPorts=`node $config_server/get_project_config.js  -type multi -attr port/url -attr2 true`
+	namespace=(${host_name//|/ })
+
 	for projectAndPort in ${projectAndPorts[@]}
 	do
 		var=(${projectAndPort//|/ })
-		namespace=(${host_name//|/ })
 		# echo "${var[2]}/${namespace[0]}/${namespace[1]}/${namespace[2]}/${namespace[3]}"
 		project_name="${var[0]}"
 		sub_doman="${var[2]}-${namespace[0]}"
@@ -124,7 +126,9 @@ do
 		if [[ ${var[0]} != "xjd-ui" ]] && [[  ${var[0]} != "new-paycenter-ui"  ]];then
 			createNginxHttpAndSSLConf $project_name $sub_doman $target_ip $http_port $https_port $file_name
 		fi
-	done	
+	done
+	# 单独增加passportapi2
+	createNginxHttpAndSSLConf xyqb-user2-api2 passportapi2 ${namespace[1]} ${namespace[2]} ${namespace[3]} $nginxname/${namespace[0]}.conf
 done
 
 nginx -s reload