升级spring boot版本；全局异常处理；统一返回结果

648540858
1 parent 2adf2459
Showing 14 changed files with 431 additions and 248 deletions
pom.xml
src/main/java/top/panll/assist/config/GlobalExceptionHandler.java
src/main/java/top/panll/assist/config/GlobalResponseAdvice.java
src/main/java/top/panll/assist/config/SpringDocConfig.java
src/main/java/top/panll/assist/config/Swagger3Config.java
src/main/java/top/panll/assist/controller/RecordController.java
src/main/java/top/panll/assist/controller/bean/ControllerException.java
src/main/java/top/panll/assist/controller/bean/ErrorCode.java
src/main/java/top/panll/assist/controller/bean/WVPResult.java
src/main/java/top/panll/assist/service/VideoFileService.java
src/main/java/top/panll/assist/utils/RedisUtil.java
src/main/resources/application-dev.yml
src/main/resources/application-local.yml
src/main/resources/application.yml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.5.RELEASE</version>
+        <version>2.7.2</version>
     </parent>
     <groupId>top.panll.assist</groupId>
     <artifactId>wvp-pro-assist</artifactId>
@@ -56,17 +56,16 @@
             <version>1.2.73</version>
         </dependency>
-        <!--Swagger3 -->
         <!--在线文档 -->
         <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-boot-starter</artifactId>
-            <version>3.0.0</version>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-ui</artifactId>
+            <version>1.6.10</version>
         </dependency>
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
-            <version>3.0.2</version>
+            <artifactId>knife4j-springdoc-ui</artifactId>
+            <version>3.0.3</version>
         </dependency>
         <dependency>
+package top.panll.assist.config;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import top.panll.assist.controller.bean.ControllerException;
+import top.panll.assist.controller.bean.ErrorCode;
+import top.panll.assist.controller.bean.WVPResult;
+
+/**
+ * 全局异常处理
+ */
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+
+    private final static Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class);
+
+    /**
+     * 默认异常处理
+     * @param e 异常
+     * @return 统一返回结果
+     */
+    @ExceptionHandler(Exception.class)
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    public WVPResult<String> exceptionHandler(Exception e) {
+        logger.error("[全局异常]： ", e);
+        return WVPResult.fail(ErrorCode.ERROR500.getCode(), e.getMessage());
+    }
+
+    /**
+     * 自定义异常处理， 处理controller中返回的错误
+     * @param e 异常
+     * @return 统一返回结果
+     */
+    @ExceptionHandler(ControllerException.class)
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    public WVPResult<String> exceptionHandler(ControllerException e) {
+        return WVPResult.fail(e.getCode(), e.getMsg());
+    }
+
+}
+package top.panll.assist.config;
+
+import com.alibaba.fastjson.JSON;
+import org.springframework.core.MethodParameter;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
+import top.panll.assist.controller.bean.ErrorCode;
+import top.panll.assist.controller.bean.WVPResult;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 全局统一返回结果
+ * @author lin
+ */
+@RestControllerAdvice
+public class GlobalResponseAdvice implements ResponseBodyAdvice<Object> {
+
+
+    @Override
+    public boolean supports(@NotNull MethodParameter returnType, @NotNull Class<? extends HttpMessageConverter<?>> converterType) {
+        return true;
+    }
+
+    @Override
+    public Object beforeBodyWrite(Object body, @NotNull MethodParameter returnType, @NotNull MediaType selectedContentType, @NotNull Class<? extends HttpMessageConverter<?>> selectedConverterType, @NotNull ServerHttpRequest request, @NotNull ServerHttpResponse response) {
+        // 排除api文档的接口，这个接口不需要统一
+        String[] excludePath = {"/v3/api-docs","/api/v1","/index/hook"};
+        for (String path : excludePath) {
+            if (request.getURI().getPath().startsWith(path)) {
+                return body;
+            }
+        }
+
+        if (body instanceof WVPResult) {
+            return body;
+        }
+
+        if (body instanceof ErrorCode) {
+            ErrorCode errorCode = (ErrorCode) body;
+            return new WVPResult<>(errorCode.getCode(), errorCode.getMsg(), null);
+        }
+
+        if (body instanceof String) {
+            return JSON.toJSONString(WVPResult.success(body));
+        }
+
+        return WVPResult.success(body);
+    }
+}
+package top.panll.assist.config;
+
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Contact;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
+import org.springdoc.core.GroupedOpenApi;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author lin
+ */
+@Configuration
+public class SpringDocConfig {
+
+    @Value("${doc.enabled: true}")
+    private boolean enable;
+
+    @Bean
+    public OpenAPI springShopOpenApi() {
+        Contact contact = new Contact();
+        contact.setName("pan");
+        contact.setEmail("648540858@qq.com");
+        return new OpenAPI()
+                .info(new Info().title("WVP-PRO-ASSIST 接口文档")
+                        .contact(contact)
+                        .description("WVP-PRO助手，补充ZLM功能")
+                        .version("v2.0")
+                        .license(new License().name("Apache 2.0").url("http://springdoc.org")));
+    }
+
+    /**
+     * 添加分组
+     * @return
+     */
+    @Bean
+    public GroupedOpenApi publicApi() {
+        return GroupedOpenApi.builder()
+                .group("1. 全部")
+                .packagesToScan("top.panll.assist")
+                .build();
+    }
+}
-package top.panll.assist.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.Contact;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-
-@Configuration
-public class Swagger3Config {
-
-    @Value("${swagger-ui.enabled}")
-    private boolean enable;
-
-    @Bean
-    public Docket createRestApi() {
-        return new Docket(DocumentationType.OAS_30)
-                .apiInfo(apiInfo())
-                .groupName("1. 全部")
-                .select()
-                .apis(RequestHandlerSelectors.basePackage("top.panll.assist"))
-                .paths(PathSelectors.any())
-                .build()
-                .pathMapping("/")
-                .enable(enable);
-    }
-
-    private ApiInfo apiInfo() {
-        return new ApiInfoBuilder()
-                .title("WVP-PRO-ASSIST 接口文档")
-                .description("更多请咨询服务开发者(https://github.com/648540858/wvp-pro-assist)。")
-                .contact(new Contact("648540858", "648540858", "648540858@qq.com"))
-                .version("1.0")
-                .build();
-    }
-}
@@ -2,16 +2,17 @@ package top.panll.assist.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import top.panll.assist.controller.bean.ControllerException;
+import top.panll.assist.controller.bean.ErrorCode;
 import top.panll.assist.controller.bean.WVPResult;
 import top.panll.assist.dto.MergeOrCutTaskInfo;
 import top.panll.assist.dto.SignInfo;
