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

qa_shell_script/ngrok/make_frp_ini.sh

@@ -61,7 +61,7 @@ addFrpcLoc local_ http 8000 q-gp.com / $filename
 
 
 addFrpcSub store http 127.0.0 1 8001 store  $filename
-addFrpcSub h5 http 192.168.4 88 7051 h5 $filename
+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
@@ -70,8 +70,7 @@ 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 126 80 uanguang $filename
-
+addFrpcSub uanguang http 192.168.4 124 80 uanguang $filename
 
 
 function createNginxSSLConf()
@@ -160,9 +159,8 @@ do
 	for projectAndPort in ${projectAndPorts[@]}
 	do
 		var=(${projectAndPort//|/ })
-		
-		
-		addFrpcSub ${var[0]} http $ipfirst $iplast ${var[1]} ${var[0]}-${ip_last} $filename
+		ip_last_repeat=${ip_last//./-}  	
+		addFrpcSub $var[0] http $ipfirst $iplast ${var[1]} ${var[0]}-${ip_last_repeat} $filename
 		createNginxSSLConf ${var[0]}-${ip_last} $ipfirst.$iplast ${var[1]} $nginxname/${var[0]}-${ip_last}.conf
 	done
 done 
@@ -177,7 +175,7 @@ do
 		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
 	done	
-	basePorts="redis|80 db|3306 rabbitmq|80"
+	basePorts="redis|80 db|3306 rabbitmq|80 pinja-api|80 pinja-cr|80 pinja-cr-api|80"
 	for basePort in ${basePorts[@]} 
 	do
 		var=(${basePort//|/ })