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

interface.ini

@@ -29,6 +29,10 @@ service.jw_user.get_user_digg = "http://blend.jwshq.yidian-inc.com/ydInner/getUs
 service.jw_user.get_share_user_info = "http://blend.jwshq.yidian-inc.com/ydInner/getShareUserInfo"
 service.jw_user.get_wechat_openid = "http://blend.jwshq.yidian-inc.com/ydInner/getUserWXBindingInfo"
 
+service.jw_order.refund = "https://api.jwshq.cn/api/wx/hulk/order/refundByManager"
+service.jw_order.reject = "https://api.jwshq.cn/api/wx/hulk/order/rejectRefundByBuyer"
+	
+
 ;idgen发号器
 service.idgen = "http://idgen.int.yidian-inc.com/id/get"
 
@@ -36,6 +40,7 @@ service.idgen = "http://idgen.int.yidian-inc.com/id/get"
 service.tcc.try = "http://tcc.int.yidian-inc.com/tcc/try"
 service.tcc.confirm = "http://tcc.int.yidian-inc.com/tcc/confirm"
 service.tcc.cancel = "http://tcc.int.yidian-inc.com/tcc/cancel"
+service.tcc.sync = "http://tcc.int.yidian-inc.com/tcc/sync"
 
 
 ;======================= 1000000-prod gateway微服务接口 ======================= 
@@ -194,6 +199,19 @@ order.order.order_pay_callback = "http://order.int.yidian-inc.com/order/order/or
 order.order.order_refund_callback = "http://order.int.yidian-inc.com/order/order/order_refund_callback"
 order.order.order_info = "http://order.int.yidian-inc.com/order/order/order_info"
 order.order.my_order_record = "http://order.int.yidian-inc.com/order/order/my_order_record"
+
+
+;订单后台
+order.order.old_order_list = "http://order.int.yidian-inc.com/order/order/old_order_list"
+order.order.old_marketing_list = "http://order.int.yidian-inc.com/order/order/old_marketing_list"
+order.order.old_goods_list = "http://order.int.yidian-inc.com/order/order/old_goods_list"
+order.order.old_sub_shop_list = "http://order.int.yidian-inc.com/order/order/old_sub_shop_list"
+order.order.old_order_item_list = "http://order.int.yidian-inc.com/order/order/old_order_item_list"
+order.order.old_order_refund = "http://order.int.yidian-inc.com/order/order/old_order_refund"
+order.order.old_order_refund_reject = "http://order.int.yidian-inc.com/order/order/old_order_refund_reject"
+order.order.old_order_export = "http://order.int.yidian-inc.com/order/order/old_order_export"
+
+
 ;tcc调order用子项目
 order.tcc.create_order_try = "http://order.int.yidian-inc.com/tcc/tcc/create_order_try"
 order.tcc.create_order_confirm = "http://order.int.yidian-inc.com/tcc/tcc/create_order_confirm"
@@ -204,7 +222,11 @@ order.tcc.cancel_order_cancel = "http://order.int.yidian-inc.com/tcc/tcc/cancel_
 order.tcc.create_order_main = "http://order.int.yidian-inc.com/tcc/tcc/create_order_main"
 order.tcc.cancel_order_main = "http://order.int.yidian-inc.com/tcc/tcc/cancel_order_main"
 
-
+;deliver 骑手
+order.deliverer.add_deliverer = "http://order.int.yidian-inc.com/deliverer/deliverer/add_deliverer"
+order.deliverer.list_day_deliverer = "http://order.int.yidian-inc.com/deliverer/deliverer/list_day_deliverer"
+order.deliverer.save_day_deliverer = "http://order.int.yidian-inc.com/deliverer/deliverer/save_day_deliverer"
+order.deliverer.list_day_deliverer_conf = "http://order.int.yidian-inc.com/deliverer/deliverer/list_day_deliverer_conf"
 ;======================= 6000000-prod pay微服务接口 ======================= 
 pay.order.pay = "http://pay.int.yidian-inc.com/pay/order/pay"
 pay.order.refund = "http://pay.int.yidian-inc.com/pay/order/refund"