@@ -28,7 +29,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-@Api(tags = "录像管理")
+@Tag(name = "录像管理", description = "录像管理")
 @CrossOrigin
 @RestController
 @RequestMapping("/api/record")
@@ -49,40 +50,31 @@ public class RecordController {
      * 获取app+stream列表
      * @return
      */
-    @ApiOperation("分页获取app+stream的列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name="page", value = "当前页", required = true, dataTypeClass = Integer.class),
-            @ApiImplicitParam(name="count", value = "每页查询数量", required = true, dataTypeClass = Integer.class),
-    })
+    @Operation(summary ="分页获取app+stream的列表")
+    @Parameter(name = "page", description = "当前页", required = true)
+    @Parameter(name = "count", description = "每页查询数量", required = true)
     @GetMapping(value = "/list")
     @ResponseBody
-    public WVPResult<PageInfo<Map<String, String>>> getList(@RequestParam int page,
+    public PageInfo<Map<String, String>> getList(@RequestParam int page,
                                                   @RequestParam int count){
-        WVPResult<PageInfo<Map<String, String>>> result = new WVPResult<>();
         List<Map<String, String>> appList = videoFileService.getList();
-        result.setCode(0);
-        result.setMsg("success");
         PageInfo<Map<String, String>> stringPageInfo = new PageInfo<>(appList);
         stringPageInfo.startPage(page, count);
-        result.setData(stringPageInfo);
-        return result;
+        return stringPageInfo;
     }
     /**
      * 分页获取app列表
      * @return
      */
-    @ApiOperation("分页获取app列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name="page", value = "当前页", required = true, dataTypeClass = Integer.class),
-            @ApiImplicitParam(name="count", value = "每页查询数量", required = true, dataTypeClass = Integer.class),
-    })
+    @Operation(summary ="分页获取app列表")
+    @Parameter(name = "page", description = "当前页", required = true)
+    @Parameter(name = "count", description = "每页查询数量", required = true)
     @GetMapping(value = "/app/list")
     @ResponseBody
