yohoops / 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== @@ -44,6 +44,8 @@ jdbc.mysql.yhorders.password=9nm0icOwt6bMHjMusIfMLw==
44 # yh_orders db split 44 # yh_orders db split
45 jdbc.mysql.yhorderssplit.master=192.168.102.202:8066 45 jdbc.mysql.yhorderssplit.master=192.168.102.202:8066
46 jdbc.mysql.yhorderssplit.slave=192.168.102.202:8066 46 jdbc.mysql.yhorderssplit.slave=192.168.102.202:8066
  47 +jdbc.mysql.yhorderssplit.slave2=192.168.102.202:8066
  48 +jdbc.mysql.yhorderssplit.slave3=192.168.102.202:8066
47 jdbc.mysql.yhorderssplit.username=yh_test 49 jdbc.mysql.yhorderssplit.username=yh_test
48 jdbc.mysql.yhorderssplit.password=9nm0icOwt6bMHjMusIfMLw== 50 jdbc.mysql.yhorderssplit.password=9nm0icOwt6bMHjMusIfMLw==
49 51
@@ -4,7 +4,7 @@ autoconfig.properties = sharedAutoconfig @@ -4,7 +4,7 @@ autoconfig.properties = sharedAutoconfig
4 4
5 autoconfig.properties.sharedAutoconfig = file:/home/dev/auto_deploy/deploy/autoconfig/dev/global-autoconfig.properties 5 autoconfig.properties.sharedAutoconfig = file:/home/dev/auto_deploy/deploy/autoconfig/dev/global-autoconfig.properties
6 6
7 -browse.service.url = http://api.brower.yohoops.org:8092/brower/ 7 +browse.service.url = http://192.168.103.59:8092/brower/
8 8
9 degrade_articleNotice_level = 0 9 degrade_articleNotice_level = 0
10 degrade_complaintsCount_level = 0 10 degrade_complaintsCount_level = 0
  1 +
  2 +jdbc.mysql.readonlyinslave=true
1 autoconfig.properties = sharedAutoconfig 3 autoconfig.properties = sharedAutoconfig
2 4
3 autoconfig.properties.sharedAutoconfig = file:/home/dev/auto_deploy/deploy/autoconfig/dev/global-autoconfig.properties 5 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 @@ -58,6 +58,8 @@ unionpay.notifyurl = http://dev-service.yohops.com:9999/payment/unionpay_newnot
58 wechat.app.newnotifyurl = http://dev-service.yohops.com:9999/payment/weixin_notify 58 wechat.app.newnotifyurl = http://dev-service.yohops.com:9999/payment/weixin_notify
59 wechat.app.notifyurl = http://dev-service.yohops.com:9999/payment/wechat_notify 59 wechat.app.notifyurl = http://dev-service.yohops.com:9999/payment/wechat_notify
60 alipay.notifyurl = http://dev-service.yohops.com:9999/payment/alipay_notify 60 alipay.notifyurl = http://dev-service.yohops.com:9999/payment/alipay_notify
  61 +cmbnetpay.payNoticeUrl=http://dev-service.yohops.com:9999/payment/cmbpay_notify
  62 +cmbnetpay.signNoticeUrl=http://dev-service.yohops.com:9999/payment/cmbsign_notify
