Merge branch 'master' into 0826_wangdong_account

interface.ini

@@ -159,7 +159,7 @@ goods.marketing.tuancan_list = "http://goods.int.yidian-inc.com/marketing/market
 ;营销中心
 goods.marketing.yingxiao_list = "http://goods.int.yidian-inc.com/marketing/marketing/yingxiao_list"
 goods.marketing.toogle_yingxiao_online_status = "http://goods.int.yidian-inc.com/marketing/marketing/toogle_yingxiao_online_status"
-
+goods.marketing.get_small_program_config = "http://goods.int.yidian-inc.com/marketing/marketing/get_small_program_config"
 
 
 
@@ -237,6 +237,7 @@ goods.goods.refund = "http://goods.int.yidian-inc.com/goods/goods/refund"
 goods.public.goods_online_site = "http://goods.int.yidian-inc.com/goods/goods/online_site"
 goods.public.goods_snapshots = "http://goods.int.yidian-inc.com/goods/goods/goods_snapshots"
 
+goods.public.place_order_goods_list = "http://goods.int.yidian-inc.com/goods/goods/place_order_goods_list"
 
 ;用户绑定
 goods.user.wechat_login = "http://goods.int.yidian-inc.com/user/user/wechat_login"
@@ -259,6 +260,18 @@ goods.marketingfororder.marketing_list = "http://goods.int.yidian-inc.com/market
 goods.marketingfororder.goods_list = "http://goods.int.yidian-inc.com/marketing/marketingfororder/goods_list"
 goods.marketingfororder.take_place_list = "http://goods.int.yidian-inc.com/marketing/marketingfororder/take_place_list"
 
+;分类标签
+goods.marketing.tag.list = "http://goods.int.yidian-inc.com/marketing/tag/list"
+goods.marketing.tag.edit = "http://goods.int.yidian-inc.com/marketing/tag/edit"
+goods.marketing.tag.delete = "http://goods.int.yidian-inc.com/marketing/tag/delete"
+goods.marketing.tag.detail = "http://goods.int.yidian-inc.com/marketing/tag/detail"
+
+;商圈
+goods.marketing.business_circle.list = "http://goods.int.yidian-inc.com/marketing/businesscircle/list"
+goods.marketing.business_circle.edit = "http://goods.int.yidian-inc.com/marketing/businesscircle/edit"
+goods.marketing.business_circle.delete = "http://goods.int.yidian-inc.com/marketing/businesscircle/delete"
+goods.marketing.business_circle.detail = "http://goods.int.yidian-inc.com/marketing/businesscircle/detail"
+
 
 ;======================= 5000000-prod order微服务接口 ======================= 
 ;订单
@@ -362,6 +375,7 @@ wallet.withdrawbackground.back_freezing_fund = "http://wallet.int.yidian-inc.com
 wallet.withdrawbackground.apply_detail = "http://wallet.int.yidian-inc.com/wallet/background/apply_detail"
 wallet.withdrawbackground.record_list = "http://wallet.int.yidian-inc.com/wallet/background/record_list"
 wallet.historyapi.sendmsg = "https://ex.jwshq.cn/app/msg/sendMessage"
+wallet.historyapi.sendmsg_new = "http://interact.int.yidian-inc.com/msg/index/withdraw_push"
 wallet.withdrawbackground.account_list = "http://wallet.int.yidian-inc.com/wallet/background/account_list"
 wallet.accountbackground.record_list = "http://wallet.int.yidian-inc.com/wallet/background/account_record_list"
 wallet.accountbackground.get_wallet_account_status = "http://wallet.int.yidian-inc.com/wallet/background/get_wallet_account_status"
@@ -557,7 +571,7 @@ goods.public.take_place_by_goods_sku_ids = "http://goods.pre.int.yidian-inc.com/
 ;营销中心
 goods.marketing.yingxiao_list = "http://goods.pre.int.yidian-inc.com/marketing/marketing/yingxiao_list"
 goods.marketing.toogle_yingxiao_online_status = "http://goods.pre.int.yidian-inc.com/marketing/marketing/toogle_yingxiao_online_status"
-
+goods.marketing.get_small_program_config = "http://goods.pre.int.yidian-inc.com/marketing/marketing/get_small_program_config"
 
 
 
