Commit d69105e8 authored by root's avatar root

sdf

parent 679adcaa
......@@ -10,6 +10,11 @@ cd $project_path
project_folder=`find ./ -maxdepth 1 -name "$project_name"`
if [ -n "$project_folder" ];then
desc=`node $config_server/get_project_config.js -name $project_name -attr desc`
type=`node $config_server/get_project_config.js -name $project_name -attr type`
if [ "$type" = "node" ];then
command2=`node $config_server/get_project_config.js -name $project_name -attr command2`
command2
fi
sh $config_server/show_info.sh $project_name pull代码 $desc
cd ./$project_name
git checkout ./
......@@ -23,7 +28,7 @@ if [ -n "$project_folder" ];then
git pull
else
echo "Fail to checkout branch $git_branch".
exit 128
exit -1
fi
else
echo "checkout default branch master"
......
......@@ -12,6 +12,11 @@ function getCode()
for project in ${projects[@]}
do
desc=`node $config_server/get_project_config.js -name $project -attr desc`
type=`node $config_server/get_project_config.js -name $project_name -attr type`
if [ "$type" = "node" ];then
command2=`node $config_server/get_project_config.js -name $project_name -attr command2`
command2
fi
cd $project_path
project_folder=`find ./ -maxdepth 1 -name "$project"`
if [ -n "$project_folder" ];then
......
......@@ -50,7 +50,7 @@ function restartJavaProject()
echo "-----project:$project while be run command: java -Xmx256m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -jar ${project}.jar --worker 1 --currentWorker 1 -t > /dev/null 2>&1 &"
log_name=`node $config_server/get_project_config.js -name $project -attr log_name`
mv $project_path/logs/$log_name $project_path/logs/$project-$time.log
mv $project_path/logs/$log_name $project_path/logs/$project.log.$time
if [[ $project == "redpacket" ]]; then
echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -jar ${project}.jar --worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &`
......
......@@ -30,7 +30,7 @@ function restartJavaProject()
sleep 2s
fi
log_name=`node $config_server/get_project_config.js -name $project -attr log_name`
mv $project_path/logs/$log_name $project_path/logs/$project-$time.log
mv $project_path/logs/$log_name $project_path/logs/$project.log.$time
config_file=`find ./ -maxdepth 2 -name "application.properties"`
if [ -n "$config_file" ]
then
......
12 13 14 15 16 17 22 24 50 151 152
12 13 14 15 16 17 22 23 24 50 151 152
......@@ -86,7 +86,7 @@ new pClass().init(true, "ui", "7004", "di-ting-ui", "QG", null, "client/app/conf
new pClass().init(true, "ui", "7020", "spider-center-ui", "QG", null, "src/app/config/env.config.js", "npm run qa", "node7", 1, "授信中心-ui","");
new pClass().init(true, "ui", "7050", "qgbc-ui", "QG", null, "src/app/config/env.config.js", "npm run build_production", "node7", 1, "白条-ui","");
new pClass().init(true, "ui", "7001", "xyqb-ui", "QG", null, "client/app/config.js", "grunt build", "node4", 1, "现金贷和白条-现金贷-ui","");
new pClass().init(true, "ui", "7046", "activity-op-ui", "QG", null, "src/js/env.config.js", "npm run build", "node7", 1, "优惠券管理后台-ui","");
new pClass().init(true, "ui", "7046", "activity-op-ui", "QG", null, "src/config/env.config.js", "npm run build", "node7", 1, "优惠券管理后台-ui","");
new pClass().init(true, "ui", "7048", "order-op-ui", "OP", null, "src/js/env.config.js", "gulp build", "node7", 1, "订单系统-ui","");
new pClass().init(true, "ui", "7002", "bt-ui", "QG", null, "src/app/config/env.config.js", "npm run qa", "node7", 1, "新版白条-ui","");
// node
......
......@@ -78,7 +78,9 @@ tranceConfig java "7025" "7003" "192.168.4.152" "baitiao.properties"
tranceConfig node "112233445512345.ittun.com" "activity-op-22.ss.xyqb.loan" "192.168.4.22" "activity-op.js"
tranceConfig nginx "7002" "7050" "192.168.4.13" "qgbc-ui.conf"
tranceConfig nginx "7050" "7002" "192.168.4.13" "bt-ui.conf"
tranceConfig node "7002" "7050" "192.168.4.12" "AppBackend.js"
tranceConfig ui "7002" "7050" "192.168.4.13" "bt-ui.js"
#tranceConfig node "7002" "7050" "192.168.4.12" "AppBackend.js"
#tranceConfig nginx "7002" "7050" "192.168.4.17" "qgbc-ui.conf"
#tranceConfig nginx "7050" "7002" "192.168.4.17" "bt-ui.conf"
#1/bin/bash
cd /home/quant_group/logs
rm -rf *.log.*
for i in `find . -name "*.log"`; do cat /dev/null >$i; done
......@@ -3,43 +3,72 @@ pwd_path="/home/qa-deploy-utils/qa_shell_script"
config_shell_path="$pwd_path"
config_server="$pwd_path/config_server"
filename=/home/config_files/special/ngrok_confg.yml
vipfilename=/home/config_files/special/ngrok_vip_confg.yml
IP_host_first="192.168.4."
ips=`cat $config_server/get_env_ip.sh`
function addFileHead()
{
rm -rf $1
echo "server_addr: ss.xyqb.loan:4443" >> $1
echo "trust_host_root_certs: false" >> $1
echo "tunnels:" >> $1
}
addFileHead $filename
addFileHead $vipfilename
rm -rf $filename
echo "server_addr: ss.xyqb.loan:4443" >> $filename
echo "trust_host_root_certs: false" >> $filename
echo "tunnels:" >> $filename
function addFile()
{
echo "$1 : $2 "
echo " $1-iplast:" >> $filename
echo " proto:" >> $filename
echo " http: \"$2\"" >> $filename
if [ -n $4 ]
then
echo " $1-$4:" >> $3
else
echo " $1-iplast:" >> $3
fi
echo " proto:" >> $3
echo " http: \"$2\"" >> $3
}
projects=(`node $config_server/get_project_config.js -type java -attr name`)
for project in ${projects[@]}
do
port=`node $config_server/get_project_config.js -name $project -attr port`
addFile $project $port
addFile $project $port $filename
done
projects=(`node $config_server/get_project_config.js -type ui -attr name`)
for project in ${projects[@]}
do
port=`node $config_server/get_project_config.js -name $project -attr port`
addFile $project $port
addFile $project $port $filename
done
projects=(`node $config_server/get_project_config.js -type node -attr name`)
for project in ${projects[@]}
do
port=`node $config_server/get_project_config.js -name $project -attr port`
addFile $project $port
addFile $project $port $filename
done
projects=(`node $config_server/get_project_config.js -type python -attr name`)
for project in ${projects[@]}
do
port=`node $config_server/get_project_config.js -name $project -attr port`
addFile $project $port
addFile $project $port $filename
done
projects_of_out_proxy=( gu-bei activity-op op-api spider-center )
for ip_last in ${ips[@]}
do
for project in ${projects_of_out_proxy[@]}
do
port=`node $config_server/get_project_config.js -name $project -attr port`
addFile $project $IP_host_first$ip_last:$port $vipfilename $ip_last
done
done
server_addr: ss.xyqb.loan:4443
trust_host_root_certs: false
tunnels:
xyqb-iplast:
proto:
http: 192.168.4.23:7001
#!/bin/bash
mq_path=/usr/lib/rabbitmq/bin
$mq_path/rabbitmqctl add_user qa qatest
$mq_path/rabbitmqctl set_user_tags qa administrator
$mq_path/rabbitmqctl list_users
#/bin/bash
/usr/lib/rabbitmq/bin/rabbitmqctl stop
/usr/lib/rabbitmq/bin/rabbitmq-server -detached
......@@ -4,4 +4,4 @@ config_file=/home/config_files/special
cp $config_file/msg_center_white_list.py $project_path/server/white_list.py
sed -i "s/import json/import json\nfrom white_list import white_list\nfrom white_list import phone_white_list/g" $project_path/server/mq/*.py
sed -i "s/msg = json.loads(body, \"utf8\")/msg = json.loads(body, \"utf8\")\n if msg[\"source\"] not in white_list:\n logging.info(\"IP:%s不再白名单之列\", msg[\"source\"])\n if msg[\"phoneNo\"] not in phone_white_list:\n logging.info(\"Phone:%s不再白名单之列,短信中心禁止发送该条短信。\", msg[\"phoneNo\"])\n self.acknowledge_message(basic_deliver.delivery_tag)\n return/g" $project_path/server/mq/*.py
sed -i "s/msg = json.loads(body, \"utf8\")/msg = json.loads(body, \"utf8\")\n if msg[\"source\"] not in white_list:\n logging.info(\"IP:%s不再白名单之列,将检查手机号白名单\", msg[\"source\"])\n if msg[\"phoneNo\"] not in phone_white_list:\n logging.info(\"Phone:%s不再白名单之列,短信中心禁止发送该条短信。\", msg)\n self.acknowledge_message(basic_deliver.delivery_tag)\n return/g" $project_path/server/mq/*.py
#!/bin/bash
IP_host_first="192.168.4."
public_ip="139.198.2.95"
pwd_path="/home/qa-deploy-utils/qa_shell_script"
config_server="$pwd_path/config_server"
ips=`cat $config_server/get_env_ip.sh`
mkdir /home/sub_config_file_dont_rm
for ip_last_num in 12 13 14 15 16 17 22 24 50 151 152
for ip_last_num in ${ips[@]}
do
cd /home/sub_config_file_dont_rm
mkdir ${IP_host_first}${ip_last_num}
......@@ -25,17 +28,11 @@ do
cp -rf /home/config_files/java/* $dir/public/java/
sed -i "s/target_host_name/${IP_host_first}${ip_last_num}/" $dir/java/*
sed -i "s/target_mq_host_name/${IP_host_first}${ip_last_num}/" $dir/java/*
# if [ $ip_last_num -lt 100 ]; then
# sed -i "s/target_host_name:7/${public_ip}:${ip_last_num}/g" $dir/public/java/*
# #gu-bei的回调接口都改成外网接口
# sed -i "s/callback=http:\/\/${IP_host_first}${ip_last_num}:7006/callback=http:\/\/${public_ip}:${ip_last_num}006/g" $dir/java/gu-bei.properties
# sed -i "s/pay_notify_url=http:\/\/${IP_host_first}${ip_last_num}:7006/pay_notify_url=http:\/\/${public_ip}:${ip_last_num}006/g" $dir/java/gu-bei.properties
# else
sed -i "s/target_host_name:70/${public_ip}:${ip_last_num}/g" $dir/public/java/*
#gu-bei的回调接口都改成外网接口
sed -i "s/callback=http:\/\/${IP_host_first}${ip_last_num}:7006/callback=http:\/\/${public_ip}:${ip_last_num}06/g" $dir/java/gu-bei.properties
sed -i "s/pay_notify_url=http:\/\/${IP_host_first}${ip_last_num}:7006/pay_notify_url=http:\/\/${public_ip}:${ip_last_num}06/g" $dir/java/gu-bei.properties
# fi
#sed -i "s/callback=http:\/\/${IP_host_first}${ip_last_num}:7006/callback=http:\/\/${public_ip}:${ip_last_num}06/g" $dir/java/gu-bei.properties
#sed -i "s/pay_notify_url=http:\/\/${IP_host_first}${ip_last_num}:7006/pay_notify_url=http:\/\/${public_ip}:${ip_last_num}06/g" $dir/java/gu-bei.properties
# fi
sed -i "s/target_host_name/${public_ip}/g" $dir/public/java/*
sed -i "s/target_mq_host_name/${IP_host_first}${ip_last_num}/" $dir/public/java/*
sed -i "s/${public_ip}:3306/${IP_host_first}${ip_last_num}:3306/g" $dir/public/java/*
......@@ -43,6 +40,9 @@ do
sed -i "s/redis.master.host=${public_ip}/redis.master.host=${IP_host_first}${ip_last_num}/g" $dir/public/java/*
sed -i "s/zk.connect.url=${public_ip}/zk.connect.url=${IP_host_first}${ip_last_num}/g" $dir/public/java/*
sed -i "s/ip_last/$ip_last_num/g" $dir/public/java/*
sed -i "s/ip_last/$ip_last_num/g" $dir/java/*
cp -rf /home/config_files/special/* $dir/special/
sed -i "s/iplast/${ip_last_num}/g" $dir/special/ngrok_confg.yml
......@@ -51,11 +51,17 @@ do
mkdir $dir/python
cp -rf /home/config_files/python/* $dir/python/
sed -i "s/target_host_name/${IP_host_first}${ip_last_num}/" $dir/python/*
sed -i "s/ip_last/$ip_last_num/g" $dir/python/*
#node项目发布
rm -rf $dir/node
mkdir $dir/node
cp -rf /home/config_files/node/* $dir/node/
sed -i "s/target_host_name/${IP_host_first}${ip_last_num}/" $dir/node/*
sed -i "s/ip_last/$ip_last_num/g" $dir/node/*
#ui配置发布
rm -rf $dir/ui
mkdir $dir/ui
......@@ -65,14 +71,16 @@ do
cp -rf /home/config_files/ui/* $dir/ui/
cp -rf /home/config_files/ui/* $dir/public/ui/
sed -i "s/target_host_name/${IP_host_first}${ip_last_num}/" $dir/ui/*
if [ $ip_last_num -lt 100 ]; then
sed -i "s/target_host_name:7/${public_ip}:${ip_last_num}/g" $dir/public/ui/*
else
if [ $ip_last_num -lt 100 ]; then
sed -i "s/target_host_name:7/${public_ip}:${ip_last_num}/g" $dir/public/ui/*
else
sed -i "s/target_host_name:70/${public_ip}:${ip_last_num}/g" $dir/public/ui/*
fi
fi
sed -i "s/target_host_name/${public_ip}/g" $dir/public/ui/*
sed -i "s/${public_ip}:3306/${IP_host_first}${ip_last_num}:3306/g" $dir/public/ui/*
sed -i "s/ip_last/$ip_last_num/g" $dir/public/ui/*
sed -i "s/ip_last/$ip_last_num/g" $dir/ui/*
#ngxin conf.d发布
rm -rf $dir/nginx_conf.d
mkdir $dir/nginx_conf.d
......
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