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

bizcode.ini

@@ -4,4 +4,6 @@ merchant=2000000
 interaction=3000000
 goods=4000000
 order=5000000
-pay=6000000
+pay=6000000
\ No newline at end of file
+account=7000000
+wallet=8000000
\ No newline at end of file

email.ini

+[common]
+
+
+[prod-tcc : common ]
+to_email                = api@yidian-inc.com
+
+[dev-tcc : common]
+to_email                = zhangyu1@yidian-inc.com
+
+[test-tcc : common]
+to_email                = zhangyu1@yidian-inc.com
\ No newline at end of file

idgen.ini

@@ -16,7 +16,7 @@ trans.apcu.prefix       = trans_
 order.bits.date         = 12
 order.bits.uid          = 2
 order.bits.machine      = 1
-order.bits.autoincrement= 2
+order.bits.autoincrement= 3
 order.bits.app          = 2
 
 ;订单号 - apcu
@@ -27,6 +27,7 @@ order.apcu.prefix       = order_
 key.bp                  = 5cfdb867e96374c7883b31d6928cc4cb
 
 ;类型号映射
+snow.type.common = 0
 snow.type.tcc_trans = 1
 snow.type.merchant_life_account_id = 2
 snow.type.goods = 3
@@ -34,6 +35,102 @@ snow.type.goods = 3
 datetime.type.order = 1
 datetime.type.merchant_shop_id = 2
 datetime.type.goods = 3
+datetime.type.55c768 = 4
+datetime.type.af3abf = 5
+datetime.type.193bd1 = 6
+datetime.type.98842c = 7
+datetime.type.33c212 = 8
+datetime.type.c0d82e = 9
+datetime.type.f8b5d7 = 10
+datetime.type.c538bc = 11
+datetime.type.7cec8d = 12
+datetime.type.86260b = 13
+datetime.type.977d89 = 14
+datetime.type.a00ebd = 15
+datetime.type.794290 = 16
+datetime.type.a556a6 = 17
+datetime.type.d1e63f = 18
+datetime.type.716e47 = 19
+datetime.type.4a3c69 = 20
+datetime.type.622324 = 21
+datetime.type.0e0f4f = 22
+datetime.type.4505d5 = 23
+datetime.type.2fb8c8 = 24
+datetime.type.dc45d9 = 25
+datetime.type.250e56 = 26
+datetime.type.f029aa = 27
+datetime.type.41ebe3 = 28
+datetime.type.8cf737 = 29
+datetime.type.716c8f = 30
+datetime.type.57df5d = 31
+datetime.type.fe41e7 = 32
+datetime.type.1d8bc1 = 33
+datetime.type.95ac50 = 34
+datetime.type.4e099e = 35
+datetime.type.e6abb3 = 36
+datetime.type.2d4dbd = 37
+datetime.type.5367fb = 38
+datetime.type.f81bed = 39
+datetime.type.b816df = 40
+datetime.type.c0e099 = 41
+datetime.type.7a258c = 42
+datetime.type.961959 = 43
+datetime.type.3ff1ec = 44
+datetime.type.2f1bd6 = 45
+datetime.type.be1cd7 = 46
+datetime.type.754b80 = 47
+datetime.type.0f0c3e = 48
+datetime.type.3d94b4 = 49
+datetime.type.6a0d57 = 50
+datetime.type.bf5dd8 = 51
+datetime.type.8f4465 = 52
+datetime.type.7cc8d6 = 53
+datetime.type.f2c8c1 = 54
+datetime.type.cdca5f = 55
+datetime.type.5b6849 = 56
+datetime.type.aa212b = 57
+datetime.type.76ee81 = 58
+datetime.type.0ce46c = 59
+datetime.type.c66f6c = 60
+datetime.type.0d5b82 = 61
+datetime.type.dbc1a1 = 62
+datetime.type.f121ba = 63
+datetime.type.14c993 = 64
+datetime.type.8d039d = 65
+datetime.type.2aaf35 = 66
+datetime.type.ced696 = 67
+datetime.type.fb6226 = 68
+datetime.type.3a96a3 = 69
+datetime.type.9f8fd0 = 70
+datetime.type.86a571 = 71
+datetime.type.258dc5 = 72
+datetime.type.e11992 = 73
+datetime.type.3d852b = 74
+datetime.type.5c6600 = 75
+datetime.type.cd99ae = 76
+datetime.type.1a9ea0 = 77
+datetime.type.f9946a = 78
+datetime.type.a29d04 = 79
+datetime.type.17681d = 80
+datetime.type.7c1917 = 81
+datetime.type.255df0 = 82
+datetime.type.d28ac2 = 83
+datetime.type.818716 = 84
+datetime.type.02582f = 85
+datetime.type.872caf = 86
+datetime.type.fd4713 = 87
+datetime.type.6cf4bb = 88
+datetime.type.9bdbff = 89
+datetime.type.88b101 = 90
+datetime.type.b8ffc5 = 91
+datetime.type.e47b69 = 92
+datetime.type.b27ace = 93
+datetime.type.63f18f = 94
+datetime.type.1165f9 = 95
+datetime.type.86d940 = 96
+datetime.type.b6f22e = 97
+datetime.type.99f362 = 98
+datetime.type.c53a9e = 99
 
 [idgen : common]
 

