Merge remote-tracking branch 'origin/dev/20210625_v3.1_权限' into dev/20210917_v3.2_老版本功能迁移

# Conflicts:
#	config-center/src/main/resources/shared/gateway-service-debug.yml
#	dblayer-mbg/src/main/java/com/lantone/dblayermbg/config/DruidConfig.java
#	dblayer-mbg/src/main/resources/application-debug.yml
#	dblayer-mbg/src/main/resources/application-inner.yml
#	dblayer-mbg/src/main/resources/application-local.yml
#	dblayer-mbg/src/main/resources/application-outer.yml
#	dblayer-mbg/src/main/resources/application-test.yml
#	dblayer-mbg/src/test/java/com/lantone/dblayermbg/CodeAutoGenerator.java
#	dblayer-mbg/src/test/java/com/lantone/dblayermbg/GeneratorUtil.java
#	security-center/src/main/java/com/lantone/security/mapper/DeptMapper.java
#	security-center/src/main/java/com/lantone/security/service/impl/DeptServiceImpl.java

common/pom.xml

@@ -12,6 +12,7 @@
     <artifactId>common</artifactId>
     <name>common</name>
     <packaging>jar</packaging>
+    <description>工具类及通用代码模块</description>
 
     <dependencies>
         <dependency>
@@ -93,15 +94,10 @@
             <groupId>com.nimbusds</groupId>
             <artifactId>nimbus-jose-jwt</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
-            <version>0.9.1</version>
-        </dependency>
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
-            <version>3.4.0</version>
+            <version>${java-jwt.version}</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>

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

@@ -1,51 +0,0 @@
-package com.lantone.common.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @Description: 科室返回对象
- * @Author songxl
- * @Date 2021/7/22
- */
-@Data
-public class DeptDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-
-    @ApiModelProperty(value = "医院ID")
-    private Long hospitalId;
-
-    @ApiModelProperty(value = "医院科室编码")
-    private String code;
-
-    @ApiModelProperty(value = "科室名称")
-    private String name;
-
-    @ApiModelProperty(value = "类别")
-    private String type;
-
-    @ApiModelProperty(value = "首字母拼音")
-    private String spell;
-
-    @ApiModelProperty(value = "区域类别")
-    private String station;
-
-    @ApiModelProperty(value = "排序")
-    private String orderNo;
-
-    @ApiModelProperty(value = "创建用户编号")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
-    private String isDeleted;
-    @ApiModelProperty(value = "关联标志位 1 关联")
-    private String relation = "0";
-}

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

@@ -1,36 +0,0 @@
-package com.lantone.common.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * <p>
- * 医院科室信息对象
- * </p>
- */
-@Data
-public class GetHospitalDeptDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "编号")
-    private Long hospitalId;
-
-    private Long parentId;
-
-
-    @ApiModelProperty(value = "名称")
-    private String hospitalName;
-
-    @ApiModelProperty(value = "组织类型（0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院）")
-    private String type;
-
-    @ApiModelProperty(value = "科室编号")
-    private Long deptId;
-    @ApiModelProperty(value = "科室名称")
-    private String deptName;
-    @ApiModelProperty(value = "是否关联")
-    private String relation;
-}

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

@@ -1,23 +0,0 @@
-package com.lantone.common.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 系统服务菜单返回对象
- */
-@Data
-public class GetSoftwareMenuDTO {
-    @ApiModelProperty(value = "编号")
-    private Long softwareId;
-
-    @ApiModelProperty(value = "服务名称")
-    private String softwareName;
-    @ApiModelProperty(value = "已关联或未关联")
-    private String softwareRelation;
-
-    @ApiModelProperty(value = "服务菜单列表")
-    private List<SoftwareMenuRelationDTO> menus;
-}

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

