Merge branch 'dev-luhongguang-20210607-goods' into 'master'

Dev luhongguang 20210607 goods

See merge request bp/yaconf!1

.gitignore

+.idea
+.DS_Store
+.project

idgen.ini

+[common]
+; 事务号 - 开始毫秒时间戳
+trans.start_timestamp   = 1619518841000
+
+;事务号 - 二进制位数
+trans.bits.timestamp    = 42
+trans.bits.machine      = 3
+trans.bits.app          = 4
+trans.bits.autoincrement= 14
+
+;事务号 - apcu
+trans.apcu.ttl          = 1
+trans.apcu.prefix       = trans_
+
+;订单号 - 十进制位数
+order.bits.date         = 12
+order.bits.uid          = 2
+order.bits.machine      = 1
+order.bits.autoincrement= 2
+order.bits.app          = 2
+
+;订单号 - apcu
+order.apcu.ttl          = 2
+order.apcu.prefix       = order_
+
+;鉴权
+key.bp                  = 5cfdb867e96374c7883b31d6928cc4cb
+
+;类型号映射
+snow.type.tcc_trans = 1
+snow.type.merchant_life_account_id = 2
+snow.type.goods = 3
+
+datetime.type.order = 1
+datetime.type.merchant_shop_id = 2
+datetime.type.goods = 3
+
+[idgen : common]
+
+[prod-idgen : idgen : common]
+to_email                = api@yidian-inc.com
+
+[test-idgen : prod-idgen : idgen : common]
+to_email                = zhangyu1@yidian-inc.com
\ No newline at end of file

interface.ini

@@ -158,3 +158,12 @@ service.jw_user.get_user_list   = "http://testblend.jwshq.cn/ydInner/getUserList
 service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
 
 [dev-merchant : test-merchant : merchant : common]
+
+
+
+[goods : common]
+[test-goods : goods : common]
+;idgen发号器
+service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
+
+[dev-goods : test-goods : goods : common]
\ No newline at end of file

mysql.ini

@@ -53,3 +53,23 @@ merchant.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
 merchant.charset='utf8mb4'
 merchant.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
 merchant.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 : merchant : common]
+
+；开发联调测试
+[dev-goods : prod-goods : merchant : common]
+goods.database_type='mysql'
+goods.database_name='goods'
+goods.connect_timeout=10
+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'
\ No newline at end of file