interface.ini

@@ -5,6 +5,8 @@ service.sensitive.detect_batch       = "http://barrage.int.yidian-inc.com/sensit
 
 
 [prod : common]
+
+;======================= 基础服务接口 ======================= 
 ;短信 
 service.user.check_sms_code          = "http://a4.go2yd.com/Website/user/check-sms-code"
 service.user.send_sms_code           = "http://a4.go2yd.com/Website/user/send-sms-code"
@@ -16,7 +18,7 @@ service.session.set             = "http://a4.go2yd.com/Website/session/set-sessi
 service.session.delete          = "http://a4.go2yd.com/Website/session/delete-session"
 service.session.mget            = "http://a4.go2yd.com/Website/session/get-many-session"
 
-;简网用户信息,目前测试域名，后期换成生产域名！！！
+;简网用户信息,目前测试域名，后期换成生产内网域名！！！
 service.jw_user.get_user_info       = "http://testblend.jwshq.cn/ydInner/getUserInfoByMobile"
 service.jw_user.get_all_city_tree   = "http://testblend.jwshq.cn/ydInner/getAllCityTree"
 service.jw_user.get_user_info_by_user_id   = "http://testblend.jwshq.cn/ydInner/getUserInfoByUserId"
@@ -27,37 +29,13 @@ service.jw_user.save_update_life = "http://testblend.jwshq.cn/ydInnerLifeAccount
 ;idgen发号器
 service.idgen = "http://idgen.int.yidian-inc.com/id/get"
 
-[perf : prod : common]
-
-
-[test : common]
-;短信 
-service.user.check_sms_code          = "http://a4-1.go2yd.com/Website/user/check-sms-code"
-service.user.send_sms_code           = "http://a4-1.go2yd.com/Website/user/send-sms-code"
-service.message.send_sms             = "http://a4-1.go2yd.com/Website/message/send-sms"
+;TCC事务协调器
+service.tcc.try = "http://tcc.int.yidian-inc.com/tcc/try"
+service.tcc.confirm = "http://tcc.int.yidian-inc.com/tcc/confirm"
+service.tcc.cancel = "http://tcc.int.yidian-inc.com/tcc/cancel"
 
-;session相关
-service.session.get             = "http://a4-1.go2yd.com/Website/session/get-session"
-service.session.set             = "http://a4-1.go2yd.com/Website/session/set-session"
-service.session.delete          = "http://a4-1.go2yd.com/Website/session/delete-session"
-service.session.mget            = "http://a4-1.go2yd.com/Website/session/get-many-session"
-
-;简网用户信息
-service.jw_user.get_user_info       = "http://testblend.jwshq.cn/ydInner/getUserInfoByMobile"
-service.jw_user.get_all_city_tree   = "http://testblend.jwshq.cn/ydInner/getAllCityTree"
-service.jw_user.get_user_info_by_user_id   = "http://testblend.jwshq.cn/ydInner/getUserInfoByUserId"
-service.jw_user.get_user_list   = "http://testblend.jwshq.cn/ydInner/getUserList"
-service.jw_user.save_push_token = "http://testblend.jwshq.cn/ydInnerToken/savePushToken"
-service.jw_user.save_update_life = "http://testblend.jwshq.cn/ydInnerLifeAccount/saveOrUpdateLifeAccount"
-
-;idgen发号器
-service.idgen = "http://idgen-test.ini.yidian-inc.com/id/get"
-
-[dev : test : common]
 
-; =======================  gateway ==================================================================================
-
-[prod-gateway : prod]
+;======================= 商户服务接口 ======================= 
 ;用户审核相关接口
 merchant.personal.check = "http://merchant.int.yidian-inc.com/auth/personal/check"
 merchant.personal.live_identity = "http://merchant.int.yidian-inc.com/auth/personal/live_identity"
@@ -89,13 +67,11 @@ merchant.enterprise.check_mobile_code   = "http://merchant.int.yidian-inc.com/au
 merchant.enterprise.change_role   = "http://merchant.int.yidian-inc.com/auth/enterprise/change_role"
 merchant.enterprise.delete_life_user   = "http://merchant.int.yidian-inc.com/auth/enterprise/delete_life_user"
 
-merchant.recruit.create_recruit  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/create_recruit"
-merchant.recruit.update_recruit  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/update_recruit"
-merchant.recruit.get_recruit  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/get_recruit"
-
 merchant.recruitinner.create_recruit  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/create_recruit"
 merchant.recruitinner.update_recruit  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/update_recruit"
 merchant.recruitinner.get_recruit  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/get_recruit"
+merchant.recruitinner.get_enterprise_info  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/get_enterprise_info"
+merchant.recruitinner.get_life_enter_info  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/get_life_enter_info"
 
 merchant.enterprise.send_code   = "http://merchant.int.yidian-inc.com/auth/verify/send_code"
 merchant.enterprise.check_code   = "http://merchant.int.yidian-inc.com/auth/verify/check_code"