-    public WVPResult<PageInfo<String>> getAppList(@RequestParam int page,
+    public PageInfo<String> getAppList(@RequestParam int page,
                                                   @RequestParam int count){
-        WVPResult<PageInfo<String>> result = new WVPResult<>();
         List<String> resultData = new ArrayList<>();
         List<File> appList = videoFileService.getAppList(true);
         if (appList.size() > 0) {
@@ -90,36 +82,28 @@ public class RecordController {
                 resultData.add(file.getName());
             }
         }
-        result.setCode(0);
-        result.setMsg("success");
         PageInfo<String> stringPageInfo = new PageInfo<>(resultData);
         stringPageInfo.startPage(page, count);
-        result.setData(stringPageInfo);
-        return result;
+        return stringPageInfo;
     }
     /**
      * 分页stream列表
      * @return
      */
-    @ApiOperation("分页stream列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name="page", value = "当前页", required = true, dataTypeClass = Integer.class),
-            @ApiImplicitParam(name="count", value = "每页查询数量", required = true, dataTypeClass = Integer.class),
-            @ApiImplicitParam(name="app", value = "应用名", required = true, dataTypeClass = String.class),
-    })
+    @Operation(summary ="分页stream列表")
+    @Parameter(name = "page", description = "当前页", required = true)
+    @Parameter(name = "count", description = "每页查询数量", required = true)
+    @Parameter(name = "app", description = "应用名", required = true)
     @GetMapping(value = "/stream/list")
     @ResponseBody
-    public WVPResult<PageInfo<String>> getStreamList(@RequestParam int page,
+    public PageInfo<String> getStreamList(@RequestParam int page,
                                                      @RequestParam int count,
                                                      @RequestParam String app ){
-        WVPResult<PageInfo<String>> result = new WVPResult<>();
         List<String> resultData = new ArrayList<>();
         if (app == null) {
-            result.setCode(400);
-            result.setMsg("app不能为空");
-            return result;
+            throw new ControllerException(ErrorCode.ERROR400.getCode(), "app不能为空");
         }
         List<File> streamList = videoFileService.getStreamList(app, true);
         if (streamList != null) {
@@ -127,69 +111,54 @@ public class RecordController {
                 resultData.add(file.getName());
             }
         }
-        result.setCode(0);
-        result.setMsg("success");
         PageInfo<String> stringPageInfo = new PageInfo<>(resultData);
         stringPageInfo.startPage(page, count);
-        result.setData(stringPageInfo);
-        return result;
+        return stringPageInfo;
     }
     /**
      * 获取日期文件夹列表
      * @return
      */
-    @ApiOperation("获取日期文件夹列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name="year", value = "年", required = true, dataTypeClass = Integer.class),
-            @ApiImplicitParam(name="month", value = "月", required = true, dataTypeClass = Integer.class),
-            @ApiImplicitParam(name="app", value = "应用名", required = true, dataTypeClass = String.class),
-            @ApiImplicitParam(name="stream", value = "流ID", required = true, dataTypeClass = String.class),
-    })
+    @Operation(summary ="获取日期文件夹列表")
+    @Parameter(name = "year", description = "月", required = true)
+    @Parameter(name = "month", description = "年", required = true)
+    @Parameter(name = "app", description = "应用名", required = true)
+    @Parameter(name = "stream", description = "流ID", required = true)
     @GetMapping(value = "/date/list")
     @ResponseBody