@@ -223,7 +245,8 @@ wallet.account.third_account_bind = "http://wallet.int.yidian-inc.com/wallet/acc
 wallet.account.third_account = "http://wallet.int.yidian-inc.com/wallet/account/third_account"
 wallet.account.withdraw_validate = "http://wallet.int.yidian-inc.com/wallet/account/withdraw_validate"
 wallet.account.withdraw_detail = "http://wallet.int.yidian-inc.com/wallet/account/withdraw_detail"
-wallet.account.total_trade = "http://wallet.int.yidian-inc.com/wallet/account/total_trade"
+wallet.historyapi.total_trade = "http://wallet.int.yidian-inc.com/wallet/historyapi/total_trade"
+wallet.historyapi.history_list = "http://wallet.dev.yidian-inc.com/wallet/historyapi/history_list"
 wallet.callback.withdraw = "http://wallet.int.yidian-inc.com/wallet/callback/withdraw"
 wallet.withdrawbackground.apply_list = "http://wallet.int.yidian-inc.com/wallet/background/apply_list"
 wallet.withdrawbackground.blacklist = "http://wallet.int.yidian-inc.com/wallet/background/blacklist"
@@ -259,6 +282,13 @@ service.jw_user.save_push_token = "http://blend-test.api.appgc.yidian-inc.com/yd
 service.jw_user.save_update_life = "http://blend-test.api.appgc.yidian-inc.com/ydInnerLifeAccount/saveOrUpdateLifeAccount"
 service.jw_user.get_user_digg = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserAgreeCount"
 service.jw_user.get_share_user_info = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getShareUserInfo"
+service.jw_user.get_wechat_openid = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserWXBindingInfo"
+
+service.jw_order.refund = "http://test.zhiyueapp.cn/api/wx/hulk/order/refundByManager"
+service.jw_order.reject = "http://test.zhiyueapp.cn/api/wx/hulk/order/rejectRefundByBuyer"
+
+
+
 
 
 
@@ -269,6 +299,7 @@ service.idgen = "http://idgen-test.ini.yidian-inc.com/id/get"
 service.tcc.try = "http://tcc.test.yidian-inc.com/tcc/try"
 service.tcc.confirm = "http://tcc.test.yidian-inc.com/tcc/confirm"
 service.tcc.cancel = "http://tcc.test.yidian-inc.com/tcc/cancel"
+service.tcc.sync = "http://tcc.test.yidian-inc.com/tcc/sync"
 
 
 ;======================= 1000000-test gateway微服务接口 ======================= 
@@ -412,6 +443,7 @@ goods.tcc.cancel_order_confirm = "http://goods.test.int.yidian-inc.com/tcc/tcc/c
 goods.tcc.cancel_order_cancel = "http://goods.test.int.yidian-inc.com/tcc/tcc/cancel_order_cancel"
 
 
+
 ;======================= 5000000-test order微服务接口 ======================= 
 ;订单
 order.order.user_order_list = "http://order.test.yidian-inc.com/order/order/user_order_list"
@@ -428,6 +460,18 @@ order.order.order_pay_callback = "http://order.test.yidian-inc.com/order/order/o
 order.order.order_refund_callback = "http://order.test.yidian-inc.com/order/order/order_refund_callback"
 order.order.order_info = "http://order.test.yidian-inc.com/order/order/order_info"
 order.order.my_order_record = "http://order.test.yidian-inc.com/order/order/my_order_record"
+
+;订单后台
+order.order.old_order_list = "http://order.test.yidian-inc.com/order/order/old_order_list"
+order.order.old_marketing_list = "http://order.test.yidian-inc.com/order/order/old_marketing_list"
+order.order.old_goods_list = "http://order.test.yidian-inc.com/order/order/old_goods_list"
+order.order.old_sub_shop_list = "http://order.test.yidian-inc.com/order/order/old_sub_shop_list"
+order.order.old_order_item_list = "http://order.test.yidian-inc.com/order/order/old_order_item_list"
+order.order.old_order_refund = "http://order.test.yidian-inc.com/order/order/old_order_refund"
+order.order.old_order_refund_reject = "http://order.test.yidian-inc.com/order/order/old_order_refund_reject"
+order.order.old_order_export = "http://order.test.yidian-inc.com/order/order/old_order_export"
+
+
 ;tcc调order用子项目
 order.tcc.create_order_try = "http://order.test.yidian-inc.com/tcc/tcc/create_order_try"
 order.tcc.create_order_confirm = "http://order.test.yidian-inc.com/tcc/tcc/create_order_confirm"
