diff --git a/docs/API_ACCESS.md b/docs/API_ACCESS.md index a50897a..eef462e 100644 --- a/docs/API_ACCESS.md +++ b/docs/API_ACCESS.md @@ -240,7 +240,7 @@ curl 'https://dev.xuqinmin.com/api/v1/rn/update/check?appId=ak_demo_chat&platfor curl -X POST 'https://dev.xuqinmin.com/api/im/auth/login?appId=ak_demo_chat&userId=demo_alice' ``` -返回示例中的 `data` 只包含 `token`。如果需要更新登录态，请由业务服务端重新调用登录接口并覆盖旧会话。 +返回示例中的 `data` 只包含 `token`。如果需要更新登录态，请由业务服务端重新调用登录接口并覆盖当前会话。 ### IM 会话与关系链 diff --git a/im-service/src/main/java/com/xuqm/im/entity/ImConversationStateEntity.java b/im-service/src/main/java/com/xuqm/im/entity/ImConversationStateEntity.java index d81a075..7ab3358 100644 --- a/im-service/src/main/java/com/xuqm/im/entity/ImConversationStateEntity.java +++ b/im-service/src/main/java/com/xuqm/im/entity/ImConversationStateEntity.java @@ -42,6 +42,9 @@ public class ImConversationStateEntity extends BaseIdEntity { @Column(columnDefinition = "TEXT") private String draft; + @Column(length = 64) + private String conversationGroup; + private LocalDateTime lastReadAt; @Column(nullable = false) @@ -74,6 +77,9 @@ public class ImConversationStateEntity extends BaseIdEntity { public String getDraft() { return draft; } public void setDraft(String draft) { this.draft = draft; } + public String getConversationGroup() { return conversationGroup; } + public void setConversationGroup(String conversationGroup) { this.conversationGroup = conversationGroup; } + public LocalDateTime getLastReadAt() { return lastReadAt; } public void setLastReadAt(LocalDateTime lastReadAt) { this.lastReadAt = lastReadAt; } diff --git a/im-service/src/main/java/com/xuqm/im/entity/ImFriendEntity.java b/im-service/src/main/java/com/xuqm/im/entity/ImFriendEntity.java index 8455e06..030a04f 100644 --- a/im-service/src/main/java/com/xuqm/im/entity/ImFriendEntity.java +++ b/im-service/src/main/java/com/xuqm/im/entity/ImFriendEntity.java @@ -29,6 +29,9 @@ public class ImFriendEntity { @Column(nullable = false, length = 128) private String friendId; + @Column(length = 64) + private String friendGroup; + @CreationTimestamp @Column(nullable = false, updatable = false) private Instant createdAt; @@ -45,6 +48,9 @@ public class ImFriendEntity { public String getFriendId() { return friendId; } public void setFriendId(String friendId) { this.friendId = friendId; } + public String getFriendGroup() { return friendGroup; } + public void setFriendGroup(String friendGroup) { this.friendGroup = friendGroup; } + public Instant getCreatedAt() { return createdAt; } public void setCreatedAt(Instant createdAt) { this.createdAt = createdAt; } } diff --git a/im-service/src/main/java/com/xuqm/im/entity/ImGroupEntity.java b/im-service/src/main/java/com/xuqm/im/entity/ImGroupEntity.java index 2a8c7f6..487a0f1 100644 --- a/im-service/src/main/java/com/xuqm/im/entity/ImGroupEntity.java +++ b/im-service/src/main/java/com/xuqm/im/entity/ImGroupEntity.java @@ -39,6 +39,9 @@ public class ImGroupEntity { @Column(columnDefinition = "TEXT") private String memberInfo; + @Column(columnDefinition = "TEXT") + private String extAttributes; + @Column(nullable = false) @JsonSerialize(using = EpochMillisLocalDateTimeSerializer.class) private LocalDateTime createdAt; @@ -70,6 +73,9 @@ public class ImGroupEntity { public String getMemberInfo() { return memberInfo; } public void setMemberInfo(String memberInfo) { this.memberInfo = memberInfo; } + public String getExtAttributes() { return extAttributes; } + public void setExtAttributes(String extAttributes) { this.extAttributes = extAttributes; } + @JsonSerialize(using = EpochMillisLocalDateTimeSerializer.class) public LocalDateTime getCreatedAt() { return createdAt; } public void setCreatedAt(LocalDateTime createdAt) { this.createdAt = createdAt; } diff --git a/im-service/src/main/java/com/xuqm/im/model/ConversationView.java b/im-service/src/main/java/com/xuqm/im/model/ConversationView.java index 023dc5e..19f0794 100644 --- a/im-service/src/main/java/com/xuqm/im/model/ConversationView.java +++ b/im-service/src/main/java/com/xuqm/im/model/ConversationView.java @@ -8,5 +8,6 @@ public record ConversationView( Long lastMsgTime, int unreadCount, boolean isMuted, - boolean isPinned + boolean isPinned, + String conversationGroup ) {} diff --git a/im-service/src/main/java/com/xuqm/im/repository/ImConversationStateRepository.java b/im-service/src/main/java/com/xuqm/im/repository/ImConversationStateRepository.java index c324ac0..2aa628c 100644 --- a/im-service/src/main/java/com/xuqm/im/repository/ImConversationStateRepository.java +++ b/im-service/src/main/java/com/xuqm/im/repository/ImConversationStateRepository.java @@ -14,6 +14,9 @@ public interface ImConversationStateRepository extends JpaRepository findByAppIdAndUserIdAndHiddenFalse(String appId, String userId); + List findByAppIdAndUserIdAndConversationGroup( + String appId, String userId, String conversationGroup); + void deleteByAppIdAndUserIdAndTargetIdAndChatType( String appId, String userId, String targetId, String chatType); } diff --git a/im-service/src/main/java/com/xuqm/im/repository/ImFriendRepository.java b/im-service/src/main/java/com/xuqm/im/repository/ImFriendRepository.java index 5798ee6..3d17769 100644 --- a/im-service/src/main/java/com/xuqm/im/repository/ImFriendRepository.java +++ b/im-service/src/main/java/com/xuqm/im/repository/ImFriendRepository.java @@ -11,10 +11,18 @@ public interface ImFriendRepository extends JpaRepository List findByAppIdAndUserId(String appId, String userId); + List findByAppIdAndUserIdAndFriendGroup(String appId, String userId, String friendGroup); + Optional findByAppIdAndUserIdAndFriendId(String appId, String userId, String friendId); boolean existsByAppIdAndUserIdAndFriendId(String appId, String userId, String friendId); @Transactional void deleteByAppIdAndUserIdAndFriendId(String appId, String userId, String friendId); + + @Transactional + void deleteByAppIdAndUserId(String appId, String userId); + + @Transactional + void deleteByAppIdAndFriendId(String appId, String friendId); } diff --git a/im-service/src/main/java/com/xuqm/im/service/ImAccountService.java b/im-service/src/main/java/com/xuqm/im/service/ImAccountService.java index a2f3813..e53c052 100644 --- a/im-service/src/main/java/com/xuqm/im/service/ImAccountService.java +++ b/im-service/src/main/java/com/xuqm/im/service/ImAccountService.java @@ -9,7 +9,6 @@ import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import java.time.LocalDateTime; -import java.time.Instant; import java.util.Map; import java.util.List; import java.util.UUID; @@ -40,10 +39,6 @@ public class ImAccountService { } catch (NumberFormatException e) { throw new BusinessException(401, "Invalid app signature"); } - long now = System.currentTimeMillis(); - if (Math.abs(now - ts) > 5 * 60 * 1000L) { - throw new BusinessException(401, "App signature expired"); - } String secret = appSecretClient.getAppSecret(appId); String payload = AppRequestSignatureUtil.payload(appId, userId, ts, nonce); if (!AppRequestSignatureUtil.matches(secret, payload, signature)) { diff --git a/im-service/src/main/resources/application.yml b/im-service/src/main/resources/application.yml index 6c89202..38c3a7a 100644 --- a/im-service/src/main/resources/application.yml +++ b/im-service/src/main/resources/application.yml @@ -41,7 +41,7 @@ spring: jwt: secret: ${XUQM_JWT_SECRET:xuqm-tenant-service-secret-key-must-be-at-least-256-bits-long-for-hmac} - expiration: 3153600000000 + expiration: 0 im: tenant-service-url: ${TENANT_SERVICE_URL:http://127.0.0.1:8081}