update core中添加缓存和常用工具

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

@@ -1,7 +1,7 @@
 package com.nb.admin;
 
 import com.nb.common.config.web.RequestCheckProperties;
-import com.nb.common.config.AppConfig;
+import com.nb.core.AppConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -17,7 +17,10 @@ import org.tio.websocket.starter.EnableTioWebSocketServer;
  *
  * @author Kevin
  */
-@SpringBootApplication(scanBasePackages ={"com.nb","springfox.documentation.schema"}, exclude = {DataSourceAutoConfiguration.class})
+@SpringBootApplication(scanBasePackages ={
+        "com.nb",
+//        "com.nb.aliyun","com.nb.bus","com.nb.system",
+        "springfox.documentation.schema"}, exclude = {DataSourceAutoConfiguration.class})
 @Import(cn.hutool.extra.spring.SpringUtil.class)
 @EnableTioWebSocketServer
 @EnableScheduling

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

@@ -1,7 +1,7 @@
 package com.nb.admin;
 
 import cn.hutool.core.io.FileUtil;
-import com.nb.common.util.MinioUtil;
+import com.nb.oss.strategy.MinioUtil;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

nb-common/all-common/src/main/java/com/nb/common/aspect/DemoModelAspect.java

@@ -1,39 +0,0 @@
-package com.nb.common.aspect;
-
-import com.nb.common.config.AppConfig;
-import com.nb.core.exception.DemoModeException;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * 演示环境AOP
- *
- * @author Kevin
- */
-@Aspect
-@Component
-@Slf4j
-public class DemoModelAspect {
-
-    @Pointcut("execution(public * com.nb..*.controller..*(..))")
-    public void pointcut() {
-    }
-
-    @Before("pointcut()")
-    public void before() {
-        HttpServletRequest requset = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-        if (AppConfig.isDemoEnabled()
-                && "POST".equals(requset.getMethod())
-                && !requset.getRequestURI().contains("/login")) {
-            throw new DemoModeException();
-        }
-    }
-
-}

nb-common/all-common/src/main/java/com/nb/common/bo/SysRoleBO.java

@@ -1,40 +0,0 @@
-package com.nb.common.bo;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 角色
- *
- * @author Kevin
- */
-@Data
-public class SysRoleBO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-
-    /**
-     * 角色编码
-     */
-    private String roleCode;
-
-    /**
-     * 角色名称
-     */
-    private String roleName;
-
-    /**
-     * 数据范围 1全部数据权限；2自定数据权限；3本部门数据权限；4本部门及以下数据权限
-     */
-    private String dataScope;
-
-}

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

@@ -9,7 +9,6 @@ import com.nb.common.config.CacheHttpServletRequestWrapper;
 import com.nb.core.exception.RequestParmErrorException;
 import com.nb.core.exception.RequestSignErrorException;
 import com.nb.core.exception.RequestTimeOutException;