@@ -438,6 +482,11 @@ order.tcc.cancel_order_cancel = "http://order.test.yidian-inc.com/tcc/tcc/cancel
 order.tcc.create_order_main = "http://order.test.yidian-inc.com/tcc/tcc/create_order_main"
 order.tcc.cancel_order_main = "http://order.test.yidian-inc.com/tcc/tcc/cancel_order_main"
 
+;deliver 骑手
+order.deliverer.add_deliverer = "http://order.test.int.yidian-inc.com/deliverer/deliverer/add_deliverer"
+order.deliverer.list_day_deliverer = "http://order.test.int.yidian-inc.com/deliverer/deliverer/list_day_deliverer"
+order.deliverer.save_day_deliverer = "http://order.test.int.yidian-inc.com/deliverer/deliverer/save_day_deliverer"
+order.deliverer.list_day_deliverer_conf = "http://order.test.int.yidian-inc.com/deliverer/deliverer/list_day_deliverer_conf"
 
 ;======================= 6000000-test pay微服务接口 ======================= 
 pay.order.pay = "http://pay.test.yidian-inc.com/pay/order/pay"
@@ -457,7 +506,8 @@ wallet.account.third_account_bind = "http://wallet.test.yidian-inc.com/wallet/ac
 wallet.account.third_account = "http://wallet.test.yidian-inc.com/wallet/account/third_account"
 wallet.account.withdraw_validate = "http://wallet.test.yidian-inc.com/wallet/account/withdraw_validate"
 wallet.account.withdraw_detail = "http://wallet.test.yidian-inc.com/wallet/account/withdraw_detail"
-wallet.account.total_trade = "http://wallet.test.yidian-inc.com/wallet/account/total_trade"
+wallet.historyapi.total_trade = "http://wallet.test.yidian-inc.com/wallet/historyapi/total_trade"
+wallet.historyapi.history_list = "http://wallet.dev.yidian-inc.com/wallet/historyapi/history_list"
 wallet.callback.withdraw = "http://wallet.test.yidian-inc.com/wallet/callback/withdraw"
 wallet.withdrawbackground.apply_list = "http://wallet.test.yidian-inc.com/wallet/background/apply_list"
 wallet.withdrawbackground.blacklist = "http://wallet.test.yidian-inc.com/wallet/background/blacklist"
@@ -469,6 +519,14 @@ wallet.withdrawbackground.record_list = "http://wallet.test.yidian-inc.com/walle
 
 [dev : test : common]
 
+
+;TCC事务协调器
+service.tcc.try = "http://tcc.dev.yidian-inc.com/tcc/try"
+service.tcc.confirm = "http://tcc.dev.yidian-inc.com/tcc/confirm"
+service.tcc.cancel = "http://tcc.dev.yidian-inc.com/tcc/cancel"
+service.tcc.sync = "http://tcc.dev.yidian-inc.com/tcc/sync"
+
+
 ;======================= 1000000-dev gateway微服务接口 ======================= 
 ;登陆上报地理位置
 merchant.user.binding_location = "http://merchant.dev.yidian-inc.com/user/user/binding_location"
@@ -608,6 +666,7 @@ goods.tcc.cancel_order_confirm = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel
 goods.tcc.cancel_order_cancel = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_order_cancel"
 
 
+
 ;======================= 5000000-dev order微服务接口 ======================= 
 ;订单
 order.order.user_order_list = "http://order.dev.yidian-inc.com/order/order/user_order_list"
@@ -624,6 +683,18 @@ order.order.order_pay_callback = "http://order.dev.yidian-inc.com/order/order/or
 order.order.order_refund_callback = "http://order.dev.yidian-inc.com/order/order/order_refund_callback"
 order.order.order_info = "http://order.dev.yidian-inc.com/order/order/order_info"
 order.order.my_order_record = "http://order.dev.yidian-inc.com/order/order/my_order_record"
