Commit b3951d6e authored by daidekun's avatar daidekun
parents be3ad8c9 3ff74f7c
...@@ -93,7 +93,8 @@ elif [[ $database_name = 'financial_system' ]]; then ...@@ -93,7 +93,8 @@ elif [[ $database_name = 'financial_system' ]]; then
elif [[ $database_name = 'gyxd' ]]; then elif [[ $database_name = 'gyxd' ]]; then
# 广源小贷系统 # 广源小贷系统
sys_table_list='administrative_districts templet' sys_table_list='administrative_districts templet'
port='3311' source_db_host='192.168.4.80'
port='6602'
elif [[ $database_name = 'offline' ]]; then elif [[ $database_name = 'offline' ]]; then
# 线下白条 # 线下白条
sys_table_list='goods_detail merchant operator_user' sys_table_list='goods_detail merchant operator_user'
...@@ -114,6 +115,11 @@ elif [[ $database_name = 'merchant' ]]; then ...@@ -114,6 +115,11 @@ elif [[ $database_name = 'merchant' ]]; then
# 用户中心 # 用户中心
sys_table_list='authority product_nature role role_authority role_supplier user' sys_table_list='authority product_nature role role_authority role_supplier user'
port='3314' port='3314'
elif [[ $database_name = 'xyqb_btzt' ]]; then
# 白条直投
sys_table_list='zt_channel zt_fund zt_fund_channel zt_fund_credit zt_fund_term'
source_db_host='192.168.4.116'
port='7001'
elif [[ $database_name = 'notify' ]]; then elif [[ $database_name = 'notify' ]]; then
# 白条直投 # 白条直投
sys_table_list='merchant merchant_config' sys_table_list='merchant merchant_config'
......
...@@ -102,11 +102,25 @@ function run_sql_file() ...@@ -102,11 +102,25 @@ function run_sql_file()
sh $work_dir/db_execute_sql.sh $target_db_host $sync_db_name sh $work_dir/db_execute_sql.sh $target_db_host $sync_db_name
} }
database_list='cash_loan_flow contract dujiangyan financial_system fund_manage gyxd mall merchant offline payment_center qinqiong quartz redpacket risk_control spider_center xyqb xyqb_app xyqb_user' database_list='cash_loan_flow contract dujiangyan financial_system fund_manage gyxd mall merchant offline payment_center qinqiong quartz redpacket risk_control spider_center xyqb xyqb_app xyqb_btzt xyqb_user'
database_list2='cash_loan_flow contract dujiangyan financial_system fund_manage gyxd merchant offline payment_center qinqiong quartz redpacket risk_control spider_center xyqb xyqb_app xyqb_btzt xyqb_user'
if [[ "$sync_db_name" = "all" ]] if [[ "$sync_db_name" = "all" ]]
then then
echo "sync all database schema" echo "sync all database schema"
echo "database_list:${database_list[@]}"
for db_name in $database_list for db_name in $database_list
do
echo "----------------------------------------------------"
echo "--- start sync $db_name ---"
db_schema_sync $db_name
run_sql_file $db_name
echo "--- end sync $db_name ---"
done
echo "----------------------------------------------------"
elif [[ "$sync_db_name" = "all(no_mall)" ]];then
echo "sync all(no_mall) database schema"
echo "database_list:${database_list2[@]}"
for db_name in $database_list2
do do
echo "----------------------------------------------------" echo "----------------------------------------------------"
echo "--- start sync $db_name ---" echo "--- start sync $db_name ---"
...@@ -115,7 +129,7 @@ then ...@@ -115,7 +129,7 @@ then
echo "--- end sync $db_name ---" echo "--- end sync $db_name ---"
echo "----------------------------------------------------" echo "----------------------------------------------------"
done done
echo "----------------------------------------------------"
else else
db_schema_sync $sync_db_name db_schema_sync $sync_db_name
run_sql_file $sync_db_name run_sql_file $sync_db_name
......
...@@ -99,10 +99,10 @@ function upload_toLocalAppStore() ...@@ -99,10 +99,10 @@ function upload_toLocalAppStore()
echo "apk正在本地appstore,请等待......" echo "apk正在本地appstore,请等待......"
#cd ${StroeApk_path} #cd ${StroeApk_path}
echo "当前上传apk包的路径是 `pwd`" echo "当前上传apk包的路径是 `pwd`"
echo "curl -F \"file=@${git_branch}_${product_flavors}_${build_time}.apk\" -F \"type=${apk_type}\" -F \"version=${apk_version}\" http://192.168.4.241:9000/android/upload" echo "curl -F \"file=@${git_branch}_${product_flavors}_${build_time}.apk\" -F \"type=${apk_type}\" -F \"version=${apk_version}\" http://172.30.199.2:9000/android/upload"
curl -F "file=@${git_branch}_${product_flavors}_${build_time}.apk" -F "type=${apk_type}" -F "version=${apk_version}" http://192.168.4.241:9000/android/upload curl -F "file=@${git_branch}_${product_flavors}_${build_time}.apk" -F "type=${apk_type}" -F "version=${apk_version}" http://172.30.199.2:9000/android/upload
if [ $? != 0 ]; then if [ $? != 0 ]; then
echo "上传失败,请联系管理员查看" echo "上传 stpre.q-gp.com 失败,请联系管理员查看"
fi fi
} }
...@@ -117,7 +117,7 @@ function upload_apk() ...@@ -117,7 +117,7 @@ function upload_apk()
#curl -F "file=@${git_branch}_${product_flavors}_${build_time}.apk" -F "uKey=13d17385c02ea9ea994d0c985d87ff32" -F "_api_key=5b09af98d5a8ff43f2f39935fa6bfbc1" https://qiniu-storage.pgyer.com/apiv1/app/upload #curl -F "file=@${git_branch}_${product_flavors}_${build_time}.apk" -F "uKey=13d17385c02ea9ea994d0c985d87ff32" -F "_api_key=5b09af98d5a8ff43f2f39935fa6bfbc1" https://qiniu-storage.pgyer.com/apiv1/app/upload
curl -F "file=@${git_branch}_${product_flavors}_${build_time}.apk" -F "uKey=41968e9da5a634b7b33dc8ff41e31c4e" -F "_api_key=8c303b6f70e8abbda50d1503568f1864" https://qiniu-storage.pgyer.com/apiv1/app/upload curl -F "file=@${git_branch}_${product_flavors}_${build_time}.apk" -F "uKey=41968e9da5a634b7b33dc8ff41e31c4e" -F "_api_key=8c303b6f70e8abbda50d1503568f1864" https://qiniu-storage.pgyer.com/apiv1/app/upload
if [ $? != 0 ]; then if [ $? != 0 ]; then
echo "上传失败,请联系管理员查看" echo "上传 蒲公英 失败,请联系管理员查看"
fi fi
fi fi
} }
......
...@@ -61,7 +61,10 @@ tranceConfig ui "192.168.4.12:7043" "xyqb-user-ui-12.q-gp.com" "192.168.4.12" " ...@@ -61,7 +61,10 @@ tranceConfig ui "192.168.4.12:7043" "xyqb-user-ui-12.q-gp.com" "192.168.4.12" "
#4.13 #4.13
#tranceConfig java "pay.debug=0" "pay.debug=1" "192.168.4.13" "xyqb-mall.properties" #tranceConfig java "pay.debug=0" "pay.debug=1" "192.168.4.13" "xyqb-mall.properties"
tranceConfig java "red.packet.id=10000115" "red.packet.id=56" "192.168.4.13" "xyqb-mall.properties" tranceConfig java "red.packet.id=10000115" "red.packet.id=56" "192.168.4.13" "xyqb-mall.properties"
tranceConfig java "7002" "7050" "192.168.4.13" "baitiao.properties"
tranceConfig java "red.packet.id=10000115" "red.packet.id=56" "192.168.4.13" "xyqb-mall.properties"
tranceConfig java "spring.rabbitmq.host = 192.168.4.13" "spring.rabbitmq.host =192.168.4.158" "192.168.4.13" "silk-road-caller.properties"
#tranceConfig java "lkb.model.url=http:\/\/192.168.4.202\/Model\/openapi" "lkb.model.url=http:\/\/192.168.4.13:8090\/Model\/openapi" "192.168.4.13" "baitiao.properties" #tranceConfig java "lkb.model.url=http:\/\/192.168.4.202\/Model\/openapi" "lkb.model.url=http:\/\/192.168.4.13:8090\/Model\/openapi" "192.168.4.13" "baitiao.properties"
#tranceConfig java "xyqb.model.url=http:\/\/192.168.4.202\/Model\/openapi" "xyqb.model.url=http:\/\/192.168.4.13:8090\/Model\/openapi" "192.168.4.13" "baitiao.properties" #tranceConfig java "xyqb.model.url=http:\/\/192.168.4.202\/Model\/openapi" "xyqb.model.url=http:\/\/192.168.4.13:8090\/Model\/openapi" "192.168.4.13" "baitiao.properties"
tranceConfig java "wx89894cd83d117b26" "wx5b2e77c58fdcf1a5" "192.168.4.13" "xyqb-user2.properties" tranceConfig java "wx89894cd83d117b26" "wx5b2e77c58fdcf1a5" "192.168.4.13" "xyqb-user2.properties"
......
...@@ -9,15 +9,19 @@ project_path=`cat $config_server/get_env_ip.sh` ...@@ -9,15 +9,19 @@ project_path=`cat $config_server/get_env_ip.sh`
for ip_last_num in $project_path for ip_last_num in $project_path
do do
echo "------------------IP-${IP_host_first}${ip_last_num}------------------" if [[ "$ip_last_num" == "50" ]]; then
expect -c " echo " not in 50 "
set timeout 10 else
spawn ssh root@${IP_host_first}${ip_last_num} echo "------------------IP-${IP_host_first}${ip_last_num}------------------"
expect \"]#\" expect -c "
send \"sh /home/qa-deploy-utils/qa_shell_script/$1\r\" set timeout 10
set timeout -1 spawn ssh root@${IP_host_first}${ip_last_num}
expect \"]#\" expect \"]#\"
send \"exit\r\" send \"sh /home/qa-deploy-utils/qa_shell_script/$1\r\"
expect eof;" set timeout -1
echo "======================END=================================" expect \"]#\"
send \"exit\r\"
expect eof;"
echo "======================END================================="
fi
done done
This diff is collapsed.
...@@ -2,85 +2,109 @@ ...@@ -2,85 +2,109 @@
pwd_path="/home/qa-deploy-utils/qa_shell_script" pwd_path="/home/qa-deploy-utils/qa_shell_script"
config_shell_path="$pwd_path" config_shell_path="$pwd_path"
config_server="$pwd_path/config_server" config_server="$pwd_path/config_server"
filename=/home/quant_group/frp_0.12.0_linux_amd64/frpc_custom_new.ini filename="/home/quant_group/frp_0.12.0_linux_amd64/frpc_custom_new_1.ini"
IP_host_first="192.168.4." nginxname="/usr/local/openresty/nginx/conf/conf.d"
ips=`cat $config_server/get_env_ip.sh` ips=`cat $config_server/get_env_ip.sh`
rm -rf $filename rm -rf $filename
function addFileHead() function addFrpcHead()
{ {
rm -rf $1
echo "[common]" >> $1 echo "[common]" >> $1
echo "server_addr = 127.0.0.1" >> $1 echo "server_addr = 127.0.0.1" >> $1
echo "server_port = 7000" >> $1 echo "server_port = 7000" >> $1
echo "privilege_token = 12345678" >> $1 echo "privilege_token = 12345678" >> $1
echo " " >> $1 echo "log_file = ./frpc.log" >> $1
echo "[company-241]" >> $1 echo "log_level = info" >> $1
echo "type = http" >> $1 echo "log_max_days = 3" >> $1
echo "local_ip = 192.168.4.241" >> $1 echo "" >> $1
echo "local_port = 10087" >> $1
echo "subdomain = company-241" >> $1
echo " " >> $1
echo "[auth-center-193]" >> $1
echo "type = http" >> $1
echo "local_ip = 192.168.4.193" >> $1
echo "local_port = 8099" >> $1
echo "subdomain = auth-center-38" >> $1
echo " " >> $1
echo "[local]" >> $1
echo "type = http" >> $1
echo "local_ip = 127.0.0.1" >> $1
echo "local_port = 10081" >> $1
echo "subdomain = " >> $1
echo " " >> $1
} }
addFrpcHead $filename
addFileHead $filename function addFrpcSub()
{
function addFile2() sub_domain=$1
sub_type=$2
sub_ip_first=$3
sub_ip_last=$4
sub_port=$5
sub_custom_domain=$6
sub_file=$7
echo "" >>$sub_file
echo "[$sub_domain-$sub_ip_last]" >> $sub_file
echo "type = $sub_type" >> $sub_file
echo "local_ip = $sub_ip_first.$sub_ip_last" >> $sub_file
echo "local_port = $sub_port" >> $sub_file
echo "subdomain = $sub_custom_domain" >> $sub_file
}
function addFrpcLoc()
{ {
echo "$1 $2 $3 $4" sub_domain=$1
echo "[web-$2-$1-http]" >> $4 sub_type=$2
echo "type = http" >> $4 sub_port=$3
echo "local_ip = 192.168.4.$1" >> $4 cus_domain=$4
echo "local_port = 1$3" >> $4 sub_loc=$5
echo "subdomain = $2" >> $4 sub_file=$6
echo "[web-$2-$1-https]" >> $4
echo "type = https" >> $4 echo "" >> $sub_file
echo "local_ip = 192.168.4.$1" >> $4 echo "[$sub_domain]" >> $sub_file
echo "local_port = 2$3" >> $4 echo "type = $sub_type" >> $sub_file
echo "subdomain = $2" >> $4 echo "local_port = $sub_port" >> $sub_file
echo "custom_domains = $cus_domain" >> $sub_file
echo "locations = $sub_loc" >> $sub_file
} }
addFrpcLoc local_ http 8000 q-gp.com / $filename
projectAndPort=`node $config_server/get_project_config.js -type multi -attr port`
for projectAndPort in ${projectAndPort[@]}
do
var=${projectAndPort//|/ }
addFile2 25 $var $filename
done
function addFile() addFrpcSub store http 127.0.0 1 8001 store $filename
addFrpcSub h5 http 192.168.4 15 7051 h5-15 $filename
addFrpcSub mock http 172.30.199 2 8080 mock $filename
addFrpcSub atm http 192.168.4 18 3000 atm $filename
addFrpcSub auth-center http 192.168.4 193 8099 auth-center-38 $filename
addFrpcSub company http 192.168.4 241 10087 company-241 $filename
function createNginxSSLConf()
{ {
echo "$1 $2 $3 $4" cus_domain=$1
echo "[web-$2-$1]" >> $4 cus_ip=$2
echo "type = http" >> $4 cus_port=$3
echo "local_ip = 192.168.4.$1" >> $4 file_name=$4
echo "local_port = $3" >> $4
echo "subdomain = $2-$1" >> $4 rm -rf $file_name
touch $file_name
echo "server {" >> $file_name
echo " listen 443 ssl;" >> $file_name
echo " server_name $cus_domain.q-gp.com;" >> $file_name
echo "" >> $file_name
echo " ssl_certificate /home/q-gp/ssl/certificate.crt;" >> $file_name
echo " ssl_certificate_key /home/q-gp/ssl/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 "" >> $file_name
echo " location / {" >> $file_name
echo " proxy_pass http://$cus_ip:$cus_port;" >> $file_name
echo " }" >> $file_name
echo "}" >> $file_name
rm -rf
} }
# projectAndPort=`node $config_server/get_project_config.js -type multi -attr port` # projectAndPort=`node $config_server/get_project_config.js -type multi -attr port`
createNginxSSLConf store 172.30.199.2 9000 $nginxname/store.conf
for ip_last in ${ips[@]} for ip_last in ${ips[@]}
do do
projectAndPort=`node $config_server/get_project_config.js -type multi -attr port` projectAndPort=`node $config_server/get_project_config.js -type multi -attr port -attr2 true`
for projectAndPort in ${projectAndPort[@]} for projectAndPort in ${projectAndPort[@]}
do do
var=${projectAndPort//|/ } var=(${projectAndPort//|/ })
addFile $ip_last $var $filename addFrpcSub ${var[0]} http 192.168.4 $ip_last ${var[1]} ${var[0]}-${ip_last} $filename
createNginxSSLConf ${var[0]}-${ip_last} 192.168.4.$ip_last ${var[1]} $nginxname/${var[0]}-${ip_last}.conf
done done
done done
......
...@@ -47,8 +47,19 @@ do ...@@ -47,8 +47,19 @@ do
{ {
echo "`date +%T:%N` 开始生成 ${IP_host_first}${ip_last_num}" echo "`date +%T:%N` 开始生成 ${IP_host_first}${ip_last_num}"
cd /home/sub_config_file_dont_rm cd /home/sub_config_file_dont_rm
#不能直接RM 整个文件,会造成mount失效
#rm -rf ${IP_host_first}${ip_last_num}
mkdir -p ${IP_host_first}${ip_last_num} mkdir -p ${IP_host_first}${ip_last_num}
cd ${IP_host_first}${ip_last_num} cd ${IP_host_first}${ip_last_num}
rm -rf java
rm -rf node
rm -rf ui
rm -rf python
rm -rf public
rm -rf nginx_conf.d
rm -rf pem_file
dir=`pwd` dir=`pwd`
#java项目发布 #java项目发布
......
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