Merge branch 'master' of https://gitea.nxsir.cn/nanxun/IM_NEW

IM.Commons/IntegrationEvents/GroupMemberJoinedEvent.cs

@@ -8,8 +8,11 @@
         public string GroupNickName { get; private set; }
         public string? Avatar { get; private set; }
         public string Role { get; private set; }
+        public string GroupName { get; private set; }
+        public string? GroupAvatar { get; private set; }
 
-        public GroupMemberJoinedEvent(Guid id, Guid userId, Guid groupId, string groupNickName, string? avatar, string role)
+        public GroupMemberJoinedEvent(Guid id, Guid userId, Guid groupId, string groupNickName, string? avatar, string role,
+            string groupName, string? groupAvatar)
         {
             Id = id;
             UserId = userId;
@@ -17,6 +20,8 @@
             GroupNickName = groupNickName;
             Avatar = avatar;
             Role = role;
+            GroupName = groupName;
+            GroupAvatar = groupAvatar;
         }
     }
 }

IM.Commons/RedisHelper.cs

@@ -12,5 +12,9 @@
         public static string GetUploadPartKey(Guid taskId) => $"upload:task:{taskId}:parts";
         public static string MergeStatus(Guid taskId) => $"upload:task:{taskId}:merge";
         public static string GetUploadInfoKey(string sessionId) => $"upload:task:{sessionId}:info";
+        /// <summary>
+        /// taskId → sessionId 映射（用于按 taskId 快速定位 session 缓存）
+        /// </summary>
+        public static string GetUploadTaskSessionMapKey(string taskId) => $"upload:task:{taskId}:session";
     }
 }

IM.Commons/Result.cs

@@ -25,7 +25,7 @@ namespace IM.Commons
         public static Result<T> Success<T>(T? data = default) => new((int)ResultCode.SUCCESS, ResultCode.SUCCESS.GetDescription(), data);
 
         public static Result<object> Success() => new((int)ResultCode.SUCCESS, ResultCode.SUCCESS.GetDescription(), null);
-
+        
         public static Result<T> Fail<T>(ResultCode code) => new((int)code, code.GetDescription());
         public static Result<object> Fail(ResultCode code) => new((int)code, code.GetDescription());
         public static Result<T> Fail<T>(ResultCode code, string errorMsg) => new((int)code, errorMsg);

IM.Commons/ResultCode.cs

@@ -154,6 +154,18 @@ namespace IM.Commons
         CHUNK_NOT_FOUND = 3201,
         /// <summary>分片合并异常</summary>
         [Description("分片合并失败")]
-        CHUNK_COMBINE_FAIL = 3202
+        CHUNK_COMBINE_FAIL = 3202,
+        /// <summary>分片小于最小限制</summary>
+        [Description("分片大小过小")]
+        PART_TOO_SMALL = 3203,
+        /// <summary>分片数量不匹配</summary>
+        [Description("分片数量不匹配")]
+        PART_COUNT_MISMATCH = 3204,
+        /// <summary>上传会话已过期</summary>
+        [Description("上传会话已过期")]
+        UPLOAD_SESSION_EXPIRED = 3205,
+        /// <summary>分片号超出范围</summary>
+        [Description("分片号无效")]
+        INVALID_PART_NUMBER = 3206
     }
 }