@@ -1,64 +0,0 @@
-package com.lantone.common.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 用户组织对象
- * </p>
- */
-@Data
-public class HospitalDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "编号")
-    private Long id;
-
-    private Long parentId;
-
-    @ApiModelProperty(value = "医院编码")
-    private String orgCode;
-
-    @ApiModelProperty(value = "父级编码")
-    private String parentCode;
-
-    @ApiModelProperty(value = "名称")
-    private String name;
-
-    @ApiModelProperty(value = "归属区域")
-    private String region;
-
-    @ApiModelProperty(value = "组织类型（0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院）")
-    private String type;
-
-    @ApiModelProperty(value = "排序")
-    private String orderNo;
-
-    @ApiModelProperty(value = "状态 0:禁用，1：启用")
-    private String status;
-
-    @ApiModelProperty(value = "创建者编号")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
-    private String isDeleted;
-
-
-    @ApiModelProperty(value = "用户在该组织下的角色列表")
-    private List<RoleDTO> roles;
-    @ApiModelProperty(value = "该医院的科室列表")
-    private List<DeptDTO> depts;
-
-    @ApiModelProperty(value = "该虚拟医院的医院列表")
-    private List<HospitalDTO> hospitalDTOS;
-    @ApiModelProperty(value = "关联标志位 1 关联")
-    private String relation = "0";
-}

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

@@ -1,98 +0,0 @@
-package com.lantone.common.dto;
-
-
-
-
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @ClassName: MenuDTO
- * @Description: 用户菜单对象
- * @Author songxl
- * @Date 2021/7/19
- * @Version 1.0
- */
-@Data
-public class MenuInfoDTO {
-    /**
-     * 编号
-     */
-    private Long id;
-
-    /**
-     * 父级编号
-     */
-    private Long parentId;
-
-    /**
-     * 系统id
-     */
-    private Long systemId;
-
-    /**
-     * 功能名称
-     */
-    private String name;
-
-    /**
-     * 类型：0:目录，1菜单，2按钮，3：功能
-     */
-    private String type;
-
-    /**
-     * 页面路由
-     */
-    private String url;
-
-    /**
-     * 权限标识
-     */
-    private String permission;
-
-    /**
-     * 图标
-     */
-    private String icon;
-
-    /**
-     * 排序
-     */
-    private String orderNo;
-
-    /**
-     * 状态 0:禁用，1：启用
-     */
-    private String status;
-
-    /**
-     * 描述
-     */
-    private String describe;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 创建用户编号
-     */
-    private Long creator;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private List<MenuInfoDTO> children;
-}

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

@@ -1,31 +0,0 @@
-package com.lantone.common.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 系统服务菜单关联关系对象
- */
-@Data
-public class SoftwareMenuRelationDTO {
-    @ApiModelProperty(value = "编号")
-    private Long softwareId;
-
-    @ApiModelProperty(value = "服务名称")
-    private String softwareName;
-
-    @ApiModelProperty(value = "编号")
-    private Long menuId;
-    @ApiModelProperty(value = "父级编号")
-    private Long parentId;
-
-    @ApiModelProperty(value = "功能名称")
-    private String menuName;
-
-    @ApiModelProperty(value = "菜单已关联或未关联")
-    private String menuRelation;
-    @ApiModelProperty(value = "子系统服务菜单关联关系对象")
-    private  List<SoftwareMenuRelationDTO> children;
-}

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

@@ -1,67 +0,0 @@
-package com.lantone.common.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * <p>
- * 病区表
- * </p>
- */
-@Data
-public class SysRegionDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-
-    @ApiModelProperty(value = "医院ID")
-    private Long hospitalId;
-
-    @ApiModelProperty(value = "医院名称")
-    @NotBlank
-    private String hospitalName;
-
-    @ApiModelProperty(value = "联系人")
-    @NotBlank
-    private String liaison;
-
-    @ApiModelProperty(value = "手机号码")
-    @NotBlank
-    private String phoneNumber;
-
-    @ApiModelProperty(value = "病区编码")
-    private String code;
-
-    @ApiModelProperty(value = "病区名称")
-    @NotBlank
-    private String name;
-
-    @ApiModelProperty(value = "首字母拼音")
-    private String spell;
-
-    @ApiModelProperty(value = "区域类别")
-    @NotBlank
-    private String station;
-
-    @ApiModelProperty(value = "排序")
-    private String orderNo;
-
-    @ApiModelProperty(value = "关联科室id")
-    private List<Long> deptIds;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "0-否 1-是")
-    private Integer status;
-
-    @ApiModelProperty(value = "0-非禁用校验标识 1-禁用校验标识 2-禁用此病区")
-    private Integer mark = 0;
-
-
-}

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

