Эх сурвалжийг харах

feat:更新编译报错h2数据库包没要导入导致启动失败问题

荭琪枫 2 жил өмнө
parent
commit
beee0feaf4
26 өөрчлөгдсөн 83 нэмэгдсэн , 119 устгасан
  1. 6 1
      iot-common/iot-common-dao/iot-data-serviceImpl-rdb/pom.xml
  2. 7 10
      iot-components/iot-DLT645-component/dependency-reduced-pom.xml
  3. 2 1
      iot-components/iot-DLT645-component/pom.xml
  4. 1 0
      iot-components/iot-component-tcp/dependency-reduced-pom.xml
  5. 2 1
      iot-components/iot-component-tcp/pom.xml
  6. 12 33
      iot-components/iot-emqx-component/dependency-reduced-pom.xml
  7. 2 1
      iot-components/iot-emqx-component/pom.xml
  8. 9 12
      iot-components/iot-http-biz-component/dependency-reduced-pom.xml
  9. 2 1
      iot-components/iot-http-biz-component/pom.xml
  10. 12 33
      iot-components/iot-mqtt-component/dependency-reduced-pom.xml
  11. 2 1
      iot-components/iot-mqtt-component/pom.xml
  12. 10 13
      iot-components/iot-websocket-component/dependency-reduced-pom.xml
  13. 2 1
      iot-components/iot-websocket-component/pom.xml
  14. 2 1
      iot-module/iot-manager/pom.xml
  15. 2 1
      iot-module/iot-message-notify/pom.xml
  16. 3 2
      iot-module/iot-rule-engine/pom.xml
  17. 2 1
      iot-module/iot-system/pom.xml
  18. 0 1
      iot-starter/src/main/resources/application-dev.yml
  19. 0 1
      iot-starter/src/main/resources/application-mysql.yml
  20. 1 2
      iot-starter/src/main/resources/application.yml
  21. 2 1
      iot-test-tool/iot-test-mqtt/pom.xml
  22. 2 1
      iot-test-tool/iot-virtual-device/pom.xml
  23. BIN
      log/error.2023-06-01.0.gz
  24. BIN
      log/error.2023-06-02.0.gz
  25. BIN
      log/info.2023-06-01.0.gz
  26. BIN
      log/info.2023-06-02.0.gz

+ 6 - 1
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/pom.xml

@@ -32,6 +32,11 @@
             <artifactId>querydsl-jpa</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
@@ -140,4 +145,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

+ 7 - 10
iot-components/iot-DLT645-component/dependency-reduced-pom.xml

@@ -3,10 +3,12 @@
   <parent>
     <artifactId>iot-components</artifactId>
     <groupId>cc.iotkit</groupId>
-    <version>${revision}</version>
+    <version>0.4.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
+  <groupId>cc.iotkit</groupId>
   <artifactId>iot-DLT645-component</artifactId>
+  <version>0.4.5-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -38,6 +40,7 @@
         <configuration>
           <source>11</source>
           <target>11</target>
+          <encoding>utf8</encoding>
         </configuration>
       </plugin>
     </plugins>
@@ -46,25 +49,19 @@
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.24</version>
+      <version>1.18.26</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-web-proxy</artifactId>
-      <version>4.2.2</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>cc.iotkit</groupId>
       <artifactId>iot-component-base</artifactId>
-      <version>0.4.3-SNAPSHOT</version>
+      <version>0.4.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>cc.iotkit</groupId>
       <artifactId>iot-common-core</artifactId>
-      <version>0.4.3-SNAPSHOT</version>
+      <version>0.4.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

+ 2 - 1
iot-components/iot-DLT645-component/pom.xml

@@ -75,9 +75,10 @@
                 <configuration>
                     <source>11</source>
                     <target>11</target>
+                    <encoding>utf8</encoding>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-</project>
+</project>

+ 1 - 0
iot-components/iot-component-tcp/dependency-reduced-pom.xml

@@ -37,6 +37,7 @@
           <target>${java.version}</target>
           <forceJavacCompilerUse>true</forceJavacCompilerUse>
           <useIncrementalCompilation>false</useIncrementalCompilation>
+          <encoding>utf8</encoding>
         </configuration>
       </plugin>
     </plugins>

+ 2 - 1
iot-components/iot-component-tcp/pom.xml

@@ -88,8 +88,9 @@
                     <target>${java.version}</target>
                     <forceJavacCompilerUse>true</forceJavacCompilerUse>
                     <useIncrementalCompilation>false</useIncrementalCompilation>
+                    <encoding>utf8</encoding>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

+ 12 - 33
iot-components/iot-emqx-component/dependency-reduced-pom.xml

@@ -3,10 +3,12 @@
   <parent>
     <artifactId>iot-components</artifactId>
     <groupId>cc.iotkit</groupId>
-    <version>${revision}</version>
+    <version>0.4.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
+  <groupId>cc.iotkit</groupId>
   <artifactId>iot-emqx-component</artifactId>
