1、系统版本升级到v4.7.7

2、升级oshi到最新版本6.4.1 3、其它优化
liuwy-dlsdys · Apr 15, 2023 · 712a4b3 · 712a4b3
1 parent 5f2dc49
commit 712a4b3
Show file tree

Hide file tree

Showing 23 changed files with 133 additions and 51 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.zhglxt</groupId>
     <artifactId>zhglxt</artifactId>
-    <version>4.7.6</version>
+    <version>4.7.7</version>
     <packaging>pom</packaging>
 
     <name>zhglxt</name>
@@ -15,7 +15,7 @@
     <inceptionYear>2019</inceptionYear>
 
     <properties>
-        <zhglxt.version>4.7.6</zhglxt.version>
+        <zhglxt.version>4.7.7</zhglxt.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
@@ -30,7 +30,7 @@
         <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.2</oshi.version>
+        <oshi.version>6.4.1</oshi.version>
         <commons.io.version>2.11.0</commons.io.version>
         <poi.version>4.1.2</poi.version>
         <velocity.version>2.3</velocity.version>

diff --git a/zhglxt-activiti/pom.xml b/zhglxt-activiti/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.zhglxt</groupId>
         <artifactId>zhglxt</artifactId>
-        <version>4.7.6</version>
+        <version>4.7.7</version>
     </parent>
     <artifactId>zhglxt-activiti</artifactId>
 

diff --git a/zhglxt-cms/pom.xml b/zhglxt-cms/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>zhglxt</artifactId>
         <groupId>com.zhglxt</groupId>
