diff --git a/autoconfig/dev/global-autoconfig.properties b/autoconfig/dev/global-autoconfig.properties index b09f690..c89a651 100644 --- a/autoconfig/dev/global-autoconfig.properties +++ b/autoconfig/dev/global-autoconfig.properties @@ -1,5 +1,5 @@ ##########111111111111111111111111111 -yoho.logs.level = INFO +yoho.logs.level = ERROR yoho.logs.basedir = /Data/logs yoho.logs.maxHistory = 7 yoho.logs.maxFileSize = 10MB diff --git a/autoconfig/dev/yoho-mars-autoconfig.properties b/autoconfig/dev/yoho-mars-autoconfig.properties index 4472144..6c5585e 100644 --- a/autoconfig/dev/yoho-mars-autoconfig.properties +++ b/autoconfig/dev/yoho-mars-autoconfig.properties @@ -18,4 +18,9 @@ redis.readonly.proxy.port=6380 redis.readonly.proxy.address=192.168.102.17 redis.notsync.twemproxy.addresses=192.168.102.17:6380 mars.task.switch=true -exchange.cur.appkey=8154ce96f69f2bb7755b9f477091d3d7 \ No newline at end of file +exchange.cur.appkey=8154ce96f69f2bb7755b9f477091d3d7 + +activity.save.msg=编辑团队会尽快审核，请留意系统通知 + +WECHAT_APPID=wx9d0d7dfed5bbaa8b +WECHAT_APPSECRET=3d37f946bca59a8c082ee8111adf6c6c \ No newline at end of file diff --git a/autoconfig/dev/yohobuy-platform-autoconfig.properties b/autoconfig/dev/yohobuy-platform-autoconfig.properties index 6923104..f0cb3ff 100644 --- a/autoconfig/dev/yohobuy-platform-autoconfig.properties +++ b/autoconfig/dev/yohobuy-platform-autoconfig.properties @@ -92,7 +92,7 @@ price.changed.notice.phone=13512519156 shop.status.change.phone=123456 -erp.storage=http://serve.yohobuy.com +erp.storage=http://192.168.102.47:9098/erp-gateway-web #\u5e73\u53f0\u7aef\u767b\u9646\u5d4c\u5957iframe\u7684salt platform.login.salt=yoho9646yoho9646 resources_https_enable=true @@ -109,7 +109,7 @@ admin.login.url=http://192.168.102.211:30012 file.image.gif.size=2621440 erp.realStorage.url=http://192.168.13.24:8099/erp-gateway-web/shift_logs/query_stock_num_by_sku -erp.domain=http://192.168.102.47:9098/erp-gateway-web +erp.domain=http://serve.yohobuy.com jdbc.mysql.yhbpromotionsplitplatform.master=192.168.102.202:8066 jdbc.mysql.yhbpromotionsplitplatform.slave=192.168.102.202:8066 diff --git a/autoconfig/dev/yohobuy-portal-gateway-autoconfig.properties b/autoconfig/dev/yohobuy-portal-gateway-autoconfig.properties index 6bb1104..43840df 100644 --- a/autoconfig/dev/yohobuy-portal-gateway-autoconfig.properties +++ b/autoconfig/dev/yohobuy-portal-gateway-autoconfig.properties @@ -10,7 +10,7 @@ jdbc.mysql.readonlyinslave = true offline.shops.url = http://192.168.102.210:8098/shops -platform.host = http://192.168.102.75:8088/platform +platform.host = http://192.168.102.210:8088/platform yohobuy.portal.gateway.env.namespace = portal-gateway yohobuy.portal.gateway.env.serverport = 0 diff --git a/autoconfig/test/yohobuy-platform-autoconfig.properties b/autoconfig/test/yohobuy-platform-autoconfig.properties index 17563b0..421c421 100644 --- a/autoconfig/test/yohobuy-platform-autoconfig.properties +++ b/autoconfig/test/yohobuy-platform-autoconfig.properties @@ -88,6 +88,8 @@ offline.shops.url = http://192.168.102.47:8098/shops/ erp.shop.url = http://192.168.103.48:9098/erp-shop-web/ +stock.req.url = http://192.168.13.3:7070/erp-gateway-web/finance/calc/calcSknLowestPrice + platform.login.salt = yoho9646yoho9646 price.audit.firstRoleName = zuzhang1 diff --git a/autoconfig/test/yohobuy-wechat-autoconfig.properties b/autoconfig/test/yohobuy-wechat-autoconfig.properties index 83a54b7..9baa96d 100644 --- a/autoconfig/test/yohobuy-wechat-autoconfig.properties +++ b/autoconfig/test/yohobuy-wechat-autoconfig.properties @@ -2,8 +2,8 @@ autoconfig.properties = sharedAutoconfig autoconfig.properties.sharedAutoconfig = file:/home/master/opps/deploy/autoconfig/master/global-autoconfig.properties -wechat.access.appid = wx75e5a7c0c88e45c2 -wechat.access.secret = ce21ae4a3f93852279175a167e54509b +wechat.access.appid = wx1e6997242bcfcdfb +wechat.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd wechat.user.get = /cgi-bin/user/get wechat.user.info = /cgi-bin/user/info diff --git a/autoconfig/test_nj_1/yohobuy-wechat-autoconfig.properties b/autoconfig/test_nj_1/yohobuy-wechat-autoconfig.properties index cf3eda8..5112c8a 100644 --- a/autoconfig/test_nj_1/yohobuy-wechat-autoconfig.properties +++ b/autoconfig/test_nj_1/yohobuy-wechat-autoconfig.properties @@ -2,8 +2,8 @@ autoconfig.properties = sharedAutoconfig autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_1/global-autoconfig.properties -wechat.access.appid = wx75e5a7c0c88e45c2 -wechat.access.secret = ce21ae4a3f93852279175a167e54509b +wechat.access.appid = wx1e6997242bcfcdfb +wechat.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd wechat.small.program.access.appid = wx084ab813d88c594b wechat.small.program.access.secret = 0252d67ef15eb07a28d80098e8c186ac diff --git a/autoconfig/test_nj_2/global-autoconfig.properties b/autoconfig/test_nj_2/global-autoconfig.properties index e31a4d4..c212064 100644 --- a/autoconfig/test_nj_2/global-autoconfig.properties +++ b/autoconfig/test_nj_2/global-autoconfig.properties @@ -137,6 +137,13 @@ jdbc.mysql.yhbpromotionsplitplatform.slave=cobar2.yohoops.org:8066 jdbc.mysql.yhbpromotionsplitplatform.username=yh_test jdbc.mysql.yhbpromotionsplitplatform.password=9nm0icOwt6bMHjMusIfMLw== +jdbc.mysql.yohopassportsplit.master=cobar1.yohoops.org:8066 +jdbc.mysql.yohopassportsplit.slave=cobar2.yohoops.org:8066 +jdbc.mysql.yohopassportsplit.slave2=cobar2.yohoops.org:8066 +jdbc.mysql.yohopassportsplit.slave3=cobar2.yohoops.org:8066 +jdbc.mysql.yohopassportsplit.username=yh_test +jdbc.mysql.yohopassportsplit.password=9nm0icOwt6bMHjMusIfMLw== + jdbc.mysql.yhresource.master=write.cms.yohoops.org:3306 jdbc.mysql.yhresource.slave=read.cms.yohoops.org:3306 diff --git a/autoconfig/test_nj_2/yohobuy-wechat-autoconfig.properties b/autoconfig/test_nj_2/yohobuy-wechat-autoconfig.properties index 5da4bf3..aa8d76c 100644 --- a/autoconfig/test_nj_2/yohobuy-wechat-autoconfig.properties +++ b/autoconfig/test_nj_2/yohobuy-wechat-autoconfig.properties @@ -2,17 +2,21 @@ autoconfig.properties = sharedAutoconfig autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties -wechat.access.appid = wxa93ae0ebf9277248 -wechat.access.secret = 871bd302c7d0603657b68a0354f36868 +wechat.access.appid = wx1e6997242bcfcdfb +wechat.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd wechat.small.program.access.appid = wx084ab813d88c594b -wechat.small.program.access.secret = 0252d67ef15eb07a28d80098e8c186ac +wechat.small.program.access.secret = 045848c0e0d76f7699236e4a35d65948 + +wechat.subscription.access.appid = wx1e6997242bcfcdfb +wechat.subscription.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd wechat.user.get = /cgi-bin/user/get wechat.user.info = /cgi-bin/user/info +wechat.yohoshow.access.appid = wx1fe49f08f41b6c26 +wechat.yohoshow.access.secret = + yohobuy.wechat.env.namespace = wechat yohobuy.wechat.env.serverport = 4 yohobuy.wechat.env.webapphome = /home/test/yohobuy-wechat/deploy -wechat.subscription.access.appid=wx1e6997242bcfcdfb -wechat.subscription.access.secret=d6fa51581e4c11ee312a1990c2ebf0bd diff --git a/autoconfig/test_nj_3/global-autoconfig.properties b/autoconfig/test_nj_3/global-autoconfig.properties index ac91a1b..3ef6736 100644 --- a/autoconfig/test_nj_3/global-autoconfig.properties +++ b/autoconfig/test_nj_3/global-autoconfig.properties @@ -181,16 +181,16 @@ jdbc.mysql.yhinbox.slave=read.passport.yohoops.org:3306 jdbc.mysql.yohologs.master=yohologs.yohoops.org:3306 #yoho_passport读写数据分离 -jdbc.mysql.yohopassport.master=write.passport.yohoops.org:3306 -jdbc.mysql.yohopassport.slave=read.passport.yohoops.org:3306 +jdbc.mysql.yohopassport.master=192.168.102.219:3306 +jdbc.mysql.yohopassport.slave=192.168.102.219:3306 #yh_operations配置读写分离 jdbc.mysql.yhoperations.master=write.cms.yohoops.org:3306 jdbc.mysql.yhoperations.slave=read.cms.yohoops.org:3306 #yh_passport读写分离 -jdbc.mysql.yhpassport.master=write.passport.yohoops.org:3306 -jdbc.mysql.yhpassport.slave=read.passport.yohoops.org:3306 +jdbc.mysql.yhpassport.master=192.168.102.219:3306 +jdbc.mysql.yhpassport.slave=192.168.102.219:3306 #yh_setting读写分离 jdbc.mysql.yhsetting.master=write.cms.yohoops.org:3306 @@ -503,4 +503,17 @@ jdbc.mysql.yhmars.password=9nm0icOwt6bMHjMusIfMLw== jdbc.mysql.yhnow.master=192.168.102.17:3306 jdbc.mysql.yhnow.slave=192.168.102.17:3306 jdbc.mysql.yhnow.username=root -jdbc.mysql.yhnow.password=Z5BMngayHLUxyWLSv6+koA== \ No newline at end of file +jdbc.mysql.yhnow.password=Z5BMngayHLUxyWLSv6+koA== + + +jdbc.mysql.yhuuc.master=192.168.102.219:3306 +jdbc.mysql.yhuuc.slave=192.168.102.219:3306 +jdbc.mysql.yhuuc.username=yh_test +jdbc.mysql.yhuuc.password=9nm0icOwt6bMHjMusIfMLw== + +jdbc.mysql.yhcms.master=192.168.102.17:3306 +jdbc.mysql.yhcms.slave=192.168.102.17:3306 +jdbc.mysql.yhcms.username=root +jdbc.mysql.yhcms.password=Z5BMngayHLUxyWLSv6+koA== + + diff --git a/autoconfig/test_nj_3/yoho-mars-autoconfig.properties b/autoconfig/test_nj_3/yoho-mars-autoconfig.properties index a75f9fe..efd49d7 100644 --- a/autoconfig/test_nj_3/yoho-mars-autoconfig.properties +++ b/autoconfig/test_nj_3/yoho-mars-autoconfig.properties @@ -22,3 +22,7 @@ redis.notsync.twemproxy.addresses=192.168.102.17:6380 mars.task.switch=true exchange.cur.appkey=8154ce96f69f2bb7755b9f477091d3d7 +activity.save.msg=编辑团队会尽快审核，请留意系统通知 + +WECHAT_APPID=wx9d0d7dfed5bbaa8b +WECHAT_APPSECRET=3d37f946bca59a8c082ee8111adf6c6c diff --git a/autoconfig/test_nj_3/yoho-now-autoconfig.properties b/autoconfig/test_nj_3/yoho-now-autoconfig.properties index 9526af4..8661e5c 100644 --- a/autoconfig/test_nj_3/yoho-now-autoconfig.properties +++ b/autoconfig/test_nj_3/yoho-now-autoconfig.properties @@ -23,4 +23,6 @@ redis.notsync.twemproxy.addresses = 192.168.102.17:6379 redis.proxy.address = 192.168.102.17 redis.readonly.proxy.address = 192.168.102.17 -yohoboys.res.url=http://cmsres.test.yoho.cn \ No newline at end of file +yohoboys.res.url=http://cmsres.test.yoho.cn + +is_task_enbale=false \ No newline at end of file diff --git a/autoconfig/test_nj_3/yohobuy-crm-autoconfig.properties b/autoconfig/test_nj_3/yohobuy-crm-autoconfig.properties index d79877a..63dcabf 100644 --- a/autoconfig/test_nj_3/yohobuy-crm-autoconfig.properties +++ b/autoconfig/test_nj_3/yohobuy-crm-autoconfig.properties @@ -8,7 +8,7 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/aut bigData.url = http://bigdata-crm.yohops.com:8070/bigdata/crm/ -crm.send.notice = true +crm.send.notice = false platform.host=http://192.168.102.48:8088/platform platform.coupon.userId=10964 diff --git a/autoconfig/test_nj_3/yohobuy-platform-autoconfig.properties b/autoconfig/test_nj_3/yohobuy-platform-autoconfig.properties index 107f259..58e0daa 100644 --- a/autoconfig/test_nj_3/yohobuy-platform-autoconfig.properties +++ b/autoconfig/test_nj_3/yohobuy-platform-autoconfig.properties @@ -109,6 +109,8 @@ service.yoho.url = http://service-test3.yohops.com:9999 erp.shop.url = http://192.168.103.48:9098/erp-shop-web/ +stock.req.url = http://54.222.172.226:80/erp-gateway-web/finance/calc/calcSknLowestPrice + shop.status.change.phone = 17895010543 upload.tencent.bid = b_teg_openrecom_opq68unpsix93dy2zjco diff --git a/autoconfig/test_nj_3/yohobuy-wechat-autoconfig.properties b/autoconfig/test_nj_3/yohobuy-wechat-autoconfig.properties index 51f0e81..ee077a1 100644 --- a/autoconfig/test_nj_3/yohobuy-wechat-autoconfig.properties +++ b/autoconfig/test_nj_3/yohobuy-wechat-autoconfig.properties @@ -2,8 +2,8 @@ autoconfig.properties = sharedAutoconfig autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties -wechat.access.appid = wx75e5a7c0c88e45c2 -wechat.access.secret = ce21ae4a3f93852279175a167e54509b +wechat.access.appid = wx1e6997242bcfcdfb +wechat.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd wechat.small.program.access.appid = wx084ab813d88c594b wechat.small.program.access.secret = 045848c0e0d76f7699236e4a35d65948 diff --git a/autoconfig/test_nj_4/yohobuy-wechat-autoconfig.properties b/autoconfig/test_nj_4/yohobuy-wechat-autoconfig.properties index d655a9f..3f7f40d 100644 --- a/autoconfig/test_nj_4/yohobuy-wechat-autoconfig.properties +++ b/autoconfig/test_nj_4/yohobuy-wechat-autoconfig.properties @@ -2,8 +2,8 @@ autoconfig.properties = sharedAutoconfig autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties -wechat.access.appid = wx75e5a7c0c88e45c2 -wechat.access.secret = ce21ae4a3f93852279175a167e54509b +wechat.access.appid = wx1e6997242bcfcdfb +wechat.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd wechat.small.program.access.appid = wx084ab813d88c594b wechat.small.program.access.secret = 0252d67ef15eb07a28d80098e8c186ac