Commit 7a4cb9c2 authored by 智勇's avatar 智勇

conflict

parents 131689d7 9406abed
...@@ -151,21 +151,22 @@ admin.get('/get_hosts', function(req, res) { ...@@ -151,21 +151,22 @@ admin.get('/get_hosts', function(req, res) {
}); });
// 根据类型获取系统名称 // 根据类型获取系统名称
admin.get('/get_systems_by_type', function(req, res) { admin.get('/get_systems_by_type', function (req, res) {
res.setHeader("Content-Type", "application/json"); res.setHeader("Content-Type","application/json");
var ui_str = execSync(`node ./get_project_config.js -type ui -attr name`) var ui_str = execSync(`node ./get_project_config.js -type ui -attr name`)
ui_str = String(ui_str) ui_str = String(ui_str)
.replace(/xyqb-ui/g, "").replace(/xjd-ui/, "xyqb-ui--xjd-ui") .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(/new-paycenter-ui/g,"").replace(/paycenter-ui/,"paycenter-ui--new-paycenter-ui")
.replace(/\s+/g, ",").replace(/\n/g, "").slice(0, -1); .replace(/\s+/g,",").replace(/\n/g,"").slice(0, -1);
var java_str = execSync(`node ./get_project_config.js -type java -attr name`) 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 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 python_str = execSync(`node ./get_project_config.js -type python -attr name`)
var server_str = `${String(java_str)} ${String(node_str)} ${String(python_str)}` 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);; server_str = server_str.replace(/\s+/g,",").replace(/\n/g,"").slice(0, -1);;
res.send({ res.send({
frontend: ui_str, common:"db,redis,rabbitmq,zookeeper",
backend: server_str frontend:ui_str,
backend:server_str
}); });
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment