权限服务mq移至消息服务

security-center/src/main/java/com/lantone/security/component/MessageReceiver.java

@@ -1,20 +1,16 @@
-package com.lantone.security.component;
+package com.lantone.message.component;
 
 import com.lantone.common.dto.AbnormalLogDTO;
-import com.lantone.common.dto.OperationLogDTO;
-import com.lantone.dblayermbg.facade.DataAuthFacade;
-import com.lantone.dblayermbg.facade.AbnormalLogFacade;
-import com.lantone.dblayermbg.facade.LoginLogFacade;
-import com.lantone.dblayermbg.facade.OperationLogFacade;
 import com.lantone.common.dto.LoginLogDTO;
+import com.lantone.common.dto.OperationLogDTO;
 import com.lantone.common.util.AddressUtils;
+import com.lantone.dblayermbg.facade.AbnormalLogFacade;
+import com.lantone.dblayermbg.facade.DataAuthFacade;
 import com.lantone.dblayermbg.facade.DictionaryInfoFacade;
 import com.lantone.dblayermbg.facade.HospitalSetFacade;
+import com.lantone.dblayermbg.facade.LoginLogFacade;
+import com.lantone.dblayermbg.facade.OperationLogFacade;
 import com.lantone.dblayermbg.facade.ResourceFacade;
-import com.lantone.security.aop.DataAuthInitAspect;
-import com.lantone.security.aop.DictionaryAspect;
-import com.lantone.security.aop.HospitalSetAspect;
-import com.lantone.security.aop.ResourceRoleRulesAspect;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
@@ -23,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * @Description: 基础信息变更导致redis需要刷新-消息的处理者
+ * @Description: 消息的处理者
  * @author: rengb
  * @time: 2021/1/5 18:27
  */
