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