@@ -635,6 +649,7 @@ goods.goods.refund = "http://goods.pre.int.yidian-inc.com/goods/goods/refund"
 goods.public.goods_online_site = "http://goods.pre.int.yidian-inc.com/goods/goods/online_site"
 goods.public.goods_snapshots = "http://goods.pre.int.yidian-inc.com/goods/goods/goods_snapshots"
 
+goods.public.place_order_goods_list = "http://goods.pre.int.yidian-inc.com/goods/goods/place_order_goods_list"
 
 ;用户绑定
 goods.user.wechat_login = "http://goods.pre.int.yidian-inc.com/user/user/wechat_login"
@@ -657,6 +672,18 @@ goods.marketingfororder.marketing_list = "http://goods.pre.int.yidian-inc.com/ma
 goods.marketingfororder.goods_list = "http://goods.pre.int.yidian-inc.com/marketing/marketingfororder/goods_list"
 goods.marketingfororder.take_place_list = "http://goods.pre.int.yidian-inc.com/marketing/marketingfororder/take_place_list"
 
+;分类标签
+goods.marketing.tag.list = "http://goods.pre.int.yidian-inc.com/marketing/tag/list"
+goods.marketing.tag.edit = "http://goods.pre.int.yidian-inc.com/marketing/tag/edit"
+goods.marketing.tag.delete = "http://goods.pre.int.yidian-inc.com/marketing/tag/delete"
+goods.marketing.tag.detail = "http://goods.pre.int.yidian-inc.com/marketing/tag/detail"
+
+;商圈
+goods.marketing.business_circle.list = "http://goods.pre.int.yidian-inc.com/marketing/businesscircle/list"
+goods.marketing.business_circle.edit = "http://goods.pre.int.yidian-inc.com/marketing/businesscircle/edit"
+goods.marketing.business_circle.delete = "http://goods.pre.int.yidian-inc.com/marketing/businesscircle/delete"
+goods.marketing.business_circle.detail = "http://goods.pre.int.yidian-inc.com/marketing/businesscircle/detail"
+
 
 ;======================= 5000000-pre order微服务接口 =======================
 ;订单
@@ -759,6 +786,7 @@ wallet.withdrawbackground.back_freezing_fund = "http://wallet.pre.int.yidian-inc
 wallet.withdrawbackground.apply_detail = "http://wallet.pre.int.yidian-inc.com/wallet/background/apply_detail"
 wallet.withdrawbackground.record_list = "http://wallet.pre.int.yidian-inc.com/wallet/background/record_list"
 wallet.historyapi.sendmsg = "https://ex.jwshq.cn/app/msg/sendMessage"
+wallet.historyapi.sendmsg_new = "http://interact.int.yidian-inc.com/msg/index/withdraw_push"
 wallet.withdrawbackground.account_list = "http://wallet.pre.int.yidian-inc.com/wallet/background/account_list"
 wallet.accountbackground.record_list = "http://wallet.pre.int.yidian-inc.com/wallet/background/account_record_list"
 wallet.accountbackground.get_wallet_account_status = "http://wallet.pre.int.yidian-inc.com/wallet/background/get_wallet_account_status"
@@ -987,6 +1015,7 @@ goods.marketing.colonel_is_apply = "http://goods.test.int.yidian-inc.com/marketi
 ;营销中心
 goods.marketing.yingxiao_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/yingxiao_list"
 goods.marketing.toogle_yingxiao_online_status = "http://goods.test.int.yidian-inc.com/marketing/marketing/toogle_yingxiao_online_status"
+goods.marketing.get_small_program_config = "http://goods.test.int.yidian-inc.com/marketing/marketing/get_small_program_config"
 
 ;供应商
 goods.background.add_ota = "http://goods.test.int.yidian-inc.com/goods/ota/add"
@@ -1028,6 +1057,8 @@ goods.goods.refund = "http://goods.test.int.yidian-inc.com/goods/goods/refund"
 goods.public.goods_online_site = "http://goods.test.int.yidian-inc.com/goods/goods/online_site"
 goods.public.goods_snapshots = "http://goods.test.int.yidian-inc.com/goods/goods/goods_snapshots"
 
+goods.public.place_order_goods_list = "http://goods.test.int.yidian-inc.com/goods/goods/place_order_goods_list"
+
 ;用户绑定
 goods.user.wechat_login = "http://goods.test.int.yidian-inc.com/user/user/wechat_login"
 goods.user.bind_phone = "http://goods.test.int.yidian-inc.com/user/user/bind_phone"
