Merge branch 'dev-luhongguang-20210607-goods'

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

@@ -298,6 +298,21 @@ 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"
+
+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"
+
 
 [merchant : common]
 

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]