+  <version>0.4.5-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -48,67 +50,44 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>11</source>
-          <target>11</target>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
           <forceJavacCompilerUse>true</forceJavacCompilerUse>
           <useIncrementalCompilation>false</useIncrementalCompilation>
+          <encoding>utf8</encoding>
         </configuration>
       </plugin>
     </plugins>
   </build>
   <dependencies>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-core</artifactId>
-      <version>4.2.2</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-web-proxy</artifactId>
-      <version>4.2.2</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-mqtt</artifactId>
-      <version>4.2.2</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.luaj</groupId>
-      <artifactId>luaj-jse</artifactId>
-      <version>3.0.1</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>cc.iotkit</groupId>
-       <artifactId>iot-common-model</artifactId>
-      <version>0.4.3-SNAPSHOT</version>
+      <artifactId>iot-common-model</artifactId>
+      <version>0.4.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>cc.iotkit</groupId>
       <artifactId>iot-common-core</artifactId>
-      <version>0.4.3-SNAPSHOT</version>
+      <version>0.4.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>cc.iotkit</groupId>
       <artifactId>iot-component-base</artifactId>
-      <version>0.4.3-SNAPSHOT</version>
+      <version>0.4.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>cc.iotkit</groupId>
       <artifactId>iot-data-service</artifactId>
-      <version>0.4.3-SNAPSHOT</version>
+      <version>0.4.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>cc.iotkit</groupId>
       <artifactId>iot-script-engine</artifactId>
-      <version>0.4.3-SNAPSHOT</version>
+      <version>0.4.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

+ 2 - 1
iot-components/iot-emqx-component/pom.xml

@@ -114,9 +114,10 @@
                     <target>${java.version}</target>
                     <forceJavacCompilerUse>true</forceJavacCompilerUse>
                     <useIncrementalCompilation>false</useIncrementalCompilation>
+                    <encoding>utf8</encoding>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-</project>
+</project>

+ 9 - 12
iot-components/iot-http-biz-component/dependency-reduced-pom.xml

@@ -3,10 +3,12 @@
   <parent>
     <artifactId>iot-components</artifactId>
     <groupId>cc.iotkit</groupId>
-    <version>${revision}</version>
+    <version>0.4.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
+  <groupId>cc.iotkit</groupId>
   <artifactId>iot-http-biz-component</artifactId>
+  <version>0.4.5-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -36,8 +38,9 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>11</source>
-          <target>11</target>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
+          <encoding>utf8</encoding>
         </configuration>
       </plugin>
     </plugins>
@@ -46,25 +49,19 @@
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.24</version>
+      <version>1.18.26</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-web-proxy</artifactId>
-      <version>4.2.2</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>cc.iotkit</groupId>
       <artifactId>iot-component-base</artifactId>
-      <version>0.4.3-SNAPSHOT</version>
+      <version>0.4.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>cc.iotkit</groupId>
       <artifactId>iot-script-engine</artifactId>
-      <version>0.4.3-SNAPSHOT</version>
+      <version>0.4.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

+ 2 - 1
iot-components/iot-http-biz-component/pom.xml

@@ -68,9 +68,10 @@
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
+                    <encoding>utf8</encoding>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-</project>
+</project>

+ 12 - 33
iot-components/iot-mqtt-component/dependency-reduced-pom.xml

@@ -3,10 +3,12 @@
   <parent>
     <artifactId>iot-components</artifactId>
     <groupId>cc.iotkit</groupId>
-    <version>${revision}</version>
+    <version>0.4.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
+  <groupId>cc.iotkit</groupId>
   <artifactId>iot-mqtt-component</artifactId>
+  <version>0.4.5-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -34,73 +36,50 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>11</source>
-          <target>11</target>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
           <forceJavacCompilerUse>true</forceJavacCompilerUse>
           <useIncrementalCompilation>false</useIncrementalCompilation>
+          <encoding>utf8</encoding>
         </configuration>
       </plugin>
     </plugins>
   </build>
   <dependencies>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-core</artifactId>
-      <version>4.2.2</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-mqtt</artifactId>
-      <version>4.2.2</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec-mqtt</artifactId>
-      <version>4.1.72.Final</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.24</version>
+      <version>1.18.26</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.32</version>
+      <version>1.7.36</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.luaj</groupId>
-      <artifactId>luaj-jse</artifactId>
-      <version>3.0.1</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>cc.iotkit</groupId>
       <artifactId>iot-common-core</artifactId>
-      <version>0.4.3-SNAPSHOT</version>
+      <version>0.4.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>cc.iotkit</groupId>
       <artifactId>iot-component-base</artifactId>
-      <version>0.4.3-SNAPSHOT</version>
+      <version>0.4.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>cc.iotkit</groupId>
       <artifactId>iot-data-service</artifactId>
