update 模块分组

nb-admin/Dockerfile

@@ -1,13 +1,13 @@
 FROM docker.io/java:8
 
-ADD target/nb-admin.jar /pump.jar
+ADD target/nb-admin-1.0.jar /nb.jar
 ADD src/main/resources/python/jython-standalone-2.7.1.jar /jython-standalone-2.7.1.jar
-RUN bash -c "touch /pump.jar"
+RUN bash -c "touch /nb.jar"
 RUN echo "Asia/shanghai" > /etc/timezone
 ENV LANG C.UTF-8
 ENV LANGUAGE zh_CN.UTF-8
 ENV LC_ALL C.UTF-8
 ENV TZ Asia/Shanghai
 
-ENTRYPOINT ["java", "-jar", "/pump.jar"]
+ENTRYPOINT ["java", "-jar", "/nb.jar"]
 EXPOSE 9090

nb-admin/pom.xml

@@ -15,7 +15,7 @@
         <!-- 核心模块 -->
         <dependency>
             <groupId>com.tuoren</groupId>
-            <artifactId>nb-framework</artifactId>
+            <artifactId>nb-system</artifactId>
         </dependency>
         <!-- OSS文件存储模块 -->
         <dependency>
@@ -28,6 +28,10 @@
             <artifactId>spring-boot-starter-test</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -42,14 +46,93 @@
             <!--</plugin>-->
         <!--</plugins>-->
     <!--</build>-->
+    <!--<build>-->
+        <!--<finalName>${project.name}</finalName>-->
+        <!--<resources>-->
+            <!--<resource>-->
+                <!--<directory>src/main/resources</directory>-->
+                <!--<filtering>true</filtering>-->
+            <!--</resource>-->
+        <!--</resources>-->
+        <!--<pluginManagement>-->
+            <!--<plugins>-->
+                <!--&lt;!&ndash;<plugin>&ndash;&gt;-->
+                    <!--&lt;!&ndash;<groupId>org.springframework.boot</groupId>&ndash;&gt;-->
+                    <!--&lt;!&ndash;<artifactId>spring-boot-maven-plugin</artifactId>&ndash;&gt;-->
+                    <!--&lt;!&ndash;<version>${spring-boot.version}</version>&ndash;&gt;-->
+                    <!--&lt;!&ndash;<configuration>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<mainClass>com.nb.AdminApplication</mainClass>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<finalName>${project.build.finalName}</finalName>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<layers>&ndash;&gt;-->
+                            <!--&lt;!&ndash;<enabled>true</enabled>&ndash;&gt;-->
+                        <!--&lt;!&ndash;</layers>&ndash;&gt;-->
+                    <!--&lt;!&ndash;</configuration>&ndash;&gt;-->
+                    <!--&lt;!&ndash;<executions>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<execution>&ndash;&gt;-->
+                            <!--&lt;!&ndash;<goals>&ndash;&gt;-->
+                                <!--&lt;!&ndash;<goal>repackage</goal>&ndash;&gt;-->
+                            <!--&lt;!&ndash;</goals>&ndash;&gt;-->
+                        <!--&lt;!&ndash;</execution>&ndash;&gt;-->
+                    <!--&lt;!&ndash;</executions>&ndash;&gt;-->
+                <!--&lt;!&ndash;</plugin>&ndash;&gt;-->
+
+                <!--<plugin>-->
+                    <!--<artifactId>maven-assembly-plugin</artifactId>-->
+                    <!--<configuration>-->
+                        <!--<archive>-->
+                            <!--<manifest>-->
+                                <!--<mainClass>com.nb.AdminApplication</mainClass>-->
+                            <!--</manifest>-->
+                            <!--<manifestEntries>-->
+                                <!--<Class-Path>.</Class-Path>-->
+                            <!--</manifestEntries>-->
+                        <!--</archive>-->
+                        <!--<descriptorRefs>-->
+                            <!--<descriptorRef>jar-with-dependencies</descriptorRef>-->
+                        <!--</descriptorRefs>-->
+                    <!--</configuration>-->
+                    <!--<executions>-->
+                        <!--<execution>-->
+                            <!--<id>make-assembly</id>-->
+                            <!--<phase>package</phase>-->
+                            <!--<goals>-->
+                                <!--<goal>single</goal>-->
+                            <!--</goals>-->
+                            <!--<configuration>-->
+                                <!--<descriptors>-->
+                                    <!--<descriptor>src/main/resources/assembly.xml</descriptor>-->
+                                <!--</descriptors>-->
+                            <!--</configuration>-->
+                        <!--</execution>-->
+                    <!--</executions>-->
+                <!--</plugin>-->
+            <!--</plugins>-->
+        <!--</pluginManagement>-->
+    <!--</build>-->
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
+            <plugin>
+                <artifactId>maven-install-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <mainClass>com.coffee.admin.AdminApplication</mainClass>
+                    <mainClass>com.nb.AdminApplication</mainClass>
+                    <layout>ZIP</layout>
+                    <layers>
+                        <enabled>true</enabled>
+                    </layers>
                 </configuration>
                 <executions>
                     <execution>
