publish 2.0.18

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.0.16</version>
+    <version>2.0.18</version>
     <packaging>pom</packaging>
     <name>springboot-parent</name>
     <description>杭州铁晟科技有限公司基础依赖</description>
@@ -58,49 +58,49 @@
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-database</artifactId>
-                <version>2.0.16</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>2.0.16</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>2.0.16</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>2.0.16</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>2.0.16</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>2.0.16</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-role</artifactId>
-                <version>2.0.16</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>2.0.16</version>
+                <version>2.0.18</version>
             </dependency>
 
             <dependency>

springboot-ademo/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.16</version>
+        <version>2.0.18</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>2.0.16</version>
+    <version>2.0.18</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

springboot-annotation/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.16</version>
+        <version>2.0.18</version>
     </parent>
 
     <artifactId>springboot-annotation</artifactId>

springboot-database/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.16</version>
+        <version>2.0.18</version>
     </parent>
 
     <artifactId>springboot-database</artifactId>

springboot-login/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.16</version>
+        <version>2.0.18</version>
     </parent>
 
     <artifactId>springboot-login</artifactId>

springboot-message/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.16</version>
+        <version>2.0.18</version>
     </parent>
 
     <artifactId>springboot-message</artifactId>

springboot-platform/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.16</version>
+        <version>2.0.18</version>
     </parent>
 
     <artifactId>springboot-platform</artifactId>

springboot-role/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.16</version>
+        <version>2.0.18</version>
     </parent>
 
     <artifactId>springboot-role</artifactId>

springboot-util/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.16</version>
+        <version>2.0.18</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>

springboot-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.16</version>
+        <version>2.0.18</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>

springboot-web/src/main/java/com/tiesheng/web/controller/system/ConfigSystemController.java

@@ -9,6 +9,7 @@ import com.tiesheng.util.pojos.PageDTO;
 import com.tiesheng.web.pojos.dao.CoreConfigSystem;
 import com.tiesheng.web.pojos.dto.config.ConfigSystemDTO;
 import com.tiesheng.web.service.CoreConfigService;
+import com.tiesheng.web.service.TieshengWebConfigurer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,6 +25,8 @@ public class ConfigSystemController {
 
     @Autowired
     CoreConfigService coreConfigService;
+    @Autowired
+    TieshengWebConfigurer tieshengWebConfigurer;
 
 
     /**
@@ -53,6 +56,7 @@ public class ConfigSystemController {
      */
     @PostMapping("/system/update")
     public ApiResp<String> systemUpdate(@RequestBody ConfigSystemDTO dto) {
+        tieshengWebConfigurer.configSystemCheck(dto);
         coreConfigService.updateConfigSystem(dto);
         return ApiResp.respOK("");
     }

springboot-web/src/main/java/com/tiesheng/web/service/CoreConfigService.java

@@ -22,8 +22,7 @@ public class CoreConfigService extends TsServiceBase<CoreConfigSystemMapper, Cor
     CoreConfigEnumMapper coreConfigEnumMapper;
     @Resource
     TsCacheService tsCacheService;
-    @Autowired
+
-    TieshengWebConfigurer tieshengWebConfigurer;
 
     private static final String CONFIG_SYSTEM_PREFIX = "CONFIG:SYSTEM:";
 
@@ -69,21 +68,20 @@ public class CoreConfigService extends TsServiceBase<CoreConfigSystemMapper, Cor
      * @param dto
      */
     public void updateConfigSystem(ConfigSystemDTO dto) {
-        CoreConfigSystem configKey = getOneByColumn("config_key", dto.getConfigKey());
+        CoreConfigSystem coreConfigSystem = getOneByColumn("config_key", dto.getConfigKey());
-        if (configKey == null) {
+        if (coreConfigSystem == null) {
             throw new ApiException("该配置不存在，请检查");
         }
-        if (configKey.getReadOnly() == 1) {
+        if (coreConfigSystem.getReadOnly() == 1) {
             throw new ApiException("该配置只读，不可修改");
         }
-        configKey.setConfigVal(dto.getConfigVal());
+        coreConfigSystem.setConfigVal(dto.getConfigVal());
-        configKey.setRemark(dto.getRemark());
+        coreConfigSystem.setRemark(dto.getRemark());
-        configKey.setExtra(dto.getExtra());
+        coreConfigSystem.setExtra(dto.getExtra());
+        updateById(coreConfigSystem);
 
-        tieshengWebConfigurer.configSystemCheck(configKey);
+        tsCacheService.putObj(CONFIG_SYSTEM_PREFIX + coreConfigSystem.getConfigKey(),
-        updateById(configKey);
+                coreConfigSystem, 10 * 60);
-
-        tsCacheService.putObj(CONFIG_SYSTEM_PREFIX + configKey, configKey, 10 * 60);
     }
 
 

springboot-web/src/main/java/com/tiesheng/web/service/TieshengWebConfigurer.java

@@ -5,6 +5,7 @@ import com.tiesheng.login.service.TsLoginConfigurer;
 import com.tiesheng.util.exception.ApiRespEnum;
 import com.tiesheng.util.pojos.ApiResp;
 import com.tiesheng.web.pojos.dao.CoreConfigSystem;
+import com.tiesheng.web.pojos.dto.config.ConfigSystemDTO;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -58,7 +59,7 @@ public interface TieshengWebConfigurer {
      * 系统配置验证
      * 如果不符合规则，可以抛出异常
      */
-    default void configSystemCheck(CoreConfigSystem configSystem) {
+    default void configSystemCheck(ConfigSystemDTO dto) {
     }
 
     ///////////////////////////////////////////////////////////////////////////