-    public WVPResult<List<String>> getDateList( @RequestParam(required = false) Integer year,
+    public List<String> getDateList( @RequestParam(required = false) Integer year,
                                                 @RequestParam(required = false) Integer month,
                                                  @RequestParam String app,
                                                  @RequestParam String stream ){
-        WVPResult<List<String>> result = new WVPResult<>();
         List<String> resultData = new ArrayList<>();
         if (app == null) {
-            result.setCode(400);
-            result.setMsg("app不能为空");
-            return result;
+            throw new ControllerException(ErrorCode.ERROR400.getCode(), "app不能为空");
         };
         if (stream == null) {
-            result.setCode(400);
-            result.setMsg("stream不能为空");
-            return result;
+            throw new ControllerException(ErrorCode.ERROR400.getCode(), "stream不能为空");
         }
         List<File> dateList = videoFileService.getDateList(app, stream, year, month, true);
         for (File file : dateList) {
             resultData.add(file.getName());
         }
-        result.setCode(0);
-        result.setMsg("success");
-        result.setData(resultData);
-        return result;
+        return resultData;
     }
     /**
      * 获取视频文件列表
      * @return
      */
-    @ApiOperation("获取日期文件夹列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name="page", value = "当前页", required = true, dataTypeClass = Integer.class),
-            @ApiImplicitParam(name="count", value = "每页查询数量", required = true, dataTypeClass = Integer.class),
-            @ApiImplicitParam(name="app", value = "应用名", required = true, dataTypeClass = String.class),
-            @ApiImplicitParam(name="stream", value = "流ID", required = true, dataTypeClass = String.class),
-            @ApiImplicitParam(name="startTime", value = "开始时间(yyyy-MM-dd HH:mm:ss)", required = false, dataTypeClass = String.class),
-            @ApiImplicitParam(name="endTime", value = "结束时间(yyyy-MM-dd HH:mm:ss)", required = false, dataTypeClass = String.class),
-    })
+    @Operation(summary ="获取日期文件夹列表")
+    @Parameter(name = "page", description = "当前页", required = true)
+    @Parameter(name = "count", description = "每页查询数量", required = true)
+    @Parameter(name = "app", description = "应用名", required = true)
+    @Parameter(name = "stream", description = "流ID", required = true)
+    @Parameter(name = "startTime", description = "开始时间(yyyy-MM-dd HH:mm:ss)", required = true)
+    @Parameter(name = "endTime", description = "结束时间(yyyy-MM-dd HH:mm:ss)", required = true)
     @GetMapping(value = "/file/list")
     @ResponseBody
-    public WVPResult<PageInfo<String>> getRecordList(@RequestParam int page,
+    public PageInfo<String> getRecordList(@RequestParam int page,
                                                      @RequestParam int count,
                                                      @RequestParam String app,
                                                      @RequestParam String stream,
@@ -197,7 +166,6 @@ public class RecordController {
                                                      @RequestParam(required = false) String endTime
     ){
-        WVPResult<PageInfo<String>> result = new WVPResult<>();
         // 开始时间与结束时间可不传或只传其一
         List<String> recordList = new ArrayList<>();
         try {
@@ -216,40 +184,33 @@ public class RecordController {
                     recordList.add(file.getName());
                 }
             }
-            result.setCode(0);
-            result.setMsg("success");
             PageInfo<String> stringPageInfo = new PageInfo<>(recordList);
             stringPageInfo.startPage(page, count);
-            result.setData(stringPageInfo);
+            return stringPageInfo;
         } catch (ParseException e) {
             logger.error("错误的开始时间[{}]或结束时间[{}]", startTime, endTime);
-            result.setCode(400);
-            result.setMsg("错误的开始时间或结束时间");
+            throw new ControllerException(ErrorCode.ERROR400.getCode(), "错误的开始时间或结束时间, e=" + e.getMessage());
         }
-        return result;
     }
     /**
      * 添加视频裁剪合并任务
      */
-    @ApiOperation("添加视频裁剪合并任务")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name="app", value = "应用名", required = true, dataTypeClass = String.class),
-            @ApiImplicitParam(name="stream", value = "流ID", required = true, dataTypeClass = String.class),
-            @ApiImplicitParam(name="startTime", value = "开始时间(yyyy-MM-dd HH:mm:ss)", required = false, dataTypeClass = String.class),
-            @ApiImplicitParam(name="endTime", value = "结束时间(yyyy-MM-dd HH:mm:ss)", required = false, dataTypeClass = String.class),
-            @ApiImplicitParam(name="remoteHost", value = "服务的IP：端口（用于直接返回完整播放地址以及下载地址）", required = false, dataTypeClass = String.class),
-    })
+    @Operation(summary ="添加视频裁剪合并任务")
+    @Parameter(name = "app", description = "应用名", required = true)
+    @Parameter(name = "stream", description = "流ID", required = true)
+    @Parameter(name = "startTime", description = "开始时间(yyyy-MM-dd HH:mm:ss)", required = true)
+    @Parameter(name = "endTime", description = "结束时间(yyyy-MM-dd HH:mm:ss)", required = true)
+    @Parameter(name = "remoteHost", description = "服务的IP：端口（用于直接返回完整播放地址以及下载地址）", required = true)
     @GetMapping(value = "/file/download/task/add")
     @ResponseBody