@@ -1047,6 +1078,18 @@ goods.marketingfororder.marketing_list = "http://goods.test.int.yidian-inc.com/m
 goods.marketingfororder.goods_list = "http://goods.test.int.yidian-inc.com/marketing/marketingfororder/goods_list"
 goods.marketingfororder.take_place_list = "http://goods.test.int.yidian-inc.com/marketing/marketingfororder/take_place_list"
 
+;分类标签
+goods.marketing.tag.list = "http://goods.test.int.yidian-inc.com/marketing/tag/list"
+goods.marketing.tag.edit = "http://goods.test.int.yidian-inc.com/marketing/tag/edit"
+goods.marketing.tag.delete = "http://goods.test.int.yidian-inc.com/marketing/tag/delete"
+goods.marketing.tag.detail = "http://goods.test.int.yidian-inc.com/marketing/tag/detail"
+
+;商圈
+goods.marketing.business_circle.list = "http://goods.test.int.yidian-inc.com/marketing/businesscircle/list"
+goods.marketing.business_circle.edit = "http://goods.test.int.yidian-inc.com/marketing/businesscircle/edit"
+goods.marketing.business_circle.delete = "http://goods.test.int.yidian-inc.com/marketing/businesscircle/delete"
+goods.marketing.business_circle.detail = "http://goods.test.int.yidian-inc.com/marketing/businesscircle/detail"
+
 ;======================= 5000000-test order微服务接口 ======================= 
 ;订单
 order.order.user_order_list = "http://order.test.yidian-inc.com/order/order/user_order_list"
@@ -1150,6 +1193,7 @@ wallet.withdrawbackground.back_freezing_fund = "http://wallet.test.yidian-inc.co
 wallet.withdrawbackground.apply_detail = "http://wallet.test.yidian-inc.com/wallet/background/apply_detail"
 wallet.withdrawbackground.record_list = "http://wallet.test.yidian-inc.com/wallet/background/record_list"
 wallet.historyapi.sendmsg = "http://testex.api.appgc.yidian-inc.com/app/msg/sendMessage"
+wallet.historyapi.sendmsg_new = "http://interaction.test.yidian-inc.com/msg/index/withdraw_push"
 wallet.withdrawbackground.account_list = "http://wallet.test.yidian-inc.com/wallet/background/account_list"
 wallet.accountbackground.record_list = "http://wallet.test.yidian-inc.com/wallet/background/account_record_list"
 wallet.accountbackground.get_wallet_account_status = "http://wallet.test.yidian-inc.com/wallet/background/get_wallet_account_status"
@@ -1345,6 +1389,7 @@ goods.marketing.colonel_is_apply = "http://goods.dev.yidian-inc.com/marketing/co
 ;营销中心
 goods.marketing.yingxiao_list = "http://goods.dev.yidian-inc.com/marketing/marketing/yingxiao_list"
 goods.marketing.toogle_yingxiao_online_status = "http://goods.dev.yidian-inc.com/marketing/marketing/toogle_yingxiao_online_status"
+goods.marketing.get_small_program_config = "http://goods.dev.yidian-inc.com/marketing/marketing/get_small_program_config"
 
 ;供应商
 goods.background.add_ota = "http://goods.dev.yidian-inc.com/goods/ota/add"
@@ -1387,6 +1432,8 @@ goods.goods.refund = "http://goods.dev.yidian-inc.com/goods/goods/refund"
 goods.public.goods_online_site = "http://goods.dev.yidian-inc.com/goods/goods/online_site"
 goods.public.goods_snapshots = "http://goods.dev.yidian-inc.com/goods/goods/goods_snapshots"
 
+goods.public.place_order_goods_list = "http://goods.dev.yidian-inc.com/goods/goods/place_order_goods_list"
+
 ;用户绑定
 goods.user.wechat_login = "http://goods.dev.yidian-inc.com/user/user/wechat_login"
 goods.user.bind_phone = "http://goods.dev.yidian-inc.com/user/user/bind_phone"
@@ -1405,6 +1452,18 @@ goods.marketingfororder.marketing_list = "http://goods.dev.yidian-inc.com/market
 goods.marketingfororder.goods_list = "http://goods.dev.yidian-inc.com/marketing/marketingfororder/goods_list"
 goods.marketingfororder.take_place_list = "http://goods.dev.yidian-inc.com/marketing/marketingfororder/take_place_list"
 