-import com.nb.common.util.IpUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -52,7 +51,7 @@ public class CheckRequestHandler  implements HandlerInterceptor {
             try {
                 checkTime( Long.valueOf(timestamp));
             }catch (NumberFormatException e){
-                log.error("时区错误,IP地址：【{}】，接受时间戳：【{}】，本地时间戳：【{}】，相差超过10分钟", IpUtil.getClientIp(request),timestamp,System.currentTimeMillis());
+//                log.error("时区错误,IP地址：【{}】，接受时间戳：【{}】，本地时间戳：【{}】，相差超过10分钟", IpUtil.getClientIp(request),timestamp,System.currentTimeMillis());
                 throw new RequestParmErrorException();
             }
             checkSign(sign,timestamp,authorization,body);

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

@@ -3,7 +3,7 @@ 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.Constants;
+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;

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

@@ -1,57 +0,0 @@
-package com.nb.common.util;
-
-import cn.hutool.core.net.NetUtil;
-import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-import com.nb.common.config.AppConfig;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * 获取地址类
- *
- * @author Kevin
- */
-@Slf4j
-public class AddressUtil {
-    /**
-     * IP地址查询
-     */
-    public static final String IP_URL = "http://whois.pconline.com.cn/ipJson.jsp";
-
-    /**
-     * 未知地址
-     */
-    public static final String UNKNOWN = "XX XX";
-
-    public static String getRealAddressByIp(String ip) {
-        String address = UNKNOWN;
-        // 内网不查询
-        try {
-            if (NetUtil.isInnerIP(ip)) {
-                return "内网IP";
-            }
-            if (AppConfig.isAddressEnabled()) {
-                try {
-                    String rspStr = HttpUtil.get(IP_URL + "?ip=" + ip + "&json=true", CharsetUtil.CHARSET_GBK);
-                    if (CharSequenceUtil.isEmpty(rspStr)) {
-                        log.error("获取地理位置异常 {}", ip);
-                        return UNKNOWN;
-                    }
-                    JSONObject obj = JSONUtil.parseObj(rspStr);
-                    String region = obj.getStr("pro");
-                    String city = obj.getStr("city");
-                    return String.format("%s %s", region, city);
-                } catch (Exception e) {
-                    log.error("获取地理位置异常 {}", ip);
-                }
-            }
-            return address;
-        }catch (Exception e){
-            return UNKNOWN;
-        }
-
-    }
-}

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

@@ -2,7 +2,7 @@ package com.nb.common.util;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import com.nb.common.Constants;
+import com.nb.core.Constants;
 import com.nb.common.redis.RedisUtils;
 
 import java.util.Collection;

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

@@ -2,7 +2,7 @@ package com.nb.common.util;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import com.nb.common.Constants;
+import com.nb.core.Constants;
 import com.nb.common.bo.DictModel;
 import com.nb.common.redis.RedisUtils;
 import com.google.common.collect.Lists;

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

@@ -4,7 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.excel.EasyExcel;
-import com.nb.common.config.AppConfig;
+import com.nb.core.AppConfig;
 import com.nb.common.enums.BizEnum;
 import lombok.extern.slf4j.Slf4j;
 

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

@@ -1,21 +0,0 @@
-package com.nb.common.util;
-
-import cn.hutool.core.lang.Singleton;
-import cn.hutool.core.lang.Snowflake;
-
-/**
- * ID生成器工具类
- *
- * @author Kevin
- */
-public class IdUtil {
-    /**
-     * 雪花算法，采用系统时钟
-     * https://blog.csdn.net/weixin_42444592/article/details/109643200
-     *
-     * @return 随机UUID
-     */
-    public static Long getSnowflakeId() {
-        return Singleton.get(Snowflake.class, 0L, 0L, true).nextId();
-    }
-}

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

@@ -1,54 +0,0 @@
-package com.nb.common.util;
-
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.servlet.ServletUtil;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * IP获取工具
- *
- * @author Kevin
- */
-public class IpUtil {
-
-    public static String getClientIp(HttpServletRequest request) {
-//        // natapp穿透工具搭建的环境，通过header，X-Natapp-Ip，获取
-//        String ipAddress = ServletUtil.getClientIPByHeader(request, "X-Natapp-Ip");
-//        if (StrUtil.isBlank(ipAddress)) {
-//            ipAddress = ServletUtil.getClientIP(request);
-//        }
-//        // 本地开发，客户端和服务器在同一台机器，获取到是0:0:0:0:0:0:0:1，ip6地址，需要进行转换
-//        ipAddress = "0:0:0:0:0:0:0:1".equals(ipAddress) ? "127.0.0.1" : ipAddress;
-        return getIpAddress(request);
-    }
-
-    public static String getIpAddress(HttpServletRequest request) {
-
-        String sourceIp = null;
-
-        String ipAddresses = request.getHeader("x-forwarded-for");
-
-        if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
-            ipAddresses = request.getHeader("Proxy-Client-IP");
-        }
-        if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
-            ipAddresses = request.getHeader("WL-Proxy-Client-IP");
-        }
-        if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
-            ipAddresses = request.getHeader("HTTP_CLIENT_IP");
-        }
-        if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
-            ipAddresses = request.getHeader("HTTP_X_FORWARDED_FOR");
-        }
-        if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
-            ipAddresses = request.getRemoteAddr();
-        }
-        if (!StrUtil.isEmpty(ipAddresses)) {
-            sourceIp = ipAddresses.split(",")[0];
-        }
-
-        return sourceIp;
-    }
-
-}

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

@@ -5,7 +5,7 @@
 //import cn.hutool.core.collection.CollUtil;
 //import cn.hutool.core.util.StrUtil;
 //import cn.hutool.crypto.digest.BCrypt;
-//import com.nb.common.Constants;
+//import com.nb.core.Constants;
 //import com.nb.common.bo.LoginUser;
 //import com.nb.common.bo.SysRoleBO;
 //import com.nb.common.bo.SysUserBO;

nb-common/delay-queue-common/src/main/java/com/nb/common/queue/delay/RedisDelayQueueAutoConfiguration.java

