udpate 调整模块

nb-admin/src/main/java/com/nb/admin/AdminApplication.java

@@ -1,5 +1,7 @@
 package com.nb.admin;
 
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
+import com.nb.common.config.properties.DruidProperties;
 import com.nb.common.config.web.RequestCheckProperties;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
@@ -12,26 +14,27 @@ import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.tio.websocket.starter.EnableTioWebSocketServer;
 
+import java.util.logging.Logger;
+
 /**
  * Admin启动类
  *
  * @author Kevin
  */
 @SpringBootApplication(scanBasePackages ={
-        "com.nb.admin",  "com.nb.framework",
+        "com.nb.admin",
         "com.nb.aliyun","com.nb.bus","com.nb.system",
-        "springfox.documentation.schema"}, exclude = {DataSourceAutoConfiguration.class})
+        "springfox.documentation.schema"})
 @Import(cn.hutool.extra.spring.SpringUtil.class)
 @EnableTioWebSocketServer
 @EnableScheduling
 @EnableAsync
-@MapperScan({"${mybatis-plus.mapperPackage}","com.nb.framework.test.mapper","com.nb.system.mapper"})
-@EnableConfigurationProperties(RequestCheckProperties.class)
+@MapperScan({"${mybatis-plus.mapperPackage}","com.nb.system.mapper"})
+@EnableConfigurationProperties({RequestCheckProperties.class, DruidProperties.class})
 @ServletComponentScan(basePackages = "com.nb.common.config")
 public class AdminApplication {
 
-    public static void main(String[] args) {
-        SpringApplication.run(AdminApplication.class, args);
+    public static void main(String[] args) { SpringApplication.run(AdminApplication.class, args);
     }
 
 }

nb-admin/src/main/java/com/nb/admin/config/mybatisplus/handler/CreateAndUpdateMetaObjectHandler.java

@@ -1,68 +0,0 @@
-package com.nb.admin.config.mybatisplus.handler;
-
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.nb.core.exception.CustomException;
-import com.nb.core.result.ResultCode;
-import org.apache.ibatis.reflection.MetaObject;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import java.util.Date;
-
-import static org.springframework.web.context.request.RequestAttributes.SCOPE_REQUEST;
-
-/**
- * MP注入处理器
- *
- * @author Kevin
- */
-@Component
-@ConditionalOnMissingBean(MetaObjectHandler.class)
-public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
-
-    public static final String CREATE_TIME = "createTime";
-    public static final String UPDATE_TIME = "updateTime";
-
-    public static final String IS_DELETE = "isDelete";
-
-    public static final String TENANT_ID="tenantId";
-
-    @Override
-    public void insertFill(MetaObject metaObject) {
-        try {
-            if (metaObject.hasGetter(CREATE_TIME) && metaObject.getValue(CREATE_TIME) == null) {
-                this.strictInsertFill(metaObject, CREATE_TIME, Date.class, new Date());
-            }
-            if (metaObject.hasGetter(IS_DELETE) && metaObject.getValue(IS_DELETE) == null) {
-                this.strictInsertFill(metaObject, IS_DELETE, Integer.class,0);
-            }
-            if (metaObject.hasGetter(UPDATE_TIME) && metaObject.getValue(UPDATE_TIME) == null) {
-                this.strictUpdateFill(metaObject, UPDATE_TIME, Date.class, new Date());
-            }
-            if (metaObject.hasGetter(TENANT_ID) && metaObject.getValue(TENANT_ID) == null) {
-                ServletRequestAttributes request = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-                String tenantId ="1";
-                if(request!=null){
-                    tenantId = String.valueOf(request.getAttribute("tenantId", SCOPE_REQUEST));
-                }
-                this.strictInsertFill(metaObject, TENANT_ID, String.class, tenantId);
-            }
-        } catch (Exception e) {
-            throw new CustomException(ResultCode.INTERNAL_SERVER_ERROR.getMessage());
-        }
-    }
-
-    @Override
-    public void updateFill(MetaObject metaObject) {
-        try {
-            if (metaObject.hasGetter(UPDATE_TIME) && metaObject.getValue(UPDATE_TIME) == null) {
-                this.strictUpdateFill(metaObject, UPDATE_TIME, Date.class, new Date());
-            }
-        } catch (Exception e) {
-            throw new CustomException(ResultCode.INTERNAL_SERVER_ERROR.getMessage());
-        }
-    }
-
-}

nb-admin/src/main/java/com/nb/admin/config/mybatisplus/interceptor/DefaultTenantLineInnerInterceptor.java

@@ -1,25 +0,0 @@
-package com.nb.admin.config.mybatisplus.interceptor;
-
-import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author lifang
- * @version 1.0.0
- * @ClassName DefaultTenantLineInnerInterceptor.java
- * @Description 默认多租户插件
- * @createTime 2022年08月02日 08:50:00
- */
-@ConditionalOnBean(TenantLineInnerInterceptor.class)
-@Configuration
-public class DefaultTenantLineInnerInterceptor {
-    /**
-     * 多租户插件
-     */
-    @Bean
-    public TenantLineInnerInterceptor tenantLineInnerInterceptor() {
-        return new TenantLineInnerInterceptor();
-    }
-}

nb-admin/src/main/java/com/nb/admin/controller/monitor/OnlineUserController.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.auth.bean.LoginUser;
 import com.nb.auth.utils.SecurityUtil;
 import com.nb.core.annotation.Log;
-import com.nb.common.redis.RedisUtils;
+import com.nb.common.config.redis.RedisUtils;
 import com.nb.core.result.R;
 import com.google.common.collect.Lists;
 import io.swagger.annotations.Api;

nb-admin/src/main/resources/application-dev.yml

@@ -27,19 +27,10 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://192.168.100.32:3306/nbnetpump?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true
+    username: root
+    password: 123456
     druid:
