lisang
/
jeepay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改充值类型，避免fastjson反序列化异常的问题。

This commit is contained in:
terrfly 2021-07-27 16:08:15 +08:00
parent f2d1b1b89f
commit eb1c12bd54
10 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/model/ResetIsvMchAppInfoConfigMQ.java
View File

@ -42,16 +42,18 @@ public class ResetIsvMchAppInfoConfigMQ extends AbstractMQ {
/** 内置msg 消息体定义 **/ /** 内置msg 消息体定义 **/
private MsgPayload payload; private MsgPayload payload;
// 重置类型 （枚举类型，无法json反序列化）
public static final byte RESET_TYPE_ISV_INFO = 1;
public static final byte RESET_TYPE_MCH_INFO = 2;
public static final byte RESET_TYPE_MCH_APP = 3;
/** 【！重要配置项！】 定义Msg消息载体 **/ /** 【！重要配置项！】 定义Msg消息载体 **/
@Data @Data
@AllArgsConstructor @AllArgsConstructor
public static class MsgPayload { public static class MsgPayload {
public enum RESET_TYPE{
ISV_INFO, MCH_INFO, MCH_APP
}
/** 重置类型 **/ /** 重置类型 **/
private Enum resetType; private Byte resetType;
/** isvNo **/ /** isvNo **/
private String isvNo; private String isvNo;
@ -82,7 +84,7 @@ public class ResetIsvMchAppInfoConfigMQ extends AbstractMQ {
} }
/** 【！重要配置项！】 构造MQModel , 一般用于发送MQ时 **/ /** 【！重要配置项！】 构造MQModel , 一般用于发送MQ时 **/
public static ResetIsvMchAppInfoConfigMQ build(Enum resetType, String isvNo, String mchNo, String appId){ public static ResetIsvMchAppInfoConfigMQ build(Byte resetType, String isvNo, String mchNo, String appId){
return new ResetIsvMchAppInfoConfigMQ(new MsgPayload(resetType, isvNo, mchNo, appId)); return new ResetIsvMchAppInfoConfigMQ(new MsgPayload(resetType, isvNo, mchNo, appId));
} }

4
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/isv/IsvInfoController.java
View File

@ -98,7 +98,7 @@ public class IsvInfoController extends CommonCtrl {
isvInfoService.removeByIsvNo(isvNo); isvInfoService.removeByIsvNo(isvNo);
// 推送mq到目前节点进行更新数据 // 推送mq到目前节点进行更新数据
mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.ISV_INFO, isvNo, null, null)); mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.RESET_TYPE_ISV_INFO, isvNo, null, null));
return ApiRes.ok(); return ApiRes.ok();
} }
@ -116,7 +116,7 @@ public class IsvInfoController extends CommonCtrl {
boolean result = isvInfoService.updateById(isvInfo); boolean result = isvInfoService.updateById(isvInfo);
// 推送mq到目前节点进行更新数据 // 推送mq到目前节点进行更新数据
mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.ISV_INFO, isvNo, null, null)); mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.RESET_TYPE_ISV_INFO, isvNo, null, null));
if (!result) return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_UPDATE); if (!result) return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_UPDATE);
return ApiRes.ok(); return ApiRes.ok();

2
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/isv/IsvPayInterfaceConfigController.java
View File

@ -133,7 +133,7 @@ public class IsvPayInterfaceConfigController extends CommonCtrl {
} }
// 推送mq到目前节点进行更新数据 // 推送mq到目前节点进行更新数据
mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.ISV_INFO, infoId, null, null)); mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.RESET_TYPE_ISV_INFO, infoId, null, null));
return ApiRes.ok(); return ApiRes.ok();
} }

4
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchAppController.java
View File

@ -114,7 +114,7 @@ public class MchAppController extends CommonCtrl {
return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_UPDATE); return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_UPDATE);
} }
// 推送修改应用消息 // 推送修改应用消息
mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_APP, null, mchApp.getMchNo(), appId)); mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.RESET_TYPE_MCH_APP, null, mchApp.getMchNo(), appId));
return ApiRes.ok(); return ApiRes.ok();
} }
@ -132,7 +132,7 @@ public class MchAppController extends CommonCtrl {
mchAppService.removeByAppId(appId); mchAppService.removeByAppId(appId);
// 推送mq到目前节点进行更新数据 // 推送mq到目前节点进行更新数据
mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_APP, null, mchApp.getMchNo(), appId)); mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.RESET_TYPE_MCH_APP, null, mchApp.getMchNo(), appId));
return ApiRes.ok(); return ApiRes.ok();
} }

4
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchInfoController.java
View File

