1、升级druid到最新版本1.2.15

2、升级kaptcha到最新版2.3.3 3、升级oshi到最新版本6.3.2 4、其它优化
liuwy-dlsdys · Dec 11, 2022 · 1c8ac34 · 1c8ac34
1 parent 638c6e4
commit 1c8ac34
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 99 deletions.
diff --git a/pom.xml b/pom.xml
@@ -23,15 +23,14 @@
         <shiro.version>1.10.1</shiro.version>
         <thymeleaf.extras.shiro.version>2.1.0</thymeleaf.extras.shiro.version>
         <mybatis.boot.version>2.2.2</mybatis.boot.version>
-        <druid.version>1.2.14</druid.version>
+        <druid.version>1.2.15</druid.version>
         <bitwalker.version>1.21</bitwalker.version>
-        <kaptcha.version>2.3.2</kaptcha.version>
+        <kaptcha.version>2.3.3</kaptcha.version>
         <swagger.version>3.0.0</swagger.version>
-        <knife4j.version>3.0.3</knife4j.version>
         <mybatis-spring-boot.version>2.2.0</mybatis-spring-boot.version>
         <pagehelper.boot.version>1.4.3</pagehelper.boot.version>
         <fastjson.version>1.2.83</fastjson.version>
-        <oshi.version>6.3.0</oshi.version>
+        <oshi.version>6.3.2</oshi.version>
         <commons.io.version>2.11.0</commons.io.version>
         <commons.fileupload.version>1.4</commons.fileupload.version>
         <poi.version>4.1.2</poi.version>
@@ -40,6 +39,7 @@
         <activiti.version>5.23.0</activiti.version>
         <aop.version>2.6.2</aop.version>
         <easyexcel.version>3.1.1</easyexcel.version>
+        <knife4j.version>3.0.3</knife4j.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -64,7 +64,7 @@
 
             <!--验证码 -->
             <dependency>
-                <groupId>com.github.penggle</groupId>
+                <groupId>pro.fessional</groupId>
                 <artifactId>kaptcha</artifactId>
                 <version>${kaptcha.version}</version>
             </dependency>

diff --git a/zhglxt-common/src/main/java/com/zhglxt/common/constant/Constants.java b/zhglxt-common/src/main/java/com/zhglxt/common/constant/Constants.java
@@ -109,5 +109,5 @@ public class Constants {
     /**
      * 定时任务违规的字符
      */
-    public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml","org.springframework", "com.zhglxt.common.util.file" };
+    public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml","org.springframework", "com.zhglxt.common.utils.file", "com.zhglxt.common.config" };
 }
diff --git a/zhglxt-common/src/main/java/com/zhglxt/common/utils/YamlUtil.java b/zhglxt-common/src/main/java/com/zhglxt/common/utils/YamlUtil.java
diff --git a/zhglxt-common/src/main/java/com/zhglxt/common/utils/file/FileUploadUtils.java b/zhglxt-common/src/main/java/com/zhglxt/common/utils/file/FileUploadUtils.java
@@ -91,8 +91,8 @@ public static final String upload(String baseDir, MultipartFile file) throws IOE
     public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension)
             throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
             InvalidExtensionException {
-        int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length();
-        if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH) {
+        int fileNameLength = Objects.requireNonNull(file.getOriginalFilename()).length();
+        if (fileNameLength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH) {
             throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH);
         }
 

diff --git a/zhglxt-framework/pom.xml b/zhglxt-framework/pom.xml
@@ -35,7 +35,7 @@
 
         <!--验证码 -->
         <dependency>
-            <groupId>com.github.penggle</groupId>
+            <groupId>pro.fessional</groupId>
             <artifactId>kaptcha</artifactId>
             <version>${kaptcha.version}</version>
             <!-- 去除内置tomcat时，要把验证码的这个exclusions去掉。因为tomcat排除后需要servlet -->

diff --git a/zhglxt-generator/src/main/java/com/zhglxt/generator/service/impl/GenTableServiceImpl.java b/zhglxt-generator/src/main/java/com/zhglxt/generator/service/impl/GenTableServiceImpl.java
@@ -123,8 +123,8 @@ public void updateGenTable(GenTable genTable) {
         genTable.setOptions(options);
         int row = genTableMapper.updateGenTable(genTable);
         if (row > 0) {
-            for (GenTableColumn cenTableColumn : genTable.getColumns()) {
-                genTableColumnMapper.updateGenTableColumn(cenTableColumn);
+            for (GenTableColumn genTableColumn : genTable.getColumns()) {
+                genTableColumnMapper.updateGenTableColumn(genTableColumn);
             }
         }
     }

diff --git a/zhglxt-web/src/main/resources/templates/main.html b/zhglxt-web/src/main/resources/templates/main.html
@@ -56,12 +56,15 @@ <h5><i style="color: #ca4440"> 更新日志</i>&nbsp;<i>单击标题进行 （
                             <div class="panel panel-default">
                                 <div class="panel-heading">
                                     <h5 class="panel-title">
-                                        <a data-toggle="collapse" data-parent="#version" href="#latest_version">latest version</a><code class="pull-right">2022.09.07-2022.11.29</code>
+                                        <a data-toggle="collapse" data-parent="#version" href="#latest_version">latest version</a><code class="pull-right">2022.09.07-2022.12.11</code>
                                     </h5>
                                 </div>
                                 <div id="latest_version" class="panel-collapse collapse in">
                                     <div class="panel-body">
                                         <ol>
+                                            <li>升级druid到最新版本1.2.15</li>
+                                            <li>升级kaptcha到最新版2.3.3</li>
+                                            <li>升级oshi到最新版本6.3.2</li>
                                             <li>升级shiro到最新版本1.10.1</li>
                                             <li>优化用户管理重置时取消部门选择(I621OJ)</li>
                                             <li>兼容Excel下拉框内容过多无法显示的问题(I61HCG)</li>