From 8a4863767e033584ef1167cb1ef080367db66d97 Mon Sep 17 00:00:00 2001 From: jack ning Date: Tue, 4 Mar 2025 09:45:34 +0800 Subject: [PATCH] update --- .../java/com/bytedesk/core/base/BaseResponse.java | 7 +------ .../com/bytedesk/core/message/MessageResponse.java | 9 +++++---- .../core/message/MessageSpecification.java | 8 ++++---- .../com/bytedesk/core/rbac/user/UserProtobuf.java | 12 ++++++------ .../com/bytedesk/core/thread/ThreadProtobuf.java | 14 ++++++-------- starter/src/main/resources/templates/ftl/dev.ftl | 4 ++-- 6 files changed, 24 insertions(+), 30 deletions(-) diff --git a/modules/core/src/main/java/com/bytedesk/core/base/BaseResponse.java b/modules/core/src/main/java/com/bytedesk/core/base/BaseResponse.java index fdba3df0e3..7a1a3476ec 100644 --- a/modules/core/src/main/java/com/bytedesk/core/base/BaseResponse.java +++ b/modules/core/src/main/java/com/bytedesk/core/base/BaseResponse.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-01-29 16:21:24 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2024-12-24 10:23:26 + * @LastEditTime: 2025-03-04 09:38:07 * @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. @@ -18,11 +18,6 @@ import java.io.Serializable; import lombok.Data; import lombok.experimental.Accessors; -/** - * @author jackning EMAIL * @author jackning 270580156@qq.com - * @version 1.0 - * @date 2024-01-29 16:21:24 - */ @Data @Accessors(chain = true) public abstract class BaseResponse implements Serializable { diff --git a/modules/core/src/main/java/com/bytedesk/core/message/MessageResponse.java b/modules/core/src/main/java/com/bytedesk/core/message/MessageResponse.java index c3db807f72..4d6536a6a9 100644 --- a/modules/core/src/main/java/com/bytedesk/core/message/MessageResponse.java +++ b/modules/core/src/main/java/com/bytedesk/core/message/MessageResponse.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-02-21 10:00:55 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2024-07-04 15:02:09 + * @LastEditTime: 2025-03-04 09:36:46 * @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. @@ -52,12 +52,13 @@ public class MessageResponse extends BaseResponse { // private String client; private ClientEnum client; - private LocalDateTime createdAt; - - // private ThreadProtobuf thread; private String threadTopic; private UserProtobuf user; private String extra; + + private LocalDateTime createdAt; + + private LocalDateTime updatedAt; } diff --git a/modules/core/src/main/java/com/bytedesk/core/message/MessageSpecification.java b/modules/core/src/main/java/com/bytedesk/core/message/MessageSpecification.java index 54de49503f..f751d59477 100644 --- a/modules/core/src/main/java/com/bytedesk/core/message/MessageSpecification.java +++ b/modules/core/src/main/java/com/bytedesk/core/message/MessageSpecification.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-06-05 22:53:57 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-03-04 08:47:57 + * @LastEditTime: 2025-03-04 09:31:58 * @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. @@ -73,9 +73,9 @@ public class MessageSpecification extends BaseSpecification { } } // user.nickname - // if (StringUtils.hasText(request.getNickname())) { - // predicates.add(criteriaBuilder.like(root.get("userNickname"), "%" + request.getUserNickname() + "%")); - // } + if (StringUtils.hasText(request.getNickname())) { + predicates.add(criteriaBuilder.like(root.get("user"), "%" + request.getNickname() + "%")); + } // if (StringUtils.hasText(request.getClient())) { predicates.add(criteriaBuilder.like(root.get("client"), "%" + request.getClient() + "%")); diff --git a/modules/core/src/main/java/com/bytedesk/core/rbac/user/UserProtobuf.java b/modules/core/src/main/java/com/bytedesk/core/rbac/user/UserProtobuf.java index 5784067cda..50ba1abf15 100644 --- a/modules/core/src/main/java/com/bytedesk/core/rbac/user/UserProtobuf.java +++ b/modules/core/src/main/java/com/bytedesk/core/rbac/user/UserProtobuf.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-01-29 16:21:24 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-02-27 10:23:32 + * @LastEditTime: 2025-03-04 09:39:54 * @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. @@ -13,13 +13,12 @@ */ package com.bytedesk.core.rbac.user; -import com.alibaba.fastjson2.JSON; -import com.bytedesk.core.base.BaseResponse; +import java.io.Serializable; +import com.alibaba.fastjson2.JSON; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; @@ -31,11 +30,12 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @AllArgsConstructor @NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class UserProtobuf extends BaseResponse { +public class UserProtobuf implements Serializable { private static final long serialVersionUID = 1L; + private String uid; + private String nickname; private String avatar; diff --git a/modules/core/src/main/java/com/bytedesk/core/thread/ThreadProtobuf.java b/modules/core/src/main/java/com/bytedesk/core/thread/ThreadProtobuf.java index 46f1de5e18..82c00fbc43 100644 --- a/modules/core/src/main/java/com/bytedesk/core/thread/ThreadProtobuf.java +++ b/modules/core/src/main/java/com/bytedesk/core/thread/ThreadProtobuf.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-02-21 10:01:27 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2024-12-16 16:38:09 + * @LastEditTime: 2025-03-04 09:39:12 * @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. @@ -13,30 +13,28 @@ */ package com.bytedesk.core.thread; +import java.io.Serializable; + import com.bytedesk.core.base.BaseResponse; import com.bytedesk.core.rbac.user.UserProtobuf; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -/** - * 所有字段跟thread.proto中字段一一对应 - * for visitor client - */ @Data @Builder @Accessors(chain = true) @AllArgsConstructor @NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class ThreadProtobuf extends BaseResponse { +public class ThreadProtobuf implements Serializable { private static final long serialVersionUID = 1L; + private String uid; + private String topic; private ThreadTypeEnum type; diff --git a/starter/src/main/resources/templates/ftl/dev.ftl b/starter/src/main/resources/templates/ftl/dev.ftl index 551699e0df..f4af127b21 100644 --- a/starter/src/main/resources/templates/ftl/dev.ftl +++ b/starter/src/main/resources/templates/ftl/dev.ftl @@ -193,12 +193,12 @@ <#-- demo --> -

${i18n[lang]["demo"]}[TODO]

+ <#--

${i18n[lang]["demo"]}[TODO]

+ -->