-      # 主库数据源
-      master:
-        url: jdbc:mysql://192.168.100.32:3306/nbnetpump?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true
-        username: root
-        password: 123456
-      # 从库数据源
-      slave:
-        # 从数据源开关/默认关闭
-        enabled: false
-        url:
-        username:
-        password:
       # 初始连接数
       initialSize: 5
       # 最小连接池数量
@@ -61,9 +52,9 @@ spring:
       testOnReturn: false
         # 通过别名的方式配置扩展插件，多个英文逗号分隔，常用的插件有：
         # 监控统计用的filter:stat
-        # 日志用的filter:log4j
+        # 日志用的filter:log4j2
         # 防御sql注入的filter:wall
-      filters: stat,wall,log4j #log4j
+      filters: stat,wall,lo4j2 #log4j
       webStatFilter:
         enabled: true
       statViewServlet:

nb-admin/src/main/resources/application-prod.yml

@@ -28,19 +28,10 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://47.101.214.91:7001/nbnetpump?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true
+    username: root
+    password: 123456
     druid:
-      # 主库数据源
-      master:
-        url: jdbc:mysql://47.101.214.91:7001/nbnetpump?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true
-        username: root
-        password: 123456
-      # 从库数据源
-      slave:
-        # 从数据源开关/默认关闭
-        enabled: false
-        url:
-        username:
-        password:
       # 初始连接数
       initialSize: 5
       # 最小连接池数量

nb-admin/src/test/java/com/nb/admin/BusDeviceTest.java

@@ -8,7 +8,7 @@ import com.nb.bus.entity.BusDeviceHistoryEntity;
 import com.nb.bus.service.LocalBusDeviceHistoryService;
 import com.nb.bus.service.LocalBusDeviceService;
 import com.nb.bus.service.dto.ClinicAnalInfusionRecord;
-import com.nb.common.util.RedissonUtil;
+import com.nb.common.config.utils.RedissonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;

nb-auth/pom.xml

@@ -46,5 +46,9 @@
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-spring-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-dao-redis-jackson</artifactId>
+        </dependency>
     </dependencies>
 </project>

nb-common/all-common/src/main/java/com/nb/common/config/sa/SaConfig.java → nb-auth/src/main/java/com/nb/auth/sa/SaConfig.java

@@ -1,4 +1,4 @@
-package com.nb.common.config.sa;
+package com.nb.auth.sa;
 
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.dao.SaTokenDaoRedisJackson;

nb-common/all-common/src/main/java/com/nb/common/config/sa/SaTokenActionDefaultImpl.java → nb-auth/src/main/java/com/nb/auth/sa/SaTokenActionDefaultImpl.java

@@ -1,4 +1,4 @@
-package com.nb.common.config.sa;
+package com.nb.auth.sa;
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;

nb-common/all-common/src/main/java/com/nb/common/config/sa/SaTokenConfig.java → nb-auth/src/main/java/com/nb/auth/sa/SaTokenConfig.java

@@ -1,14 +1,15 @@
-package com.nb.common.config.sa;
+package com.nb.auth.sa;
 
 import cn.dev33.satoken.interceptor.SaRouteInterceptor;
 import cn.dev33.satoken.router.SaRouter;
 import cn.dev33.satoken.stp.StpUtil;
-import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
 import org.springframework.web.servlet.HandlerInterceptor;
+
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -29,7 +30,7 @@ public class SaTokenConfig {
                     .check(StpUtil::checkLogin);
         });
     }
