From 9b72d5deb03b7484dea42fdae4e4734f98ae30a8 Mon Sep 17 00:00:00 2001 From: zhuangtianxiang <2913129173@qq.com> Date: Sat, 26 Apr 2025 11:57:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(dify):=20=E6=B7=BB=E5=8A=A0=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=90=AF=E7=94=A8=E7=A6=81=E7=94=A8=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=92=8C=E5=8F=AF=E7=94=A8=E5=BA=94=E7=94=A8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3-=20=E5=9C=A8=20DifyServerService=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=B8=AD=E6=B7=BB=E5=8A=A0=20enabledApp=20=E6=96=B9?= =?UTF-8?q?=E6=B3=95=20-=20=E5=9C=A8=20DifyServerServiceImpl=20=E4=B8=AD?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=20enabledApp=20=E6=96=B9=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E4=BA=8E=E5=88=87=E6=8D=A2=E5=BA=94=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E5=90=AF=E7=94=A8=E7=8A=B6=E6=80=81=20-=20=E5=9C=A8=20V1Server?= =?UTF-8?q?Controller=20=E4=B8=AD=E6=B7=BB=E5=8A=A0=20enabledApp=20?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8=E6=96=B9=E6=B3=95-=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20getAbleApps=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E8=8E=B7=E5=8F=96=E5=8F=AF=E7=94=A8=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=20-=20=E4=BC=98=E5=8C=96=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=EF=BC=8C=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=20LambdaQueryWrapper=20=E6=9B=BF=E4=BB=A3=20QueryWrapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/SpringSecurityConfig.java | 2 ++ .../dify/controller/V1ServerController.java | 19 +++++++++++++++++-- .../dify/service/DifyServerService.java | 1 + .../service/Impl/DifyServerServiceImpl.java | 12 ++++++++++-- 4 files changed, 30 insertions(+), 4 deletions(-) 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 09181d8..ea6d687 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 @@ -10,6 +10,7 @@ import org.springframework.security.authentication.ProviderManager; import org.springframework.security.authentication.dao.DaoAuthenticationProvider; import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; import org.springframework.security.core.session.SessionRegistry; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.web.SecurityFilterChain; @@ -23,6 +24,7 @@ import javax.sql.DataSource; /** * @author harry_yao */ +//@EnableWebFluxSecurity @AllArgsConstructor @EnableMethodSecurity @Configuration 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 85ddf32..3a641d9 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 @@ -1,6 +1,7 @@ package com.zsc.edu.dify.modules.dify.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.zsc.edu.dify.modules.dify.entity.AppEntity; import com.zsc.edu.dify.modules.dify.service.DifyServerService; import io.github.guoshiqiufeng.dify.server.DifyServer; @@ -82,11 +83,25 @@ public class V1ServerController { } /** + * 切换启用状态 * + * @param id 应用id + * @return */ @PostMapping("/app/{id}") - public boolean enabledApp(@PathVariable("id") String id) { - return true; + public boolean enabledApp(@PathVariable String id) { + return difyServerService.enabledApp(id); + } + + /** + * 获取可用应用列表 + * @return + */ + @GetMapping("/apps/able") + public List getAbleApps() { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AppEntity::isEnabled, true); + return difyServerService.list(queryWrapper); } } diff --git a/src/main/java/com/zsc/edu/dify/modules/dify/service/DifyServerService.java b/src/main/java/com/zsc/edu/dify/modules/dify/service/DifyServerService.java index 4c06b5b..2aca2a6 100644 --- a/src/main/java/com/zsc/edu/dify/modules/dify/service/DifyServerService.java +++ b/src/main/java/com/zsc/edu/dify/modules/dify/service/DifyServerService.java @@ -9,4 +9,5 @@ import java.util.List; public interface DifyServerService extends IService { List getApps(String mode, String name); + boolean enabledApp(String id); } diff --git a/src/main/java/com/zsc/edu/dify/modules/dify/service/Impl/DifyServerServiceImpl.java b/src/main/java/com/zsc/edu/dify/modules/dify/service/Impl/DifyServerServiceImpl.java index 88a0367..13b9f54 100644 --- a/src/main/java/com/zsc/edu/dify/modules/dify/service/Impl/DifyServerServiceImpl.java +++ b/src/main/java/com/zsc/edu/dify/modules/dify/service/Impl/DifyServerServiceImpl.java @@ -1,9 +1,7 @@ package com.zsc.edu.dify.modules.dify.service.Impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zsc.edu.dify.common.util.TreeUtil; import com.zsc.edu.dify.exception.ConstraintException; import com.zsc.edu.dify.modules.dify.entity.AppEntity; import com.zsc.edu.dify.modules.dify.mapper.AppEntityMapper; @@ -57,4 +55,14 @@ public class DifyServerServiceImpl extends ServiceImpl