@@ -119,12 +95,10 @@ merchant.enterprise.life_info = "http://merchant.int.yidian-inc.com/auth/enterpr
 merchant.enterprise.op_commit = "http://merchant.int.yidian-inc.com/auth/enterprise/op_commit"
 merchant.enterprise.op_business_update = "http://merchant.int.yidian-inc.com/auth/enterprise/op_business_update"
 
+;生活号接口
 merchant.lifeaccount.get_account_by_lid = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_account_by_lid"
-
 merchant.lifeaccount.get_account_info = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_account_info"
-
 merchant.lifeaccount.get_lid_by_uid = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_lid_by_uid"
-
 merchant.lifeaccount.get_life_account_by_id = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_life_account_by_id"
 merchant.lifeaccount.get_life_account_by_ids = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_life_account_by_ids"
 merchant.lifeaccount.get_life_account_by_name = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_life_account_by_name"
@@ -133,6 +107,7 @@ merchant.lifeaccount.get_life_account_by_full_name = "http://merchant.int.yidian
 merchant.lifeaccount.get_account_info_by_lid = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_account_info_by_lid"
 merchant.lifeaccount.batch_get_account_name = "http://merchant.int.yidian-inc.com/lifeaccount/account/batch_get_account_name"
 merchant.lifeaccount.update_life_account = "http://merchant.int.yidian-inc.com/lifeaccount/account/update_life_account"
+merchant.lifeaccount.get_merchant_entrance  = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_merchant_entrance"
 
 ;互动项目
 interaction.index.follow = "http://interact.int.yidian-inc.com/follow/index/follow"
@@ -141,12 +116,40 @@ interaction.index.is_follow = "http://interact.int.yidian-inc.com/follow/index/i
 interaction.inner.digg = "http://interact.int.yidian-inc.com/follow/index/digg"
 interaction.inner.get_count_and_isfollow = "http://interact.int.yidian-inc.com/follow/index/get_count_and_isfollow"
 
-[perf-gateway : perf : prod-gateway]
 
+[perf : prod : common]
 
-[test-gateway : test]
 
+[test : common]
+;======================= 基础服务接口 ======================= 
+;短信 
+service.user.check_sms_code          = "http://a4-1.go2yd.com/Website/user/check-sms-code"
+service.user.send_sms_code           = "http://a4-1.go2yd.com/Website/user/send-sms-code"
+service.message.send_sms             = "http://a4-1.go2yd.com/Website/message/send-sms"
+
+;session相关
+service.session.get             = "http://a4-1.go2yd.com/Website/session/get-session"
+service.session.set             = "http://a4-1.go2yd.com/Website/session/set-session"
+service.session.delete          = "http://a4-1.go2yd.com/Website/session/delete-session"
+service.session.mget            = "http://a4-1.go2yd.com/Website/session/get-many-session"
 
+;简网用户信息
+service.jw_user.get_user_info       = "http://testblend.jwshq.cn/ydInner/getUserInfoByMobile"
+service.jw_user.get_all_city_tree   = "http://testblend.jwshq.cn/ydInner/getAllCityTree"
+service.jw_user.get_user_info_by_user_id   = "http://testblend.jwshq.cn/ydInner/getUserInfoByUserId"
+service.jw_user.get_user_list   = "http://testblend.jwshq.cn/ydInner/getUserList"
+service.jw_user.save_push_token = "http://testblend.jwshq.cn/ydInnerToken/savePushToken"
+service.jw_user.save_update_life = "http://testblend.jwshq.cn/ydInnerLifeAccount/saveOrUpdateLifeAccount"
+
+;idgen发号器
+service.idgen = "http://idgen-test.ini.yidian-inc.com/id/get"
+
+;TCC事务协调器
+service.tcc.try = "http://tcc.test.yidian-inc.com/tcc/try"
+service.tcc.confirm = "http://tcc.test.yidian-inc.com/tcc/confirm"
+service.tcc.cancel = "http://tcc.test.yidian-inc.com/tcc/cancel"
+
+;======================= 商户服务接口 ======================= 
 ;用户审核相关接口
 merchant.personal.check = "http://merchant.test.yidian-inc.com/auth/personal/check"
 merchant.personal.live_identity = "http://merchant.test.yidian-inc.com/auth/personal/live_identity"
@@ -185,6 +188,8 @@ merchant.recruit.get_recruit  = "http://merchant.test.yidian-inc.com/lifeaccount
 merchant.recruitinner.create_recruit  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/create_recruit"
 merchant.recruitinner.update_recruit  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/update_recruit"
 merchant.recruitinner.get_recruit  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/get_recruit"
+merchant.recruitinner.get_enterprise_info  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/get_enterprise_info"
+merchant.recruitinner.get_life_enter_info  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/get_life_enter_info"
 
 merchant.enterprise.send_code   = "http://merchant.test.yidian-inc.com/auth/verify/send_code"
 merchant.enterprise.check_code   = "http://merchant.test.yidian-inc.com/auth/verify/check_code"
