删除MqCommonService类；

jeepay-core/src/main/java/com/jeequan/jeepay/core/mq/MqCommonService.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2021-2031, 河北计全科技有限公司 (https://www.jeequan.com & jeequan@126.com).
- * <p>
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.jeequan.jeepay.core.mq;
-
-/**
- * @author xiaoyu
- * @site https://www.jeepay.vip
- * @date 2021/6/25 17:10
- */
-public abstract class MqCommonService {
-
-    /**
-     * 消息发送
-     * @param msg
-     * @param sendType
-     */
-    public abstract void send(String msg, String sendType);
-
-    /**
-     * 延迟消息发送
-     * @param msg
-     * @param delay
-     * @param sendType
-     */
-    public abstract void send(String msg, long delay, String sendType);
-
-}

jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/config/SysConfigController.java

@@ -17,12 +17,12 @@ package com.jeequan.jeepay.mgr.ctrl.config;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jeequan.jeepay.components.mq.model.ResetAppConfigMQ;
+import com.jeequan.jeepay.components.mq.vender.IMQSender;
 import com.jeequan.jeepay.core.aop.MethodLog;
 import com.jeequan.jeepay.core.constants.ApiCodeEnum;
-import com.jeequan.jeepay.core.constants.CS;
 import com.jeequan.jeepay.core.entity.SysConfig;
 import com.jeequan.jeepay.core.model.ApiRes;
-import com.jeequan.jeepay.core.mq.MqCommonService;
 import com.jeequan.jeepay.mgr.ctrl.CommonCtrl;
 import com.jeequan.jeepay.service.impl.SysConfigService;
 import lombok.extern.slf4j.Slf4j;
@@ -50,7 +50,7 @@ import java.util.Map;
 public class SysConfigController extends CommonCtrl {
 
 	@Autowired private SysConfigService sysConfigService;
-	@Autowired private MqCommonService mqCommonService;
+	@Autowired private IMQSender mqSender;
 
 
 	/**
@@ -85,7 +85,7 @@ public class SysConfigController extends CommonCtrl {
 		int update = sysConfigService.updateByConfigKey(updateMap);
 		if(update <= 0) return ApiRes.fail(ApiCodeEnum.SYSTEM_ERROR, "更新失败");
 
-		mqCommonService.send(groupKey, CS.MQ.MQ_TYPE_MODIFY_SYS_CONFIG);
+		mqSender.send(ResetAppConfigMQ.build(groupKey));
 		return ApiRes.ok();
 	}
 

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

@@ -18,12 +18,12 @@ package com.jeequan.jeepay.mgr.ctrl.isv;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jeequan.jeepay.components.mq.model.ResetIsvMchAppInfoConfigMQ;
+import com.jeequan.jeepay.components.mq.vender.IMQSender;
 import com.jeequan.jeepay.core.aop.MethodLog;
 import com.jeequan.jeepay.core.constants.ApiCodeEnum;
-import com.jeequan.jeepay.core.constants.CS;
 import com.jeequan.jeepay.core.entity.IsvInfo;
 import com.jeequan.jeepay.core.model.ApiRes;
-import com.jeequan.jeepay.core.mq.MqCommonService;
 import com.jeequan.jeepay.mgr.ctrl.CommonCtrl;
 import com.jeequan.jeepay.service.impl.IsvInfoService;
 import org.apache.commons.lang3.StringUtils;
@@ -46,7 +46,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class IsvInfoController extends CommonCtrl {
 
     @Autowired private IsvInfoService isvInfoService;
-    @Autowired private MqCommonService mqCommonService;
+    @Autowired private IMQSender mqSender;
 
     /**
      * @author: pangxiaoyu
@@ -96,7 +96,9 @@ public class IsvInfoController extends CommonCtrl {
     @RequestMapping(value="/{isvNo}", method = RequestMethod.DELETE)
     public ApiRes delete(@PathVariable("isvNo") String isvNo) {
         isvInfoService.removeByIsvNo(isvNo);
-        mqCommonService.send(isvNo, CS.MQ.MQ_TYPE_MODIFY_ISV_INFO); // 推送mq到目前节点进行更新数据
+
+        // 推送mq到目前节点进行更新数据
+        mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.ISV_INFO, isvNo, null, null));
         return ApiRes.ok();
     }
 
@@ -112,7 +114,10 @@ public class IsvInfoController extends CommonCtrl {
         IsvInfo isvInfo = getObject(IsvInfo.class);
         isvInfo.setIsvNo(isvNo);
         boolean result = isvInfoService.updateById(isvInfo);
-        mqCommonService.send(isvNo, CS.MQ.MQ_TYPE_MODIFY_ISV_INFO); // 推送mq到目前节点进行更新数据
+
+        // 推送mq到目前节点进行更新数据
+        mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.ISV_INFO, isvNo, null, null));
+
         if (!result)  return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_UPDATE);
         return ApiRes.ok();
     }

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

@@ -16,6 +16,8 @@
 package com.jeequan.jeepay.mgr.ctrl.isv;
 
 import com.alibaba.fastjson.JSONObject;
+import com.jeequan.jeepay.components.mq.model.ResetIsvMchAppInfoConfigMQ;
+import com.jeequan.jeepay.components.mq.vender.IMQSender;
 import com.jeequan.jeepay.core.aop.MethodLog;
 import com.jeequan.jeepay.core.constants.ApiCodeEnum;
 import com.jeequan.jeepay.core.constants.CS;
@@ -23,7 +25,6 @@ import com.jeequan.jeepay.core.entity.PayInterfaceConfig;
 import com.jeequan.jeepay.core.entity.PayInterfaceDefine;
 import com.jeequan.jeepay.core.model.ApiRes;
 import com.jeequan.jeepay.core.model.params.IsvParams;
-import com.jeequan.jeepay.core.mq.MqCommonService;
 import com.jeequan.jeepay.core.utils.StringKit;
 import com.jeequan.jeepay.mgr.ctrl.CommonCtrl;
 import com.jeequan.jeepay.service.impl.PayInterfaceConfigService;
@@ -48,7 +49,7 @@ import java.util.Map;
 public class IsvPayInterfaceConfigController extends CommonCtrl {
 
     @Autowired private PayInterfaceConfigService payInterfaceConfigService;
-    @Autowired private MqCommonService mqCommonService;
+    @Autowired private IMQSender mqSender;
 
    /**
     * @Author: ZhuXiao
@@ -130,7 +131,10 @@ public class IsvPayInterfaceConfigController extends CommonCtrl {
         if (!result) {
             return ApiRes.fail(ApiCodeEnum.SYSTEM_ERROR, "配置失败");
         }
-        mqCommonService.send(infoId, CS.MQ.MQ_TYPE_MODIFY_ISV_INFO); // 推送mq到目前节点进行更新数据
+
+        // 推送mq到目前节点进行更新数据
+        mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.ISV_INFO, infoId, null, null));
+
         return ApiRes.ok();
     }
 

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

@@ -16,21 +16,16 @@
 package com.jeequan.jeepay.mgr.ctrl.merchant;
 
 import cn.hutool.core.util.IdUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jeequan.jeepay.components.mq.model.ResetIsvMchAppInfoConfigMQ;
+import com.jeequan.jeepay.components.mq.vender.IMQSender;
 import com.jeequan.jeepay.core.aop.MethodLog;
 import com.jeequan.jeepay.core.constants.ApiCodeEnum;
-import com.jeequan.jeepay.core.constants.CS;
 import com.jeequan.jeepay.core.entity.MchApp;
 import com.jeequan.jeepay.core.model.ApiRes;
-import com.jeequan.jeepay.core.mq.MqCommonService;
-import com.jeequan.jeepay.core.utils.JsonKit;
-import com.jeequan.jeepay.core.utils.StringKit;
 import com.jeequan.jeepay.mgr.ctrl.CommonCtrl;
 import com.jeequan.jeepay.service.impl.MchAppService;
 import com.jeequan.jeepay.service.impl.MchInfoService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -48,7 +43,7 @@ public class MchAppController extends CommonCtrl {
 
     @Autowired private MchInfoService mchInfoService;
     @Autowired private MchAppService mchAppService;
-    @Autowired private MqCommonService mqCommonService;
+    @Autowired private IMQSender mqSender;
 
     /**
      * @Author: ZhuXiao
@@ -119,9 +114,7 @@ public class MchAppController extends CommonCtrl {
             return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_UPDATE);
         }
         // 推送修改应用消息
-        JSONObject jsonObject = JsonKit.newJson("mchNo", mchApp.getMchNo());
+        mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_APP, null, mchApp.getMchNo(), appId));
-        jsonObject.put("appId", appId);
-        mqCommonService.send(jsonObject.toJSONString(), CS.MQ.MQ_TYPE_MODIFY_MCH_APP);
         return ApiRes.ok();
     }
 
@@ -139,9 +132,7 @@ public class MchAppController extends CommonCtrl {
         mchAppService.removeByAppId(appId);
 
         // 推送mq到目前节点进行更新数据
-        JSONObject jsonObject = JsonKit.newJson("mchNo", mchApp.getMchNo());
+        mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_APP, null, mchApp.getMchNo(), appId));
-        jsonObject.put("appId", appId);
-        mqCommonService.send(jsonObject.toJSONString(), CS.MQ.MQ_TYPE_MODIFY_MCH_APP);
         return ApiRes.ok();
     }
 

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

@@ -20,13 +20,15 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jeequan.jeepay.components.mq.model.CleanMchLoginAuthCacheMQ;
+import com.jeequan.jeepay.components.mq.model.ResetIsvMchAppInfoConfigMQ;
+import com.jeequan.jeepay.components.mq.vender.IMQSender;
 import com.jeequan.jeepay.core.aop.MethodLog;
 import com.jeequan.jeepay.core.constants.ApiCodeEnum;
 import com.jeequan.jeepay.core.constants.CS;
 import com.jeequan.jeepay.core.entity.MchInfo;
 import com.jeequan.jeepay.core.entity.SysUser;
 import com.jeequan.jeepay.core.model.ApiRes;
-import com.jeequan.jeepay.core.mq.MqCommonService;
 import com.jeequan.jeepay.mgr.ctrl.CommonCtrl;
 import com.jeequan.jeepay.service.impl.MchInfoService;
 import com.jeequan.jeepay.service.impl.SysUserAuthService;
@@ -39,9 +41,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashSet;
+import java.util.*;
-import java.util.List;
-import java.util.Set;
 
 /**
  * 商户管理类
@@ -57,7 +57,7 @@ public class MchInfoController extends CommonCtrl {
     @Autowired private MchInfoService mchInfoService;
     @Autowired private SysUserService sysUserService;
     @Autowired private SysUserAuthService sysUserAuthService;
-    @Autowired private MqCommonService mqCommonService;
+    @Autowired private IMQSender mqSender;
 
     /**
      * @author: pangxiaoyu
@@ -113,10 +113,12 @@ public class MchInfoController extends CommonCtrl {
     @RequestMapping(value="/{mchNo}", method = RequestMethod.DELETE)
     public ApiRes delete(@PathVariable("mchNo") String mchNo) {
         List<Long> userIdList = mchInfoService.removeByMchNo(mchNo);
+
         // 推送mq删除redis用户缓存
-        mqCommonService.send(JSONArray.toJSONString(userIdList), CS.MQ.MQ_TYPE_MCH_LOGIN_USER_REMOVE);
+        mqSender.send(CleanMchLoginAuthCacheMQ.build(userIdList));
+
         // 推送mq到目前节点进行更新数据
-        mqCommonService.send(mchNo, CS.MQ.MQ_TYPE_MODIFY_MCH_INFO);
+        mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_INFO, null, mchNo, null));
         return ApiRes.ok();
     }
 
@@ -162,7 +164,7 @@ public class MchInfoController extends CommonCtrl {
 
         // 推送mq删除redis用户认证信息
         if (!removeCacheUserIdList.isEmpty()) {
-            mqCommonService.send(JSONArray.toJSONString(removeCacheUserIdList), CS.MQ.MQ_TYPE_MCH_LOGIN_USER_REMOVE);
+            mqSender.send(CleanMchLoginAuthCacheMQ.build(new ArrayList<>(removeCacheUserIdList)));
         }
 
         //更新商户信息
@@ -171,7 +173,7 @@ public class MchInfoController extends CommonCtrl {
         }
 
         // 推送mq到目前节点进行更新数据
-        mqCommonService.send(mchNo, CS.MQ.MQ_TYPE_MODIFY_MCH_INFO);
+        mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_INFO, null, mchNo, null));
 
         return ApiRes.ok();
     }

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

@@ -16,6 +16,8 @@
 package com.jeequan.jeepay.mgr.ctrl.merchant;
 
 import com.alibaba.fastjson.JSONObject;
+import com.jeequan.jeepay.components.mq.model.ResetIsvMchAppInfoConfigMQ;
+import com.jeequan.jeepay.components.mq.vender.IMQSender;
 import com.jeequan.jeepay.core.aop.MethodLog;
 import com.jeequan.jeepay.core.constants.ApiCodeEnum;
 import com.jeequan.jeepay.core.constants.CS;
@@ -25,8 +27,6 @@ import com.jeequan.jeepay.core.entity.PayInterfaceConfig;
 import com.jeequan.jeepay.core.entity.PayInterfaceDefine;
 import com.jeequan.jeepay.core.model.ApiRes;
 import com.jeequan.jeepay.core.model.params.NormalMchParams;
-import com.jeequan.jeepay.core.mq.MqCommonService;
-import com.jeequan.jeepay.core.utils.JsonKit;
 import com.jeequan.jeepay.core.utils.StringKit;
 import com.jeequan.jeepay.mgr.ctrl.CommonCtrl;
 import com.jeequan.jeepay.service.impl.MchAppService;
@@ -54,7 +54,7 @@ public class MchPayInterfaceConfigController extends CommonCtrl {
 
     @Autowired private PayInterfaceConfigService payInterfaceConfigService;
     @Autowired private MchAppService mchAppService;
-    @Autowired private MqCommonService mqCommonService;
+    @Autowired private IMQSender mqSender;
     @Autowired private MchInfoService mchInfoService;
     @Autowired private SysConfigService sysConfigService;
 
@@ -153,9 +153,9 @@ public class MchPayInterfaceConfigController extends CommonCtrl {
         if (!result) {
             return ApiRes.fail(ApiCodeEnum.SYSTEM_ERROR, "配置失败");
         }
-        JSONObject jsonObject = JsonKit.newJson("mchNo", mchApp.getMchNo());
+
-        jsonObject.put("appId", infoId);
+        // 推送mq到目前节点进行更新数据
-        mqCommonService.send(jsonObject.toJSONString(), CS.MQ.MQ_TYPE_MODIFY_MCH_APP); // 推送mq到目前节点进行更新数据
+        mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_APP, null, mchApp.getMchNo(), infoId));
 
         return ApiRes.ok();
     }

jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/MchNotifyController.java

@@ -18,12 +18,13 @@ package com.jeequan.jeepay.mgr.ctrl.order;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jeequan.jeepay.components.mq.model.PayOrderMchNotifyMQ;
+import com.jeequan.jeepay.components.mq.vender.IMQSender;
 import com.jeequan.jeepay.core.constants.ApiCodeEnum;
 import com.jeequan.jeepay.core.constants.CS;
 import com.jeequan.jeepay.core.entity.MchNotifyRecord;
 import com.jeequan.jeepay.core.exception.BizException;
 import com.jeequan.jeepay.core.model.ApiRes;
-import com.jeequan.jeepay.core.mq.MqCommonService;
 import com.jeequan.jeepay.mgr.ctrl.CommonCtrl;
 import com.jeequan.jeepay.service.impl.MchNotifyRecordService;
 import org.apache.commons.lang3.StringUtils;
@@ -46,7 +47,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class MchNotifyController extends CommonCtrl {
 
     @Autowired private MchNotifyRecordService mchNotifyService;
-    @Autowired private MqCommonService mqCommonService;
+    @Autowired private IMQSender mqSender;
 
     /**
      * @author: pangxiaoyu
@@ -107,7 +108,7 @@ public class MchNotifyController extends CommonCtrl {
         mchNotifyService.getBaseMapper().updateIngAndAddNotifyCountLimit(notifyId);
 
         //调起MQ重发
-        mqCommonService.send(notifyId+"", CS.MQ.MQ_TYPE_PAY_ORDER_MCH_NOTIFY);
+        mqSender.send(PayOrderMchNotifyMQ.build(notifyId));
 
         return ApiRes.ok(mchNotify);
     }

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

@@ -17,19 +17,18 @@ package com.jeequan.jeepay.mch.ctrl.merchant;
 
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jeequan.jeepay.components.mq.model.ResetIsvMchAppInfoConfigMQ;
+import com.jeequan.jeepay.components.mq.vender.IMQSender;
 import com.jeequan.jeepay.core.aop.MethodLog;
 import com.jeequan.jeepay.core.constants.ApiCodeEnum;
 import com.jeequan.jeepay.core.constants.CS;
 import com.jeequan.jeepay.core.entity.MchApp;
 import com.jeequan.jeepay.core.exception.BizException;
 import com.jeequan.jeepay.core.model.ApiRes;
-import com.jeequan.jeepay.core.mq.MqCommonService;
 import com.jeequan.jeepay.core.utils.JsonKit;
 import com.jeequan.jeepay.mch.ctrl.CommonCtrl;
 import com.jeequan.jeepay.service.impl.MchAppService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -46,7 +45,7 @@ import org.springframework.web.bind.annotation.*;
 public class MchAppController extends CommonCtrl {
 
     @Autowired private MchAppService mchAppService;
-    @Autowired private MqCommonService mqCommonService;
+    @Autowired private IMQSender mqSender;
 
     /**
      * @Author: ZhuXiao
@@ -122,9 +121,7 @@ public class MchAppController extends CommonCtrl {
             return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_UPDATE);
         }
         // 推送修改应用消息
-        JSONObject jsonObject = JsonKit.newJson("mchNo", mchApp.getMchNo());
+        mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_APP, null, mchApp.getMchNo(), appId));
-        jsonObject.put("appId", appId);
-        mqCommonService.send(jsonObject.toJSONString(), CS.MQ.MQ_TYPE_MODIFY_MCH_APP);
         return ApiRes.ok();
     }
 
@@ -146,9 +143,7 @@ public class MchAppController extends CommonCtrl {
         mchAppService.removeByAppId(appId);
 
         // 推送mq到目前节点进行更新数据
-        JSONObject jsonObject = JsonKit.newJson("mchNo", mchApp.getMchNo());
+        mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_APP, null, mchApp.getMchNo(), appId));
-        jsonObject.put("appId", appId);
-        mqCommonService.send(jsonObject.toJSONString(), CS.MQ.MQ_TYPE_MODIFY_MCH_APP);
         return ApiRes.ok();
     }
 

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

@@ -16,6 +16,8 @@
 package com.jeequan.jeepay.mch.ctrl.merchant;
 
 import com.alibaba.fastjson.JSONObject;
+import com.jeequan.jeepay.components.mq.model.ResetIsvMchAppInfoConfigMQ;
+import com.jeequan.jeepay.components.mq.vender.IMQSender;
 import com.jeequan.jeepay.core.aop.MethodLog;
 import com.jeequan.jeepay.core.constants.ApiCodeEnum;
 import com.jeequan.jeepay.core.constants.CS;
@@ -26,8 +28,6 @@ import com.jeequan.jeepay.core.entity.PayInterfaceDefine;
 import com.jeequan.jeepay.core.exception.BizException;
 import com.jeequan.jeepay.core.model.ApiRes;
 import com.jeequan.jeepay.core.model.params.NormalMchParams;
-import com.jeequan.jeepay.core.mq.MqCommonService;
-import com.jeequan.jeepay.core.utils.JsonKit;
 import com.jeequan.jeepay.core.utils.StringKit;
 import com.jeequan.jeepay.mch.ctrl.CommonCtrl;
 import com.jeequan.jeepay.service.impl.MchAppService;
@@ -55,9 +55,9 @@ public class MchPayInterfaceConfigController extends CommonCtrl {
 
     @Autowired private PayInterfaceConfigService payInterfaceConfigService;
     @Autowired private MchInfoService mchInfoService;
-    @Autowired private MqCommonService mqCommonService;
     @Autowired private MchAppService mchAppService;
     @Autowired private SysConfigService sysConfigService;
+    @Autowired private IMQSender mqSender;
 
     /**
      * @Author: ZhuXiao
@@ -154,9 +154,7 @@ public class MchPayInterfaceConfigController extends CommonCtrl {
         if (!result) {
             throw new BizException("配置失败");
         }
-        JSONObject jsonObject = JsonKit.newJson("mchNo", getCurrentMchNo());
+        mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_APP, null, getCurrentMchNo(), infoId));
-        jsonObject.put("appId", infoId);
-        mqCommonService.send(jsonObject.toJSONString(), CS.MQ.MQ_TYPE_MODIFY_MCH_APP);
 
         return ApiRes.ok();
     }

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

@@ -20,6 +20,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.domain.AlipayOpenAuthTokenAppModel;
 import com.alipay.api.request.AlipayOpenAuthTokenAppRequest;
 import com.alipay.api.response.AlipayOpenAuthTokenAppResponse;
+import com.jeequan.jeepay.components.mq.model.ResetIsvMchAppInfoConfigMQ;
+import com.jeequan.jeepay.components.mq.vender.IMQSender;
 import com.jeequan.jeepay.core.constants.CS;
 import com.jeequan.jeepay.core.ctrls.AbstractCtrl;
 import com.jeequan.jeepay.core.entity.MchApp;
@@ -27,8 +29,6 @@ import com.jeequan.jeepay.core.entity.PayInterfaceConfig;
 import com.jeequan.jeepay.core.exception.BizException;
 import com.jeequan.jeepay.core.model.params.alipay.AlipayConfig;
 import com.jeequan.jeepay.core.model.params.alipay.AlipayIsvParams;
-import com.jeequan.jeepay.core.mq.MqCommonService;
-import com.jeequan.jeepay.core.utils.JsonKit;
 import com.jeequan.jeepay.pay.channel.alipay.AlipayKit;
 import com.jeequan.jeepay.pay.model.AlipayClientWrapper;
 import com.jeequan.jeepay.pay.model.IsvConfigContext;
@@ -61,8 +61,8 @@ public class AlipayBizController extends AbstractCtrl {
     @Autowired private ConfigContextService configContextService;
     @Autowired private SysConfigService sysConfigService;
     @Autowired private PayInterfaceConfigService payInterfaceConfigService;
-    @Autowired private MqCommonService mqCommonService;
     @Autowired private MchAppService mchAppService;
+    @Autowired private IMQSender mqSender;
 
     /** 跳转到支付宝的授权页面 （统一从pay项目获取到isv配置信息）
      * isvAndMchNo 格式:  ISVNO_MCHAPPID
@@ -143,9 +143,8 @@ public class AlipayBizController extends AbstractCtrl {
 
                 MchApp mchApp = mchAppService.getById(mchAppId);
 
-                JSONObject jsonObject = JsonKit.newJson("mchNo", mchApp.getMchNo());
+                // 更新应用配置信息
-                jsonObject.put("appId", mchApp.getAppId());
+                mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.MsgPayload.RESET_TYPE.MCH_APP, null, mchApp.getMchNo(), mchApp.getAppId()));
-                mqCommonService.send(jsonObject.toJSONString(), CS.MQ.MQ_TYPE_MODIFY_MCH_APP); // 推送mq到目前节点进行更新数据
 
             }
         } catch (Exception e) {

jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/payorder/AbstractPayOrderController.java

@@ -16,6 +16,8 @@
 package com.jeequan.jeepay.pay.ctrl.payorder;
 
 import cn.hutool.core.date.DateUtil;
+import com.jeequan.jeepay.components.mq.model.PayOrderReissueMQ;
+import com.jeequan.jeepay.components.mq.vender.IMQSender;
 import com.jeequan.jeepay.core.constants.CS;
 import com.jeequan.jeepay.core.entity.MchApp;
 import com.jeequan.jeepay.core.entity.MchInfo;
@@ -23,7 +25,6 @@ import com.jeequan.jeepay.core.entity.MchPayPassage;
 import com.jeequan.jeepay.core.entity.PayOrder;
 import com.jeequan.jeepay.core.exception.BizException;
 import com.jeequan.jeepay.core.model.ApiRes;
-import com.jeequan.jeepay.core.mq.MqCommonService;
 import com.jeequan.jeepay.core.utils.SeqKit;
 import com.jeequan.jeepay.core.utils.SpringBeansUtil;
 import com.jeequan.jeepay.core.utils.StringKit;
@@ -32,7 +33,6 @@ import com.jeequan.jeepay.pay.ctrl.ApiController;
 import com.jeequan.jeepay.pay.exception.ChannelException;
 import com.jeequan.jeepay.pay.model.IsvConfigContext;
 import com.jeequan.jeepay.pay.model.MchAppConfigContext;
-import com.jeequan.jeepay.pay.mq.receive.MqReceiveCommon;
 import com.jeequan.jeepay.pay.rqrs.msg.ChannelRetMsg;
 import com.jeequan.jeepay.pay.rqrs.payorder.UnifiedOrderRQ;
 import com.jeequan.jeepay.pay.rqrs.payorder.UnifiedOrderRS;
@@ -64,8 +64,7 @@ public abstract class AbstractPayOrderController extends ApiController {
     @Autowired private ConfigContextService configContextService;
     @Autowired private PayMchNotifyService payMchNotifyService;
     @Autowired private SysConfigService sysConfigService;
-    @Autowired private MqCommonService mqCommonService;
+    @Autowired private IMQSender mqSender;
-    @Autowired private MqReceiveCommon receiveCommon;
 
 
     /** 统一下单 (新建订单模式) **/
@@ -332,7 +331,7 @@ public abstract class AbstractPayOrderController extends ApiController {
 
         //判断是否需要轮询查单
         if(channelRetMsg.isNeedQuery()){
-            mqCommonService.send(receiveCommon.buildMsg(payOrderId, 1), 5 * 1000, CS.MQ.MQ_TYPE_CHANNEL_ORDER_QUERY);
+            mqSender.send(PayOrderReissueMQ.build(payOrderId, 1), 5* 1000);
         }
 
     }

jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/payorder/UnifiedOrderController.java

@@ -15,9 +15,6 @@
  */
 package com.jeequan.jeepay.pay.ctrl.payorder;
 
-import com.jeequan.jeepay.components.mq.model.PayOrderMchNotifyMQ;
-import com.jeequan.jeepay.components.mq.model.ResetAppConfigMQ;
-import com.jeequan.jeepay.components.mq.vender.IMQSender;
 import com.jeequan.jeepay.core.constants.CS;
 import com.jeequan.jeepay.core.entity.PayOrder;
 import com.jeequan.jeepay.core.entity.PayWay;
@@ -49,33 +46,12 @@ public class UnifiedOrderController extends AbstractPayOrderController {
     @Autowired private PayWayService payWayService;
     @Autowired private ConfigContextService configContextService;
 
-
-    @Autowired
-    private IMQSender mqSender;
-
-
     /**
      * 统一下单接口
      * **/
     @PostMapping("/api/pay/unifiedOrder")
     public ApiRes unifiedOrder(){
 
-
-        if(true){
-
-//            imqSender.send(PayOrderMchNotifyMQ.build("T00001"));
-            mqSender.send(ResetAppConfigMQ.build(), 19);
-
-
-            mqSender.send(PayOrderMchNotifyMQ.build("123"));
-
-            mqSender.send(ResetAppConfigMQ.build(), 20);
-
-
-            return null;
-        }
-
-
         //获取参数 & 验签
         UnifiedOrderRQ rq = getRQByWithMchSign(UnifiedOrderRQ.class);
 

jeepay-payment/src/main/java/com/jeequan/jeepay/pay/mq/PayOrderMchNotifyMQReceiver.java

@@ -20,7 +20,6 @@ import cn.hutool.http.HttpUtil;
 import com.jeequan.jeepay.components.mq.model.PayOrderMchNotifyMQ;
 import com.jeequan.jeepay.components.mq.vender.IMQSender;
 import com.jeequan.jeepay.core.entity.MchNotifyRecord;
-import com.jeequan.jeepay.core.mq.MqCommonService;
 import com.jeequan.jeepay.service.impl.MchNotifyRecordService;
 import com.jeequan.jeepay.service.impl.PayOrderService;
 import lombok.extern.slf4j.Slf4j;

jeepay-payment/src/main/java/com/jeequan/jeepay/pay/service/PayMchNotifyService.java

@@ -16,11 +16,11 @@
 package com.jeequan.jeepay.pay.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.jeequan.jeepay.core.constants.CS;
+import com.jeequan.jeepay.components.mq.model.PayOrderMchNotifyMQ;
+import com.jeequan.jeepay.components.mq.vender.IMQSender;
 import com.jeequan.jeepay.core.entity.MchNotifyRecord;
 import com.jeequan.jeepay.core.entity.PayOrder;
 import com.jeequan.jeepay.core.entity.RefundOrder;
-import com.jeequan.jeepay.core.mq.MqCommonService;
 import com.jeequan.jeepay.core.utils.JeepayKit;
 import com.jeequan.jeepay.core.utils.StringKit;
 import com.jeequan.jeepay.pay.rqrs.payorder.QueryPayOrderRS;
@@ -44,7 +44,7 @@ public class PayMchNotifyService {
 
     @Autowired private MchNotifyRecordService mchNotifyRecordService;
     @Autowired private ConfigContextService configContextService;
-    @Autowired private MqCommonService mqCommonService;
+    @Autowired private IMQSender mqSender;
 
 
     /** 商户通知信息， 只有订单是终态，才会发送通知， 如明确成功和明确失败 **/
@@ -85,7 +85,7 @@ public class PayMchNotifyService {
 
             //推送到MQ
             Long notifyId = mchNotifyRecord.getNotifyId();
-            mqCommonService.send(notifyId + "", CS.MQ.MQ_TYPE_PAY_ORDER_MCH_NOTIFY);
+            mqSender.send(PayOrderMchNotifyMQ.build(notifyId));
 
         } catch (Exception e) {
             log.error("推送失败！", e);
@@ -130,7 +130,7 @@ public class PayMchNotifyService {
 
             //推送到MQ
             Long notifyId = mchNotifyRecord.getNotifyId();
-            mqCommonService.send(notifyId + "", CS.MQ.MQ_TYPE_PAY_ORDER_MCH_NOTIFY);
+            mqSender.send(PayOrderMchNotifyMQ.build(notifyId));
 
         } catch (Exception e) {
             log.error("推送失败！", e);