-      <version>0.4.3-SNAPSHOT</version>
+      <version>0.4.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>cc.iotkit</groupId>
       <artifactId>iot-script-engine</artifactId>
-      <version>0.4.3-SNAPSHOT</version>
+      <version>0.4.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

+ 2 - 1
iot-components/iot-mqtt-component/pom.xml

@@ -98,9 +98,10 @@
                     <target>${java.version}</target>
                     <forceJavacCompilerUse>true</forceJavacCompilerUse>
                     <useIncrementalCompilation>false</useIncrementalCompilation>
+                    <encoding>utf8</encoding>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-</project>
+</project>

+ 10 - 13
iot-components/iot-websocket-component/dependency-reduced-pom.xml

@@ -3,10 +3,12 @@
   <parent>
     <artifactId>iot-components</artifactId>
     <groupId>cc.iotkit</groupId>
-    <version>${revision}</version>
+    <version>0.4.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
+  <groupId>cc.iotkit</groupId>
   <artifactId>iot-websocket-component</artifactId>
+  <version>0.4.5-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>
@@ -32,43 +34,38 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>11</source>
-          <target>11</target>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
           <forceJavacCompilerUse>true</forceJavacCompilerUse>
           <useIncrementalCompilation>false</useIncrementalCompilation>
+          <encoding>utf8</encoding>
         </configuration>
       </plugin>
     </plugins>
   </build>
   <dependencies>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-core</artifactId>
-      <version>4.2.2</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.24</version>
+      <version>1.18.26</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>cc.iotkit</groupId>
       <artifactId>iot-common-core</artifactId>
-      <version>0.4.3-SNAPSHOT</version>
+      <version>0.4.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.32</version>
+      <version>1.7.36</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>cc.iotkit</groupId>
       <artifactId>iot-component-base</artifactId>
-      <version>0.4.3-SNAPSHOT</version>
+      <version>0.4.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

+ 2 - 1
iot-components/iot-websocket-component/pom.xml

@@ -71,9 +71,10 @@
                     <target>${java.version}</target>
                     <forceJavacCompilerUse>true</forceJavacCompilerUse>
                     <useIncrementalCompilation>false</useIncrementalCompilation>
+                    <encoding>utf8</encoding>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-</project>
+</project>

+ 2 - 1
iot-module/iot-manager/pom.xml

@@ -131,6 +131,7 @@
                 <configuration>
                     <source>${java.version}</source> <!-- depending on your project -->
                     <target>${java.version}</target> <!-- depending on your project -->
+                    <encoding>utf8</encoding>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>org.projectlombok</groupId>
@@ -154,4 +155,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

+ 2 - 1
iot-module/iot-message-notify/pom.xml

@@ -46,9 +46,10 @@
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
+                    <encoding>utf8</encoding>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-</project>
+</project>

+ 3 - 2
iot-module/iot-rule-engine/pom.xml

@@ -107,9 +107,10 @@
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
+                    <encoding>utf8</encoding>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-    
-</project>
+
+</project>

+ 2 - 1
iot-module/iot-system/pom.xml

@@ -75,6 +75,7 @@
                 <configuration>
                     <source>${java.version}</source> <!-- depending on your project -->
                     <target>${java.version}</target> <!-- depending on your project -->
+                    <encoding>utf8</encoding>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>org.projectlombok</groupId>
@@ -98,4 +99,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

+ 0 - 1
iot-starter/src/main/resources/application-dev.yml

@@ -80,7 +80,6 @@ spring:
     host: 127.0.0.1
     port: 6379
     database: 0
-    password:
 
   mvc:
     pathmatch:

+ 0 - 1
iot-starter/src/main/resources/application-mysql.yml

@@ -54,7 +54,6 @@ spring:
     host: 127.0.0.1
     port: 6379
     database: 0
-    password:
 
   mvc:
     pathmatch:

+ 1 - 2
iot-starter/src/main/resources/application.yml

@@ -80,7 +80,6 @@ spring:
     host: 127.0.0.1
     port: 6379
     database: 0
-    password:
 
   mvc:
     pathmatch:
@@ -153,4 +152,4 @@ user:
     # 密码最大错误次数
     maxRetryCount: 5
     # 密码锁定时间(默认10分钟)
-    lockTime: 10
+    lockTime: 10

+ 2 - 1
iot-test-tool/iot-test-mqtt/pom.xml

@@ -52,6 +52,7 @@
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
+                    <encoding>utf8</encoding>
                 </configuration>
             </plugin>
             <plugin>
@@ -79,4 +80,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

+ 2 - 1
iot-test-tool/iot-virtual-device/pom.xml

@@ -50,9 +50,10 @@
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
+                    <encoding>utf8</encoding>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-</project>
+</project>

BIN
log/error.2023-06-01.0.gz


BIN
log/error.2023-06-02.0.gz


BIN
log/info.2023-06-01.0.gz


BIN
log/info.2023-06-02.0.gz