publish 2.0.27-sb1

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.tiesheng.springboot-parent</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.0.23</version>
+    <version>2.0.27-sb1</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.23</version>
+                <version>2.0.27-sb1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-login</artifactId>
-                <version>2.0.23</version>
+                <version>2.0.27-sb1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-web</artifactId>
-                <version>2.0.23</version>
+                <version>2.0.27-sb1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-util</artifactId>
-                <version>2.0.23</version>
+                <version>2.0.27-sb1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-platform</artifactId>
-                <version>2.0.23</version>
+                <version>2.0.27-sb1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-message</artifactId>
-                <version>2.0.23</version>
+                <version>2.0.27-sb1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-role</artifactId>
-                <version>2.0.23</version>
+                <version>2.0.27-sb1</version>
             </dependency>
 
             <dependency>
                 <groupId>com.tiesheng.springboot-parent</groupId>
                 <artifactId>springboot-annotation</artifactId>
-                <version>2.0.23</version>
+                <version>2.0.27-sb1</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.23</version>
+        <version>2.0.27-sb1</version>
     </parent>
 
     <artifactId>springboot-ademo</artifactId>
-    <version>2.0.23</version>
+    <version>2.0.27-sb1</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.23</version>
+        <version>2.0.27-sb1</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.23</version>
+        <version>2.0.27-sb1</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.23</version>
+        <version>2.0.27-sb1</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.23</version>
+        <version>2.0.27-sb1</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.23</version>
+        <version>2.0.27-sb1</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.23</version>
+        <version>2.0.27-sb1</version>
     </parent>
 
     <artifactId>springboot-role</artifactId>

springboot-role/src/main/java/com/tiesheng/role/controller/CommRoleController.java

@@ -13,6 +13,7 @@ import com.tiesheng.role.pojos.vo.GroupTypeDTO;
 import com.tiesheng.role.pojos.vo.ServiceMenuVO;
 import com.tiesheng.role.service.CoreRoleService;
 import com.tiesheng.util.pojos.ApiResp;