@@ -59,14 +142,35 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- 跳过单元测试 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skipTests>true</skipTests>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <!-- 环境标识，需要与配置文件的名称相对应 -->
+                <profiles.active>dev</profiles.active>
+                <!--<profiles.active>prod</profiles.active>-->
+                <logging.level>debug</logging.level>
+            </properties>
+            <activation>
+                <!-- 默认环境 -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>test</id>
+            <properties>
+                <profiles.active>test</profiles.active>
+                <logging.level>warn</logging.level>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profiles.active>prod</profiles.active>
+                <logging.level>warn</logging.level>
+            </properties>
+        </profile>
+    </profiles>
 </project>

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

@@ -1,12 +1,10 @@
-package com.nb.admin;
+package com.nb;
 
-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;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.annotation.Import;
@@ -14,7 +12,6 @@ import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.tio.websocket.starter.EnableTioWebSocketServer;
 
-import java.util.logging.Logger;
 
 /**
  * Admin启动类
@@ -22,8 +19,7 @@ import java.util.logging.Logger;
  * @author Kevin
  */
 @SpringBootApplication(scanBasePackages ={
-        "com.nb.admin",
-        "com.nb.aliyun","com.nb.bus","com.nb.system",
+        "com.nb",
         "springfox.documentation.schema"})
 @Import(cn.hutool.extra.spring.SpringUtil.class)
 @EnableTioWebSocketServer

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

@@ -1,7 +1,7 @@
 package com.nb.admin;
 
-import com.aliyuncs.iot.model.v20180120.QueryDeviceResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.nb.AdminApplication;
 import com.nb.aliyun.sdk.AliyunIotSdk;
 import com.nb.bus.entity.BusDeviceEntity;
 import com.nb.bus.entity.BusDeviceRunningEntity;

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

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.nb.AdminApplication;
 import com.nb.bus.controller.vo.ClinicStatsVo;
 import com.nb.bus.entity.BusClinicEntity;
 import com.nb.bus.entity.BusDocEntity;

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

@@ -1,5 +1,6 @@
 package com.nb.admin;
 
+import com.nb.AdminApplication;
 import com.nb.bus.controller.BusDeviceHistoryController;
 import com.nb.bus.entity.BusDeviceAlarmEntity;
 import com.nb.bus.entity.BusInfusionHistoryEntity;

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

@@ -3,6 +3,7 @@ package com.nb.admin;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.nb.AdminApplication;
 import com.nb.bus.entity.BusDeviceEntity;
 import com.nb.bus.entity.BusDeviceHistoryEntity;
 import com.nb.bus.service.LocalBusDeviceHistoryService;

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

@@ -1,5 +1,6 @@
 package com.nb.admin;
 
+import com.nb.AdminApplication;
 import com.nb.bus.controller.BusHospitalLogController;
 import com.nb.bus.entity.BusHospitalLogEntity;
 import com.nb.bus.service.LocalBusHospitalLogService;

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

@@ -1,5 +1,6 @@
 package com.nb.admin;
 
+import com.nb.AdminApplication;
 import com.nb.bus.bean.GeoPoint;
 import com.nb.bus.bean.Script;
 import com.nb.bus.controller.BusHospitalController;

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

@@ -2,6 +2,7 @@ package com.nb.admin;
 
 import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.nb.AdminApplication;
 import com.nb.bus.entity.BusDeviceEntity;
 import com.nb.bus.service.LocalBusDeviceService;
 import com.fasterxml.jackson.core.JsonProcessingException;

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

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.EnumUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.nb.AdminApplication;
 import com.nb.bus.controller.BusDeviceManualController;
 import com.nb.bus.controller.vo.ClinicEditVo;
 import com.nb.bus.entity.BusClinicEntity;

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

@@ -1,5 +1,6 @@
 package com.nb.admin;
 
+import com.nb.AdminApplication;
 import com.nb.bus.hospital.config.HospitalDeviceAutoUndoConfigHandler;
 import com.nb.bus.hospital.config.handler.HandlerConstant;
 import com.nb.core.Value;

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

@@ -1,11 +1,11 @@
 package com.nb.admin;
 
+import com.nb.AdminApplication;
 import com.nb.bus.registry.device.DeviceOperator;
 import com.nb.bus.registry.device.DeviceRegistry;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 

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

@@ -1,6 +1,7 @@
 package com.nb.admin;
 
 import cn.hutool.core.io.FileUtil;
+import com.nb.AdminApplication;
 import com.nb.oss.strategy.MinioUtil;
 import org.junit.Test;
 import org.junit.runner.RunWith;

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

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.EnumUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.nb.AdminApplication;
 import com.nb.bus.entity.BusClinicEntity;
 import com.nb.bus.hospital.his.strategy.HisStrategyEnum;
 import com.nb.bus.hospital.his.strategy.HisStrategyHandler;

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

@@ -1,10 +1,10 @@
 package com.nb.admin;
 
 import cn.hutool.json.JSONUtil;
+import com.nb.AdminApplication;
 import com.nb.bus.job.DeviceFlowStatsJob;
-import com.nb.common.notice.msg.DiskMsg;
-import com.nb.common.notice.msg.LifeCycleMsg;
-import com.nb.common.notice.wechat.EnterpriseWeChatNotify;
+import com.nb.common.config.notice.msg.DiskMsg;
+import com.nb.common.config.notice.wechat.EnterpriseWeChatNotify;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,6 +1,7 @@
 package com.nb.admin;
 
 import cn.hutool.json.JSONUtil;
