From 5c030e9e3bf004416d5cb89084d9cbb7e5e3da19 Mon Sep 17 00:00:00 2001 From: jack ning Date: Wed, 23 Jul 2025 07:07:55 +0800 Subject: [PATCH] update --- deploy/docker/docker-compose-ollama.yaml | 2 +- deploy/docker/docker-compose.yaml | 2 +- deploy/server/config/application.properties | 2 +- .../config/properties/BytedeskProperties.java | 20 +++++++++---------- .../BytedeskPropertiesResponse.java | 4 ++-- .../com/bytedesk/core/utils/ConvertUtils.java | 4 ++-- .../core/workflow/node/WorkflowBaseNode.java | 7 ++++++- .../resources/application-open.properties | 2 +- .../main/resources/static/architecture.html | 13 +++++------- 9 files changed, 29 insertions(+), 27 deletions(-) diff --git a/deploy/docker/docker-compose-ollama.yaml b/deploy/docker/docker-compose-ollama.yaml index 4fac4cc86e..8fb080cafc 100644 --- a/deploy/docker/docker-compose-ollama.yaml +++ b/deploy/docker/docker-compose-ollama.yaml @@ -153,7 +153,7 @@ services: # bytedesk config BYTEDESK_DEBUG: "false" BYTEDESK_VERSION: 0.8.8 - BYTEDESK_APPKEY: ZjoyMDI1LTA4LTA2OkVOVEVSUFJJU0U6Ojo6 + BYTEDESK_LICENSE_KEY: ZjoyMDI1LTA4LTA2OkVOVEVSUFJJU0U6Ojo6 # enable custom config: name, logo, description BYTEDESK_CUSTOM_ENABLED: "false" BYTEDESK_CUSTOM_NAME: diff --git a/deploy/docker/docker-compose.yaml b/deploy/docker/docker-compose.yaml index 0097900876..879cc69c30 100644 --- a/deploy/docker/docker-compose.yaml +++ b/deploy/docker/docker-compose.yaml @@ -133,7 +133,7 @@ services: # bytedesk config BYTEDESK_DEBUG: "false" BYTEDESK_VERSION: 0.8.8 - BYTEDESK_APPKEY: ZjoyMDI1LTA4LTA2OkVOVEVSUFJJU0U6Ojo6 + BYTEDESK_LICENSE_KEY: ZjoyMDI1LTA4LTA2OkVOVEVSUFJJU0U6Ojo6 # enable custom config: name, logo, description BYTEDESK_CUSTOM_ENABLED: "false" BYTEDESK_CUSTOM_NAME: diff --git a/deploy/server/config/application.properties b/deploy/server/config/application.properties index f212d021fb..1e8c66cbc3 100644 --- a/deploy/server/config/application.properties +++ b/deploy/server/config/application.properties @@ -4,7 +4,7 @@ bytedesk.debug=true bytedesk.version=0.8.8 # 授权 key -bytedesk.appkey=ZjoyMDI1LTA4LTA2OkVOVEVSUFJJU0U6Ojo6 +bytedesk.licenseKey=ZjoyMDI1LTA4LTA2OkVOVEVSUFJJU0U6Ojo6 # enable custom config: name, logo, description bytedesk.custom.enabled=false diff --git a/modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskProperties.java b/modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskProperties.java index 8b187b436a..aee128cabe 100644 --- a/modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskProperties.java +++ b/modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskProperties.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-01-30 09:14:39 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-07-15 13:44:27 + * @LastEditTime: 2025-07-23 06:53:17 * @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. @@ -147,7 +147,7 @@ public class BytedeskProperties { private String version; - private String appkey; + private String licenseKey; // 自定义配置 private Custom custom = new Custom(); @@ -501,20 +501,20 @@ public class BytedeskProperties { } /** - * 获取加密后的appkey - * @return 加密后的appkey字符串 + * 获取加密后的licenseKey + * @return 加密后的licenseKey字符串 */ - public String getAppkey() { - // 原始appkey已经是Base64编码的许可证信息，直接AES加密 - return encryptString(this.appkey); + public String getLicenseKey() { + // 原始licenseKey已经是Base64编码的许可证信息，直接AES加密 + return encryptString(this.licenseKey); } /** - * 获取原始appkey（仅用于内部使用） - * @return 原始appkey字符串 + * 获取原始licenseKey（仅用于内部使用） + * @return 原始licenseKey字符串 */ public String getOriginalAppkey() { - return this.appkey; + return this.licenseKey; } } diff --git a/modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskPropertiesResponse.java b/modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskPropertiesResponse.java index fd2fba26c5..ded78d1fcb 100644 --- a/modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskPropertiesResponse.java +++ b/modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskPropertiesResponse.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2025-02-07 20:45:09 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-07-04 18:11:42 + * @LastEditTime: 2025-07-23 06:53:43 * @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. @@ -24,7 +24,7 @@ public class BytedeskPropertiesResponse implements Serializable { private Boolean debug; private String version; - private String appkey; // 注意：这是加密后的appkey，前端需要先解密再解码 + private String licenseKey; // 注意：这是加密后的licenseKey，前端需要先解密再解码 // private Custom custom; diff --git a/modules/core/src/main/java/com/bytedesk/core/utils/ConvertUtils.java b/modules/core/src/main/java/com/bytedesk/core/utils/ConvertUtils.java index 21600e3dc3..7540d5b075 100644 --- a/modules/core/src/main/java/com/bytedesk/core/utils/ConvertUtils.java +++ b/modules/core/src/main/java/com/bytedesk/core/utils/ConvertUtils.java @@ -272,8 +272,8 @@ public class ConvertUtils { // return modelMapper.map(bytedeskProperties, BytedeskPropertiesResponse.class); BytedeskPropertiesResponse response = modelMapper.map(bytedeskProperties, BytedeskPropertiesResponse.class); - // 确保使用加密后的appkey - response.setAppkey(bytedeskProperties.getAppkey()); + // 确保使用加密后的licenseKey + response.setLicenseKey(bytedeskProperties.getLicenseKey()); // 明确设置Custom所有字段的值，确保从配置中获取 if (bytedeskProperties.getCustom() != null) { diff --git a/modules/core/src/main/java/com/bytedesk/core/workflow/node/WorkflowBaseNode.java b/modules/core/src/main/java/com/bytedesk/core/workflow/node/WorkflowBaseNode.java index 61a665dfbf..2cb658e7d4 100644 --- a/modules/core/src/main/java/com/bytedesk/core/workflow/node/WorkflowBaseNode.java +++ b/modules/core/src/main/java/com/bytedesk/core/workflow/node/WorkflowBaseNode.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2025-06-19 16:16:28 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-07-22 16:01:48 + * @LastEditTime: 2025-07-22 23:49:13 * @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. @@ -117,6 +117,11 @@ public abstract class WorkflowBaseNode implements Serializable { * 节点标题 */ private String title; + + /** + * 节点内容 + */ + private String content; /** * 输入值映射 diff --git a/starter/src/main/resources/application-open.properties b/starter/src/main/resources/application-open.properties index e809be7fcb..1184680f03 100644 --- a/starter/src/main/resources/application-open.properties +++ b/starter/src/main/resources/application-open.properties @@ -4,7 +4,7 @@ bytedesk.debug=true bytedesk.version=0.8.8 # 授权 key -bytedesk.appkey=ZjoyMDI1LTA4LTA2OkVOVEVSUFJJU0U6Ojo6 +bytedesk.licenseKey=ZjoyMDI1LTA4LTA2OkVOVEVSUFJJU0U6Ojo6 # enable custom config: name, logo, description bytedesk.custom.enabled=false diff --git a/starter/src/main/resources/static/architecture.html b/starter/src/main/resources/static/architecture.html index e96dc9ad53..eb96d749ba 100644 --- a/starter/src/main/resources/static/architecture.html +++ b/starter/src/main/resources/static/architecture.html @@ -442,14 +442,11 @@
Frontend Layer
前端展示层
-
PC端/网站/H5
-
移动手机端
-
企业微信
-
微信公众号
-
小程序
-
电商平台
-
Whatsapp/Facebook/Ig/Line...
-
... ...
+
PC端/网站/H5/移动手机端
+
企业微信/公众号/小程序
+
抖音/快手/小红书
+
电商平台/社交平台
+
Whatsapp/Facebook/Ig/Line/Telegram...