diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/CalculateSalesQueueConsumer.java b/ruoyi-admin/src/main/java/com/ruoyi/consumer/CalculateSalesQueueConsumer.java similarity index 68% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/CalculateSalesQueueConsumer.java rename to ruoyi-admin/src/main/java/com/ruoyi/consumer/CalculateSalesQueueConsumer.java index a6ea4792..1f963091 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/CalculateSalesQueueConsumer.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/consumer/CalculateSalesQueueConsumer.java @@ -1,5 +1,6 @@ -package com.ruoyi.cai.mq.consumer; +package com.ruoyi.consumer; +import com.ruoyi.cai.mq.constant.CalculateSalesQueueHttpMqConstant; import com.ruoyi.cai.service.ConsumeLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.annotation.Exchange; @@ -13,18 +14,13 @@ import org.springframework.stereotype.Component; @Slf4j public class CalculateSalesQueueConsumer { - public final static String CALCULATE_SALES_QUEUE = "calculateSalesQueue"; - public final static String CALCULATE_SALES_EXCHANGE = "calculateSalesExchange"; - public final static String CALCULATE_SALES_KEY = "calculateSalesKey"; - - @Autowired private ConsumeLogService consumeLogService; @RabbitListener(bindings = @QueueBinding( - value = @Queue(value = CALCULATE_SALES_QUEUE, durable = "false", autoDelete = "false"), - exchange = @Exchange(value = CALCULATE_SALES_EXCHANGE), - key = CALCULATE_SALES_KEY) + value = @Queue(value = CalculateSalesQueueHttpMqConstant.CALCULATE_SALES_QUEUE, durable = "false", autoDelete = "false"), + exchange = @Exchange(value = CalculateSalesQueueHttpMqConstant.CALCULATE_SALES_EXCHANGE), + key = CalculateSalesQueueHttpMqConstant.CALCULATE_SALES_KEY) ,containerFactory = "customContainerFactory") public void calculateSalesQueue(String message) { log.info("接受到到分销处理请求: message=" + message); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/CommonConsumer.java b/ruoyi-admin/src/main/java/com/ruoyi/consumer/CommonConsumer.java similarity index 75% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/CommonConsumer.java rename to ruoyi-admin/src/main/java/com/ruoyi/consumer/CommonConsumer.java index 8baa4722..be4f3c71 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/CommonConsumer.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/consumer/CommonConsumer.java @@ -1,8 +1,9 @@ -package com.ruoyi.cai.mq.consumer; +package com.ruoyi.consumer; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.ruoyi.cai.mq.config.HandleConfig; +import com.ruoyi.cai.mq.constant.CommonHttpMqConstant; import com.ruoyi.cai.mq.handle.IHandle; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.annotation.Exchange; @@ -15,18 +16,15 @@ import org.springframework.stereotype.Component; @Component @Slf4j public class CommonConsumer { - public final static String COMMON_QUEUE = "caiCommonQueue"; - public final static String COMMON_EXCHANGE = "caiCommonExchange"; - public final static String COMMON_KEY = "caiCommonKey"; @Autowired private HandleConfig handleConfig; @RabbitListener(bindings = @QueueBinding( - value = @Queue(value = COMMON_QUEUE, durable = "false", autoDelete = "false"), - exchange = @Exchange(value = COMMON_EXCHANGE), - key = COMMON_KEY) + value = @Queue(value = CommonHttpMqConstant.COMMON_QUEUE, durable = "false", autoDelete = "false"), + exchange = @Exchange(value = CommonHttpMqConstant.COMMON_EXCHANGE), + key = CommonHttpMqConstant.COMMON_KEY) ,containerFactory = "customContainerFactory") public void calculateSalesQueue(String message) { log.info("队列消息处理-开始: message=" + message); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/CommonDelayMqConsumer.java b/ruoyi-admin/src/main/java/com/ruoyi/consumer/CommonDelayMqConsumer.java similarity index 69% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/CommonDelayMqConsumer.java rename to ruoyi-admin/src/main/java/com/ruoyi/consumer/CommonDelayMqConsumer.java index 56acc134..4f2e7e23 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/CommonDelayMqConsumer.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/consumer/CommonDelayMqConsumer.java @@ -1,15 +1,10 @@ -package com.ruoyi.cai.mq.consumer; +package com.ruoyi.consumer; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.cai.manager.UserForbidManager; -import com.ruoyi.cai.mq.CommonDelayTypeEnum; -import com.ruoyi.cai.mq.config.CommonDelayMqConfig; import com.ruoyi.cai.mq.config.HandleDelayConfig; -import com.ruoyi.cai.mq.handle.IHandle; -import com.ruoyi.cai.mq.handleDelay.CommonDelayDto; +import com.ruoyi.cai.mq.constant.CommonDelayHttpMqConstant; import com.ruoyi.cai.mq.handleDelay.IHandleDelay; -import com.ruoyi.cai.service.SysPushService; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; @@ -18,14 +13,10 @@ import org.springframework.stereotype.Component; @Slf4j @Component public class CommonDelayMqConsumer { - @Autowired - private UserForbidManager userForbidManager; - @Autowired - private SysPushService sysPushService; @Autowired private HandleDelayConfig handleDelayConfig; - @RabbitListener(queues = CommonDelayMqConfig.QUEUE_NAME + @RabbitListener(queues = CommonDelayHttpMqConstant.QUEUE_NAME ,containerFactory = "customContainerFactory") public void checkTimeOutMq(String message) { log.info("公共延时队列消息处理-开始: message=" + message); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/WindowConsumer.java b/ruoyi-admin/src/main/java/com/ruoyi/consumer/WindowConsumer.java similarity index 75% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/WindowConsumer.java rename to ruoyi-admin/src/main/java/com/ruoyi/consumer/WindowConsumer.java index 8ad64d07..1e237678 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/consumer/WindowConsumer.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/consumer/WindowConsumer.java @@ -1,8 +1,9 @@ -package com.ruoyi.cai.mq.consumer; +package com.ruoyi.consumer; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.ruoyi.cai.mq.config.HandleConfig; +import com.ruoyi.cai.mq.constant.WindowHttpMqConstant; import com.ruoyi.cai.mq.handle.IHandle; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.annotation.Exchange; @@ -16,19 +17,15 @@ import org.springframework.stereotype.Component; @Slf4j public class WindowConsumer { - public final static String WINDOW_QUEUE = "caiWindowQueue"; - public final static String WINDOW_EXCHANGE = "caiWindowExchange"; - public final static String WINDOW_KEY = "caiWindowKey"; - @Autowired private HandleConfig handleConfig; // ,containerFactory = "customContainerFactory" @RabbitListener(bindings = @QueueBinding( - value = @Queue(value = WINDOW_QUEUE, durable = "false", autoDelete = "false"), - exchange = @Exchange(value = WINDOW_EXCHANGE), - key = WINDOW_KEY)) + value = @Queue(value = WindowHttpMqConstant.WINDOW_QUEUE, durable = "false", autoDelete = "false"), + exchange = @Exchange(value = WindowHttpMqConstant.WINDOW_EXCHANGE), + key = WindowHttpMqConstant.WINDOW_KEY)) public void calculateSalesQueue(String message) { log.info("飘窗检测-开始: message=" + message); try { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/MqControllerTest.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/MqControllerTest.java index 707fc6f5..f3483464 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/MqControllerTest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/MqControllerTest.java @@ -1,6 +1,6 @@ package com.ruoyi.web.controller.cai.admin.init; -import com.ruoyi.cai.mq.AmqpProducer; +import com.ruoyi.cai.mq.AmqpHttpProducer; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -15,15 +15,10 @@ import org.springframework.web.bind.annotation.RestController; public class MqControllerTest { @Autowired - private AmqpProducer amqpProducer; - - @GetMapping("/send") - public void send(String message,Integer time){ - amqpProducer.sendRoomSettleDelay(message,time); - } + private AmqpHttpProducer amqpHttpProducer; @GetMapping("/send2") public void send(String message){ - amqpProducer.sendCalculateSales(message); + amqpHttpProducer.sendCalculateSales(message); } } diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/business/RoomTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/business/RoomTest.java index e5394b58..822436c8 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/business/RoomTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/business/RoomTest.java @@ -6,8 +6,6 @@ import com.ruoyi.cai.notice.data.ImVideoAttachR; import com.ruoyi.cai.notice.data.child.ImVideoAttachData; import com.ruoyi.cai.service.UserService; import com.ruoyi.cai.ws.cache.RoomDataCache; -import com.ruoyi.cai.ws.job.JobResp; -import com.ruoyi.cai.ws.job.RoomCheckJobService; import com.ruoyi.cai.ws.service.RoomService; import com.ruoyi.yunxin.Yunxin; import com.ruoyi.yunxin.resp.YxCommonR; @@ -20,14 +18,14 @@ import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest @Slf4j public class RoomTest { - @Autowired - private RoomCheckJobService roomCheckJobService; +// @Autowired +// private RoomCheckJobService roomCheckJobService; @Test public void test(){ - Long roomId = 1761964822147088386L; - JobResp resp = roomCheckJobService.checkRoom(roomId); - log.error(JSON.toJSONString(resp)); +// Long roomId = 1761964822147088386L; +// JobResp resp = roomCheckJobService.checkRoom(roomId); +// log.error(JSON.toJSONString(resp)); } @Autowired diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java index eb7cf905..ef6f30a0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java @@ -15,7 +15,7 @@ import com.ruoyi.cai.enums.IgnoreDataTypeEnum; import com.ruoyi.cai.enums.SystemConfigEnum; import com.ruoyi.cai.executor.ExecutorConstant; import com.ruoyi.cai.manager.*; -import com.ruoyi.cai.mq.AmqpProducer; +import com.ruoyi.cai.mq.AmqpHttpProducer; import com.ruoyi.cai.mq.handle.dto.LoginNotifyDTO; import com.ruoyi.cai.service.*; import com.ruoyi.cai.util.RandomSjUtil; @@ -86,7 +86,7 @@ public class CaiLoginManager { @Autowired private IgnoreDataService ignoreDataService; @Autowired - private AmqpProducer amqpProducer; + private AmqpHttpProducer amqpHttpProducer; public String login(String username,String password){ User user = userService.getByUsername(username); @@ -119,7 +119,7 @@ public class CaiLoginManager { loginUserDTO.setImei(ServletUtils.getImei()); loginUserDTO.setClientIP(ServletUtils.getClientIP()); loginUserDTO.setLogin(true); - amqpProducer.sendCommonMq(loginUserDTO); + amqpHttpProducer.sendCommonMq(loginUserDTO); } public String register(CaiRegisterUser caiUser) { diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ConsumerManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ConsumerManager.java index 68641f2d..980845c9 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ConsumerManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ConsumerManager.java @@ -12,7 +12,7 @@ import com.ruoyi.cai.dto.commom.consumer.GuardConsumerResp; import com.ruoyi.cai.dto.commom.consumer.RechargeConsumerResp; import com.ruoyi.cai.dto.video.VideoSettleResp; import com.ruoyi.cai.enums.SystemConfigEnum; -import com.ruoyi.cai.mq.AmqpProducer; +import com.ruoyi.cai.mq.AmqpHttpProducer; import com.ruoyi.cai.mq.handle.dto.WindowGiftNotifyDTO; import com.ruoyi.cai.mq.handle.dto.WindowRechargeNotifyDTO; import com.ruoyi.cai.notice.YunxinHttpService; @@ -37,7 +37,7 @@ public class ConsumerManager { @Autowired private UserGiftService userGiftService; @Autowired - private AmqpProducer amqpProducer; + private AmqpHttpProducer amqpHttpProducer; @Autowired private RechargeOrderService rechargeOrderService; @Autowired @@ -57,7 +57,7 @@ public class ConsumerManager { GuardConsumerResp resp = guardTotalService.giveGuard(query); if(resp.isSuccess()){ try { - amqpProducer.sendCalculateSales(resp.getConsumeLogId()+""); + amqpHttpProducer.sendCalculateSales(resp.getConsumeLogId()+""); }catch (Exception e){ log.error("RabbitMq 发送失败, 守护分销流程流转失败！",e); } @@ -79,7 +79,7 @@ public class ConsumerManager { GiftConsumerResp resp = userGiftService.giveGift(query); if(resp.isSuccess()){ try { - amqpProducer.sendCalculateSales(resp.getConsumeLogId()+""); + amqpHttpProducer.sendCalculateSales(resp.getConsumeLogId()+""); }catch (Exception e){ log.error("RabbitMq 发送失败, 礼物分销流程流转失败！",e); } @@ -107,7 +107,7 @@ public class ConsumerManager { windowGift.setToId(resp.getToUid()); windowGift.setGift(resp.getGift()); windowGift.setGiftNum(query.getGiftCount()); - amqpProducer.sendWindowMq(windowGift); + amqpHttpProducer.sendWindowMq(windowGift); } } }catch (Exception e){ @@ -121,7 +121,7 @@ public class ConsumerManager { VideoSettleResp resp = accountService.videoSettle(room); ConsumeLog consumeLog = resp.getConsumeLog(); try { - amqpProducer.sendCalculateSales(consumeLog.getId()+""); + amqpHttpProducer.sendCalculateSales(consumeLog.getId()+""); }catch (Exception e){ log.error("RabbitMq 发送失败, 视频分销流程流转失败！",e); } @@ -152,7 +152,7 @@ public class ConsumerManager { log.error("充值每日实时统计失败",e); } try { - amqpProducer.sendCalculateSales(resp.getConsumeLogId()+""); + amqpHttpProducer.sendCalculateSales(resp.getConsumeLogId()+""); }catch (Exception e){ log.error("RabbitMq 发送失败, 充值分销流程流转失败！",e); } @@ -176,7 +176,7 @@ public class ConsumerManager { windowRecharge.setAvatar(resp.getUser().getAvatar()); windowRecharge.setAmount(resp.getRechargeCoin()); windowRecharge.setTime(LocalDateTime.now()); - amqpProducer.sendWindowMq(windowRecharge); + amqpHttpProducer.sendWindowMq(windowRecharge); } } }catch (Exception e){ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/HomeManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/HomeManager.java index 5dd71f01..2f518482 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/HomeManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/HomeManager.java @@ -2,20 +2,17 @@ package com.ruoyi.cai.manager; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.constant.RedisHttpConstant; -import com.ruoyi.cai.domain.User; -import com.ruoyi.cai.dto.admin.vo.AnchorTopAdminVo; import com.ruoyi.cai.dto.app.query.index.AnchorListQuery; import com.ruoyi.cai.dto.app.vo.AnchorListVo; import com.ruoyi.cai.dto.app.vo.setting.AppHomeConfig; import com.ruoyi.cai.enums.SystemConfigEnum; import com.ruoyi.cai.enums.home.AnchorListQueryTypeEnum; -import com.ruoyi.cai.mq.AmqpProducer; +import com.ruoyi.cai.mq.AmqpHttpProducer; import com.ruoyi.cai.mq.handle.dto.LoginNotifyDTO; import com.ruoyi.cai.service.AnchorService; import com.ruoyi.cai.service.AnchorTopService; import com.ruoyi.cai.service.UserService; import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.ServletUtils; import org.apache.commons.collections4.CollectionUtils; @@ -24,7 +21,6 @@ import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -147,7 +143,7 @@ public class HomeManager { @Autowired private SystemConfigManager systemConfigManager; @Autowired - private AmqpProducer amqpProducer; + private AmqpHttpProducer amqpHttpProducer; public AppHomeConfig config() { AppHomeConfig config = new AppHomeConfig(); @@ -160,7 +156,7 @@ public class HomeManager { loginUserDTO.setUserId(userId); loginUserDTO.setImei(ServletUtils.getImei()); loginUserDTO.setClientIP(ServletUtils.getClientIP()); - amqpProducer.sendCommonMq(loginUserDTO); + amqpHttpProducer.sendCommonMq(loginUserDTO); } return config; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ImService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ImService.java index 58c0bd9a..aae8f8e4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ImService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ImService.java @@ -15,7 +15,7 @@ import com.ruoyi.cai.enums.ChatTypeEnum; import com.ruoyi.cai.enums.GenderEnum; import com.ruoyi.cai.enums.UserMemberTypeEnum; import com.ruoyi.cai.enums.im.ImImgStatusEnum; -import com.ruoyi.cai.mq.AmqpProducer; +import com.ruoyi.cai.mq.AmqpHttpProducer; import com.ruoyi.cai.mq.handleDelay.dto.SaveSendImImgDelayDto; import com.ruoyi.cai.service.*; import com.ruoyi.cai.util.FileUtils; @@ -50,7 +50,7 @@ public class ImService { @Autowired private UserBlacklistService userBlacklistService; @Autowired - private AmqpProducer amqpProducer; + private AmqpHttpProducer amqpHttpProducer; @Autowired private ISysOssService sysOssService; @Autowired @@ -229,7 +229,7 @@ public class ImService { } SaveSendImImgDelayDto dto = new SaveSendImImgDelayDto(); dto.setRecordId(saveSendImImgReq.getRecordId()); - amqpProducer.sendCommonDelayMq(dto,5); + amqpHttpProducer.sendCommonDelayMq(dto,5); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java index c9123801..ceaad42a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java @@ -10,14 +10,11 @@ import com.ruoyi.cai.dto.admin.query.UserForbidReq; import com.ruoyi.cai.enums.ForbidStatusEnum; import com.ruoyi.cai.enums.forbid.ForbidTimeEnum; import com.ruoyi.cai.enums.forbid.ForbidTypeEnum; -import com.ruoyi.cai.mq.AmqpProducer; -import com.ruoyi.cai.mq.CommonDelayTypeEnum; -import com.ruoyi.cai.mq.handleDelay.CommonDelayDto; +import com.ruoyi.cai.mq.AmqpHttpProducer; import com.ruoyi.cai.mq.handleDelay.dto.ForbidDelayDto; import com.ruoyi.cai.service.*; import com.ruoyi.cai.util.CaiDateUtil; import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.StringUtils; import lombok.Data; @@ -277,13 +274,13 @@ public class UserForbidManager { if(between > 0 && between < 60*60*12){ ForbidDelayDto dto = new ForbidDelayDto(); dto.setForbidId(expireId); - amqpProducer.sendCommonDelayMq(dto,(int)between+5); + amqpHttpProducer.sendCommonDelayMq(dto,(int)between+5); } } } @Autowired - private AmqpProducer amqpProducer; + private AmqpHttpProducer amqpHttpProducer; public void checkExpire(Long id){ UserForbid userForbid = userForbidService.getById(id); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/AmqpHttpProducer.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/AmqpHttpProducer.java new file mode 100644 index 00000000..41377560 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/AmqpHttpProducer.java @@ -0,0 +1,43 @@ +package com.ruoyi.cai.mq; + +import com.alibaba.fastjson.JSON; +import com.ruoyi.cai.mq.constant.CalculateSalesQueueHttpMqConstant; +import com.ruoyi.cai.mq.constant.CommonDelayHttpMqConstant; +import com.ruoyi.cai.mq.constant.CommonHttpMqConstant; +import com.ruoyi.cai.mq.constant.WindowHttpMqConstant; +import com.ruoyi.cai.mq.handle.CommonDTO; +import com.ruoyi.cai.mq.handleDelay.CommonDelayDto; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class AmqpHttpProducer { + @Autowired + private RabbitTemplate rabbitTemplate; + + public void sendCalculateSales(String message){ + rabbitTemplate.convertAndSend(CalculateSalesQueueHttpMqConstant.CALCULATE_SALES_EXCHANGE, CalculateSalesQueueHttpMqConstant.CALCULATE_SALES_KEY, message); + } + + + public void sendCommonMq(T dto){ + rabbitTemplate.convertAndSend(CommonHttpMqConstant.COMMON_EXCHANGE, + CommonHttpMqConstant.COMMON_KEY, JSON.toJSONString(dto)); + } + + public void sendWindowMq(T dto){ + rabbitTemplate.convertAndSend(WindowHttpMqConstant.WINDOW_EXCHANGE, + WindowHttpMqConstant.WINDOW_KEY, JSON.toJSONString(dto)); + } + + public void sendCommonDelayMq(T dto, Integer timeout){ + rabbitTemplate.convertAndSend(CommonDelayHttpMqConstant.EXCHANGE_NAME, + CommonDelayHttpMqConstant.ROUTING_KEY, + JSON.toJSONString(dto), + messagePostProcessor -> { + messagePostProcessor.getMessageProperties().setDelay(timeout*1000); // 设置延迟时间，单位毫秒 + return messagePostProcessor; + }); + } +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/AmqpProducer.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/AmqpProducer.java deleted file mode 100644 index 559507c6..00000000 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/AmqpProducer.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.ruoyi.cai.mq; - -import com.alibaba.fastjson.JSON; -import com.ruoyi.cai.mq.config.RoomCheckDelayMqConfig; -import com.ruoyi.cai.mq.config.RoomSettleDelayMqConfig; -import com.ruoyi.cai.mq.config.CommonDelayMqConfig; -import com.ruoyi.cai.mq.consumer.CalculateSalesQueueConsumer; -import com.ruoyi.cai.mq.consumer.CommonConsumer; -import com.ruoyi.cai.mq.consumer.WindowConsumer; -import com.ruoyi.cai.mq.handle.CommonDTO; -import com.ruoyi.cai.mq.handleDelay.CommonDelayDto; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -@Component -public class AmqpProducer { - @Autowired - private RabbitTemplate rabbitTemplate; - - public void sendCalculateSales(String message){ - rabbitTemplate.convertAndSend(CalculateSalesQueueConsumer.CALCULATE_SALES_EXCHANGE, CalculateSalesQueueConsumer.CALCULATE_SALES_KEY, message); - } - - - public void sendCommonMq(T dto){ - rabbitTemplate.convertAndSend(CommonConsumer.COMMON_EXCHANGE, - CommonConsumer.COMMON_KEY, JSON.toJSONString(dto)); - } - - public void sendWindowMq(T dto){ - rabbitTemplate.convertAndSend(WindowConsumer.WINDOW_EXCHANGE, - WindowConsumer.WINDOW_KEY, JSON.toJSONString(dto)); - } - - public void sendRoomCheckDelay(String message, Integer timeout){ - rabbitTemplate.convertAndSend(RoomCheckDelayMqConfig.EXCHANGE_NAME, - RoomCheckDelayMqConfig.ROUTING_KEY, - message, - messagePostProcessor -> { - messagePostProcessor.getMessageProperties().setDelay(timeout*1000); // 设置延迟时间，单位毫秒 - return messagePostProcessor; - }); - } - - public void sendRoomSettleDelay(String message, Integer timeout){ - rabbitTemplate.convertAndSend(RoomSettleDelayMqConfig.EXCHANGE_NAME, - RoomSettleDelayMqConfig.ROUTING_KEY, - message, - messagePostProcessor -> { - messagePostProcessor.getMessageProperties().setDelay(timeout*1000); // 设置延迟时间，单位毫秒 - return messagePostProcessor; - }); - } - - public void sendCommonDelayMq(T dto, Integer timeout){ - rabbitTemplate.convertAndSend(CommonDelayMqConfig.EXCHANGE_NAME, - CommonDelayMqConfig.ROUTING_KEY, - JSON.toJSONString(dto), - messagePostProcessor -> { - messagePostProcessor.getMessageProperties().setDelay(timeout*1000); // 设置延迟时间，单位毫秒 - return messagePostProcessor; - }); - } -} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/AmqpWsProducer.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/AmqpWsProducer.java new file mode 100644 index 00000000..6600822e --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/AmqpWsProducer.java @@ -0,0 +1,33 @@ +package com.ruoyi.cai.mq; + +import com.ruoyi.cai.mq.constant.ws.RoomCheckDelayWsMqConstant; +import com.ruoyi.cai.mq.constant.ws.RoomSettleDelayWsMqConstant; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class AmqpWsProducer { + @Autowired + private RabbitTemplate rabbitTemplate; + + public void sendRoomCheckDelay(String message, Integer timeout){ + rabbitTemplate.convertAndSend(RoomCheckDelayWsMqConstant.EXCHANGE_NAME, + RoomCheckDelayWsMqConstant.ROUTING_KEY, + message, + messagePostProcessor -> { + messagePostProcessor.getMessageProperties().setDelay(timeout*1000); // 设置延迟时间，单位毫秒 + return messagePostProcessor; + }); + } + + public void sendRoomSettleDelay(String message, Integer timeout){ + rabbitTemplate.convertAndSend(RoomSettleDelayWsMqConstant.EXCHANGE_NAME, + RoomSettleDelayWsMqConstant.ROUTING_KEY, + message, + messagePostProcessor -> { + messagePostProcessor.getMessageProperties().setDelay(timeout*1000); // 设置延迟时间，单位毫秒 + return messagePostProcessor; + }); + } +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/config/CommonDelayMqConfig.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/config/CommonDelayMqConfig.java index 812b5526..f52cc2f5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/config/CommonDelayMqConfig.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/config/CommonDelayMqConfig.java @@ -1,5 +1,6 @@ package com.ruoyi.cai.mq.config; +import com.ruoyi.cai.mq.constant.CommonDelayHttpMqConstant; import org.springframework.amqp.core.*; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -10,15 +11,11 @@ import java.util.HashMap; @Configuration public class CommonDelayMqConfig { - public static final String EXCHANGE_NAME = "commonDelayExchange"; - public static final String QUEUE_NAME = "commonDelayQueue"; - public static final String ROUTING_KEY = "commonDelayRouting"; - @Bean public CustomExchange commonDelayedExchange() { HashMap args = new HashMap<>(); args.put("x-delayed-type", "direct"); - return new CustomExchange(EXCHANGE_NAME, + return new CustomExchange(CommonDelayHttpMqConstant.EXCHANGE_NAME, "x-delayed-message", // 消息类型 true, // 是否持久化 false,// 是否自动删除 @@ -27,14 +24,14 @@ public class CommonDelayMqConfig { @Bean public Queue commonDelayedQueue() { - return QueueBuilder.durable(QUEUE_NAME) + return QueueBuilder.durable(CommonDelayHttpMqConstant.QUEUE_NAME) .withArgument("x-delayed-type", "direct") .build(); } @Bean public Binding commonDelayedBinding(Queue commonDelayedQueue,CustomExchange commonDelayedExchange) { - return BindingBuilder.bind(commonDelayedQueue()).to(commonDelayedExchange()).with(ROUTING_KEY).noargs(); + return BindingBuilder.bind(commonDelayedQueue()).to(commonDelayedExchange()).with(CommonDelayHttpMqConstant.ROUTING_KEY).noargs(); } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/config/RoomCheckDelayMqConfig.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/config/RoomCheckDelayMqConfig.java index c82bf240..a96af9dc 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/config/RoomCheckDelayMqConfig.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/config/RoomCheckDelayMqConfig.java @@ -1,5 +1,6 @@ package com.ruoyi.cai.mq.config; +import com.ruoyi.cai.mq.constant.ws.RoomCheckDelayWsMqConstant; import org.springframework.amqp.core.*; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -10,15 +11,11 @@ import java.util.HashMap; @Configuration public class RoomCheckDelayMqConfig { - public static final String EXCHANGE_NAME = "roomCheckDelayExchange"; - public static final String QUEUE_NAME = "roomCheckDelayQueue"; - public static final String ROUTING_KEY = "roomCheckDelayRouting"; - @Bean public CustomExchange roomCheckDelayedExchange() { HashMap args = new HashMap<>(); args.put("x-delayed-type", "direct"); - return new CustomExchange(EXCHANGE_NAME, + return new CustomExchange(RoomCheckDelayWsMqConstant.EXCHANGE_NAME, "x-delayed-message", // 消息类型 true, // 是否持久化 false,// 是否自动删除 @@ -27,14 +24,14 @@ public class RoomCheckDelayMqConfig { @Bean public Queue roomCheckDelayedQueue() { - return QueueBuilder.durable(QUEUE_NAME) + return QueueBuilder.durable(RoomCheckDelayWsMqConstant.QUEUE_NAME) .withArgument("x-delayed-type", "direct") .build(); } @Bean public Binding roomCheckDelayedBinding(Queue roomCheckDelayedQueue,CustomExchange roomCheckDelayedExchange) { - return BindingBuilder.bind(roomCheckDelayedQueue).to(roomCheckDelayedExchange).with(ROUTING_KEY).noargs(); + return BindingBuilder.bind(roomCheckDelayedQueue).to(roomCheckDelayedExchange).with(RoomCheckDelayWsMqConstant.ROUTING_KEY).noargs(); } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/config/RoomSettleDelayMqConfig.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/config/RoomSettleDelayMqConfig.java index 793028e6..038ef018 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/config/RoomSettleDelayMqConfig.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/config/RoomSettleDelayMqConfig.java @@ -1,5 +1,6 @@ package com.ruoyi.cai.mq.config; +import com.ruoyi.cai.mq.constant.ws.RoomSettleDelayWsMqConstant; import org.springframework.amqp.core.*; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -10,15 +11,11 @@ import java.util.HashMap; @Configuration public class RoomSettleDelayMqConfig { - public static final String EXCHANGE_NAME = "roomSettleDelayExchange"; - public static final String QUEUE_NAME = "roomSettleDelayQueue"; - public static final String ROUTING_KEY = "roomSettleDelayRouting"; - @Bean public CustomExchange roomSettleDelayedExchange() { HashMap args = new HashMap<>(); args.put("x-delayed-type", "direct"); - return new CustomExchange(EXCHANGE_NAME, + return new CustomExchange(RoomSettleDelayWsMqConstant.EXCHANGE_NAME, "x-delayed-message", // 消息类型 true, // 是否持久化 false,// 是否自动删除 @@ -27,14 +24,14 @@ public class RoomSettleDelayMqConfig { @Bean public Queue roomSettleDelayedQueue() { - return QueueBuilder.durable(QUEUE_NAME) + return QueueBuilder.durable(RoomSettleDelayWsMqConstant.QUEUE_NAME) .withArgument("x-delayed-type", "direct") .build(); } @Bean public Binding roomSettleDelayedBinding(Queue roomSettleDelayedQueue,CustomExchange roomSettleDelayedExchange) { - return BindingBuilder.bind(roomSettleDelayedQueue).to(roomSettleDelayedExchange).with(ROUTING_KEY).noargs(); + return BindingBuilder.bind(roomSettleDelayedQueue).to(roomSettleDelayedExchange).with(RoomSettleDelayWsMqConstant.ROUTING_KEY).noargs(); } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/constant/CalculateSalesQueueHttpMqConstant.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/constant/CalculateSalesQueueHttpMqConstant.java new file mode 100644 index 00000000..e54f6b86 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/constant/CalculateSalesQueueHttpMqConstant.java @@ -0,0 +1,12 @@ +package com.ruoyi.cai.mq.constant; + +/** + * HTTP服务 + * 分销计算 + */ +public class CalculateSalesQueueHttpMqConstant { + public final static String CALCULATE_SALES_QUEUE = "calculateSalesQueue"; + public final static String CALCULATE_SALES_EXCHANGE = "calculateSalesExchange"; + public final static String CALCULATE_SALES_KEY = "calculateSalesKey"; + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/constant/CommonDelayHttpMqConstant.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/constant/CommonDelayHttpMqConstant.java new file mode 100644 index 00000000..613e7617 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/constant/CommonDelayHttpMqConstant.java @@ -0,0 +1,10 @@ +package com.ruoyi.cai.mq.constant; + +/** + * HTTP 公共延迟队列 + */ +public class CommonDelayHttpMqConstant { + public static final String EXCHANGE_NAME = "commonDelayExchange"; + public static final String QUEUE_NAME = "commonDelayQueue"; + public static final String ROUTING_KEY = "commonDelayRouting"; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/constant/CommonHttpMqConstant.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/constant/CommonHttpMqConstant.java new file mode 100644 index 00000000..5cc50e09 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/constant/CommonHttpMqConstant.java @@ -0,0 +1,14 @@ +package com.ruoyi.cai.mq.constant; + + +/** + * + * 公共队列 HTTP服务专用 + */ +public class CommonHttpMqConstant { + + public final static String COMMON_QUEUE = "caiCommonQueue"; + public final static String COMMON_EXCHANGE = "caiCommonExchange"; + public final static String COMMON_KEY = "caiCommonKey"; + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/constant/WindowHttpMqConstant.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/constant/WindowHttpMqConstant.java new file mode 100644 index 00000000..07b86749 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/constant/WindowHttpMqConstant.java @@ -0,0 +1,11 @@ +package com.ruoyi.cai.mq.constant; + +/** + * HTTP + * 飘窗通知队列 + */ +public class WindowHttpMqConstant { + public final static String WINDOW_QUEUE = "caiWindowQueue"; + public final static String WINDOW_EXCHANGE = "caiWindowExchange"; + public final static String WINDOW_KEY = "caiWindowKey"; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/constant/ws/RoomCheckDelayWsMqConstant.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/constant/ws/RoomCheckDelayWsMqConstant.java new file mode 100644 index 00000000..08600413 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/constant/ws/RoomCheckDelayWsMqConstant.java @@ -0,0 +1,11 @@ +package com.ruoyi.cai.mq.constant.ws; + +/** + * WS服务 + * 房间检测延迟队列 + */ +public class RoomCheckDelayWsMqConstant { + public static final String EXCHANGE_NAME = "roomCheckDelayExchange"; + public static final String QUEUE_NAME = "roomCheckDelayQueue"; + public static final String ROUTING_KEY = "roomCheckDelayRouting"; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/constant/ws/RoomSettleDelayWsMqConstant.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/constant/ws/RoomSettleDelayWsMqConstant.java new file mode 100644 index 00000000..ecb8026a --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/constant/ws/RoomSettleDelayWsMqConstant.java @@ -0,0 +1,11 @@ +package com.ruoyi.cai.mq.constant.ws; + +/** + * 每分钟扣分延迟队列 + */ +public class RoomSettleDelayWsMqConstant { + public static final String EXCHANGE_NAME = "roomSettleDelayExchange"; + public static final String QUEUE_NAME = "roomSettleDelayQueue"; + public static final String ROUTING_KEY = "roomSettleDelayRouting"; + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/rank/RankManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/rank/RankManager.java index 1ba0bcf2..73ffd5d6 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/rank/RankManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/rank/RankManager.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.rank; import com.ruoyi.cai.constant.RedisHttpConstant; -import com.ruoyi.cai.mq.AmqpProducer; +import com.ruoyi.cai.mq.AmqpHttpProducer; import com.ruoyi.cai.mq.handle.dto.RankNotifyDTO; import lombok.extern.slf4j.Slf4j; import org.redisson.api.RScoredSortedSet; @@ -247,7 +247,7 @@ public class RankManager { @Autowired - private AmqpProducer amqpProducer; + private AmqpHttpProducer amqpHttpProducer; public void sendLoveRankMq(Long userId,Long value,Long traceId){ try { @@ -256,7 +256,7 @@ public class RankManager { rank.setPrice(value); rank.setTraceId(traceId); rank.setRankType(1); - amqpProducer.sendCommonMq(rank); + amqpHttpProducer.sendCommonMq(rank); }catch (Exception e){ log.error("发送魅力榜 rank mq失败",e); } @@ -269,7 +269,7 @@ public class RankManager { rank.setPrice(value); rank.setTraceId(traceId); rank.setRankType(2); - amqpProducer.sendCommonMq(rank); + amqpHttpProducer.sendCommonMq(rank); }catch (Exception e){ log.error("发送邀请榜 rank mq失败",e); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/SysPushServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/SysPushServiceImpl.java index 13d899fb..432e77f2 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/SysPushServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/SysPushServiceImpl.java @@ -19,7 +19,7 @@ import com.ruoyi.cai.enums.SystemConfigEnum; import com.ruoyi.cai.enums.systempush.*; import com.ruoyi.cai.manager.SystemConfigManager; import com.ruoyi.cai.mapper.SysPushMapper; -import com.ruoyi.cai.mq.AmqpProducer; +import com.ruoyi.cai.mq.AmqpHttpProducer; import com.ruoyi.cai.mq.handle.dto.SysPushNotifyDTO; import com.ruoyi.cai.mq.handleDelay.dto.SysPushDelayDto; import com.ruoyi.cai.notice.data.NoticeMsgR; @@ -67,7 +67,7 @@ public class SysPushServiceImpl extends ServiceImpl impl @Autowired private SystemConfigManager systemConfigManager; @Autowired - private AmqpProducer amqpProducer; + private AmqpHttpProducer amqpHttpProducer; @Autowired private SysPushLogService sysPushLogService; @@ -180,7 +180,7 @@ public class SysPushServiceImpl extends ServiceImpl impl long between = CaiDateUtil.diff(sysPush.getSendTime(), LocalDateTime.now()); SysPushDelayDto dto = new SysPushDelayDto(); dto.setSysPushId(sysPush.getId()); - amqpProducer.sendCommonDelayMq(dto,(int)between+2); + amqpHttpProducer.sendCommonDelayMq(dto,(int)between+2); }catch (Exception e){ log.error("系统推送任务发送失败!",e); } @@ -210,7 +210,7 @@ public class SysPushServiceImpl extends ServiceImpl impl } SysPushNotifyDTO sysPush = new SysPushNotifyDTO(); sysPush.setSysPushId(id); - amqpProducer.sendCommonMq(sysPush); + amqpHttpProducer.sendCommonMq(sysPush); } @Override @@ -413,7 +413,7 @@ public class SysPushServiceImpl extends ServiceImpl impl if(between > 0 && between < 60*60*12){ SysPushDelayDto dto = new SysPushDelayDto(); dto.setSysPushId(sysPush.getId()); - amqpProducer.sendCommonDelayMq(dto,(int)between+5); + amqpHttpProducer.sendCommonDelayMq(dto,(int)between+5); } } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserForbidServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserForbidServiceImpl.java index f4a36ab6..e644a0a8 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserForbidServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserForbidServiceImpl.java @@ -1,6 +1,5 @@ package com.ruoyi.cai.service.impl; -import cn.dev33.satoken.stp.StpUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,18 +12,14 @@ import com.ruoyi.cai.enums.forbid.ForbidTimeEnum; import com.ruoyi.cai.enums.forbid.ForbidTypeEnum; import com.ruoyi.cai.manager.ForbidCache; import com.ruoyi.cai.mapper.UserForbidMapper; -import com.ruoyi.cai.mq.AmqpProducer; -import com.ruoyi.cai.mq.CommonDelayTypeEnum; -import com.ruoyi.cai.mq.handleDelay.CommonDelayDto; +import com.ruoyi.cai.mq.AmqpHttpProducer; import com.ruoyi.cai.mq.handleDelay.dto.ForbidDelayDto; -import com.ruoyi.cai.mq.handleDelay.dto.SysPushDelayDto; import com.ruoyi.cai.service.AnchorService; import com.ruoyi.cai.service.UserForbidService; import com.ruoyi.cai.service.UserInfoService; import com.ruoyi.cai.service.UserService; import com.ruoyi.cai.util.CaiDateUtil; import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.enums.UserType; import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; @@ -51,7 +46,7 @@ public class UserForbidServiceImpl extends ServiceImpl