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

elasticsearch.ini

+; 公共的配置内容，不区分应用及环境
+[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

@@ -3,8 +3,8 @@
 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"
@@ -16,6 +16,16 @@ 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       = "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]
 
 
@@ -31,11 +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 ==================================================================================
-
-[prod-gateway : prod]
 ;简网用户信息
 service.jw_user.get_user_info       = "testblend.jwshq.cn/ydInner/getUserInfoByMobile"
 service.jw_user.get_all_city_tree   = "testblend.jwshq.cn/ydInner/getAllCityTree"
@@ -43,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"
@@ -119,12 +132,7 @@ interaction.index.life_detail = "interact.int.yidian-inc.com/follow/index/life_d
 
 
 [test-gateway : test]
-;简网用户信息
-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"
@@ -284,26 +292,29 @@ interaction.index.life_detail = "interaction.dev.yidian-inc.com/follow/index/lif
 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"
 
+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"
 
-; =======================  merchant ==================================================================================
+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"
 
 
-[prod-merchant : prod]
 
+; =======================  merchant ==================================================================================
 
+[prod-merchant : prod]
+[perf-goods : perf : prod-goods]
 [test-merchant : test]
-;简网用户信息
-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-test.ini.yidian-inc.com/id/get"
-
-[dev-merchant : dev]
+[dev-merchant : dev : test-merchant]
 
 
 
@@ -311,17 +322,14 @@ service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
 
 [prod-goods : prod]
 [perf-goods : perf : prod-goods]
-
 [test-goods : test]
-;idgen发号器
-service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
-
 [dev-goods : dev : test-goods]
 
 
-; =======================  merchant ==================================================================================
 
 
+; =======================  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"
@@ -332,7 +340,6 @@ service.jw_user.get_user_digg   = "testblend.jwshq.cn/ydInner/getUserAgreeCount"
 [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"

mysql.ini

@@ -87,7 +87,7 @@ 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'
@@ -98,6 +98,15 @@ 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=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'
+
 ；开发联调测试
 [dev-goods : prod-goods : merchant : common]
 goods.database_type='mysql'
@@ -109,23 +118,6 @@ 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'
 
-
-; 预发环境
-[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.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
@@ -135,7 +127,6 @@ 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'
 
-
 [tcc : common]
 
 [prod-tcc : tcc : common]