数据库拆分

dblayer-mbg/src/main/java/com/lantone/dblayermbg/config/DruidConfig.java

@@ -1,22 +1,10 @@
 package com.lantone.dblayermbg.config;
 
-import com.alibaba.druid.pool.DruidDataSource;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionTemplate;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-import javax.sql.DataSource;
-
 /**
  * @Description:
  * @author: rengb
@@ -24,7 +12,6 @@ import javax.sql.DataSource;
  */
 @EnableTransactionManagement
 @Configuration
-@MapperScan(basePackages = "com.lantone.dblayermbg.mapper")
 public class DruidConfig {
 
     /**

dblayer-mbg/src/main/resources/application-local.yml

@@ -3,9 +3,6 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.237:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
       # 连接池的配置信息
       # 初始化大小，最小，最大
       initialSize: 5

dblayer-mbg/src/main/resources/application.yml

@@ -7,7 +7,6 @@ spring:
 
 mybatis-plus:
   mapper-locations: classpath*:/mapper/**/*Mapper.xml
-  type-aliases-package: com.lantone.dblayermbg.entity
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     map-underscore-to-camel-case: true

dblayer-mbg/src/main/resources/mapper/RoleSoftwareMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.RoleSoftwareMapper">
-
-</mapper>

dblayer-mbg/src/main/resources/mapper/RoleSoftwareResourceMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.RoleSoftwareResourceMapper">
-
-</mapper>

dblayer-mbg/src/main/resources/mapper/SoftwareResourceMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lantone.dblayermbg.mapper.SoftwareResourceMapper">
-
-</mapper>

message-service/pom.xml

@@ -39,6 +39,15 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-okhttp</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

message-service/src/main/java/com/lantone/message/client/SecurityService.java

@@ -0,0 +1,39 @@
+package com.lantone.message.client;
+
+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("security-center")
+public interface SecurityService {
+
+    @PostMapping("/logManage/addLoginLog")
+    CommonResult addLoginLog(LoginLogDTO loginLog);
+
+    @PostMapping("/logManage/addOperLog")
+    CommonResult addOperLog(OperationLogDTO operationLog);
+
+    @PostMapping("/logManage/addOperErrorLog")
+    CommonResult addOperErrorLog(AbnormalLogDTO abnormalLogDTO);
+
+    @PostMapping("/dictionaryManage/initDicMap")
+    CommonResult initDicMap();
+
+    @PostMapping("/hospitalSetManage/initHospitalSetMap")
+    CommonResult initHospitalSetMap();
+
+    @PostMapping("/funcManage/initResourceRolesMap")
+    CommonResult initResourceRolesMap();
+
+    @PostMapping("/dataAuthManage/initUserDataAuth")
+    CommonResult initUserDataAuth();
+
+}

message-service/src/main/java/com/lantone/message/component/MessageReceiver.java

@@ -4,13 +4,7 @@ import com.lantone.common.dto.AbnormalLogDTO;
 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.message.client.SecurityService;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
@@ -28,31 +22,19 @@ import org.springframework.stereotype.Component;
 public class MessageReceiver {
 
     @Autowired
-    private DictionaryInfoFacade dictionaryInfoFacade;
-    @Autowired
-    private HospitalSetFacade hospitalSetFacade;
-    @Autowired
-    private ResourceFacade resourceFacade;
-    @Autowired
-    private LoginLogFacade loginLogFacade;
-    @Autowired
-    private OperationLogFacade operationLogFacade;
-    @Autowired
-    private AbnormalLogFacade abnormalLogFacade;
-    @Autowired
-    private DataAuthFacade dataAuthFacade;
+    private SecurityService securityService;
 
 
     @RabbitListener(queues = "emrais.redis.cache.refresh.queue", ackMode = "MANUAL")
     public void RedisCacheRefreshHandle(String type, Message message, Channel channel) throws Exception {
-        if (type.equals(DictionaryInfoFacade.class.getSimpleName())) {
-            dictionaryInfoFacade.initDicMap();
-        } else if (type.equals(HospitalSetFacade.class.getSimpleName())) {
-            hospitalSetFacade.initHospitalSetMap();
-        } else if (type.equals(ResourceFacade.class.getSimpleName())) {
-            resourceFacade.initResourceRolesMap();
-        } else if (type.equals(DataAuthFacade.class.getSimpleName())) {
-            dataAuthFacade.initUserDataAuth();
+        if (type.equals("initDicMap")) {
+            securityService.initDicMap();
+        } else if (type.equals("initHospitalSetMap")) {
+            securityService.initHospitalSetMap();
+        } else if (type.equals("initResourceRolesMap")) {
+            securityService.initResourceRolesMap();
+        } else if (type.equals("initUserDataAuth")) {
+            securityService.initUserDataAuth();
         }
         channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
     }
@@ -60,20 +42,20 @@ public class MessageReceiver {
     @RabbitListener(queues = "emrais.login.success.record.queue", ackMode = "MANUAL")
     public void sendLogSuccessMessageHandle(LoginLogDTO loginLog, Message message, Channel channel) throws Exception {
         loginLog.setLoginAddress(AddressUtils.getRealAddressByIP(loginLog.getLoginIp()));
-        loginLogFacade.getBaseMapper().addLoginLog(loginLog);
+        securityService.addLoginLog(loginLog);
         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()));
-        operationLogFacade.getBaseMapper().addOperLog(operationLog);
+        securityService.addOperLog(operationLog);
         channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
     }
 
     @RabbitListener(queues = "emrais.oper.error.record.queue", ackMode = "MANUAL")
     public void sendOperErrorRecordMessage(AbnormalLogDTO abnormalLogDTO, Message message, Channel channel) throws Exception {
-        abnormalLogFacade.getBaseMapper().addOperErrorLog(abnormalLogDTO);
+        securityService.addOperErrorLog(abnormalLogDTO);
         channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
     }
 

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

@@ -35,6 +35,14 @@ management:
     health:
       show-details: always
 
+feign:
+  okhttp:
+    enabled: true
+
+ribbon:
+  ConnectTimeout: 3000 # 服务请求连接超时时间（毫秒）
+  ReadTimeout: 3000 # 服务请求处理超时时间（毫秒）
+
 swagger.title: 消息管理服务
 swagger.des: 消息管理服务
 swagger.version: 0.0.1-SNAPSHOT

security-center/src/main/java/com/lantone/SecurityCenterApplication.java

@@ -1,5 +1,6 @@
 package com.lantone;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
@@ -8,6 +9,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @EnableEurekaClient
 @EnableFeignClients
 @SpringBootApplication
+@MapperScan(basePackages = "com.lantone.security.mapper")
 public class SecurityCenterApplication {
 
     public static void main(String[] args) {

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

@@ -1,7 +1,6 @@
 package com.lantone.security.aop;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.google.common.collect.Lists;
 import com.lantone.common.constant.AuthConstant;
 import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.common.exception.Asserts;
@@ -10,8 +9,8 @@ import com.lantone.common.util.ListUtil;
 import com.lantone.common.util.SysUserUtils;
 import com.lantone.common.vo.base.BasePageVo;
 import com.lantone.common.vo.base.BaseVo;
-import com.lantone.dblayermbg.entity.UserRole;
-import com.lantone.dblayermbg.facade.UserRoleFacade;
+import com.lantone.security.entity.UserRole;
+import com.lantone.security.facade.base.UserRoleFacade;
 import com.lantone.security.annotation.DataAuthFilter;
 import org.apache.commons.lang.StringUtils;
 import org.aspectj.lang.JoinPoint;

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

@@ -1,7 +1,7 @@
 package com.lantone.security.aop;
 
-import com.lantone.dblayermbg.facade.DataAuthFacade;
-import com.lantone.security.service.MessageService;
+import com.lantone.security.facade.base.DataAuthFacade;
+import com.lantone.security.client.MessageService;
 import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
@@ -42,7 +42,7 @@ public class DataAuthInitAspect {
 
     @After("basicInfoChange()")
     public void aspectAfter() {
-        messageService.redisRefresh(DataAuthFacade.class.getSimpleName());
+        messageService.redisRefresh("initUserDataAuth");
     }
 
 }

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

@@ -1,7 +1,7 @@
 package com.lantone.security.aop;
 
-import com.lantone.dblayermbg.facade.DictionaryInfoFacade;
-import com.lantone.security.service.MessageService;
+import com.lantone.security.facade.base.DictionaryInfoFacade;
+import com.lantone.security.client.MessageService;
 import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
@@ -28,7 +28,7 @@ public class DictionaryAspect {
 
     @After("basicInfoChange()")
     public void aspectAfter() {
-        messageService.redisRefresh(DictionaryInfoFacade.class.getSimpleName());
+        messageService.redisRefresh("initDicMap");
     }
 
 }

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

@@ -1,7 +1,7 @@
 package com.lantone.security.aop;
 
-import com.lantone.dblayermbg.facade.HospitalSetFacade;
-import com.lantone.security.service.MessageService;
+import com.lantone.security.facade.base.HospitalSetFacade;
+import com.lantone.security.client.MessageService;
 import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
@@ -28,7 +28,7 @@ public class HospitalSetAspect {
 
     @After("basicInfoChange()")
     public void aspectAfter() {
-        messageService.redisRefresh(HospitalSetFacade.class.getSimpleName());
+        messageService.redisRefresh("initHospitalSetMap");
     }
 
 }

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

@@ -8,7 +8,7 @@ import com.lantone.common.dto.OperationLogDTO;
 import com.lantone.common.util.HttpUtils;
 import com.lantone.common.util.IpUtils;
 import com.lantone.common.util.SysUserUtils;
-import com.lantone.security.service.MessageService;
+import com.lantone.security.client.MessageService;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.JoinPoint;

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

@@ -1,7 +1,7 @@
 package com.lantone.security.aop;
 
-import com.lantone.dblayermbg.facade.ResourceFacade;
-import com.lantone.security.service.MessageService;
+import com.lantone.security.facade.base.ResourceFacade;
+import com.lantone.security.client.MessageService;
 import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
@@ -38,7 +38,7 @@ public class ResourceRoleRulesAspect {
 
     @After("basicInfoChange()")
     public void aspectAfter() {
-        messageService.redisRefresh(ResourceFacade.class.getSimpleName());
+        messageService.redisRefresh("initResourceRolesMap");
     }
 
 }

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

@@ -1,4 +1,4 @@
-package com.lantone.security.service;
+package com.lantone.security.client;
 
 import com.lantone.common.api.CommonResult;
 import org.springframework.cloud.openfeign.FeignClient;

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

@@ -1,4 +1,4 @@
-package com.lantone.security.service;
+package com.lantone.security.client;
 
 import com.lantone.common.api.CommonResult;
 import com.lantone.common.dto.AbnormalLogDTO;

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

@@ -1,6 +1,6 @@
 package com.lantone.security.component;
 
-import com.lantone.dblayermbg.facade.DictionaryInfoFacade;
+import com.lantone.security.facade.base.DictionaryInfoFacade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

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

@@ -1,6 +1,6 @@
 package com.lantone.security.component;
 
-import com.lantone.dblayermbg.facade.HospitalSetFacade;
+import com.lantone.security.facade.base.HospitalSetFacade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

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

@@ -1,7 +1,6 @@
 package com.lantone.security.component;
 
-import com.lantone.dblayermbg.facade.DataAuthFacade;
-import com.lantone.dblayermbg.facade.ResourceFacade;
+import com.lantone.security.facade.base.ResourceFacade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -17,18 +16,13 @@ public class ResourceRoleRulesHolder {
 
     @Autowired
     private ResourceFacade resourceFacade;
-    @Autowired
-    private DataAuthFacade dataAuthFacade;
 
     /**
-     * 预加载所有权限
+     * 预加载所有资源与角色访问对应关系
      */
     @PostConstruct
     public void initResourceRolesMap() {
-        //预加载功能权限
         resourceFacade.initResourceRolesMap();
-        //预加载数据权限
-        dataAuthFacade.initUserDataAuth();
     }
 
 }

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

@@ -0,0 +1,28 @@
+package com.lantone.security.component;
+
+import com.lantone.security.facade.base.DataAuthFacade;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * @Description: 用户的数据权限操作组件
+ * @author: rengb
+ * @time: 2021/1/5 18:27
+ */
+@Component
+public class UserDataAuthHolder {
+
+    @Autowired
+    private DataAuthFacade dataAuthFacade;
+
+    /**
+     * 预加载所有用户的数据权限
+     */
+    @PostConstruct
+    public void initUserDataAuth() {
+        dataAuthFacade.initUserDataAuth();
+    }
+
+}

common/src/main/java/com/lantone/common/dto/DataAuthDetailDTO.java

@@ -1,10 +1,9 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 /**

common/src/main/java/com/lantone/common/dto/DeptDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/DownBoxRegionDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetCreateRoleDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetDataAuthByIdDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetDataAuthDeptDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetDataAuthDetailDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetDataAuthDoctorDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetDataAuthHospitalDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetDataAuthPageDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetDataAuthRoleDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetDataAuthSoftwareDTO.java

@@ -1,10 +1,9 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 /**

common/src/main/java/com/lantone/common/dto/GetDeptInfoDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetDeptTreeDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetDictionaryInfoByTypeDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/com/lantone/common/dto/GetDoctorPageDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetHospitalByIdDTO.java

@@ -1,15 +1,10 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
-import com.lantone.common.vo.AddHospitalUserVO;
-import com.lantone.common.vo.AddRoleSoftwareVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * <p>

common/src/main/java/com/lantone/common/dto/GetHospitalDeptDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetHospitalListInfoDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetHospitalTreeDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetHospitalUserDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetHospitalUserPageDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetMenuByIdDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/com/lantone/common/dto/GetMenusTreeDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetMyNoticeListDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetNoticeInfoByIdDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetRealHospitalDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetRoleDTO.java

@@ -1,12 +1,10 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import sun.util.resources.ga.LocaleNames_ga;
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 角色输出对象

common/src/main/java/com/lantone/common/dto/GetRolePageDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetSoftwareMenuDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetUserDTO.java

@@ -1,6 +1,5 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
-import com.lantone.common.vo.AddHospitalTreeVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

common/src/main/java/com/lantone/common/dto/GetUserHospitalDeptDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetUserHospitalsDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetUserPageDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/GetUserShowTreeDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/HospitalDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/ListManagePageDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/MenuDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/com/lantone/common/dto/MenuInfoDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 
 

common/src/main/java/com/lantone/common/dto/RoleDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/SoftwareDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/SoftwareDataAuthDetail.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/SoftwareMenuDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/SoftwareMenuRelationDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/SysRegionDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/UserInfoDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/UserMenuResourceTreeDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/UserPermissionDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/UserRoleDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/UserSoftwareHospitalDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

common/src/main/java/com/lantone/common/dto/ViewRegionDTO.java

@@ -1,4 +1,4 @@
-package com.lantone.common.dto;
+package com.lantone.security.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/AbnormalLog.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DataAuth.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DataAuthDetail.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Dept.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DeptDoctor.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DeptMedoup.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DeptUser.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DictionaryInfo.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Doctor.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Hospital.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/HospitalSet.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/HospitalUser.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/LoginLog.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Medoup.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/MedoupDoctor.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Menu.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/MenuResource.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Notice.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/NoticeUser.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/OperationLog.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Region.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RegionDept.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Resource.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Role.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RoleSoftware.java

@@ -1,4 +1,4 @@
-package com.lantone.dblayermbg.entity;
+package com.lantone.security.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;