@@ -209,20 +214,18 @@ merchant.enterprise.life_info = "http://merchant.test.yidian-inc.com/auth/enterp
 merchant.enterprise.op_commit = "http://merchant.test.yidian-inc.com/auth/enterprise/op_commit"
 merchant.enterprise.op_business_update = "http://merchant.test.yidian-inc.com/auth/enterprise/op_business_update"
 
+;生活号接口
 merchant.lifeaccount.get_account_by_lid = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_account_by_lid"
-
 merchant.lifeaccount.get_account_info = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_account_info"
-
 merchant.lifeaccount.get_lid_by_uid = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_lid_by_uid"
-
 merchant.lifeaccount.get_account_info_by_lid = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_account_info_by_lid"
-
 merchant.lifeaccount.get_life_account_by_id = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_account_by_id"
 merchant.lifeaccount.get_life_account_by_ids = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_account_by_ids"
 merchant.lifeaccount.get_life_account_by_name = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_account_by_name"
 merchant.lifeaccount.get_life_account_by_full_name = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_account_by_full_name"
 merchant.lifeaccount.batch_get_account_name = "merchant.test.yidian-inc.com/lifeaccount/account/batch_get_account_name"
 merchant.lifeaccount.update_life_account = "merchant.test.yidian-inc.com/lifeaccount/account/update_life_account"
+merchant.lifeaccount.get_merchant_entrance  = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_merchant_entrance"
 
 ;互动项目
 interaction.index.follow = "http://interaction.test.yidian-inc.com/follow/index/follow"
@@ -232,20 +235,22 @@ interaction.inner.digg = "http://interaction.test.yidian-inc.com/follow/index/di
 interaction.inner.get_count_and_isfollow = "http://interaction.test.yidian-inc.com/follow/index/get_count_and_isfollow"
 
 ;门店
-goods.shop.add_shop = "http://goods.test.yidian-inc.com/shop/shop/add_shop"
-goods.shop.get_shop_list = "http://goods.test.yidian-inc.com/shop/shop/get_shop_list"
-goods.shop.get_shop_info = "http://goods.test.yidian-inc.com/shop/shop/get_shop_info"
-goods.shop.update_shop = "http://goods.test.yidian-inc.com/shop/shop/update_shop"
-goods.shop.shop_list = "http://goods.test.yidian-inc.com/shop/shop/shop_list"
+goods.shop.add_shop = "http://goods.test.int.yidian-inc.com/shop/shop/add_shop"
+goods.shop.get_shop_list = "http://goods.test.int.yidian-inc.com/shop/shop/get_shop_list"
+goods.shop.get_shop_info = "http://goods.test.int.yidian-inc.com/shop/shop/get_shop_info"
+goods.shop.update_shop = "http://goods.test.int.yidian-inc.com/shop/shop/update_shop"
+goods.shop.shop_list = "http://goods.test.int.yidian-inc.com/shop/shop/shop_list"
 
 ;分销活动
-goods.marketing.marketing_list = "http://goods.test.yidian-inc.com/marketing/marketing/marketing_list"
-goods.marketing.add_marketing = "http://goods.test.yidian-inc.com/marketing/marketing/add_marketing"
-goods.marketing.update_marketing = "http://goods.test.yidian-inc.com/marketing/marketing/update_marketing"
-goods.marketing.marketing_info = "http://goods.test.yidian-inc.com/marketing/marketing/marketing_info"
-goods.marketing.marketing_goods_list = "http://goods.test.yidian-inc.com/marketing/marketinggoods/marketing_goods_list"
-goods.marketing.generate_share_goods = "http://goods.test.yidian-inc.com/marketing/marketinggoods/generate_share_goods"
-goods.marketing.goods_list = "http://goods.test.yidian-inc.com/marketing/marketing/marketing_goods_list"
+goods.marketing.marketing_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/marketing_list"
+goods.marketing.add_marketing = "http://goods.test.int.yidian-inc.com/marketing/marketing/add_marketing"
+goods.marketing.update_marketing = "http://goods.test.int.yidian-inc.com/marketing/marketing/update_marketing"
+goods.marketing.marketing_info = "http://goods.test.int.yidian-inc.com/marketing/marketing/marketing_info"
+goods.marketing.marketing_goods_list = "http://goods.test.int.yidian-inc.com/marketing/marketinggoods/marketing_goods_list"
+goods.marketing.generate_share_goods = "http://goods.test.int.yidian-inc.com/marketing/marketinggoods/generate_share_goods"
+goods.marketing.goods_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/marketing_goods_list"
+goods.marketing.marketing_goods_rate = "http://goods.test.int.yidian-inc.com/marketing/marketing/marketing_goods_rate"
+goods.marketing.get_marketing_goods_list = "http://goods.test.int.yidian-inc.com/marketing/marketinggoods/get_marketing_goods_list"
 
 
 
@@ -256,16 +261,74 @@ goods.marketing.apply_second_distributor = "http://goods.test.yidian-inc.com/mar
 goods.marketing.send_sms_code = "http://goods.test.yidian-inc.com/marketing/distributor/send_sms_code"
 goods.marketing.distributor = "http://goods.test.yidian-inc.com/marketing/distributor/distributor"
 goods.marketing.distributor_list = "http://goods.test.yidian-inc.com/marketing/distributor/distributor_list"
