1、系统升级到4.7.6

2、修改参数键名时移除前缓存配置 3、其它优化
liuwy-dlsdys · Dec 18, 2022 · c885677 · c885677
1 parent 1c8ac34
commit c885677
Show file tree

Hide file tree

Showing 28 changed files with 47 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.zhglxt</groupId>
     <artifactId>zhglxt</artifactId>
-    <version>4.7.5</version>
+    <version>4.7.6</version>
     <packaging>pom</packaging>
 
     <name>zhglxt</name>
@@ -15,7 +15,7 @@
     <inceptionYear>2019</inceptionYear>
 
     <properties>
-        <zhglxt.version>4.7.5</zhglxt.version>
+        <zhglxt.version>4.7.6</zhglxt.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.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.5</version>
+        <version>4.7.6</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.5</version>
+        <version>4.7.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.5</version>
+        <version>4.7.6</version>
     </parent>
 
     <artifactId>zhglxt-common</artifactId>

diff --git a/zhglxt-common/src/main/java/com/zhglxt/common/core/text/Convert.java b/zhglxt-common/src/main/java/com/zhglxt/common/core/text/Convert.java
@@ -666,7 +666,7 @@ public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue) {
             return new BigDecimal((Long) value);
         }
         if (value instanceof Double) {
-            return new BigDecimal((Double) value);
+            return BigDecimal.valueOf((Double) value);
         }
         if (value instanceof Integer) {
             return new BigDecimal((Integer) value);

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.5</version>
+        <version>4.7.6</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.5</version>
+        <version>4.7.6</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.5</version>
+        <version>4.7.6</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.5</version>
+        <version>4.7.6</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.5</version>
+        <version>4.7.6</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.5</version>
+        <version>4.7.6</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.5</version>
+        <version>4.7.6</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.5</version>
+        <version>4.7.6</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.5</version>
+        <version>4.7.6</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.5</version>
+        <version>4.7.6</version>
     </parent>
     <artifactId>zhglxt-quartz</artifactId>
     <description>

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.5</version>
+        <version>4.7.6</version>
     </parent>
     <artifactId>zhglxt-system</artifactId>
     <description>

diff --git a/zhglxt-system/src/main/java/com/zhglxt/system/mapper/SysConfigMapper.java b/zhglxt-system/src/main/java/com/zhglxt/system/mapper/SysConfigMapper.java
@@ -22,6 +22,14 @@ public interface SysConfigMapper {
      */
     public SysConfig selectConfig(SysConfig config);
 
+    /**
+     * 通过ID查询配置
+     *
+     * @param configId 参数ID
+     * @return 参数配置信息
+     */
+    public SysConfig selectConfigById(String configId);
+
     /**
      * 查询参数配置列表
      *

diff --git a/zhglxt-system/src/main/java/com/zhglxt/system/mapper/SysDeptMapper.java b/zhglxt-system/src/main/java/com/zhglxt/system/mapper/SysDeptMapper.java
@@ -17,7 +17,7 @@
 @Component
 public interface SysDeptMapper {
     /**
-     * 查询部门人数
+     * 查询下级部门数量
      *
      * @param dept 部门信息
      * @return 结果

diff --git a/zhglxt-system/src/main/java/com/zhglxt/system/service/ISysDeptService.java b/zhglxt-system/src/main/java/com/zhglxt/system/service/ISysDeptService.java
@@ -45,7 +45,7 @@ public interface ISysDeptService {
     public List<Ztree> roleDeptTreeData(SysRole role);
 
     /**
-     * 查询部门人数
+     * 根据父部门ID查询下级部门数量
      *
      * @param parentId 父部门ID
      * @return 结果

diff --git a/zhglxt-system/src/main/java/com/zhglxt/system/service/impl/SysConfigServiceImpl.java b/zhglxt-system/src/main/java/com/zhglxt/system/service/impl/SysConfigServiceImpl.java
@@ -102,6 +102,12 @@ public int insertConfig(SysConfig config) {
      */
     @Override
     public int updateConfig(SysConfig config) {
+        SysConfig temp = configMapper.selectConfigById(config.getConfigId());
+        if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey()))
+        {
+            CacheUtils.remove(getCacheName(), getCacheKey(temp.getConfigKey()));
+        }
+
         int row = configMapper.updateConfig(config);
         if (row > 0) {
             CacheUtils.put(getCacheName(), getCacheKey(config.getConfigKey()), config.getConfigValue());

diff --git a/zhglxt-system/src/main/java/com/zhglxt/system/service/impl/SysDeptServiceImpl.java b/zhglxt-system/src/main/java/com/zhglxt/system/service/impl/SysDeptServiceImpl.java
@@ -138,7 +138,7 @@ public List<Ztree> initZtree(List<SysDept> deptList, List<String> roleDeptList)
     }
 
     /**
-     * 查询部门人数
+     * 根据父部门ID查询下级部门数量
      *
      * @param parentId 部门ID
      * @return 结果

diff --git a/zhglxt-system/src/main/resources/mapper/system/SysConfigMapper.xml b/zhglxt-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -59,6 +59,11 @@
         </where>
     </select>
 
+    <select id="selectConfigById" parameterType="String" resultMap="SysConfigResult">
+        <include refid="selectConfigVo"/>
+        where config_id = #{configId}
+    </select>
+
     <select id="checkConfigKeyUnique" parameterType="String" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
         where config_key = #{configKey}

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.5</version>
+        <version>4.7.6</version>
     </parent>
     <artifactId>zhglxt-web</artifactId>
     <packaging>war</packaging>

diff --git a/zhglxt-web/src/main/java/com/zhglxt/web/controller/system/SysProfileController.java b/zhglxt-web/src/main/java/com/zhglxt/web/controller/system/SysProfileController.java
@@ -54,10 +54,7 @@ public String profile(ModelMap mmap) {
     @ResponseBody
     public boolean checkPassword(String password) {
         SysUser user = getSysUser();
-        if (passwordService.matches(user, password)) {
-            return true;
-        }
-        return false;
+        return passwordService.matches(user, password);
     }
 
     @GetMapping("/resetPwd")

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.5
+  version: 4.7.6
   # 版权年份
   copyrightYear: 2022
   # 实例演示开关

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.5
+                            <b>当前版本：</b>v4.7.6
                         </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.5
+                            <b>当前版本：</b>v4.7.6
                         </p>
                         <p>
                             <span class="label label-warning">开源免费</span>

diff --git a/zhglxt-web/src/main/resources/templates/demo/form/wizard.html b/zhglxt-web/src/main/resources/templates/demo/form/wizard.html
@@ -181,7 +181,7 @@ <h3>测试多行显示</h3>
   enableURLhash: true, // Enable selection of the step based on url hash
   transition: {
       animation: 'none', // Effect on navigation, none/fade/slide-horizontal/slide-vertical/slide-swing
-      speed: '400', // Transion animation speed
+      speed: '400', // Transition animation speed
       easing:'' // Transition animation easing. Not supported without a jQuery easing plugin
   },
   toolbarSettings: {

diff --git a/zhglxt-web/src/main/resources/templates/main.html b/zhglxt-web/src/main/resources/templates/main.html
@@ -56,12 +56,13 @@ <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.12.11</code>
+                                        <a data-toggle="collapse" data-parent="#version" href="#latest_version">latest version</a><code class="pull-right">2022.09.07-2022.12.18</code>
                                     </h5>
                                 </div>
                                 <div id="latest_version" class="panel-collapse collapse in">
                                     <div class="panel-body">
                                         <ol>
+                                            <li>修改参数键名时移除前缓存配置</li>
                                             <li>升级druid到最新版本1.2.15</li>
                                             <li>升级kaptcha到最新版2.3.3</li>
                                             <li>升级oshi到最新版本6.3.2</li>