From ba6b23fd4e7dd21c84660b717deab6cb4e996c6f Mon Sep 17 00:00:00 2001 From: jack ning Date: Sat, 22 Feb 2025 13:32:11 +0800 Subject: [PATCH] update starter/src: mod 9 files --- .../kbase/upload/UploadRestService.java | 6 ++--- starter/docker-compose-ollama.yaml | 13 +++++++++ starter/docker-compose.yaml | 13 +++++++++ .../starter/config/Knife4jConfig.java | 27 ++++++++++++++++++- .../controller/PageRouteController.java | 11 +++++--- .../main/resources/application-dev.properties | 4 +++ .../src/main/resources/templates/ftl/dev.ftl | 1 + 7 files changed, 67 insertions(+), 8 deletions(-) diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/upload/UploadRestService.java b/modules/kbase/src/main/java/com/bytedesk/kbase/upload/UploadRestService.java index af22b53641..3fc48ae583 100755 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/upload/UploadRestService.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/upload/UploadRestService.java @@ -1,8 +1,8 @@ /* * @Author: jackning 270580156@qq.com * @Date: 2024-03-15 11:35:53 - * @LastEditors: jack ning github@bytedesk.com - * @LastEditTime: 2025-02-06 11:40:29 + * @LastEditors: jackning 270580156@qq.com + * @LastEditTime: 2025-02-22 13:30:11 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -67,7 +67,7 @@ public class UploadRestService extends BaseRestService { + // if (openApi.getTags()!=null){ + // openApi.getTags().forEach(tag -> { + // Map map=new HashMap<>(); + // map.put("x-order", RandomUtil.randomInt(0,100)); + // tag.setExtensions(map); + // }); + // } + // if(openApi.getPaths()!=null){ + // openApi.addExtension("x-test123","333"); + // openApi.getPaths().addExtension("x-abb",RandomUtil.randomInt(1,100)); + // } + // }; + // } @Bean @Primary diff --git a/starter/src/main/java/com/bytedesk/starter/controller/PageRouteController.java b/starter/src/main/java/com/bytedesk/starter/controller/PageRouteController.java index 897eb17eaf..cef502ef15 100644 --- a/starter/src/main/java/com/bytedesk/starter/controller/PageRouteController.java +++ b/starter/src/main/java/com/bytedesk/starter/controller/PageRouteController.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-01-29 16:17:36 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-02-16 07:06:58 + * @LastEditTime: 2025-02-22 13:10:34 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -58,7 +58,8 @@ public class PageRouteController { en.put("knowledgeBase", "Knowledge Base(Internal)"); en.put("helpCenter", "Help Center(External)"); en.put("kanban", "Project Management"); - en.put("apiDoc", "API Documentation"); + en.put("apiDoc", "Swagger API Docs"); + en.put("knife4jDoc", "Knife4j API Docs"); en.put("docs", "Docs"); en.put("monitoring", "Monitoring"); en.put("voiceOfCustomer", "Voice of Customer"); @@ -83,7 +84,8 @@ public class PageRouteController { zh.put("knowledgeBase", "对内知识库"); zh.put("helpCenter", "帮助中心(对外知识库)"); zh.put("kanban", "项目管理"); - zh.put("apiDoc", "API 文档"); + zh.put("apiDoc", "Swagger API 文档"); + zh.put("knife4jDoc", "Knife4j API 文档"); zh.put("docs", "文档"); zh.put("monitoring", "系统监控"); zh.put("voiceOfCustomer", "客户之声"); @@ -107,7 +109,8 @@ public class PageRouteController { zhTW.put("knowledgeBase", "對內知識庫"); zhTW.put("helpCenter", "幫助中心(對外知識庫)"); zhTW.put("kanban", "項目管理"); - zhTW.put("apiDoc", "API 文檔"); + zhTW.put("apiDoc", "Swagger API 文檔"); + zhTW.put("knife4jDoc", "Knife4j API 文檔"); zhTW.put("docs", "文檔"); zhTW.put("monitoring", "系統監控"); zhTW.put("voiceOfCustomer", "客戶之聲"); diff --git a/starter/src/main/resources/application-dev.properties b/starter/src/main/resources/application-dev.properties index 60e7c6a9a6..533c89a6b8 100644 --- a/starter/src/main/resources/application-dev.properties +++ b/starter/src/main/resources/application-dev.properties @@ -345,11 +345,15 @@ spring.boot.admin.client.url=http://127.0.0.1:9003 # http://127.0.0.1:9003/v3/api-docs # =============================== springdoc.show-actuator=false +# swagger-ui +# http://127.0.0.1:9003/swagger-ui/index.html springdoc.swagger-ui.enabled=true springdoc.swagger-ui.path=/index.html +# api-docs springdoc.api-docs.enabled=true springdoc.api-docs.path=/v3/api-docs # knife4j +# http://127.0.0.1:9003/doc.html knife4j.enabled=true knife4j.setting.language=zh_cn diff --git a/starter/src/main/resources/templates/ftl/dev.ftl b/starter/src/main/resources/templates/ftl/dev.ftl index 9d2ef67f9c..3b970cb901 100644 --- a/starter/src/main/resources/templates/ftl/dev.ftl +++ b/starter/src/main/resources/templates/ftl/dev.ftl @@ -173,6 +173,7 @@

${i18n[lang]["systemDevelopment"]}