conflict

qa_shell_script/config_server/get_project_config_server.js

@@ -151,22 +151,23 @@ admin.get('/get_hosts', function(req, res) {
 });
 
 // 根据类型获取系统名称
-admin.get('/get_systems_by_type', function(req, res) {
-    res.setHeader("Content-Type", "application/json");
-    var ui_str = execSync(`node ./get_project_config.js  -type ui -attr name`)
-    ui_str = String(ui_str)
-        .replace(/xyqb-ui/g, "").replace(/xjd-ui/, "xyqb-ui--xjd-ui")
-        .replace(/new-paycenter-ui/g, "").replace(/paycenter-ui/, "paycenter-ui--new-paycenter-ui")
-        .replace(/\s+/g, ",").replace(/\n/g, "").slice(0, -1);
-    var java_str = execSync(`node ./get_project_config.js  -type java -attr name`)
-    var node_str = execSync(`node ./get_project_config.js  -type node -attr name`)
-    var python_str = execSync(`node ./get_project_config.js  -type python -attr name`)
-    var server_str = `${String(java_str)} ${String(node_str)} ${String(python_str)}`
-    server_str = server_str.replace(/\s+/g, ",").replace(/\n/g, "").slice(0, -1);;
-    res.send({
-        frontend: ui_str,
-        backend: server_str
-    });
+admin.get('/get_systems_by_type', function (req, res) {
+ 	res.setHeader("Content-Type","application/json");
+	var ui_str = execSync(`node ./get_project_config.js  -type ui -attr name`)
+	ui_str = String(ui_str)
+	.replace(/xyqb-ui/g,"").replace(/xjd-ui/,"xyqb-ui--xjd-ui")
+	.replace(/new-paycenter-ui/g,"").replace(/paycenter-ui/,"paycenter-ui--new-paycenter-ui")
+	.replace(/\s+/g,",").replace(/\n/g,"").slice(0, -1);
+	var java_str = execSync(`node ./get_project_config.js  -type java -attr name`)
+	var node_str = execSync(`node ./get_project_config.js  -type node -attr name`)
+	var python_str = execSync(`node ./get_project_config.js  -type python -attr name`)
+	var server_str = `${String(java_str)} ${String(node_str)} ${String(python_str)}`
+	server_str = server_str.replace(/\s+/g,",").replace(/\n/g,"").slice(0, -1);;
+	res.send({
+		common:"db,redis,rabbitmq,zookeeper",
+		frontend:ui_str,
+		backend:server_str
+	});
 });
 
 // 给jenkins使用根据类型获取系统名称