+goods.marketing.distributor_code_url = "http://goods.test.yidian-inc.com/marketing/distributor/distributor_code_url"
+goods.marketing.is_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/is_distributor"
+ 
+;商品
+goods.public.get_goods_category_list = "http://goods.test.int.yidian-inc.com/goods/goods/get_goods_category_list"
+goods.public.get_level_one_category_list = "http://goods.test.int.yidian-inc.com/goods/goods/get_level_one_category_list"
+goods.public.goods_edit = "http://goods.test.int.yidian-inc.com/goods/goods/edit"
+goods.public.goods_online_offline = "http://goods.test.int.yidian-inc.com/goods/goods/online_offline"
+goods.public.check_goods_name = "http://goods.test.int.yidian-inc.com/goods/goods/check_goods_name"
+
+goods.background.goods_list_op = "http://goods.test.int.yidian-inc.com/goods/goods/goods_list_op"
+goods.background.goods_info_op = "http://goods.test.int.yidian-inc.com/goods/goods/info_op"
+goods.background.goods_audit = "http://goods.test.int.yidian-inc.com/goods/goods/audit"
+
+goods.consumer.goods_list_c = "http://goods.test.int.yidian-inc.com/goods/goods/goods_list_c"
+goods.consumer.goods_list_es = "http://goods.test.int.yidian-inc.com/goods/goods/goods_list_es"
+goods.consumer.goods_info = "http://goods.test.int.yidian-inc.com/goods/goods/info_fe"
+goods.consumer.goods_add = "http://goods.test.int.yidian-inc.com/goods/goods/add"
+
+goods.public.goods_sku_list = "http://goods.test.int.yidian-inc.com/goods/goods/goods_sku_list"
+goods.public.goods_spu_list = "http://goods.test.int.yidian-inc.com/goods/goods/goods_spu_list"
 
 
 ;订单
 order.order.user_order_list = "http://order.test.yidian-inc.com/order/order/user_order_list"
 order.order.merchant_order_list = "http://order.test.yidian-inc.com/order/order/merchant_order_list"
+order.order.create_order = "http://order.test.yidian-inc.com/order/order/create_order"
+order.order.cancel_order = "http://order.test.yidian-inc.com/order/order/cancel_order"
+order.order.refund_apply = "http://order.test.yidian-inc.com/order/order/refund_apply"
+order.order.pay_order = "http://order.test.yidian-inc.com/order/order/pay_order"
+order.order.pay_order_item = "http://order.test.yidian-inc.com/order/order/pay_order_item"
+order.order.pay_order_info = "http://order.test.yidian-inc.com/order/order/pay_order_info"
+order.order.scanpurchase_userverify = "http://order.test.yidian-inc.com/order/order/scanpurchase_userverify"
+
+;支付
+pay.order.pay = "http://pay.test.yidian-inc.com/pay/order/pay"
+pay.order.refund = "http://pay.test.yidian-inc.com/pay/order/refund"
+pay.order.write_off = "http://pay.test.yidian-inc.com/pay/order/write_off"
+pay.callback.pay = "http://pay.test.yidian-inc.com/pay/callback/pay"
+pay.callback.refund = "http://pay.test.yidian-inc.com/pay/callback/refund"
+
+;钱包
+wallet.account.transfer = "http://wallet.test.yidian-inc.com/wallet/account/transfer"
+wallet.account.list = "http://wallet.test.yidian-inc.com/wallet/account/list"
+wallet.account.account_info = "http://wallet.test.yidian-inc.com/wallet/account/account_info"
+
+
+;tcc调goods用子项目
+goods.tcc.place_an_order_try = "http://goods.test.int.yidian-inc.com/tcc/tcc/place_an_order_try";
+goods.tcc.place_an_order_confirm = "http://goods.test.int.yidian-inc.com/tcc/tcc/place_an_order_confirm";
+goods.tcc.place_an_order_cancel = "http://goods.test.int.yidian-inc.com/tcc/tcc/place_an_order_cancel";
+goods.tcc.cancel_order_try = "http://goods.test.int.yidian-inc.com/tcc/tcc/cancel_order_try";
+goods.tcc.cancel_order_confirm = "http://goods.test.int.yidian-inc.com/tcc/tcc/cancel_order_confirm";
+goods.tcc.cancel_order_cancel = "http://goods.test.int.yidian-inc.com/tcc/tcc/cancel_order_cancel";
+
+
+;tcc调order用子项目
+order.tcc.create_order_try = "http://order.test.yidian-inc.com/tcc/tcc/create_order_try";
+order.tcc.create_order_confirm = "http://order.test.yidian-inc.com/tcc/tcc/create_order_confirm";
+order.tcc.create_order_cancel = "http://order.test.yidian-inc.com/tcc/tcc/create_order_cancel";
+order.tcc.cancel_order_try = "http://order.test.yidian-inc.com/tcc/tcc/cancel_order_try";
+order.tcc.cancel_order_confirm = "http://order.test.yidian-inc.com/tcc/tcc/cancel_order_confirm";
+order.tcc.cancel_order_cancel = "http://order.test.yidian-inc.com/tcc/tcc/cancel_order_cancel";
+order.tcc.create_order_main = "http://order.test.yidian-inc.com/tcc/tcc/create_order_main";
+order.tcc.cancel_order_main = "http://order.test.yidian-inc.com/tcc/tcc/cancel_order_main";
 
 
-
-
-[dev-gateway : dev]
+[dev : test : common]
 ;用户审核相关接口
 merchant.personal.check = "http://merchant.dev.yidian-inc.com/auth/personal/check"
 merchant.personal.live_identity = "http://merchant.dev.yidian-inc.com/auth/personal/live_identity"
