Commit 19e0e3e0 authored by 智勇's avatar 智勇

Merge branch 'master' into 4.96

parents 114370a5 27a788c8
...@@ -24,6 +24,8 @@ function db_schema_sync() ...@@ -24,6 +24,8 @@ function db_schema_sync()
config_file_name="$sync_config_folder/${database}_${uuid}_db_schema_sync_config.json" config_file_name="$sync_config_folder/${database}_${uuid}_db_schema_sync_config.json"
db_backup_sub_folders=$db_backup_folder/${database} db_backup_sub_folders=$db_backup_folder/${database}
echo "rm -rf $db_backup_sub_folders"
rm -rf $db_backup_sub_folders
echo "mkdir -p $db_backup_sub_folders" echo "mkdir -p $db_backup_sub_folders"
mkdir -p $db_backup_sub_folders mkdir -p $db_backup_sub_folders
mkdir -p $sync_config_folder mkdir -p $sync_config_folder
......
...@@ -18,7 +18,7 @@ then ...@@ -18,7 +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"} #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
......
...@@ -83,22 +83,22 @@ fi ...@@ -83,22 +83,22 @@ fi
config_file=`find ./ -maxdepth 2 -name "application.properties"` config_file=`find ./ -maxdepth 2 -name "application.properties"`
if [ -n "$config_file" ] #if [ -n "$config_file" ]
then #then
echo "$project already have config file" # echo "$project already have config file"
else #else
echo "$project have no config file" # echo "$project have no config file"
if $is_public_ip && [ -n "$is_public_ip" ] # if $is_public_ip && [ -n "$is_public_ip" ]
then # then
rm -rf /home/quant_group/${project}/application.properties # rm -rf /home/quant_group/${project}/application.properties
echo "ln -s $config_path/public/java/${project}.* /home/quant_group/${project}/application.properties" # echo "ln -s $config_path/public/java/${project}.* /home/quant_group/${project}/application.properties"
ln -s $config_path/public/java/${project}.* /home/quant_group/${project}/application.properties # ln -s $config_path/public/java/${project}.* /home/quant_group/${project}/application.properties
else # else
rm -rf /home/quant_group/${project}/application.properties # rm -rf /home/quant_group/${project}/application.properties
echo "ln -s $config_path/java/${project}.* /home/quant_group/${project}/application.properties" # echo "ln -s $config_path/java/${project}.* /home/quant_group/${project}/application.properties"
ln -s $config_path/java/${project}.* /home/quant_group/${project}/application.properties # ln -s $config_path/java/${project}.* /home/quant_group/${project}/application.properties
fi # fi
fi #fi
echo "Project: $project will be start" echo "Project: $project will be start"
log_name=`node $config_server/get_project_config.js -name $project -attr log_name` log_name=`node $config_server/get_project_config.js -name $project -attr log_name`
......
...@@ -93,14 +93,15 @@ function parseJson2Str(json) { ...@@ -93,14 +93,15 @@ function parseJson2Str(json) {
function getProjectConfigPromise() { function getProjectConfigPromise() {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
// mongoose.model("ProConfig",new mongoose.Schema({})) // mongoose.model("ProConfig",new mongoose.Schema({}))
ProConfig.find({}).exec().then(res => { ProConfig.find({ is_active: true }).exec().then(res => {
let _pros = JSON.parse(JSON.stringify(res)); let _pros = JSON.parse(JSON.stringify(res));
let re = {}, hosts = {}; let re = {}, hosts = {};
for (let pro of _pros) { for (let pro of _pros) {
hosts[pro["project_name"]] = pro["host_name"]; hosts[pro["project_name"]] = pro["host_name"];
if (pro["project_name"] == "xjd-ui") { // if (pro["project_name"] == "xjd-ui") {
hosts["xyqb-ui--xjd-ui"] = pro["host_name"]; // hosts["xyqb-ui--xjd-ui"] = pro["host_name"];
} else if (pro["project_name"] == "new-paycenter-ui") { // } else
if (pro["project_name"] == "new-paycenter-ui") {
hosts["paycenter-ui--new-paycenter-ui"] = pro["host_name"]; hosts["paycenter-ui--new-paycenter-ui"] = pro["host_name"];
} }
...@@ -255,7 +256,20 @@ admin.get('/get_project_attr/:name', async function (req, res) { ...@@ -255,7 +256,20 @@ admin.get('/get_project_attr/:name', async function (req, res) {
res.send(e) res.send(e)
} }
}); });
// 获取项目配置具体属性
admin.get('/get_attr_from_project/:name/:attr', async function (req, res) {
// res.setHeader("Content-Type", "text");
var names = req.params.name.split("--");
var p_name = "";
if (names.length > 1) {
p_name = names[0]
} else {
p_name = req.params.name
}
let pro = await getProjectConfigPromiseByDb({ project_name: req.params.name });
let val = pro[0][req.params.attr];
res.send(val);
});
// 获取所有域名 // 获取所有域名
admin.get('/get_hosts', async function (req, res) { admin.get('/get_hosts', async function (req, res) {
...@@ -279,12 +293,13 @@ function getfrontendbackend(pros) { ...@@ -279,12 +293,13 @@ function getfrontendbackend(pros) {
for (let key of keys) { for (let key of keys) {
let pro = pros[key] let pro = pros[key]
if (pro.type == "ui") { if (pro.type == "ui") {
// && pro.name != "spider-center-ui" // && pro.name != "spider-center-ui" pro.name != "xyqb-ui" &&
if (pro.name != "xyqb-ui" && pro.name != "paycenter-ui") { if (pro.name != "paycenter-ui") {
if (pro.name == "xjd-ui") { // if (pro.name == "xjd-ui") {
temp.frontend.push("xyqb-ui--xjd-ui"); // temp.frontend.push("xyqb-ui--xjd-ui");
temp[pro.type].push("xyqb-ui--xjd-ui") // temp[pro.type].push("xyqb-ui--xjd-ui")
} else if (pro.name == "new-paycenter-ui") { // } else
if (pro.name == "new-paycenter-ui") {
temp.frontend.push("paycenter-ui--new-paycenter-ui"); temp.frontend.push("paycenter-ui--new-paycenter-ui");
temp[pro.type].push("paycenter-ui--new-paycenter-ui") temp[pro.type].push("paycenter-ui--new-paycenter-ui")
} }
...@@ -310,7 +325,7 @@ admin.get('/get_systems_by_type', async function (req, res) { ...@@ -310,7 +325,7 @@ admin.get('/get_systems_by_type', async function (req, res) {
let pros = configs.projects; let pros = configs.projects;
let fb = getfrontendbackend(pros); let fb = getfrontendbackend(pros);
res.send({ res.send({
common: "db,redis,rabbitmq,zookeeper", common: "db,redis,rabbitmq,zookeeper,kong,postgres,mongodb",
frontend: fb.frontend.join(","), frontend: fb.frontend.join(","),
backend: fb.backend.join(",") backend: fb.backend.join(",")
}); });
...@@ -329,6 +344,12 @@ admin.get('/get_systems_by_type_for_jenkins/:_type', async function (req, res) { ...@@ -329,6 +344,12 @@ admin.get('/get_systems_by_type_for_jenkins/:_type', async function (req, res) {
} }
}); });
// 提供所有项目的所有配置
admin.get('/get_pro_configs', async function (req, res) {
let configs = await getProjectConfigPromise();
res.send(configs.projects);
});
// 给jenkins使用根据类型获取系统名称 // 给jenkins使用根据类型获取系统名称
admin.get('/get_systems_by_type_for_temp', async function (req, res) { admin.get('/get_systems_by_type_for_temp', async function (req, res) {
let configs = await getProjectConfigPromise(); let configs = await getProjectConfigPromise();
...@@ -356,15 +377,15 @@ admin.get('/get_namespace_by_type_for_jenkins/:_type', async function (req, res) ...@@ -356,15 +377,15 @@ admin.get('/get_namespace_by_type_for_jenkins/:_type', async function (req, res)
res.send(ns_array.join("\n")); res.send(ns_array.join("\n"));
}); });
// 获取这个服务的所有配置 // 获取这个服务的所有配置
admin.get('/get_config/:_name',async function(req,res) { admin.get('/get_config/:_name', async function (req, res) {
let config = await getProjectConfigPromiseByDb({project_name:req.params._name}); let config = await getProjectConfigPromiseByDb({ project_name: req.params._name });
res.send(config[0]) res.send(config[0])
}) })
// 给jenkins使用获取服务groupname_projectname // 给jenkins使用获取服务groupname_projectname
admin.get('/get_groupname_by_type_for_jenkins/:_type', async function (req, res) { admin.get('/get_groupname_by_type_for_jenkins/:_type', async function (req, res) {
let configs = await getProjectConfigPromiseByDb({}); let configs = await getProjectConfigPromiseByDb({ is_active: true });
let re = { let re = {
ui: [], ui: [],
java: [], java: [],
...@@ -373,15 +394,16 @@ admin.get('/get_groupname_by_type_for_jenkins/:_type', async function (req, res) ...@@ -373,15 +394,16 @@ admin.get('/get_groupname_by_type_for_jenkins/:_type', async function (req, res)
}; };
let xjdui = [["", ""], ["", ""]], payui = [["", ""], ["", ""]] let xjdui = [["", ""], ["", ""]], payui = [["", ""], ["", ""]]
for (let o of configs) { for (let o of configs) {
if (o.project_name == "xyqb-ui") { // if (o.project_name == "xyqb-ui") {
xjdui[0][0] = o.git_path_group // xjdui[0][0] = o.git_path_group
xjdui[1][0] = o.project_name // xjdui[1][0] = o.project_name
} else if (o.project_name == "paycenter-ui") { // } else if (o.project_name == "xjd-ui") {
// xjdui[0][1] = o.git_path_group
// xjdui[1][1] = o.project_name
// } else
if (o.project_name == "paycenter-ui") {
payui[0][0] = o.git_path_group payui[0][0] = o.git_path_group
payui[1][0] = o.project_name payui[1][0] = o.project_name
} else if (o.project_name == "xjd-ui") {
xjdui[0][1] = o.git_path_group
xjdui[1][1] = o.project_name
} else if (o.project_name == "new-paycenter-ui") { } else if (o.project_name == "new-paycenter-ui") {
payui[0][1] = o.git_path_group payui[0][1] = o.git_path_group
payui[1][1] = o.project_name payui[1][1] = o.project_name
...@@ -399,9 +421,10 @@ admin.get('/get_groupname_by_type_for_jenkins/:_type', async function (req, res) ...@@ -399,9 +421,10 @@ admin.get('/get_groupname_by_type_for_jenkins/:_type', async function (req, res)
} }
let lua_ui = [], cb = ""; let lua_ui = [], cb = "";
if (req.params._type == "lua_ui") { if (req.params._type == "lua_ui") {
lua_ui.push(getLuaUiStr(xjdui)); // lua_ui.push(getLuaUiStr(xjdui));
lua_ui.push(getLuaUiStr(payui)); lua_ui.push(getLuaUiStr(payui));
cb = lua_ui.join("\n"); cb = lua_ui.join("\n");
res.send(cb);
} else { } else {
res.send(re[req.params._type].join("\n")); res.send(re[req.params._type].join("\n"));
} }
...@@ -460,5 +483,6 @@ admin.get('/get_proxy', function (req, res) { ...@@ -460,5 +483,6 @@ admin.get('/get_proxy', function (req, res) {
}); });
app.use('/config_server', admin) app.use('/config_server', admin)
console.log("http://192.168.4.3:10088/config_server/get_node_command") app.listen(10086, function () {
app.listen(10088) console.log("http://192.168.4.3:10088/config_server/get_node_command")
})
7001|m.xyqb.com|xyqb-ui
7050|bt.xyqb.com|bt-ui
7003|api.xyqb.com|xyqb
7004|r.xyqb.com|di-ting-ui
7005|rapi.xyqb.com|di-ting
7006|payapi.xyqb.com|gu-bei
7007|pay.xyqb.com|pay-center-ui
7008|off.xyqb.com|offline-ui
7010|offapi.xyqb.com|xyqb-offline
7011|financial.xyqb.com|financial-system-ui
7012|fsapi.xyqb.com|financial-system
7013|auth.xyqb.com|han-gu-guan
7037|qapi.xyqb.com|cash-loan-flow
7019|mallapi.xyqb.com|xyqb-mall
7021|scapi.xyqb.com|spider-center
7029|gyxdapi.xyqb.com|gyxd
7025|btapi.xyqb.com|baitiao
\ No newline at end of file
{ {
"name": "config_server", "name": "config_server",
"version": "1.0.0", "version": "1.0.0",
"description": "",
"main": "get_project_config.js", "main": "get_project_config.js",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1",
"start": "nodemon get_project_config_server"
}, },
"author": "", "author": "",
"license": "ISC", "license": "ISC",
...@@ -16,5 +16,9 @@ ...@@ -16,5 +16,9 @@
"mongoose": "^5.0.11", "mongoose": "^5.0.11",
"pm2": "^2.7.2", "pm2": "^2.7.2",
"request": "^2.83.0" "request": "^2.83.0"
} },
"devDependencies": {
"nodemon": "^1.18.3"
},
"description": ""
} }
...@@ -11,7 +11,58 @@ ips=`cat $config_server/get_env_ip.sh` ...@@ -11,7 +11,58 @@ ips=`cat $config_server/get_env_ip.sh`
rm -rf $filename rm -rf $filename
rm -rf $nginxname/* rm -rf $nginxname/*
function createNginxForQGP()
{
host_name=$1
project_name=$2
cus_domain=$3
cus_ip=$4
http_port=$5
https_port=$6
file_name=$7
touch $file_name
echo "############----${project_name}----############" >> $file_name
echo "server {" >> $file_name
echo " listen 80;" >> $file_name
echo " server_name $cus_domain.$host_name.com;" >> $file_name
echo " underscores_in_headers on;" >> $file_name
echo " proxy_set_header REMOTE_ADDR \$remote_addr; " >> $file_name
echo " proxy_set_header REMOTE_PORT \$remote_port; " >> $file_name
echo " proxy_set_header Host \$host;" >> $file_name
echo " proxy_set_header QT_TOKEN \$http_QT_TOKEN;" >> $file_name
echo " proxy_set_header Upgrade \$http_upgrade;" >> $file_name
echo " proxy_set_header Connection \"upgrade\";" >> $file_name
echo " client_max_body_size 100M;" >> $file_name
echo "" >> $file_name
echo " location / {" >> $file_name
echo " proxy_pass http://$cus_ip:$http_port;" >> $file_name
echo " }" >> $file_name
echo "}" >> $file_name
echo "" >> $file_name
echo "server {" >> $file_name
echo " listen 443 ssl;" >> $file_name
echo " server_name $cus_domain.$host_name.com;" >> $file_name
echo "" >> $file_name
echo " proxy_set_header QT_TOKEN \$http_QT_TOKEN;" >> $file_name
echo " ssl_certificate /home/q-gp/ssl/q-gp/certificate.crt;" >> $file_name
echo " ssl_certificate_key /home/q-gp/ssl/q-gp/private.key;" >> $file_name
echo "" >> $file_name
echo " ssl_session_cache shared:SSL:1m;" >> $file_name
echo " ssl_session_timeout 5m;" >> $file_name
echo "" >> $file_name
echo " ssl_ciphers HIGH:!aNULL:!MD5;" >> $file_name
echo " ssl_prefer_server_ciphers on;" >> $file_name
echo " proxy_set_header REMOTE_ADDR \$remote_addr; " >> $file_name
echo " proxy_set_header REMOTE_PORT \$remote_port; " >> $file_name
echo " proxy_set_header Host \$host;" >> $file_name
echo "" >> $file_name
echo " location / {" >> $file_name
echo " proxy_pass http://$cus_ip:$https_port;" >> $file_name
echo " }" >> $file_name
echo "}" >> $file_name
}
function createNginxHttpAndSSLConf() function createNginxHttpAndSSLConf()
{ {
...@@ -26,7 +77,7 @@ function createNginxHttpAndSSLConf() ...@@ -26,7 +77,7 @@ function createNginxHttpAndSSLConf()
echo "############----${project_name}----############" >> $file_name echo "############----${project_name}----############" >> $file_name
echo "server {" >> $file_name echo "server {" >> $file_name
echo " listen 80;" >> $file_name echo " listen 80;" >> $file_name
echo " server_name $cus_domain.q-gp.com;" >> $file_name echo " server_name $cus_domain.liangkebang.com;" >> $file_name
echo " underscores_in_headers on;" >> $file_name echo " underscores_in_headers on;" >> $file_name
echo " proxy_set_header REMOTE_ADDR \$remote_addr; " >> $file_name echo " proxy_set_header REMOTE_ADDR \$remote_addr; " >> $file_name
echo " proxy_set_header REMOTE_PORT \$remote_port; " >> $file_name echo " proxy_set_header REMOTE_PORT \$remote_port; " >> $file_name
...@@ -34,6 +85,7 @@ function createNginxHttpAndSSLConf() ...@@ -34,6 +85,7 @@ function createNginxHttpAndSSLConf()
echo " proxy_set_header QT_TOKEN \$http_QT_TOKEN;" >> $file_name echo " proxy_set_header QT_TOKEN \$http_QT_TOKEN;" >> $file_name
echo " proxy_set_header Upgrade \$http_upgrade;" >> $file_name echo " proxy_set_header Upgrade \$http_upgrade;" >> $file_name
echo " proxy_set_header Connection \"upgrade\";" >> $file_name echo " proxy_set_header Connection \"upgrade\";" >> $file_name
echo " client_max_body_size 100M;" >> $file_name
echo "" >> $file_name echo "" >> $file_name
echo " location / {" >> $file_name echo " location / {" >> $file_name
echo " proxy_pass http://$cus_ip:$http_port;" >> $file_name echo " proxy_pass http://$cus_ip:$http_port;" >> $file_name
...@@ -42,11 +94,11 @@ function createNginxHttpAndSSLConf() ...@@ -42,11 +94,11 @@ function createNginxHttpAndSSLConf()
echo "" >> $file_name echo "" >> $file_name
echo "server {" >> $file_name echo "server {" >> $file_name
echo " listen 443 ssl;" >> $file_name echo " listen 443 ssl;" >> $file_name
echo " server_name $cus_domain.q-gp.com;" >> $file_name echo " server_name $cus_domain.liangkebang.com;" >> $file_name
echo "" >> $file_name echo "" >> $file_name
echo " proxy_set_header QT_TOKEN \$http_QT_TOKEN;" >> $file_name echo " proxy_set_header QT_TOKEN \$http_QT_TOKEN;" >> $file_name
echo " ssl_certificate /home/q-gp/ssl/certificate.crt;" >> $file_name echo " ssl_certificate /home/q-gp/ssl/liangkebang/liangkebang.crt;" >> $file_name
echo " ssl_certificate_key /home/q-gp/ssl/private.key;" >> $file_name echo " ssl_certificate_key /home/q-gp/ssl/liangkebang/liangkebang.key;" >> $file_name
echo "" >> $file_name echo "" >> $file_name
echo " ssl_session_cache shared:SSL:1m;" >> $file_name echo " ssl_session_cache shared:SSL:1m;" >> $file_name
echo " ssl_session_timeout 5m;" >> $file_name echo " ssl_session_timeout 5m;" >> $file_name
...@@ -67,7 +119,7 @@ function createNginxHttpAndSSLConf() ...@@ -67,7 +119,7 @@ function createNginxHttpAndSSLConf()
_str="" _str=""
getK8sConditionStr(){ getK8sConditionStr(){
_str="${_str} _str="${_str}
if ( \$host ~* .*-${1}.q-gp.com ) { if ( \$host ~* .*-${1}.liangkebang.com ) {
set \$ip ${2}; set \$ip ${2};
} }
" "
...@@ -85,6 +137,7 @@ createK8sNginxConf(){ ...@@ -85,6 +137,7 @@ createK8sNginxConf(){
echo " proxy_set_header Host \$host; " >> $file_name echo " proxy_set_header Host \$host; " >> $file_name
echo " proxy_set_header REMOTE_ADDR \$remote_addr; " >> $file_name echo " proxy_set_header REMOTE_ADDR \$remote_addr; " >> $file_name
echo " proxy_set_header REMOTE_PORT \$remote_port; " >> $file_name echo " proxy_set_header REMOTE_PORT \$remote_port; " >> $file_name
echo " client_max_body_size 100M;" >> $file_name
echo " " >> $file_name echo " " >> $file_name
echo " set \$ip \"192.168.6.12\"; " >> $file_name echo " set \$ip \"192.168.6.12\"; " >> $file_name
echo " location / { " >> $file_name echo " location / { " >> $file_name
...@@ -95,10 +148,10 @@ createK8sNginxConf(){ ...@@ -95,10 +148,10 @@ createK8sNginxConf(){
echo " " >> $file_name echo " " >> $file_name
echo "server { " >> $file_name echo "server { " >> $file_name
echo " listen 443 ssl; " >> $file_name echo " listen 443 ssl; " >> $file_name
echo " server_name *.q-gp.com; " >> $file_name echo " server_name *.liangkebang.com; " >> $file_name
echo " proxy_set_header QT_TOKEN \$http_QT_TOKEN; " >> $file_name echo " proxy_set_header QT_TOKEN \$http_QT_TOKEN; " >> $file_name
echo " ssl_certificate /home/q-gp/ssl/certificate.crt; " >> $file_name echo " ssl_certificate /home/q-gp/ssl/liangkebang/liangkebang.crt; " >> $file_name
echo " ssl_certificate_key /home/q-gp/ssl/private.key; " >> $file_name echo " ssl_certificate_key /home/q-gp/ssl/liangkebang/liangkebang.key; " >> $file_name
echo " ssl_session_cache shared:SSL:1m; " >> $file_name echo " ssl_session_cache shared:SSL:1m; " >> $file_name
echo " ssl_session_timeout 5m; " >> $file_name echo " ssl_session_timeout 5m; " >> $file_name
echo " ssl_ciphers HIGH:!aNULL:!MD5; " >> $file_name echo " ssl_ciphers HIGH:!aNULL:!MD5; " >> $file_name
...@@ -124,17 +177,45 @@ createNginxHttpAndSSLConf h5sp h5sp-25 192.168.4.25 7057 7057 $nginxname/base.co ...@@ -124,17 +177,45 @@ createNginxHttpAndSSLConf h5sp h5sp-25 192.168.4.25 7057 7057 $nginxname/base.co
# 业务要求 # 业务要求
createNginxHttpAndSSLConf h5 h5 192.168.4.16 7051 7051 $nginxname/base.conf createNginxHttpAndSSLConf jfk jfk 172.30.220.7 9018 9018 $nginxname/base.conf
createNginxHttpAndSSLConf qg1 qg1-21 192.168.4.21 9019 9019 $nginxname/base.conf #createNginxHttpAndSSLConf h5 h5 192.168.6.33 33068 33068 $nginxname/base.conf
createNginxHttpAndSSLConf uanguang uanguang 192.168.4.124 80 80 $nginxname/base.conf #createNginxHttpAndSSLConf passportapi passportapi 192.168.6.10 11822 11822 $nginxname/base.conf
createNginxHttpAndSSLConf tyw tyw 192.168.28.170 8081 8081 $nginxname/base.conf
createNginxHttpAndSSLConf qg1 qg1-21 172.30.220.20 8018 8018 $nginxname/base.conf
createNginxHttpAndSSLConf qg1 qg1-21-server 172.30.220.20 9019 9019 $nginxname/base.conf
createNginxHttpAndSSLConf uanguang uanguang 193.168.4.124 80 80 $nginxname/base.conf
createNginxHttpAndSSLConf gongyucheng gongyucheng 192.168.4.254 80 80 $nginxname/base.conf createNginxHttpAndSSLConf gongyucheng gongyucheng 192.168.4.254 80 80 $nginxname/base.conf
createNginxHttpAndSSLConf lkb-client lkb-client 172.30.220.7 8082 8082 $nginxname/base.conf
createNginxHttpAndSSLConf operator operator 172.30.220.7 8099 8099 $nginxname/base.conf
createNginxHttpAndSSLConf rule-engine rule-engine 172.30.220.7 9050 9050 $nginxname/base.conf
createNginxHttpAndSSLConf risk-fields risk-fields 172.30.220.13 9010 9010 $nginxname/base.conf
createNginxHttpAndSSLConf toko-score toko-score 172.30.222.2 9007 9007 $nginxname/base.conf
createNginxHttpAndSSLConf es-15920 es-15920 172.30.220.11 15920 15920 $nginxname/base.conf
createNginxHttpAndSSLConf es-16920 es-16920 172.30.220.11 16920 16920 $nginxname/base.conf
createNginxHttpAndSSLConf zk-16181 zk-16181 172.30.220.11 16181 16181 $nginxname/base.conf
createNginxHttpAndSSLConf zk-16182 zk-16182 172.30.220.11 16182 16182 $nginxname/base.conf
createNginxHttpAndSSLConf zk-16183 zk-16183 172.30.220.11 16183 16183 $nginxname/base.conf
createNginxHttpAndSSLConf zk-15181 zk-15181 172.30.220.11 15181 15181 $nginxname/base.conf
createNginxHttpAndSSLConf zk-15182 zk-15182 172.30.220.11 15182 15182 $nginxname/base.conf
createNginxHttpAndSSLConf zk-15183 zk-15183 172.30.220.11 15183 15183 $nginxname/base.conf
createNginxHttpAndSSLConf kafka-16091 kafka-16091 172.30.220.11 16091 16091 $nginxname/base.conf
createNginxHttpAndSSLConf kafka-16092 kafka-16092 172.30.220.11 16092 16092 $nginxname/base.conf
createNginxHttpAndSSLConf kafka-16093 kafka-16093 172.30.220.11 16093 16093 $nginxname/base.conf
createNginxHttpAndSSLConf kafka-15091 kafka-15091 172.30.220.11 15091 15091 $nginxname/base.conf
createNginxHttpAndSSLConf kafka-15092 kafka-15092 172.30.220.11 15092 15092 $nginxname/base.conf
createNginxHttpAndSSLConf kafka-15093 kafka-15093 172.30.220.11 15093 15093 $nginxname/base.conf
createNginxHttpAndSSLConf zipkin-18180 zipkin-18180 172.30.220.11 18180 18180 $nginxname/base.conf
createNginxHttpAndSSLConf zipkin-15180 zipkin-15180 172.30.220.11 15180 15180 $nginxname/base.conf
createNginxHttpAndSSLConf zipkin-16180 zipkin-16180 172.30.220.11 16180 16180 $nginxname/base.conf
createNginxHttpAndSSLConf sync-rabbitmq sync-rabbitmq 172.30.3.140 15672 15672 $nginxname/base.conf
createNginxHttpAndSSLConf lkbclient lkbclient 172.30.220.7 8083 8083 $nginxname/base.conf
createNginxHttpAndSSLConf ldap ldap 172.30.5.214 389 389 $nginxname/base.conf
# 工作目录 # 工作目录
createNginxHttpAndSSLConf jen jen 192.168.4.2 8080 8080 $nginxname/base.conf createNginxHttpAndSSLConf jen jen 192.168.4.2 8080 8080 $nginxname/base.conf
createNginxHttpAndSSLConf invoice invoice 39.106.110.31 8010 8010 $nginxname/base.conf
# 自定义服务 # 自定义服务
createNginxHttpAndSSLConf qa qa 172.30.220.22 80 80 $nginxname/base.conf #createNginxHttpAndSSLConf qa qa 172.30.220.22 80 80 $nginxname/base.conf
createNginxHttpAndSSLConf qg qg 172.30.220.22 10087 10087 $nginxname/base.conf createNginxHttpAndSSLConf qg qg 172.30.220.22 10087 10087 $nginxname/base.conf
createNginxHttpAndSSLConf bp bp 172.30.220.22 10084 10084 $nginxname/base.conf createNginxHttpAndSSLConf bp bp 172.30.220.22 10084 10084 $nginxname/base.conf
createNginxHttpAndSSLConf qahelp qahelp 172.30.220.22 8000 8000 $nginxname/base.conf createNginxHttpAndSSLConf qahelp qahelp 172.30.220.22 8000 8000 $nginxname/base.conf
...@@ -147,7 +228,15 @@ createNginxHttpAndSSLConf mockapi mockapi 172.30.220.22 80 80 $nginxname/base.co ...@@ -147,7 +228,15 @@ createNginxHttpAndSSLConf mockapi mockapi 172.30.220.22 80 80 $nginxname/base.co
createNginxHttpAndSSLConf mockm mockm 172.30.220.22 9010 9010 $nginxname/base.conf createNginxHttpAndSSLConf mockm mockm 172.30.220.22 9010 9010 $nginxname/base.conf
createNginxHttpAndSSLConf login login 172.30.220.22 80 80 $nginxname/base.conf createNginxHttpAndSSLConf login login 172.30.220.22 80 80 $nginxname/base.conf
createNginxHttpAndSSLConf user user 172.30.220.22 80 80 $nginxname/base.conf createNginxHttpAndSSLConf user user 172.30.220.22 80 80 $nginxname/base.conf
createNginxHttpAndSSLConf riskfield riskfield 172.30.220.13 9010 9010 $nginxname/base.conf
createNginxHttpAndSSLConf pinjaman-img pinjaman-img 172.30.220.12 22122 22122 $nginxname/base.conf
createNginxForQGP quantgroups npmprivate npmprivate 172.30.3.43 4873 4873 $nginxname/base.conf
createNginxForQGP quantgroups sonar sonar 172.30.3.42 9000 9000 $nginxname/base.conf
createNginxForQGP q-gp git git 172.30.10.23 80 80 $nginxname/base.conf
createNginxForQGP q-gp gitabc gitabc 172.30.10.24 80 80 $nginxname/base.conf
# createNginxHttpAndSSLConf sonar sonar 172.30.3.42 9000 9000 $nginxname/base.conf
# createNginxHttpAndSSLConf pipes pipes 10.17.115.10 80 80 $nginxname/base.conf
createNginxHttpAndSSLConf kafka kafka 10.17.115.10 80 80 $nginxname/base.conf
for ip_last in ${ips[@]} for ip_last in ${ips[@]}
do do
...@@ -196,4 +285,4 @@ nginx -s reload ...@@ -196,4 +285,4 @@ nginx -s reload
# content_by_lua ' # content_by_lua '
# ngx.say(ngx.var.ip); # ngx.say(ngx.var.ip);
# '; # ';
\ No newline at end of file
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
ip=$1 ip=$1
phone_no=$2 phone_no=$2
port=$3 port=$3
redis_ip=$4
redis_port=$5
DBNAME="xyqb_user" DBNAME="xyqb_user"
DBNAME1="payment_center" DBNAME1="payment_center"
DBNAME2="xyqb" DBNAME2="xyqb"
...@@ -61,6 +63,11 @@ function deleteAlldata() ...@@ -61,6 +63,11 @@ function deleteAlldata()
mysql $mysqld ${DBNAME2} -e "delete from pay_center_bank_card where phone_no=$phone_no" mysql $mysqld ${DBNAME2} -e "delete from pay_center_bank_card where phone_no=$phone_no"
mysql $mysqld ${DBNAME2} -e "delete from pay_center_biao_tiao_bank_card where phone_no=$phone_no" mysql $mysqld ${DBNAME2} -e "delete from pay_center_biao_tiao_bank_card where phone_no=$phone_no"
mysql $mysqld ${DBNAME2} -e "delete from repayment_plan where user_id=$xyqb_user_id" mysql $mysqld ${DBNAME2} -e "delete from repayment_plan where user_id=$xyqb_user_id"
mysql $mysqld ${DBNAME2} -e "delete from quota_credit where user_id=$xyqb_user_id"
mysql $mysqld ${DBNAME2} -e "delete from quota_distribute_limit where user_id=$xyqb_user_id"
mysql $mysqld ${DBNAME2} -e "delete from quota_account where user_id=$xyqb_user_id"
mysql $mysqld cash_loan_flow -e "delete from order_mapping where qg_user_id=$xyqb_user_id"
mysql $mysqld cash_loan_flow -e "delete from user_mapping where qg_user_id=$xyqb_user_id"
if [ -n "$loan_id" ];then if [ -n "$loan_id" ];then
mysql $mysqld ${DBNAME2} -e "delete from loan_demand_history where loan_application_history_id in ($loan_id)" mysql $mysqld ${DBNAME2} -e "delete from loan_demand_history where loan_application_history_id in ($loan_id)"
mysql $mysqld ${DBNAME2} -e "delete from loan_submit_info where loan_id in ($loan_id)" mysql $mysqld ${DBNAME2} -e "delete from loan_submit_info where loan_id in ($loan_id)"
...@@ -73,19 +80,19 @@ function deleteAlldata() ...@@ -73,19 +80,19 @@ function deleteAlldata()
mysql $mysqld cash_loan_flow -e "delete from order_progress_record where loan_id in ($loan_id)" mysql $mysqld cash_loan_flow -e "delete from order_progress_record where loan_id in ($loan_id)"
fi fi
echo "删除redis缓存" echo "删除redis缓存"
redis_key=`redis-cli -h $ip -p 6379 keys *$phone_no*` redis_key=`redis-cli -h $redis_ip -p $redis_port keys *$phone_no*`
if [ -n "$redis_key" ];then if [ -n "$redis_key" ];then
echo $redis_key echo $redis_key
redis-cli -h $ip -p 6379 del $redis_key redis-cli -h $redis_ip -p $redis_port del $redis_key
fi fi
redis_key=`redis-cli -h $ip -p 6379 keys *$xyqb_user_id*` redis_key=`redis-cli -h $redis_ip -p $redis_port keys *$xyqb_user_id*`
if [ -n "$redis_key" ];then if [ -n "$redis_key" ];then
echo $redis_key echo $redis_key
token=`redis-cli -h $ip -p 6379 get userid-sessionvalue:cache::$xyqb_user_id:xyqb` token=`redis-cli -h $redis_ip -p $redis_port get userid-sessionvalue:cache::$xyqb_user_id:xyqb`
redis-cli -h $ip -p 6379 del $redis_key redis-cli -h $redis_ip -p $redis_port del $redis_key
redis_key=`redis-cli -h $ip -p 6379 keys *$token*` redis_key=`redis-cli -h $redis_ip -p $redis_port keys *$token*`
echo $redis_key echo $redis_key
redis-cli -h $ip -p 6379 del $redis_key redis-cli -h $redis_ip -p $redis_port del $redis_key
#redis-cli -h $ip -p 6379 keys *$token* | xargs redis-cli -h $ip -p 6379 del #redis-cli -h $ip -p 6379 keys *$token* | xargs redis-cli -h $ip -p 6379 del
fi fi
fi fi
......
...@@ -16,8 +16,8 @@ if [ -z "$registerFrom" ];then ...@@ -16,8 +16,8 @@ if [ -z "$registerFrom" ];then
registerFrom=214 registerFrom=214
fi fi
cash_domain="qapi-$namespace.q-gp.com" cash_domain="qapi-$namespace.liangkebang.com"
xyqb_domain="m-$namespace.q-gp.com" xyqb_domain="m-$namespace.liangkebang.com"
if [ -z "$namespace" ];then if [ -z "$namespace" ];then
cash_domain=$ip:7037 cash_domain=$ip:7037
......
#!/bin/bash #!/bin/bash
ip=$1 ip=$1
phone_no=$2 phone_no=$2
namespace=$4
HOSTNAME='$ip' HOSTNAME="${ip}"
PORT='$4' PORT=$3
USERNAME='qa' USERNAME='qa'
PASSWORD='qatest' PASSWORD='qatest'
date="`date +%Y%m%d%H%M%S`" date=$(date "+ %Y-%m-%d %H:%M:%S")
date_now=`date + "%Y-%m-%d %T"`
mysql="-h${HOSTNAME} -P${PORT} -u${USERNAME} -p${PASSWORD}" mysql="-h${HOSTNAME} -P${PORT} -u${USERNAME} -p${PASSWORD}"
uid = "SELECT uuid,id from xyqb_user.user where phone_no=${phone_no}" function basicData()
spider = "INSERT INTO spider_center.user_auth_info (auth_type, last_auth_time, auth_account_name, user_id, auth_status) VALUES(14, ${date}, ${phone_no}, ${uid}, 1),(7, ${date_now}, ${phone_no}, ${uid}, 1),(0,${date_now},${phone_no}, ${uid}, 1);" {
address = "INSERT INTO xyqb_user.address (user_id, province_code, province, city_code, city, district_code, district, address, created_at, updated_at) VALUES("+userid+", 450000, '广西壮族自治区', 450500, '北海市', 450503, '银海区', '海淀区中关村102号', '"+date+"', '"+date+"');" #查询用户ID
contact = "INSERT INTO xyqb_user.contact (user_id, name, phone_no, relation, created_at, updated_at)VALUES("+userid+", '张三', '138888888899', 3, '"+date+"', '"+date+"'),( "+userid+", '李四', '13888888888', 3, '"+date+"', '"+date+"');" uuid="SELECT uuid from user where phone_no=${phone_no}"
print: id="SELECT id from user where phone_no=${phone_no}"
uid=`mysql -N $mysql xyqb_user -e "set names utf8;${uuid}"`
userid=`mysql -N $mysql xyqb_user -e "set names utf8;${id}"`
#spider_center.user_auth_info插入基础资料、拍照、运营商认证
spider="INSERT INTO spider_center.user_auth_info (auth_type, last_auth_time, auth_account_name, user_id, auth_status) VALUES (14, '${date}', ${phone_no}, '${uid}', 1),(7, '${date}', ${phone_no}, '${uid}', 1),(0,'${date}',${phone_no}, '${uid}', 1)"
#xyqb_user.address插入地址
address="INSERT INTO xyqb_user.address (user_id, province_code, province, city_code, city, district_code, district, address, created_at, updated_at) VALUES(${userid}, 450000, '广西壮族自治区', 450500, '北海市', 450503, '银海区', '海淀区中关村102号', '${date}', '${date}')"
#xyqb_user.contact插入联系人信息
contact="INSERT INTO xyqb_user.contact (user_id, name, phone_no, relation, created_at, updated_at)VALUES(${userid}, '张三', '13888888889', 3, '${date}', '${date}'),( ${userid}, '李四', '13888888888', 3, '${date}', '${date}')"
#xyqb_user.user_detail添加联系人邮箱
userDetail="update xyqb_user.user_detail set email='19925632562@163.com' where user_id=${userid}"
#xyqb_user.user_ext_info插入用户职业、学历
userExtInfo="INSERT INTO xyqb_user.user_ext_info (user_id, means_of_income_payment, monthly_income_range, occupation, education, has_car, has_social_security, has_house, has_credit_card, marry_status, created_at, updated_at) VALUES(${userid}, 0, 3, 3, 3, 0, 0, 0, 0, 0, '${date}', '${date}')"
#执行sql
mysql ${mysql} -e"set names utf8;${spider};${address};${contact};${userDetail};${userExtInfo}"
echo "done!!!!${date} "
}
basicData $ip $phone_no $namespace $PORT
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