-    public WVPResult<String> addTaskForDownload(@RequestParam String app,
+    public String addTaskForDownload(@RequestParam String app,
                                                 @RequestParam String stream,
                                                 @RequestParam(required = false) String startTime,
                                                 @RequestParam(required = false) String endTime,
                                                 @RequestParam(required = false) String remoteHost
     ){
-        WVPResult<String> result = new WVPResult<>();
         Date startTimeDate  = null;
         Date endTimeDate  = null;
         try {
@@ -263,111 +224,96 @@ public class RecordController {
             e.printStackTrace();
         }
         String id = videoFileService.mergeOrCut(app, stream, startTimeDate, endTimeDate, remoteHost);
-        result.setCode(0);
-        result.setMsg(id!= null?"success":"error： 可能未找到视频文件");
-        result.setData(id);
-        return result;
+        if (id== null) {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(), "可能未找到视频文件");
+        }
+        return id;
     }
     /**
      * 查询视频裁剪合并任务列表
      */
-    @ApiOperation("查询视频裁剪合并任务列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name="app", value = "应用名", required = false, dataTypeClass = String.class),
-            @ApiImplicitParam(name="stream", value = "流ID", required = false, dataTypeClass = String.class),
-            @ApiImplicitParam(name="taskId", value = "任务ID", required = false, dataTypeClass = String.class),
-            @ApiImplicitParam(name="isEnd", value = "是否结束", required = false, dataTypeClass = Boolean.class),
-    })
+    @Operation(summary ="查询视频裁剪合并任务列表")
+    @Parameter(name = "app", description = "应用名", required = true)
+    @Parameter(name = "stream", description = "流ID", required = true)
+    @Parameter(name = "taskId", description = "任务ID", required = true)
+    @Parameter(name = "isEnd", description = "是否结束", required = true)
     @GetMapping(value = "/file/download/task/list")
     @ResponseBody
-    public WVPResult<List<MergeOrCutTaskInfo>> getTaskListForDownload(
+    public List<MergeOrCutTaskInfo> getTaskListForDownload(
             @RequestParam(required = false) String app,
             @RequestParam(required = false) String stream,
             @RequestParam(required = false) String taskId,
             @RequestParam(required = false) Boolean isEnd){
         List<MergeOrCutTaskInfo> taskList = videoFileService.getTaskListForDownload(isEnd, app, stream, taskId);
-        WVPResult<List<MergeOrCutTaskInfo>> result = new WVPResult<>();
-        result.setCode(0);
-        result.setMsg(taskList !=  null?"success":"error");
-        result.setData(taskList);
-        return result;
+        if (taskList == null) {
+            throw new ControllerException(ErrorCode.ERROR100);
+        }
+        return taskList;
     }
     /**
      * 收藏录像（被收藏的录像不会被清理任务清理）
      */
-    @ApiOperation("收藏录像（被收藏的录像不会被清理任务清理）")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name="type", value = "类型", required = true, dataTypeClass = String.class),
-            @ApiImplicitParam(name="app", value = "应用名", required = true, dataTypeClass = String.class),
-            @ApiImplicitParam(name="stream", value = "流ID", required = true, dataTypeClass = String.class),
-    })
+    @Operation(summary ="收藏录像（被收藏的录像不会被清理任务清理）")
+    @Parameter(name = "type", description = "类型", required = true)
+    @Parameter(name = "app", description = "应用名", required = true)
+    @Parameter(name = "stream", description = "流ID", required = true)
     @GetMapping(value = "/file/collection/add")
     @ResponseBody
-    public WVPResult<String> collection(
+    public void collection(
             @RequestParam(required = true) String type,
             @RequestParam(required = true) String app,
             @RequestParam(required = true) String stream){
         boolean collectionResult = videoFileService.collection(app, stream, type);
-        WVPResult<String> result = new WVPResult<>();
-        result.setCode(0);
-        result.setMsg(collectionResult ?"success":"error");
-        return result;
+        if (!collectionResult) {
+            throw new ControllerException(ErrorCode.ERROR100);
+        }
     }
     /**
      * 移除收藏录像
      */
-    @ApiOperation("移除收藏录像")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name="type", value = "类型", required = true, dataTypeClass = String.class),
-            @ApiImplicitParam(name="app", value = "应用名", required = true, dataTypeClass = String.class),
-            @ApiImplicitParam(name="stream", value = "流ID", required = true, dataTypeClass = String.class),
-    })
+    @Operation(summary ="移除收藏录像")
+    @Parameter(name = "type", description = "类型", required = true)
+    @Parameter(name = "app", description = "应用名", required = true)
+    @Parameter(name = "stream", description = "流ID", required = true)
     @GetMapping(value = "/file/collection/remove")
     @ResponseBody