+import com.nb.AdminApplication;
 import com.nb.bus.hospital.HospitalManagerRegister;
 import com.nb.bus.hospital.config.HospitalDeviceAutoUndoConfigHandler;
 import com.nb.bus.hospital.config.handler.DeputyDeviceAutoUndoHandler;

nb-common/all-common/pom.xml

@@ -1,134 +0,0 @@
-<?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>all-common</artifactId>
-    <dependencies>
-        <!--<dependency>-->
-        <!--<groupId>com.tuoren</groupId>-->
-        <!--<artifactId>nb-auth</artifactId>-->
-        <!--</dependency>-->
-
-        <dependency>
-            <groupId>com.tuoren</groupId>
-            <artifactId>nb-auth</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.t-io</groupId>
-            <artifactId>tio-websocket-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-            <optional>true</optional>
-            <scope>compile</scope>
-        </dependency>
-        <!-- web 模块 -->
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                    <groupId>org.springframework.boot</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- sa-token -->
-        <dependency>
-            <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-spring-boot-starter</artifactId>
-        </dependency>
-        <!-- sa-token redis -->
-        <dependency>
-            <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
-        </dependency>
-        <!--redis依赖 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-        <!-- pool 对象池 -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-        </dependency>
-        <!-- mybatis plus -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-        </dependency>
-        <!-- hutool -->
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-        </dependency>
-        <!-- guava -->
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-        <!-- fastjson -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-        <!-- servlet -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
-        <!-- hibernate validator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-        <!--  自动生成YML配置关联JSON文件  -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-        </dependency>
-        <!-- easyexcel -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel</artifactId>
-        </dependency>
-        <!-- minio -->
-        <dependency>
-            <groupId>io.minio</groupId>
-            <artifactId>minio</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.websocket</groupId>
-            <artifactId>jakarta.websocket-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson-spring-boot-starter</artifactId>
-            <optional>true</optional>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.marshalling</groupId>
-            <artifactId>jboss-marshalling</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>

nb-common/config-common/pom.xml

@@ -14,6 +14,30 @@
     <description>一些通用配置</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.tuoren</groupId>
+            <artifactId>nb-auth</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.t-io</groupId>
+            <artifactId>tio-websocket-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

nb-common/all-common/src/main/java/com/nb/common/apply/ApplyManager.java → nb-common/config-common/src/main/java/com/nb/common/config/apply/ApplyManager.java

@@ -1,4 +1,4 @@
-package com.nb.common.apply;
+package com.nb.common.config.apply;
 
 import java.util.Collection;
 

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

@@ -2,13 +2,15 @@ package com.nb.common.config.bo;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * 字典模型
  *
  * @author Kevin
  */
 @Data
