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]
 

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'