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

---
 dsBase/pom.xml                                | 36 ++++---------------
 .../Base/Controller/BaseController.java       |  3 +-
 .../TeacherTemplateUtil.java                  |  3 +-
 .../Global/Controller/GlobalController.java   |  4 +--
 pom.xml                                       |  4 +++
 5 files changed, 14 insertions(+), 36 deletions(-)

diff --git a/dsBase/pom.xml b/dsBase/pom.xml
index 93bc0a5f..53069bb4 100644
--- a/dsBase/pom.xml
+++ b/dsBase/pom.xml
@@ -35,33 +35,23 @@
         <dependency>
             <groupId>com.jfinal</groupId>
             <artifactId>jfinal</artifactId>
-            <version>5.2.4</version>
+            <version>${jfinal.version}</version>
         </dependency>
         <dependency>
             <groupId>com.jfinal</groupId>
             <artifactId>jfinal-undertow</artifactId>
-            <version>3.7</version>
+            <version>${jfinal-undertow.version}</version>
         </dependency>
         <dependency>
             <groupId>com.jfinal</groupId>
             <artifactId>cos</artifactId>
-            <version>2022.2</version>
+            <version>${jfinal-cos.version}</version>
         </dependency>
         <!--  JApiDocs  -->
         <dependency>
             <groupId>io.github.yedaxia</groupId>
             <artifactId>japidocs</artifactId>
-            <version>1.4.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.icecooly</groupId>
-            <artifactId>FastHttpClient</artifactId>
-            <version>1.10</version>
-        </dependency>
-        <dependency>
-            <groupId>de.ruedigermoeller</groupId>
-            <artifactId>fst</artifactId>
-            <version>3.0.4-jdk17</version>
+            <version>${japidocs.version}</version>
         </dependency>
 
         <!--https://blog.csdn.net/AdminGuan/article/details/100147488-->
@@ -69,14 +59,7 @@
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt</artifactId>
-            <version>0.7.0</version>
-        </dependency>
-        <!--引用json库-->
-        <dependency>
-            <groupId>net.sf.json-lib</groupId>
-            <artifactId>json-lib</artifactId>
-            <version>2.4</version>
-            <classifier>jdk15</classifier>
+            <version>${jjwt.version}</version>
         </dependency>
 
         <!--引入定时器组件-->
@@ -91,7 +74,7 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>6.3.0</version>
+            <version>${HikariCP.version}</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
         <dependency>
@@ -179,13 +162,6 @@
             <version>${snakeyaml.version}</version>
         </dependency>
 
-        <!--https://blog.csdn.net/AdminGuan/article/details/100147488-->
-        <!--JWT,用于鉴权-->
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
-            <version>0.7.0</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Base/Controller/BaseController.java b/dsBase/src/main/java/com/dsideal/dsBase/Base/Controller/BaseController.java
index 056a8557..3c01b5a9 100644
--- a/dsBase/src/main/java/com/dsideal/dsBase/Base/Controller/BaseController.java
+++ b/dsBase/src/main/java/com/dsideal/dsBase/Base/Controller/BaseController.java
@@ -18,7 +18,6 @@ import com.jfinal.kit.PropKit;
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
-import org.apache.commons.lang.StringUtils;
 
 import java.io.File;
 import java.util.*;
@@ -328,7 +327,7 @@ public class BaseController extends Controller {
     @Before({GET.class, RepeatIntercetpor.class})
     public void selectPersonsByBureauId(String bureau_id) {
         //如果不传入单位ID,即当前操作人员的单位ID
-        if (StringUtils.isBlank(bureau_id)) {
+        if (StrKit.isBlank(bureau_id)) {
             bureau_id = SessionKit.get(getRequest(), getResponse(), "bureau_id");
         }
         List<Record> list = bm.selectPersonsByBureauId(bureau_id);
diff --git a/dsBase/src/main/java/com/dsideal/dsBase/ExcelImportTemplate/TeacherTemplateUtil.java b/dsBase/src/main/java/com/dsideal/dsBase/ExcelImportTemplate/TeacherTemplateUtil.java
index 7e7dd0d0..0ee64cf7 100644
--- a/dsBase/src/main/java/com/dsideal/dsBase/ExcelImportTemplate/TeacherTemplateUtil.java
+++ b/dsBase/src/main/java/com/dsideal/dsBase/ExcelImportTemplate/TeacherTemplateUtil.java
@@ -7,7 +7,6 @@ import com.dsideal.dsBase.Util.CommonUtil;
 import com.jfinal.kit.PathKit;
 import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.Record;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddressList;
@@ -112,7 +111,7 @@ public class TeacherTemplateUtil
             int referColNum = i + 1;
             String warehouseName = stageList.get(i);
             List<String> shelves = stageAndSubjectList.get(warehouseName);
-            if (CollectionUtils.isNotEmpty(shelves)) {
+            if (!shelves.isEmpty()) {
                 int rowCount = wsSheet.getLastRowNum();
                 if (rowCount == 0 && wsSheet.getRow(0) == null)
                     wsSheet.createRow(0);
diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Global/Controller/GlobalController.java b/dsBase/src/main/java/com/dsideal/dsBase/Global/Controller/GlobalController.java
index 1fda298a..50eb05b9 100644
--- a/dsBase/src/main/java/com/dsideal/dsBase/Global/Controller/GlobalController.java
+++ b/dsBase/src/main/java/com/dsideal/dsBase/Global/Controller/GlobalController.java
@@ -9,9 +9,9 @@ import com.jfinal.aop.Before;
 import com.jfinal.core.Controller;
 import com.jfinal.ext.interceptor.GET;
 import com.jfinal.ext.interceptor.POST;
+import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
-import org.apache.commons.lang.StringUtils;
 
 import java.util.List;
 
@@ -190,7 +190,7 @@ public class GlobalController extends Controller {
         JSONObject resultJson = new JSONObject();
         String key = getPara("key");
 
-        if (StringUtils.isBlank(key)) {
+        if (StrKit.isBlank(key)) {
             resultJson.put("success", false);
             resultJson.put("msg", "key不允许为空！");
             renderJson(resultJson);
diff --git a/pom.xml b/pom.xml
index c3a6d9d6..bbea3ad8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,10 @@
         <jfinal-cos.version>2022.2</jfinal-cos.version>
         <!--HikariCP版本号-->
         <HikariCP.version>6.3.0</HikariCP.version>
+        <!--生成JWT的版本号-->
+        <jjwt.version>0.7.0</jjwt.version>
+        <!--生成接口文档的类库版本号-->
+        <japidocs.version>1.4.4</japidocs.version>
         <!--fastjson版本号-->
         <fastjson.version>2.0.57</fastjson.version>
         <!--Hutool工具包-->