@@ -300,15 +363,13 @@ merchant.enterprise.check_mobile_code   = "http://merchant.dev.yidian-inc.com/au
 merchant.enterprise.change_role   = "http://merchant.dev.yidian-inc.com/auth/enterprise/change_role"
 merchant.enterprise.delete_life_user   = "http://merchant.dev.yidian-inc.com/auth/enterprise/delete_life_user"
 
-merchant.recruit.create_recruit  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/create_recruit"
-merchant.recruit.update_recruit  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/update_recruit"
-merchant.recruit.get_recruit  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/get_recruit"
 
 merchant.recruitinner.create_recruit  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/create_recruit"
 merchant.recruitinner.update_recruit  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/update_recruit"
 merchant.recruitinner.get_recruit  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/get_recruit"
-
 merchant.recruitinner.batch_recruit  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/check_recruit"
+merchant.recruitinner.get_enterprise_info  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/get_enterprise_info"
+merchant.recruitinner.get_life_enter_info  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/get_life_enter_info"
 
 ;管理员用户权限相关接口
 merchant.authority.get_role_list  = "http://merchant.dev.yidian-inc.com/authority/authority/get_role_list"
@@ -342,7 +403,7 @@ merchant.lifeaccount.get_life_account_by_full_name = "http://merchant.dev.yidian
 merchant.lifeaccount.get_account_info_by_lid = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_account_info_by_lid"
 merchant.lifeaccount.batch_get_account_name = "merchant.dev.yidian-inc.com/lifeaccount/account/batch_get_account_name"
 merchant.lifeaccount.update_life_account = "merchant.dev.yidian-inc.com/lifeaccount/account/update_life_account"
-
+merchant.lifeaccount.get_merchant_entrance  = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_merchant_entrance"
 
 ;互动项目
 interaction.index.follow = "http://interaction.dev.yidian-inc.com/follow/index/follow"
@@ -368,7 +429,8 @@ goods.marketing.marketing_info = "http://goods.dev.yidian-inc.com/marketing/mark
 goods.marketing.marketing_goods_list = "http://goods.dev.yidian-inc.com/marketing/marketinggoods/marketing_goods_list"
 goods.marketing.generate_share_goods = "http://goods.dev.yidian-inc.com/marketing/marketinggoods/generate_share_goods"
 goods.marketing.goods_list = "http://goods.dev.yidian-inc.com/marketing/marketing/marketing_goods_list"
-
+goods.marketing.marketing_goods_rate = "http://goods.dev.yidian-inc.com/marketing/marketing/marketing_goods_rate"
+goods.marketing.get_marketing_goods_list = "http://goods.dev.yidian-inc.com/marketing/marketinggoods/get_marketing_goods_list"
 
 
 ;团长
@@ -378,11 +440,13 @@ goods.marketing.apply_second_distributor = "http://goods.dev.yidian-inc.com/mark
 goods.marketing.send_sms_code = "http://goods.dev.yidian-inc.com/marketing/distributor/send_sms_code"
 goods.marketing.distributor = "http://goods.dev.yidian-inc.com/marketing/distributor/distributor"
 goods.marketing.distributor_list = "http://goods.dev.yidian-inc.com/marketing/distributor/distributor_list"
-
+goods.marketing.distributor_code_url = "http://goods.dev.yidian-inc.com/marketing/distributor/distributor_code_url"
+goods.marketing.is_distributor = "http://goods.dev.yidian-inc.com/marketing/distributor/is_distributor"
 
 
 ;商品
 goods.public.get_goods_category_list = "http://goods.dev.yidian-inc.com/goods/goods/get_goods_category_list"
+goods.public.get_level_one_category_list = "http://goods.dev.yidian-inc.com/goods/goods/get_level_one_category_list"
 goods.public.goods_edit = "http://goods.dev.yidian-inc.com/goods/goods/edit"
 goods.public.goods_online_offline = "http://goods.dev.yidian-inc.com/goods/goods/online_offline"
 goods.public.check_goods_name = "http://goods.dev.yidian-inc.com/goods/goods/check_goods_name"
@@ -396,56 +460,98 @@ goods.consumer.goods_list_es = "http://goods.dev.yidian-inc.com/goods/goods/good
 goods.consumer.goods_info = "http://goods.dev.yidian-inc.com/goods/goods/info_fe"
 goods.consumer.goods_add = "http://goods.dev.yidian-inc.com/goods/goods/add"
 
