Merge remote-tracking branch 'origin/master'

2023-04-10 16:36:36 +08:00
parent 9fc0e6bb41 4b9e15ff0d
commit d66d2eefdc
60 changed files with 1967 additions and 215 deletions
--- a/pqs-event/event-boot/pom.xml
+++ b/pqs-event/event-boot/pom.xml
@@ -21,6 +21,16 @@
            <groupId>com.njcn</groupId>
            <artifactId>common-web</artifactId>
            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+            </exclusions>
        </dependency>
        <dependency>
            <groupId>com.njcn</groupId>