@@ -1,24 +0,0 @@
-package com.lantone.common.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 菜单功能DTO
- * </p>
- */
-@Data
-public class UserPermissionDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "编号")
-    private Long id;
-
-    @ApiModelProperty(value = "资源权限")
-    private String permission;
-
-}

common/src/main/java/com/lantone/common/vo/RoleSoftwareMenuVo.java

@@ -1,28 +0,0 @@
-package com.lantone.common.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * <p>
- * 角色系统功能菜单VO
- * </p>
- */
-@Data
-public class RoleSoftwareMenuVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "角色id列表")
-    private List<Long> roles;
-
-    @ApiModelProperty(value = "服务id")
-    private Long softwareId;
-
-
-
-}

common/src/main/java/com/lantone/common/vo/UserLoginVO.java

@@ -1,22 +0,0 @@
-package com.lantone.common.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * @Description: 登录参数
- * @Author: ztg
- * @Date: 2018/9/28 13:14
- */
-@Getter
-@Setter
-public class UserLoginVO {
-
-    @NotBlank(message = "请输入用户名!")
-    private String username;
-    @NotBlank(message = "请输入密码!")
-    private String password;
-
-}

config-center/pom.xml

@@ -12,6 +12,7 @@
     <artifactId>config-center</artifactId>
     <name>config-center</name>
     <packaging>jar</packaging>
+    <description>基于Spring Cloud Config的微服务配置中心</description>
 
     <dependencies>
         <dependency>

config-center/src/main/resources/shared/gateway-service-debug.yml

@@ -1,15 +1,8 @@
 spring:
   redis:
-    database: 8
-    host: 192.168.2.126 # 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 # 连接超时时间（毫秒）
+    database: 12
+    host: 192.168.2.237 # Redis服务器地址
+    port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
+    password: emrais # Redis服务器连接密码（默认为空）
 
 swagger.show: true

config-center/src/main/resources/shared/gateway-service-inner.yml

@@ -4,12 +4,5 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
 
 swagger.show: false

config-center/src/main/resources/shared/gateway-service-local.yml

@@ -4,12 +4,5 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
 
 swagger.show: true

config-center/src/main/resources/shared/gateway-service-outer.yml

@@ -4,12 +4,5 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
 
 swagger.show: false

config-center/src/main/resources/shared/gateway-service-test.yml

@@ -4,12 +4,5 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
 
 swagger.show: true

config-center/src/main/resources/shared/message-service-debug.yml

@@ -4,46 +4,12 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
   rabbitmq:
     host: 192.168.2.237
     port: 5672
     username: emrais
     password: emrais
     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 # 不论重试是有状态的还是无状态的
 
 rabbitmq:
   mqtt:

config-center/src/main/resources/shared/message-service-inner.yml

@@ -4,46 +4,12 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
   rabbitmq:
     host: 192.168.2.237
     port: 5672
     username: emrais
     password: emrais
     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 # 不论重试是有状态的还是无状态的
 
 rabbitmq:
   mqtt:

config-center/src/main/resources/shared/message-service-local.yml

@@ -4,46 +4,12 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
   rabbitmq:
     host: 192.168.2.237
     port: 5672
     username: emrais
     password: emrais
     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 # 不论重试是有状态的还是无状态的
 
 rabbitmq:
   mqtt:

config-center/src/main/resources/shared/message-service-outer.yml

@@ -4,46 +4,12 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
   rabbitmq:
     host: 192.168.2.237
     port: 5672
     username: emrais
     password: emrais
     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 # 不论重试是有状态的还是无状态的
 
 rabbitmq:
   mqtt:

config-center/src/main/resources/shared/message-service-test.yml

@@ -4,46 +4,12 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
   rabbitmq:
     host: 192.168.2.237
     port: 5672
     username: emrais
     password: emrais
     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 # 不论重试是有状态的还是无状态的
 
 rabbitmq:
   mqtt:

config-center/src/main/resources/shared/security-center-debug.yml

@@ -4,12 +4,10 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
+  datasource:
+    druid:
+      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
 
 swagger.show: true

config-center/src/main/resources/shared/security-center-inner.yml

@@ -4,12 +4,10 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
+  datasource:
+    druid:
+      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
 
 swagger.show: false