@@ -0,0 +1,17 @@
+package com.nb.common.queue.delay;
+
+import org.redisson.api.RedissonClient;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnResource;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConditionalOnClass(RedissonClient.class)
+@ConditionalOnResource(resources = "META-INF/spring.factories")
+@ConditionalOnWebApplication
+@ComponentScan("com.nb.common.queue.delay")
+public class RedisDelayQueueAutoConfiguration {
+
+}

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

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

nb-common/delay-queue-common/src/main/java/com/nb/common/queue/delay/manager/RedissonDelayMessageManager.java → nb-common/delay-queue-common/src/main/java/com/nb/common/queue/delay/RedissonDelayMessageManager.java

@@ -1,10 +1,11 @@
-package com.nb.common.queue.delay.manager;
+package com.nb.common.queue.delay;
 
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.nb.common.queue.delay.handler.DelayMessageHandler;
+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.Value;

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

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

nb-core/pom.xml

@@ -14,6 +14,10 @@
     <description>核心包，包含了一些基础信息</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
@@ -49,5 +53,9 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+        </dependency>
     </dependencies>
 </project>

nb-common/all-common/src/main/java/com/nb/common/config/AppConfig.java → nb-core/src/main/java/com/nb/core/AppConfig.java

@@ -1,4 +1,4 @@
-package com.nb.common.config;
+package com.nb.core;
 
 import lombok.Getter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -23,8 +23,8 @@ public class AppConfig {
     /**
      * 实例演示开关
      */
-    @Getter
-    private static boolean demoEnabled = false;
+//    @Getter
+//    private static boolean demoEnabled = false;
 
     /**
      * 获取地址开关
@@ -54,9 +54,9 @@ public class AppConfig {
         AppConfig.name = name;
     }
 
-    public void setDemoEnabled(boolean demoEnabled) {
-        AppConfig.demoEnabled = demoEnabled;
-    }
+//    public void setDemoEnabled(boolean demoEnabled) {
+//        AppConfig.demoEnabled = demoEnabled;
+//    }
 
     public void setAddressEnabled(boolean addressEnabled) {
         AppConfig.addressEnabled = addressEnabled;

nb-common/all-common/src/main/java/com/nb/common/Constants.java → nb-core/src/main/java/com/nb/core/Constants.java

@@ -1,6 +1,6 @@
-package com.nb.common;
+package com.nb.core;
 
-import com.nb.common.config.AppConfig;
+import com.nb.core.AppConfig;
 
 /**
  * 常量类

nb-common/all-common/src/main/java/com/nb/common/cache/CacheConfig.java → nb-core/src/main/java/com/nb/core/cache/CacheManagerConfig.java

@@ -1,4 +1,4 @@
-package com.nb.common.cache;
+package com.nb.core.cache;
 
 import org.springframework.cache.CacheManager;
 import org.springframework.context.annotation.Bean;
@@ -23,7 +23,7 @@ import java.time.Duration;
  * @createTime 2022年04月06日 22:31:00
  */
 @Component
-public class CacheConfig {
+public class CacheManagerConfig {
     @Primary
     @Bean
     public CacheManager cacheManager(RedisConnectionFactory redisConnectionFactory){

nb-common/all-common/src/main/java/com/nb/common/cache/ClusterConfigStorage.java → nb-core/src/main/java/com/nb/core/cache/ClusterConfigStorage.java

@@ -1,4 +1,4 @@
-package com.nb.common.cache;
+package com.nb.core.cache;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.IEnum;

nb-common/all-common/src/main/java/com/nb/common/cache/ConfigStorage.java → nb-core/src/main/java/com/nb/core/cache/ConfigStorage.java

@@ -1,4 +1,4 @@
-package com.nb.common.cache;
+package com.nb.core.cache;
 
 
 import com.nb.core.Value;

nb-common/all-common/src/main/java/com/nb/common/cache/manager/ClusterConfigStorageManager.java → nb-core/src/main/java/com/nb/core/cache/manager/ClusterStorageManager.java

@@ -1,8 +1,9 @@
-package com.nb.common.cache.manager;
+package com.nb.core.cache.manager;
 
-import com.nb.common.cache.ClusterConfigStorage;
-import com.nb.common.cache.ConfigStorage;
+import com.nb.core.cache.ClusterConfigStorage;
+import com.nb.core.cache.ConfigStorage;
 import org.redisson.api.RedissonClient;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
@@ -18,17 +19,15 @@ import java.util.concurrent.ConcurrentHashMap;
  **/
 
 @Component
-public class ClusterConfigStorageManager implements ConfigStorageManager {
-
-    private final RedissonClient redissonClient;
+@ConditionalOnBean(ConfigStorageManager.class)
+public class ClusterStorageManager implements ConfigStorageManager {
 
     private final RedisTemplate redisTemplate;
 
 
     private Map<String,ClusterConfigStorage > storageMap=new ConcurrentHashMap<>();
 
-    public ClusterConfigStorageManager(RedissonClient redissonClient,RedisTemplate redisTemplate) {
-        this.redissonClient = redissonClient;
+    public ClusterStorageManager(RedisTemplate redisTemplate) {
         this.redisTemplate=redisTemplate;
     }
 

nb-common/all-common/src/main/java/com/nb/common/cache/manager/ConfigStorageManager.java → nb-core/src/main/java/com/nb/core/cache/manager/ConfigStorageManager.java

@@ -1,6 +1,6 @@
-package com.nb.common.cache.manager;
+package com.nb.core.cache.manager;
 
-import com.nb.common.cache.ConfigStorage;
+import com.nb.core.cache.ConfigStorage;
 
 /** 
  * @Author lifang

nb-common/all-common/src/main/java/com/nb/common/cache/message/ClusterCache.java → nb-core/src/main/java/com/nb/core/cache/message/ClusterCache.java

@@ -1,4 +1,4 @@
-package com.nb.common.cache.message;
+package com.nb.core.cache.message;
 
 import reactor.core.publisher.Mono;
 

nb-common/all-common/src/main/java/com/nb/common/cache/message/RedisClusterCache.java → nb-core/src/main/java/com/nb/core/cache/message/RedisClusterCache.java

@@ -1,4 +1,4 @@
-package com.nb.common.cache.message;
+package com.nb.core.cache.message;
 
 import org.springframework.data.redis.core.Cursor;
 import org.springframework.data.redis.core.HashOperations;

nb-common/all-common/src/main/java/com/nb/common/thread/DefaultHandlerThreadFactory.java → nb-core/src/main/java/com/nb/core/thread/DefaultHandlerThreadFactory.java

@@ -1,7 +1,6 @@
-package com.nb.common.thread;
-
-import org.jetbrains.annotations.NotNull;
+package com.nb.core.thread;
 
+import javax.validation.constraints.NotNull;
 import java.util.concurrent.ThreadFactory;
 
 /**

nb-common/all-common/src/main/java/com/nb/common/thread/DefaultUncaughtExceptionHandler.java → nb-core/src/main/java/com/nb/core/thread/DefaultUncaughtExceptionHandler.java

@@ -1,4 +1,4 @@
-package com.nb.common.thread;
+package com.nb.core.thread;
 
 import lombok.extern.slf4j.Slf4j;
 

nb-common/all-common/src/main/java/com/nb/common/thread/ExecutorConfig.java → nb-core/src/main/java/com/nb/core/thread/ExecutorConfig.java

@@ -1,4 +1,4 @@
-package com.nb.common.thread;
+package com.nb.core.thread;
 
 import org.springframework.boot.autoconfigure.task.TaskSchedulingProperties;
 import org.springframework.context.annotation.Bean;

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

@@ -1,4 +1,4 @@
-package com.nb.common.util;
+package com.nb.core.utils;
 
 /**
  * @author lifang

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

@@ -1,4 +1,4 @@
-package com.nb.common.util;
+package com.nb.core.utils;
 
 /**
  * @author lifang

nb-oss/src/main/java/com/nb/oss/strategy/FileStorageStrategy.java

@@ -1,6 +1,6 @@
 package com.nb.oss.strategy;
 
-import com.nb.oss.strategy.storage.SysStorage;
+import com.nb.oss.strategy.entity.SysStorage;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;

nb-common/all-common/src/main/java/com/nb/common/util/FileUtil.java → nb-oss/src/main/java/com/nb/oss/strategy/FileUtil.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.nb.common.util;
+package com.nb.oss.strategy;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.IdUtil;

nb-common/all-common/src/main/java/com/nb/common/config/MinioConfig.java → nb-oss/src/main/java/com/nb/oss/strategy/MinioConfig.java

@@ -1,4 +1,4 @@
-package com.nb.common.config;
+package com.nb.oss.strategy;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

nb-common/all-common/src/main/java/com/nb/common/util/MinioUtil.java → nb-oss/src/main/java/com/nb/oss/strategy/MinioUtil.java

@@ -1,6 +1,5 @@
-package com.nb.common.util;
+package com.nb.oss.strategy;
 
-import com.nb.common.config.MinioConfig;
 import com.nb.core.exception.CustomException;
 import io.minio.*;
 import lombok.extern.slf4j.Slf4j;

nb-oss/src/main/java/com/nb/oss/strategy/OssAutoConfiguration.java

@@ -0,0 +1,26 @@
+package com.nb.oss.strategy;
+
+import com.nb.auth.utils.SecurityUtil;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnResource;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName OssAutoConfiguration.java
+ * @Description TODO
+ * @createTime 2022年08月01日 22:24:00
+ */
+
+@Configuration
+@ConditionalOnClass(SecurityUtil.class)
+@ConditionalOnResource(resources = "META-INF/spring.factories")
+@ConditionalOnWebApplication
+@ComponentScan("com.nb.oss.strategy")
+@MapperScan("com.nb.oss.strategy.mapper")
+public class OssAutoConfiguration {
+}

nb-oss/src/main/java/com/nb/oss/strategy/context/FileStorageContext.java

@@ -1,6 +1,6 @@
 package com.nb.oss.strategy.context;
 
-import com.nb.common.config.AppConfig;
+import com.nb.core.AppConfig;
 import com.nb.core.exception.CustomException;
 import com.nb.oss.strategy.FileStorageStrategy;
 import com.google.common.collect.Maps;

nb-admin/src/main/java/com/nb/admin/controller/common/CommonController.java → nb-oss/src/main/java/com/nb/oss/strategy/controller/CommonController.java

@@ -1,4 +1,4 @@
-package com.nb.admin.controller.common;
+package com.nb.oss.strategy.controller;
 
 import cn.hutool.core.io.FileUtil;
 import com.nb.core.exception.CustomException;
@@ -6,7 +6,7 @@ import com.nb.core.result.R;
 import com.nb.core.result.ResultCode;
 import com.nb.oss.strategy.FileStorageStrategy;
 import com.nb.oss.strategy.context.FileStorageContext;
-import com.nb.oss.strategy.storage.SysStorage;
+import com.nb.oss.strategy.entity.SysStorage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;

nb-oss/src/main/java/com/nb/oss/strategy/doc/OssDocConfig.java

@@ -0,0 +1,30 @@
+package com.nb.oss.strategy.doc;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName OssDocConfig.java
+ * @Description TODO
+ * @createTime 2022年08月01日 22:28:00
+ */
+@Component
+public class OssDocConfig {
+    @Bean
+    @Profile("dev")
+    public Docket ossDoc(){
+        return new Docket(DocumentationType.SWAGGER_2)
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.nb.oss.strategy.controller"))
+                .paths(PathSelectors.any())
+                .build()
+                .groupName("文件存储模块");
+    }
+}

nb-oss/src/main/java/com/nb/oss/strategy/storage/SysStorage.java → nb-oss/src/main/java/com/nb/oss/strategy/entity/SysStorage.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.nb.oss.strategy.storage;
+package com.nb.oss.strategy.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.nb.core.entity.GenericEntity;

nb-oss/src/main/java/com/nb/oss/strategy/impl/AliyunStorageStrategy.java

@@ -1,7 +1,7 @@
 package com.nb.oss.strategy.impl;
 
 import com.nb.common.enums.FileStorageStrategyEnum;
-import com.nb.oss.strategy.storage.SysStorage;
+import com.nb.oss.strategy.entity.SysStorage;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 

nb-oss/src/main/java/com/nb/oss/strategy/impl/MinioStorageStrategy.java

@@ -1,12 +1,12 @@
 package com.nb.oss.strategy.impl;
 
 import cn.hutool.core.text.CharSequenceUtil;
-import com.nb.common.config.MinioConfig;
+import com.nb.oss.strategy.MinioConfig;
 import com.nb.common.enums.FileStorageStrategyEnum;
-import com.nb.common.util.FileUtil;
-import com.nb.common.util.MinioUtil;
-import com.nb.oss.strategy.storage.LocalSysStorageService;
-import com.nb.oss.strategy.storage.SysStorage;
+import com.nb.oss.strategy.FileUtil;
+import com.nb.oss.strategy.MinioUtil;
+import com.nb.oss.strategy.service.LocalSysStorageService;
+import com.nb.oss.strategy.entity.SysStorage;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;

nb-oss/src/main/java/com/nb/oss/strategy/storage/mapper/SysLocalStorageMapper.java → nb-oss/src/main/java/com/nb/oss/strategy/mapper/SysLocalStorageMapper.java

@@ -1,7 +1,7 @@
-package com.nb.oss.strategy.storage.mapper;
+package com.nb.oss.strategy.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.nb.oss.strategy.storage.SysStorage;
+import com.nb.oss.strategy.entity.SysStorage;
 
 /**
  * <p>

nb-oss/src/main/java/com/nb/oss/strategy/storage/LocalSysStorageService.java → nb-oss/src/main/java/com/nb/oss/strategy/service/LocalSysStorageService.java

@@ -1,7 +1,8 @@
-package com.nb.oss.strategy.storage;
+package com.nb.oss.strategy.service;
 
 import com.nb.common.crud.BaseService;
-import com.nb.oss.strategy.storage.mapper.SysLocalStorageMapper;
+import com.nb.oss.strategy.entity.SysStorage;
+import com.nb.oss.strategy.mapper.SysLocalStorageMapper;
 import org.springframework.stereotype.Service;
 
 /**

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

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

nb-system/src/main/java/com/nb/aliyun/AliyunConsumerGroupService.java

@@ -16,7 +16,7 @@ import com.nb.bus.listener.event.bean.DeviceInfoEvent;
 import com.nb.bus.service.LocalBusDeviceService;
 import com.nb.bus.service.LocalBusHospitalLogService;
 import com.nb.bus.listener.DeviceInfoListener;
-import com.nb.common.util.ExceptionUtil;
+import com.nb.core.utils.ExceptionUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

nb-system/src/main/java/com/nb/aliyun/sdk/AliyunIotSdk.java

@@ -8,7 +8,7 @@ import com.aliyuncs.iot.model.v20180120.*;
 import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.profile.IClientProfile;
 import com.nb.aliyun.PlatformAccount;
-import com.nb.common.util.ExceptionUtil;
+import com.nb.core.utils.ExceptionUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

nb-system/src/main/java/com/nb/bus/controller/BusStatsAnalyseController.java

@@ -7,7 +7,7 @@ import com.nb.bus.enums.StatsAnalyseEnum;
 import com.nb.bus.service.dto.CombineQuery;
 import com.nb.bus.stats.CommonStats;
 import com.nb.bus.stats.entity.StatsAnalyseResult;
-import com.nb.common.util.ThreadUtil;
+import com.nb.core.utils.ThreadUtil;
 import com.nb.core.exception.CustomException;
 import com.nb.core.exception.TenantException;
 import com.nb.core.result.R;

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

@@ -14,9 +14,8 @@ import com.nb.bus.hospital.his.HisScriptSession;
 import com.nb.bus.hospital.his.strategy.HisStrategyEnum;
 import com.nb.bus.hospital.script.ScriptManager;
 import com.nb.bus.service.*;
-import com.nb.common.cache.ConfigStorage;
-import com.nb.common.cache.manager.ConfigStorageManager;
-import com.nb.common.util.RedissonUtil;
+import com.nb.core.cache.ConfigStorage;
+import com.nb.core.cache.manager.ConfigStorageManager;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 

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

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

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

@@ -1,6 +1,6 @@
 package com.nb.bus.hospital.config;
 
-import com.nb.common.cache.ConfigStorage;
+import com.nb.core.cache.ConfigStorage;
 import com.nb.core.Value;
 import lombok.Getter;
 

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

@@ -8,7 +8,7 @@ import com.nb.bus.enums.DeviceStatusEnum;
 import com.nb.bus.hospital.config.handler.HandlerConstant;
 import com.nb.bus.hospital.enums.ConfigHandlerEnums;
 import com.nb.bus.service.dto.UndoDeviceConfig;
-import com.nb.common.cache.ConfigStorage;
+import com.nb.core.cache.ConfigStorage;
 import com.nb.core.Value;
 import com.nb.common.queue.delay.manager.DelayMessageManager;
 import com.nb.common.queue.delay.message.DelayMessage;

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

@@ -8,7 +8,7 @@ import com.nb.bus.enums.DeviceStatusEnum;
 import com.nb.bus.hospital.config.handler.HandlerConstant;
 import com.nb.bus.hospital.enums.ConfigHandlerEnums;
 import com.nb.bus.service.dto.UndoDeviceConfig;
-import com.nb.common.cache.ConfigStorage;
+import com.nb.core.cache.ConfigStorage;
 import com.nb.core.Value;
 import com.nb.common.queue.delay.manager.DelayMessageManager;
 import com.nb.common.queue.delay.message.DelayMessage;

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

@@ -9,12 +9,12 @@ import com.nb.bus.hospital.config.bean.FunctionAnalConfig;
 import com.nb.bus.entity.BusDeviceRunningEntity;
 import com.nb.bus.hospital.config.handler.HandlerConstant;
 import com.nb.bus.hospital.enums.ConfigHandlerEnums;
-import com.nb.common.cache.ConfigStorage;
+import com.nb.core.cache.ConfigStorage;
 import com.nb.core.Value;
 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.common.util.ExceptionUtil;
+import com.nb.core.utils.ExceptionUtil;
 import com.nb.common.util.RedissonUtil;
 import lombok.Builder;
 import lombok.Data;

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

@@ -10,7 +10,7 @@ import com.nb.bus.hospital.config.handler.HandlerConstant;
 import com.nb.bus.hospital.enums.ConfigHandlerEnums;
 import com.nb.bus.registry.device.DeviceOperator;
 import com.nb.bus.registry.device.DeviceRegistry;
-import com.nb.common.cache.ConfigStorage;
+import com.nb.core.cache.ConfigStorage;
 import com.nb.core.Value;
 import com.nb.common.queue.delay.manager.DelayMessageManager;
 import com.nb.common.queue.delay.message.DelayMessage;

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

@@ -5,8 +5,7 @@ import cn.hutool.json.JSONUtil;
 import com.nb.bus.entity.BusDeviceRunningEntity;
 import com.nb.bus.hospital.config.bean.FunctionPatientCodeConfig;
 import com.nb.bus.hospital.enums.ConfigHandlerEnums;
-import com.nb.common.cache.ConfigStorage;
-import com.nb.common.util.RedissonUtil;
+import com.nb.core.cache.ConfigStorage;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Objects;

nb-system/src/main/java/com/nb/bus/hospital/his/HisScriptSession.java

@@ -20,13 +20,13 @@ import com.nb.bus.hospital.script.ScriptManager;
 import com.nb.bus.hospital.script.ScriptParse;
 import com.nb.bus.service.LocalBusClinicService;
 import com.nb.bus.service.LocalBusHospitalService;
-import com.nb.common.cache.ConfigStorage;
-import com.nb.common.cache.manager.ConfigStorageManager;
+import com.nb.core.cache.ConfigStorage;
+import com.nb.core.cache.manager.ConfigStorageManager;
 import com.nb.core.Value;
 import com.nb.core.exception.CustomException;
 import com.nb.core.exception.ScriptException;
 import com.nb.core.result.R;
-import com.nb.common.util.ExceptionUtil;
+import com.nb.core.utils.ExceptionUtil;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.Assert;

nb-system/src/main/java/com/nb/bus/hospital/his/HisScriptSessionManager.java

@@ -1,7 +1,7 @@
 package com.nb.bus.hospital.his;
 
 import com.nb.bus.hospital.script.ScriptManager;
-import com.nb.common.cache.manager.ClusterConfigStorageManager;
+import com.nb.core.cache.manager.ClusterStorageManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -19,9 +19,9 @@ import java.util.concurrent.ConcurrentHashMap;
 public class HisScriptSessionManager {
     private Map<String,HisScriptSession> sessionMap=new ConcurrentHashMap<>();
     private ScriptManager scriptManager;
-    private ClusterConfigStorageManager configStorageManager;
+    private ClusterStorageManager configStorageManager;
     @Autowired
-    public HisScriptSessionManager(  ScriptManager scriptManager, ClusterConfigStorageManager configStorageManager) {
+    public HisScriptSessionManager(ScriptManager scriptManager, ClusterStorageManager configStorageManager) {
         this.scriptManager = scriptManager;
         this.configStorageManager = configStorageManager;
     }

nb-system/src/main/java/com/nb/bus/listener/DeviceInfoListener.java

@@ -20,7 +20,7 @@ import com.nb.bus.registry.patient.PatientOperator;
 import com.nb.bus.registry.patient.PatientRegistry;
 import com.nb.bus.service.*;
 import com.nb.bus.utils.WsPublishUtils;
-import com.nb.common.util.ExceptionUtil;
+import com.nb.core.utils.ExceptionUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.event.EventListener;

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

@@ -21,7 +21,7 @@ import com.nb.bus.service.dto.DeviceQuery;
 import com.nb.bus.service.dto.DeviceResult;
 import com.nb.common.crud.BaseService;
 import com.nb.core.exception.CustomException;
-import com.nb.common.util.ExceptionUtil;
+import com.nb.core.utils.ExceptionUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;

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

@@ -17,8 +17,8 @@ import com.nb.bus.mapper.BusHospitalMapper;
 import com.nb.bus.service.constant.LocalBusConAlarmService;
 import com.nb.bus.service.constant.LocalBusConMixService;
 import com.nb.bus.utils.CodeUtils;
-import com.nb.common.cache.ConfigStorage;
-import com.nb.common.cache.manager.ConfigStorageManager;
+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.websocket.HospitalCodeCheck;
 import com.nb.common.crud.BaseService;

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

@@ -26,7 +26,7 @@ import com.nb.bus.utils.WsPublishUtils;
 import com.nb.common.crud.BaseService;
 import com.nb.core.exception.CustomException;
 import com.nb.core.result.R;
-import com.nb.common.util.ExceptionUtil;
+import com.nb.core.utils.ExceptionUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;

nb-system/src/main/java/com/nb/bus/stats/analyse/AlarmStatsAnalyse.java

@@ -11,7 +11,7 @@ import com.nb.bus.service.dto.CombineQuery;
 import com.nb.bus.stats.CommonStats;
 import com.nb.bus.stats.entity.*;
 import com.nb.bus.stats.enums.PieEnum;
-import com.nb.common.util.ThreadUtil;
+import com.nb.core.utils.ThreadUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.springframework.stereotype.Service;

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

@@ -7,7 +7,7 @@ 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.Constants;
+import com.nb.core.Constants;
 import com.nb.common.config.websocket.HospitalCodeCheck;
 import com.nb.common.config.websocket.MessagingRequest;
 import com.nb.common.config.websocket.handler.WsHandler;

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

@@ -2,7 +2,7 @@ package com.nb.bus.websocket;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.nb.bus.hospital.his.HisScriptSessionManager;
-import com.nb.common.Constants;
+import com.nb.core.Constants;
 import com.nb.common.config.websocket.handler.Subscribe;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -3,7 +3,7 @@ package com.nb.bus.websocket.auth;
 import cn.hutool.core.text.CharSequenceUtil;
 import com.nb.bus.hospital.HospitalManagerRegister;
 import com.nb.bus.hospital.his.HisScriptSession;
-import com.nb.common.Constants;
+import com.nb.core.Constants;
 import com.nb.common.config.websocket.HospitalCodeCheck;
 import com.nb.common.ws.IWebSocketAuthFilter;
 import lombok.AllArgsConstructor;

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

@@ -10,7 +10,7 @@ import org.tio.http.common.HttpRequest;
 import org.tio.http.common.HttpResponse;
 import org.tio.core.ChannelContext;
 
-import static com.nb.common.Constants.LOGIN_USER_KEY;
+import static com.nb.core.Constants.LOGIN_USER_KEY;
 
 /**
  * @author lifang

nb-system/src/main/java/com/nb/system/config/DefaultApplyManager.java

@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Sets;
 import com.nb.common.apply.ApplyManager;
-import com.nb.common.cache.ConfigStorage;
-import com.nb.common.cache.manager.ClusterConfigStorageManager;
+import com.nb.core.cache.ConfigStorage;
+import com.nb.core.cache.manager.ClusterStorageManager;
 import com.nb.core.Value;
 import com.nb.common.enums.MenuTypeEnum;
 import com.nb.common.enums.StatusEnum;
@@ -38,8 +38,8 @@ public class DefaultApplyManager implements ApplyManager {
     private final ConfigStorage storage;
     private final LocalSysApplyMenuService sysApplyMenuService;
     private final ISysMenuService sysMenuService;
-    public DefaultApplyManager(ClusterConfigStorageManager clusterConfigStorageManager,LocalSysApplyMenuService sysApplyMenuService, ISysMenuService sysMenuService) {
-        this.storage = clusterConfigStorageManager.getStorage("apply");
+    public DefaultApplyManager(ClusterStorageManager clusterStorageManager, LocalSysApplyMenuService sysApplyMenuService, ISysMenuService sysMenuService) {
+        this.storage = clusterStorageManager.getStorage("apply");
         this.sysApplyMenuService=sysApplyMenuService;
         this.sysMenuService=sysMenuService;
     }

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

@@ -12,7 +12,7 @@ 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.auth.bean.LoginUser;
-import com.nb.common.Constants;
+import com.nb.core.Constants;
 import com.nb.common.enums.MenuTypeEnum;
 import com.nb.common.enums.StatusEnum;
 import com.nb.core.exception.CustomException;

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

@@ -14,8 +14,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.nb.auth.bean.LoginUser;
 import com.nb.auth.bean.SysRoleInfo;
 import com.nb.auth.utils.SecurityUtil;
-import com.nb.common.Constants;
-import com.nb.common.bo.SysRoleBO;
+import com.nb.core.Constants;
 import com.nb.common.enums.StatusEnum;
 import com.nb.common.enums.YesNoEnum;
 import com.nb.core.exception.CustomException;