Commit b7744267 authored by 智勇's avatar 智勇
parents b520f550 cb8503e6
...@@ -44,11 +44,11 @@ if [[ $database_name = 'xyqb' ]]; then ...@@ -44,11 +44,11 @@ if [[ $database_name = 'xyqb' ]]; then
# 信用钱包database # 信用钱包database
# repay v_manifest v_repay 是view类型的 # repay v_manifest v_repay 是view类型的
# secure_proxy 表里面的数据需要被同步 # secure_proxy 表里面的数据需要被同步
sys_table_list='baitiao_merchant baitiao_secure_key channel funding_contract funding_corp loan_product merchant_channel payeco_return_url_info red_packet t_phonenum zmxy_return_url configuration repay v_manifest v_repay secure_proxy' sys_table_list='baitiao_merchant baitiao_secure_key channel funding_contract funding_corp loan_product merchant_channel payeco_return_url_info red_packet t_phonenum zmxy_return_url configuration repay v_manifest v_repay secure_proxy funding_corp_config'
port='3306' port='3306'
elif [[ $database_name = 'xyqb_app' ]]; then elif [[ $database_name = 'xyqb_app' ]]; then
# app-backend使用的数据库 # app-backend使用的数据库
sys_table_list='activities app_banners app_config app_versions banners blanknote_entries credit_questions hot_games loan_banners loan_questions migrations sharings widgets' sys_table_list='activities app_banners app_config app_versions banners blanknote_entries credit_questions hot_games loan_banners loan_questions migrations sharings widgets js_patch upgrade_version'
port='3307' port='3307'
elif [[ $database_name = 'payment_center' ]]; then elif [[ $database_name = 'payment_center' ]]; then
# 支付中心 # 支付中心
...@@ -64,7 +64,7 @@ elif [[ $database_name = 'dujiangyan' ]]; then ...@@ -64,7 +64,7 @@ elif [[ $database_name = 'dujiangyan' ]]; then
port='3310' port='3310'
elif [[ $database_name = 'mall' ]]; then elif [[ $database_name = 'mall' ]]; then
# 白条商城 # 白条商城
sys_table_list='mall_config activity_3c_product ad_detail new_3c_product supplier 3c_product 3c_product_spec apix_phone_recharge_detail apix_recharge_project apix_recharge_project_bak category configuration course_detail_info course_info merchant pay19_recharge_project product' sys_table_list='mall_config activity_3c_product ad_detail new_3c_product supplier 3c_product 3c_product_spec apix_phone_recharge_detail apix_recharge_project apix_recharge_project_bak category configuration course_detail_info course_info merchant pay19_recharge_project mall_category product product_sku product_sku_image product_spu product_nature nature_value product_category spu_image product_nature_value'
port='3310' port='3310'
elif [[ $database_name = 'qinqiong' ]]; then elif [[ $database_name = 'qinqiong' ]]; then
# qinqiong # qinqiong
......
...@@ -48,4 +48,6 @@ do ...@@ -48,4 +48,6 @@ do
sed -i "s/https\:\/\/scapi.xyqb.com/http\:\/\/${server_host}:7021/g" $entry sed -i "s/https\:\/\/scapi.xyqb.com/http\:\/\/${server_host}:7021/g" $entry
sed -i "s/http\:\/\/gyxdapi.xyqb.com/http\:\/\/${server_host}:7029/g" $entry sed -i "s/http\:\/\/gyxdapi.xyqb.com/http\:\/\/${server_host}:7029/g" $entry
sed -i "s/https\:\/\/gyxdapi.xyqb.com/http\:\/\/${server_host}:7029/g" $entry sed -i "s/https\:\/\/gyxdapi.xyqb.com/http\:\/\/${server_host}:7029/g" $entry
sed -i "s/http\:\/\/btapi.xyqb.com/http\:\/\/${server_host}:7025/g" $entry
sed -i "s/https\:\/\/btapi.xyqb.com/http\:\/\/${server_host}:7025/g" $entry
done done
\ No newline at end of file
...@@ -13,6 +13,7 @@ if [ -n "$project_folder" ];then ...@@ -13,6 +13,7 @@ if [ -n "$project_folder" ];then
sh $config_server/show_info.sh $project_name pull代码 $desc sh $config_server/show_info.sh $project_name pull代码 $desc
cd ./$project_name cd ./$project_name
git checkout ./ git checkout ./
git fetch
git pull git pull
if [ -n "$git_branch" ]; then if [ -n "$git_branch" ]; then
echo "checkout specified branch $git_branch" echo "checkout specified branch $git_branch"
......
...@@ -18,6 +18,7 @@ function getCode() ...@@ -18,6 +18,7 @@ function getCode()
sh $config_server/show_info.sh $project pull代码 $desc sh $config_server/show_info.sh $project pull代码 $desc
cd ./$project cd ./$project
git checkout ./ git checkout ./
git fetch
git pull git pull
if [ -n "$git_branch" ]; then if [ -n "$git_branch" ]; then
git checkout -f $git_branch git checkout -f $git_branch
......
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
project_path=/home/quant_group/jenkins/workspace/XyqbAndroidBuild project_path=/home/quant_group/jenkins/workspace/XyqbAndroidBuild
target_file=${project_path}/app/build.gradle target_file=${project_path}/app/build.gradle
store_path=/home/ganshc/ store_path=/home/ganshc/
source_file=${store_path}/build.gradle source_gradlefile=${store_path}/build.gradle
source_flavors=${store_path}/markets.txt
buildapk_path=/home/quant_group/jenkins/workspace/XyqbAndroidBuild/build/archives buildapk_path=/home/quant_group/jenkins/workspace/XyqbAndroidBuild/build/archives
branch_name=$1 branch_name=$1
product_flavors=$2 product_flavors=$2
...@@ -11,10 +12,12 @@ product_flavors=$2 ...@@ -11,10 +12,12 @@ product_flavors=$2
cd ${project_path} cd ${project_path}
if [ -z ${branch_name} ]; then function get_code()
{
if [ -z ${branch_name} ]; then
echo "checkout default branch master" echo "checkout default branch master"
git pull git pull
else else
echo "checkout specified branch ${branch_name}" echo "checkout specified branch ${branch_name}"
which git which git
git checkout ${branch_name} git checkout ${branch_name}
...@@ -25,23 +28,45 @@ else ...@@ -25,23 +28,45 @@ else
echo "Fail to checkout branch ${branch_name}". echo "Fail to checkout branch ${branch_name}".
exit -1 exit -1
fi fi
fi fi
}
echo "copy file to app"
cp -r ${source_file} ${target_file}
echo "gradle build start"
gradle clean resguard --stacktrace --debug
echo "rename apk" function build_android()
{
echo "拷贝可使用的gradle文件"
cp -r ${source_gradlefile} ${target_file}
if [[ ! -z ${product_flavors} ]]; then
echo "${product_flavors}" > ${project_path}/markets.txt
fi
rm -rf ${project_path}/apk/*
echo "开始使用gradle进行编译该版本的代码"
gradle clean resguard --stacktrace --debug
if [ $? = 0 ]; then
echo "gradle build is ok".
echo "开始重命名对应的渠道包"
#apkfile="`find ${buildapk_path} -name "*${product_flavors}.apk"`"
#apkfile=`grep "${product_flavors}" *.apk`
apkfile=`ls ${buildapk_path} | grep "${product_flavors}"`
echo ${apkfile}
echo "当前路径"
cd ${buildapk_path}
pwd
mv ${apkfile} ${project_path}/apk/${branch_name}_${product_flavors}.apk
else
echo "Fail to build android".
exit -1
fi
}
cd ${buildapk_path} function upload_apk()
{
echo "正在将apk上传到蒲公英,请等待......"
curl -F "file=@${project_path}/apk/${branch_name}_${product_flavors}.apk" -F "uKey=13d17385c02ea9ea994d0c985d87ff32" -F "_api_key=5b09af98d5a8ff43f2f39935fa6bfbc1" https://static.pgyer.com/app/qrcode/lJrv
}
cp *${product_flavors}.apk /home/quant_group/jenkins/workspace/XyqbAndroidBuild/apk/${branch_name}_${product_flavors}.apk get_code
echo "upload apk to pugongyin" build_android
curl -F "file=@/home/quant_group/jenkins/workspace/XyqbAndroidBuild/apk/${branch_name}_${product_flavors}.apk" -F "uKey=13d17385c02ea9ea994d0c985d87ff32" -F "_api_key=5b09af98d5a8ff43f2f39935fa6bfbc1" https://static.pgyer.com/app/qrcode/lJrv #upload_apk
...@@ -84,11 +84,11 @@ new pClass().init(true, "ui", "7043", "xyqb-user-ui", "head_group", null, "src/a ...@@ -84,11 +84,11 @@ new pClass().init(true, "ui", "7043", "xyqb-user-ui", "head_group", null, "src/a
new pClass().init(true, "ui", "7039", "merchant-op-ui", "QG", null, "src/js/env.config.js", "npm run build", "node7", 1, "商户系统-ui",""); new pClass().init(true, "ui", "7039", "merchant-op-ui", "QG", null, "src/js/env.config.js", "npm run build", "node7", 1, "商户系统-ui","");
new pClass().init(true, "ui", "7004", "di-ting-ui", "QG", null, "client/app/config.js", "grunt build", "node7", 1, "信审-ui",""); new pClass().init(true, "ui", "7004", "di-ting-ui", "QG", null, "client/app/config.js", "grunt build", "node7", 1, "信审-ui","");
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", "7020", "spider-center-ui", "QG", null, "src/app/config/env.config.js", "npm run qa", "node7", 1, "授信中心-ui","");
new pClass().init(true, "ui", "7002", "qgbc-ui", "QG", null, "src/app/config/env.config.js", "npm run build_production", "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", "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", "gulp build", "node7", 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", "7048", "order-op-ui", "OP", null, "src/js/env.config.js", "gulp 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", "7050", "bt-ui", "QG", null, "src/app/config/env.config.js", "npm run qa", "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 // node
new pClass().init(true, "node", "7018", "AppBackend", "QG", null, "config/environment/test.js", "forever start -a -s --uid AppBackend bin/www", null, 1, "APP后台服务-server","","forever stop AppBackend"); new pClass().init(true, "node", "7018", "AppBackend", "QG", null, "config/environment/test.js", "forever start -a -s --uid AppBackend bin/www", null, 1, "APP后台服务-server","","forever stop AppBackend");
new pClass().init(true, "node", "7041", "activity-op", "QG", null, "src/config.js", "forever start -a -s --uid activity-op src/app.js", null, 1, "优惠券中心-server","","forever stop activity-op"); new pClass().init(true, "node", "7041", "activity-op", "QG", null, "src/config.js", "forever start -a -s --uid activity-op src/app.js", null, 1, "优惠券中心-server","","forever stop activity-op");
......
...@@ -62,12 +62,11 @@ tranceConfig java "hubei.api.url=http:\/\/192.168.100.185:8585" "hubei.api.url=h ...@@ -62,12 +62,11 @@ tranceConfig java "hubei.api.url=http:\/\/192.168.100.185:8585" "hubei.api.url=h
#tranceConfig java "192.168.4.14:7007" "139.198.2.95:1407" "192.168.4.14" "gu-bei.properties" #tranceConfig java "192.168.4.14:7007" "139.198.2.95:1407" "192.168.4.14" "gu-bei.properties"
#tranceConfig java "paycenter.exception.debug=1" "paycenter.exception.debug=0" "192.168.4.15" "gu-bei.properties"
#tranceConfig java "192.168.4.14:3306" "192.168.4.20:3306" "192.168.4.14" "*"
#tranceConfig python "192.168.4.14" "192.168.4.20" "192.168.4.14" "qin-qiong.*"
tranceConfig java "spider-center.host=http:\/\/192.168.4.12:7021\/" "spider-center.host=http:\/\/spider-center-12.ss.xyqb.loan\/" "192.168.4.12" "spider-center.properties"
tranceConfig java "qgbc-ui.url=http:\/\/192.168.4.152:7002" "qgbc-ui.url=http:\/\/192.168.4.152:7050" "192.168.4.152" "xyqb.properties"
#!/bin/bash
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
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
}
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
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
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
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
done
server_addr: ss.xyqb.loan:4443
trust_host_root_certs: false
tunnels:
xyqb-iplast:
proto:
http: "7003"
baitiao-iplast:
proto:
http: "7025"
xyqb-mall-iplast:
proto:
http: "7019"
xyqb-offline-iplast:
proto:
http: "7010"
xyqb-user2-iplast:
proto:
http: "7042"
di-ting-iplast:
proto:
http: "7005"
han-gu-guan-iplast:
proto:
http: "7013"
jian-men-guan-iplast:
proto:
http: "7015"
black-hole-iplast:
proto:
http: "7028"
gu-bei-iplast:
proto:
http: "7006"
xyqb-quartz-iplast:
proto:
http: "7023"
spider-center-iplast:
proto:
http: "7021"
cash-loan-flow-iplast:
proto:
http: "7037"
financial-system-iplast:
proto:
http: "7012"
fund-manage-iplast:
proto:
http: "7034"
gyxd-iplast:
proto:
http: "7029"
merchant-backend-iplast:
proto:
http: "7038"
redpacket-iplast:
proto:
http: "7031"
finance-api-iplast:
proto:
http: "7044"
check-accounts-iplast:
proto:
http: "7045"
du-jiang-yan-iplast:
proto:
http: "7014"
op-ui-iplast:
proto:
http: "7032"
activity-ui-iplast:
proto:
http: "7040"
financial-system-ui-iplast:
proto:
http: "7011"
gyxd-ui-iplast:
proto:
http: "7030"
offline-ui-iplast:
proto:
http: "7008"
funding-corp-op-ui-iplast:
proto:
http: "7035"
paycenter-ui-iplast:
proto:
http: "7007"
xyqb-user-ui-iplast:
proto:
http: "7043"
merchant-op-ui-iplast:
proto:
http: "7039"
di-ting-ui-iplast:
proto:
http: "7004"
spider-center-ui-iplast:
proto:
http: "7020"
qgbc-ui-iplast:
proto:
http: "7002"
xyqb-ui-iplast:
proto:
http: "7001"
activity-op-ui-iplast:
proto:
http: "7046"
order-op-ui-iplast:
proto:
http: "7048"
bt-ui-iplast:
proto:
http: "7050"
AppBackend-iplast:
proto:
http: "7018"
activity-op-iplast:
proto:
http: "7041"
op-api-iplast:
proto:
http: "7047"
fe-api-iplast:
proto:
http: "7049"
qin-qiong-iplast:
proto:
http: "7022"
xyqb-query-iplast:
proto:
http: "7033"
...@@ -18,6 +18,9 @@ do ...@@ -18,6 +18,9 @@ do
mkdir $dir/public mkdir $dir/public
rm $dir/public/java rm $dir/public/java
mkdir $dir/public/java mkdir $dir/public/java
rm $dir/special
mkdir $dir/special
cp -rf /home/config_files/java/* $dir/java/ cp -rf /home/config_files/java/* $dir/java/
cp -rf /home/config_files/java/* $dir/public/java/ 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_host_name/${IP_host_first}${ip_last_num}/" $dir/java/*
...@@ -40,6 +43,8 @@ do ...@@ -40,6 +43,8 @@ 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/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/zk.connect.url=${public_ip}/zk.connect.url=${IP_host_first}${ip_last_num}/g" $dir/public/java/*
cp -rf /home/config_files/special/* $dir/special/
sed -i "s/iplast/${ip_last_num}/g" $dir/special/ngrok_confg.yml
#python项目发布 #python项目发布
rm -rf $dir/python rm -rf $dir/python
...@@ -79,3 +84,8 @@ do ...@@ -79,3 +84,8 @@ do
# sed -i "s/target_host_name/${IP_host_first}${ip_last_num}/" $dir/nginx_conf.d/* # sed -i "s/target_host_name/${IP_host_first}${ip_last_num}/" $dir/nginx_conf.d/*
done done
sh /home/qa-deploy-utils/qa_shell_script/exception_sub_shell.sh
...@@ -25,11 +25,11 @@ if [[ $database_name = 'xyqb' ]]; then ...@@ -25,11 +25,11 @@ if [[ $database_name = 'xyqb' ]]; then
# 信用钱包database # 信用钱包database
# repay v_manifest v_repay 是view类型的 # repay v_manifest v_repay 是view类型的
# secure_proxy 表里面的数据需要被同步 # secure_proxy 表里面的数据需要被同步
sys_table_list='baitiao_merchant baitiao_secure_key channel funding_contract funding_corp loan_product merchant_channel payeco_return_url_info red_packet t_phonenum zmxy_return_url configuration repay v_manifest v_repay secure_proxy' sys_table_list='baitiao_merchant baitiao_secure_key channel funding_contract funding_corp loan_product merchant_channel payeco_return_url_info red_packet t_phonenum zmxy_return_url configuration repay v_manifest v_repay secure_proxy funding_corp_config'
port='3306' port='3306'
elif [[ $database_name = 'xyqb_app' ]]; then elif [[ $database_name = 'xyqb_app' ]]; then
# app-backend使用的数据库 # app-backend使用的数据库
sys_table_list='activities app_banners app_config app_versions banners blanknote_entries credit_questions hot_games loan_banners loan_questions migrations sharings widgets' sys_table_list='activities app_banners app_config app_versions banners blanknote_entries credit_questions hot_games loan_banners loan_questions migrations sharings widgets js_patch upgrade_version'
port='3307' port='3307'
elif [[ $database_name = 'payment_center' ]]; then elif [[ $database_name = 'payment_center' ]]; then
# 支付中心 # 支付中心
...@@ -45,7 +45,7 @@ elif [[ $database_name = 'dujiangyan' ]]; then ...@@ -45,7 +45,7 @@ elif [[ $database_name = 'dujiangyan' ]]; then
port='3310' port='3310'
elif [[ $database_name = 'mall' ]]; then elif [[ $database_name = 'mall' ]]; then
# 白条商城 # 白条商城
sys_table_list='activity_3c_product ad_detail new_3c_product supplier 3c_product 3c_product_spec apix_phone_recharge_detail apix_recharge_project apix_recharge_project_bak category configuration course_detail_info course_info merchant pay19_recharge_project product' sys_table_list='mall_config activity_3c_product ad_detail new_3c_product supplier 3c_product 3c_product_spec apix_phone_recharge_detail apix_recharge_project apix_recharge_project_bak category configuration course_detail_info course_info merchant pay19_recharge_project product product_sku product_sku_image product_spu product_nature nature_value'
port='3310' port='3310'
elif [[ $database_name = 'qinqiong' ]]; then elif [[ $database_name = 'qinqiong' ]]; then
# qinqiong # qinqiong
...@@ -77,7 +77,7 @@ elif [[ $database_name = 'sms-center' ]]; then ...@@ -77,7 +77,7 @@ elif [[ $database_name = 'sms-center' ]]; then
port='3311' port='3311'
elif [[ $database_name = 'spider_center' ]]; then elif [[ $database_name = 'spider_center' ]]; then
# 授信中心 # 授信中心
sys_table_list='merchant merchant_config' sys_table_list='merchant merchant_config notify_message'
port='3312' port='3312'
elif [[ $database_name = 'xyqb_user' ]]; then elif [[ $database_name = 'xyqb_user' ]]; then
# 用户中心 # 用户中心
......
...@@ -65,7 +65,8 @@ sed -i "s/https\:\/\/scapi.xyqb.com/http\:\/\/${server_host}:7021/g" ${database_ ...@@ -65,7 +65,8 @@ sed -i "s/https\:\/\/scapi.xyqb.com/http\:\/\/${server_host}:7021/g" ${database_
sed -i "s/http\:\/\/gyxdapi.xyqb.com/http\:\/\/${server_host}:7029/g" ${database_name}_${mysql_host}.sql sed -i "s/http\:\/\/gyxdapi.xyqb.com/http\:\/\/${server_host}:7029/g" ${database_name}_${mysql_host}.sql
sed -i "s/https\:\/\/gyxdapi.xyqb.com/http\:\/\/${server_host}:7029/g" ${database_name}_${mysql_host}.sql sed -i "s/https\:\/\/gyxdapi.xyqb.com/http\:\/\/${server_host}:7029/g" ${database_name}_${mysql_host}.sql
sed -i "s/http\:\/\/btapi.xyqb.com/http\:\/\/${server_host}:7025/g" ${database_name}_${mysql_host}.sql
sed -i "s/https\:\/\/btapi.xyqb.com/http\:\/\/${server_host}:7025/g" ${database_name}_${mysql_host}.sql
if [[ "${use_public_ip}" = true ]]; then if [[ "${use_public_ip}" = true ]]; then
......
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