61 63
62 64
63 # 优惠券ID 65 # 优惠券ID
@@ -16,7 +16,7 @@ build.productindex.use.code=true @@ -16,7 +16,7 @@ build.productindex.use.code=true
16 build.storageskuindex.use.code=true 16 build.storageskuindex.use.code=true
17 17
18 #consumer index config 18 #consumer index config
19 -search.index.batch.limit=2500 19 +search.index.batch.limit=5000
20 search.index.batch.limit.tbl=2000 20 search.index.batch.limit.tbl=2000
21 search.index.batch.max.thread.size=10 21 search.index.batch.max.thread.size=10
22 22
@@ -21,7 +21,7 @@ canal.subscribeChannel.operation=yhb_operations.activity_product,yhb_operations. @@ -21,7 +21,7 @@ canal.subscribeChannel.operation=yhb_operations.activity_product,yhb_operations.
21 21
22 ##cancal-erpproduct 22 ##cancal-erpproduct
23 canal.destination.erpproduct=erpproduct 23 canal.destination.erpproduct=erpproduct
24 -canal.subscribeChannel.erpproduct=erp_product.product_pool_detail 24 +canal.subscribeChannel.erpproduct=erp_product.product_pool_detail,erp_product.product_ext
25 25
26 ##cancal-erpcustomerservice 26 ##cancal-erpcustomerservice
27 canal.destination.erpcustomerservice=erpcustomerservice 27 canal.destination.erpcustomerservice=erpcustomerservice
@@ -59,6 +59,8 @@ unionpay.notifyurl = http://service-test1.yohops.com:9999/payment/unionpay_newn @@ -59,6 +59,8 @@ unionpay.notifyurl = http://service-test1.yohops.com:9999/payment/unionpay_newn
59 wechat.app.newnotifyurl =http://service-test1.yohops.com:9999/payment/weixin_notify 59 wechat.app.newnotifyurl =http://service-test1.yohops.com:9999/payment/weixin_notify
60 wechat.app.notifyurl = http://service-test1.yohops.com:9999/payment/wechat_notify 60 wechat.app.notifyurl = http://service-test1.yohops.com:9999/payment/wechat_notify
61 alipay.notifyurl = http://service-test1.yohops.com:9999/payment/alipay_notify 61 alipay.notifyurl = http://service-test1.yohops.com:9999/payment/alipay_notify
  62 +cmbnetpay.payNoticeUrl=http://service-test1.yohops.com:9999/payment/cmbpay_notify
  63 +cmbnetpay.signNoticeUrl=http://service-test1.yohops.com:9999/payment/cmbsign_notify
62 64
63 # unionmpos env: 00,production enviroment; 01,test enviroment 65 # unionmpos env: 00,production enviroment; 01,test enviroment
64 unionmpos.env=00 66 unionmpos.env=00
@@ -15,6 +15,8 @@ unionpay.notifyurl = http://service-test3.yohops.com:9999/payment/unionpay_newn @@ -15,6 +15,8 @@ unionpay.notifyurl = http://service-test3.yohops.com:9999/payment/unionpay_newn
15 wechat.app.newnotifyurl = http://service-test3.yohops.com:9999/payment/weixin_notify 15 wechat.app.newnotifyurl = http://service-test3.yohops.com:9999/payment/weixin_notify
16 wechat.app.notifyurl = http://service-test3.yohops.com:9999/payment/wechat_notify 16 wechat.app.notifyurl = http://service-test3.yohops.com:9999/payment/wechat_notify
17 alipay.notifyurl = http://service-test3.yohops.com:9999/payment/alipay_notify 17 alipay.notifyurl = http://service-test3.yohops.com:9999/payment/alipay_notify
  18 +cmbnetpay.payNoticeUrl=http://service-test3.yohops.com:9999/payment/cmbpay_notify
  19 +cmbnetpay.signNoticeUrl=http://service-test3.yohops.com:9999/payment/cmbsign_notify
