Commit 57699d47 authored by wentao.suo's avatar wentao.suo
parents 3cacb892 7fd38181
...@@ -9,3 +9,5 @@ ...@@ -9,3 +9,5 @@
.DS_Store .DS_Store
qa_shell_script/config_server/node_modules qa_shell_script/config_server/node_modules
.log .log
./qa_shell_script/config_server/package.json
./qa_shell_script/config_server/package-lock.json
...@@ -18,6 +18,7 @@ then ...@@ -18,6 +18,7 @@ then
sh $config_server/show_info.sh $project 连接配置文件 $desc $3 sh $config_server/show_info.sh $project 连接配置文件 $desc $3
project_type=`node $config_server/get_project_config.js -name $project -attr type` project_type=`node $config_server/get_project_config.js -name $project -attr type`
file=`node $config_server/get_project_config.js -name $project -attr config_file` file=`node $config_server/get_project_config.js -name $project -attr config_file`
file=${file:+"application.properties"}
echo "rm -rf /home/quant_group/${project}/$file" echo "rm -rf /home/quant_group/${project}/$file"
rm -rf /home/quant_group/$project/$file rm -rf /home/quant_group/$project/$file
......
...@@ -70,7 +70,7 @@ max_wait_ack_time=700 ...@@ -70,7 +70,7 @@ max_wait_ack_time=700
ack_phrase="JVM\ running\ for" ack_phrase="JVM\ running\ for"
project=$1 project=$1
desc=`node $config_server/get_project_config.js -name $project -attr desc` desc=`node $config_server/get_project_config.js -name $project -attr desc`
run_command_=`node $config_server/get_project_config.js -name $project -attr command_` run_command_=`node $config_server/get_project_config.js -name $project -attr command`
run_commands=(${run_command_//|/ }) run_commands=(${run_command_//|/ })
sh $config_server/show_info.sh $project 重新启动 $desc $ip sh $config_server/show_info.sh $project 重新启动 $desc $ip
cd $project_path/$project cd $project_path/$project
...@@ -107,7 +107,7 @@ mv $project_path/logs/$log_name $project_path/logs/$log_name.$time ...@@ -107,7 +107,7 @@ mv $project_path/logs/$log_name $project_path/logs/$log_name.$time
command1=${run_commands[0]//\^/ } command1=${run_commands[0]//\^/ }
command2=${run_commands[1]//\^/ } command2=${run_commands[1]//\^/ }
command=`echo "nohup java $command1 -jar ${project}.jar $command2" | sed "s#-Didc=default#-Didc=$idc#g"` command=`echo "$command1 -jar ${project}.jar $command2" | sed "s#-Didc=default#-Didc=$idc#g"`
echo $command echo $command
$command > /dev/null 2>&1 & $command > /dev/null 2>&1 &
echo "日志名称:$log_name" echo "日志名称:$log_name"
......
...@@ -11,6 +11,7 @@ var param = { ...@@ -11,6 +11,7 @@ var param = {
var hosts = { var hosts = {
"activity-op": "actapi.xyqb.com", "activity-op": "actapi.xyqb.com",
"activity-op-ui": "activity-op.xyqb.com", "activity-op-ui": "activity-op.xyqb.com",
"account-center":"account.xyqb.com",
//"activity-ui": "activity.xyqb.com", //"activity-ui": "activity.xyqb.com",
"new-activity-ui":"activity.xyqb.com", "new-activity-ui":"activity.xyqb.com",
"xyqb": "api.xyqb.com", "xyqb": "api.xyqb.com",
......
var cproc = require('child_process');
var execSync = cproc.execSync;
var project_name, project_attr, projects = {},
java_projects = [],
node_projects = [],
python_projects = [],
ui_projects = [];
var param = {
type: "",
name: "",
attr: ""
}
projects = String(execSync(`curl -s http://192.168.4.3:10088/config_server/get_project_config_from_db`))
projects = JSON.parse(projects)
// console.log(typeof(projects))
for (var index in projects) {
switch (projects[index]['type']) {
case "java":
java_projects.push(projects[index]);
break;
case "node":
node_projects.push(projects[index]);
break;
case "ui":
ui_projects.push(projects[index]);
break;
case "python":
python_projects.push(projects[index]);
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 = "";
process.argv.forEach(function(val, index, array) {
if (index >= 2) {
if (index % 2 == 0) {
temp = val.replace(/\-/, "");
param[temp] = "";
} else {
param[temp] = val;
}
}
});
function getListAttr(projects, attr) {
var list = [];
for (var i = 0; i < projects.length; i++) {
// if (projects[i].is_active) {
list.push(projects[i][attr])
// }
}
return list.join(" ");
}
var configFunction = function() {};
configFunction.prototype = {
getProjectAttr: function(pName, pAttr) {
for (var index in projects) {
if (projects[index]['name'] == pName) {
var attrs = pAttr.split("/");
if (attrs.length == 0) {
console.log("")
return
}
var list = [];
for (var j = 0; j < attrs.length; j++) {
if (projects[index][attrs[j]]) {
list.push(projects[index][attrs[j]].split(" ").join("^"));
} else {
list.push(" ");
}
}
console.log(list.join("|"))
} else {
}
}
},
getProjectsAttrs: function(projects, attr, attr2) {
var attrs = attr.split("/");
if (attrs.length == 0) {
return
}
var list = [];
//attr2 专有参数,用来表示是否要取带有对外域名的服务
if (attr2 == "true") {
for (var i = 0; i < projects.length; i++) {
if (projects[i].url != "") {
var li = [projects[i]["name"]];
for (var j = 0; j < attrs.length; j++) {
li.push(projects[i][attrs[j]]);
}
// li.push(projects[i].url);
list.push(li.join("|"));
}
}
} else {
for (var i = 0; i < projects.length; i++) {
// if (projects[i].is_active){
var li = [projects[i]["name"]];
for (var j = 0; j < attrs.length; j++) {
li.push(projects[i][attrs[j]]);
}
list.push(li.join("|"));
// }
}
}
return list.join(" ");
},
getProjectsAttr: function(type, attr) {
switch (type) {
case "java":
console.log(getListAttr(java_projects, attr));
break;
case "ui":
console.log(getListAttr(ui_projects, attr));
break;
case "python":
console.log(getListAttr(python_projects, attr));
break;
case "node":
console.log(getListAttr(node_projects, attr));
break;
}
}
}
//tower add
module.exports = {
java: java_projects,
node: node_projects,
python: python_projects,
ui: ui_projects
}
var F = new configFunction();
if (param["type"] == "") {
F.getProjectAttr(param["name"], param["attr"]);
} else if (param["type"] == "multi") {
var str = "";
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 if (param["type"] == "hosts") {
console.log(JSON.stringify(hosts));
} else {
F.getProjectsAttr(param["type"], param["attr"]);
}
\ No newline at end of file
This diff is collapsed.
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
"body-parser": "^1.18.2", "body-parser": "^1.18.2",
"child_process": "^1.0.2", "child_process": "^1.0.2",
"express": "^4.16.2", "express": "^4.16.2",
"request": "^2.83.0",
"mongodb": "^2.2.33",
"pm2": "^2.7.2" "pm2": "^2.7.2"
} }
} }
server {
listen 80 default;
server_name _;
underscores_in_headers on;
proxy_set_header Host $host;
proxy_set_header QT_TOKEN $http_QT_TOKEN;
set $ip ;
location / {
if
proxy_pass http://;
}
}
server {
listen 443 ssl;
server_name _;
proxy_set_header QT_TOKEN $http_QT_TOKEN;
ssl_certificate /home/q-gp/ssl/certificate.crt;
ssl_certificate_key /home/q-gp/ssl/private.key;
ssl_session_cache shared:SSL:1m;
ssl_session_timeout 5m;
ssl_ciphers HIGH:!aNULL:!MD5;
ssl_prefer_server_ciphers on;
proxy_set_header Host $host;
set $ip ;
location / {
if
proxy_pass http://;
}
}
server {
listen 80 default;
server_name _;
underscores_in_headers on;
proxy_set_header Host $host;
proxy_set_header QT_TOKEN $http_QT_TOKEN;
set $ip ;
location / {
if
proxy_pass http://;
}
}
server {
listen 443 ssl;
server_name _;
proxy_set_header QT_TOKEN $http_QT_TOKEN;
ssl_certificate /home/q-gp/ssl/certificate.crt;
ssl_certificate_key /home/q-gp/ssl/private.key;
ssl_session_cache shared:SSL:1m;
ssl_session_timeout 5m;
ssl_ciphers HIGH:!aNULL:!MD5;
ssl_prefer_server_ciphers on;
proxy_set_header Host $host;
set $ip ;
location / {
if
proxy_pass http://;
}
}
dongmeifeng|192.168.4.78|32093|32093 tower|192.168.4.78|30886|30084 zhanghong|192.168.4.77|31826|32324 wangzhen|192.168.4.77|31809|30100 zhangbo|192.168.4.77|31091|32056 wangfei|192.168.4.77|32389|31374 renmingxing|192.168.4.78|30169|32509 tianyawei|192.168.4.77|32718|32701 hemengying|192.168.4.32|30067|30660 songruili|192.168.4.18|32355|30265 yiwei|192.168.4.77|30352|30286 lishuang|192.168.4.77|30011|31185 chenyadong|192.168.4.77|30384|32523 chenxingchun|192.168.4.33|30445|30583 yanxiaoyu|192.168.4.18|32116|30133 debug2|192.168.4.32|32224|32522 dongmeifeng|192.168.4.78|32093|32093 tower|192.168.4.78|30886|30084 zhangbo|192.168.4.77|31091|32056 wangfei|192.168.4.77|32389|31374 renmingxing|192.168.4.78|30169|32509 songruili|192.168.4.18|32355|30265 yiwei|192.168.4.77|30352|30286 lishuang|192.168.4.77|30011|31185 chenyadong|192.168.4.77|30384|32523 chenxingchun|192.168.4.33|30445|30583 yanxiaoyu|192.168.4.18|32116|30133 cloner|192.168.6.9|32566|32560 c2|192.168.6.8|30492|31481 withdb|192.168.6.9|30321|30896 base|192.168.6.9|31440|32685 dbtest|192.168.6.9|31669|31647 ggggg|192.168.6.9|30451|32069 |192.168.6.9||
...@@ -142,7 +142,7 @@ createNginxHttpAndSSLConf mock mock 172.30.220.22 8080 8080 $nginxname/base.conf ...@@ -142,7 +142,7 @@ createNginxHttpAndSSLConf mock mock 172.30.220.22 8080 8080 $nginxname/base.conf
createNginxHttpAndSSLConf atm atm 172.30.220.43 80 80 $nginxname/base.conf createNginxHttpAndSSLConf atm atm 172.30.220.43 80 80 $nginxname/base.conf
createNginxHttpAndSSLConf mockapi mockapi 172.30.220.22 80 80 $nginxname/base.conf createNginxHttpAndSSLConf mockapi mockapi 172.30.220.22 80 80 $nginxname/base.conf
createNginxHttpAndSSLConf acs acs 172.30.220.43 8585 8585 $nginxname/base.conf createNginxHttpAndSSLConf acs acs 172.30.220.43 8585 8585 $nginxname/base.conf
createNginxHttpAndSSLConf a a 172.30.220.22 80 80 $nginxname/base.conf
...@@ -176,4 +176,4 @@ do ...@@ -176,4 +176,4 @@ do
done done
createK8sNginxConf $nginxname/k8s.conf createK8sNginxConf $nginxname/k8s.conf
nginx -s reload nginx -s reload
\ No newline at end of file
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