+
+;订单后台
+order.order.old_order_list = "http://order.dev.yidian-inc.com/order/order/old_order_list"
+order.order.old_marketing_list = "http://order.dev.yidian-inc.com/order/order/old_marketing_list"
+order.order.old_goods_list = "http://order.dev.yidian-inc.com/order/order/old_goods_list"
+order.order.old_sub_shop_list = "http://order.dev.yidian-inc.com/order/order/old_sub_shop_list"
+order.order.old_order_item_list = "http://order.dev.yidian-inc.com/order/order/old_order_item_list"
+order.order.old_order_refund = "http://order.dev.yidian-inc.com/order/order/old_order_refund"
+order.order.old_order_refund_reject = "http://order.dev.yidian-inc.com/order/order/old_order_refund_reject"
+order.order.old_order_export = "http://order.dev.yidian-inc.com/order/order/old_order_export"
+
+
 ;tcc调order用子项目
 order.tcc.create_order_try = "http://order.dev.yidian-inc.com/tcc/tcc/create_order_try"
 order.tcc.create_order_confirm = "http://order.dev.yidian-inc.com/tcc/tcc/create_order_confirm"
@@ -634,7 +705,11 @@ order.tcc.cancel_order_cancel = "http://order.dev.yidian-inc.com/tcc/tcc/cancel_
 order.tcc.create_order_main = "http://order.dev.yidian-inc.com/tcc/tcc/create_order_main"
 order.tcc.cancel_order_main = "http://order.dev.yidian-inc.com/tcc/tcc/cancel_order_main"
 
-
+;deliver 骑手
+order.deliverer.add_deliverer = "http://order.dev.yidian-inc.com/deliverer/deliverer/add_deliverer"
+order.deliverer.list_day_deliverer = "http://order.dev.yidian-inc.com/deliverer/deliverer/list_day_deliverer"
+order.deliverer.save_day_deliverer = "http://order.dev.yidian-inc.com/deliverer/deliverer/save_day_deliverer"
+order.deliverer.list_day_deliverer_conf = "http://order.dev.yidian-inc.com/deliverer/deliverer/list_day_deliverer_conf"
 ;======================= 6000000-dev pay微服务接口 ======================= 
 pay.order.pay = "http://pay.dev.yidian-inc.com/pay/order/pay"
 pay.order.refund = "http://pay.dev.yidian-inc.com/pay/order/refund"
@@ -653,7 +728,9 @@ wallet.account.third_account_bind = "http://wallet.dev.yidian-inc.com/wallet/acc
 wallet.account.third_account = "http://wallet.dev.yidian-inc.com/wallet/account/third_account"
 wallet.account.withdraw_validate = "http://wallet.dev.yidian-inc.com/wallet/account/withdraw_validate"
 wallet.account.withdraw_detail = "http://wallet.dev.yidian-inc.com/wallet/account/withdraw_detail"
-wallet.account.total_trade = "http://wallet.dev.yidian-inc.com/wallet/account/total_trade"
+wallet.historyapi.total_trade = "http://wallet.dev.yidian-inc.com/wallet/historyapi/total_trade"
+wallet.historyapi.history_list = "http://wallet.dev.yidian-inc.com/wallet/historyapi/history_list"
+wallet.historyapi.withdraw_wechat = "http://wallet.dev.yidian-inc.com/wallet/historyapi/withdraw_wechat"
 wallet.callback.withdraw = "http://wallet.dev.yidian-inc.com/wallet/callback/withdraw"
 wallet.withdrawbackground.apply_list = "http://wallet.dev.yidian-inc.com/wallet/background/apply_list"
 wallet.withdrawbackground.blacklist = "http://wallet.dev.yidian-inc.com/wallet/background/blacklist"

mysql.ini

@@ -139,6 +139,7 @@ marketing.charset='utf8mb4'
 marketing.write.host='w.bp_marketing.int.yidian-inc.com:3306'
 marketing.read.host='r.bp_marketing_1.int.yidian-inc.com:3306,r.bp_marketing_2.int.yidian-inc.com:3306'
 