@ -118,7 +118,7 @@ public class MchInfoController extends CommonCtrl {
mqSender.send(CleanMchLoginAuthCacheMQ.build(userIdList)); mqSender.send(CleanMchLoginAuthCacheMQ.build(userIdList));
// 推送mq到目前节点进行更新数据 // 推送mq到目前节点进行更新数据
mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_INFO, null, mchNo, null)); mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.RESET_TYPE_MCH_INFO, null, mchNo, null));
return ApiRes.ok(); return ApiRes.ok();
} }
@ -173,7 +173,7 @@ public class MchInfoController extends CommonCtrl {
} }
// 推送mq到目前节点进行更新数据 // 推送mq到目前节点进行更新数据
mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_INFO, null, mchNo, null)); mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.RESET_TYPE_MCH_INFO, null, mchNo, null));
return ApiRes.ok(); return ApiRes.ok();
} }

2
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchPayInterfaceConfigController.java
View File

@ -155,7 +155,7 @@ public class MchPayInterfaceConfigController extends CommonCtrl {
} }
// 推送mq到目前节点进行更新数据 // 推送mq到目前节点进行更新数据
mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_APP, null, mchApp.getMchNo(), infoId)); mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.RESET_TYPE_MCH_APP, null, mchApp.getMchNo(), infoId));
return ApiRes.ok(); return ApiRes.ok();
} }

4
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java
View File

@ -121,7 +121,7 @@ public class MchAppController extends CommonCtrl {
return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_UPDATE); return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_UPDATE);
} }
// 推送修改应用消息 // 推送修改应用消息
mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_APP, null, mchApp.getMchNo(), appId)); mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.RESET_TYPE_MCH_APP, null, mchApp.getMchNo(), appId));
return ApiRes.ok(); return ApiRes.ok();
} }
@ -143,7 +143,7 @@ public class MchAppController extends CommonCtrl {
mchAppService.removeByAppId(appId); mchAppService.removeByAppId(appId);
// 推送mq到目前节点进行更新数据 // 推送mq到目前节点进行更新数据
mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_APP, null, mchApp.getMchNo(), appId)); mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.RESET_TYPE_MCH_APP, null, mchApp.getMchNo(), appId));
return ApiRes.ok(); return ApiRes.ok();
} }

2
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchPayInterfaceConfigController.java
View File

@ -154,7 +154,7 @@ public class MchPayInterfaceConfigController extends CommonCtrl {
if (!result) { if (!result) {
throw new BizException("配置失败"); throw new BizException("配置失败");
} }
mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_APP, null, getCurrentMchNo(), infoId)); mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.RESET_TYPE_MCH_APP, null, getCurrentMchNo(), infoId));
return ApiRes.ok(); return ApiRes.ok();
} }

2
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/ctrl/AlipayBizController.java
View File

@ -144,7 +144,7 @@ public class AlipayBizController extends AbstractCtrl {
MchApp mchApp = mchAppService.getById(mchAppId); MchApp mchApp = mchAppService.getById(mchAppId);
// 更新应用配置信息 // 更新应用配置信息
mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_APP, null, mchApp.getMchNo(), mchApp.getAppId())); mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.RESET_TYPE_MCH_APP, null, mchApp.getMchNo(), mchApp.getAppId()));
} }
} catch (Exception e) { } catch (Exception e) {

6
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/mq/ResetIsvMchAppInfoMQReceiver.java
View File

@ -38,11 +38,11 @@ public class ResetIsvMchAppInfoMQReceiver implements ResetIsvMchAppInfoConfigMQ.
@Override @Override
public void receive(ResetIsvMchAppInfoConfigMQ.MsgPayload payload) { public void receive(ResetIsvMchAppInfoConfigMQ.MsgPayload payload) {
if(payload.getResetType() == ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.ISV_INFO){ if(payload.getResetType() == ResetIsvMchAppInfoConfigMQ.RESET_TYPE_ISV_INFO){
this.modifyIsvInfo(payload.getIsvNo()); this.modifyIsvInfo(payload.getIsvNo());
}else if(payload.getResetType() == ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_INFO){ }else if(payload.getResetType() == ResetIsvMchAppInfoConfigMQ.RESET_TYPE_MCH_INFO){
this.modifyMchInfo(payload.getMchNo()); this.modifyMchInfo(payload.getMchNo());
}else if(payload.getResetType() == ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_APP){ }else if(payload.getResetType() == ResetIsvMchAppInfoConfigMQ.RESET_TYPE_MCH_APP){
this.modifyMchApp(payload.getMchNo(), payload.getAppId()); this.modifyMchApp(payload.getMchNo(), payload.getAppId());
} }