Skip to content

Q
qa-deploy-utils
Commit 9eb0f607 authored by tywldx's avatar tywldx
Browse files
Options

Merge branch 'master' of http://git.quantgroup.cn/QA/qa-deploy-utils

parents 5ff8a7fd 7fd38181
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 98 deletions
qa_shell_script/3_link_config_file_by_name.sh
View file @ 9eb0f607
...@@ -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
......
qa_shell_script/base_script/restartJava.sh
View file @ 9eb0f607
...@@ -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"
......
qa_shell_script/config_server/get_project_config_from_mongo.js
View file @ 9eb0f607
...@@ -11,16 +11,11 @@ var param = { ...@@ -11,16 +11,11 @@ var param = {
attr: "" attr: ""
} }
projects = String(execSync(`curl -s http://127.0.0.1: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))
// console.log(projects)
for (var index in projects) { for (var index in projects) {
// if (projects[index]['project_name'] == 'xyqb') {
// console.log(index)
// console.log(projects[index])
// }
switch (projects[index]['type']) { switch (projects[index]['type']) {
case "java": case "java":
java_projects.push(projects[index]); java_projects.push(projects[index]);
...@@ -36,7 +31,7 @@ for (var index in projects) { ...@@ -36,7 +31,7 @@ for (var index in projects) {
break; break;
} }
} }
// console.log(111)
// // --java // // --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", ""); // 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", "");
...@@ -64,32 +59,9 @@ function getListAttr(projects, attr) { ...@@ -64,32 +59,9 @@ function getListAttr(projects, attr) {
} }
var configFunction = function() {}; var configFunction = function() {};
configFunction.prototype = { configFunction.prototype = {
// getProjectAttr: function(pName, pAttr) {
// if (typeof projects[pName] == "undefined") {
// console.log("111")
// } else {
// console.log("222")
// var attrs = pAttr.split("/");
// if (attrs.length == 0) {
// console.log("")
// return
// }
// var list = [];
// for (var j = 0; j < attrs.length; j++) {
// if(projects[pName][attrs[j]]){
// console.log(projects)
// list.push(projects[pName][attrs[j]].split(" ").join("^"));
// }else{
// list.push(" ");
// }
// }
// console.log(list.join("|"))
// }
// },
getProjectAttr: function(pName, pAttr) { getProjectAttr: function(pName, pAttr) {
for (var index in projects) { for (var index in projects) {
if (projects[index]['project_name'] == pName) { if (projects[index]['name'] == pName) {
var attrs = pAttr.split("/"); var attrs = pAttr.split("/");
if (attrs.length == 0) { if (attrs.length == 0) {
console.log("") console.log("")
...@@ -104,40 +76,11 @@ configFunction.prototype = { ...@@ -104,40 +76,11 @@ configFunction.prototype = {
} }
} }
console.log(list.join("|")) console.log(list.join("|"))
} else {} } 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(" ");
// },
getProjectsAttrs: function(projects, attr, attr2) { getProjectsAttrs: function(projects, attr, attr2) {
var attrs = attr.split("/"); var attrs = attr.split("/");
if (attrs.length == 0) { if (attrs.length == 0) {
...@@ -148,7 +91,7 @@ configFunction.prototype = { ...@@ -148,7 +91,7 @@ configFunction.prototype = {
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]["project_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]]);
} }
...@@ -159,7 +102,7 @@ configFunction.prototype = { ...@@ -159,7 +102,7 @@ configFunction.prototype = {
} 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]["project_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]]);
} }
......
qa_shell_script/config_server/get_project_config_server.js
View file @ 9eb0f607
...@@ -151,23 +151,23 @@ admin.get('/get_hosts', function(req, res) { ...@@ -151,23 +151,23 @@ 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({
common:"db,redis,rabbitmq,zookeeper", common: "db,redis,rabbitmq,zookeeper",
frontend:ui_str, frontend: ui_str,
backend:server_str backend: server_str
}); });
}); });
// 给jenkins使用根据类型获取系统名称 // 给jenkins使用根据类型获取系统名称
...@@ -264,21 +264,38 @@ admin.get('/get_proxy', function(req, res) { ...@@ -264,21 +264,38 @@ admin.get('/get_proxy', function(req, res) {
admin.get('/get_project_config_from_db', function(req, res) { admin.get('/get_project_config_from_db', function(req, res) {
res.setHeader("Content-Type", "application/json"); res.setHeader("Content-Type", "application/json");
async function test() { async function test() {
let db = await mongodb.MongoClient.connect('mongodb://192.168.28.179:27017/qaHome', async function(err, db) { let db = await mongodb.MongoClient.connect('mongodb://172.30.220.22:27017/qaHome', async function(err, db) {
let proconfigs = db.collection('proconfigs'); let proconfigs = db.collection('proconfigs');
let projects = await proconfigs.find().toArray(); let projects = await proconfigs.find().toArray();
let re = []; let re = [];
// for (var i = 0; i < projects.length; i++) { for (var index = 0; index < projects.length; index++) {
// let project_name=projects[i]['project_name']; let temp = {
// let temp = { project_name: projects[i] }; name: projects[index]["project_name"],
// // temp[projects[i]['project_name']] = projects[i]; type: projects[index]["type"],
// console.log(temp) url: projects[index]["host_name"].replace(".xyqb.com", "").replace(".quantgroup.cn", ""),
// re.push(temp); www: projects[index]["host_name"],
git_path: projects[index]["git_path"],
// } config_path: projects[index]["config_path"],
log_name: projects[index]["log_path"],
command: projects[index]["start_command"],
command2: projects[index]["build_command"],
stop_command: projects[index]["stop_command"],
// command3: projects[index]["command3"],
// command4: projects[index]["command4"],
// command5: projects[index]["command5"],
port: projects[index]["port"],
desc: projects[index]["full_name"],
is_active: projects[index]["is_active"],
auth: projects[index]["auth"],
target_path: projects[index]["jar_path"]
}
// let project_name = projects[i]['project_name'];
// temp[projects[i]['project_name']] = projects[i];
// console.log(temp)
re.push(temp);
}
db.close(); db.close();
res.send(projects) res.send(re)
}); });
} }
test(); test();
......
qa_shell_script/ngrok/docker_env_name.sh
View file @ 9eb0f607
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||
qa_shell_script/ngrok/make_frp_ini_V2.sh
View file @ 9eb0f607
...@@ -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