Skip to content

Y
yaconf
Commit b167286c authored by guozhiyuan's avatar guozhiyuan
Browse files
Options

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

parents 60e18268 fdc1227c
Show whitespace changes
Inline Side-by-side
Showing with 121 additions and 87 deletions
elasticsearch.ini 0 → 100755
View file @ b167286c
; 公共的配置内容，不区分应用及环境
[common]
[goods : common]
; 生产环境
[prod-goods : goods : common]
; 预发环境
[perf-goods : prod-goods : goods : common]
；测试测试
[test-goods : prod-goods : goods : common]
goods.host="http://10.126.154.152:40000"
；开发联调测试
[dev-goods : prod-goods : goods : common]
goods.host="http://10.126.154.152:40000"
\ No newline at end of file
interface.ini
View file @ b167286c
[common]
;敏感词
service.sensitive.detect = "http://barrage.int.yidian-inc.com/sensitive/detection/detect"
service.sensitive.detect_batch = "http://barrage.int.yidian-inc.com/sensitive/detection/detectBatch"
[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"
......@@ -18,8 +16,20 @@ 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"
[test : common]
;简网用户信息,目前测试域名，后期换成生产域名！！！
service.jw_user.get_user_info = "testblend.jwshq.cn/ydInner/getUserInfoByMobile"
service.jw_user.get_all_city_tree = "testblend.jwshq.cn/ydInner/getAllCityTree"
service.jw_user.get_user_info_by_user_id = "testblend.jwshq.cn/ydInner/getUserInfoByUserId"
service.jw_user.get_user_list = "testblend.jwshq.cn/ydInner/getUserList"
service.jw_user.save_push_token = "testblend.jwshq.cn/ydInnerToken/savePushToken"
;idgen发号器
service.idgen = "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"
......@@ -31,14 +41,6 @@ service.session.set = "http://a4-1.go2yd.com/Website/session/set-ses
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"
[dev : test : common]
[gateway : common]
[prod-gateway : gateway : common]
;简网用户信息
service.jw_user.get_user_info = "testblend.jwshq.cn/ydInner/getUserInfoByMobile"
service.jw_user.get_all_city_tree = "testblend.jwshq.cn/ydInner/getAllCityTree"
......@@ -46,6 +48,14 @@ service.jw_user.get_user_info_by_user_id = "testblend.jwshq.cn/ydInner/getUser
service.jw_user.get_user_list = "testblend.jwshq.cn/ydInner/getUserList"
service.jw_user.save_push_token = "testblend.jwshq.cn/ydInnerToken/savePushToken"
;idgen发号器
service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
[dev : test : common]
; ======================= gateway ==================================================================================
[prod-gateway : prod]
;用户审核相关接口
merchant.personal.check = "merchant.int.yidian-inc.com/auth/personal/check"
merchant.personal.live_identity = "merchant.int.yidian-inc.com/auth/personal/live_identity"
......@@ -57,10 +67,6 @@ merchant.user.life_account_list = "merchant.int.yidian-inc.com/user/user/account
;登陆上报地理位置
merchant.user.binding_location = "merchant.int.yidian-inc.com/user/user/binding_location"
;企业审核相关接口
merchant.enterprise.ent_check = "merchant.int.yidian-inc.com/auth/enterprise/check"
merchant.enterprise.ent_commit = "merchant.int.yidian-inc.com/auth/enterprise/business"
......@@ -92,8 +98,6 @@ merchant.recruitinner.get_recruit = "merchant.int.yidian-inc.com/lifeaccount/re
merchant.enterprise.send_code = "merchant.int.yidian-inc.com/auth/verify/send_code"
merchant.enterprise.check_code = "merchant.int.yidian-inc.com/auth/verify/check_code"
;管理员用户权限相关接口
merchant.authority.get_role_list = "merchant.int.yidian-inc.com/authority/authority/get_role_list"
merchant.authority.add_role = "merchant.int.yidian-inc.com/authority/authority/add_role"
......@@ -107,7 +111,6 @@ merchant.authority.get_user_info = "merchant.int.yidian-inc.com/authority/author
merchant.authority.update_user = "merchant.int.yidian-inc.com/authority/authority/update_user"
merchant.authority.add_user_role = "merchant.int.yidian-inc.com/authority/authority/add_user_role"
;后台op接口
merchant.enterprise.life_list = "merchant.int.yidian-inc.com/auth/enterprise/life_list"
merchant.enterprise.life_info = "merchant.int.yidian-inc.com/auth/enterprise/life_info"
......@@ -125,19 +128,11 @@ interaction.index.is_follow = "interact.int.yidian-inc.com/follow/index/is_follo
interaction.inner.digg = "interact.int.yidian-inc.com/follow/index/digg"
interaction.index.life_detail = "interact.int.yidian-inc.com/follow/index/get_count"
[perf-gateway : perf : prod-gateway]
[test-gateway : test]
[perf-gateway : gateway : common]
[test-gateway : gateway : common]
;简网用户信息
service.jw_user.get_user_info = "testblend.jwshq.cn/ydInner/getUserInfoByMobile"
service.jw_user.get_all_city_tree = "testblend.jwshq.cn/ydInner/getAllCityTree"
service.jw_user.get_user_info_by_user_id = "testblend.jwshq.cn/ydInner/getUserInfoByUserId"
service.jw_user.get_user_list = "testblend.jwshq.cn/ydInner/getUserList"
service.jw_user.save_push_token = "testblend.jwshq.cn/ydInnerToken/savePushToken"
;用户审核相关接口
merchant.personal.check = "merchant.test.yidian-inc.com/auth/personal/check"
......@@ -170,7 +165,6 @@ merchant.enterprise.check_mobile_code = "merchant.test.yidian-inc.com/auth/ent
merchant.enterprise.change_role = "merchant.test.yidian-inc.com/auth/enterprise/change_role"
merchant.enterprise.delete_life_user = "merchant.test.yidian-inc.com/auth/enterprise/delete_life_user"
merchant.recruit.create_recruit = "merchant.test.yidian-inc.com/lifeaccount/recruit/create_recruit"
merchant.recruit.update_recruit = "merchant.test.yidian-inc.com/lifeaccount/recruit/update_recruit"
merchant.recruit.get_recruit = "merchant.test.yidian-inc.com/lifeaccount/recruit/get_recruit"
......@@ -206,6 +200,8 @@ merchant.lifeaccount.get_account_by_lid = "merchant.test.yidian-inc.com/lifeacco
merchant.lifeaccount.get_account_info = "merchant.test.yidian-inc.com/lifeaccount/account/get_account_info"
merchant.lifeaccount.get_lid_by_uid = "merchant.test.yidian-inc.com/lifeaccount/account/get_lid_by_uid"
;互动项目
interaction.index.follow = "interaction.test.yidian-inc.com/follow/index/follow"
interaction.index.follow_list = "interaction.test.yidian-inc.com/follow/index/follow_list"
......@@ -217,7 +213,7 @@ interaction.index.life_detail = "interaction.test.yidian-inc.com/follow/index/ge
goods.shop.add_shop = "goods.test.yidian-inc.com/shop/shop/add_shop"
goods.shop.get_shop_list = "goods.test.yidian-inc.com/shop/shop/get_shop_list"
[dev-gateway : test-gateway : gateway : common]
[dev-gateway : dev]
;用户审核相关接口
merchant.personal.check = "merchant.dev.yidian-inc.com/auth/personal/check"
merchant.personal.live_identity = "merchant.dev.yidian-inc.com/auth/personal/live_identity"
......@@ -283,6 +279,8 @@ merchant.lifeaccount.get_account_by_lid = "merchant.dev.yidian-inc.com/lifeaccou
merchant.lifeaccount.get_account_info = "merchant.dev.yidian-inc.com/lifeaccount/account/get_account_info"
merchant.lifeaccount.get_lid_by_uid = "merchant.dev.yidian-inc.com/lifeaccount/account/get_lid_by_uid"
;互动项目
interaction.index.follow = "interaction.dev.yidian-inc.com/follow/index/follow"
interaction.index.follow_list = "interaction.dev.yidian-inc.com/follow/index/follow_list"
......@@ -294,46 +292,62 @@ interaction.index.life_detail = "interaction.dev.yidian-inc.com/follow/index/get
goods.shop.add_shop = "goods.dev.yidian-inc.com/shop/shop/add_shop"
goods.shop.get_shop_list = "goods.dev.yidian-inc.com/shop/shop/get_shop_list"
;商品
goods.public.get_goods_category_list = "http://goods.dev.yidian-inc.com/goods/goods/get_goods_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"
[merchant : common]
[test-merchant : merchant : common]
;简网用户信息
service.jw_user.get_user_info = "testblend.jwshq.cn/ydInner/getUserInfoByMobile"
service.jw_user.get_all_city_tree = "testblend.jwshq.cn/ydInner/getAllCityTree"
service.jw_user.get_user_info_by_user_id = "testblend.jwshq.cn/ydInner/getUserInfoByUserId"
service.jw_user.get_user_list = "testblend.jwshq.cn/ydInner/getUserList"
service.jw_user.save_push_token = "testblend.jwshq.cn/ydInnerToken/savePushToken"
goods.background.goods_list_op = "http://goods.dev.yidian-inc.com/goods/goods/goods_list_op"
goods.background.goods_info_op = "http://goods.dev.yidian-inc.com/goods/goods/info_op"
goods.background.goods_audit = "http://goods.dev.yidian-inc.com/goods/goods/audit"
;idgen发号器
service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
goods.consumer.goods_list_c = "http://goods.dev.yidian-inc.com/goods/goods/goods_list_c"
goods.consumer.goods_list_es = "http://goods.dev.yidian-inc.com/goods/goods/goods_list_es"
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"
[dev-merchant : test-merchant : merchant : common]
; ======================= merchant ==================================================================================
[prod-merchant : prod]
[perf-goods : perf : prod-goods]
[test-merchant : test]
[dev-merchant : dev : test-merchant]
[goods : common]
[test-goods : goods : common]
;idgen发号器
service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
[dev-goods : test-goods : goods : common]
; ======================= merchant ==================================================================================
[interaction:common]
[prod-interaction : interaction : common]
[prod-goods : prod]
[perf-goods : perf : prod-goods]
[test-goods : test]
[dev-goods : dev : test-goods]
; ======================= merchant ==================================================================================
[prod-interaction : prod]
merchant.account.get_role_list = "merchant.int.yidian-inc.com/lifeaccount/account/get_role_list"
merchant.account.get_life_list = "merchant.int.yidian-inc.com/lifeaccount/account/get_life_list"
merchant.account.get_user_list = "merchant.int.yidian-inc.com/lifeaccount/account/get_user_list"
service.jw_user.get_user_dynamic = "testblend.jwshq.cn/ydInner/getUserListWithDynamic"
service.jw_user.get_user_digg = "testblend.jwshq.cn/ydInner/getUserAgreeCount"
[test-interaction : interaction : common]
[perf-goods : perf : prod-goods]
[test-interaction : test]
merchant.account.get_role_list = "merchant.test.yidian-inc.com/lifeaccount/account/get_role_list"
merchant.account.get_life_list = "merchant.test.yidian-inc.com/lifeaccount/account/get_life_list"
merchant.account.get_user_list = "merchant.test.yidian-inc.com/lifeaccount/account/get_user_list"
service.jw_user.get_user_dynamic = "testblend.jwshq.cn/ydInner/getUserListWithDynamic"
service.jw_user.get_user_digg = "testblend.jwshq.cn/ydInner/getUserAgreeCount"
[dev-interaction : test-interaction : interaction : common]
[dev-interaction : dev]
merchant.account.get_role_list = "merchant.dev.yidian-inc.com/lifeaccount/account/get_role_list"
merchant.account.get_life_list = "merchant.dev.yidian-inc.com/lifeaccount/account/get_life_list"
merchant.account.get_user_list = "merchant.dev.yidian-inc.com/lifeaccount/account/get_user_list"
......
mysql.ini
View file @ b167286c
......@@ -8,12 +8,12 @@
[prod-merchant : merchant : common]
merchant.database_type='mysql'
merchant.database_name='merchant'
merchant.connect_timeout=10
merchant.connect_timeout=2
merchant.username='bp_merchant_rw'
merchant.password='wNC@zFJzPf1yM$Cv8yB8#AO3i&Ecgx'
merchant.charset='utf8mb4'
merchant.write.host='w.bp_merchant.int.yidian-inc.com'
merchant.read.host='r.bp_merchant_1.int.yidian-inc.com,r.bp_merchant_2.int.yidian-inc.com'
merchant.write.host='w.bp_merchant.int.yidian-inc.com:3306'
merchant.read.host='r.bp_merchant_1.int.yidian-inc.com:3306,r.bp_merchant_2.int.yidian-inc.com:3306'
; 预发环境
......@@ -23,7 +23,7 @@ merchant.read.host='r.bp_merchant_1.int.yidian-inc.com,r.bp_merchant_2.int.yidia
[test-merchant : prod-merchant : merchant : common]
merchant.database_type='mysql'
merchant.database_name='merchant'
merchant.connect_timeout=10
merchant.connect_timeout=2
merchant.username='bp_test_rw'
merchant.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
merchant.charset='utf8mb4'
......@@ -34,7 +34,7 @@ merchant.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_
[dev-merchant : prod-merchant : merchant : common]
merchant.database_type='mysql'
merchant.database_name='merchant'
merchant.connect_timeout=10
merchant.connect_timeout=2
merchant.username='bp_test_rw'
merchant.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
merchant.charset='utf8mb4'
......@@ -46,12 +46,12 @@ merchant.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_
[prod-interaction : interaction : common]
interaction.database_type='mysql'
interaction.database_name='interaction'
interaction.connect_timeout=10
interaction.connect_timeout=2
interaction.username='bp_interaction_rw'
interaction.password='wNC@zFJzPf1yM$Cv8yB8#AO3i&Ecgx'
interaction.charset='utf8mb4'
interaction.write.host='10.138.7.56'
interaction.read.host='10.138.7.57,10.138.7.58'
interaction.write.host='10.138.7.56:3306'
interaction.read.host='10.138.7.57:3306,10.138.7.58:3306'
; 预发环境
[perf-merchant : prod-merchant : merchant : common]
......@@ -60,7 +60,7 @@ interaction.read.host='10.138.7.57,10.138.7.58'
[test-interaction : prod-interaction : interaction : common]
interaction.database_type='mysql'
interaction.database_name='interaction'
interaction.connect_timeout=10
interaction.connect_timeout=2
interaction.username='bp_test_rw'
interaction.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
interaction.charset='utf8mb4'
......@@ -71,7 +71,7 @@ interaction.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysq
[dev-interaction : prod-interaction : interaction : common]
interaction.database_type='mysql'
interaction.database_name='interaction'
interaction.connect_timeout=10
interaction.connect_timeout=2
interaction.username='bp_test_rw'
interaction.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
interaction.charset='utf8mb4'
......@@ -87,57 +87,59 @@ interaction.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysq
; 预发环境
[perf-goods : prod-goods : merchant : common]
；测试环境
; 测试环境
[test-goods : prod-goods : merchant : common]
goods.database_type='mysql'
goods.database_name='goods'
goods.connect_timeout=10
goods.connect_timeout=2
goods.username='bp_test_rw'
goods.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
goods.charset='utf8mb4'
goods.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
goods.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
distribution.database_type='mysql'
distribution.database_name='distribution'
distribution.connect_timeout=2
distribution.username='bp_test_rw'
distribution.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
distribution.charset='utf8mb4'
distribution.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
distribution.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
；开发联调测试
[dev-goods : prod-goods : merchant : common]
goods.database_type='mysql'
goods.database_name='goods'
goods.connect_timeout=10
goods.connect_timeout=2
goods.username='bp_test_rw'
goods.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
goods.charset='utf8mb4'
goods.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
goods.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
[goods : common]
; 生产环境
[prod-goods : goods : common]
; 预发环境
[perf-goods : prod-goods : goods : common]
；测试环境
[test-goods : prod-goods : goods : common]
distribution.database_type='mysql'
distribution.database_name='distribution'
distribution.connect_timeout=10
distribution.connect_timeout=2
distribution.username='bp_test_rw'
distribution.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
distribution.charset='utf8mb4'
distribution.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
distribution.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
；开发联调测试
[dev-goods : prod-goods : goods : common]
distribution.database_type='mysql'
distribution.database_name='distribution'
distribution.connect_timeout=10
distribution.username='bp_test_rw'
distribution.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
distribution.charset='utf8mb4'
distribution.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
distribution.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
\ No newline at end of file
[tcc : common]
[prod-tcc : tcc : common]
[dev-tcc : prod-tcc : tcc : common]
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'
tccIndex.read.host[]='r.bp_test_mysql5_2.int.yidian-inc.com:3310'
[test-tcc : dev-tcc]
\ 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