diff --git a/src/main/java/com/zsc/edu/dify/modules/dify/controller/PPTController.java b/src/main/java/com/zsc/edu/dify/modules/dify/controller/PPTController.java index ada7cb8..9a8ac64 100644 --- a/src/main/java/com/zsc/edu/dify/modules/dify/controller/PPTController.java +++ b/src/main/java/com/zsc/edu/dify/modules/dify/controller/PPTController.java @@ -24,7 +24,6 @@ public class PPTController { * @return */ @PostMapping("/run") - @PreAuthorize("hasAuthority('dify:ppt:run')") @OperationLogAnnotation(content = "'dify工作流'", operationType = "运行") public WorkflowRunResponse runWorkflow(@RequestBody WorkflowRunRequest request) { request.setUserId(SecurityUtil.getUserInfo().id.toString()); diff --git a/src/main/java/com/zsc/edu/dify/modules/dify/controller/Spider2Controller.java b/src/main/java/com/zsc/edu/dify/modules/dify/controller/Spider2Controller.java index 21519d2..4ee9075 100644 --- a/src/main/java/com/zsc/edu/dify/modules/dify/controller/Spider2Controller.java +++ b/src/main/java/com/zsc/edu/dify/modules/dify/controller/Spider2Controller.java @@ -26,7 +26,6 @@ public class Spider2Controller { * @return */ @PostMapping("/run") - @PreAuthorize("hasAuthority('dify:spider2:run')") @OperationLogAnnotation(content = "'dify工作流'", operationType = "运行") public WorkflowRunResponse runWorkflow(@RequestBody WorkflowRunRequest request) { request.setUserId(SecurityUtil.getUserInfo().id.toString()); diff --git a/src/main/java/com/zsc/edu/dify/modules/dify/controller/SpiderController.java b/src/main/java/com/zsc/edu/dify/modules/dify/controller/SpiderController.java index 7269841..d7319b5 100644 --- a/src/main/java/com/zsc/edu/dify/modules/dify/controller/SpiderController.java +++ b/src/main/java/com/zsc/edu/dify/modules/dify/controller/SpiderController.java @@ -25,7 +25,6 @@ public class SpiderController { private static final String API_KEY = "77c068fd-d5b6-4c33-97d8-db5511a09b26"; @PostMapping("/run") - @PreAuthorize("hasAuthority('dify:spider:run')") public JSONObject run(@RequestBody SpiderDto dto) throws JsonProcessingException { dto.setLlm_api_key(API_KEY); String body = objectMapper.writeValueAsString(dto); @@ -38,7 +37,6 @@ public class SpiderController { } @PostMapping("/status") - @PreAuthorize("hasAuthority('dify:spider:status')") public JSONObject status() { return WebClient.create(SPIDER_URL).post().uri("/crawl_status") .retrieve() @@ -47,7 +45,6 @@ public class SpiderController { } @PostMapping("/logs") - @PreAuthorize("hasAuthority('dify:spider:log')") public JSONObject logs() { return WebClient.create(SPIDER_URL).post().uri("/logs") .retrieve() @@ -56,7 +53,6 @@ public class SpiderController { } @PostMapping("/stop") - @PreAuthorize("hasAuthority('dify:spider:stop')") public JSONObject stop() { return WebClient.create(SPIDER_URL).post().uri("/stop_crawl") .retrieve() 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 e706f4a..35f02df 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 @@ -45,7 +45,6 @@ public class V1ChatController { * apikey 建议在数据库进行存储,前端调用时传智能体 id,从数据库查询 */ @PostMapping("/completions/{appId}") - @PreAuthorize("hasAnyAuthority('dify:chat:send','dify:word:send')") @OperationLogAnnotation(content = "'dify对话'", operationType = "发送") public ChatMessageSendResponse sendChatMessage( @RequestBody ChatMessageSendRequest sendRequest, @@ -81,7 +80,6 @@ public class V1ChatController { * @return 会话列表 */ @PostMapping("/conversations/{appId}") - @PreAuthorize("hasAnyAuthority('dify:chat:query','dify:word:query')") public DifyPageResult conversations( @RequestBody MessageConversationsRequest request, @PathVariable String appId @@ -98,7 +96,6 @@ public class V1ChatController { * @return 消息列表 */ @PostMapping("/messages/{appid}") - @PreAuthorize("hasAnyAuthority('dify:chat:query','dify:word:query')") public DifyPageResult messages( @RequestBody MessagesRequest request, @PathVariable String appid @@ -115,7 +112,6 @@ public class V1ChatController { * @param taskId 任务id */ @PatchMapping("/stream/stop") - @PreAuthorize("hasAnyAuthority('dify:chat:stop','dify:word:stop')") public void stopMessagesStream(@RequestParam String taskId, @RequestParam String appId) { String apiKey = appEntityService.getApikey(appId); String userId = SecurityUtil.getUserInfo().id.toString(); @@ -128,7 +124,6 @@ public class V1ChatController { * @param conversationId 会话id */ @DeleteMapping("/conversation") - @PreAuthorize("hasAnyAuthority('dify:chat:delete','dify:word:delete')") @OperationLogAnnotation(content = "'dify对话'", operationType = "删除") public void deleteConversation(@RequestParam String conversationId, @RequestParam String appId) { String apiKey = appEntityService.getApikey(appId); @@ -147,7 +142,6 @@ public class V1ChatController { * @return */ @GetMapping("/messages/suggested") - @PreAuthorize("hasAnyAuthority('dify:chat:query','dify:word:query')") public List messagesSuggested(String messageId,String appId){ String apiKey = appEntityService.getApikey(appId); String userId = SecurityUtil.getUserInfo().id.toString(); @@ -160,7 +154,6 @@ public class V1ChatController { * @return */ @GetMapping("/parameters/{appid}") - @PreAuthorize("hasAnyAuthority('dify:chat:query','dify:word:query')") public AppParametersResponseVO parameters(@PathVariable String appid){ String apiKey = appEntityService.getApikey(appid); return ExceptionUtil.difyException(()->difyChat.parameters(apiKey)); 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 1632c80..b19c405 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 @@ -28,7 +28,6 @@ public class V1DatasetController { * @return */ @PostMapping("/page") - @PreAuthorize("hasAuthority('dify:dataset:query')") public DifyPageResult page(@RequestBody DatasetPageRequest request){ request.setApiKey(apiKey); return difyDataset.page(request); @@ -41,7 +40,6 @@ public class V1DatasetController { * @return */ @PostMapping("/createDocumentByFile") - @PreAuthorize("hasAuthority('dify:dataset:create')") @OperationLogAnnotation(content = "'dify知识库文档'", operationType = "新建") public DocumentCreateResponse createDocumentByFile(DocumentCreateByFileRequest request){ return ExceptionUtil.difyException(() -> difyDataset.createDocumentByFile(request)); @@ -54,7 +52,6 @@ public class V1DatasetController { * @return */ @GetMapping("/pageDocument") - @PreAuthorize("hasAuthority('dify:dataset:query')") public DifyPageResult pageDocument(@RequestBody DatasetPageDocumentRequest request){ request.setApiKey(apiKey); return difyDataset.pageDocument(request); @@ -68,7 +65,6 @@ public class V1DatasetController { * @return */ @PostMapping("/uploadFileInfo") - @PreAuthorize("hasAuthority('dify:dataset:query')") public UploadFileInfoResponse uploadFileInfo(String datasetId, String documentId){ return difyDataset.uploadFileInfo(datasetId, documentId,apiKey); } @@ -81,7 +77,6 @@ public class V1DatasetController { * @return */ @DeleteMapping("/deleteDocument") - @PreAuthorize("hasAuthority('dify:dataset:delete')") @OperationLogAnnotation(content = "'dify知识库文档'", operationType = "删除") public void deleteDocument(String datasetId, String documentId){ difyDataset.deleteDocument(datasetId, documentId, apiKey); @@ -94,7 +89,6 @@ public class V1DatasetController { * @return */ @PostMapping("/createSegment") - @PreAuthorize("hasAuthority('dify:dataset:create')") @OperationLogAnnotation(content = "'dify知识库文档分段'", operationType = "新建") public SegmentResponse createSegment(@RequestBody SegmentCreateRequest request){ return difyDataset.createSegment(request); @@ -107,7 +101,6 @@ public class V1DatasetController { * @return */ @PostMapping("/createSegmentChildChunk") - @PreAuthorize("hasAuthority('dify:dataset:create')") @OperationLogAnnotation(content = "'dify知识库文档子分段'", operationType = "新建") public SegmentChildChunkCreateResponse createSegmentChildChunk(@RequestBody SegmentChildChunkCreateRequest request){ return difyDataset.createSegmentChildChunk(request); @@ -120,7 +113,6 @@ public class V1DatasetController { * @return */ @GetMapping("/retrieve") - @PreAuthorize("hasAuthority('dify:dataset:retrieve')") public RetrieveResponse retrieve(@RequestBody RetrieveRequest request){ return difyDataset.retrieve(request); } 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 b3ec5ce..b8f8aa3 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 @@ -31,7 +31,6 @@ public class V1ServerController { * @return */ @GetMapping("/apps") - @PreAuthorize("hasAuthority('dify:server:query')") @DataPermission public List getApps(String mode, String name) { return appEntityService.getApps(mode, name); @@ -43,7 +42,6 @@ public class V1ServerController { * @return */ @GetMapping("/{id}") - @PreAuthorize("hasAuthority('dify:server:query')") public AppsResponseVO getApp(@PathVariable("id") String id) { return difyServer.app(id); } @@ -54,7 +52,6 @@ public class V1ServerController { * @return */ @GetMapping("/api-key/{id}") - @PreAuthorize("hasAuthority('dify:server:query')") public List getAppApiKey(@PathVariable("id") String id) { return difyServer.getAppApiKey(id); } @@ -65,7 +62,6 @@ public class V1ServerController { * @return */ @PostMapping("/api-key/init/{id}") - @PreAuthorize("hasAuthority('dify:server:init')") public List initAppApiKey(@PathVariable("id") String id) { return difyServer.initAppApiKey(id); } @@ -75,7 +71,6 @@ public class V1ServerController { * @return */ @GetMapping("/api-key/dataset") - @PreAuthorize("hasAuthority('dify:server:query')") public List getDatasetApiKey() { return difyServer.getDatasetApiKey(); } @@ -85,7 +80,6 @@ public class V1ServerController { * @return */ @PostMapping("/api-key/dataset/init") - @PreAuthorize("hasAuthority('dify:server:init')") public List initDatasetApiKey() { return difyServer.initDatasetApiKey(); } @@ -97,7 +91,6 @@ public class V1ServerController { * @return */ @PostMapping("/app/{id}/toggle") - @PreAuthorize("hasAuthority('dify:server:update')") @OperationLogAnnotation(content = "'dify服务启用状态'", operationType = "更新") public boolean enabledApp(@PathVariable String id) { return appEntityService.enabledApp(id); @@ -108,7 +101,6 @@ public class V1ServerController { * @return */ @GetMapping("/apps/enabled") - @PreAuthorize("hasAuthority('dify:server:query')") @DataPermission public List getEnableApps() { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -122,7 +114,6 @@ public class V1ServerController { * @return */ @GetMapping("/apps/type") - @PreAuthorize("hasAuthority('dify:server:query')") @DataPermission public List getAppsByAppType(Integer appType){ return appEntityService.selectByAppType(appType); 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 871073c..47682d9 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 @@ -41,7 +41,6 @@ public class V1WorkflowController { * @return */ @PostMapping("/run/{appId}") - @PreAuthorize("hasAnyAuthority('dify:workflow:run','dify:ppt:run','dify:spider2:run')") @OperationLogAnnotation(content = "'dify工作流'", operationType = "运行") public WorkflowRunResponse runWorkflow(@RequestBody WorkflowRunRequest request, @PathVariable String appId) { request.setUserId(SecurityUtil.getUserInfo().id.toString()); @@ -79,7 +78,6 @@ public class V1WorkflowController { * @return */ @GetMapping("/info/{appId}") - @PreAuthorize("hasAnyAuthority('dify:workflow:info','dify:ppt:info','dify:spider2:info')") public WorkflowInfoResponse info(String workflowRunId, @PathVariable String appId) { String apiKey =appEntityService.getApikey(appId); return ExceptionUtil.difyException(() -> difyWorkflow.info(workflowRunId, apiKey)); @@ -92,7 +90,6 @@ public class V1WorkflowController { * @return */ @PostMapping("/logs/{appId}") - @PreAuthorize("hasAnyAuthority('dify:workflow:log','dify:ppt:log','dify:spider2:log')") public DifyPageResult logs(@RequestBody WorkflowLogsRequest request, @PathVariable String appId) { String apiKey = appEntityService.getApikey(appId); request.setApiKey(apiKey); @@ -107,7 +104,6 @@ public class V1WorkflowController { * @return */ @GetMapping("/list/{appId}") - @PreAuthorize("hasAnyAuthority('dify:workflow:query','dify:ppt:query','dify:spider2:query')") @DataPermission public List list(@PathVariable String appId){ return difyWorkflowService.list(new QueryWrapper().eq("app_id",appId)); @@ -120,7 +116,6 @@ public class V1WorkflowController { * @return */ @GetMapping("/detail/{id}") - @PreAuthorize("hasAnyAuthority('dify:workflow:query','dify:ppt:query','dify:spider2:query')") @DataPermission public WorkflowData detail(@PathVariable Long id){ return difyWorkflowService.detail(id); @@ -133,7 +128,6 @@ public class V1WorkflowController { * @return */ @DeleteMapping("/delete/{id}") - @PreAuthorize("hasAuthority('dify:workflow:delete')") @OperationLogAnnotation(content = "'dify工作流日志'", operationType = "删除") public boolean delete(@PathVariable Long id){ return difyWorkflowService.delete(id); @@ -146,7 +140,6 @@ public class V1WorkflowController { * @return */ @GetMapping("/query") - @PreAuthorize("hasAuthority('dify:workflow:query')") @DataPermission public Page query(Page page){ return difyWorkflowService.query(page); diff --git a/src/main/java/com/zsc/edu/dify/modules/dify/controller/WordController.java b/src/main/java/com/zsc/edu/dify/modules/dify/controller/WordController.java index 14b3414..010b6d3 100644 --- a/src/main/java/com/zsc/edu/dify/modules/dify/controller/WordController.java +++ b/src/main/java/com/zsc/edu/dify/modules/dify/controller/WordController.java @@ -28,7 +28,6 @@ public class WordController { * apikey 建议在数据库进行存储,前端调用时传智能体 id,从数据库查询 */ @PostMapping("/completions") - @PreAuthorize("hasAuthority('dify:word:send')") @OperationLogAnnotation(content = "'dify对话'", operationType = "发送") public ChatMessageSendResponse sendChatMessage(@RequestBody ChatMessageSendRequest sendRequest){ sendRequest.setApiKey(appEntityService.getApikey("baca08c1-e92b-4dc9-a445-3584803f54d4"));