config-center/src/main/resources/shared/security-center-local.yml

@@ -4,12 +4,10 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
+  datasource:
+    druid:
+      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
 
 swagger.show: true

config-center/src/main/resources/shared/security-center-outer.yml

@@ -4,12 +4,10 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
+  datasource:
+    druid:
+      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
 
 swagger.show: false

config-center/src/main/resources/shared/security-center-test.yml

@@ -4,12 +4,10 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
+  datasource:
+    druid:
+      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
 
 swagger.show: true

config-center/src/main/resources/shared/structure-center-debug.yml

@@ -4,13 +4,6 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
 
 swagger.show: true
 

config-center/src/main/resources/shared/structure-center-inner.yml

@@ -4,13 +4,6 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
 
 swagger.show: false
 

config-center/src/main/resources/shared/structure-center-local.yml

@@ -4,13 +4,6 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
 
 swagger.show: true
 

config-center/src/main/resources/shared/structure-center-outer.yml

@@ -4,13 +4,6 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
 
 swagger.show: false
 

config-center/src/main/resources/shared/structure-center-test.yml

@@ -4,13 +4,6 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
 
 swagger.show: true
 

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

@@ -1,22 +1,10 @@
 package com.lantone.dblayermbg.config;
 
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-import org.apache.ibatis.plugin.Interceptor;
-import org.apache.ibatis.session.SqlSessionFactory;
-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,15 +12,13 @@ import javax.sql.DataSource;
  */
 @EnableTransactionManagement
 @Configuration
