From bd43f95d533b1b7126ace93b6bef4f2af5cf02d7 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Tue, 29 Apr 2025 13:44:00 +0800
Subject: [PATCH] 'commit'

---
 dsBase/pom.xml                                | 152 ++++++++----------
 .../dsideal/dsBase/Util/ExcelCommonUtil.java  |   3 +-
 dsGw/pom.xml                                  |  64 ++++----
 pom.xml                                       |  73 +++++++--
 4 files changed, 157 insertions(+), 135 deletions(-)

diff --git a/dsBase/pom.xml b/dsBase/pom.xml
index 53069bb4..1c0acb97 100644
--- a/dsBase/pom.xml
+++ b/dsBase/pom.xml
@@ -10,11 +10,14 @@
     </parent>
     <artifactId>dsBase</artifactId>
     <name>dsBase</name>
-    <!--使用jdk21进行编译-->
+
+    <!-- 统一管理版本号 -->
     <properties>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+
     <!-- 使用阿里 maven 库 -->
     <repositories>
         <repository>
@@ -30,8 +33,9 @@
             </snapshots>
         </repository>
     </repositories>
+
     <dependencies>
-        <!--jfinal主框架-->
+        <!-- JFinal框架 -->
         <dependency>
             <groupId>com.jfinal</groupId>
             <artifactId>jfinal</artifactId>
@@ -47,163 +51,134 @@
             <artifactId>cos</artifactId>
             <version>${jfinal-cos.version}</version>
         </dependency>
-        <!--  JApiDocs  -->
-        <dependency>
-            <groupId>io.github.yedaxia</groupId>
-            <artifactId>japidocs</artifactId>
-            <version>${japidocs.version}</version>
-        </dependency>
-
-        <!--https://blog.csdn.net/AdminGuan/article/details/100147488-->
-        <!--JWT,用于鉴权-->
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
-            <version>${jjwt.version}</version>
-        </dependency>
-
-        <!--引入定时器组件-->
-        <dependency>
-            <groupId>it.sauronsoftware.cron4j</groupId>
-            <artifactId>cron4j</artifactId>
-            <version>2.2.5</version>
-        </dependency>
 
