liuloulou / auto_deploy_test · Commits

Go to a project

Authored by chunhua.zhang
Commit eb7ee96672512fba9c364f7b755c02d2d02a08ed 2 parents eb163f4e 878315d6

Merge branch 'master' of git.yoho.cn:yohoops/auto_deploy_test

Inline Side-by-side
Showing 9 changed files with 33 additions and 10 deletions
... ... @@ -44,6 +44,8 @@ jdbc.mysql.yhorders.password=9nm0icOwt6bMHjMusIfMLw==
# yh_orders db split
jdbc.mysql.yhorderssplit.master=192.168.102.202:8066
jdbc.mysql.yhorderssplit.slave=192.168.102.202:8066
jdbc.mysql.yhorderssplit.slave2=192.168.102.202:8066
jdbc.mysql.yhorderssplit.slave3=192.168.102.202:8066
jdbc.mysql.yhorderssplit.username=yh_test
jdbc.mysql.yhorderssplit.password=9nm0icOwt6bMHjMusIfMLw==
... ...
... ... @@ -4,7 +4,7 @@ autoconfig.properties = sharedAutoconfig
autoconfig.properties.sharedAutoconfig = file:/home/dev/auto_deploy/deploy/autoconfig/dev/global-autoconfig.properties
browse.service.url = http://api.brower.yohoops.org:8092/brower/
browse.service.url = http://192.168.103.59:8092/brower/
degrade_articleNotice_level = 0
degrade_complaintsCount_level = 0
... ...
jdbc.mysql.readonlyinslave=true
autoconfig.properties = sharedAutoconfig
autoconfig.properties.sharedAutoconfig = file:/home/dev/auto_deploy/deploy/autoconfig/dev/global-autoconfig.properties
... ...
... ... @@ -58,6 +58,8 @@ unionpay.notifyurl = http://dev-service.yohops.com:9999/payment/unionpay_newnot
wechat.app.newnotifyurl = http://dev-service.yohops.com:9999/payment/weixin_notify
wechat.app.notifyurl = http://dev-service.yohops.com:9999/payment/wechat_notify
alipay.notifyurl = http://dev-service.yohops.com:9999/payment/alipay_notify
cmbnetpay.payNoticeUrl=http://dev-service.yohops.com:9999/payment/cmbpay_notify
cmbnetpay.signNoticeUrl=http://dev-service.yohops.com:9999/payment/cmbsign_notify
# 优惠券ID
... ...
... ... @@ -16,7 +16,7 @@ build.productindex.use.code=true
build.storageskuindex.use.code=true
#consumer index config
search.index.batch.limit=2500
search.index.batch.limit=5000
search.index.batch.limit.tbl=2000
search.index.batch.max.thread.size=10
... ...
... ... @@ -21,7 +21,7 @@ canal.subscribeChannel.operation=yhb_operations.activity_product,yhb_operations.
##cancal-erpproduct
canal.destination.erpproduct=erpproduct
canal.subscribeChannel.erpproduct=erp_product.product_pool_detail
canal.subscribeChannel.erpproduct=erp_product.product_pool_detail,erp_product.product_ext
##cancal-erpcustomerservice
canal.destination.erpcustomerservice=erpcustomerservice
... ...
... ... @@ -59,6 +59,8 @@ unionpay.notifyurl = http://service-test1.yohops.com:9999/payment/unionpay_newn
wechat.app.newnotifyurl =http://service-test1.yohops.com:9999/payment/weixin_notify
wechat.app.notifyurl = http://service-test1.yohops.com:9999/payment/wechat_notify
alipay.notifyurl = http://service-test1.yohops.com:9999/payment/alipay_notify
cmbnetpay.payNoticeUrl=http://service-test1.yohops.com:9999/payment/cmbpay_notify
cmbnetpay.signNoticeUrl=http://service-test1.yohops.com:9999/payment/cmbsign_notify
# unionmpos env: 00,production enviroment; 01,test enviroment
unionmpos.env=00
\ No newline at end of file
... ...
... ... @@ -15,6 +15,8 @@ unionpay.notifyurl = http://service-test3.yohops.com:9999/payment/unionpay_newn
wechat.app.newnotifyurl = http://service-test3.yohops.com:9999/payment/weixin_notify
wechat.app.notifyurl = http://service-test3.yohops.com:9999/payment/wechat_notify
alipay.notifyurl = http://service-test3.yohops.com:9999/payment/alipay_notify
cmbnetpay.payNoticeUrl=http://service-test3.yohops.com:9999/payment/cmbpay_notify
cmbnetpay.signNoticeUrl=http://service-test3.yohops.com:9999/payment/cmbsign_notify
java.logs.home = /Data/logs
... ...
... ... @@ -139,6 +139,7 @@ init(){
IPATBLE_HOME=$OPPS_DEPLOY_HOME/scripts/iptable/$SERVERS
AUTOCONFIG_HOME_BASE=$OPPS_DEPLOY_HOME/autoconfig
IPATBLE_HOME_BASE=$OPPS_DEPLOY_HOME/scripts/iptable
echo "init ok"
}
... ... @@ -166,6 +167,8 @@ package(){
git pull origin master
fi
echo "package 1"
####update iptables
if [ -d "$IPATBLE_HOME" ]; then
echo "[INFO] start to update ips..."
... ... @@ -174,10 +177,14 @@ package(){
git pull origin master
fi
echo "package 2"
## always remove old code
echo " start to remove existed src folder: $ROJECT_SOURCE_BRANCH_DIR "
rm -rf $ROJECT_SOURCE_BRANCH_DIR
echo "package 3"
###update source code
if [ ! -d "$PROJECT_SOURCE_DIR" ]; then
echo "[INFO] git clone -b $APP_BRANCH $GIT_BASE_URL$GIT_GROUP/$APP_NAME.git $APP_BRANCH"
... ... @@ -205,6 +212,7 @@ package(){
git checkout tags/$TAG_NAME -b branch-$TAG_NAME
fi
echo "package 4"
cd $ROJECT_SOURCE_BRANCH_DIR/bin
###package app
... ... @@ -212,13 +220,18 @@ package(){
if [ ! -d $AUTOCONFIG_HOME ]; then
mkdir -p $AUTOCONFIG_HOME
fi
result=`sh $ROJECT_SOURCE_BRANCH_DIR/bin/mvn-package.sh $AUTOCONFIG_HOME/${APP_NAME}-autoconfig.properties $AUTOCONFIG_HOME/global-autoconfig.properties`
echo "$result"
if [[ "$result" =~ "FAILURE" ]] && [[ "$result" =~ "ERROR" ]];then
PACKAGE_RESULT="FAILED"
else
PACKAGE_RESULT="SUCCESS"
fi
echo "package 5"
echo "current path is " `pwd`
echo "result cmd is sh $ROJECT_SOURCE_BRANCH_DIR/bin/mvn-package.sh $AUTOCONFIG_HOME/${APP_NAME}-autoconfig.properties $AUTOCONFIG_HOME/global-autoconfig.properties"
sh $ROJECT_SOURCE_BRANCH_DIR/bin/mvn-package.sh $AUTOCONFIG_HOME/${APP_NAME}-autoconfig.properties $AUTOCONFIG_HOME/global-autoconfig.properties
#echo "result = $result"
#if [[ "$result" =~ "FAILURE" ]] && [[ "$result" =~ "ERROR" ]];then
# PACKAGE_RESULT="FAILED"
# else
# PACKAGE_RESULT="SUCCESS"
#fi
echo "[INFO] package application finish."
###commit autoconfig
... ...