18 20
19 java.logs.home = /Data/logs 21 java.logs.home = /Data/logs
20 22
@@ -139,6 +139,7 @@ init(){ @@ -139,6 +139,7 @@ init(){
139 IPATBLE_HOME=$OPPS_DEPLOY_HOME/scripts/iptable/$SERVERS 139 IPATBLE_HOME=$OPPS_DEPLOY_HOME/scripts/iptable/$SERVERS
140 AUTOCONFIG_HOME_BASE=$OPPS_DEPLOY_HOME/autoconfig 140 AUTOCONFIG_HOME_BASE=$OPPS_DEPLOY_HOME/autoconfig
141 IPATBLE_HOME_BASE=$OPPS_DEPLOY_HOME/scripts/iptable 141 IPATBLE_HOME_BASE=$OPPS_DEPLOY_HOME/scripts/iptable
  142 + echo "init ok"
142 } 143 }
143 144
144 145
@@ -166,6 +167,8 @@ package(){ @@ -166,6 +167,8 @@ package(){
166 git pull origin master 167 git pull origin master
167 fi 168 fi
168 169
  170 + echo "package 1"
  171 +
169 ####update iptables 172 ####update iptables
170 if [ -d "$IPATBLE_HOME" ]; then 173 if [ -d "$IPATBLE_HOME" ]; then
171 echo "[INFO] start to update ips..." 174 echo "[INFO] start to update ips..."
@@ -174,10 +177,14 @@ package(){ @@ -174,10 +177,14 @@ package(){
174 git pull origin master 177 git pull origin master
175 fi 178 fi
176 179
  180 + echo "package 2"
  181 +
177 ## always remove old code 182 ## always remove old code
178 echo " start to remove existed src folder: $ROJECT_SOURCE_BRANCH_DIR " 183 echo " start to remove existed src folder: $ROJECT_SOURCE_BRANCH_DIR "
179 rm -rf $ROJECT_SOURCE_BRANCH_DIR 184 rm -rf $ROJECT_SOURCE_BRANCH_DIR
180 185
  186 + echo "package 3"
  187 +
181 ###update source code 188 ###update source code
182 if [ ! -d "$PROJECT_SOURCE_DIR" ]; then 189 if [ ! -d "$PROJECT_SOURCE_DIR" ]; then
183 echo "[INFO] git clone -b $APP_BRANCH $GIT_BASE_URL$GIT_GROUP/$APP_NAME.git $APP_BRANCH" 190 echo "[INFO] git clone -b $APP_BRANCH $GIT_BASE_URL$GIT_GROUP/$APP_NAME.git $APP_BRANCH"
@@ -205,6 +212,7 @@ package(){ @@ -205,6 +212,7 @@ package(){
205 git checkout tags/$TAG_NAME -b branch-$TAG_NAME 212 git checkout tags/$TAG_NAME -b branch-$TAG_NAME
206 fi 213 fi
207 214
  215 + echo "package 4"
208 216
209 cd $ROJECT_SOURCE_BRANCH_DIR/bin 217 cd $ROJECT_SOURCE_BRANCH_DIR/bin
210 ###package app 218 ###package app
@@ -212,13 +220,18 @@ package(){ @@ -212,13 +220,18 @@ package(){
212 if [ ! -d $AUTOCONFIG_HOME ]; then 220 if [ ! -d $AUTOCONFIG_HOME ]; then
213 mkdir -p $AUTOCONFIG_HOME 221 mkdir -p $AUTOCONFIG_HOME
214 fi 222 fi
215 - result=`sh $ROJECT_SOURCE_BRANCH_DIR/bin/mvn-package.sh $AUTOCONFIG_HOME/${APP_NAME}-autoconfig.properties $AUTOCONFIG_HOME/global-autoconfig.properties`  
216 - echo "$result"  
217 - if [[ "$result" =~ "FAILURE" ]] && [[ "$result" =~ "ERROR" ]];then  
218 - PACKAGE_RESULT="FAILED"  
219 - else  
220 - PACKAGE_RESULT="SUCCESS"  
221 - fi 223 +
  224 + echo "package 5"
  225 + echo "current path is " `pwd`
  226 + echo "result cmd is sh $ROJECT_SOURCE_BRANCH_DIR/bin/mvn-package.sh $AUTOCONFIG_HOME/${APP_NAME}-autoconfig.properties $AUTOCONFIG_HOME/global-autoconfig.properties"
  227 +
  228 + sh $ROJECT_SOURCE_BRANCH_DIR/bin/mvn-package.sh $AUTOCONFIG_HOME/${APP_NAME}-autoconfig.properties $AUTOCONFIG_HOME/global-autoconfig.properties
  229 + #echo "result = $result"
  230 + #if [[ "$result" =~ "FAILURE" ]] && [[ "$result" =~ "ERROR" ]];then
  231 + # PACKAGE_RESULT="FAILED"
  232 + # else
  233 + # PACKAGE_RESULT="SUCCESS"
  234 + #fi
222 echo "[INFO] package application finish." 235 echo "[INFO] package application finish."
223 236
224 ###commit autoconfig 237 ###commit autoconfig