update:rebase master

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"
@@ -227,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"
@@ -263,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"
+
+
+
 
 
 
@@ -273,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微服务接口 ======================= 
@@ -433,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"
@@ -467,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"
@@ -479,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"
@@ -635,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"
@@ -668,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

@@ -63,6 +63,16 @@ merchant.charset='utf8mb4'
 merchant.write.host='w.bp_merchant.int.yidian-inc.com:3306'
 merchant.read.host='r.bp_merchant_1.int.yidian-inc.com:3306,r.bp_merchant_2.int.yidian-inc.com:3306'
 
+;导数据专用--线上
+dao.database_type='mysql'
+dao.database_name='zhiyue'
+dao.connect_timeout=2
+dao.username='zhiyue_tmp_ro'
+dao.password='AABBCCDD'
+dao.charset='utf8mb4'
+;marketing.write.host='10.126.155.120:3306'
+dao.read.host='10.136.150.2:3307'
+
 ; 预发环境
 [perf-merchant : prod-merchant : merchant : common]
 
@@ -108,13 +118,13 @@ merchant.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_
 
 ;导数据专用--目前调试
 dao.database_type='mysql'
-dao.database_name='juliet'
+dao.database_name='zhiyue'
 dao.connect_timeout=2
-dao.username='tmp_ro'
-dao.password='s5JEh#FUvX%7P3sO9ZDQw&cpH$Xr8Q'
+dao.username='zhiyue_tmp_ro'
+dao.password='AABBCCDD'
 dao.charset='utf8mb4'
 ;marketing.write.host='10.126.155.120:3306'
-dao.read.host='10.126.155.120:3306'
+dao.read.host='10.136.150.2:3307'
 
 
 [goods : common]
@@ -260,6 +270,7 @@ commerce.password='@Z0#ylCRgPKx4v1bjqH5#mNP%9UO7t'
 commerce.charset='utf8mb4'
 commerce.write.host='10.126.154.178:3306'
 commerce.read.host='10.126.154.178:3306'
+
 ; 开发联调测试
 [dev-order : order : common]
 order.database_type='mysql'
@@ -271,6 +282,7 @@ 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'
 
+
 ; 生活号 接龙拼单 骑手排线功能开发 @耿鸿飞 @2021-7-21 待生活号重构完毕后会删除该配置
 commerce.database_type='mysql'
 commerce.database_name='commerce'
@@ -281,6 +293,7 @@ commerce.charset='utf8mb4'
 commerce.write.host='10.126.154.178:3306'
 commerce.read.host='10.126.154.178:3306'
 
+
 [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,7 +111,7 @@ cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
 cacheConnect.timeout=1
-cacheConnect.serializer='none'
+cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 [dev-goods : test-goods : goods : common]
 
@@ -124,7 +124,7 @@ cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
 cacheConnect.timeout=1
-cacheConnect.serializer='none'
+cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 
 
@@ -137,7 +137,7 @@ cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
 cacheConnect.timeout=1
-cacheConnect.serializer='none'
+cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 [dev-order : test-order : order : common]