diff --git a/modules/ai/src/main/java/com/bytedesk/ai/robot/RobotEventListener.java b/modules/ai/src/main/java/com/bytedesk/ai/robot/RobotEventListener.java index e95952f33a..bb2cdd8aad 100644 --- a/modules/ai/src/main/java/com/bytedesk/ai/robot/RobotEventListener.java +++ b/modules/ai/src/main/java/com/bytedesk/ai/robot/RobotEventListener.java @@ -28,7 +28,7 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.bytedesk.ai.provider.vendors.ollama.OllamaChatService; import com.bytedesk.ai.provider.vendors.zhipuai.ZhipuaiService; -import com.bytedesk.core.config.BytedeskProperties; +import com.bytedesk.core.config.properties.BytedeskProperties; import com.bytedesk.core.enums.ClientEnum; import com.bytedesk.core.enums.LevelEnum; import com.bytedesk.core.message.IMessageSendService; diff --git a/modules/core/src/main/java/com/bytedesk/core/config/BytedeskProperties.java b/modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskProperties.java similarity index 99% rename from modules/core/src/main/java/com/bytedesk/core/config/BytedeskProperties.java rename to modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskProperties.java index ee9d6803c6..caafb240f7 100644 --- a/modules/core/src/main/java/com/bytedesk/core/config/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-02-07 20:44:40 + * @LastEditTime: 2025-02-07 21:23:36 * @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. @@ -12,7 +12,7 @@ * 联系:270580156@qq.com * Copyright (c) 2024 by bytedesk.com, All Rights Reserved. */ -package com.bytedesk.core.config; +package com.bytedesk.core.config.properties; import java.util.ArrayList; import java.util.List; diff --git a/modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskPropertiesController.java b/modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskPropertiesController.java new file mode 100644 index 0000000000..d7cf9f3662 --- /dev/null +++ b/modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskPropertiesController.java @@ -0,0 +1,32 @@ +/* + * @Author: jackning 270580156@qq.com + * @Date: 2025-02-07 21:24:22 + * @LastEditors: jackning 270580156@qq.com + * @LastEditTime: 2025-02-07 21:26:03 + * @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. + * Business Source License 1.1: https://github.com/Bytedesk/bytedesk/blob/main/LICENSE + * contact: 270580156@qq.com + * + * Copyright (c) 2025 by bytedesk.com, All Rights Reserved. + */ +package com.bytedesk.core.config.properties; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.bytedesk.core.utils.ConvertUtils; + +@RestController +@RequestMapping("/test/api/properties") +public class BytedeskPropertiesController { + + // http://127.0.0.1:9003/test/api/properties/bytedesk + @GetMapping("/bytedesk") + public BytedeskPropertiesResponse getBytedeskProperties() { + return ConvertUtils.convertToBytedeskPropertiesResponse(BytedeskProperties.getInstance()); + } + +} \ No newline at end of file diff --git a/modules/core/src/main/java/com/bytedesk/core/config/BytedeskPropertiesResponse.java b/modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskPropertiesResponse.java similarity index 91% rename from modules/core/src/main/java/com/bytedesk/core/config/BytedeskPropertiesResponse.java rename to modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskPropertiesResponse.java index 8163655e1e..75ad7377bb 100644 --- a/modules/core/src/main/java/com/bytedesk/core/config/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-02-07 20:46:13 + * @LastEditTime: 2025-02-07 21:13:04 * @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. @@ -11,7 +11,7 @@ * * Copyright (c) 2025 by bytedesk.com, All Rights Reserved. */ -package com.bytedesk.core.config; +package com.bytedesk.core.config.properties; import java.io.Serializable; @@ -29,6 +29,7 @@ public class BytedeskPropertiesResponse implements Serializable { private String logo; private String description; private String version; + // } diff --git a/modules/core/src/main/java/com/bytedesk/core/feature/FeatureController.java b/modules/core/src/main/java/com/bytedesk/core/feature/FeatureController.java index 3908f53855..731be3e3c7 100644 --- a/modules/core/src/main/java/com/bytedesk/core/feature/FeatureController.java +++ b/modules/core/src/main/java/com/bytedesk/core/feature/FeatureController.java @@ -15,7 +15,7 @@ package com.bytedesk.core.feature; import org.springframework.web.bind.annotation.RestController; -import com.bytedesk.core.config.BytedeskProperties; +import com.bytedesk.core.config.properties.BytedeskProperties; import com.bytedesk.core.utils.JsonResult; import lombok.AllArgsConstructor; diff --git a/modules/core/src/main/java/com/bytedesk/core/jms/JmsArtemisController.java b/modules/core/src/main/java/com/bytedesk/core/jms/JmsArtemisController.java index 39185b21a9..06f3f13ea9 100644 --- a/modules/core/src/main/java/com/bytedesk/core/jms/JmsArtemisController.java +++ b/modules/core/src/main/java/com/bytedesk/core/jms/JmsArtemisController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.bytedesk.core.config.BytedeskProperties; +import com.bytedesk.core.config.properties.BytedeskProperties; import com.bytedesk.core.utils.JsonResult; import lombok.extern.slf4j.Slf4j; diff --git a/modules/core/src/main/java/com/bytedesk/core/push/PushRestService.java b/modules/core/src/main/java/com/bytedesk/core/push/PushRestService.java index e417eac1b3..11e09481cc 100644 --- a/modules/core/src/main/java/com/bytedesk/core/push/PushRestService.java +++ b/modules/core/src/main/java/com/bytedesk/core/push/PushRestService.java @@ -29,7 +29,7 @@ import org.springframework.orm.ObjectOptimisticLockingFailureException; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import com.bytedesk.core.base.BaseRestService; -import com.bytedesk.core.config.BytedeskProperties; +import com.bytedesk.core.config.properties.BytedeskProperties; import com.bytedesk.core.constant.I18Consts; import com.bytedesk.core.constant.TypeConsts; import com.bytedesk.core.exception.EmailExistsException; diff --git a/modules/core/src/main/java/com/bytedesk/core/push/email/PushServiceImplEmail.java b/modules/core/src/main/java/com/bytedesk/core/push/email/PushServiceImplEmail.java index 0bdabcd99c..0def334c26 100644 --- a/modules/core/src/main/java/com/bytedesk/core/push/email/PushServiceImplEmail.java +++ b/modules/core/src/main/java/com/bytedesk/core/push/email/PushServiceImplEmail.java @@ -28,7 +28,7 @@ import com.aliyuncs.exceptions.ClientException; import com.aliyuncs.exceptions.ServerException; import com.aliyuncs.profile.DefaultProfile; import com.aliyuncs.profile.IClientProfile; -import com.bytedesk.core.config.BytedeskProperties; +import com.bytedesk.core.config.properties.BytedeskProperties; import com.bytedesk.core.message.MessageEntity; import com.bytedesk.core.push.PushNotifier; import com.bytedesk.core.utils.Utils; diff --git a/modules/core/src/main/java/com/bytedesk/core/push/sms/PushServiceImplSms.java b/modules/core/src/main/java/com/bytedesk/core/push/sms/PushServiceImplSms.java index 92fa57954a..102ae76c4d 100644 --- a/modules/core/src/main/java/com/bytedesk/core/push/sms/PushServiceImplSms.java +++ b/modules/core/src/main/java/com/bytedesk/core/push/sms/PushServiceImplSms.java @@ -25,7 +25,7 @@ import com.aliyuncs.exceptions.ClientException; import com.aliyuncs.exceptions.ServerException; import com.aliyuncs.http.MethodType; import com.aliyuncs.profile.DefaultProfile; -import com.bytedesk.core.config.BytedeskProperties; +import com.bytedesk.core.config.properties.BytedeskProperties; import com.bytedesk.core.message.MessageEntity; import com.bytedesk.core.push.PushNotifier; // import com.bytedesk.core.utils.Utils; diff --git a/modules/core/src/main/java/com/bytedesk/core/rbac/organization/OrganizationInitializer.java b/modules/core/src/main/java/com/bytedesk/core/rbac/organization/OrganizationInitializer.java index f1e5a12ead..2553da158c 100644 --- a/modules/core/src/main/java/com/bytedesk/core/rbac/organization/OrganizationInitializer.java +++ b/modules/core/src/main/java/com/bytedesk/core/rbac/organization/OrganizationInitializer.java @@ -18,7 +18,7 @@ import java.util.Optional; import org.springframework.beans.factory.SmartInitializingSingleton; import org.springframework.stereotype.Component; -import com.bytedesk.core.config.BytedeskProperties; +import com.bytedesk.core.config.properties.BytedeskProperties; import com.bytedesk.core.constant.BytedeskConsts; import com.bytedesk.core.rbac.authority.AuthorityInitializer; import com.bytedesk.core.rbac.role.RoleInitializer; diff --git a/modules/core/src/main/java/com/bytedesk/core/rbac/user/UserInitializer.java b/modules/core/src/main/java/com/bytedesk/core/rbac/user/UserInitializer.java index fe1f25bbc5..56b62123dd 100644 --- a/modules/core/src/main/java/com/bytedesk/core/rbac/user/UserInitializer.java +++ b/modules/core/src/main/java/com/bytedesk/core/rbac/user/UserInitializer.java @@ -16,7 +16,7 @@ package com.bytedesk.core.rbac.user; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Component; -import com.bytedesk.core.config.BytedeskProperties; +import com.bytedesk.core.config.properties.BytedeskProperties; import com.bytedesk.core.constant.AvatarConsts; import com.bytedesk.core.uid.UidUtils; diff --git a/modules/core/src/main/java/com/bytedesk/core/rbac/user/UserService.java b/modules/core/src/main/java/com/bytedesk/core/rbac/user/UserService.java index 6dc18222ae..4d6ad8af3e 100644 --- a/modules/core/src/main/java/com/bytedesk/core/rbac/user/UserService.java +++ b/modules/core/src/main/java/com/bytedesk/core/rbac/user/UserService.java @@ -28,7 +28,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import com.bytedesk.core.config.BytedeskEventPublisher; -import com.bytedesk.core.config.BytedeskProperties; +import com.bytedesk.core.config.properties.BytedeskProperties; import com.bytedesk.core.constant.AvatarConsts; import com.bytedesk.core.constant.I18Consts; import com.bytedesk.core.enums.PlatformEnum; 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 af9c9147fa..f5dd90a1bc 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 @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-03-01 17:20:46 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2024-11-09 12:21:51 + * @LastEditTime: 2025-02-07 21:22:25 * @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. @@ -21,6 +21,8 @@ import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import com.alibaba.fastjson2.JSON; +import com.bytedesk.core.config.properties.BytedeskProperties; +import com.bytedesk.core.config.properties.BytedeskPropertiesResponse; import com.bytedesk.core.constant.BytedeskConsts; import com.bytedesk.core.message.MessageEntity; import com.bytedesk.core.message.MessageResponse; @@ -143,4 +145,8 @@ public class ConvertUtils { return modelMapper.map(authorityEntity, AuthorityResponse.class); } + public static BytedeskPropertiesResponse convertToBytedeskPropertiesResponse(BytedeskProperties bytedeskProperties) { + return modelMapper.map(bytedeskProperties, BytedeskPropertiesResponse.class); + } + } diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/upload/UploadConfig.java b/modules/kbase/src/main/java/com/bytedesk/kbase/upload/UploadConfig.java index c4832fb861..4ed9d529af 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/upload/UploadConfig.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/upload/UploadConfig.java @@ -20,7 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.bytedesk.core.config.BytedeskProperties; +import com.bytedesk.core.config.properties.BytedeskProperties; import com.bytedesk.kbase.upload.storage.UploadStorageException; @Configuration 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 8686959518..af22b53641 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 @@ -39,7 +39,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import com.bytedesk.core.base.BaseRestService; -import com.bytedesk.core.config.BytedeskProperties; +import com.bytedesk.core.config.properties.BytedeskProperties; import com.bytedesk.core.rbac.user.UserProtobuf; import com.bytedesk.core.uid.UidUtils; import com.bytedesk.kbase.upload.storage.UploadStorageException; diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/upload/UploadUtils.java b/modules/kbase/src/main/java/com/bytedesk/kbase/upload/UploadUtils.java index ace1c8bd5c..146e5b3fc7 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/upload/UploadUtils.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/upload/UploadUtils.java @@ -10,7 +10,7 @@ import java.nio.file.StandardCopyOption; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import com.bytedesk.core.config.BytedeskProperties; +import com.bytedesk.core.config.properties.BytedeskProperties; import com.bytedesk.kbase.upload.storage.UploadStorageException; public class UploadUtils { diff --git a/modules/service/src/main/java/com/bytedesk/service/agent/AgentInitializer.java b/modules/service/src/main/java/com/bytedesk/service/agent/AgentInitializer.java index b82a946f5a..899bf85a68 100644 --- a/modules/service/src/main/java/com/bytedesk/service/agent/AgentInitializer.java +++ b/modules/service/src/main/java/com/bytedesk/service/agent/AgentInitializer.java @@ -17,7 +17,7 @@ import org.springframework.beans.factory.SmartInitializingSingleton; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; -import com.bytedesk.core.config.BytedeskProperties; +import com.bytedesk.core.config.properties.BytedeskProperties; import com.bytedesk.core.constant.BytedeskConsts; import lombok.AllArgsConstructor; diff --git a/modules/team/src/main/java/com/bytedesk/team/member/MemberInitializer.java b/modules/team/src/main/java/com/bytedesk/team/member/MemberInitializer.java index d72c0d3e2a..d9c1add71d 100644 --- a/modules/team/src/main/java/com/bytedesk/team/member/MemberInitializer.java +++ b/modules/team/src/main/java/com/bytedesk/team/member/MemberInitializer.java @@ -16,7 +16,7 @@ package com.bytedesk.team.member; import org.springframework.beans.factory.SmartInitializingSingleton; import org.springframework.stereotype.Component; -import com.bytedesk.core.config.BytedeskProperties; +import com.bytedesk.core.config.properties.BytedeskProperties; import com.bytedesk.core.constant.BytedeskConsts; import com.bytedesk.core.constant.I18Consts; import com.bytedesk.team.department.DepartmentConsts;