-        <!--引用光-->
-        <!-- https://mvnrepository.com/artifact/com.zaxxer/HikariCP -->
+        <!-- 数据库相关 -->
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
             <version>${HikariCP.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
             <version>${postgresql.version}</version>
         </dependency>
-        <!--图片缩放-->
-        <dependency>
-            <groupId>net.coobird</groupId>
-            <artifactId>thumbnailator</artifactId>
-            <version>0.4.19</version>
-        </dependency>
-
-        <!--日志logback-->
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.4.7</version>
-        </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
-        <!--安装hutool-->
+        <!-- 工具类库 -->
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.8.24</version>
+            <version>${hutool.version}</version>
         </dependency>
-        <!--引用fastjson-->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>2.0.45</version>
+            <version>${fastjson.version}</version>
         </dependency>
-
-        <!-- https://mvnrepository.com/artifact/cn.idev.excel/fastexcel -->
-        <dependency>
-            <groupId>cn.idev.excel</groupId>
-            <artifactId>fastexcel</artifactId>
-            <version>1.1.0</version>
-        </dependency>
-
-        <!--引用jsoup防止xss攻击-->
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.17.2</version>
+            <version>${jsoup.version}</version>
         </dependency>
-        <!--引用gson-->
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <version>${gson.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.14.0</version>
+            <version>${commons-io.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-email</artifactId>
-            <version>1.5</version>
+            <version>${commons-email.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>${commons-lang3.version}</version>
         </dependency>
         <dependency>
             <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
-            <version>2.1.4</version>
+            <version>${dom4j.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/redis.clients/jedis -->
-        <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-            <version>5.2.0</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
             <version>${snakeyaml.version}</version>
         </dependency>
+        <dependency>
+            <groupId>net.coobird</groupId>
+            <artifactId>thumbnailator</artifactId>
+            <version>${thumbnailator.version}</version>
+        </dependency>
 
+        <!-- 日志相关 -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.20.0</version>
+            <version>${log4j2.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.20.0</version>
+            <version>${log4j2.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version>
-        </dependency>
+        <!-- JSON处理 -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.15.3</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>${jackson.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
+
+        <!-- 其他依赖 -->
         <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>${snakeyaml.version}</version>
+            <groupId>io.github.yedaxia</groupId>
+            <artifactId>japidocs</artifactId>
+            <version>${japidocs.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>${jjwt.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>it.sauronsoftware.cron4j</groupId>
+            <artifactId>cron4j</artifactId>
+            <version>${cron4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.idev.excel</groupId>
+            <artifactId>fastexcel</artifactId>
+            <version>${fastexcel.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>${jedis.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.38</version>
+            <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -214,7 +189,6 @@
                     <source>21</source>
                     <target>21</target>
                     <encoding>UTF-8</encoding>
-                    <!-- java21 保留参数名编译参数 -->
                     <compilerArgument>-parameters</compilerArgument>
                     <compilerArgument>-Xlint:unchecked</compilerArgument>
                 </configuration>
diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Util/ExcelCommonUtil.java b/dsBase/src/main/java/com/dsideal/dsBase/Util/ExcelCommonUtil.java
index 6823df9e..6cb2ba91 100644
--- a/dsBase/src/main/java/com/dsideal/dsBase/Util/ExcelCommonUtil.java
+++ b/dsBase/src/main/java/com/dsideal/dsBase/Util/ExcelCommonUtil.java
@@ -8,7 +8,6 @@ import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.upload.UploadFile;
-import org.apache.commons.lang.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -695,7 +694,7 @@ public class ExcelCommonUtil {
         if (hex.startsWith("#")) {
             colorStr = hex.substring(1);
         }
-        if (StringUtils.length(colorStr) == 8) {
+        if (colorStr.length() == 8) {
             colorStr = hex.substring(2);
         }
         int r = Integer.valueOf(colorStr.substring(0, 2), 16);
diff --git a/dsGw/pom.xml b/dsGw/pom.xml
index f42765b6..7f089f57 100644
--- a/dsGw/pom.xml
+++ b/dsGw/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -10,82 +11,88 @@
     <name>dsGw</name>
 
     <dependencies>
-        <!--jfinal主框架-->
+        <!-- JFinal框架 -->
         <dependency>
             <groupId>com.jfinal</groupId>
             <artifactId>jfinal</artifactId>
             <version>${jfinal.version}</version>
         </dependency>
-
         <dependency>
             <groupId>com.jfinal</groupId>
             <artifactId>jfinal-undertow</artifactId>
             <version>${jfinal-undertow.version}</version>
         </dependency>
-
         <dependency>
             <groupId>com.jfinal</groupId>
             <artifactId>cos</artifactId>
             <version>${jfinal-cos.version}</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/redis.clients/jedis -->
+        <!-- Redis客户端 -->
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>5.2.0</version>
+            <version>${jedis.version}</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
-        <!--安装hutool-->
+        <!-- 工具类库 -->
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
             <version>${hutool.version}</version>
         </dependency>
 
-        <!--日志logback-->
+        <!-- 日志框架 -->
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
             <version>1.5.6</version>
         </dependency>
+
+        <!-- Apache Commons工具集 -->
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.14.0</version>
+            <version>${commons-io.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-email</artifactId>
-            <version>1.5</version>
+            <version>${commons-email.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>${commons-lang3.version}</version>
         </dependency>
-        <!--OkHttp-->
-        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.15</version>
+        </dependency>
+
+        <!-- HTTP客户端 -->
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
             <version>4.12.0</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
+
+        <!-- YAML处理 -->
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
             <version>${snakeyaml.version}</version>
         </dependency>
 
-        <!--https://blog.csdn.net/AdminGuan/article/details/100147488-->
-        <!--JWT,用于鉴权-->
+        <!-- JWT相关 -->
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt</artifactId>
-            <version>0.7.0</version>
+            <version>${jjwt.version}</version>
         </dependency>
+
+        <!-- JAXB相关 -->
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
@@ -106,25 +113,23 @@
             <artifactId>activation</artifactId>
             <version>1.1.1</version>
         </dependency>
-        <!--引用fastjson-->
+
+        <!-- JSON处理 -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
             <version>${fastjson.version}</version>
         </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.15</version> <!-- 可以选择最新版本 -->
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
+
+        <!-- Lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.34</version>
+            <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -132,13 +137,12 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-                    <source>21</source>
-                    <target>21</target>
-                    <encoding>UTF-8</encoding>
-                    <!-- java21 保留参数名编译参数 -->
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
                     <compilerArgument>-parameters</compilerArgument>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index bbea3ad8..827ce0ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,36 +30,81 @@
     </repositories>
     <!--使用jdk21进行编译-->
     <properties>
+        <!-- 项目编码设置 -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <!--JFinal版本号-->
+
+        <!-- JFinal框架相关版本 -->
         <jfinal.version>5.2.4</jfinal.version>
         <jfinal-undertow.version>3.7</jfinal-undertow.version>
         <jfinal-cos.version>2022.2</jfinal-cos.version>
-        <!--HikariCP版本号-->
+
+        <!-- 数据库连接池 -->
         <HikariCP.version>6.3.0</HikariCP.version>
-        <!--生成JWT的版本号-->
+
+        <!-- 安全认证相关 -->
         <jjwt.version>0.7.0</jjwt.version>
-        <!--生成接口文档的类库版本号-->
+
+        <!-- 定时任务调度 -->
+        <cron4j.version>2.2.5</cron4j.version>
+
+        <!-- 图片处理工具 -->
+        <thumbnailator.version>0.4.19</thumbnailator.version>
+
+        <!-- API文档生成工具 -->
         <japidocs.version>1.4.4</japidocs.version>
-        <!--fastjson版本号-->
+
+        <!-- JSON处理工具 -->
         <fastjson.version>2.0.57</fastjson.version>
-        <!--Hutool工具包-->
+
+        <!-- 工具类库 -->
         <hutool.version>5.8.37</hutool.version>
-        <!--Minio版本号-->
+
+        <!-- 对象存储服务 -->
         <minio.version>8.5.17</minio.version>
-        <!--jedis版本号-->
+
+        <!-- Redis客户端 -->
         <jedis.version>5.1.5</jedis.version>
-        <!--Postgresql 版本号-->
+
+        <!-- PostgreSQL数据库驱动 -->
         <postgresql.version>42.7.5</postgresql.version>
-        <!--POI版本-->
+
+        <!-- Excel处理工具 -->
         <poi.version>5.2.5</poi.version>
-        <!--yaml文件读取-->
+
+        <!-- YAML配置文件处理 -->
         <snakeyaml.version>2.3</snakeyaml.version>
-        <!--maven插件版本号-->
+
+        <!-- HTML解析和XSS防护 -->
+        <jsoup.version>1.17.2</jsoup.version>
+
+        <!-- Google JSON处理工具 -->
+        <gson.version>2.10.1</gson.version>
+
+        <!-- Apache Commons工具集 -->
+        <commons-io.version>2.14.0</commons-io.version>
+        <commons-email.version>1.5</commons-email.version>
+        <commons-lang3.version>3.12.0</commons-lang3.version>
+
+        <!-- XML处理工具 -->
+        <dom4j.version>2.1.4</dom4j.version>
+
+        <!-- 日志框架 -->
+        <slf4j.version>1.7.36</slf4j.version>
+        <log4j2.version>2.20.0</log4j2.version>
+
+        <!-- Jackson JSON处理 -->
+        <jackson.version>2.15.3</jackson.version>
+
+        <!-- Excel快速处理工具 -->
+        <fastexcel.version>1.1.0</fastexcel.version>
+
+        <!-- Lombok注解处理器 -->
+        <lombok.version>1.18.38</lombok.version>
+
+        <!-- Maven插件版本 -->
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
         <maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
         <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>