-    public WVPResult<String> removeCollection(
+    public void removeCollection(
             @RequestParam(required = true) String type,
             @RequestParam(required = true) String app,
             @RequestParam(required = true) String stream){
         boolean collectionResult = videoFileService.removeCollection(app, stream, type);
-        WVPResult<String> result = new WVPResult<>();
-        result.setCode(0);
-        result.setMsg(collectionResult ?"success":"error");
-        return result;
+        if (!collectionResult) {
+            throw new ControllerException(ErrorCode.ERROR100);
+        }
     }
     /**
      * 收藏录像列表
      */
-    @ApiOperation("收藏录像列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name="type", value = "类型", required = true, dataTypeClass = String.class),
-            @ApiImplicitParam(name="app", value = "应用名", required = false, dataTypeClass = String.class),
-            @ApiImplicitParam(name="stream", value = "流ID", required = false, dataTypeClass = String.class),
-    })
+    @Operation(summary ="收藏录像列表")
+    @Parameter(name = "type", description = "类型", required = false)
+    @Parameter(name = "app", description = "应用名", required = false)
+    @Parameter(name = "stream", description = "流ID", required = false)
     @GetMapping(value = "/file/collection/list")
     @ResponseBody
-    public WVPResult<List<SignInfo>> collectionList(
+    public List<SignInfo> collectionList(
             @RequestParam(required = false) String type,
             @RequestParam(required = false) String app,
             @RequestParam(required = false) String stream){
         List<SignInfo> signInfos = videoFileService.getCollectionList(app, stream, type);
-        WVPResult<List<SignInfo>> result = new WVPResult<>();
-        result.setCode(0);
-        result.setMsg(signInfos != null ?"success":"error");
-        result.setData(signInfos);
-        return result;
+        return signInfos;
     }
     /**
      * 中止视频裁剪合并任务列表
      */
-    @ApiOperation("中止视频裁剪合并任务列表(暂不支持)")
+    @Operation(summary ="中止视频裁剪合并任务列表(暂不支持)")
     @GetMapping(value = "/file/download/task/stop")
     @ResponseBody
     public WVPResult<String> stopTaskForDownload(@RequestParam String taskId){
@@ -397,7 +343,9 @@ public class RecordController {
         String app = json.getString("app");
         String stream = json.getString("stream");
         logger.debug("ZLM 录制完成，参数：" + file_path);
-        if (file_path == null) return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);
+        if (file_path == null) {
+            return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);
+        }
         videoFileService.handFile(new File(file_path), app, stream);
         return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);
@@ -406,54 +354,39 @@ public class RecordController {
     /**
      * 磁盘空间查询
      */
-    @ApiOperation("磁盘空间查询")
+    @Operation(summary ="磁盘空间查询")
     @ResponseBody
     @GetMapping(value = "/space", produces = "application/json;charset=UTF-8")
-    public ResponseEntity<String> getSpace() {
-        JSONObject ret = new JSONObject();
-        ret.put("code", 0);
-        ret.put("msg", "success");
-        SpaceInfo spaceInfo = videoFileService.getSpaceInfo();
-        ret.put("data", JSON.toJSON(spaceInfo));
-        return new ResponseEntity<>(ret.toString(), HttpStatus.OK);
-    }
-
-    /**
-     * 录像文件的时长
-     */
-    @ApiOperation("录像文件的时长")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name="app", value = "应用名", required = true, dataTypeClass = String.class),
-            @ApiImplicitParam(name="stream", value = "流ID", required = true, dataTypeClass = String.class),
-            @ApiImplicitParam(name="recordIng", value = "是否录制中", required = false, dataTypeClass = String.class),
-    })
-    @ResponseBody
-    @GetMapping(value = "/file/duration", produces = "application/json;charset=UTF-8")
-    @PostMapping(value = "/file/duration", produces = "application/json;charset=UTF-8")
-    public ResponseEntity<String> fileDuration( @RequestParam String app, @RequestParam String stream) {
-        JSONObject ret = new JSONObject();
-        ret.put("code", 0);
-        ret.put("msg", "success");
-        long duration = videoFileService.fileDuration(app, stream);
-        ret.put("data", duration);
-        return new ResponseEntity<>(ret.toString(), HttpStatus.OK);
+    public SpaceInfo getSpace() {
+        return videoFileService.getSpaceInfo();
     }
     /**
      * 增加推流的鉴权信息，用于录像存储使用
      */
-    @ApiOperation("增加推流的鉴权信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name="app", value = "应用名", required = true, dataTypeClass = String.class),
-            @ApiImplicitParam(name="stream", value = "流ID", required = true, dataTypeClass = String.class),
-            @ApiImplicitParam(name="callId", value = "录像自鉴权ID", required = true, dataTypeClass = String.class),
-    })
+    @Operation(summary ="增加推流的鉴权信息")
+    @Parameter(name = "app", description = "应用名", required = true)
+    @Parameter(name = "stream", description = "流ID", required = true)
+    @Parameter(name = "callId", description = "录像自鉴权ID", required = true)
     @ResponseBody
     @GetMapping(value = "/addStreamCallInfo", produces = "application/json;charset=UTF-8")
     @PostMapping(value = "/addStreamCallInfo", produces = "application/json;charset=UTF-8")
