update 文件分模块

nb-admin/pom.xml

@@ -34,39 +34,39 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <!--<build>-->
         <!--<plugins>-->
             <!--<plugin>-->
                 <!--<groupId>org.springframework.boot</groupId>-->
                 <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
-                <!--<configuration>-->
-                    <!--<mainClass>com.coffee.admin.AdminApplication</mainClass>-->
-                <!--</configuration>-->
-                <!--<executions>-->
-                    <!--<execution>-->
-                        <!--<goals>-->
-                            <!--<goal>repackage</goal>-->
-                        <!--</goals>-->
-                    <!--</execution>-->
-                <!--</executions>-->
-            <!--</plugin>-->
-            <!--&lt;!&ndash; 跳过单元测试 &ndash;&gt;-->
-            <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-surefire-plugin</artifactId>-->
-                <!--<configuration>-->
-                    <!--<skipTests>true</skipTests>-->
-                <!--</configuration>-->
             <!--</plugin>-->
         <!--</plugins>-->
     <!--</build>-->
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.coffee.admin.AdminApplication</mainClass>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- 跳过单元测试 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

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

@@ -1,6 +1,7 @@
 package com.nb.admin;
 
 import com.nb.common.config.web.RequestCheckProperties;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -17,13 +18,14 @@ import org.tio.websocket.starter.EnableTioWebSocketServer;
  * @author Kevin
  */
 @SpringBootApplication(scanBasePackages ={
-        "com.nb",
-//        "com.nb.aliyun","com.nb.bus","com.nb.system",
+        "com.nb.admin",  "com.nb.framework",
+        "com.nb.aliyun","com.nb.bus","com.nb.system",
         "springfox.documentation.schema"}, exclude = {DataSourceAutoConfiguration.class})
 @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)
 @ServletComponentScan(basePackages = "com.nb.common.config")
 public class AdminApplication {

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.nb.core.config;
+package com.nb.admin.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.core.config.serializer.BooleanToIntegerSerializer;
-import com.nb.core.config.serializer.EnumDeserializer;
+import com.nb.admin.config.serializer.BooleanToIntegerSerializer;
+import com.nb.admin.config.serializer.EnumDeserializer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Configuration;

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

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

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

@@ -1,4 +1,4 @@
-package com.nb.core.config.datasource;
+package com.nb.admin.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.core.config.properties.DruidProperties;
+import com.nb.admin.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-core/src/main/java/com/nb/core/config/datasource/DynamicDataSource.java → nb-admin/src/main/java/com/nb/admin/config/datasource/DynamicDataSource.java

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

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

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

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

@@ -1,13 +1,10 @@
-package com.nb.core.config.mybatisplus;
+package com.nb.admin.config.mybatisplus;
 
 import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.MySqlDialect;
-import com.nb.core.config.mybatisplus.handler.CreateAndUpdateMetaObjectHandler;
 import lombok.AllArgsConstructor;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 /**
@@ -17,7 +14,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
  */
 @EnableTransactionManagement(proxyTargetClass = true)
 @AllArgsConstructor
-@MapperScan({"${mybatis-plus.mapperPackage}","com.nb.framework.test.mapper","com.nb"})
 public class MybatisPlusConfig {
     private final TenantLineInnerInterceptor tenantLineInnerInterceptor;
     @Bean

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

@@ -1,4 +1,4 @@
-package com.nb.core.config.mybatisplus.handler;
+package com.nb.admin.config.mybatisplus.handler;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.nb.core.exception.CustomException;

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

@@ -1,4 +1,4 @@
-package com.nb.core.config.mybatisplus.interceptor;
+package com.nb.admin.config.mybatisplus.interceptor;
 
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;

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

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

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

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

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

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

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

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

nb-admin/src/main/resources/logback-spring.xml

@@ -6,7 +6,7 @@
     <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>
 
 
-    <appender name="ERRORLOGEventPublisher" class="com.nb.framework.logback.SystemLoggingAppender">
+    <appender name="ERRORLOGEventPublisher" class="com.nb.common.log.SystemLoggingAppender">
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>WARN</level>
         </filter>

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

@@ -17,7 +17,7 @@ import com.nb.bus.service.LocalBusClinicService;
 import com.nb.bus.service.LocalBusInfusionHistoryService;
 import com.nb.bus.service.LocalBusPatientService;
 import com.nb.bus.service.dto.PatientDeviceRepeatResult;
-import com.nb.common.enums.SexEnum;
+import com.nb.core.enums.SexEnum;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -11,7 +11,7 @@ import com.nb.bus.hospital.his.strategy.HisStrategyHandler;
 import com.nb.bus.hospital.his.strategy.HisStrategyManager;
 import com.nb.bus.hospital.his.strategy.HisStrategyManagerRegister;
 import com.nb.bus.service.LocalBusClinicService;
-import com.nb.common.enums.SexEnum;
+import com.nb.core.enums.SexEnum;
 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/util/ExcelUtil.java

@@ -5,7 +5,7 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.excel.EasyExcel;
 import com.nb.core.AppProperties;
-import com.nb.common.enums.BizEnum;
+import com.nb.core.enums.BizEnum;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;

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

@@ -9,7 +9,7 @@
 //import com.nb.common.bo.LoginUser;
 //import com.nb.common.bo.SysRoleBO;
 //import com.nb.common.bo.SysUserBO;
-//import com.nb.common.enums.GrantTypeEnum;
+//import com.nb.core.enums.GrantTypeEnum;
 //
 //import java.util.List;
 //import java.util.Objects;

nb-common/log-common/pom.xml

@@ -20,14 +20,13 @@
             <groupId>com.tuoren</groupId>
             <artifactId>nb-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.tuoren</groupId>
-            <artifactId>nb-auth</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.tuoren</groupId>
+            <artifactId>crud-common</artifactId>
+        </dependency>
     </dependencies>
 </project>

nb-framework/src/main/java/com/nb/framework/logback/SystemLoggingAppender.java → nb-common/log-common/src/main/java/com/nb/common/log/SystemLoggingAppender.java

@@ -1,4 +1,4 @@
-package com.nb.framework.logback;
+package com.nb.common.log;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.spi.ILoggingEvent;
@@ -8,10 +8,8 @@ import ch.qos.logback.classic.spi.ThrowableProxyUtil;
 import ch.qos.logback.core.CoreConstants;
 import ch.qos.logback.core.UnsynchronizedAppenderBase;
 import cn.hutool.extra.spring.SpringUtil;
-import com.nb.common.notice.msg.ErrorMsg;
-import com.nb.common.notice.wechat.EnterpriseWeChatNotify;
-import com.nb.system.entity.SysRunningLog;
-import com.nb.system.mapper.SysRunningLogMapper;
+import com.nb.common.log.entity.SysRunningLog;
+import com.nb.common.log.mapper.SysRunningLogMapper;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.*;
@@ -21,7 +19,7 @@ public class SystemLoggingAppender extends UnsynchronizedAppenderBase<ILoggingEv
 
     private SysRunningLogMapper logMapper=null;
 
-    private EnterpriseWeChatNotify notify=null;
+//    private EnterpriseWeChatNotify notify=null;
     @Override
     protected void append(ILoggingEvent event) {
         init();
@@ -66,9 +64,9 @@ public class SystemLoggingAppender extends UnsynchronizedAppenderBase<ILoggingEv
                 .threadId(String.valueOf(Thread.currentThread().getId()))
                 .build();
         if (Level.ERROR.equals(event.getLevel())) {
-            if(notify!=null){
-                notify.send( ErrorMsg.of(message));
-            }
+//            if(notify!=null){
+//                notify.send( ErrorMsg.of(message));
+//            }
         }
 
         logMapper.insert(info);
@@ -78,8 +76,8 @@ public class SystemLoggingAppender extends UnsynchronizedAppenderBase<ILoggingEv
         if(logMapper==null){
             logMapper= SpringUtil.getBean(SysRunningLogMapper.class);
         }
-        if(notify==null){
-            notify= SpringUtil.getBean(EnterpriseWeChatNotify.class);
-        }
+//        if(notify==null){
+//            notify= SpringUtil.getBean(EnterpriseWeChatNotify.class);
+//        }
     }
 }

nb-system/src/main/java/com/nb/system/controller/SysRunningLogController.java → nb-common/log-common/src/main/java/com/nb/common/log/controller/SysRunningLogController.java

@@ -1,12 +1,12 @@
-package com.nb.system.controller;
+package com.nb.common.log.controller;
 
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.stp.StpLogic;
 import com.baomidou.mybatisplus.core.mapper.Mapper;
 import com.nb.common.crud.BaseService;
 import com.nb.common.crud.controller.BaseQueryController;
-import com.nb.system.entity.SysRunningLog;
-import com.nb.system.service.impl.LocalSysRunningLogService;
+import com.nb.common.log.entity.SysRunningLog;
+import com.nb.common.log.service.LocalSysRunningLogService;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

nb-system/src/main/java/com/nb/system/entity/SysRunningLog.java → nb-common/log-common/src/main/java/com/nb/common/log/entity/SysRunningLog.java

@@ -1,4 +1,4 @@
-package com.nb.system.entity;
+package com.nb.common.log.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.nb.core.entity.GenericEntity;

nb-system/src/main/java/com/nb/system/mapper/SysRunningLogMapper.java → nb-common/log-common/src/main/java/com/nb/common/log/mapper/SysRunningLogMapper.java

@@ -1,7 +1,7 @@
-package com.nb.system.mapper;
+package com.nb.common.log.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.nb.system.entity.SysRunningLog;
+import com.nb.common.log.entity.SysRunningLog;
 
 /**
  * <p>

nb-system/src/main/java/com/nb/system/service/impl/LocalSysRunningLogService.java → nb-common/log-common/src/main/java/com/nb/common/log/service/LocalSysRunningLogService.java

@@ -1,8 +1,8 @@
-package com.nb.system.service.impl;
+package com.nb.common.log.service;
 
 import com.nb.common.crud.BaseService;
-import com.nb.system.entity.SysRunningLog;
-import com.nb.system.mapper.SysRunningLogMapper;
+import com.nb.common.log.entity.SysRunningLog;
+import com.nb.common.log.mapper.SysRunningLogMapper;
 import org.springframework.stereotype.Service;
 
 /**

nb-core/pom.xml

@@ -14,6 +14,14 @@
     <description>核心包，包含了一些基础信息</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-to-slf4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>

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

@@ -1,4 +1,4 @@
-package com.nb.common;
+package com.nb.core;
 
 /**
  * 菜单常量类

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

@@ -1,4 +1,4 @@
-package com.nb.common.enums;
+package com.nb.core.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package com.nb.common.enums;
+package com.nb.core.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package com.nb.common.enums;
+package com.nb.core.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package com.nb.common.enums;
+package com.nb.core.enums;
 
 /**
  * 文件存储策略

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

@@ -1,4 +1,4 @@
-package com.nb.common.enums;
+package com.nb.core.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package com.nb.common.enums;
+package com.nb.core.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package com.nb.common.enums;
+package com.nb.core.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package com.nb.common.enums;
+package com.nb.core.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package com.nb.common.enums;
+package com.nb.core.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package com.nb.common.enums;
+package com.nb.core.enums;
 
 import com.baomidou.mybatisplus.annotation.IEnum;
 import com.fasterxml.jackson.annotation.JsonFormat;

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

@@ -1,4 +1,4 @@
-package com.nb.common.enums;
+package com.nb.core.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package com.nb.common.enums;
+package com.nb.core.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package com.nb.common.enums;
+package com.nb.core.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nb-framework/pom.xml

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>nb-root</artifactId>
-        <groupId>com.tuoren</groupId>
-        <version>1.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>nb-framework</artifactId>
-
-    <dependencies>
-        <!-- web 容器使用 undertow 性能更强 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-undertow</artifactId>
-        </dependency>
-        <!-- SpringBoot拦截器 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
-        <!-- Mysql驱动包 -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <!-- 阿里数据库连接池 -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <!-- 系统模块 -->
-        <dependency>
-            <groupId>com.tuoren</groupId>
-            <artifactId>nb-system</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson-spring-boot-starter</artifactId>
-        </dependency>
-
-    </dependencies>
-</project>

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

@@ -1,6 +1,6 @@
 package com.nb.oss.strategy.impl;
 
-import com.nb.common.enums.FileStorageStrategyEnum;
+import com.nb.core.enums.FileStorageStrategyEnum;
 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

@@ -2,7 +2,7 @@ package com.nb.oss.strategy.impl;
 
 import cn.hutool.core.text.CharSequenceUtil;
 import com.nb.oss.strategy.MinioConfig;
-import com.nb.common.enums.FileStorageStrategyEnum;
+import com.nb.core.enums.FileStorageStrategyEnum;
 import com.nb.oss.strategy.FileUtil;
 import com.nb.oss.strategy.MinioUtil;
 import com.nb.oss.strategy.service.LocalSysStorageService;

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.nb.bus.service.dto.FormulaDrugDomain;
 import com.nb.bus.service.dto.UndoDeviceConfig;
 import com.nb.core.entity.TenantGenericEntity;
-import com.nb.common.enums.SexEnum;
+import com.nb.core.enums.SexEnum;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.nb.aliyun.utils.*;
 import com.nb.bus.entity.common.CommonDeviceParam;
 import com.nb.bus.enums.DeviceTypeEnum;
-import com.nb.common.enums.SexEnum;
+import com.nb.core.enums.SexEnum;
 import com.fasterxml.jackson.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -3,7 +3,7 @@ package com.nb.bus.entity;
 import cn.hutool.core.util.ObjectUtil;
 import com.nb.bus.enums.DeviceAlarmEnum;
 import com.nb.bus.enums.DeviceStatusEnum;
-import com.nb.common.enums.SexEnum;
+import com.nb.core.enums.SexEnum;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nb-system/src/main/java/com/nb/bus/service/dto/ClinicAnalClinicRecord.java

@@ -1,7 +1,7 @@
 package com.nb.bus.service.dto;
 
 import com.nb.bus.entity.BusClinicEntity;
-import com.nb.common.enums.SexEnum;
+import com.nb.core.enums.SexEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

nb-system/src/main/java/com/nb/bus/service/dto/CombineQuery.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.bus.enums.StatsTimeUnit;
 import com.nb.bus.enums.WarnEnum;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.nb.core.enums.SexEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -32,7 +33,7 @@ public class CombineQuery {
     private String patientName;
 
     /**
-     * @see  com.nb.common.enums.SexEnum
+     * @see  SexEnum
      */
     @ApiModelProperty("性别 1、男 2、女 3、未知")
     private Integer patientGender;

nb-system/src/main/java/com/nb/bus/service/dto/CombineResult.java

@@ -1,7 +1,7 @@
 package com.nb.bus.service.dto;
 
 import com.nb.bus.entity.common.CommonDeviceParam;
-import com.nb.common.enums.SexEnum;
+import com.nb.core.enums.SexEnum;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nb-system/src/main/java/com/nb/bus/service/dto/ManualMonitorResult.java

@@ -1,7 +1,7 @@
 package com.nb.bus.service.dto;
 
 import com.nb.bus.enums.DeviceManualEnum;
-import com.nb.common.enums.SexEnum;
+import com.nb.core.enums.SexEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

nb-system/src/main/java/com/nb/bus/service/dto/PatientDeviceNoneResult.java

@@ -1,6 +1,6 @@
 package com.nb.bus.service.dto;
 
-import com.nb.common.enums.SexEnum;
+import com.nb.core.enums.SexEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

nb-system/src/main/java/com/nb/bus/service/dto/PatientDeviceRepeatResult.java

@@ -2,7 +2,7 @@ package com.nb.bus.service.dto;
 
 import com.nb.bus.enums.DeviceAlarmEnum;
 import com.nb.bus.enums.DeviceStatusEnum;
-import com.nb.common.enums.SexEnum;
+import com.nb.core.enums.SexEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

nb-system/src/main/java/com/nb/bus/service/dto/PatientMonitorResult.java

@@ -3,7 +3,7 @@ package com.nb.bus.service.dto;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.StrUtil;
 import com.nb.bus.enums.*;
-import com.nb.common.enums.SexEnum;
+import com.nb.core.enums.SexEnum;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nb-system/src/main/java/com/nb/bus/stats/report/AgeAndGenderStatsReport.java

@@ -10,7 +10,7 @@ import com.nb.bus.stats.entity.PieResult;
 import com.nb.bus.stats.entity.StatsColumn;
 import com.nb.bus.stats.entity.TableResult;
 import com.nb.bus.stats.enums.AgeStatsEnum;
-import com.nb.common.enums.SexEnum;
+import com.nb.core.enums.SexEnum;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;

nb-system/src/main/java/com/nb/bus/stats/report/GenderStatsReport.java

@@ -11,7 +11,7 @@ import com.nb.bus.stats.entity.PieResult;
 import com.nb.bus.stats.entity.StatsColumn;
 import com.nb.bus.stats.entity.TableResult;
 import com.nb.bus.stats.enums.PieEnum;
-import com.nb.common.enums.SexEnum;
+import com.nb.core.enums.SexEnum;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;

nb-system/src/main/java/com/nb/bus/stats/report/WeightStatsReport.java

@@ -11,7 +11,7 @@ import com.nb.bus.stats.entity.PieResult;
 import com.nb.bus.stats.entity.TableResult;
 import com.nb.bus.stats.enums.PieEnum;
 import com.nb.bus.stats.enums.WeightRangeEnum;
-import com.nb.common.enums.SexEnum;
+import com.nb.core.enums.SexEnum;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;

nb-system/src/main/java/com/nb/system/auth/DefaultAccountOperator.java

@@ -9,8 +9,8 @@ import com.nb.auth.bean.LoginUser;
 import com.nb.auth.controller.vo.*;
 import com.nb.auth.granter.IAccountOperator;
 import com.nb.auth.utils.SecurityUtil;
-import com.nb.common.MenuConstants;
-import com.nb.common.enums.*;
+import com.nb.core.MenuConstants;
+import com.nb.core.enums.*;
 import com.nb.system.entity.SysMenu;
 import com.nb.system.entity.SysRole;
 import com.nb.system.entity.SysUser;

nb-system/src/main/java/com/nb/system/auth/WebAuthGranter.java

@@ -11,8 +11,8 @@ import com.nb.auth.enums.GrantTypeEnum;
 import com.nb.auth.granter.IAuthGranter;
 import com.nb.auth.granter.TokenParameter;
 import com.nb.auth.utils.SecurityUtil;
-import com.nb.common.enums.DelFlagEnum;
-import com.nb.common.enums.StatusEnum;
+import com.nb.core.enums.DelFlagEnum;
+import com.nb.core.enums.StatusEnum;
 import com.nb.core.enums.UserPlatformEnum;
 import com.nb.core.exception.CustomException;
 import com.nb.system.entity.SysRole;

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

@@ -10,8 +10,8 @@ import com.nb.common.apply.ApplyManager;
 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;
+import com.nb.core.enums.MenuTypeEnum;
+import com.nb.core.enums.StatusEnum;
 import com.nb.system.entity.SysApplyMenu;
 import com.nb.system.entity.SysMenu;
 import com.nb.system.service.ISysMenuService;

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

@@ -7,7 +7,7 @@ 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.enums.StatusEnum;
+import com.nb.core.enums.StatusEnum;
 import com.nb.core.exception.CustomException;
 import com.nb.common.util.ConfigUtil;
 import com.nb.system.common.dto.SysConfigAddDTO;

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

@@ -10,7 +10,7 @@ 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.enums.StatusEnum;
+import com.nb.core.enums.StatusEnum;
 import com.nb.core.exception.CustomException;
 import com.nb.system.common.dto.SysDeptAddDTO;
 import com.nb.system.common.dto.SysDeptEditDTO;

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

@@ -8,7 +8,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.common.bo.DictModel;
-import com.nb.common.enums.StatusEnum;
+import com.nb.core.enums.StatusEnum;
 import com.nb.core.exception.CustomException;
 import com.nb.common.util.DictUtil;
 import com.nb.system.common.dto.SysDictAddDTO;

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

@@ -12,9 +12,9 @@ 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.enums.LinkExternalEnum;
-import com.nb.common.enums.MenuTypeEnum;
-import com.nb.common.enums.StatusEnum;
+import com.nb.core.enums.LinkExternalEnum;
+import com.nb.core.enums.MenuTypeEnum;
+import com.nb.core.enums.StatusEnum;
 import com.nb.core.exception.CustomException;
 import com.nb.system.common.dto.SysMenuAddDTO;
 import com.nb.system.common.dto.SysMenuEditDTO;

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

@@ -7,7 +7,7 @@ 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.enums.StatusEnum;
+import com.nb.core.enums.StatusEnum;
 import com.nb.core.exception.CustomException;
 import com.nb.system.common.dto.SysPostAddDTO;
 import com.nb.system.common.dto.SysPostEditDTO;

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

@@ -13,8 +13,8 @@ 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.core.Constants;
-import com.nb.common.enums.MenuTypeEnum;
-import com.nb.common.enums.StatusEnum;
+import com.nb.core.enums.MenuTypeEnum;
+import com.nb.core.enums.StatusEnum;
 import com.nb.core.exception.CustomException;
 import com.nb.system.common.dto.SysRoleAddDTO;
 import com.nb.system.common.dto.SysRoleAssignMenuDTO;

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

@@ -15,8 +15,8 @@ import com.nb.auth.bean.LoginUser;
 import com.nb.auth.bean.SysRoleInfo;
 import com.nb.auth.utils.SecurityUtil;
 import com.nb.core.Constants;
-import com.nb.common.enums.StatusEnum;
-import com.nb.common.enums.YesNoEnum;
+import com.nb.core.enums.StatusEnum;
+import com.nb.core.enums.YesNoEnum;
 import com.nb.core.exception.CustomException;
 import com.nb.system.common.dto.SysUserAddDTO;
 import com.nb.system.common.dto.SysUserEditDTO;

pom.xml

@@ -44,7 +44,6 @@
 
     <modules>
         <module>nb-admin</module>
-        <module>nb-framework</module>
         <module>nb-common</module>
         <module>nb-system</module>
         <module>nb-oss</module>
@@ -69,6 +68,11 @@
     <!-- 依赖管理 -->
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.tuoren</groupId>
+                <artifactId>crud-common</artifactId>
+                <version>${nb.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.tuoren</groupId>
                 <artifactId>nb-core</artifactId>