-    private static final List<String> IGNORE_URL = Lists.newArrayList();
+    private static final List<String> IGNORE_URL = new ArrayList<>();
 
     static {
         IGNORE_URL.add("/actuator/**");

nb-common/all-common/src/main/java/com/nb/common/config/mybatis/DateToBigIntHandler.java

@@ -1,45 +0,0 @@
-package com.nb.common.config.mybatis;
-
-import org.apache.ibatis.type.*;
-
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Date;
-
-
-/**
- * @author lifang
- * @version 1.0.0
- * @ClassName DateToBigIntHandler.java
- * @Description TODO
- * @createTime 2022年03月21日 09:58:00
- */
-@MappedTypes(Date.class)
-@MappedJdbcTypes(JdbcType.BIGINT)
-public class DateToBigIntHandler implements TypeHandler<Date> {
-
-    @Override
-    public void setParameter(PreparedStatement ps, int i, Date parameter, JdbcType jdbcType) throws SQLException {
-        ps.setObject(i,parameter.getTime());
-    }
-
-    @Override
-    public Date getResult(ResultSet rs, String columnName) throws SQLException {
-        long result = rs.getLong(columnName);
-        return result==0?null:new Date(result);
-    }
-
-    @Override
-    public Date getResult(ResultSet rs, int columnIndex) throws SQLException {
-        long result = rs.getLong(columnIndex);
-        return result==0?null:new Date(result);
-    }
-
-    @Override
-    public Date getResult(CallableStatement cs, int columnIndex) throws SQLException {
-        long result = cs.getLong(columnIndex);
-        return result==0?null:new Date(result);
-    }
-}

nb-common/all-common/src/main/java/com/nb/common/util/SecurityUtil.java

@@ -1,118 +0,0 @@
-//package com.nb.common.util;
-//
-//import cn.dev33.satoken.spring.SpringMVCUtil;
-//import cn.dev33.satoken.stp.StpUtil;
-//import cn.hutool.core.collection.CollUtil;
-//import cn.hutool.core.util.StrUtil;
-//import cn.hutool.crypto.digest.BCrypt;
-//import com.nb.core.Constants;
-//import com.nb.common.bo.LoginUser;
-//import com.nb.common.bo.SysRoleBO;
-//import com.nb.common.bo.SysUserBO;
-//import com.nb.core.enums.GrantTypeEnum;
-//
-//import java.util.List;
-//import java.util.Objects;
-//import java.util.stream.Collectors;
-//
-///**
-// * 安全服务工具类
-// *
-// * @author Kevin
-// */
-//public class SecurityUtil {
-//    /**
-//     * 获取用户账户
-//     **/
-//    public static String getUsername() {
-//        return getLoginUser().getUsername();
-//    }
-//
-//    /**
-//     * 获取系统用户
-//     **/
-//    public static SysUserBO getSysUser() {
-//        return getLoginUser().getSysUser();
-//    }
-//
-//
-//    /**
-//     * 获取用户
-//     **/
-//    public static LoginUser getLoginUser() {
-//        try {
-//            return (LoginUser) StpUtil.getTokenSession().get(Constants.LOGIN_USER_KEY);
-//        } catch (Exception ex) {
-//            return null;
-//        }
-//    }
-//
-//    /**
-//     * 获取用户
-//     **/
-//    public static void  setLogin(LoginUser loginUser) {
-//        StpUtil.getTokenSession().set(Constants.LOGIN_USER_KEY,loginUser);
-//    }
-//
-//    public static boolean isSys(){
-//        LoginUser loginUser = getLoginUser();
-//        if(loginUser==null){
-//            return false;
-//        }
-//        String grantType = loginUser.getGrantType();
-//        if (GrantTypeEnum.APPKEY_APPSECRET.getCode().equalsIgnoreCase(grantType)) {
-//            return false;
-//        }
-//        return Boolean.TRUE.equals(loginUser.getIsSys());
-//    }
-//
-//    public static String getTenantId(){
-//        return String.valueOf(SpringMVCUtil.getRequest().getAttribute("tenantId"));
-//    }
-//    /**
-//     * 是否是超级管理员
-//     **/
-//    public static Boolean isSuperAdmin() {
-//        String grantType = getLoginUser().getGrantType();
-//        if (GrantTypeEnum.APPKEY_APPSECRET.getCode().equalsIgnoreCase(grantType)) {
-//            return false;
-//        }
-//        List<SysRoleBO> roles = getSysUser().getRoles();
-//        if(CollUtil.isEmpty(roles)){
-//            return false;
-//        }
-//        return roles.stream().filter(role-> StrUtil.isNotBlank(role.getRoleCode()))
-//                .map(SysRoleBO::getRoleCode)
-//                .collect(Collectors.toSet())
-//                .contains("admin");
-//    }
-//
-//    /**
-//     * 是否是超级管理员
-//     **/
-//    public static Boolean isSysSuperAdmin(Long userId) {
-//        return Objects.nonNull(userId) && userId == 1L;
-//    }
-//
-//    /**
-//     * 生成BCryptPasswordEncoder密码
-//     *
-//     * @param password 密码
-//     * @return 加密字符串
-//     */
-//    public static String encryptPassword(String password) {
-//        return BCrypt.hashpw(password);
-//    }
-//
-//    /**
-//     * 判断密码是否相同
-//     *
-//     * @param rawPassword     真实密码
-//     * @param encodedPassword 加密后字符
-//     * @return 结果
-//     */
-//    public static boolean matchesPassword(String rawPassword, String encodedPassword) {
-//        return BCrypt.checkpw(rawPassword, encodedPassword);
-//    }
-//
-//}

nb-common/config-common/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>nb-common</artifactId>
+        <groupId>com.tuoren</groupId>
+        <version>1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>config-common</artifactId>
+
+    <description>一些通用配置</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
+    </dependencies>
+</project>

nb-admin/src/main/java/com/nb/admin/config/ApplicationConfig.java → nb-common/config-common/src/main/java/com/nb/common/config/ApplicationConfig.java

@@ -1,4 +1,4 @@
-package com.nb.admin.config;
+package com.nb.common.config;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;

nb-common/config-common/src/main/java/com/nb/common/config/ConfigAutoConfiguration.java

@@ -0,0 +1,16 @@
+package com.nb.common.config;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName ConfigAutoConfiguration.java
+ * @Description TODO
+ * @createTime 2022年08月02日 10:03:00
+ */
+@Configuration
+@ComponentScan("com.nb.common.config")
+public class ConfigAutoConfiguration {
+}

nb-admin/src/main/java/com/nb/admin/config/ValidatorConfig.java → nb-common/config-common/src/main/java/com/nb/common/config/ValidatorConfig.java

@@ -1,4 +1,4 @@
-package com.nb.admin.config;
+package com.nb.common.config;
 
 import org.hibernate.validator.HibernateValidator;
 import org.springframework.context.annotation.Bean;

nb-admin/src/main/java/com/nb/admin/config/WebAppMvcConfig.java → nb-common/config-common/src/main/java/com/nb/common/config/WebAppMvcConfig.java

@@ -1,4 +1,4 @@
-package com.nb.admin.config;
+package com.nb.common.config;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
@@ -9,8 +9,8 @@ import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.StringSerializer;
-import com.nb.admin.config.serializer.BooleanToIntegerSerializer;
-import com.nb.admin.config.serializer.EnumDeserializer;
+import com.nb.common.config.serializer.BooleanToIntegerSerializer;
+import com.nb.common.config.serializer.EnumDeserializer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
@@ -37,7 +37,7 @@ import java.util.*;
 public class WebAppMvcConfig implements WebMvcConfigurer {
     @Autowired
     private ObjectMapper objectMapper;
-    @Autowired
+    @Autowired(required = false)
     private List<HandlerInterceptor> interceptors;
     @Override
     public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {

nb-admin/src/main/java/com/nb/admin/config/aspect/DataSourceAspect.java → nb-common/config-common/src/main/java/com/nb/common/config/aspect/DataSourceAspect.java

@@ -1,7 +1,7 @@
-package com.nb.admin.config.aspect;
+package com.nb.common.config.aspect;
 
 import com.nb.core.annotation.DataSource;
-import com.nb.admin.config.datasource.DynamicDataSourceContextHolder;
+import com.nb.common.config.datasource.DynamicDataSourceContextHolder;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;

nb-common/all-common/src/main/java/com/nb/common/bo/DictModel.java → nb-common/config-common/src/main/java/com/nb/common/config/bo/DictModel.java

@@ -1,4 +1,4 @@
-package com.nb.common.bo;
+package com.nb.common.config.bo;
 
 import lombok.Data;
 

nb-common/all-common/src/main/java/com/nb/common/convert/ExcelDictConverter.java → nb-common/config-common/src/main/java/com/nb/common/config/convert/ExcelDictConverter.java

@@ -1,4 +1,4 @@
-package com.nb.common.convert;
+package com.nb.common.config.convert;
 
 import cn.hutool.core.annotation.AnnotationUtil;
 import cn.hutool.core.util.StrUtil;
@@ -8,8 +8,8 @@ import com.alibaba.excel.metadata.GlobalConfiguration;
 import com.alibaba.excel.metadata.data.ReadCellData;
 import com.alibaba.excel.metadata.data.WriteCellData;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.nb.common.config.utils.DictUtil;
 import com.nb.core.annotation.ExcelDict;
-import com.nb.common.util.DictUtil;
 
 import java.lang.reflect.Field;
 

nb-admin/src/main/java/com/nb/admin/config/datasource/DruidConfig.java → nb-common/config-common/src/main/java/com/nb/common/config/datasource/DruidConfig.java

@@ -1,4 +1,4 @@
-package com.nb.admin.config.datasource;
+package com.nb.common.config.datasource;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.druid.pool.DruidDataSource;
@@ -6,7 +6,7 @@ import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
 import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
 import com.alibaba.druid.util.Utils;
 import com.nb.core.enums.DataSourceTypeEnum;
-import com.nb.admin.config.properties.DruidProperties;
+import com.nb.common.config.properties.DruidProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;

nb-admin/src/main/java/com/nb/admin/config/datasource/DynamicDataSource.java → nb-common/config-common/src/main/java/com/nb/common/config/datasource/DynamicDataSource.java

@@ -1,4 +1,4 @@
-package com.nb.admin.config.datasource;
+package com.nb.common.config.datasource;
 
 import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
 

nb-admin/src/main/java/com/nb/admin/config/datasource/DynamicDataSourceContextHolder.java → nb-common/config-common/src/main/java/com/nb/common/config/datasource/DynamicDataSourceContextHolder.java

@@ -1,4 +1,4 @@
-package com.nb.admin.config.datasource;
+package com.nb.common.config.datasource;
 
 import lombok.extern.slf4j.Slf4j;
 

nb-common/all-common/src/main/java/com/nb/common/config/mybatis/GetNameInterface.java → nb-common/config-common/src/main/java/com/nb/common/config/mybatisplus/GetNameInterface.java

@@ -1,4 +1,4 @@
-package com.nb.common.config.mybatis;
+package com.nb.common.config.mybatisplus;
 
 /**
  * @author lifang

nb-admin/src/main/java/com/nb/admin/config/mybatisplus/MybatisPlusConfig.java → nb-common/config-common/src/main/java/com/nb/common/config/mybatisplus/MybatisPlusConfig.java

@@ -1,4 +1,4 @@
-package com.nb.admin.config.mybatisplus;
+package com.nb.common.config.mybatisplus;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;

nb-common/all-common/src/main/java/com/nb/common/config/mybatis/TenantNameHandler.java → nb-common/config-common/src/main/java/com/nb/common/config/mybatisplus/TenantNameHandler.java

@@ -1,4 +1,4 @@
-package com.nb.common.config.mybatis;
+package com.nb.common.config.mybatisplus;
 
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.extra.spring.SpringUtil;

nb-auth/src/main/java/com/nb/auth/config/CreateAndUpdateMetaObjectHandler.java → nb-common/config-common/src/main/java/com/nb/common/config/mybatisplus/handler/CreateAndUpdateMetaObjectHandler.java

@@ -1,4 +1,4 @@
-package com.nb.auth.config;
+package com.nb.common.config.mybatisplus.handler;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.nb.auth.bean.LoginUser;

nb-auth/src/main/java/com/nb/auth/config/DefaultTenantLineInnerInterceptor.java → nb-common/config-common/src/main/java/com/nb/common/config/mybatisplus/interceptor/DefaultTenantLineInnerInterceptor.java

@@ -1,4 +1,4 @@
-package com.nb.auth.config;
+package com.nb.common.config.mybatisplus.interceptor;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ClassUtil;
@@ -13,7 +13,6 @@ import com.nb.core.entity.TenantGenericEntity;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;
 import net.sf.jsqlparser.schema.Column;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

nb-auth/src/main/java/com/nb/auth/config/TenantIdManager.java → nb-common/config-common/src/main/java/com/nb/common/config/mybatisplus/interceptor/TenantIdManager.java

@@ -1,4 +1,4 @@
-package com.nb.auth.config;
+package com.nb.common.config.mybatisplus.interceptor;
 
 import cn.hutool.core.util.StrUtil;
 import org.springframework.stereotype.Component;

nb-admin/src/main/java/com/nb/admin/config/properties/DruidProperties.java → nb-common/config-common/src/main/java/com/nb/common/config/properties/DruidProperties.java

@@ -1,4 +1,4 @@
-package com.nb.admin.config.properties;
+package com.nb.common.config.properties;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import lombok.Data;

nb-common/all-common/src/main/java/com/nb/common/redis/RedisConfig.java → nb-common/config-common/src/main/java/com/nb/common/config/redis/RedisConfig.java

@@ -1,8 +1,10 @@
-package com.nb.common.redis;
+package com.nb.common.config.redis;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.redisson.spring.starter.RedissonAutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.cache.annotation.CachingConfigurerSupport;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
@@ -20,12 +22,13 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 @Configuration
 @EnableCaching
 @Slf4j
+@AutoConfigureBefore(RedissonAutoConfiguration.class)
 @AllArgsConstructor
 public class RedisConfig extends CachingConfigurerSupport {
 
     private  final ObjectMapper objectMapper;
     @Bean
-    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
+    public RedisTemplate<String, Object> defaultRedisTemplate(RedisConnectionFactory connectionFactory) {
         RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
 
         // 使用Jackson2JsonRedisSerialize 替换默认序列化

nb-common/all-common/src/main/java/com/nb/common/redis/RedisUtils.java → nb-common/config-common/src/main/java/com/nb/common/config/redis/RedisUtils.java

@@ -1,4 +1,4 @@
-package com.nb.common.redis;
+package com.nb.common.config.redis;
 
 import cn.hutool.core.collection.CollectionUtil;
 import org.springframework.data.redis.core.RedisTemplate;

nb-common/delay-queue-common/src/main/java/com/nb/common/queue/delay/RedissonClientAutoConfiguration.java → nb-common/config-common/src/main/java/com/nb/common/config/redis/RedissonClientAutoConfiguration.java

@@ -3,7 +3,7 @@
 // (powered by Fernflower decompiler)
 //
 
-package com.nb.common.queue.delay;
+package com.nb.common.config.redis;
 
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;

nb-admin/src/main/java/com/nb/admin/config/serializer/BooleanToIntegerSerializer.java → nb-common/config-common/src/main/java/com/nb/common/config/serializer/BooleanToIntegerSerializer.java

@@ -1,4 +1,4 @@
-package com.nb.admin.config.serializer;
+package com.nb.common.config.serializer;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;

nb-admin/src/main/java/com/nb/admin/config/serializer/EnumConvertFactory.java → nb-common/config-common/src/main/java/com/nb/common/config/serializer/EnumConvertFactory.java

@@ -1,4 +1,4 @@
-package com.nb.admin.config.serializer;
+package com.nb.common.config.serializer;
 
 import com.baomidou.mybatisplus.annotation.IEnum;
 import org.springframework.core.convert.converter.Converter;

nb-admin/src/main/java/com/nb/admin/config/serializer/EnumDeserializer.java → nb-common/config-common/src/main/java/com/nb/common/config/serializer/EnumDeserializer.java

@@ -1,4 +1,4 @@
-package com.nb.admin.config.serializer;
+package com.nb.common.config.serializer;
 
 import com.baomidou.mybatisplus.annotation.IEnum;
 import com.nb.core.Value;

nb-common/all-common/src/main/java/com/nb/common/util/ConfigUtil.java → nb-common/config-common/src/main/java/com/nb/common/config/utils/ConfigUtil.java

@@ -1,9 +1,9 @@
-package com.nb.common.util;
+package com.nb.common.config.utils;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.nb.core.Constants;
-import com.nb.common.redis.RedisUtils;
+import com.nb.common.config.redis.RedisUtils;
 
 import java.util.Collection;
 import java.util.Objects;

nb-common/all-common/src/main/java/com/nb/common/util/DictUtil.java → nb-common/config-common/src/main/java/com/nb/common/config/utils/DictUtil.java

@@ -1,10 +1,10 @@
-package com.nb.common.util;
+package com.nb.common.config.utils;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.nb.core.Constants;
-import com.nb.common.bo.DictModel;
-import com.nb.common.redis.RedisUtils;
+import com.nb.common.config.bo.DictModel;
+import com.nb.common.config.redis.RedisUtils;
 import com.google.common.collect.Lists;
 
 import java.util.Collection;

nb-common/all-common/src/main/java/com/nb/common/util/RedissonUtil.java → nb-common/config-common/src/main/java/com/nb/common/config/utils/RedissonUtil.java

@@ -1,4 +1,4 @@
-package com.nb.common.util;
+package com.nb.common.config.utils;
 
 
 import com.nb.core.entity.AbstractMsgId;

nb-common/all-common/src/main/java/com/nb/common/config/CacheHttpServletRequestWrapper.java → nb-common/config-common/src/main/java/com/nb/common/config/web/CacheHttpServletRequestWrapper.java

@@ -1,4 +1,4 @@
-package com.nb.common.config;
+package com.nb.common.config.web;
 
 import lombok.SneakyThrows;
 import org.springframework.util.StreamUtils;

nb-common/all-common/src/main/java/com/nb/common/config/CachingContentFilter.java → nb-common/config-common/src/main/java/com/nb/common/config/web/CachingContentFilter.java

@@ -1,4 +1,4 @@
-package com.nb.common.config;
+package com.nb.common.config.web;
 
 import cn.hutool.core.text.CharSequenceUtil;
 import lombok.extern.slf4j.Slf4j;

nb-common/all-common/src/main/java/com/nb/common/config/CorsConfig.java → nb-common/config-common/src/main/java/com/nb/common/config/web/CorsConfig.java

@@ -1,4 +1,4 @@
-package com.nb.common.config;
+package com.nb.common.config.web;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;

nb-common/all-common/src/main/java/com/nb/common/config/web/handler/CheckRequestHandler.java → nb-common/config-common/src/main/java/com/nb/common/config/web/handler/CheckRequestHandler.java

@@ -4,8 +4,8 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.digest.DigestUtil;
 import cn.hutool.json.JSONObject;
+import com.nb.common.config.web.CacheHttpServletRequestWrapper;
 import com.nb.common.config.web.RequestCheckProperties;
-import com.nb.common.config.CacheHttpServletRequestWrapper;
 import com.nb.core.exception.RequestParmErrorException;
 import com.nb.core.exception.RequestSignErrorException;
 import com.nb.core.exception.RequestTimeOutException;

nb-common/all-common/src/main/java/com/nb/common/config/websocket/handler/Subscribe.java → nb-common/config-common/src/main/java/com/nb/common/config/websocket/handler/Subscribe.java

@@ -3,12 +3,12 @@ package com.nb.common.config.websocket.handler;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.nb.auth.bean.LoginUser;
+import com.nb.common.config.utils.RedissonUtil;
 import com.nb.core.Constants;
 import com.nb.common.config.websocket.DefaultMessageListener;
 import com.nb.common.config.websocket.MessagingRequest;
 import com.nb.common.config.websocket.TopicMessage;
 import com.nb.common.config.websocket.WebSocketConstant;
-import com.nb.common.util.RedissonUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RPatternTopic;

nb-common/all-common/src/main/java/com/nb/common/ws/DefaultWsServerAioListener.java → nb-common/config-common/src/main/java/com/nb/common/config/websocket/ws/DefaultWsServerAioListener.java

@@ -1,4 +1,4 @@
-package com.nb.common.ws;
+package com.nb.common.config.websocket.ws;
 
 import com.nb.common.config.websocket.handler.WsHandler;
 import lombok.extern.slf4j.Slf4j;

nb-common/all-common/src/main/java/com/nb/common/ws/HeartBeatConfig.java → nb-common/config-common/src/main/java/com/nb/common/config/websocket/ws/HeartBeatConfig.java

@@ -1,4 +1,4 @@
-package com.nb.common.ws;
+package com.nb.common.config.websocket.ws;
 
 import com.nb.common.config.websocket.handler.WsHandler;
 import lombok.AllArgsConstructor;

nb-common/all-common/src/main/java/com/nb/common/ws/IWebSocketAuthFilter.java → nb-common/config-common/src/main/java/com/nb/common/config/websocket/ws/IWebSocketAuthFilter.java

@@ -1,4 +1,4 @@
-package com.nb.common.ws;
+package com.nb.common.config.websocket.ws;
 
 import org.tio.http.common.HttpRequest;
 import org.tio.http.common.HttpResponse;

nb-common/config-common/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,3 @@
+# RedisDelayQueueAutoConfiguration ×Ô¶¯×°ÅäÉùÃ÷
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.nb.common.config.ConfigAutoConfiguration

nb-common/pom.xml

@@ -17,6 +17,7 @@
         <module>crud-common</module>
         <module>delay-queue-common</module>
         <module>all-common</module>
+        <module>config-common</module>
     </modules>
 
     <dependencies>

nb-core/pom.xml

@@ -25,6 +25,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.redisson</groupId>
@@ -41,6 +42,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

nb-core/src/main/java/com/nb/core/CoreAutoConfiguration.java

@@ -0,0 +1,14 @@
+package com.nb.core;
+
+import org.springframework.context.annotation.ComponentScan;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName CoreAutoConfig.java
+ * @Description TODO
+ * @createTime 2022年08月02日 10:22:00
+ */
+@ComponentScan("com.nb.core")
+public class CoreAutoConfiguration {
+}

nb-common/all-common/src/main/java/com/nb/common/util/ExcelUtil.java → nb-core/src/main/java/com/nb/core/utils/ExcelUtil.java

@@ -1,4 +1,4 @@
-package com.nb.common.util;
+package com.nb.core.utils;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;

nb-core/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,3 @@
+# RedisDelayQueueAutoConfiguration ×Ô¶¯×°ÅäÉùÃ÷
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.nb.core.CoreAutoConfiguration

nb-system/pom.xml

@@ -12,6 +12,20 @@
     <artifactId>nb-system</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.tuoren</groupId>
+            <artifactId>nb-auth</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.tuoren</groupId>
+            <artifactId>nb-core</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.tuoren</groupId>
+            <artifactId>config-common</artifactId>
+            <version>1.0</version>
+        </dependency>
         <dependency>
             <groupId>com.tuoren</groupId>
             <artifactId>nb-oss</artifactId>
@@ -44,11 +58,6 @@
             <groupId>org.python</groupId>
             <artifactId>jython-standalone</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.tuoren</groupId>
-            <artifactId>nb-core</artifactId>
-            <version>1.0</version>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -74,11 +83,6 @@
             <version>0.56.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.tuoren</groupId>
-            <artifactId>nb-auth</artifactId>
-        </dependency>
-
 
         <dependency>
             <groupId>com.github.whvcse</groupId>

nb-system/src/main/java/com/nb/bus/entity/BusDeviceEntity.java

@@ -8,7 +8,7 @@ import com.nb.aliyun.utils.EnumUtils;
 import com.nb.bus.bean.AliIotConfig;
 import com.nb.bus.enums.DeviceStatusEnum2;
 import com.nb.bus.enums.DeviceTypeEnum;
-import com.nb.common.config.mybatis.TenantNameHandler;
+import com.nb.common.config.mybatisplus.TenantNameHandler;
 import com.nb.core.entity.TenantGenericEntity;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;

nb-system/src/main/java/com/nb/bus/hospital/HospitalManagerRegister.java

@@ -4,7 +4,7 @@ import com.nb.bus.registry.device.DeviceRegistry;
 import com.nb.bus.hospital.script.ScriptManager;
 import com.nb.bus.utils.WsPublishUtils;
 import com.nb.core.cache.manager.ConfigStorageManager;
-import com.nb.common.util.RedissonUtil;
+import com.nb.common.config.utils.RedissonUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;

nb-system/src/main/java/com/nb/bus/hospital/config/HospitalFunctionAnalConfigHandler.java

@@ -15,7 +15,7 @@ import com.nb.common.queue.delay.manager.DelayMessageManager;
 import com.nb.common.queue.delay.message.DelayMessage;
 import com.nb.common.queue.delay.message.DelayMessageProperties;
 import com.nb.core.utils.ExceptionUtil;
-import com.nb.common.util.RedissonUtil;
+import com.nb.common.config.utils.RedissonUtil;
 import lombok.Builder;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

nb-system/src/main/java/com/nb/bus/registry/device/ClusterDeviceOperator.java

@@ -12,7 +12,7 @@ import com.nb.bus.registry.constant.DeviceKeyConstant;
 import com.nb.bus.service.LocalBusDeviceService;
 import com.nb.bus.service.LocalBusInfusionHistoryService;
 import com.nb.core.Value;
-import com.nb.common.util.RedissonUtil;
+import com.nb.common.config.utils.RedissonUtil;
 import org.redisson.api.RMapCache;
 
 import java.math.BigDecimal;

nb-system/src/main/java/com/nb/bus/registry/patient/ClusterPatientOperator.java

@@ -9,7 +9,7 @@ import com.nb.bus.registry.constant.PatientKeyConstant;
 import com.nb.bus.service.LocalBusInfusionHistoryService;
 import com.nb.bus.service.LocalBusPatientService;
 import com.nb.core.Value;
-import com.nb.common.util.RedissonUtil;
+import com.nb.common.config.utils.RedissonUtil;
 import org.redisson.api.RMapCache;
 
 /**

nb-system/src/main/java/com/nb/bus/service/LocalBusHospitalService.java

@@ -19,7 +19,7 @@ import com.nb.bus.service.constant.LocalBusConMixService;
 import com.nb.bus.utils.CodeUtils;
 import com.nb.core.cache.ConfigStorage;
 import com.nb.core.cache.manager.ConfigStorageManager;
-import com.nb.common.config.mybatis.GetNameInterface;
+import com.nb.common.config.mybatisplus.GetNameInterface;
 import com.nb.common.config.websocket.HospitalCodeCheck;
 import com.nb.common.crud.BaseService;
 import com.nb.core.entity.QueryParamEntity;

nb-system/src/main/java/com/nb/bus/service/constant/LocalBusConMixService.java

@@ -10,7 +10,7 @@ import com.nb.bus.entity.BusConMixEntity;
 import com.nb.bus.enums.ConstantEnum;
 import com.nb.bus.enums.ConstantMixEnum;
 import com.nb.bus.mapper.BusConMixMapper;
-import com.nb.common.util.RedissonUtil;
+import com.nb.common.config.utils.RedissonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RMap;
 import org.springframework.beans.factory.annotation.Autowired;

nb-system/src/main/java/com/nb/bus/utils/WsPublishUtils.java

@@ -9,7 +9,7 @@ import com.nb.bus.service.dto.MonitorStatusStatsCountResult;
 import com.nb.bus.service.dto.PatientMonitorResult;
 import com.nb.common.config.websocket.TopicMessage;
 import com.nb.common.config.websocket.WebSocketConstant;
-import com.nb.common.util.RedissonUtil;
+import com.nb.common.config.utils.RedissonUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;

nb-system/src/main/java/com/nb/bus/websocket/DefaultWebSocketMsgHandler.java

@@ -6,7 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.nb.bus.hospital.HospitalManagerRegister;
 import com.nb.bus.hospital.his.HisResponse;
-import com.nb.common.ws.IWebSocketAuthFilter;
+import com.nb.common.config.websocket.ws.IWebSocketAuthFilter;
 import com.nb.core.Constants;
 import com.nb.common.config.websocket.HospitalCodeCheck;
 import com.nb.common.config.websocket.MessagingRequest;

nb-system/src/main/java/com/nb/bus/websocket/auth/HospitalAuthFilter.java

@@ -5,7 +5,7 @@ import com.nb.bus.hospital.HospitalManagerRegister;
 import com.nb.bus.hospital.his.HisScriptSession;
 import com.nb.core.Constants;
 import com.nb.common.config.websocket.HospitalCodeCheck;
-import com.nb.common.ws.IWebSocketAuthFilter;
+import com.nb.common.config.websocket.ws.IWebSocketAuthFilter;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

nb-system/src/main/java/com/nb/bus/websocket/auth/UserAuthFilter.java

@@ -3,7 +3,7 @@ package com.nb.bus.websocket.auth;
 import cn.hutool.json.JSONUtil;
 import com.nb.auth.bean.LoginUser;
 import com.nb.auth.utils.SecurityUtil;
-import com.nb.common.ws.IWebSocketAuthFilter;
+import com.nb.common.config.websocket.ws.IWebSocketAuthFilter;
 import org.springframework.stereotype.Component;
 import org.tio.core.Tio;
 import org.tio.http.common.HttpRequest;

nb-system/src/main/java/com/nb/system/controller/SysConfigController.java

@@ -5,7 +5,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.core.annotation.Log;
 import com.nb.core.result.R;
-import com.nb.common.util.ExcelUtil;
+import com.nb.core.utils.ExcelUtil;
 import com.nb.system.common.dto.SysConfigAddDTO;
 import com.nb.system.common.dto.SysConfigEditDTO;
 import com.nb.system.common.dto.SysConfigQueryDTO;

nb-system/src/main/java/com/nb/system/controller/SysDictController.java

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.core.annotation.Log;
 import com.nb.core.result.R;
-import com.nb.common.util.ExcelUtil;
+import com.nb.core.utils.ExcelUtil;
 import com.nb.system.common.dto.SysDictAddDTO;
 import com.nb.system.common.dto.SysDictEditDTO;
 import com.nb.system.common.dto.SysDictQueryDTO;

nb-system/src/main/java/com/nb/system/controller/SysDictItemController.java

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.core.annotation.Log;
 import com.nb.core.result.R;
-import com.nb.common.util.ExcelUtil;
+import com.nb.core.utils.ExcelUtil;
 import com.nb.system.common.dto.SysDictItemAddDTO;
 import com.nb.system.common.dto.SysDictItemEditDTO;
 import com.nb.system.common.dto.SysDictItemQueryDTO;

nb-system/src/main/java/com/nb/system/controller/SysPostController.java

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.core.annotation.Log;
 import com.nb.core.result.R;
-import com.nb.common.util.ExcelUtil;
+import com.nb.core.utils.ExcelUtil;
 import com.nb.system.common.dto.SysPostAddDTO;
 import com.nb.system.common.dto.SysPostEditDTO;
 import com.nb.system.common.dto.SysPostQueryDTO;

nb-system/src/main/java/com/nb/system/controller/SysRoleController.java

@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.core.annotation.Log;
 import com.nb.core.result.R;
-import com.nb.common.util.ExcelUtil;
+import com.nb.core.utils.ExcelUtil;
 import com.nb.system.common.dto.SysRoleAddDTO;
 import com.nb.system.common.dto.SysRoleAssignMenuDTO;
 import com.nb.system.common.dto.SysRoleEditDTO;

nb-system/src/main/java/com/nb/system/controller/SysUserController.java

@@ -6,7 +6,7 @@ import com.nb.auth.utils.SecurityUtil;
 import com.nb.core.annotation.Log;
 import com.nb.core.exception.CustomException;
 import com.nb.core.result.R;
-import com.nb.common.util.ExcelUtil;
+import com.nb.core.utils.ExcelUtil;
 import com.nb.system.common.dto.SysUserAddDTO;
 import com.nb.system.common.dto.SysUserEditDTO;
 import com.nb.system.common.dto.SysUserQueryDTO;

nb-system/src/main/java/com/nb/system/entity/SysConfig.java

@@ -7,7 +7,7 @@ import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.nb.core.annotation.ExcelDict;
-import com.nb.common.convert.ExcelDictConverter;
+import com.nb.common.config.convert.ExcelDictConverter;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

nb-system/src/main/java/com/nb/system/entity/SysDict.java

@@ -7,7 +7,7 @@ import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.nb.core.annotation.ExcelDict;
-import com.nb.common.convert.ExcelDictConverter;
+import com.nb.common.config.convert.ExcelDictConverter;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

nb-system/src/main/java/com/nb/system/entity/SysDictItem.java

@@ -7,7 +7,7 @@ import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.nb.core.annotation.ExcelDict;
-import com.nb.common.convert.ExcelDictConverter;
+import com.nb.common.config.convert.ExcelDictConverter;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

nb-system/src/main/java/com/nb/system/entity/SysPost.java

@@ -7,7 +7,7 @@ import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.nb.core.annotation.ExcelDict;
-import com.nb.common.convert.ExcelDictConverter;
+import com.nb.common.config.convert.ExcelDictConverter;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

nb-system/src/main/java/com/nb/system/entity/SysRole.java

@@ -6,7 +6,7 @@ import com.alibaba.excel.annotation.write.style.*;
 import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.nb.core.annotation.ExcelDict;
-import com.nb.common.convert.ExcelDictConverter;
+import com.nb.common.config.convert.ExcelDictConverter;
 import com.nb.core.entity.TenantGenericEntity;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

nb-system/src/main/java/com/nb/system/entity/SysUser.java

@@ -6,8 +6,8 @@ import com.alibaba.excel.annotation.write.style.*;
 import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
 import com.baomidou.mybatisplus.annotation.*;
 import com.nb.core.annotation.ExcelDict;
-import com.nb.common.config.mybatis.TenantNameHandler;
-import com.nb.common.convert.ExcelDictConverter;
+import com.nb.common.config.mybatisplus.TenantNameHandler;
+import com.nb.common.config.convert.ExcelDictConverter;
 import com.nb.core.entity.TenantGenericEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;

nb-system/src/main/java/com/nb/system/service/ISysDictService.java

@@ -3,7 +3,7 @@ package com.nb.system.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.nb.common.bo.DictModel;
+import com.nb.common.config.bo.DictModel;
 import com.nb.system.common.dto.SysDictAddDTO;
 import com.nb.system.common.dto.SysDictEditDTO;
 import com.nb.system.common.dto.SysDictQueryDTO;

nb-system/src/main/java/com/nb/system/service/impl/SysConfigServiceImpl.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.nb.core.enums.StatusEnum;
 import com.nb.core.exception.CustomException;
-import com.nb.common.util.ConfigUtil;
+import com.nb.common.config.utils.ConfigUtil;
 import com.nb.system.common.dto.SysConfigAddDTO;
 import com.nb.system.common.dto.SysConfigEditDTO;
 import com.nb.system.common.dto.SysConfigQueryDTO;

nb-system/src/main/java/com/nb/system/service/impl/SysDictServiceImpl.java

@@ -7,10 +7,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.nb.common.bo.DictModel;
+import com.nb.common.config.bo.DictModel;
 import com.nb.core.enums.StatusEnum;
 import com.nb.core.exception.CustomException;
-import com.nb.common.util.DictUtil;
+import com.nb.common.config.utils.DictUtil;
 import com.nb.system.common.dto.SysDictAddDTO;
 import com.nb.system.common.dto.SysDictEditDTO;
 import com.nb.system.common.dto.SysDictQueryDTO;

nb-system/src/main/java/com/nb/system/utils/CaptchaTool.java

@@ -2,7 +2,7 @@ package com.nb.system.utils;
 
 import cn.hutool.core.util.StrUtil;
 import com.nb.core.exception.CustomException;
-import com.nb.common.redis.RedisUtils;
+import com.nb.common.config.redis.RedisUtils;
 import com.wf.captcha.base.Captcha;
 import com.wf.captcha.utils.CaptchaUtil;
 import lombok.AllArgsConstructor;

nb-system/src/main/resources/mapper/bus/BusDeviceMapper.xml

@@ -17,7 +17,7 @@
         <result column="status" property="status"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
-        <result column="tenant_id" property="tenantName" typeHandler="com.nb.common.config.mybatis.TenantNameHandler"/>
+        <result column="tenant_id" property="tenantName" typeHandler="com.nb.common.config.mybatisplus.TenantNameHandler"/>
     </resultMap>
 
     <resultMap id="deviceResult" type="com.nb.bus.entity.BusDeviceEntity" autoMapping="true">