-    public ResponseEntity<String> addStreamCallInfo(String app, String stream, String callId) {
+    public void addStreamCallInfo(String app, String stream, String callId) {
         String key = "Stream_Call_Info" + app + "_" + stream;
         redisUtil.set(key, callId, -1);
-        return new ResponseEntity<>(null, HttpStatus.OK);
+    }
+
+    /**
+     * 录像文件的时长
+     */
+    @Operation(summary ="录像文件的时长")
+    @Parameter(name = "app", description = "应用名", required = true)
+    @Parameter(name = "stream", description = "流ID", required = true)
+    @Parameter(name = "recordIng", description = "是否录制中", required = true)
+    @ResponseBody
+    @GetMapping(value = "/file/duration", produces = "application/json;charset=UTF-8")
+    @PostMapping(value = "/file/duration", produces = "application/json;charset=UTF-8")
+    public long fileDuration( @RequestParam String app, @RequestParam String stream) {
+        return videoFileService.fileDuration(app, stream);
     }
 }
+package top.panll.assist.controller.bean;
+
+/**
+ * 自定义异常，controller出现错误时直接抛出异常由全局异常捕获并返回结果
+ */
+public class ControllerException extends RuntimeException{
+
+    private int code;
+    private String msg;
+
+    public ControllerException(int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+    public ControllerException(ErrorCode errorCode) {
+        this.code = errorCode.getCode();
+        this.msg = errorCode.getMsg();
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}
+package top.panll.assist.controller.bean;
+
+/**
+ * 全局错误码
+ */
+public enum ErrorCode {
+    SUCCESS(0, "成功"),
+    ERROR100(100, "失败"),
+    ERROR400(400, "参数不全或者错误"),
+    ERROR403(403, "无权限操作"),
+    ERROR401(401, "请登录后重新请求"),
+    ERROR500(500, "系统异常");
+
+    private final int code;
+    private final String msg;
+
+    ErrorCode(int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}
 package top.panll.assist.controller.bean;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "统一返回结果")
 public class WVPResult<T> {
+    public WVPResult() {
+    }
+
+    public WVPResult(int code, String msg, T data) {
+        this.code = code;
+        this.msg = msg;
+        this.data = data;
+    }
+
+
+    @Schema(description = "错误码，0为成功")
     private int code;
+    @Schema(description = "描述，错误时描述错误原因")
     private String msg;
+    @Schema(description = "数据")
     private T data;
+
+    public static <T> WVPResult<T> success(T t, String msg) {
+        return new WVPResult<>(ErrorCode.SUCCESS.getCode(), msg, t);
+    }
+
+    public static <T> WVPResult<T> success(T t) {
+        return success(t, ErrorCode.SUCCESS.getMsg());
+    }
+
+    public static <T> WVPResult<T> fail(int code, String msg) {
+        return new WVPResult<>(code, msg, null);
+    }
+
+    public static <T> WVPResult<T> fail(ErrorCode errorCode) {
+        return fail(errorCode.getCode(), errorCode.getMsg());
+    }
+
     public int getCode() {
         return code;
     }
@@ -518,7 +518,6 @@ public class VideoFileService {
                 }else {
                     result.add((MergeOrCutTaskInfo)redisUtil.get(keyItem));
                 }
-
             }
         }
         result.sort((MergeOrCutTaskInfo m1, MergeOrCutTaskInfo m2)->{
@@ -707,28 +707,18 @@ public class RedisUtil {
      * @return
      */
     public List<Object> scan(String query) {
-        Set<String> keys = (Set<String>) redisTemplate.execute((RedisCallback<Set<String>>) connection -> {
-            Set<String> keysTmp = new HashSet<>();
-            Cursor<byte[]> cursor = connection.scan(new ScanOptions.ScanOptionsBuilder().match(query).count(1000).build());
-            while (cursor.hasNext()) {
-                keysTmp.add(new String(cursor.next()));
+        Set<String> resultKeys = redisTemplate.execute((RedisCallback<Set<String>>) connection -> {
+            ScanOptions scanOptions = ScanOptions.scanOptions().match("*" + query + "*").count(1000).build();
+            Cursor<byte[]> scan = connection.scan(scanOptions);
+            Set<String> keys = new HashSet<>();
+            while (scan.hasNext()) {
+                byte[] next = scan.next();
+                keys.add(new String(next));
             }
-            return keysTmp;
+            return keys;
         });
-//        Set<String> keys = (Set<String>) redisTemplate.execute(new RedisCallback<Set<String>>(){
-//
-//            @Override
-//            public Set<String> doInRedis(RedisConnection connection) throws DataAccessException {
-//                Set<String> keysTmp = new HashSet<>();
-//                Cursor<byte[]> cursor = connection.scan(new ScanOptions.ScanOptionsBuilder().match(query).count(1000).build());
-//                while (cursor.hasNext()) {
-//                    keysTmp.add(new String(cursor.next()));
-//                }
-//            return keysTmp;
-//            }
-//        });
-        return new ArrayList<>(keys);
+        return new ArrayList<>(resultKeys);
     }
     public void convertAndSend(String channel, Object msg) {
@@ -42,7 +42,7 @@ userSettings:
     threads: 2
 swagger-ui:
-    enabled: true
+
 # [可选] 日志配置, 一般不需要改
 logging:
     file:
+spring:
+    # REDIS数据库配置
+    redis:
+        # [可选] 超时时间
+        timeout: 10000
+        # 以下为单机配置
+        # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1
+        host: 127.0.0.1
+        # [必须修改] 端口号
+        port: 6379
+        # [可选] 数据库 DB
+        database: 1
+        # [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接
+        password: adminadmin123.
+        # 以下为集群配置
+#        cluster:
+#            nodes: 192.168.1.242:7001
+#        password: 4767cb971b40a1300fa09b7f87b09d1c
+
+# [可选] WVP监听的HTTP端口, 网页和接口调用都是这个端口
+server:
+    port: 18089
+    # [可选] HTTPS配置， 默认不开启
+    ssl:
+        # [可选] 是否开启HTTPS访问
+        enabled: false
+        # [可选] 证书文件路径，放置在resource/目录下即可，修改xxx为文件名
+        key-store: classpath:xxx.jks
+        # [可选] 证书密码
+        key-password: password
+        # [可选] 证书类型， 默认为jks，根据实际修改
+        key-store-type: JKS
+
+# [根据业务需求配置]
+userSettings:
+    # [必选 ] zlm配置的录像路径
+    record: /home/lin/server/test001/default/www/record/
+    # [可选 ] 录像保存时长（单位： 天）每天晚12点自动对过期文件执行清理
+    recordDay: 7
+    # [可选 ] 录像下载合成临时文件保存时长， 不配置默认取值recordDay（单位： 天）每天晚12点自动对过期文件执行清理
+    # recordTempDay: 7
+    # [必选 ] ffmpeg路径
+    ffmpeg: /home/lin/IdeaProjects/wvp-pro-assist/lib/ffmpeg
+    # [必选 ] ffprobe路径， 一般安装ffmpeg就会自带， 一般跟ffmpeg在同一目录,用于查询文件的信息
+    ffprobe: /home/lin/IdeaProjects/wvp-pro-assist/lib/ffprobe
+    # [可选 ] 限制 ffmpeg 合并文件使用的线程数，间接限制cpu使用率， 默认2 限制到50%
+    threads: 2
+
+swagger-ui:
+
+# [可选] 日志配置, 一般不需要改
+logging:
+    file:
+        name: logs/wvp.log
+        max-history: 30
+        max-size: 10MB
+        total-size-cap: 300MB
+    level:
+        root: WARN
+        top:
+            panll:
+                assist: info
 \ No newline at end of file
 spring:
   profiles:
-    active: dev
+    active: local