diff --git a/src/main/java/com/zsc/edu/dify/exception/ApiExceptionHandler.java b/src/main/java/com/zsc/edu/dify/exception/ApiExceptionHandler.java index 1f93af1..ef4ace2 100644 --- a/src/main/java/com/zsc/edu/dify/exception/ApiExceptionHandler.java +++ b/src/main/java/com/zsc/edu/dify/exception/ApiExceptionHandler.java @@ -64,5 +64,5 @@ public class ApiExceptionHandler { log.error("ApiException: {}", objectMapper.writeValueAsString(Map.of("msg", ex.getMessage()))); return new ResponseEntity<>(objectMapper.writeValueAsString(Map.of("msg", ex.getMessage())), HttpStatus.INTERNAL_SERVER_ERROR); } -//TODo 403报错修改 + } diff --git a/src/main/java/com/zsc/edu/dify/exception/ExceptionUtil.java b/src/main/java/com/zsc/edu/dify/exception/ExceptionUtil.java new file mode 100644 index 0000000..fa5af7d --- /dev/null +++ b/src/main/java/com/zsc/edu/dify/exception/ExceptionUtil.java @@ -0,0 +1,18 @@ +package com.zsc.edu.dify.exception; + +import org.springframework.stereotype.Component; + +import java.util.function.Supplier; + +@Component +public class ExceptionUtil { + + public static T difyException(Supplier supplier) throws ApiException { + try { + return supplier.get(); + } catch (RuntimeException e) { + System.err.println(e.getMessage()); + throw new ApiException("服务器错误"); + } + } +} diff --git a/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1ChatController.java b/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1ChatController.java index c08cbb9..375f312 100644 --- a/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1ChatController.java +++ b/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1ChatController.java @@ -14,7 +14,6 @@ import org.springframework.http.MediaType; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; /** * @author yanghq diff --git a/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1DatasetController.java b/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1DatasetController.java index ee56a4a..a2d9a23 100644 --- a/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1DatasetController.java +++ b/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1DatasetController.java @@ -1,5 +1,8 @@ package com.zsc.edu.dify.modules.dify.controller; +import com.zsc.edu.dify.exception.ApiException; +import com.zsc.edu.dify.exception.ConstraintException; +import com.zsc.edu.dify.exception.ExceptionUtil; import com.zsc.edu.dify.modules.operationLog.entity.OperationLogAnnotation; import io.github.guoshiqiufeng.dify.core.pojo.DifyPageResult; import io.github.guoshiqiufeng.dify.dataset.DifyDataset; @@ -43,7 +46,7 @@ public class V1DatasetController { @PreAuthorize("hasAuthority('dify:dataset:create')") @OperationLogAnnotation(content = "'dify知识库文档'", operationType = "新建") public DocumentCreateResponse createDocumentByFile(DocumentCreateByFileRequest request){ - return difyDataset.createDocumentByFile(request); + return ExceptionUtil.difyException(() -> difyDataset.createDocumentByFile(request)); } /**