-@MapperScan(basePackages = "com.lantone.dblayermbg.mapper", sqlSessionFactoryRef = "db1sqlSessionFactory")
 public class DruidConfig {
 
     /**
      * mybatis-plus分页插件<br>
      * 文档：http://mp.baomidou.com<br>
      */
-    @Bean(name = "db1PaginationInterceptor")
-    @Primary
+    @Bean
     public PaginationInterceptor paginationInterceptor() {
         PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
         // 设置请求的页面大于最大页后操作,true调回到首页,false继续请求,默认false
@@ -42,23 +28,4 @@ public class DruidConfig {
         return paginationInterceptor;
     }
 
-    @Bean(name = "db1")
-    @ConfigurationProperties(prefix = "spring.datasource.druid.db1" )
-    @Primary
-    public DataSource db1() {
-        return DruidDataSourceBuilder.create().build();
-    }
-
-    @Bean("db1sqlSessionFactory")
-    @Primary
-    public SqlSessionFactory sqlSessionFactory(@Qualifier("db1") DataSource db1) throws Exception {
-        MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();
-        sqlSessionFactory.setDataSource(db1);
-        sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:/mapper/*.xml"));
-        Interceptor[] plugins = new Interceptor[1];
-        plugins[0] = paginationInterceptor();
-        sqlSessionFactory.setPlugins(plugins);
-        return sqlSessionFactory.getObject();
-    }
-
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/DeptServiceImpl.java

@@ -1,24 +0,0 @@
-package com.lantone.dblayermbg.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.common.dto.analyze.BasDeptInfoDTO;
-import com.lantone.common.vo.analyze.BasDeptInfoVO;
-import com.lantone.dblayermbg.entity.Dept;
-import com.lantone.dblayermbg.mapper.DeptMapper;
-import com.lantone.dblayermbg.service.DeptService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 科室表 Service实现类
- * </p>
- */
-@Service
-public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements DeptService {
-
-    public List<BasDeptInfoDTO> getList(BasDeptInfoVO basDeptInfoVO) {
-        return baseMapper.getList(basDeptInfoVO);
-    }
-}

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

@@ -1,93 +0,0 @@
-spring:
-  datasource:
-    druid:
-      # 数据库 1
-      db1:
-        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
-        minIdle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间，单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-        filters.commons-log.connection-logger-name: wall,log4j
-        filter:
-          stat:
-            enabled: true
-            mergeSql: true
-            log-slow-sql: true
-            slow-sql-millis: 2000
-        #监控配置
-        web-stat-filter:
-          enabled: true
-          url-pattern: /*
-          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-        # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-        stat-view-servlet:
-          enabled: true
-          url-pattern: /druid/*
-          reset-enable: false
-          login-username: root
-          login-password: root
-      # 数据库 2
-      db2:
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        platform: mysql
-        url: jdbc:mysql://192.168.2.126:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-        username: root
-        password: Lat0ne@tesT
-        # 连接池的配置信息
-        # 初始化大小，最小，最大
-        initialSize: 5
-        minIdle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间，单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-        filters.commons-log.connection-logger-name: wall,log4j
-        filter:
-          stat:
-            enabled: true
-            mergeSql: true
-            log-slow-sql: true
-            slow-sql-millis: 2000
-        #监控配置
-        web-stat-filter:
-          enabled: true
-          url-pattern: /*
-          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-        # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-        stat-view-servlet:
-          enabled: true
-          url-pattern: /druid/*
-          reset-enable: false
-          login-username: root
-          login-password: root

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

@@ -1,93 +0,0 @@
-spring:
-  datasource:
-    druid:
-      # 数据库 1
-      db1:
-        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
-        minIdle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间，单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-        filters.commons-log.connection-logger-name: wall,log4j
-        filter:
-          stat:
-            enabled: true
-            mergeSql: true
-            log-slow-sql: true
-            slow-sql-millis: 2000
-        #监控配置
-        web-stat-filter:
-          enabled: true
-          url-pattern: /*
-          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-        # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-        stat-view-servlet:
-          enabled: true
-          url-pattern: /druid/*
-          reset-enable: false
-          login-username: root
-          login-password: root
-      # 数据库 2
-      db2:
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        platform: mysql
-        url: jdbc:mysql://192.168.2.237:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-        username: root
-        password: lantone
-        # 连接池的配置信息
-        # 初始化大小，最小，最大
-        initialSize: 5
-        minIdle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间，单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-        filters.commons-log.connection-logger-name: wall,log4j
-        filter:
-          stat:
-            enabled: true
-            mergeSql: true
-            log-slow-sql: true
-            slow-sql-millis: 2000
-        #监控配置
-        web-stat-filter:
-          enabled: true
-          url-pattern: /*
-          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-        # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-        stat-view-servlet:
-          enabled: true
-          url-pattern: /druid/*
-          reset-enable: false
-          login-username: root
-          login-password: root

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

@@ -1,93 +0,0 @@
-spring:
-  datasource:
-    druid:
-      # 数据库 1
-      db1:
-        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
-        minIdle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间，单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-        filters.commons-log.connection-logger-name: wall,log4j
-        filter:
-          stat:
-            enabled: true
-            mergeSql: true
-            log-slow-sql: true
-            slow-sql-millis: 2000
-        #监控配置
-        web-stat-filter:
-          enabled: true
-          url-pattern: /*
-          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-        # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-        stat-view-servlet:
-          enabled: true
-          url-pattern: /druid/*
-          reset-enable: false
-          login-username: root
-          login-password: root
-      # 数据库 2
-      db2:
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        platform: mysql
-        url: jdbc:mysql://192.168.2.237:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-        username: root
-        password: lantone
-        # 连接池的配置信息
-        # 初始化大小，最小，最大
-        initialSize: 5
-        minIdle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间，单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-        filters.commons-log.connection-logger-name: wall,log4j
-        filter:
-          stat:
-            enabled: true
-            mergeSql: true
-            log-slow-sql: true
-            slow-sql-millis: 2000
-        #监控配置
-        web-stat-filter:
-          enabled: true
-          url-pattern: /*
-          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-        # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-        stat-view-servlet:
-          enabled: true
-          url-pattern: /druid/*
-          reset-enable: false
-          login-username: root
-          login-password: root

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

@@ -1,93 +0,0 @@
-spring:
-  datasource:
-    druid:
-      # 数据库 1
-      db1:
-        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
-        minIdle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间，单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-        filters.commons-log.connection-logger-name: wall,log4j
-        filter:
-          stat:
-            enabled: true
-            mergeSql: true
-            log-slow-sql: true
-            slow-sql-millis: 2000
-        #监控配置
-        web-stat-filter:
-          enabled: true
-          url-pattern: /*
-          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-        # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-        stat-view-servlet:
-          enabled: true
-          url-pattern: /druid/*
-          reset-enable: false
-          login-username: root
-          login-password: root
-      # 数据库 2
-      db2:
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        platform: mysql
-        url: jdbc:mysql://192.168.2.237:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-        username: root
-        password: lantone
-        # 连接池的配置信息
-        # 初始化大小，最小，最大
-        initialSize: 5
-        minIdle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间，单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-        filters.commons-log.connection-logger-name: wall,log4j
-        filter:
-          stat:
-            enabled: true
-            mergeSql: true
-            log-slow-sql: true
-            slow-sql-millis: 2000
-        #监控配置
-        web-stat-filter:
-          enabled: true
-          url-pattern: /*
-          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-        # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-        stat-view-servlet:
-          enabled: true
-          url-pattern: /druid/*
-          reset-enable: false
-          login-username: root
-          login-password: root

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

@@ -1,93 +0,0 @@
-spring:
-  datasource:
-    druid:
-      # 数据库 1
-      db1:
-        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
-        minIdle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间，单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-        filters.commons-log.connection-logger-name: wall,log4j
-        filter:
-          stat:
-            enabled: true
-            mergeSql: true
-            log-slow-sql: true
-            slow-sql-millis: 2000
-        #监控配置
-        web-stat-filter:
-          enabled: true
-          url-pattern: /*
-          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-        # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-        stat-view-servlet:
-          enabled: true
-          url-pattern: /druid/*
-          reset-enable: false
-          login-username: root
-          login-password: root
-      # 数据库 2
-      db2:
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        platform: mysql
-        url: jdbc:mysql://192.168.2.126:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-        username: root
-        password: Lat0ne@tesT
-        # 连接池的配置信息
-        # 初始化大小，最小，最大
-        initialSize: 5
-        minIdle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间，单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-        filters.commons-log.connection-logger-name: wall,log4j
-        filter:
-          stat:
-            enabled: true
-            mergeSql: true
-            log-slow-sql: true
-            slow-sql-millis: 2000
-        #监控配置
-        web-stat-filter:
-          enabled: true
-          url-pattern: /*
-          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-        # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-        stat-view-servlet:
-          enabled: true
-          url-pattern: /druid/*
-          reset-enable: false
-          login-username: root
-          login-password: root

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

@@ -4,10 +4,51 @@ spring:
     time-zone: GMT+8
     serialization:
       write-dates-as-timestamps: false
+  datasource:
+    druid:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      platform: mysql
+      # 连接池的配置信息
+      # 初始化大小，最小，最大
+      initialSize: 5
+      minIdle: 5
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      # 打开PSCache，并且指定每个连接上PSCache的大小
+      poolPreparedStatements: true
+      maxPoolPreparedStatementPerConnectionSize: 20
+      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
+      #监控配置
+      web-stat-filter:
+        enabled: true
+        url-pattern: /*
+        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
+      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        reset-enable: false
+        login-username: root
+        login-password: root
 
 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>

dblayer-mbg/src/test/java/com/lantone/dblayermbg/CodeAutoGenerator.java

@@ -9,29 +9,6 @@ package com.lantone.dblayermbg;
  */
 public class CodeAutoGenerator {
 
-    /**
-     * 数据库
-     */
-    private static String username = "root";
-    private static String password = "lantone";
-    private static String url = "jdbc:mysql://192.168.2.237:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8";
-
-    /**
-     * 表名
-     */
-    private static String[] TABLES = {
-            "med_work_flow_info",
-            "med_work_flow_node",
-            "med_work_flow_link",
-            "med_appeal_info",
-            "med_appeal_examine_info"
-    };
-
-    /**
-     * 生成的实体类忽略表前缀: 不需要则置空
-     */
-    private static String[] ENTITY_IGNORE_PREFIX = { "med_" };
-
     /**
      * 初次生成：entity.java、mapper.java、mapper.xml、baseMapper.xml、service.java、serviceImpl.java、facade.java
      * 再次生成：entity.java、baseMapper.xml、service.java、serviceImpl.java
@@ -39,7 +16,66 @@ public class CodeAutoGenerator {
      * @param args
      */
     public static void main(String[] args) {
-        GeneratorUtil.create(username, password, url, TABLES, ENTITY_IGNORE_PREFIX);
+        securityCenter();
+    }
+
+    /**
+     * security-center模块
+     */
+    private static void securityCenter() {
+        //模块名称
+        String moduleName_ = "security-center";
+        //父包名路径(文件输出路径,也是导包的路径)
+        String parentPackagePath_ = "/com/lantone/security";
+        //生成文件父类包package
+        String packageName_ = "com.lantone.security";
+
+        //数据库
+        String username = "root";
+        String password = "lantone";
+        String url = "jdbc:mysql://192.168.2.237:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8";
+
+        //表名
+        String[] TABLES = {
+                "sys_abnormal_log",
+                "sys_data_auth",
+                "sys_data_auth_detail",
+                "sys_dept",
+                "sys_dept_doctor",
+                "sys_dept_medoup",
+                "sys_dictionary_info",
+                "sys_doctor",
+                "sys_hospital",
+                "sys_hospital_set",
+                "sys_hospital_user",
+                "sys_login_log",
+                "sys_medoup",
+                "sys_medoup_doctor",
+                "sys_menu",
+                "sys_menu_resource",
+                "sys_operation_log",
+                "sys_region",
+                "sys_region_dept",
+                "sys_resource",
+                "sys_role",
+                "sys_role_software",
+                "sys_role_software_data_auth",
+                "sys_role_software_menu",
+                "sys_role_software_resource",
+                "sys_software",
+                "sys_software_data_auth",
+                "sys_software_menu",
+                "sys_software_resource",
+                "sys_user",
+                "sys_user_role",
+                "sys_dept_user",
+                "sys_notice",
+                "sys_notice_user"
+        };
+        //生成的实体类忽略表前缀: 不需要则置空
+        String[] ENTITY_IGNORE_PREFIX = { "sys_" };
+
+        GeneratorUtil.create(moduleName_, parentPackagePath_, packageName_, username, password, url, TABLES, ENTITY_IGNORE_PREFIX);
     }
 
 }

dblayer-mbg/src/test/java/com/lantone/dblayermbg/GeneratorUtil.java

@@ -75,12 +75,12 @@ public class GeneratorUtil {
 
 
     // 各层包名
-    private static String ENTITY_PATH = "/entity/appeal/";
-    private static String FACADE_PATH = "/facade/appeal/";
-    private static String MAPPER_PATH = "/mapperdb2/";
-    private static String XML_PATH = "/resources/mapperdb2/";
-    private static String SERVICE_PATH = "/service/appeal/";
-    private static String SERVICE_IMPL_PATH = "/service/impl/appeal/";
+    private static String ENTITY_PATH = "/entity/";
+    private static String FACADE_PATH = "/facade/base/";
+    private static String MAPPER_PATH = "/mapper/";
+    private static String XML_PATH = "/resources/mapper/";
+    private static String SERVICE_PATH = "/service/";
+    private static String SERVICE_IMPL_PATH = "/service/impl/";
     private static String CONTROLLER_PATH = "/web/";
 
 
@@ -187,10 +187,6 @@ public class GeneratorUtil {
                         if (fieldType.toLowerCase().contains("datetime")) {
                             return DbColumnType.DATE;
                         }
-                        //将数据库中longblob类型转换为String
-                        if(fieldType.toLowerCase().contains("longblob")){
-                            return DbColumnType.STRING;
-                        }
                         return (DbColumnType) super.processTypeConvert(globalConfig, fieldType);
                     }
                 });
@@ -232,12 +228,12 @@ public class GeneratorUtil {
         return new PackageConfig()
                 // 父包名
                 .setParent(packageName)
-                .setEntity("entity.appeal")
-                .setMapper("mapperdb2")
-                .setXml("resources.mapperdb2")
-                .setService("service.appeal")
-                .setServiceImpl("service.impl.appeal")
-                .setController("facade.appeal");
+                .setEntity("entity")
+                .setMapper("mapper")
+                .setXml("resources.mapper")
+                .setService("service")
+                .setServiceImpl("service.impl")
+                .setController("facade.base");
     }
 
     /**
@@ -443,7 +439,19 @@ public class GeneratorUtil {
      * @Return void
      * @MethodName create
      */
-    public static void create(String username, String password, String url, String[] tables, String[] entityIgnorePrefix) {
+    public static void create(String moduleName_, String parentPackagePath_, String packageName_, String username, String password, String url, String[] tables, String[] entityIgnorePrefix) {
+        moduleName = moduleName_;
+        PARENT_PACKAGE_PATH = parentPackagePath_;
+        packageName = packageName_;
+
+        ENTITY_OUTPUT_PATH = "/src/main/java" + PARENT_PACKAGE_PATH + ENTITY_PATH;
+        FACADE_OUTPUT_PATH = "/src/main/java" + PARENT_PACKAGE_PATH + FACADE_PATH;
+        MAPPER_OUTPUT_PATH = "/src/main/java" + PARENT_PACKAGE_PATH + MAPPER_PATH;
+        BASEMAPPER_OUTPUT_PATH = "/src/main/java" + PARENT_PACKAGE_PATH + MAPPER_PATH + "/parent/";
+        SERVICE_OUTPUT_PATH = "/src/main/java" + PARENT_PACKAGE_PATH + SERVICE_PATH;
+        SERVICE_IMPL_OUTPUT_PATH = "/src/main/java" + PARENT_PACKAGE_PATH + SERVICE_IMPL_PATH;
+        CONTROLLER_OUTPUT_PATH = "/src/main/java" + PARENT_PACKAGE_PATH + CONTROLLER_PATH;
+
         // 全局配置
         GlobalConfig globalConfig = globalConfig();
         // 数据源配置

gateway-service/pom.xml

@@ -12,6 +12,7 @@
     <artifactId>gateway-service</artifactId>
     <name>gateway-service</name>
     <packaging>jar</packaging>
+    <description>基于Spring Cloud Gateway的微服务API网关服务</description>
 
     <dependencies>
         <dependency>

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

@@ -49,6 +49,14 @@ spring:
       discovery:
         enabled: true
         service-id: config-center
+  redis:
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
+        max-idle: 5 # 连接池中的最大空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 20000 # 连接超时时间（毫秒）
   profiles:
     active: debug
 

message-service/pom.xml

@@ -12,11 +12,12 @@
     <artifactId>message-service</artifactId>
     <name>message-service</name>
     <packaging>jar</packaging>
+    <description>消息中心</description>
 
     <dependencies>
         <dependency>
             <groupId>com.lantone</groupId>
-            <artifactId>dblayer-mbg</artifactId>
+            <artifactId>common</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -38,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

@@ -11,6 +11,42 @@ spring:
       discovery:
         enabled: true
         service-id: config-center
+  redis:
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
+        max-idle: 5 # 连接池中的最大空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 20000 # 连接超时时间（毫秒）
+  rabbitmq:
+    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 # 不论重试是有状态的还是无状态的
   profiles:
     active: local
 
@@ -35,6 +71,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

monitor-service/pom.xml

@@ -12,6 +12,7 @@
     <artifactId>monitor-service</artifactId>
     <name>monitor-service</name>
     <packaging>jar</packaging>
+    <description>基于Spring Boot Admin的微服务监控中心</description>
 
     <dependencies>
         <dependency>

pom.xml

@@ -55,6 +55,7 @@
         <poi.version>4.0.1</poi.version>
         <commons-beanutils.version>1.9.3</commons-beanutils.version>
         <nimbus-jose-jwt.version>8.16</nimbus-jose-jwt.version>
+        <java-jwt.version>3.4.0</java-jwt.version>
         <spring-data-commons.version>2.3.0.RELEASE</spring-data-commons.version>
         <jackson-databind.version>2.12.3</jackson-databind.version>
         <validation-api.version>2.0.1.Final</validation-api.version>

register-center/pom.xml

@@ -12,6 +12,7 @@
     <artifactId>register-center</artifactId>
     <name>register-center</name>
     <packaging>jar</packaging>
+    <description>基于Spring Cloud Eureka的微服务注册中心</description>
 
     <dependencies>
         <dependency>

security-center/pom.xml

@@ -12,6 +12,7 @@
     <artifactId>security-center</artifactId>
     <name>security-center</name>
     <packaging>jar</packaging>
+    <description>权限中心</description>
 
     <dependencies>
         <dependency>
@@ -44,10 +45,6 @@
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-okhttp</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

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/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/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/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;