+import com.tiesheng.util.pojos.DaoBase;
 import com.tiesheng.util.pojos.TokenBean;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,6 +44,14 @@ public class CommRoleController {
         List<CoreRoleAuthority> allOwnerMenus = coreRoleService.getOwnerAuthorityLeafList(tokenBean.getId(), tokenBean.getRoleId());
         List<String> list = allOwnerMenus.stream().map(CoreRoleAuthority::getService).collect(Collectors.toList());
 
+        // 添加公开服务
+        list.addAll(coreRoleService.getServerMapper().selectList(new QueryWrapper<CoreRoleServer>()
+                .eq("is_public", 1).eq("is_deleted", 0).eq("is_open", 1)
+        ).stream().map(DaoBase::getId).collect(Collectors.toList()));
+
+        // 去除重复
+        list = CollUtil.distinct(list);
+
         List<CoreRoleServer> roleServerList = new ArrayList<>();
         if (CollUtil.isNotEmpty(list)) {
             roleServerList = coreRoleService.getServerMapper().selectList(new QueryWrapper<CoreRoleServer>()

springboot-role/src/main/java/com/tiesheng/role/pojos/dao/CoreRoleServer.java

@@ -66,6 +66,12 @@ public class CoreRoleServer extends DaoBase {
     @TableField(value = "ext3")
     private String ext3;
 
+    /**
+     * 是否公开
+     */
+    @TableField(value = "is_public")
+    private Integer isPublic;
+
     /**
      * 获取名称
      *
@@ -227,4 +233,22 @@ public class CoreRoleServer extends DaoBase {
     public void setExt3(String ext3) {
         this.ext3 = ext3;
     }
+
+    /**
+     * 获取是否公开
+     *
+     * @return is_public - 是否公开
+     */
+    public Integer getIsPublic() {
+        return isPublic;
+    }
+
+    /**
+     * 设置是否公开
+     *
+     * @param isPublic 是否公开
+     */
+    public void setIsPublic(Integer isPublic) {
+        this.isPublic = isPublic;
+    }
 }

springboot-role/src/main/resources/db/migration/tiesheng_v2.0.22.sql

@@ -0,0 +1,3 @@
+alter table core_role_server
+    add is_public int default 0 null comment '是否公开';
+

springboot-role/src/main/resources/mapper/CoreRoleServerMapper.xml

@@ -17,10 +17,11 @@
     <result column="ext1" jdbcType="VARCHAR" property="ext1" />
     <result column="ext2" jdbcType="VARCHAR" property="ext2" />
     <result column="ext3" jdbcType="VARCHAR" property="ext3" />
+    <result column="is_public" jdbcType="INTEGER" property="isPublic" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, create_time, update_time, is_deleted, `name`, remark, logo, sort, is_open, link, 
-    ext1, ext2, ext3
+    ext1, ext2, ext3, is_public
   </sql>
 </mapper>

springboot-util/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.23</version>
+        <version>2.0.27-sb1</version>
     </parent>
 
     <artifactId>springboot-util</artifactId>
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.30</version>
+            <version>8.0.33</version>
         </dependency>
 
         <dependency>
@@ -107,7 +107,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15to18</artifactId>
-            <version>1.68</version>
+            <version>1.80</version>
         </dependency>
 
         <dependency>

springboot-util/src/main/java/com/tiesheng/util/service/TsCacheService.java

@@ -1,7 +1,6 @@
 package com.tiesheng.util.service;
 
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
 import com.tiesheng.util.ServletKit;
@@ -10,6 +9,7 @@ import com.tiesheng.util.service.cache.TsCacheHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
 import java.util.Set;
 
 @Service
@@ -92,4 +92,20 @@ public class TsCacheService {
         remove(captchaKey);
     }
 
+
+    /**
+     * 验证是否重复操作
+     *
+     * @param key
+     * @param value
+     * @param seconds
+     */
+    public void checkRepeat(String key, String value, int seconds) {
+        String s = get(key);
+        if (StrUtil.isNotEmpty(s) && Objects.equals(s, value)) {
+            throw new ApiException("操作频繁，请稍后再试");
+        }
+        put(key, value, seconds);
+    }
+
 }

springboot-web/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.tiesheng.springboot-parent</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.0.23</version>
+        <version>2.0.27-sb1</version>
     </parent>
 
     <artifactId>springboot-web</artifactId>
@@ -30,9 +30,39 @@
                     <artifactId>spring-boot-starter-json</artifactId>
                     <groupId>org.springframework.boot</groupId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.tomcat.embed</groupId>
+                    <artifactId>tomcat-embed-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.tomcat.embed</groupId>
+                    <artifactId>tomcat-embed-el</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.tomcat.embed</groupId>
+                    <artifactId>tomcat-embed-websocket</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+            <version>9.0.104</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-el</artifactId>
+            <version>9.0.104</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-websocket</artifactId>
+            <version>9.0.104</version>
+        </dependency>
+
         <!--    aspect    -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

springboot-web/src/main/java/com/tiesheng/web/config/operation/OperationAspect.java

@@ -1,6 +1,8 @@
 package com.tiesheng.web.config.operation;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
@@ -56,6 +58,8 @@ public class OperationAspect {
     @Around("methodArgs()")
     public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
 
+        DateTime crateTime = DateUtil.date();
+
         HttpServletRequest request = ServletKit.getRequest();
         if (request == null) {
             return joinPoint.proceed();
@@ -115,7 +119,7 @@ public class OperationAspect {
             }
         }
 
-        coreLogService.addOperationLog(
+        coreLogService.addOperationLog(crateTime,
                 tsTokenConfig.validToken(request, false), title, subject, reqMaps);
 
         return response;

springboot-web/src/main/java/com/tiesheng/web/controller/comm/ToolController.java

@@ -122,8 +122,10 @@ public class ToolController {
      */
     @TokenIgnore
     @PostMapping("/file/chunk_upload")
-    public ApiResp<String> fileChunkUpload(@RequestParam("file") MultipartFile file, String fileMd5, Integer chunk) {
+    public ApiResp<String> fileChunkUpload(@RequestParam("file") MultipartFile file,
-        fileUploadService.chunkUpload(file, fileMd5, chunk);
+                                           String fileMd5, Integer chunk,
+                                           String flowFilename) {
+        fileUploadService.chunkUpload(file, fileMd5, chunk, flowFilename);
         return ApiResp.respOK("");
     }
 
@@ -211,7 +213,8 @@ public class ToolController {
 
     ///////////////////////////////////////////////////////////////////////////
     // export
-    ///////////////////////////////////////////////////////////////////////////
+
+    /// ////////////////////////////////////////////////////////////////////////
 
     @TokenIgnore
     @OperationIgnore

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

@@ -1,5 +1,6 @@
 package com.tiesheng.web.service;
 
+import cn.hutool.core.util.StrUtil;
 import com.tiesheng.util.exception.ApiException;
 import com.tiesheng.util.service.TsCacheService;
 import com.tiesheng.util.service.TsServiceBase;
@@ -41,7 +42,7 @@ public class CoreConfigService extends TsServiceBase<CoreConfigSystemMapper, Cor
         CoreConfigSystem oneByColumn = tsCacheService.getObj(CONFIG_SYSTEM_PREFIX + configKey,
                 CoreConfigSystem.class, -1);
 
-        if (oneByColumn != null) {
+        if (oneByColumn != null && StrUtil.isNotEmpty(oneByColumn.getConfigVal())) {
             return oneByColumn;
         }
 

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

@@ -23,6 +23,7 @@ import com.tiesheng.web.util.ProcessSyncConsumer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -154,7 +155,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
     /**
      * 添加操作日志
      */
-    public void addOperationLog(TokenBean tokenBean, String title, String subject, Object params) {
+    public void addOperationLog(Date createTime, TokenBean tokenBean, String title, String subject, Object params) {
 
         if (tokenBean == null || StrUtil.isEmpty(tokenBean.getId())) {
             return;
@@ -165,7 +166,7 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
         }
 
         CoreLogOperation operation = new CoreLogOperation();
-        operation.setCreateTime(DateUtil.date());
+        operation.setCreateTime(createTime);
         operation.setUpdateTime(DateUtil.date());
         operation.setUserId(requestUserInfo.getId());
         operation.setUserName(requestUserInfo.getName());

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

@@ -92,11 +92,14 @@ public class FileUploadService {
      * @param fileMd5
      * @param chunk
      */
-    public void chunkUpload(MultipartFile file, String fileMd5, Integer chunk) {
+    public void chunkUpload(MultipartFile file, String fileMd5, Integer chunk, String flowFilename) {
         if (file == null) {
             throw new ApiException("请选择文件后上传");
         }
 
+        String fileType = FileUtil.extName(flowFilename);
+        tieshengWebConfigurer.uploadFileCheck(fileType);
+
         try {
             // 块文件
             FileUploadPath folder = FileUploadPath.folder(fileMd5);
@@ -116,6 +119,8 @@ public class FileUploadService {
      */
     public String chunkMerge(String fileMd5, String fileExt) {
 
+        tieshengWebConfigurer.uploadFileCheck(fileExt);
+
         // 1，获取文件块的目录
         FileUploadPath folder = FileUploadPath.folder(fileMd5);