ZF/weiyu
1
0
Fork 0
mirror of https://gitee.com/270580156/weiyu.git synced 2026-05-18 13:17:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
jack ning
2025-03-04 09:45:34 +08:00
parent 54d81b6866
commit 8a4863767e
6 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/core/src/main/java/com/bytedesk/core/base/BaseResponse.java
View File

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

9
modules/core/src/main/java/com/bytedesk/core/message/MessageResponse.java
View File

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

8
modules/core/src/main/java/com/bytedesk/core/message/MessageSpecification.java
View File

@@ -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() + "%"));

12
modules/core/src/main/java/com/bytedesk/core/rbac/user/UserProtobuf.java
View File

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

14
modules/core/src/main/java/com/bytedesk/core/thread/ThreadProtobuf.java
View File

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