+goods.public.goods_sku_list = "http://goods.dev.yidian-inc.com/goods/goods/goods_sku_list"
+goods.public.goods_spu_list = "http://goods.dev.yidian-inc.com/goods/goods/goods_spu_list"
+
 
 ;订单
 order.order.user_order_list = "http://order.dev.yidian-inc.com/order/order/user_order_list"
 order.order.merchant_order_list = "http://order.dev.yidian-inc.com/order/order/merchant_order_list"
+order.order.create_order = "http://order.dev.yidian-inc.com/order/order/create_order"
+order.order.cancel_order = "http://order.dev.yidian-inc.com/order/order/cancel_order"
+order.order.refund_apply = "http://order.dev.yidian-inc.com/order/order/refund_apply"
+order.order.pay_order = "http://order.dev.yidian-inc.com/order/order/pay_order"
+order.order.pay_order_item = "http://order.dev.yidian-inc.com/order/order/pay_order_item"
+order.order.pay_order_info = "http://order.dev.yidian-inc.com/order/order/pay_order_info"
+order.order.scanpurchase_userverify = "http://order.dev.yidian-inc.com/order/order/scanpurchase_userverify"
 
 
-; =======================  merchant ==================================================================================
+;支付
+pay.order.pay = "http://pay.dev.yidian-inc.com/pay/order/pay"
+pay.order.refund = "http://pay.dev.yidian-inc.com/pay/order/refund"
+pay.order.write_off = "http://pay.dev.yidian-inc.com/pay/order/write_off"
+pay.callback.pay = "http://pay.dev.yidian-inc.com/pay/callback/pay"
+pay.callback.refund = "http://pay.dev.yidian-inc.com/pay/callback/refund"
 
-[prod-merchant : prod]
-[perf-goods : perf : prod-goods]
-[test-merchant : test]
-[dev-merchant : dev : test-merchant]
+;钱包
+wallet.account.transfer = "http://wallet.dev.yidian-inc.com/wallet/account/transfer"
+wallet.account.list = "http://wallet.dev.yidian-inc.com/wallet/account/list"
+wallet.account.account_info = "http://wallet.dev.yidian-inc.com/wallet/account/account_info"
 
+;tcc调goods用子项目
+goods.tcc.place_an_order_try = "http://goods.dev.yidian-inc.com/tcc/tcc/place_an_order_try";
+goods.tcc.place_an_order_confirm = "http://goods.dev.yidian-inc.com/tcc/tcc/place_an_order_confirm";
+goods.tcc.place_an_order_cancel = "http://goods.dev.yidian-inc.com/tcc/tcc/place_an_order_cancel";
+goods.tcc.cancel_order_try = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_order_try";
+goods.tcc.cancel_order_confirm = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_order_confirm";
+goods.tcc.cancel_order_cancel = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_order_cancel";
 
 
-; =======================  goods ==================================================================================
 
-[prod-goods : prod]
-[perf-goods : perf : prod-goods]
-[test-goods : test]
+;tcc调order用子项目
+order.tcc.create_order_try = "http://order.dev.yidian-inc.com/tcc/tcc/create_order_try";
+order.tcc.create_order_confirm = "http://order.dev.yidian-inc.com/tcc/tcc/create_order_confirm";
+order.tcc.create_order_cancel = "http://order.dev.yidian-inc.com/tcc/tcc/create_order_cancel";
+order.tcc.cancel_order_try = "http://order.dev.yidian-inc.com/tcc/tcc/cancel_order_try";
+order.tcc.cancel_order_confirm = "http://order.dev.yidian-inc.com/tcc/tcc/cancel_order_confirm";
+order.tcc.cancel_order_cancel = "http://order.dev.yidian-inc.com/tcc/tcc/cancel_order_cancel";
+order.tcc.create_order_main = "http://order.dev.yidian-inc.com/tcc/tcc/create_order_main";
+order.tcc.cancel_order_main = "http://order.dev.yidian-inc.com/tcc/tcc/cancel_order_main";
 
-merchant.lifeaccount.get_life_account_by_ids = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_account_by_ids"
 
-[dev-goods : dev : test-goods]
 
-merchant.lifeaccount.get_life_account_by_ids = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_life_account_by_ids"
+; =======================  gateway ==================================================================================
 
+[prod-gateway : prod]
+[perf-gateway : perf]
+[test-gateway : test]
+[dev-gateway : dev]
 
-; =======================  order ==================================================================================
+; =======================  merchant ==================================================================================
 
-[prod-order : prod]
-[perf-order : perf : prod-order]
-[test-order : test]
+[prod-merchant : prod]
+[perf-merchant : perf]
+[test-merchant : test]
+[dev-merchant : dev]
 
-goods.shop.get_shop_list = "http://goods.test.yidian-inc.com/shop/shop/get_shop_list"
-goods.public.goods_sku_list = "http://goods.test.yidian-inc.com/goods/goods/goods_sku_list"
+; =======================  goods ==================================================================================
 
-[dev-order : dev : test-order]
+[prod-goods : prod]
+[perf-goods : perf ]
+[test-goods : test]
+[dev-goods : dev]
 