@@ -49,13 +45,13 @@ public class MessageReceiver {
 
     @RabbitListener(queues = "emrais.redis.cache.refresh.queue", ackMode = "MANUAL")
     public void RedisCacheRefreshHandle(String type, Message message, Channel channel) throws Exception {
-        if (type.equals(DictionaryAspect.class.getSimpleName())) {
+        if (type.equals(DictionaryInfoFacade.class.getSimpleName())) {
             dictionaryInfoFacade.initDicMap();
-        } else if (type.equals(HospitalSetAspect.class.getSimpleName())) {
+        } else if (type.equals(HospitalSetFacade.class.getSimpleName())) {
             hospitalSetFacade.initHospitalSetMap();
-        } else if (type.equals(ResourceRoleRulesAspect.class.getSimpleName())) {
+        } else if (type.equals(ResourceFacade.class.getSimpleName())) {
             resourceFacade.initResourceRolesMap();
-        } else if (type.equals(DataAuthInitAspect.class.getSimpleName())) {
+        } else if (type.equals(DataAuthFacade.class.getSimpleName())) {
             dataAuthFacade.initUserDataAuth();
         }
         channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
@@ -68,7 +64,6 @@ public class MessageReceiver {
         channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
     }
 
-
     @RabbitListener(queues = "emrais.oper.log.record.queue", ackMode = "MANUAL")
     public void sendOperLogRecordMessage(OperationLogDTO operationLog, Message message, Channel channel) throws Exception {
         operationLog.setOperationAddress(AddressUtils.getRealAddressByIP(operationLog.getOperationIp()));

security-center/src/main/java/com/lantone/security/component/MessageSender.java

@@ -1,9 +1,9 @@
-package com.lantone.security.component;
+package com.lantone.message.component;
 
 import com.lantone.common.dto.AbnormalLogDTO;
 import com.lantone.common.dto.LoginLogDTO;
 import com.lantone.common.dto.OperationLogDTO;
-import com.lantone.security.enums.QueueEnum;
+import com.lantone.message.enums.QueueEnum;
 import org.springframework.amqp.AmqpException;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageDeliveryMode;
@@ -65,7 +65,7 @@ public class MessageSender {
     /**
      * 用户操作异常记录日志
      */
-    public void operErrorLogRecordMessage( AbnormalLogDTO abnormalLogDTO) {
+    public void operErrorLogRecordMessage(AbnormalLogDTO abnormalLogDTO) {
         rabbitTemplate.convertAndSend(QueueEnum.QUEUE_OPER_ERROR_RECORD.getExchange(), QueueEnum.QUEUE_OPER_ERROR_RECORD.getRouteKey(), abnormalLogDTO, new MessagePostProcessor() {
             @Override
             public Message postProcessMessage(Message message) throws AmqpException {

security-center/src/main/java/com/lantone/security/config/RabbitMqConfig.java

@@ -1,6 +1,6 @@
-package com.lantone.security.config;
+package com.lantone.message.config;
 
-import com.lantone.security.enums.QueueEnum;
+import com.lantone.message.enums.QueueEnum;
 import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.BindingBuilder;
 import org.springframework.amqp.core.DirectExchange;

message-service/src/main/java/com/lantone/message/config/RedisConfig.java

@@ -0,0 +1,13 @@
+package com.lantone.message.config;
+
+import com.lantone.common.config.BaseRedisConfig;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Redis相关配置
+ * Created by macro on 2020/6/19.
+ */
+@Configuration
+public class RedisConfig extends BaseRedisConfig {
+
+}

security-center/src/main/java/com/lantone/security/enums/QueueEnum.java

@@ -1,4 +1,4 @@
-package com.lantone.security.enums;
+package com.lantone.message.enums;
 
 import lombok.Getter;
 

security-center/src/main/java/com/lantone/security/rabbitmq/ConfirmCallbackService.java

@@ -1,4 +1,4 @@
-package com.lantone.security.rabbitmq;
+package com.lantone.message.rabbitmq;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.connection.CorrelationData;

security-center/src/main/java/com/lantone/security/rabbitmq/ReturnCallbackService.java

@@ -1,4 +1,4 @@
-package com.lantone.security.rabbitmq;
+package com.lantone.message.rabbitmq;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;

message-service/src/main/java/com/lantone/message/web/RedisRefreshController.java

@@ -0,0 +1,30 @@
+package com.lantone.message.web;
+
+import com.lantone.common.api.CommonResult;
+import com.lantone.message.component.MessageSender;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description: redis刷新处理API
+ * @author: rengb
+ * @time: 2021/1/5 18:27
+ */
+@RestController
+@Api(value = "redis刷新处理API", tags = { "redis刷新处理API" })
+public class RedisRefreshController {
+
+    @Autowired
+    private MessageSender messageSender;
+
+    @ApiOperation(value = "redis刷新处理")
+    @PostMapping("/redisRefresh")
+    public CommonResult redisRefresh(String type) {
+        messageSender.sendRedisCacheRefreshMessage(type);
+        return CommonResult.success(null);
+    }
+
+}

message-service/src/main/java/com/lantone/message/web/SyslogHandleController.java

@@ -0,0 +1,48 @@
+package com.lantone.message.web;
+
+import com.lantone.common.api.CommonResult;
+import com.lantone.common.dto.AbnormalLogDTO;
+import com.lantone.common.dto.LoginLogDTO;
+import com.lantone.common.dto.OperationLogDTO;
+import com.lantone.message.component.MessageSender;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description: 系统相关日志处理API
+ * @author: rengb
+ * @time: 2021/1/5 18:27
+ */
+@RestController
+@Api(value = "系统相关日志处理API", tags = { "系统相关日志处理API" })
+public class SyslogHandleController {
+
+    @Autowired
+    private MessageSender messageSender;
+
+    @ApiOperation(value = "用户登录成功后记录日志处理")
+    @PostMapping("/loginLogHandle")
+    public CommonResult loginLogHandle(@RequestBody LoginLogDTO loginLog) {
+        messageSender.sendLogSuccessRecordMessage(loginLog);
+        return CommonResult.success(null);
+    }
+
+    @ApiOperation(value = "用户操作后记录日志处理")
+    @PostMapping("/operationLogHandle")
+    public CommonResult operationLogHandle(@RequestBody OperationLogDTO operationLog) {
+        messageSender.sendOperLogRecordMessage(operationLog);
+        return CommonResult.success(null);
+    }
+
+    @ApiOperation(value = "用户操作异常记录日志处理")
+    @PostMapping("/abnormalLogHandle")
+    public CommonResult abnormalLogHandle(@RequestBody AbnormalLogDTO abnormalLogDTO) {
+        messageSender.operErrorLogRecordMessage(abnormalLogDTO);
+        return CommonResult.success(null);
+    }
+
+}

message-service/src/main/resources/bootstrap.yml

@@ -3,6 +3,18 @@ server:
 spring:
   application:
     name: message-service
+  redis:
+    database: 12
+    host: 192.168.2.236 # Redis服务器地址
+    port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
+    password: lantone # Redis服务器连接密码（默认为空）
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
+        max-idle: 5 # 连接池中的最大空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 20000 # 连接超时时间（毫秒）
   rabbitmq:
     host: 192.168.2.236
     port: 5672

security-center/pom.xml

@@ -39,10 +39,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

security-center/src/main/java/com/lantone/security/aop/DataAuthInitAspect.java

@@ -1,6 +1,7 @@
 package com.lantone.security.aop;
 
-import com.lantone.security.component.MessageSender;
+import com.lantone.dblayermbg.facade.DataAuthFacade;
+import com.lantone.security.service.MessageService;
 import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
@@ -17,7 +18,7 @@ import org.springframework.stereotype.Component;
 public class DataAuthInitAspect {
 
     @Autowired
-    private MessageSender messageSender;
+    private MessageService messageService;
 
     @Pointcut("execution(public * com.lantone.security.web.RoleManagementController.addRole(..))" +
             "||execution(public * com.lantone.security.web.RoleManagementController.deleteRole(..))" +
@@ -41,7 +42,7 @@ public class DataAuthInitAspect {
 
     @After("basicInfoChange()")
     public void aspectAfter() {
-        messageSender.sendRedisCacheRefreshMessage(DataAuthInitAspect.class.getSimpleName());
+        messageService.redisRefresh(DataAuthFacade.class.getSimpleName());
     }
 
 }

security-center/src/main/java/com/lantone/security/aop/DictionaryAspect.java

@@ -1,6 +1,7 @@
 package com.lantone.security.aop;
 
-import com.lantone.security.component.MessageSender;
+import com.lantone.dblayermbg.facade.DictionaryInfoFacade;
+import com.lantone.security.service.MessageService;
 import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
@@ -17,7 +18,7 @@ import org.springframework.stereotype.Component;
 public class DictionaryAspect {
 
     @Autowired
-    private MessageSender messageSender;
+    private MessageService messageService;
 
     @Pointcut("execution(public * com.lantone.security.web.DictionaryManagementController.addDictionary(..))" +
             "||execution(public * com.lantone.security.web.DictionaryManagementController.updateDictionary(..))" +
@@ -27,7 +28,7 @@ public class DictionaryAspect {
 
     @After("basicInfoChange()")
     public void aspectAfter() {
-        messageSender.sendRedisCacheRefreshMessage(DictionaryAspect.class.getSimpleName());
+        messageService.redisRefresh(DictionaryInfoFacade.class.getSimpleName());
     }
 
 }

security-center/src/main/java/com/lantone/security/aop/HospitalSetAspect.java

@@ -1,6 +1,7 @@
 package com.lantone.security.aop;
 
-import com.lantone.security.component.MessageSender;
+import com.lantone.dblayermbg.facade.HospitalSetFacade;
+import com.lantone.security.service.MessageService;
 import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
@@ -17,7 +18,7 @@ import org.springframework.stereotype.Component;
 public class HospitalSetAspect {
 
     @Autowired
-    private MessageSender messageSender;
+    private MessageService messageService;
 
     @Pointcut("execution(public * com.lantone.security.web.HospitalSetManagementController.addHospitalSet(..))" +
             "||execution(public * com.lantone.security.web.HospitalSetManagementController.updateHospitalSet(..))" +
@@ -27,7 +28,7 @@ public class HospitalSetAspect {
 
     @After("basicInfoChange()")
     public void aspectAfter() {
-        messageSender.sendRedisCacheRefreshMessage(HospitalSetAspect.class.getSimpleName());
+        messageService.redisRefresh(HospitalSetFacade.class.getSimpleName());
     }
 
 }

security-center/src/main/java/com/lantone/security/aop/LogAspect.java

@@ -7,7 +7,7 @@ import com.lantone.common.dto.AbnormalLogDTO;
 import com.lantone.common.dto.OperationLogDTO;
 import com.lantone.common.util.HttpUtils;
 import com.lantone.common.util.SysUserUtils;
-import com.lantone.security.component.MessageSender;
+import com.lantone.security.service.MessageService;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.JoinPoint;
@@ -18,8 +18,10 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+
 import java.util.Date;
 import java.util.Map;
+
 /**
  * @Description:日志记录处理
  * @Author: cy
@@ -30,7 +32,7 @@ import java.util.Map;
 @Component
 public class LogAspect {
     @Autowired
-    private MessageSender messageSender;
+    private MessageService messageService;
 
     // 操作配置织入点
     @Pointcut("execution(public * com.lantone.security.web.RegionManagementController.*(..))")
@@ -81,7 +83,7 @@ public class LogAspect {
                 e.printStackTrace();
             }
         }
-        messageSender.sendOperLogRecordMessage(operationLog);
+        messageService.operationLogHandle(operationLog);
     }
 
 
@@ -95,10 +97,10 @@ public class LogAspect {
     protected void errorLog(JoinPoint joinPoint, Exception e) {
         AbnormalLogDTO abnormalLogDTO = new AbnormalLogDTO();
         OperationLogDTO operationLog = multiplexing(joinPoint);
-        BeanUtils.copyProperties(operationLog,abnormalLogDTO);
+        BeanUtils.copyProperties(operationLog, abnormalLogDTO);
         abnormalLogDTO.setOperationAgent(HttpUtils.getHttpServletRequest().getHeader("User-Agent"));
         abnormalLogDTO.setOperationErrorInfo(StringUtils.substring(e.toString(), 0, 1000));
-        messageSender.operErrorLogRecordMessage(abnormalLogDTO);
+        messageService.abnormalLogHandle(abnormalLogDTO);
     }
 
     /**
@@ -108,7 +110,7 @@ public class LogAspect {
      * @Author: cy
      * @Date: 2021/9/5
      */
-    public OperationLogDTO multiplexing(JoinPoint joinPoint){
+    public OperationLogDTO multiplexing(JoinPoint joinPoint) {
         OperationLogDTO operationLog = new OperationLogDTO();
         Date date = new Date();
         operationLog.setOperationDate(date);

security-center/src/main/java/com/lantone/security/aop/ResourceRoleRulesAspect.java

@@ -1,6 +1,7 @@
 package com.lantone.security.aop;
 
-import com.lantone.security.component.MessageSender;
+import com.lantone.dblayermbg.facade.ResourceFacade;
+import com.lantone.security.service.MessageService;
 import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
@@ -17,7 +18,7 @@ import org.springframework.stereotype.Component;
 public class ResourceRoleRulesAspect {
 
     @Autowired
-    private MessageSender messageSender;
+    private MessageService messageService;
 
     @Pointcut("execution(public * com.lantone.security.web.RoleManagementController.addRole(..))" +
             "||execution(public * com.lantone.security.web.RoleManagementController.deleteRole(..))" +
@@ -37,7 +38,7 @@ public class ResourceRoleRulesAspect {
 
     @After("basicInfoChange()")
     public void aspectAfter() {
-        messageSender.sendRedisCacheRefreshMessage(ResourceRoleRulesAspect.class.getSimpleName());
+        messageService.redisRefresh(ResourceFacade.class.getSimpleName());
     }
 
 }

security-center/src/main/java/com/lantone/security/facade/UserManagementFacade.java

@@ -55,12 +55,12 @@ import com.lantone.dblayermbg.facade.MedoupDoctorFacade;
 import com.lantone.dblayermbg.facade.RoleFacade;
 import com.lantone.dblayermbg.facade.UserFacade;
 import com.lantone.dblayermbg.facade.UserRoleFacade;
-import com.lantone.security.component.MessageSender;
 import com.lantone.security.enums.DictionaryEnum;
 import com.lantone.security.enums.HospitalTypeEnum;
 import com.lantone.security.enums.RelationEnum;
 import com.lantone.security.enums.ReturnTypeEnum;
 import com.lantone.security.service.AuthService;
+import com.lantone.security.service.MessageService;
 import eu.bitwalker.useragentutils.UserAgent;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -109,7 +109,7 @@ public class UserManagementFacade {
     @Autowired
     private DictionaryInfoFacade dictionaryInfoFacade;
     @Autowired
-    private MessageSender messageSender;
+    private MessageService messageService;
 
     public CommonResult login(LoginVO loginVO) {
         Map<String, String> params = new HashMap<>();
@@ -224,7 +224,7 @@ public class UserManagementFacade {
         //3.校验插入用户所属组织是否正常
         checkHospitals(hospitals);
         //4.校验插入用户角色是否正常
-//        checkRoles(roles);(目前角色校验有问题通过id查不到角色）
+        //        checkRoles(roles);(目前角色校验有问题通过id查不到角色）
         //5.用户如果没有医疗组、科室 绑定角色不能选择本医疗组、全部科室除本科室外、本科室数据权限角色
         //科室
         userDeptCheck(roles, deptFlag);
@@ -804,7 +804,7 @@ public class UserManagementFacade {
      */
     public void sendLogRecordMessage(CommonResult commonResult) {
         Object data = commonResult.getData();
-        if(null != data){
+        if (null != data) {
             Map<String, Object> map = JSONObject.parseObject(JSON.toJSONString(data));
             if (map.containsKey("token") && null != map.get("token")) {
                 LoginLogDTO loginLog = new LoginLogDTO();
@@ -820,8 +820,9 @@ public class UserManagementFacade {
                 // 获取客户端浏览器
                 String browser = userAgent.getBrowser().getName();
                 loginLog.setLoginBrowser(browser);
-                messageSender.sendLogSuccessRecordMessage(loginLog);
+                messageService.loginLogHandle(loginLog);
             }
         }
     }
+
 }

security-center/src/main/java/com/lantone/security/service/AuthService.java

@@ -15,7 +15,7 @@ import java.util.Map;
 @FeignClient("user-auth")
 public interface AuthService {
 
-    @PostMapping(value = "/oauth/token")
+    @PostMapping("/oauth/token")
     CommonResult getAccessToken(@RequestParam Map<String, String> parameters);
 
 }

security-center/src/main/java/com/lantone/security/service/MessageService.java

@@ -0,0 +1,30 @@
+package com.lantone.security.service;
+
+import com.lantone.common.api.CommonResult;
+import com.lantone.common.dto.AbnormalLogDTO;
+import com.lantone.common.dto.LoginLogDTO;
+import com.lantone.common.dto.OperationLogDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * @Description: 消息服务远程调用
+ * @author: rengb
+ * @time: 2021/1/5 18:27
+ */
+@FeignClient("message-service")
+public interface MessageService {
+
+    @PostMapping("/redisRefresh")
+    CommonResult redisRefresh(String type);
+
+    @PostMapping("/loginLogHandle")
+    CommonResult loginLogHandle(LoginLogDTO loginLog);
+
+    @PostMapping("/operationLogHandle")
+    CommonResult operationLogHandle(OperationLogDTO operationLog);
+
+    @PostMapping("/abnormalLogHandle")
+    CommonResult abnormalLogHandle(AbnormalLogDTO abnormalLogDTO);
+
+}

security-center/src/main/resources/bootstrap.yml

@@ -16,39 +16,6 @@ spring:
         max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
         min-idle: 0 # 连接池中的最小空闲连接
     timeout: 20000 # 连接超时时间（毫秒）
-  rabbitmq:
-    host: 192.168.2.236
-    port: 5672
-    username: rengb
-    password: 123456
-    virtual-host: /emrais # 虚拟host
-    publisher-confirm-type: correlated # 确认消息已发送到交换机(Exchange)  发送确认
-    publisher-returns: true # 确认消息已发送到队列(Queue)  发送回调
-    connection-timeout: 4000
-    template:
-      mandatory: true # 当exchange无法找到任何一个合适的queue时，将消息return给生产者
-      receive-timeout: 30000 # 消费端接收的响应时间
-      reply-timeout: 30000 # 发送端等待接收消费端给出return msg的时间，相当于在message同步时，发送并消费成功的时间
-      retry:
-        enabled: true
-        max-attempts: 6 # 最大重试次数
-        initial-interval: 2000 # 重试初始间隔时间
-        multiplier: 2 # 间隔时间乘子，间隔时间*乘子=下一次的间隔时间，最大不能超过设置的最大间隔时间
-        max-interval: 64000 # 最大重试时间间隔
-    listener:
-      simple:
-        acknowledge-mode: auto # 自动确认
-        auto-startup: true # 是否启动时自动启动容器
-        concurrency: 1 # 最小的消费者数量
-        max-concurrency: 5 # 最大的消费者数量
-        default-requeue-rejected: true # 投递失败时是否重新排队；默认是true（与参数acknowledge-mode有关系）
-        retry:
-          enabled: true
-          max-attempts: 6
-          initial-interval: 2000
-          multiplier: 2
-          max-interval: 64000
-          stateless: true # 不论重试是有状态的还是无状态的
 
 eureka:
   client: