From 1ecee3c6339385708f0b1cd6cb6490ee0036cc1e Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Mon, 25 Sep 2023 16:24:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4influx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/njcn/advance/AdvanceBootApplication.java | 2 ++
 pqs-device/common-device-biz/pom.xml                       | 2 +-
 pqs-job/job-admin/pom.xml                                  | 7 -------
 .../src/main/java/com/njcn/system/SystemBootMain.java      | 2 ++
 .../src/main/java/com/njcn/user/UserBootApplication.java   | 2 ++
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/AdvanceBootApplication.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/AdvanceBootApplication.java
index d04ee0d0c..179c842f8 100644
--- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/AdvanceBootApplication.java
+++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/AdvanceBootApplication.java
@@ -5,6 +5,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.DependsOn;
 
 /**
  * @author hongawen
@@ -12,6 +13,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @createTime 2021年05月14日 15:14
  */
 @Slf4j
+@DependsOn("proxyMapperRegister")
 @MapperScan("com.njcn.**.mapper")
 @EnableFeignClients(basePackages = "com.njcn")
 @SpringBootApplication(scanBasePackages = "com.njcn")
diff --git a/pqs-device/common-device-biz/pom.xml b/pqs-device/common-device-biz/pom.xml
index 9bdb5fe96..ab6181178 100644
--- a/pqs-device/common-device-biz/pom.xml
+++ b/pqs-device/common-device-biz/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>pqs-influx</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/pqs-job/job-admin/pom.xml b/pqs-job/job-admin/pom.xml
index 61d1d98f7..d5871af7d 100644
--- a/pqs-job/job-admin/pom.xml
+++ b/pqs-job/job-admin/pom.xml
@@ -28,17 +28,10 @@
     </properties>
 
     <dependencies>
-
         <!-- starter-web：spring-webmvc + autoconfigure + logback + yaml + tomcat -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <!-- starter-test：junit + spring-test + mockito -->
         <dependency>
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/SystemBootMain.java b/pqs-system/system-boot/src/main/java/com/njcn/system/SystemBootMain.java
index b1ad05045..b6a2780aa 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/SystemBootMain.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/SystemBootMain.java
@@ -5,6 +5,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.DependsOn;
 
 /**
  * @author hongawen
@@ -12,6 +13,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @createTime 2021年05月14日 15:14
  */
 @Slf4j
+@DependsOn("proxyMapperRegister")
 @MapperScan("com.njcn.**.mapper")
 @EnableFeignClients(basePackages = "com.njcn")
 @SpringBootApplication(scanBasePackages = "com.njcn")
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/UserBootApplication.java b/pqs-user/user-boot/src/main/java/com/njcn/user/UserBootApplication.java
index c667daea9..7b8ae0d74 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/UserBootApplication.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/UserBootApplication.java
@@ -5,6 +5,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.DependsOn;
 
 
 /**
@@ -13,6 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @date 2021年12月09日 20:59
  */
 @Slf4j
+@DependsOn("proxyMapperRegister")
 @MapperScan("com.njcn.**.mapper")
 @EnableFeignClients(basePackages = "com.njcn")
 @SpringBootApplication(scanBasePackages = "com.njcn")