fix

qa_shell_script/config_server/get_project_config.js

@@ -194,19 +194,29 @@ configFunction.prototype = {
 				console.log(list.join("|"))
 		}
 	},
-	getProjectsAttrs: function(projects, attr) {
+	getProjectsAttrs: function(projects, attr, attr2) {
 		var attrs = attr.split("/");
 		if (attrs.length == 0) {
 			return
 		}
 		var list = [];
 		for (var i = 0; i < projects.length; i++) {
-			if (projects[i].is_active && projects[i].www){
-				var li = [projects[i]["name"]];
-				for (var j = 0; j < attrs.length; j++) {
-					li.push(projects[i][attrs[j]]);
+			if (projects[i].is_active){
+				if(attr2 == "true"){
+					if(projects[i].www){
+						var li = [projects[i]["name"]];
+						for (var j = 0; j < attrs.length; j++) {
+							li.push(projects[i][attrs[j]]);
+						}
+						list.push(li.join("|"));
+					}
+				}else{
+					var li = [projects[i]["name"]];
+					for (var j = 0; j < attrs.length; j++) {
+						li.push(projects[i][attrs[j]]);
+					}
+					list.push(li.join("|"));
 				}
-				list.push(li.join("|"));
 			}
 		}
 		return list.join(" ");
@@ -243,10 +253,10 @@ if (param["type"] == "") {
 	F.getProjectAttr(param["name"], param["attr"]);
 } else if (param["type"] == "multi") {
 	var str = "";
-	str += F.getProjectsAttrs(java_projects, param["attr"]);
-	str += " " + F.getProjectsAttrs(ui_projects, param["attr"]);
-	str += " " + F.getProjectsAttrs(python_projects, param["attr"]);
-	str += " " + F.getProjectsAttrs(node_projects, param["attr"]);
+	str += F.getProjectsAttrs(java_projects, param["attr"], param["attr2"]);
+	str += " " + F.getProjectsAttrs(ui_projects, param["attr"], param["attr2"]);
+	str += " " + F.getProjectsAttrs(python_projects, param["attr"], param["attr2"]);
+	str += " " + F.getProjectsAttrs(node_projects, param["attr"], param["attr2"]);
 	console.log(str)
 } else {
 	F.getProjectsAttr(param["type"], param["attr"]);

qa_shell_script/ngrok/make_frp_ini.sh

@@ -97,7 +97,7 @@ createNginxSSLConf store 172.30.199.2 9000 $nginxname/store.conf
 
 for ip_last in ${ips[@]}
 do
-	projectAndPort=`node $config_server/get_project_config.js  -type multi -attr port`
+	projectAndPort=`node $config_server/get_project_config.js  -type multi -attr port -attr2 true`
 	for projectAndPort in ${projectAndPort[@]}
 	do
 		var=(${projectAndPort//|/ })