ZF/weiyu
1
0
Fork 0
mirror of https://gitee.com/270580156/weiyu.git synced 2025-12-30 10:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
jack ning
2025-07-23 07:07:55 +08:00
parent a06873cfd9
commit 5c030e9e3b
9 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/docker/docker-compose-ollama.yaml
View File

@@ -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:

2
deploy/docker/docker-compose.yaml
View File

@@ -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:

2
deploy/server/config/application.properties
View File

@@ -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

20
modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskProperties.java
View File

@@ -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;
}
}

4
modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskPropertiesResponse.java
View File

@@ -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;

4
modules/core/src/main/java/com/bytedesk/core/utils/ConvertUtils.java
View File

@@ -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) {

7
modules/core/src/main/java/com/bytedesk/core/workflow/node/WorkflowBaseNode.java
View File

@@ -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;
/**
* 输入值映射

2
starter/src/main/resources/application-open.properties
View File

@@ -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

13
starter/src/main/resources/static/architecture.html
View File

@@ -442,14 +442,11 @@
<div class="layer-title" lang="en">Frontend Layer</div>
<div class="layer-title" lang="zh">前端展示层</div>
<div class="layer-content">
<div class="layer-component">PC端/网站/H5</div>
<div class="layer-component">移动手机端</div>
<div class="layer-component">企业微信</div>
<div class="layer-component">微信公众号</div>
<div class="layer-component">小程序</div>
<div class="layer-component">电商平台</div>
<div class="layer-component">Whatsapp/Facebook/Ig/Line...</div>
<div class="layer-component">... ...</div>
<div class="layer-component">PC端/网站/H5/移动手机端</div>
<div class="layer-component">企业微信/公众号/小程序</div>
<div class="layer-component">抖音/快手/小红书</div>
<div class="layer-component">电商平台/社交平台</div>
<div class="layer-component">Whatsapp/Facebook/Ig/Line/Telegram...</div>
</div>
</div>