+;分类标签
+goods.marketing.tag.list = "http://goods.dev.yidian-inc.com/marketing/tag/list"
+goods.marketing.tag.edit = "http://goods.dev.yidian-inc.com/marketing/tag/edit"
+goods.marketing.tag.delete = "http://goods.dev.yidian-inc.com/marketing/tag/delete"
+goods.marketing.tag.detail = "http://goods.dev.yidian-inc.com/marketing/tag/detail"
+
+;商圈
+goods.marketing.business_circle.list = "http://goods.dev.yidian-inc.com/marketing/businesscircle/list"
+goods.marketing.business_circle.edit = "http://goods.dev.yidian-inc.com/marketing/businesscircle/edit"
+goods.marketing.business_circle.delete = "http://goods.dev.yidian-inc.com/marketing/businesscircle/delete"
+goods.marketing.business_circle.detail = "http://goods.dev.yidian-inc.com/marketing/businesscircle/detail"
+
 ;======================= 5000000-dev order微服务接口 ======================= 
 ;订单
 order.order.user_order_list = "http://order.dev.yidian-inc.com/order/order/user_order_list"
@@ -1504,6 +1563,7 @@ wallet.withdrawbackground.back_freezing_fund = "http://wallet.dev.yidian-inc.com
 wallet.withdrawbackground.apply_detail = "http://wallet.dev.yidian-inc.com/wallet/background/apply_detail"
 wallet.withdrawbackground.record_list = "http://wallet.dev.yidian-inc.com/wallet/background/record_list"
 wallet.historyapi.sendmsg = "http://testex.api.appgc.yidian-inc.com/app/msg/sendMessage"
+wallet.historyapi.sendmsg_new = "http://interaction.dev.yidian-inc.com/msg/index/withdraw_push"
 wallet.withdrawbackground.account_list = "http://wallet.dev.yidian-inc.com/wallet/background/account_list"
 wallet.accountbackground.record_list = "http://wallet.dev.yidian-inc.com/wallet/background/account_record_list"
 wallet.accountbackground.get_wallet_account_status = "http://wallet.dev.yidian-inc.com/wallet/background/get_wallet_account_status"

kafka.ini

@@ -21,16 +21,25 @@
 subscribe.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'
 subscribe.topic='bp_str_jielong_subscribe_notify_prod'
 
+push.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'
+push.topic='opmg_touch_center'
+
 [perf-interaction : prod-interaction : interaction : common]
 
 [test-interaction : interaction : common]
 subscribe.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'
 subscribe.topic='bp_str_jielong_subscribe_notify_test'
 
+push.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'
+push.topic='opmg_touch_center_test'
+
 [dev-interaction : test-interaction : interaction : common]
 subscribe.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'
 subscribe.topic='bp_str_jielong_subscribe_notify_dev'
 
+push.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'
+push.topic='opmg_touch_center_test'
+
 ;商品项目
 [goods : common]
 

mysql.ini

@@ -505,3 +505,43 @@ coupon.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
 coupon.charset='utf8mb4'
 coupon.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
 coupon.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
+
+
+[shq-c-server : common]
+
+; 生产环境
+[prod-shq-c-server : shq-c-server : common]
+shqc.database_type='mysql'
+shqc.database_name='shqc'
+shqc.connect_timeout=2
+shqc.username='bp_shqc_rw'
+shqc.password='wNC@zFJzPf1yM$Cv8yB8#AO3i&Ecgx'
+shqc.charset='utf8mb4'
+shqc.write.host='w.bp_shqc.int.yidian-inc.com:3306'
+shqc.read.host='r.bp_shqc_1.int.yidian-inc.com:3306,r.bp_shqc_2.int.yidian-inc.com:3306'
+
+
+; 预发环境
+[perf-shq-c-server : prod-shq-c-server : shq-c-server : common]
+
+; 测试环境
+[test-shq-c-server : shq-c-server : common]
+shqc.database_type='mysql'
+shqc.database_name='shqc'
+shqc.connect_timeout=2
+shqc.username='bp_rw'
+shqc.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
+shqc.charset='utf8mb4'
+shqc.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
+shqc.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
+
+; 联调环境
+[dev-shq-c-server : shq-c-server : common]
+shqc.database_type='mysql'
+shqc.database_name='shqc'
+shqc.connect_timeout=2
+shqc.username='bp_rw'
+shqc.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
+shqc.charset='utf8mb4'
+shqc.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
+shqc.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'