From 426e57c5ac14daf96981219d413f92f53d808858 Mon Sep 17 00:00:00 2001
From: vertoryao <673441990@qq.com>
Date: Mon, 5 May 2025 01:48:22 +0800
Subject: [PATCH] =?UTF-8?q?refactor(api):=20=E7=BB=9F=E4=B8=80=20API=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=89=8D=E7=BC=80=E5=B9=B6=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 JsonAuthenticationFilter 中使用 startsWith 方法判断请求内容类型
- 更新 SpringSecurityConfig 中的 logoutUrl 为 /api/user/logout
- 在 V1ChatController、V1DatasetController、V1ServerController 和 V1WorkflowController 中统一添加 /api 前缀
---
 .../edu/dify/framework/security/JsonAuthenticationFilter.java   | 2 +-
 .../zsc/edu/dify/framework/security/SpringSecurityConfig.java   | 2 +-
 .../zsc/edu/dify/modules/dify/controller/V1ChatController.java  | 2 +-
 .../edu/dify/modules/dify/controller/V1DatasetController.java   | 2 +-
 .../edu/dify/modules/dify/controller/V1ServerController.java    | 2 +-
 .../edu/dify/modules/dify/controller/V1WorkflowController.java  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zsc/edu/dify/framework/security/JsonAuthenticationFilter.java b/src/main/java/com/zsc/edu/dify/framework/security/JsonAuthenticationFilter.java
index 8497e2c..0e02837 100644
--- a/src/main/java/com/zsc/edu/dify/framework/security/JsonAuthenticationFilter.java
+++ b/src/main/java/com/zsc/edu/dify/framework/security/JsonAuthenticationFilter.java
@@ -21,7 +21,7 @@ public class JsonAuthenticationFilter extends UsernamePasswordAuthenticationFilt
         if (!request.getMethod().equals("POST")) {
             throw new AuthenticationServiceException("Authentication method not supported: " + request.getMethod());
         }
-        if (request.getContentType().equals(MediaType.APPLICATION_JSON_VALUE)) {
+        if (request.getContentType().startsWith(MediaType.APPLICATION_JSON_VALUE)) {
             try {
                 Map map = new ObjectMapper().readValue(request.getInputStream(), Map.class);
                 String username = map.get("username").toString();
diff --git a/src/main/java/com/zsc/edu/dify/framework/security/SpringSecurityConfig.java b/src/main/java/com/zsc/edu/dify/framework/security/SpringSecurityConfig.java
index f9f8852..2adebbe 100644
--- a/src/main/java/com/zsc/edu/dify/framework/security/SpringSecurityConfig.java
+++ b/src/main/java/com/zsc/edu/dify/framework/security/SpringSecurityConfig.java
@@ -129,7 +129,7 @@ public class SpringSecurityConfig {
                     .successHandler(customAuthenticationSuccessHandler)
                     .failureHandler(customAuthenticationFailureHandler))
                 .logout(logout -> logout
-                        .logoutUrl("/api/user/logout")
+                        .logoutUrl("/api/rest/user/logout")
                         .logoutSuccessHandler((request, response, authentication) -> {}))
                 // 添加自定义未授权和未登录结果返回
                 .exceptionHandling(exception -> exception
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 be05450..699dc2d 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
@@ -21,7 +21,7 @@ import reactor.core.publisher.Mono;
  * @since 2025/3/25 10:48
  */
 @RestController
-@RequestMapping("/v1/chat")
+@RequestMapping("/api/v1/chat")
 public class V1ChatController {
 
     @Resource
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 c9f57f0..11720ab 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
@@ -10,7 +10,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/v1/dataset")
+@RequestMapping("/api/v1/dataset")
 public class V1DatasetController {
     @Resource
     private DifyDataset difyDataset;
diff --git a/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1ServerController.java b/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1ServerController.java
index f6252e3..6f6477d 100644
--- a/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1ServerController.java
+++ b/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1ServerController.java
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @RestController
-@RequestMapping("/v1/server")
+@RequestMapping("/api/v1/server")
 public class V1ServerController {
 
     @Resource
diff --git a/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1WorkflowController.java b/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1WorkflowController.java
index 98eb790..9520218 100644
--- a/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1WorkflowController.java
+++ b/src/main/java/com/zsc/edu/dify/modules/dify/controller/V1WorkflowController.java
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Flux;
 
 @RestController
-@RequestMapping("/v1/workflow")
+@RequestMapping("/api/v1/workflow")
 public class V1WorkflowController {
 
     @Resource