Commit bf272002 authored by tywldx's avatar tywldx

fix

parent f39ab8ad
...@@ -10,31 +10,29 @@ var param = { ...@@ -10,31 +10,29 @@ var param = {
name: "", name: "",
attr: "" attr: ""
} }
projects = {}
projects = String(execSync(`curl -s http://192.168.4.3:10088/config_server/get_project_config_from_db`)) _projects = String(execSync(`curl -s http://192.168.4.3:10088/config_server/get_project_config_from_db`))
projects = JSON.parse(projects) _projects = JSON.parse(_projects)
// console.log(typeof(projects)) // console.log(typeof(projects))
for (var index in projects) { for (let pro of _projects) {
switch (projects[index]['type']) { projects[pro.name] = pro;
switch (pro['type']) {
case "java": case "java":
java_projects.push(projects[index]); java_projects.push(pro);
break; break;
case "node": case "node":
node_projects.push(projects[index]); node_projects.push(pro);
break; break;
case "ui": case "ui":
ui_projects.push(projects[index]); ui_projects.push(pro);
break; break;
case "python": case "python":
python_projects.push(projects[index]); python_projects.push(pro);
break; break;
} }
} }
// // --java
// new pClass().init(1,true,"java", "7042", "xyqb-user2", "head_group", "xyqb-user2.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts", "-Denv=dev -Didc=default -Dtech.localhost= -Dtest=true", "用户注册登录-V2-server", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
var temp = ""; var temp = "";
process.argv.forEach(function(val, index, array) { process.argv.forEach(function(val, index, array) {
...@@ -60,8 +58,9 @@ function getListAttr(projects, attr) { ...@@ -60,8 +58,9 @@ function getListAttr(projects, attr) {
var configFunction = function() {}; var configFunction = function() {};
configFunction.prototype = { configFunction.prototype = {
getProjectAttr: function(pName, pAttr) { getProjectAttr: function(pName, pAttr) {
for (var index in projects) { if (typeof projects[pName] == "undefined") {
if (projects[index]['name'] == pName) { console.log("")
} else {
var attrs = pAttr.split("/"); var attrs = pAttr.split("/");
if (attrs.length == 0) { if (attrs.length == 0) {
console.log("") console.log("")
...@@ -69,16 +68,14 @@ configFunction.prototype = { ...@@ -69,16 +68,14 @@ configFunction.prototype = {
} }
var list = []; var list = [];
for (var j = 0; j < attrs.length; j++) { for (var j = 0; j < attrs.length; j++) {
if (projects[index][attrs[j]]) { if(projects[pName][attrs[j]]){
list.push(projects[index][attrs[j]].split(" ").join("^"));
} else { list.push(projects[pName][attrs[j]].split(" ").join("^"));
}else{
list.push(" "); list.push(" ");
} }
} }
console.log(list.join("|")) console.log(list.join("|"))
} else {
}
} }
}, },
getProjectsAttrs: function(projects, attr, attr2) { getProjectsAttrs: function(projects, attr, attr2) {
...@@ -88,9 +85,9 @@ configFunction.prototype = { ...@@ -88,9 +85,9 @@ configFunction.prototype = {
} }
var list = []; var list = [];
//attr2 专有参数,用来表示是否要取带有对外域名的服务 //attr2 专有参数,用来表示是否要取带有对外域名的服务
if (attr2 == "true") { if(attr2 == "true"){
for (var i = 0; i < projects.length; i++) { for (var i = 0; i < projects.length; i++) {
if (projects[i].url != "") { if(projects[i].url != ""){
var li = [projects[i]["name"]]; var li = [projects[i]["name"]];
for (var j = 0; j < attrs.length; j++) { for (var j = 0; j < attrs.length; j++) {
li.push(projects[i][attrs[j]]); li.push(projects[i][attrs[j]]);
...@@ -99,7 +96,7 @@ configFunction.prototype = { ...@@ -99,7 +96,7 @@ configFunction.prototype = {
list.push(li.join("|")); list.push(li.join("|"));
} }
} }
} else { }else{
for (var i = 0; i < projects.length; i++) { for (var i = 0; i < projects.length; i++) {
// if (projects[i].is_active){ // if (projects[i].is_active){
var li = [projects[i]["name"]]; var li = [projects[i]["name"]];
...@@ -131,26 +128,32 @@ configFunction.prototype = { ...@@ -131,26 +128,32 @@ configFunction.prototype = {
} }
//tower add //tower add
module.exports = { module.exports={
java: java_projects, java : java_projects,
node: node_projects, node : node_projects,
python: python_projects, python : python_projects,
ui: ui_projects ui : ui_projects
} }
var F = new configFunction(); var F = new configFunction();
if (param["type"] == "") {
try {
if (param["type"] == "") {
F.getProjectAttr(param["name"], param["attr"]); F.getProjectAttr(param["name"], param["attr"]);
} else if (param["type"] == "multi") { } else if (param["type"] == "multi") {
var str = ""; var str = "";
str += F.getProjectsAttrs(java_projects, param["attr"], param["attr2"]); str += F.getProjectsAttrs(java_projects, param["attr"], param["attr2"]);
str += " " + F.getProjectsAttrs(ui_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(python_projects, param["attr"], param["attr2"]);
str += " " + F.getProjectsAttrs(node_projects, param["attr"], param["attr2"]); str += " " + F.getProjectsAttrs(node_projects, param["attr"], param["attr2"]);
console.log(str) console.log(str)
} else if (param["type"] == "hosts") { } else if (param["type"] == "hosts") {
console.log(JSON.stringify(hosts)); console.log(JSON.stringify(hosts));
} else { } else {
F.getProjectsAttr(param["type"], param["attr"]); F.getProjectsAttr(param["type"], param["attr"]);
}
} catch (e) {
console.log(e)
} }
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