diff --git a/deploy/docker/docker-compose-ollama.yaml b/deploy/docker/docker-compose-ollama.yaml index ff4720cda1..79159d5cc5 100644 --- a/deploy/docker/docker-compose-ollama.yaml +++ b/deploy/docker/docker-compose-ollama.yaml @@ -105,7 +105,7 @@ services: BYTEDESK_DEBUG: true BYTEDESK_EDITION: ENTERPRISE BYTEDESK_VERSION: 0.7.7 - BYTEDESK_APPKEY: ZjoyMDI1LTA2LTEx + BYTEDESK_APPKEY: ZjoyMDI1LTA2LTExOkNPTU1VTklUWTo6 # 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 4386869ddc..0cc453cc61 100644 --- a/deploy/docker/docker-compose.yaml +++ b/deploy/docker/docker-compose.yaml @@ -85,7 +85,7 @@ services: BYTEDESK_DEBUG: true BYTEDESK_EDITION: ENTERPRISE BYTEDESK_VERSION: 0.7.7 - BYTEDESK_APPKEY: ZjoyMDI1LTA2LTEx + BYTEDESK_APPKEY: ZjoyMDI1LTA2LTExOkNPTU1VTklUWTo6 # enable custom config: name, logo, description BYTEDESK_CUSTOM_ENABLED: false BYTEDESK_CUSTOM_NAME: diff --git a/modules/team/src/main/java/com/bytedesk/team/member/MemberEventListener.java b/modules/team/src/main/java/com/bytedesk/team/member/MemberEventListener.java index e0ecd2f77e..587b1954af 100644 --- a/modules/team/src/main/java/com/bytedesk/team/member/MemberEventListener.java +++ b/modules/team/src/main/java/com/bytedesk/team/member/MemberEventListener.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-06-03 14:06:20 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-04-24 16:27:08 + * @LastEditTime: 2025-05-12 10:24:16 * @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. @@ -130,29 +130,6 @@ public class MemberEventListener { topicCacheService.pushRequest(request); } - // @EventListener - // public void onMemberUpdateEvent(MemberUpdateEvent event) { - // // MemberUpdateEvent memberUpdateEvent = (MemberUpdateEvent) - // event.getObject(); - // log.info("member updated: {}", event); - // // TODO: 删除旧的部门主题 - // } - - // @EventListener - // public void onRoleUpdateEvent(GenericApplicationEvent event) - // { - // RoleUpdateEvent roleUpdateEvent = event.getObject(); - // RoleEntity roleEntity = roleUpdateEvent.getRoleEntity(); - // log.info("onRoleUpdateEvent: {}", roleEntity.toString()); - // // 给member对应的userUid删除/添加角色 - // // 遍历roleEntity.getMemberUids - // if (roleEntity.getLevel().equals(LevelEnum.ORGANIZATION.name())) { - // // - // } else { - // log.info("not support yet"); - // } - // } - @EventListener public void onUploadCreateEvent(UploadCreateEvent event) throws IOException { UploadEntity upload = event.getUpload(); diff --git a/modules/team/src/main/java/com/bytedesk/team/member/MemberRestService.java b/modules/team/src/main/java/com/bytedesk/team/member/MemberRestService.java index 2167a93c8f..827bade737 100644 --- a/modules/team/src/main/java/com/bytedesk/team/member/MemberRestService.java +++ b/modules/team/src/main/java/com/bytedesk/team/member/MemberRestService.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-01-29 16:20:17 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-05-09 10:23:51 + * @LastEditTime: 2025-05-12 10:26:40 * @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. @@ -249,21 +249,6 @@ public class MemberRestService extends BaseRestServiceWithExcel