From 94e3cc94d83f5ec1bb64e48360a15d057f3643d9 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 12 十二月 2025 15:32:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jsxswms' into jsxswms

---
 pom.xml |   39 +++++++++++++++++++++++++++++++++------
 1 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4a533db..5dd2bcd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,18 +11,22 @@
     <groupId>com.zy</groupId>
     <artifactId>asrs</artifactId>
     <version>1.1.1</version>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
 
     <properties>
         <java.version>1.8</java.version>
-        <cool.version>1.1.1</cool.version>
+        <cool.version>3.2.0</cool.version>
         <mysql-driver.version>5.1.47</mysql-driver.version>
         <mybatis-plus.version>2.3.2</mybatis-plus.version>
         <fastjson.version>1.2.58</fastjson.version>
         <springfox.version>2.7.0</springfox.version>
     </properties>
-
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -37,9 +41,21 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+        <!-- 浣跨敤鏈湴 JAR 瑙e喅缂哄け鐨� cn.cool:framework:jar:3.2.0 -->
+        <dependency>
             <groupId>cn.cool</groupId>
             <artifactId>framework</artifactId>
-            <version>${cool.version}</version>
+            <version>3.2.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/version/lib/framework-3.2.0.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-core</artifactId>
+            <version>2.1.0</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -89,7 +105,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
-            <version>2.0.5</version>
+            <version>2.2.6</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -97,10 +113,21 @@
             <version>1.16.22</version>
             <scope>provided</scope>
         </dependency>
+        <!-- okHttp3 -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.10.0</version>
+        </dependency>
+        <dependency>
+            <groupId>de.schlichtherle.truelicense</groupId>
+            <artifactId>truelicense-core</artifactId>
+            <version>1.33</version>
+        </dependency>
     </dependencies>
 
     <build>
-        <finalName>xtywms</finalName>
+        <finalName>wms</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

--
Gitblit v1.9.1