Skip to content

Y
yaconf
Commit de6efba2 authored by jianghaiming's avatar jianghaiming
Browse files
Options

Merge branch 'master' of https://gitlab.yidian-inc.com/bp/yaconf

parents b71c6fcb a30cc00d
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 10 deletions
dictionary.ini
View file @ de6efba2
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
104="平台营销补贴" 104="平台营销补贴"
105="团长佣金收入" 105="团长佣金收入"
106="平台活动补贴" 106="平台活动补贴"
107="第三方渠道手续费"
108="结算价收益"
109="结算价补贴"
201="余额提现" 201="余额提现"
301="平台营销补贴" 301="平台营销补贴"
302="商品交易" 302="商品交易"
......
interface.ini
View file @ de6efba2
...@@ -453,15 +453,15 @@ shqc.chicken.marketing.list = "http://shqc.int.yidian-inc.com/chicken/marketing/ ...@@ -453,15 +453,15 @@ shqc.chicken.marketing.list = "http://shqc.int.yidian-inc.com/chicken/marketing/
shqc.chicken.user.enter = "http://shqc.int.yidian-inc.com/chicken/user/enter" shqc.chicken.user.enter = "http://shqc.int.yidian-inc.com/chicken/user/enter"
shqc.chicken.user.egg_percent = "http://shqc.int.yidian-inc.com/chicken/user/egg_percent" shqc.chicken.user.egg_percent = "http://shqc.int.yidian-inc.com/chicken/user/egg_percent"
shqc.chicken.user.property = "http://shqc.int.yidian-inc.com/chicken/user/property" shqc.chicken.user.property = "http://shqc.int.yidian-inc.com/chicken/user/property"
shqc.chicken.user.message_list = "http://shqc.int.yidian-inc.com/chicken/feed/message_list" shqc.chicken.user.message_list = "http://shqc.int.yidian-inc.com/chicken/user/message_list"
shqc.chicken.user.has_unread_message = "http://shqc.int.yidian-inc.com/chicken/feed/has_unread_message" shqc.chicken.user.has_unread_message = "http://shqc.int.yidian-inc.com/chicken/user/has_unread_message"
;生活圈c端 小鸡游戏 feed模块 ;生活圈c端 小鸡游戏 feed模块
shqc.chicken.feed.do_feed = "http://shqc.int.yidian-inc.com/chicken/feed/do_feed" shqc.chicken.feed.do_feed = "http://shqc.int.yidian-inc.com/chicken/feed/do_feed"
;======================= 7000000-prod account微服务接口 ======================= ;======================= 7000000-prod account微服务接口 =======================
account.account.create = "http://account.int.yidian-inc.com/account/account/create" account.account.create = "http://account.int.yidian-inc.com/account/account/create"
account.account.get_account = "http://account.int.yidian-inc.com/account/account/get_account" account.account.get_account = "http://account.int.yidian-inc.com/account/account/get_account"
account.billrecord.create = "http://account.int.yidian-inc.com/account/billrecord/create"
[perf : prod : common] [perf : prod : common]
;======================= 基础服务接口 ======================= ;======================= 基础服务接口 =======================
...@@ -893,6 +893,7 @@ coupon.tcc.use_coupon_cancel = "http://coupon.pre.int.yidian-inc.com/tcc/tcc/use ...@@ -893,6 +893,7 @@ coupon.tcc.use_coupon_cancel = "http://coupon.pre.int.yidian-inc.com/tcc/tcc/use
;======================= 7000000-pre account微服务接口 ======================= ;======================= 7000000-pre account微服务接口 =======================
account.account.create = "http://account.pre.int.yidian-inc.com/account/account/create" account.account.create = "http://account.pre.int.yidian-inc.com/account/account/create"
account.account.get_account = "http://account.pre.int.yidian-inc.com/account/account/get_account" account.account.get_account = "http://account.pre.int.yidian-inc.com/account/account/get_account"
account.billrecord.create = "http://account.pre.int.yidian-inc.com/account/billrecord/create"
;======================== 10000000-pre shqc 微服务接口 ============================== ;======================== 10000000-pre shqc 微服务接口 ==============================
;生活圈c端 小鸡游戏 task模块 ;生活圈c端 小鸡游戏 task模块
...@@ -911,8 +912,8 @@ shqc.chicken.marketing.list = "http://shqc.pre.int.yidian-inc.com/chicken/market ...@@ -911,8 +912,8 @@ shqc.chicken.marketing.list = "http://shqc.pre.int.yidian-inc.com/chicken/market
shqc.chicken.user.enter = "http://shqc.pre.int.yidian-inc.com/chicken/user/enter" shqc.chicken.user.enter = "http://shqc.pre.int.yidian-inc.com/chicken/user/enter"
shqc.chicken.user.egg_percent = "http://shqc.pre.int.yidian-inc.com/chicken/user/egg_percent" shqc.chicken.user.egg_percent = "http://shqc.pre.int.yidian-inc.com/chicken/user/egg_percent"
shqc.chicken.user.property = "http://shqc.pre.int.yidian-inc.com/chicken/user/property" shqc.chicken.user.property = "http://shqc.pre.int.yidian-inc.com/chicken/user/property"
shqc.chicken.user.message_list = "http://shqc.pre.int.yidian-inc.com/chicken/feed/message_list" shqc.chicken.user.message_list = "http://shqc.pre.int.yidian-inc.com/chicken/user/message_list"
shqc.chicken.user.has_unread_message = "http://shqc.pre.int.yidian-inc.com/chicken/feed/has_unread_message" shqc.chicken.user.has_unread_message = "http://shqc.pre.int.yidian-inc.com/chicken/user/has_unread_message"
;生活圈c端 小鸡游戏 feed模块 ;生活圈c端 小鸡游戏 feed模块
shqc.chicken.feed.do_feed = "http://shqc.pre.int.yidian-inc.com/chicken/feed/do_feed" shqc.chicken.feed.do_feed = "http://shqc.pre.int.yidian-inc.com/chicken/feed/do_feed"
...@@ -1346,6 +1347,7 @@ coupon.tcc.use_coupon_cancel = "http://coupon.test.yidian-inc.com/tcc/tcc/use_co ...@@ -1346,6 +1347,7 @@ coupon.tcc.use_coupon_cancel = "http://coupon.test.yidian-inc.com/tcc/tcc/use_co
;======================= 7000000-test account微服务接口 ======================= ;======================= 7000000-test account微服务接口 =======================
account.account.create = "http://account.test.yidian-inc.com/account/account/create" account.account.create = "http://account.test.yidian-inc.com/account/account/create"
account.account.get_account = "http://account.test.yidian-inc.com/account/account/get_account" account.account.get_account = "http://account.test.yidian-inc.com/account/account/get_account"
account.billrecord.create = "http://account.test.yidian-inc.com/account/billrecord/create"
;======================== 10000000-test shqc 微服务接口 ============================== ;======================== 10000000-test shqc 微服务接口 ==============================
;生活圈c端 小鸡游戏 task模块 ;生活圈c端 小鸡游戏 task模块
...@@ -1364,8 +1366,8 @@ shqc.chicken.marketing.list = "http://shqc.test.yidian-inc.com/chicken/marketing ...@@ -1364,8 +1366,8 @@ shqc.chicken.marketing.list = "http://shqc.test.yidian-inc.com/chicken/marketing
shqc.chicken.user.enter = "http://shqc.test.yidian-inc.com/chicken/user/enter" shqc.chicken.user.enter = "http://shqc.test.yidian-inc.com/chicken/user/enter"
shqc.chicken.user.egg_percent = "http://shqc.test.yidian-inc.com/chicken/user/egg_percent" shqc.chicken.user.egg_percent = "http://shqc.test.yidian-inc.com/chicken/user/egg_percent"
shqc.chicken.user.property = "http://shqc.test.yidian-inc.com/chicken/user/property" shqc.chicken.user.property = "http://shqc.test.yidian-inc.com/chicken/user/property"
shqc.chicken.user.message_list = "http://shqc.test.yidian-inc.com/chicken/feed/message_list" shqc.chicken.user.message_list = "http://shqc.test.yidian-inc.com/chicken/user/message_list"
shqc.chicken.user.has_unread_message = "http://shqc.test.yidian-inc.com/chicken/feed/has_unread_message" shqc.chicken.user.has_unread_message = "http://shqc.test.yidian-inc.com/chicken/user/has_unread_message"
;生活圈c端 小鸡游戏 feed模块 ;生活圈c端 小鸡游戏 feed模块
shqc.chicken.feed.do_feed = "http://shqc.test.yidian-inc.com/chicken/feed/do_feed" shqc.chicken.feed.do_feed = "http://shqc.test.yidian-inc.com/chicken/feed/do_feed"
...@@ -1776,8 +1778,8 @@ shqc.chicken.marketing.list = "http://shqc.dev.yidian-inc.com/chicken/marketing/ ...@@ -1776,8 +1778,8 @@ shqc.chicken.marketing.list = "http://shqc.dev.yidian-inc.com/chicken/marketing/
shqc.chicken.user.enter = "http://shqc.dev.yidian-inc.com/chicken/user/enter" shqc.chicken.user.enter = "http://shqc.dev.yidian-inc.com/chicken/user/enter"
shqc.chicken.user.egg_percent = "http://shqc.dev.yidian-inc.com/chicken/user/egg_percent" shqc.chicken.user.egg_percent = "http://shqc.dev.yidian-inc.com/chicken/user/egg_percent"
shqc.chicken.user.property = "http://shqc.dev.yidian-inc.com/chicken/user/property" shqc.chicken.user.property = "http://shqc.dev.yidian-inc.com/chicken/user/property"
shqc.chicken.user.message_list = "http://shqc.dev.yidian-inc.com/chicken/feed/message_list" shqc.chicken.user.message_list = "http://shqc.dev.yidian-inc.com/chicken/user/message_list"
shqc.chicken.user.has_unread_message = "http://shqc.dev.yidian-inc.com/chicken/feed/has_unread_message" shqc.chicken.user.has_unread_message = "http://shqc.dev.yidian-inc.com/chicken/user/has_unread_message"
;生活圈c端 小鸡游戏 feed模块 ;生活圈c端 小鸡游戏 feed模块
shqc.chicken.feed.do_feed = "http://shqc.dev.yidian-inc.com/chicken/feed/do_feed" shqc.chicken.feed.do_feed = "http://shqc.dev.yidian-inc.com/chicken/feed/do_feed"
...@@ -1785,6 +1787,7 @@ shqc.chicken.feed.do_feed = "http://shqc.dev.yidian-inc.com/chicken/feed/do_feed ...@@ -1785,6 +1787,7 @@ shqc.chicken.feed.do_feed = "http://shqc.dev.yidian-inc.com/chicken/feed/do_feed
;======================= 7000000-dev account微服务接口 ======================= ;======================= 7000000-dev account微服务接口 =======================
account.account.create = "http://account.dev.yidian-inc.com/account/account/create" account.account.create = "http://account.dev.yidian-inc.com/account/account/create"
account.account.get_account = "http://account.dev.yidian-inc.com/account/account/get_account" account.account.get_account = "http://account.dev.yidian-inc.com/account/account/get_account"
account.billrecord.create = "http://account.dev.yidian-inc.com/account/billrecord/create"
; ======================= gateway ================================================================================== ; ======================= gateway ==================================================================================
......
kafka.ini
View file @ de6efba2
...@@ -10,8 +10,15 @@ ...@@ -10,8 +10,15 @@
;商户项目继承common + 自己的配置，此节中配置会覆盖父级的相同配置（不区分环境） ;商户项目继承common + 自己的配置，此节中配置会覆盖父级的相同配置（不区分环境）
[merchant : common] [merchant : common]
[prod-merchant : merchant : common] [prod-merchant : merchant : common]
account.broker_list='l-kafka-outer1.ops.hj1.yidian-inc.com:9092,l-kafka-outer2.ops.hj1.yidian-inc.com:9092,l-kafka-outer3.ops.hj1.yidian-inc.com:9092,l-kafka-outer4.ops.hj1.yidian-inc.com:9092,l-kafka-outer5.ops.hj1.yidian-inc.com:9092'
account.topic='bp_create_account_prod'
[perf-merchant : prod-merchant : merchant : common] [perf-merchant : prod-merchant : merchant : common]
[test-merchant : prod-merchant : merchant : common] [test-merchant : prod-merchant : merchant : common]
account.broker_list='l-kafka-test-env1.ops.hj1.yidian-inc.com:9092'
account.topic='bp_create_account_test'
[dev-merchant : test-merchant : prod-merchant : merchant : common] [dev-merchant : test-merchant : prod-merchant : merchant : common]
;触达项目 ;触达项目
...@@ -77,4 +84,15 @@ goods.publish.topic='bp_str_jielong_goods_publish_dev' ...@@ -77,4 +84,15 @@ goods.publish.topic='bp_str_jielong_goods_publish_dev'
[prod-wallet : wallet : common] [prod-wallet : wallet : common]
[perf-wallet : wallet : common] [perf-wallet : wallet : common]
[test-wallet : wallet : common] [test-wallet : wallet : common]
[dev-wallet : test-wallet : wallet : common] [dev-wallet : test-wallet : wallet : common]
\ No newline at end of file
;account项目
[account : common]
[prod-account : account : common]
account.broker_list='l-kafka-outer1.ops.hj1.yidian-inc.com:9092,l-kafka-outer2.ops.hj1.yidian-inc.com:9092,l-kafka-outer3.ops.hj1.yidian-inc.com:9092,l-kafka-outer4.ops.hj1.yidian-inc.com:9092,l-kafka-outer5.ops.hj1.yidian-inc.com:9092'
account.topic='bp_create_account_prod'
[perf-account : prod-account : account : common]
[test-account : account : common]
account.broker_list='l-kafka-test-env1.ops.hj1.yidian-inc.com:9092,l-kafka-test-env2.ops.hj1.yidian-inc.com:9092,l-kafka-test-env3.ops.hj1.yidian-inc.com:9092'
account.topic='bp_create_account_test'
[dev-account : test-account : account : common]
\ No newline at end of file
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