diff --git a/pom.xml b/pom.xml
index 1f1bdf6..6cae0c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.4.0
+ 3.4.4
com.zsc.edu
@@ -28,8 +28,9 @@
17
- 3.5.9
+ 3.5.11
1.6.2
+ 2.0.53
@@ -37,6 +38,12 @@
+
+ io.github.guoshiqiufeng.dify
+ dify-spring-boot-starter
+ 0.9.0
+
+
org.springframework.boot
spring-boot-starter-aop
@@ -150,7 +157,7 @@
com.alibaba
fastjson
- 2.0.21
+ ${fastjson.version}
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 1d6bbde..09181d8 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
@@ -81,6 +81,7 @@ public class SpringSecurityConfig {
.requestMatchers(HttpMethod.GET, "/api/rest/user/menu","/api/rest/user/register","/api/rest/user/send-email").permitAll()
.requestMatchers(HttpMethod.POST, "/api/rest/user/login","/api/rest/user/register").permitAll()
.requestMatchers("/api/rest/user/me").permitAll()
+ .requestMatchers("/v1/**").permitAll()
.requestMatchers("/api/**").authenticated()
)
// 不用注解,直接通过判断路径实现动态访问权限
@@ -137,7 +138,7 @@ public class SpringSecurityConfig {
.rememberMe(rememberMe -> rememberMe
.userDetailsService(userDetailsService)
.tokenRepository(persistentTokenRepository()))
- .csrf(csrf -> csrf.ignoringRequestMatchers("/api/internal/**", "/api/rest/user/logout","/api/rest/user/register"))
+ .csrf(csrf -> csrf.ignoringRequestMatchers("v1/**","/api/internal/**", "/api/rest/user/logout","/api/rest/user/register"))
.sessionManagement(session -> session
.maximumSessions(3)
.sessionRegistry(sessionRegistry)
diff --git a/src/main/java/com/zsc/edu/dify/modules/message/dto/PageDto.java b/src/main/java/com/zsc/edu/dify/modules/message/dto/PageDto.java
deleted file mode 100644
index cfa36fa..0000000
--- a/src/main/java/com/zsc/edu/dify/modules/message/dto/PageDto.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.zsc.edu.dify.modules.message.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author zhuang
- */
-@Data
-public class PageDto {
- /**
- * 总条数
- */
- private Long total;
- /**
- * 总页数
- */
- private Integer pages;
- /**
- * 集合
- */
- private List list;
-}
\ No newline at end of file
diff --git a/src/main/java/com/zsc/edu/dify/modules/system/utils/TreeUtil.java b/src/main/java/com/zsc/edu/dify/modules/system/utils/TreeUtil.java
index 37257a9..75fe5cc 100644
--- a/src/main/java/com/zsc/edu/dify/modules/system/utils/TreeUtil.java
+++ b/src/main/java/com/zsc/edu/dify/modules/system/utils/TreeUtil.java
@@ -5,10 +5,10 @@ import java.util.function.*;
import java.util.stream.Collectors;
/**
- * @Description: 树操作方法工具类
- * @Copyright: Copyright (c) 赵侠客
- * @Date: 2024-07-22 10:42
- * @Version: 1.0
+ * @ Description: 树操作方法工具类
+ * @ Copyright: Copyright (c) 赵侠客
+ * @ Date: 2024-07-22 10:42
+ * @ Version: 1.0
*/
public class TreeUtil {
/**
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6f638a7..3a5dfa4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,4 +3,12 @@ spring:
active: dev
docker:
compose:
- enabled: false
\ No newline at end of file
+ enabled: false
+
+dify:
+ url: http://47.112.173.8:6800/ # 请替换为实际的 Dify 服务地址
+ server:
+ email: vertoryao@outlook.com # 请替换为实际的 Dify 服务邮箱,若不需要调用 server相关接口可不填
+ password: admin123 # 请替换为实际的 Dify 服务密码,若不需要调用 server相关接口可不填
+ dataset:
+ api-key: dataset-kN5WTJ8jR877YfN1A34JceVg # 请替换为实际的知识库api-key, 若不需要调用知识库可不填
\ No newline at end of file
diff --git a/src/main/resources/mappers/system/UserMapper.xml b/src/main/resources/mappers/system/UserMapper.xml
index 5966f89..72f1c00 100644
--- a/src/main/resources/mappers/system/UserMapper.xml
+++ b/src/main/resources/mappers/system/UserMapper.xml
@@ -37,9 +37,7 @@
-
- id, username, password, email, phone, create_time
-
+ id, username, password, email, phone, create_time