+
 ; 预发环境
 [perf-goods : prod-goods : goods : common]
 
@@ -162,6 +163,8 @@ marketing.charset='utf8mb4'
 marketing.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
 marketing.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
 
+
+
 ; 开发联调测试
 [dev-goods : goods : common]
 goods.database_type='mysql'
@@ -184,6 +187,7 @@ marketing.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1
 
 
 
+
 ;TCC使用分片
 [tcc : common]
 
@@ -224,6 +228,15 @@ order.charset='utf8mb4'
 order.write.host='w.bp_order.int.yidian-inc.com:3306'
 order.read.host='r.bp_order_1.int.yidian-inc.com:3306,r.bp_order_2.int.yidian-inc.com:3306'
 
+; 生活号 接龙拼单 骑手排线功能开发 @耿鸿飞 @2021-7-21 待生活号重构完毕后会删除该配置
+commerce.database_type='mysql'
+commerce.database_name='commerce'
+commerce.connect_timeout=2
+commerce.username='commerce_rw'
+commerce.password='zhd8IJZdpAgxyvc6EVPP3VG8'
+commerce.charset='utf8mb4'
+commerce.write.host='dbproxy.local.cutt.com:5101'
+commerce.read.host='dbproxy.local.cutt.com:5101'
 ; 预发环境
 [perf-order : prod-order : order : common]
 
@@ -238,6 +251,16 @@ order.charset='utf8mb4'
 order.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
 order.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
 
+; 生活号 接龙拼单 骑手排线功能开发 @耿鸿飞 @2021-7-21 待生活号重构完毕后会删除该配置
+commerce.database_type='mysql'
+commerce.database_name='commerce'
+commerce.connect_timeout=2
+commerce.username='commerce_rw'
+commerce.password='zhd8IJZdpAgxyvc6EVPP3VG8'
+commerce.charset='utf8mb4'
+commerce.write.host='dbproxy.local.cutt.com:5101'
+commerce.read.host='dbproxy.local.cutt.com:5101'
+ 
 ; 开发联调测试
 [dev-order : order : common]
 order.database_type='mysql'
@@ -250,6 +273,16 @@ 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'
 
 
+; 生活号 接龙拼单 骑手排线功能开发 @耿鸿飞 @2021-7-21 待生活号重构完毕后会删除该配置
+commerce.database_type='mysql'
+commerce.database_name='commerce'
+commerce.connect_timeout=2
+commerce.username='commerce_rw'
+commerce.password='zhd8IJZdpAgxyvc6EVPP3VG8'
+commerce.charset='utf8mb4'
+commerce.write.host='dbproxy.local.cutt.com:5101'
+commerce.read.host='dbproxy.local.cutt.com:5101'
+ 
 
 [pay : common]
 

redis.ini

@@ -9,7 +9,7 @@ cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
 cacheConnect.timeout=1
-cacheConnect.serializer='none'
+cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
  
 
@@ -22,7 +22,7 @@ cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
 cacheConnect.timeout=1
-cacheConnect.serializer='none'
+cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 [dev-gateway : test-gateway : gateway : common]
 
@@ -41,7 +41,7 @@ cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
 cacheConnect.timeout=1
-cacheConnect.serializer='none'
+cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 
 countConnect.mode='codis'
@@ -64,7 +64,7 @@ cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
 cacheConnect.timeout=1
-cacheConnect.serializer='none'
+cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 
 [dev-merchant : test-merchant : prod-merchant : merchant : common]
@@ -98,7 +98,7 @@ cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
 cacheConnect.timeout=1
-cacheConnect.serializer='none'
+cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
  
 
@@ -111,6 +111,33 @@ cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
 cacheConnect.timeout=1
-cacheConnect.serializer='none'
+cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 [dev-goods : test-goods : goods : common]
+
+[order : common]
+
+[prod-order : order : common]
+cacheConnect.mode='codis'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18136/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='igbinary'
+cacheConnect.prefix=''
+
+
+[perf-order : order : common]
+[test-order : order : common]
+;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
+cacheConnect.mode='codis'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18131/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='igbinary'
+cacheConnect.prefix=''
+[dev-order : test-order : order : common]
+