Merge branch 'master' into 0826_wangdong_account

kafka.ini

@@ -21,16 +21,25 @@
 subscribe.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'
 subscribe.topic='bp_str_jielong_subscribe_notify_prod'
 
+push.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'
+push.topic='opmg_touch_center'
+
 [perf-interaction : prod-interaction : interaction : common]
 
 [test-interaction : interaction : common]
 subscribe.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'
 subscribe.topic='bp_str_jielong_subscribe_notify_test'
 
+push.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'
+push.topic='opmg_touch_center_test'
+
 [dev-interaction : test-interaction : interaction : common]
 subscribe.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'
 subscribe.topic='bp_str_jielong_subscribe_notify_dev'
 
+push.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'
+push.topic='opmg_touch_center_test'
+
 ;商品项目
 [goods : common]
 

mysql.ini

@@ -505,3 +505,43 @@ coupon.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
 coupon.charset='utf8mb4'
 coupon.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
 coupon.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
+
+
+[shq-c-server : common]
+
+; 生产环境
+[prod-shq-c-server : shq-c-server : common]
+shqc.database_type='mysql'
+shqc.database_name='shqc'
+shqc.connect_timeout=2
+shqc.username='bp_shqc_rw'
+shqc.password='wNC@zFJzPf1yM$Cv8yB8#AO3i&Ecgx'
+shqc.charset='utf8mb4'
+shqc.write.host='w.bp_shqc.int.yidian-inc.com:3306'
+shqc.read.host='r.bp_shqc_1.int.yidian-inc.com:3306,r.bp_shqc_2.int.yidian-inc.com:3306'
+
+
+; 预发环境
+[perf-shq-c-server : prod-shq-c-server : shq-c-server : common]
+
+; 测试环境
+[test-shq-c-server : shq-c-server : common]
+shqc.database_type='mysql'
+shqc.database_name='shqc'
+shqc.connect_timeout=2
+shqc.username='bp_rw'
+shqc.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
+shqc.charset='utf8mb4'
+shqc.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
+shqc.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
+
+; 联调环境
+[dev-shq-c-server : shq-c-server : common]
+shqc.database_type='mysql'
+shqc.database_name='shqc'
+shqc.connect_timeout=2
+shqc.username='bp_rw'
+shqc.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
+shqc.charset='utf8mb4'
+shqc.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
+shqc.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'