Merge remote-tracking branch 'origin/main'

.gitignore

@@ -3,6 +3,7 @@ target/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/
+.DS_Store
 
 ### STS ###
 .apt_generated

cloud/web/web-file-8082/src/main/java/com/bgasol/web/file/file/controller/FileController.java

@@ -17,15 +17,11 @@ import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.InputStreamResource;
-import org.springframework.core.io.Resource;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 

cloud/web/web-file-8082/src/main/java/com/bgasol/web/file/file/service/FileService.java

@@ -7,7 +7,6 @@ import com.bgasol.model.file.file.entity.FileEntity;
 import com.bgasol.plugin.minio.config.MinioConfig;
 import com.bgasol.web.file.file.mapper.FileMapper;
 import io.micrometer.common.util.StringUtils;
-import jakarta.activation.MimetypesFileTypeMap;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -19,7 +18,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Date;
 
 @Service
 @RequiredArgsConstructor

cloud/web/web-file-8082/src/main/java/com/bgasol/web/file/file/service/OssService.java

@@ -9,7 +9,6 @@ import io.minio.RemoveObjectArgs;
 import io.minio.errors.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -17,7 +16,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
-import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 

cloud/web/web-file-8082/src/main/java/com/bgasol/web/file/video/controller/VideoController.java

@@ -9,7 +9,6 @@ import com.bgasol.model.file.video.dto.VideoCreateDto;
 import com.bgasol.model.file.video.dto.VideoPageDto;
 import com.bgasol.model.file.video.dto.VideoUpdateDto;
 import com.bgasol.model.file.video.entity.VideoEntity;
-import com.bgasol.web.file.file.service.OssService;
 import com.bgasol.web.file.video.service.VideoService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -36,8 +35,6 @@ public class VideoController extends BaseController<
         VideoUpdateDto> {
     private final VideoService videoService;
 
-    private final OssService ossService;
-
     @Override
     public VideoService commonBaseService() {
         return videoService;
@@ -84,7 +81,7 @@ public class VideoController extends BaseController<
     }
 
     @SneakyThrows
-    @GetMapping("/{id}")
+    @GetMapping("/play/{id}")
     @Operation(summary = "在线播放文件", operationId = "playVideo")
     @SaCheckPermission("video:playVideo")
     public ResponseEntity<Resource> playVideo(

cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/menu/service/MenuService.java

@@ -4,7 +4,6 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.bgasol.common.constant.value.SystemConfigValues;
 import com.bgasol.common.core.base.dto.BasePageDto;
-import com.bgasol.common.core.base.service.BaseService;
 import com.bgasol.common.core.base.service.BaseTreeService;
 import com.bgasol.model.system.menu.entity.MenuEntity;
 import com.bgasol.model.system.user.entity.UserEntity;

cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/permission/service/PermissionService.java

@@ -1,7 +1,6 @@
 package com.bgasol.web.system.permission.service;
 
 import com.bgasol.common.core.base.dto.BasePageDto;
-import com.bgasol.common.core.base.service.BaseService;
 import com.bgasol.common.core.base.service.BaseTreeService;
 import com.bgasol.model.system.permission.entity.PermissionEntity;
 import com.bgasol.web.system.permission.mapper.PermissionMapper;

cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/role/service/RoleService.java

@@ -17,7 +17,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RedissonClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;

cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/runner/SystemInitData.java

@@ -15,7 +15,6 @@ import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Component
@@ -40,7 +39,6 @@ public class SystemInitData implements ApplicationRunner {
     }
 
     public void initMenus() {
-        List<MenuEntity> systemServiceMenuChildren = new ArrayList<>();
         String systemServiceId = "system-service";
         MenuEntity systemServiceMenu = MenuEntity.builder()
                 .id(systemServiceId)