-        <version>4.7.6</version>
+        <version>4.7.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/zhglxt-cms/src/main/java/com/zhglxt/cms/entity/Article.java b/zhglxt-cms/src/main/java/com/zhglxt/cms/entity/Article.java
@@ -10,29 +10,98 @@
  */
 public class Article implements Serializable {
     private static final long serialVersionUID = -1395263694069887623L;
-    private String id;//主键id
-    private String columnId;//栏目编号
-    private String columnName;//栏目名称
-    private String columnFlag;//栏目标识
-    private String title;//标题
-    private String link;//文章链接
-    private String content;//文章内容
-    private String titleColor;//标题颜色
-    private String imageUrl;//文章图片路径
-    private String imageName;//文章图片名称
-    private String keywords;//关键字
-    private String description;//描述、摘要
-    private String weight;//权重，越大越靠前
-    private Date weightTime;//权重期限
-    private String hits;//点击数
-    private String posId;//推荐位，多选
-    private String status;//0.显示、1.隐藏
-    private String createBy;//创建人
-    private Date createTime;//创建时间
-    private String updateBy;//更新人
-    private Date updateTime;//更新时间
-    private String remark;//备注
-    private String sort;//排序
+    /**
+     * 主键id
+     **/
+    private String id;
+    /**
+     * 栏目编号
+     **/
+    private String columnId;
+    /**
+     * 栏目名称
+     **/
+    private String columnName;
+    /**
+     * 栏目标识
+     **/
+    private String columnFlag;
+    /**
+     * 标题
+     **/
+    private String title;
+    /**
+     * 文章链接
+     **/
+    private String link;
+    /**
+     * 文章内容
+     **/
+    private String content;
+    /**
+     * 标题颜色
+     **/
+    private String titleColor;
+    /**
+     * 文章图片路径
+     **/
+    private String imageUrl;
+    /**
+     * 文章图片名称
+     **/
+    private String imageName;
+    /**
+     * 关键字
+     **/
+    private String keywords;
+    /**
+     * 描述、摘要
+     **/
+    private String description;
+    /**
+     * 权重，越大越靠前
+     **/
+    private String weight;
+    /**
+     * 权重期限
+     **/
+    private Date weightTime;
+    /**
+     * 点击数
+     **/
+    private String hits;
+    /**
+     * 推荐位，多选
+     **/
+    private String posId;
+    /**
+     * 0.显示、1.隐藏
+     **/
+    private String status;
+    /**
+     * 创建人
+     **/
+    private String createBy;
+    /**
+     * 创建时间
+     **/
+    private Date createTime;
+    /**
+     * 更新人
+     **/
+    private String updateBy;
+    /**
+     * 更新时间
+     **/
+    private Date updateTime;
+    /**
+     * 备注
+     **/
+    private String remark;
+    /**
+     * 排序
+     **/
+    private String sort;
 
     public String getId() {
         return id;

diff --git a/zhglxt-common/pom.xml b/zhglxt-common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.zhglxt</groupId>
         <artifactId>zhglxt</artifactId>
-        <version>4.7.6</version>
+        <version>4.7.7</version>
     </parent>
 
     <artifactId>zhglxt-common</artifactId>

diff --git a/zhglxt-common/src/main/java/com/zhglxt/common/utils/StringUtils.java b/zhglxt-common/src/main/java/com/zhglxt/common/utils/StringUtils.java
@@ -296,7 +296,7 @@ public static final List<String> str2List(String str, String sep, boolean filter
     }
 
     /**
-     * 判断给定的set列表中是否包含数组array 判断给定的数组array中是否包含给定的元素value
+     * 判断给定的collection列表中是否包含数组array 判断给定的数组array中是否包含给定的元素value
      *
      * @param collection 给定的集合
      * @param array 给定的数组

diff --git a/zhglxt-demo/pom.xml b/zhglxt-demo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>zhglxt</artifactId>
         <groupId>com.zhglxt</groupId>
-        <version>4.7.6</version>
+        <version>4.7.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/zhglxt-file-manager/pom.xml b/zhglxt-file-manager/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>zhglxt</artifactId>
         <groupId>com.zhglxt</groupId>
-        <version>4.7.6</version>
+        <version>4.7.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/zhglxt-file-manager/zhglxt-file-CKFinder/pom.xml b/zhglxt-file-manager/zhglxt-file-CKFinder/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>zhglxt-file-manager</artifactId>
         <groupId>com.zhglxt</groupId>
-        <version>4.7.6</version>
+        <version>4.7.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/zhglxt-file-manager/zhglxt-file-CKFinderPlugin-FileEditor/pom.xml b/zhglxt-file-manager/zhglxt-file-CKFinderPlugin-FileEditor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>zhglxt-file-manager</artifactId>
         <groupId>com.zhglxt</groupId>
-        <version>4.7.6</version>
+        <version>4.7.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/zhglxt-file-manager/zhglxt-file-CKFinderPlugin-ImageResize/pom.xml b/zhglxt-file-manager/zhglxt-file-CKFinderPlugin-ImageResize/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>zhglxt-file-manager</artifactId>
         <groupId>com.zhglxt</groupId>
-        <version>4.7.6</version>
+        <version>4.7.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/zhglxt-file-manager/zhglxt-file-CKFinderPlugin-Watermark/pom.xml b/zhglxt-file-manager/zhglxt-file-CKFinderPlugin-Watermark/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>zhglxt-file-manager</artifactId>
         <groupId>com.zhglxt</groupId>
-        <version>4.7.6</version>
+        <version>4.7.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/zhglxt-framework/pom.xml b/zhglxt-framework/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.zhglxt</groupId>
         <artifactId>zhglxt</artifactId>
-        <version>4.7.6</version>
+        <version>4.7.7</version>
     </parent>
     <artifactId>zhglxt-framework</artifactId>
     <description>

diff --git a/zhglxt-generator/pom.xml b/zhglxt-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>zhglxt</artifactId>
         <groupId>com.zhglxt</groupId>
-        <version>4.7.6</version>
+        <version>4.7.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/zhglxt-oa/pom.xml b/zhglxt-oa/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.zhglxt</groupId>
         <artifactId>zhglxt</artifactId>
-        <version>4.7.6</version>
+        <version>4.7.7</version>
     </parent>
     <artifactId>zhglxt-oa</artifactId>
 

diff --git a/zhglxt-quartz/pom.xml b/zhglxt-quartz/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.zhglxt</groupId>
         <artifactId>zhglxt</artifactId>
-        <version>4.7.6</version>
+        <version>4.7.7</version>
     </parent>
     <artifactId>zhglxt-quartz</artifactId>
     <description>

diff --git a/zhglxt-quartz/src/main/java/com/zhglxt/quartz/util/JobInvokeUtil.java b/zhglxt-quartz/src/main/java/com/zhglxt/quartz/util/JobInvokeUtil.java
@@ -30,7 +30,7 @@ public static void invokeMethod(SysJob sysJob) throws Exception {
             Object bean = SpringUtils.getBean(beanName);
             invokeMethod(bean, methodName, methodParams);
         } else {
-            Object bean = Class.forName(beanName).newInstance();
+            Object bean = Class.forName(beanName).getDeclaredConstructor().newInstance();
             invokeMethod(bean, methodName, methodParams);
         }
     }

diff --git a/zhglxt-system/pom.xml b/zhglxt-system/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.zhglxt</groupId>
         <artifactId>zhglxt</artifactId>
-        <version>4.7.6</version>
+        <version>4.7.7</version>
     </parent>
     <artifactId>zhglxt-system</artifactId>
     <description>

diff --git a/zhglxt-system/src/main/java/com/zhglxt/system/service/impl/SysUserServiceImpl.java b/zhglxt-system/src/main/java/com/zhglxt/system/service/impl/SysUserServiceImpl.java
@@ -461,16 +461,15 @@ public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String
                     BeanValidators.validateWithException(validator, user);
                     user.setPassword(Md5Utils.hash(user.getLoginName() + password));
                     user.setCreateBy(operName);
-                    this.insertUser(user);
+                    userMapper.insertUser(user);
                     successNum++;
-                    //successMsg.append("<br/>" + successNum + "、账号 " + user.getLoginName() + " 导入成功");
                 } else if (isUpdateSupport) {
                     BeanValidators.validateWithException(validator, user);
                     checkUserAllowed(u);
                     checkUserDataScope(u.getUserId());
                     user.setUserId(u.getUserId());
                     user.setUpdateBy(operName);
-                    this.updateUser(user);
+                    userMapper.updateUser(user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getLoginName() + " 更新成功");
                 } else {
@@ -488,7 +487,6 @@ public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String
             failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
             throw new ServiceException(failureMsg.toString());
         } else {
-            //successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
             successMsg.append("恭喜您，成功导入"+ successNum + "条");
         }
         return successMsg.toString();

diff --git a/zhglxt-web/pom.xml b/zhglxt-web/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.zhglxt</groupId>
         <artifactId>zhglxt</artifactId>
-        <version>4.7.6</version>
+        <version>4.7.7</version>
     </parent>
     <artifactId>zhglxt-web</artifactId>
     <packaging>war</packaging>

diff --git a/zhglxt-web/src/main/resources/application.yml b/zhglxt-web/src/main/resources/application.yml
@@ -3,7 +3,7 @@ zhglxt:
   # 名称
   name: WEB应用系统
   # 版本
-  version: 4.7.6
+  version: 4.7.7
   # 版权年份
   copyrightYear: 2023
   # 实例演示开关

diff --git a/zhglxt-web/src/main/resources/templates/demo/form/summernote.html b/zhglxt-web/src/main/resources/templates/demo/form/summernote.html
@@ -19,7 +19,7 @@ <h2>WEB应用系统</h2>
                             本系统一个完全响应式，基于Bootstrap3.3.7最新版本开发的扁平化主题，她采用了主流的左右两栏式布局，使用了Html5+CSS3等现代技术，她提供了诸多的强大的可以重新组合的UI组件，并集成了最新的jQuery版本(v2.1.1)，当然，也集成了很多功能强大，用途广泛的就jQuery插件，她可以用于所有的Web应用程序，如<b>网站管理后台</b>，<b>网站会员中心</b>，<b>CMS</b>，<b>CRM</b>，<b>OA</b>等等，当然，您也可以对她进行深度定制，以做出更强系统。
                         </p>
                         <p>
-                            <b>当前版本：</b>v4.7.6
+                            <b>当前版本：</b>v4.7.7
                         </p>
                         <p>
                             <span class="label label-warning">免费开源</span>
@@ -60,7 +60,7 @@ <h3>你好， </h3>
                             H+是一个完全响应式，基于Bootstrap3.3.7最新版本开发的扁平化主题，她采用了主流的左右两栏式布局，使用了Html5+CSS3等现代技术，她提供了诸多的强大的可以重新组合的UI组件，并集成了最新的jQuery版本(v2.1.1)，当然，也集成了很多功能强大，用途广泛的就jQuery插件，她可以用于所有的Web应用程序，如<b>网站管理后台</b>，<b>网站会员中心</b>，<b>CMS</b>，<b>CRM</b>，<b>OA</b>等等，当然，您也可以对她进行深度定制，以做出更强系统。
                         </p>
                         <p>
-                            <b>当前版本：</b>v4.7.6
+                            <b>当前版本：</b>v4.7.7
                         </p>
                         <p>
                             <span class="label label-warning">开源免费</span>

diff --git a/zhglxt-web/src/main/resources/templates/main.html b/zhglxt-web/src/main/resources/templates/main.html
@@ -56,10 +56,25 @@ <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.12.18-2023.04.14</code>
+                                        <a data-toggle="collapse" data-parent="#version" href="#latest_version">latest version</a><code class="pull-right">2023.04.14-2023.04.15</code>
                                     </h5>
                                 </div>
                                 <div id="latest_version" class="panel-collapse collapse in">
+                                    <div class="panel-body">
+                                        <ol>
+                                            <li>升级oshi到最新版本6.4.1</li>
+                                        </ol>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--4.7.7-->
+                            <div class="panel panel-default">
+                                <div class="panel-heading">
+                                    <h5 class="panel-title">
+                                        <a data-toggle="collapse" data-parent="#version" href="#v477">4.7.7</a><code class="pull-right">2022.12.18-2023.04.14</code>
+                                    </h5>
+                                </div>
+                                <div id="v477" class="panel-collapse collapse">
                                     <div class="panel-body">
                                         <ol>
                                             <li>企业官网文件管理器代码优化</li>