From eb3dd00b0b7fcda477229d518d250f9c842b790b Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 21 十月 2025 17:45:44 +0800
Subject: [PATCH] 2025.10.21 1. 走航季度报告相关数据计算逻辑调整

---
 pom.xml |   87 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8436d7e..a0c3395 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <kotlin.version>1.5.0</kotlin.version>
+        <kotlin.version>2.1.0</kotlin.version>
         <itext.version>7.2.2</itext.version>
         <!-- tk.mybatis -->
         <mapper.plugin>tk.mybatis.mapper.generator.MapperPlugin</mapper.plugin>
@@ -35,6 +35,10 @@
                     <artifactId>spring-boot-starter-logging</artifactId>
                 </exclusion>
             </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
@@ -165,6 +169,17 @@
             <artifactId>springfox-boot-starter</artifactId>
             <version>3.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.plugin</groupId>
+            <artifactId>spring-plugin-core</artifactId>
+            <version>2.0.0.RELEASE</version>
+        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.plugin</groupId>-->
+<!--            <artifactId>spring-plugin-metadata</artifactId>-->
+<!--            <version>2.0.0.RELEASE</version>-->
+<!--        </dependency>-->
+
 
         <!-- https://mvnrepository.com/artifact/org.freemarker/freemarker -->
         <dependency>
@@ -211,12 +226,74 @@
             <artifactId>jfreechart</artifactId>
             <version>1.5.3</version>
         </dependency>
-
+        <!-- Httpclient-->
         <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.0</version>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.5.14</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/javax.xml.ws/jaxws-api -->
+<!--        <dependency>-->
+<!--            <groupId>javax.xml.ws</groupId>-->
+<!--            <artifactId>jaxws-api</artifactId>-->
+<!--            <version>2.3.1</version>-->
+<!--        </dependency>-->
+<!--        &lt;!&ndash; https://mvnrepository.com/artifact/org.apache.axis2/axis2-jaxws &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.axis2</groupId>-->
+<!--            <artifactId>axis2-jaxws</artifactId>-->
+<!--            <version>1.8.2</version>-->
+<!--        </dependency>-->
+<!--        &lt;!&ndash; https://mvnrepository.com/artifact/org.apache.axis2/axis2-adb &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.axis2</groupId>-->
+<!--            <artifactId>axis2-adb</artifactId>-->
+<!--            <version>1.8.2</version>-->
+<!--        </dependency>-->
+<!--        &lt;!&ndash; https://mvnrepository.com/artifact/org.apache.axis2/axis2-transport-base &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.axis2</groupId>-->
+<!--            <artifactId>axis2-transport-base</artifactId>-->
+<!--            <version>1.8.2</version>-->
+<!--        </dependency>-->
+        <!-- https://mvnrepository.com/artifact/org.apache.axis2/axis2-kernel -->
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-kernel</artifactId>
+            <version>1.8.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.17.0</version>
+        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.docx4j</groupId>-->
+<!--            <artifactId>docx4j-core</artifactId>-->
+<!--            <version>11.4.9</version> &lt;!&ndash; 浣跨敤鏈�鏂扮ǔ瀹氱増 &ndash;&gt;-->
+<!--        </dependency>-->
+<!--        &lt;!&ndash; 濡傞渶澶勭悊鍥剧墖/琛ㄦ牸绛夐珮绾у姛鑳斤紝鍙坊鍔� &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>org.docx4j</groupId>-->
+<!--            <artifactId>docx4j-ImportXHTML</artifactId>-->
+<!--            <version>11.4.8</version>-->
+<!--        </dependency>-->
+<!--        &lt;!&ndash; MockK 鍗曞厓娴嬭瘯搴擄紙鐢ㄤ簬 Kotlin锛� &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>io.mockk</groupId>-->
+<!--            <artifactId>mockk</artifactId>-->
+<!--            <version>1.14.5</version> &lt;!&ndash; 浣跨敤鏈�鏂扮ǔ瀹氱増 &ndash;&gt;-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.junit.jupiter</groupId>-->
+<!--            <artifactId>junit-jupiter</artifactId>-->
+<!--            <version>RELEASE</version>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
+
+
+
     </dependencies>
 
     <build>

--
Gitblit v1.9.3