-goods.shop.get_shop_list = "http://goods.dev.yidian-inc.com/shop/shop/get_shop_list"
-goods.public.goods_sku_list = "http://goods.dev.yidian-inc.com/goods/goods/goods_sku_list"
+; =======================  order ==================================================================================
+
+[prod-order : prod]
+[perf-order : perf]
+[test-order : test]
+[dev-order : dev]
 
 ; =======================  pay ==================================================================================
 
 [prod-pay : prod]
-[perf-pay : perf : prod-pay]
+[perf-pay : perf]
 [test-pay : test]
-[dev-pay : dev : test-pay]
+[dev-pay : dev]
+
 
+; =======================  wallet ==================================================================================
 
+[prod-wallet : prod]
+[perf-wallet : perf]
+[test-wallet : test]
+[dev-wallet : dev]
 
 ; =======================  interaction ==================================================================================
 
@@ -456,6 +562,7 @@ merchant.account.get_user_list  = "http://merchant.int.yidian-inc.com/lifeaccoun
 service.jw_user.get_user_dynamic   = "http://testblend.jwshq.cn/ydInner/getUserListWithDynamic"
 service.jw_user.get_user_digg   = "http://testblend.jwshq.cn/ydInner/getUserAgreeCount"
 
+[perf-interaction : perf]
 
 [test-interaction : test]
 merchant.account.get_role_list  = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_role_list"

mongo.ini

@@ -7,7 +7,7 @@
 
 ;商户项目继承common + 自己的配置 + 生产环境特有有配置，此节中配置会覆盖父级的相同配置
 [prod-gateway : gateway : common]
-gateway.host="rs_bp_merchant_01.int.yidian-inc.com:27107,rs_bp_merchant_02.int.yidian-inc.com:27107,rs_bp_merchant_03.int.yidian-inc.com:27107"
+gateway.host="rs_bp_merchant_01.int.yidian-inc.com:27017,rs_bp_merchant_02.int.yidian-inc.com:27017,rs_bp_merchant_03.int.yidian-inc.com:27017"
 gateway.uriOptions.username='rs_merchant_rw'
 gateway.uriOptions.password='w#JR9tQOVud$jh43V7v#B9Bd#kD4w%'
 gateway.uriOptions.replicaSet='rs_bp'
@@ -20,7 +20,7 @@ gateway.driverOptions.typeMap.root='array'
 gateway.driverOptions.typeMap.document='array'
  
 
-xhprof.host="rs_bp_merchant_01.int.yidian-inc.com:27107,rs_bp_merchant_02.int.yidian-inc.com:27107,rs_bp_merchant_03.int.yidian-inc.com:27107"
+xhprof.host="rs_bp_merchant_01.int.yidian-inc.com:27017,rs_bp_merchant_02.int.yidian-inc.com:27017,rs_bp_merchant_03.int.yidian-inc.com:27017"
 xhprof.uriOptions.username='rs_merchant_rw'
 xhprof.uriOptions.password='w#JR9tQOVud$jh43V7v#B9Bd#kD4w%'
 xhprof.uriOptions.replicaSet='rs_bp'

mysql.ini

@@ -174,3 +174,77 @@ order.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
 order.charset='utf8mb4'
 order.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
 order.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
+
+tccIndex.database_type='mysql'
+tccIndex.database_name='bp_tcc'
+tccIndex.connect_timeout=2
+tccIndex.username='bp_test_rw'
+tccIndex.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+tccIndex.charset='utf8'
+tccIndex.write.host='w.bp_test_mysql5.int.yidian-inc.com:3310'
+tccIndex.read.host='r.bp_test_mysql5_1.int.yidian-inc.com:3310,r.bp_test_mysql5_2.int.yidian-inc.com:3310'
+
+
+
+[pay : common]
+
+; 生产环境
+[prod-pay : pay : common]
+
+
+; 预发环境
+[perf-pay : prod-pay : pay : common]
+
+; 测试环境
+[test-pay : pay : common]
+pay.database_type='mysql'
+pay.database_name='pay'
+pay.connect_timeout=2
+pay.username='bp_test_rw'
+pay.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+pay.charset='utf8mb4'
+pay.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
+pay.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
+
+; 联调环境
+[dev-pay : pay : common]
+pay.database_type='mysql'
+pay.database_name='pay'
+pay.connect_timeout=2
+pay.username='bp_test_rw'
+pay.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+pay.charset='utf8mb4'
+pay.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
+pay.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
+
+
+[wallet : common]
+
+; 生产环境
+[prod-wallet : wallet : common]
+
+
+; 预发环境
+[perf-wallet : prod-wallet : wallet : common]
+
+; 测试环境
+[test-wallet : wallet : common]
+wallet.database_type='mysql'
+wallet.database_name='wallet'
+wallet.connect_timeout=2
+wallet.username='bp_test_rw'
+wallet.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+wallet.charset='utf8mb4'
+wallet.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
+wallet.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
+
+; 联调环境
+[dev-wallet : wallet : common]
+wallet.database_type='mysql'
+wallet.database_name='wallet'
+wallet.connect_timeout=2
+wallet.username='bp_test_rw'
+wallet.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+wallet.charset='utf8mb4'
+wallet.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
+wallet.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'