-public class DictModel {
+public class DictModel implements Serializable {
 
     String label;
     String value;

nb-common/all-common/src/main/java/com/nb/common/event/EventConfig.java → nb-common/config-common/src/main/java/com/nb/common/config/event/EventConfig.java

@@ -1,7 +1,7 @@
-package com.nb.common.event;
+package com.nb.common.config.event;
 
-import com.nb.common.notice.msg.LifeCycleMsg;
-import com.nb.common.notice.wechat.EnterpriseWeChatNotify;
+import com.nb.common.config.notice.msg.LifeCycleMsg;
+import com.nb.common.config.notice.wechat.EnterpriseWeChatNotify;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

nb-common/all-common/src/main/java/com/nb/common/notice/NotifyEnums.java → nb-common/config-common/src/main/java/com/nb/common/config/notice/NotifyEnums.java

@@ -1,4 +1,4 @@
-package com.nb.common.notice;
+package com.nb.common.config.notice;
 
 import cn.hutool.core.date.DateUtil;
 import lombok.AllArgsConstructor;

nb-common/all-common/src/main/java/com/nb/common/notice/SystemMonitor.java → nb-common/config-common/src/main/java/com/nb/common/config/notice/SystemMonitor.java

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

nb-common/all-common/src/main/java/com/nb/common/notice/msg/AbstractMsg.java → nb-common/config-common/src/main/java/com/nb/common/config/notice/msg/AbstractMsg.java

@@ -1,8 +1,8 @@
-package com.nb.common.notice.msg;
+package com.nb.common.config.notice.msg;
 
 import cn.hutool.json.JSONUtil;
-import com.nb.common.notice.NotifyEnums;
-import com.nb.common.notice.wechat.EnterpriseWeChatMsgEnums;
+import com.nb.common.config.notice.NotifyEnums;
+import com.nb.common.config.notice.wechat.EnterpriseWeChatMsgEnums;
 
 import java.util.HashMap;
 import java.util.Map;

nb-common/all-common/src/main/java/com/nb/common/notice/msg/DeviceMsg.java → nb-common/config-common/src/main/java/com/nb/common/config/notice/msg/DeviceMsg.java

@@ -1,6 +1,6 @@
-package com.nb.common.notice.msg;
+package com.nb.common.config.notice.msg;
 
-import com.nb.common.notice.NotifyEnums;
+import com.nb.common.config.notice.NotifyEnums;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 

nb-common/all-common/src/main/java/com/nb/common/notice/msg/DiskMsg.java → nb-common/config-common/src/main/java/com/nb/common/config/notice/msg/DiskMsg.java

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

nb-common/all-common/src/main/java/com/nb/common/notice/msg/ErrorMsg.java → nb-common/config-common/src/main/java/com/nb/common/config/notice/msg/ErrorMsg.java

@@ -1,7 +1,7 @@
-package com.nb.common.notice.msg;
+package com.nb.common.config.notice.msg;
 
 import cn.hutool.core.text.CharSequenceUtil;
-import com.nb.common.notice.NotifyEnums;
+import com.nb.common.config.notice.NotifyEnums;
 import lombok.AllArgsConstructor;
 
 /**

nb-common/all-common/src/main/java/com/nb/common/notice/msg/LifeCycleMsg.java → nb-common/config-common/src/main/java/com/nb/common/config/notice/msg/LifeCycleMsg.java

@@ -1,7 +1,7 @@
-package com.nb.common.notice.msg;
+package com.nb.common.config.notice.msg;
 
 import cn.hutool.core.text.CharSequenceUtil;
-import com.nb.common.notice.NotifyEnums;
+import com.nb.common.config.notice.NotifyEnums;
 import lombok.AllArgsConstructor;
 
 /**

nb-common/all-common/src/main/java/com/nb/common/notice/msg/SysResourceMsg.java → nb-common/config-common/src/main/java/com/nb/common/config/notice/msg/SysResourceMsg.java

@@ -1,7 +1,7 @@
-package com.nb.common.notice.msg;
+package com.nb.common.config.notice.msg;
 
-import com.nb.common.notice.NotifyEnums;
-import com.nb.common.notice.SystemMonitor;
+import com.nb.common.config.notice.NotifyEnums;
+import com.nb.common.config.notice.SystemMonitor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 

nb-common/all-common/src/main/java/com/nb/common/notice/wechat/EnterpriseWeChatMsg.java → nb-common/config-common/src/main/java/com/nb/common/config/notice/wechat/EnterpriseWeChatMsg.java

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

nb-common/all-common/src/main/java/com/nb/common/notice/wechat/EnterpriseWeChatMsgEnums.java → nb-common/config-common/src/main/java/com/nb/common/config/notice/wechat/EnterpriseWeChatMsgEnums.java

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

nb-common/all-common/src/main/java/com/nb/common/notice/wechat/EnterpriseWeChatNotify.java → nb-common/config-common/src/main/java/com/nb/common/config/notice/wechat/EnterpriseWeChatNotify.java

@@ -1,21 +1,17 @@
-package com.nb.common.notice.wechat;
+package com.nb.common.config.notice.wechat;
 
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
-import com.nb.common.notice.SystemMonitor;
-import com.nb.common.notice.msg.AbstractMsg;
-import com.nb.common.notice.msg.DiskMsg;
-import com.nb.common.notice.msg.SysResourceMsg;
-import io.netty.channel.DefaultEventLoop;
-import io.netty.channel.EventLoopGroup;
+import com.nb.common.config.notice.SystemMonitor;
+import com.nb.common.config.notice.msg.AbstractMsg;
+import com.nb.common.config.notice.msg.DiskMsg;
+import com.nb.common.config.notice.msg.SysResourceMsg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.actuate.system.DiskSpaceHealthIndicator;
-import org.springframework.context.annotation.Profile;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
 
 
 /**

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

@@ -5,8 +5,8 @@ import cn.hutool.extra.spring.SpringUtil;
 import com.nb.core.Constants;
 import com.nb.common.config.bo.DictModel;
 import com.nb.common.config.redis.RedisUtils;
-import com.google.common.collect.Lists;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
@@ -24,7 +24,7 @@ public class DictUtil {
 
     public static List<DictModel> getDictList(String dictCode) {
         Object obj = SpringUtil.getBean(RedisUtils.class).get(getCacheKey(dictCode));
-        return Objects.nonNull(obj) ? (List<DictModel>) obj : Lists.newArrayList();
+        return Objects.nonNull(obj) ? (List<DictModel>) obj : new ArrayList<>();
     }
 
     public static String getDictLabel(String dictCode, String dictValue) {

nb-common/crud-common/pom.xml

@@ -16,6 +16,11 @@
 
 
     <dependencies>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.tuoren</groupId>
             <artifactId>nb-auth</artifactId>

nb-common/delay-queue-common/pom.xml

@@ -14,6 +14,10 @@
     <description>延迟队列通用</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.tuoren</groupId>
             <artifactId>nb-core</artifactId>

nb-common/delay-queue-common/src/main/java/com/nb/common/queue/delay/message/DelayMessage.java

@@ -1,6 +1,5 @@
 package com.nb.common.queue.delay.message;
 
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.nb.core.Value;
 import com.nb.common.queue.delay.handler.DelayMessageHandler;
@@ -9,6 +8,7 @@ import org.springframework.lang.NonNull;
 import org.springframework.util.Assert;
 
 import java.io.Serializable;
+import java.util.UUID;
 
 /**
  * @author  lifang
@@ -24,7 +24,7 @@ public class DelayMessage implements Serializable {
     /**
      * 消息的唯一id,使用该字段移除消息
      */
-    private Long msgId;
+    private String msgId;
 
     /**
      * 内容
@@ -47,7 +47,7 @@ public class DelayMessage implements Serializable {
     private DelayMessageProperties properties;
 
     public DelayMessage(@NonNull Value body, @NonNull String handlerId, @NonNull DelayMessageProperties properties) {
-        this.msgId = IdWorker.getId();
+        this.msgId = UUID.randomUUID().toString();
         this.body = body;
         this.handlerId = handlerId;
         this.properties = properties;

nb-common/log-common/pom.xml

@@ -17,16 +17,29 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.tuoren</groupId>
-            <artifactId>nb-core</artifactId>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
             <groupId>com.tuoren</groupId>
-            <artifactId>crud-common</artifactId>
+            <artifactId>nb-auth</artifactId>
         </dependency>
     </dependencies>
 </project>

nb-common/log-common/src/main/java/com/nb/common/log/LogAutoConfiguration.java

@@ -1,16 +1,8 @@
 package com.nb.common.log;
 
-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;
 
-@ConditionalOnClass(SecurityUtil.class)
 @ComponentScan("com.nb.common.log")
-@MapperScan({"com.nb.common.log.mapper"})
 public class LogAutoConfiguration {
 
 }

nb-common/log-common/src/main/java/com/nb/common/log/SystemLoggingAppender.java

@@ -1,6 +1,5 @@
 package com.nb.common.log;
 
-import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.classic.spi.IThrowableProxy;
 import ch.qos.logback.classic.spi.StackTraceElementProxy;
@@ -8,21 +7,16 @@ 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.log.entity.SysRunningLog;
-import com.nb.common.log.mapper.SysRunningLogMapper;
+import com.nb.common.log.event.InnerLog4j2;
+import com.nb.common.log.event.InnerLog4j2Event;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.*;
 
 @Slf4j
 public class SystemLoggingAppender extends UnsynchronizedAppenderBase<ILoggingEvent> {
-
-    private SysRunningLogMapper logMapper=null;
-
-//    private EnterpriseWeChatNotify notify=null;
     @Override
     protected void append(ILoggingEvent event) {
-        init();
         StackTraceElement element = event.getCallerData()[0];
         IThrowableProxy proxies = event.getThrowableProxy();
         String message = event.getFormattedMessage();
@@ -32,7 +26,7 @@ public class SystemLoggingAppender extends UnsynchronizedAppenderBase<ILoggingEv
         queue.add(proxies);
         while (queue.size() > 0) {
             IThrowableProxy proxy = queue.poll();
-            if(proxy==null){
+            if (proxy == null) {
                 break;
             }
             int commonFrames = proxy.getCommonFrames();
@@ -52,7 +46,7 @@ public class SystemLoggingAppender extends UnsynchronizedAppenderBase<ILoggingEv
         stack = joiner.toString();
 
 
-        SysRunningLog info = SysRunningLog.builder()
+        InnerLog4j2 info = InnerLog4j2.builder()
                 .name(event.getLoggerName())
                 .level(event.getLevel().levelStr)
                 .className(element.getClassName())
@@ -63,21 +57,6 @@ public class SystemLoggingAppender extends UnsynchronizedAppenderBase<ILoggingEv
                 .message(message)
                 .threadId(String.valueOf(Thread.currentThread().getId()))
                 .build();
-        if (Level.ERROR.equals(event.getLevel())) {
-//            if(notify!=null){
-//                notify.send( ErrorMsg.of(message));
-//            }
-        }
-
-        logMapper.insert(info);
-    }
-
-    private void init(){
-        if(logMapper==null){
-            logMapper= SpringUtil.getBean(SysRunningLogMapper.class);
-        }
-//        if(notify==null){
-//            notify= SpringUtil.getBean(EnterpriseWeChatNotify.class);
-//        }
+        SpringUtil.publishEvent(new InnerLog4j2Event(info));
     }
 }

nb-common/log-common/src/main/java/com/nb/common/log/aop/LogAspect.java

@@ -1,16 +1,14 @@
 package com.nb.common.log.aop;
 
 import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.http.useragent.UserAgent;
 import cn.hutool.http.useragent.UserAgentUtil;
 import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.auth.utils.SecurityUtil;
-import com.nb.common.log.entity.SysLog;
 import com.nb.common.log.enums.LogStatusEnum;
-import com.nb.common.log.service.ISysLogService;
+import com.nb.common.log.event.OperationLog;
+import com.nb.common.log.event.OperationLogEvent;
 import com.nb.core.annotation.Log;
 import com.nb.core.utils.AddressUtil;
 import com.nb.core.utils.IpUtil;
@@ -77,7 +75,7 @@ public class LogAspect {
                 return;
             }
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-            SysLog sysLog = new SysLog();
+            OperationLog sysLog = new OperationLog();
             sysLog.setTitle(controllerLog.title());
             sysLog.setLogStatus(LogStatusEnum.SUCCESS.getCode());
             sysLog.setUserPlatform(controllerLog.userPlatform().getCode());
@@ -112,10 +110,11 @@ public class LogAspect {
                 sysLog.setLogStatus(LogStatusEnum.FAILURE.getCode());
                 sysLog.setException(e.getMessage());
             }
-            ThreadUtil.execAsync(() -> {
-                ISysLogService sysLogService = SpringUtil.getBean(ISysLogService.class);
-                sysLogService.save(sysLog);
-            });
+            SpringUtil.publishEvent(new OperationLogEvent(sysLog));
+//            ThreadUtil.execAsync(() -> {
+//                ISysLogService sysLogService = SpringUtil.getBean(ISysLogService.class);
+//                sysLogService.save(sysLog);
+//            });
             log.debug("接口：{}，URI：{}，执行耗时：{}", sysLog.getTitle(), sysLog.getRequsetUri(), time >= 1000 ? time / 1000 + "s" : time + "ms");
         } catch (Exception exception) {
             log.error("异常信息:{}", exception.getMessage());
@@ -146,6 +145,6 @@ public class LogAspect {
             }
         }
         return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse
-                || o instanceof BindingResult || o instanceof Page;
+                || o instanceof BindingResult ;
     }
 }

nb-common/log-common/src/main/java/com/nb/common/log/event/InnerLog4j2.java

@@ -0,0 +1,44 @@
+package com.nb.common.log.event;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Builder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("系统内部日志 ")
+public class InnerLog4j2{
+
+    @ApiModelProperty( "名称")
+    private String name;
+
+    @ApiModelProperty( "线程名")
+    private String threadName;
+
+    @ApiModelProperty( "日志级别")
+    private String level;
+
+    @ApiModelProperty( "类名")
+    private String className;
+
+    @ApiModelProperty( "方法名")
+    private String methodName;
+
+    @ApiModelProperty( "行号")
+    private int lineNumber;
+
+    @ApiModelProperty("日志内容")
+    private String message;
+
+    @ApiModelProperty("异常栈")
+    private String exceptionStack;
+
+    @ApiModelProperty("线程ID")
+    private String threadId;
+}

nb-common/log-common/src/main/java/com/nb/common/log/event/InnerLog4j2Event.java

@@ -0,0 +1,21 @@
+package com.nb.common.log.event;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName LogeEvent.java
+ * @Description TODO
+ * @createTime 2022年08月02日 11:08:00
+ */
+
+public class InnerLog4j2Event extends ApplicationEvent {
+    @Getter
+    private InnerLog4j2 log;
+    public InnerLog4j2Event(InnerLog4j2 log) {
+        super(log);
+        this.log=log;
+    }
+}

nb-common/log-common/src/main/java/com/nb/common/log/event/OperationLog.java

@@ -0,0 +1,102 @@
+package com.nb.common.log.event;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 操作日志内容
+ * </p>
+ *
+ * @author Kevin
+ * @since 2021-07-12
+ */
+@Data
+public class OperationLog implements Serializable {
+
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 日志状态 0成功；1失败
+     */
+    private String logStatus;
+
+    /**
+     * 用户平台 WEB：web管理后台；APP：前端用户平台
+     */
+    private String userPlatform;
+
+    /**
+     * 请求地址
+     */
+    private String requsetUri;
+
+    /**
+     * 请求方式
+     */
+    private String requsetType;
+
+    /**
+     * 请求方法
+     */
+    private String requsetMethod;
+
+    /**
+     * 请求参数
+     */
+    private String requsetParams;
+
+    /**
+     * 返回参数
+     */
+    @JsonIgnore
+    private String responseResult;
+
+    /**
+     * 请求耗时
+     */
+    private String requsetTime;
+
+    /**
+     * 异常信息
+     */
+    @JsonIgnore
+    private String exception;
+
+    /**
+     * 操作人员
+     */
+    private String operName;
+
+    /**
+     * IP地址
+     */
+    private String ipAddress;
+
+    /**
+     * 操作地点
+     */
+    private String operLocation;
+
+    /**
+     * 浏览器类型
+     */
+    private String browser;
+
+    /**
+     * 操作系统
+     */
+    private String os;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+}

nb-common/log-common/src/main/java/com/nb/common/log/event/OperationLogEvent.java

@@ -0,0 +1,22 @@
+package com.nb.common.log.event;
+
+import lombok.Data;
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName LogeEvent.java
+ * @Description TODO
+ * @createTime 2022年08月02日 11:08:00
+ */
+
+public class OperationLogEvent extends ApplicationEvent {
+    @Getter
+    private OperationLog log;
+    public OperationLogEvent(OperationLog log) {
+        super(log);
+        this.log=log;
+    }
+}

nb-common/pom.xml

@@ -16,128 +16,8 @@
         <module>log-common</module>
         <module>crud-common</module>
         <module>delay-queue-common</module>
-        <module>all-common</module>
         <module>config-common</module>
     </modules>
 
-    <dependencies>
-        <!--<dependency>-->
-            <!--<groupId>com.tuoren</groupId>-->
-            <!--<artifactId>nb-auth</artifactId>-->
-        <!--</dependency>-->
 
-        <dependency>
-            <groupId>com.tuoren</groupId>
-            <artifactId>nb-auth</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.t-io</groupId>
-            <artifactId>tio-websocket-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-            <optional>true</optional>
-            <scope>compile</scope>
-        </dependency>
-        <!-- web 模块 -->
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                    <groupId>org.springframework.boot</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- sa-token -->
-        <dependency>
-            <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-spring-boot-starter</artifactId>
-        </dependency>
-        <!-- sa-token redis -->
-        <dependency>
-            <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
-        </dependency>
-        <!--redis依赖 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-        <!-- pool 对象池 -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-        </dependency>
-        <!-- mybatis plus -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-        </dependency>
-        <!-- hutool -->
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-        </dependency>
-        <!-- guava -->
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-        <!-- fastjson -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-        <!-- servlet -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
-        <!-- hibernate validator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-        <!--  自动生成YML配置关联JSON文件  -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-        </dependency>
-        <!-- easyexcel -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel</artifactId>
-        </dependency>
-        <!-- minio -->
-        <dependency>
-            <groupId>io.minio</groupId>
-            <artifactId>minio</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.websocket</groupId>
-            <artifactId>jakarta.websocket-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson-spring-boot-starter</artifactId>
-            <optional>true</optional>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.marshalling</groupId>
-            <artifactId>jboss-marshalling</artifactId>
-        </dependency>
-    </dependencies>
 </project>

nb-core/pom.xml

@@ -30,6 +30,7 @@
         <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson-spring-boot-starter</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>javax.validation</groupId>
@@ -57,7 +58,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>

nb-system/pom.xml

@@ -12,48 +12,31 @@
     <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>
-        </dependency>
-        <dependency>
-            <groupId>com.tuoren</groupId>
-            <artifactId>all-common</artifactId>
-            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>com.tuoren</groupId>
             <artifactId>delay-queue-common</artifactId>
-            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>com.tuoren</groupId>
             <artifactId>log-common</artifactId>
-            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>com.tuoren</groupId>
             <artifactId>crud-common</artifactId>
-            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>com.tuoren</groupId>
-            <artifactId>nb-common</artifactId>
+            <artifactId>nb-auth</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.tuoren</groupId>
+            <artifactId>nb-oss</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.python</groupId>
             <artifactId>jython-standalone</artifactId>
@@ -90,6 +73,7 @@
         </dependency>
 
 
+
     </dependencies>
 
 </project>

nb-system/src/main/java/com/nb/bus/job/DeviceFlowStatsJob.java

@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.nb.bus.entity.BusHospitalLogEntity;
 import com.nb.bus.enums.HospitalLogEnum;
 import com.nb.bus.service.LocalBusHospitalLogService;
-import com.nb.common.notice.msg.DeviceMsg;
-import com.nb.common.notice.wechat.EnterpriseWeChatNotify;
+import com.nb.common.config.notice.msg.DeviceMsg;
+import com.nb.common.config.notice.wechat.EnterpriseWeChatNotify;
 import lombok.AllArgsConstructor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.scheduling.annotation.Scheduled;

nb-system/src/main/java/com/nb/log/config/LogEventListenerConfig.java

@@ -0,0 +1,53 @@
+package com.nb.log.config;
+
+import ch.qos.logback.classic.Level;
+import cn.hutool.core.bean.BeanUtil;
+import com.nb.common.log.event.InnerLog4j2;
+import com.nb.common.log.event.InnerLog4j2Event;
+import com.nb.common.log.event.OperationLog;
+import com.nb.common.log.event.OperationLogEvent;
+import com.nb.log.entity.SysLog;
+import com.nb.log.entity.SysRunningLog;
+import com.nb.log.service.ISysLogService;
+import com.nb.log.service.LocalSysRunningLogService;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.event.EventListener;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName LogEventListener.java
+ * @Description TODO
+ * @createTime 2022年08月02日 11:42:00
+ */
+@Component
+@Order(1)
+public class LogEventListenerConfig {
+    private ISysLogService sysLogService;
+    private LocalSysRunningLogService sysRunningLogService;
+
+    @Autowired
+    public LogEventListenerConfig(ISysLogService sysLogService, LocalSysRunningLogService sysRunningLogService) {
+        this.sysLogService = sysLogService;
+        this.sysRunningLogService = sysRunningLogService;
+    }
+
+    @EventListener
+    public void operationLog(OperationLogEvent logEvent){
+        OperationLog log = logEvent.getLog();
+        SysLog sysLog = BeanUtil.copyProperties(log, SysLog.class);
+        sysLogService.save(sysLog);
+    }
+
+    @EventListener
+    public void innerLog(InnerLog4j2Event logEvent){
+        InnerLog4j2 log = logEvent.getLog();
+        if(Level.ERROR.levelStr.equals(log.getLevel())){
+            SysRunningLog sysLog = BeanUtil.copyProperties(log, SysRunningLog.class);
+            sysRunningLogService.save(sysLog);
+        }
+    }
+}

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

@@ -1,9 +1,9 @@
-package com.nb.common.log.controller;
+package com.nb.log.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nb.common.log.service.ISysLogService;
-import com.nb.common.log.service.dto.SysLogQueryDTO;
+import com.nb.log.service.ISysLogService;
+import com.nb.log.service.dto.SysLogQueryDTO;
 import com.nb.core.annotation.Log;
 import com.nb.core.result.R;
 import io.swagger.annotations.Api;

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

@@ -1,12 +1,12 @@
-package com.nb.common.log.controller;
+package com.nb.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.common.log.entity.SysRunningLog;
-import com.nb.common.log.service.LocalSysRunningLogService;
+import com.nb.log.entity.SysRunningLog;
+import com.nb.log.service.LocalSysRunningLogService;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

nb-common/log-common/src/main/java/com/nb/common/log/doc/LogDocConfig.java → nb-system/src/main/java/com/nb/log/doc/LogDocConfig.java

@@ -1,6 +1,5 @@
-package com.nb.common.log.doc;
+package com.nb.log.doc;
 
-import com.nb.core.doc.SwaggerConfig;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
@@ -23,7 +22,7 @@ public class LogDocConfig{
     public Docket logDoc(){
         return new Docket(DocumentationType.SWAGGER_2)
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("com.nb.common.log.controller"))
+                .apis(RequestHandlerSelectors.basePackage("com.nb.log.controller"))
                 .paths(PathSelectors.any())
                 .build()
                 .groupName("操作日志模块")

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

@@ -1,4 +1,4 @@
-package com.nb.common.log.entity;
+package com.nb.log.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;

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

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

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

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

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

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

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

@@ -1,10 +1,10 @@
-package com.nb.common.log.service;
+package com.nb.log.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.log.entity.SysLog;
-import com.nb.common.log.service.dto.SysLogQueryDTO;
+import com.nb.log.entity.SysLog;
+import com.nb.log.service.dto.SysLogQueryDTO;
 
 /**
  * <p>

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

@@ -1,8 +1,13 @@
-package com.nb.common.log.service;
+package com.nb.log.service;
 
+import ch.qos.logback.classic.Level;
+import cn.hutool.core.bean.BeanUtil;
 import com.nb.common.crud.BaseService;
-import com.nb.common.log.entity.SysRunningLog;
-import com.nb.common.log.mapper.SysRunningLogMapper;
+import com.nb.common.log.event.InnerLog4j2;
+import com.nb.common.log.event.InnerLog4j2Event;
+import com.nb.log.entity.SysRunningLog;
+import com.nb.log.mapper.SysRunningLogMapper;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 
 /**
@@ -14,6 +19,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class LocalSysRunningLogService extends BaseService<SysRunningLogMapper, SysRunningLog,String> {
+
     @Override
     public void validateBeforeSave(SysRunningLog entity) {
 

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

@@ -1,14 +1,18 @@
-package com.nb.common.log.service;
+package com.nb.log.service;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.log.entity.SysLog;
-import com.nb.common.log.mapper.SysLogMapper;
-import com.nb.common.log.service.dto.SysLogQueryDTO;
+import com.nb.log.entity.SysLog;
+import com.nb.common.log.event.OperationLog;
+import com.nb.common.log.event.OperationLogEvent;
+import com.nb.log.mapper.SysLogMapper;
+import com.nb.log.service.dto.SysLogQueryDTO;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 
 /**

nb-common/log-common/src/main/java/com/nb/common/log/service/dto/SysLogQueryDTO.java → nb-system/src/main/java/com/nb/log/service/dto/SysLogQueryDTO.java

@@ -1,4 +1,4 @@
-package com.nb.common.log.service.dto;
+package com.nb.log.service.dto;
 
 import lombok.Data;
 

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

@@ -9,7 +9,7 @@ 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.apply.ApplyManager;
+import com.nb.common.config.apply.ApplyManager;
 import com.nb.core.enums.UserPlatformEnum;
 import com.nb.core.exception.apply.ApplyTokenParamException;
 import com.nb.core.exception.apply.NoExistAppKeyException;

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.config.apply.ApplyManager;
 import com.nb.core.cache.ConfigStorage;
 import com.nb.core.cache.manager.ClusterStorageManager;
 import com.nb.core.Value;

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

@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.nb.common.apply.ApplyManager;
+import com.nb.common.config.apply.ApplyManager;
 import com.nb.common.crud.BaseService;
 import com.nb.core.exception.CustomException;
 import com.nb.system.common.dto.SysApplyAssignMenuDTO;

pom.xml

@@ -68,11 +68,26 @@
     <!-- 依赖管理 -->
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.tuoren</groupId>
+                <artifactId>config-common</artifactId>
+                <version>${nb.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.tuoren</groupId>
                 <artifactId>crud-common</artifactId>
                 <version>${nb.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.tuoren</groupId>
+                <artifactId>delay-queue-common</artifactId>
+                <version>${nb.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.tuoren</groupId>
+                <artifactId>log-common</artifactId>
+                <version>${nb.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.tuoren</groupId>
                 <artifactId>nb-core</artifactId>
@@ -256,68 +271,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <build>
-        <finalName>${project.name}</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-maven-plugin</artifactId>
-                    <version>${spring-boot.version}</version>
-                    <configuration>
-                        <mainClass>com.nb.admin.AdminApplication</mainClass>
-                        <finalName>${project.build.finalName}</finalName>
-                        <layers>
-                            <enabled>true</enabled>
-                        </layers>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>repackage</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
 
-    <profiles>
-        <profile>
-            <id>dev</id>
-            <properties>
-                <!-- 环境标识，需要与配置文件的名称相对应 -->
-                <profiles.active>dev</profiles.active>
-                <!--<profiles.active>prod</profiles.active>-->
-                <logging.level>debug</logging.level>
-            </properties>
-            <activation>
-                <!-- 默认环境 -->
-                <activeByDefault>true</activeByDefault>
-            </activation>
-        </profile>
-        <profile>
-            <id>test</id>
-            <properties>
-                <profiles.active>test</profiles.active>
-                <logging.level>warn</logging.level>
-            </properties>
-        </profile>
-        <profile>
-            <id>prod</id>
-            <properties>
-                <profiles.active>prod</profiles.active>
-                <logging.level>warn</logging.level>
-            </properties>
-        </profile>
-    </profiles>
 
 </project>