add

backend/IMTest/obj/Debug/net8.0/IMTest.AssemblyInfo.cs

@@ -14,11 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("IMTest")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-<<<<<<< HEAD
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+eb8455e141ea496a2134ad7c7d9b759b6029dd75")]
-=======
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f7223dc5904286fdf8e117b56c37f58dc431d68b")]
->>>>>>> eb8455e141ea496a2134ad7c7d9b759b6029dd75
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f7772a9c5a6c1a00fd55a667dd7644fe3debe9d7")]
 [assembly: System.Reflection.AssemblyProductAttribute("IMTest")]
 [assembly: System.Reflection.AssemblyTitleAttribute("IMTest")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

backend/IMTest/obj/Debug/net8.0/IMTest.AssemblyInfoInputs.cache

@@ -1,5 +1 @@
-<<<<<<< HEAD
-546570633bb9288fc2957cbb29a807a45f3e48ba127ec13bc3956d28f5e6ed5b
-=======
-3c0a5335719f892c65744a9df7eae9fd7b12de9067131f5c9f4cb65f2b27b8d4
->>>>>>> eb8455e141ea496a2134ad7c7d9b759b6029dd75
+c6e01bb72d85599aa024524b725bc3ddb7e3c1cc42c37b8b46561df20748cbf5

backend/IM_API/.idea/.idea.IM_API/.idea/.gitignore

@@ -0,0 +1,15 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Rider ignored files
+/modules.xml
+/projectSettingsUpdater.xml
+/.idea.IM_API.iml
+/contentModel.xml
+# Ignored default folder with query files
+/queries/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

backend/IM_API/.idea/.idea.IM_API/.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
+</project>

backend/IM_API/.idea/.idea.IM_API/.idea/indexLayout.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>

backend/IM_API/.idea/.idea.IM_API/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>

backend/IM_API/Application/EventHandlers/GroupInviteActionUpdateHandler/RequestDbHandler.cs

@@ -15,7 +15,7 @@ namespace IM_API.Application.EventHandlers.GroupInviteActionUpdateHandler
         public async Task Consume(ConsumeContext<GroupInviteActionUpdateEvent> context)
         {
             var @event = context.Message;
-            if(@event.Action == Models.GroupRequestState.Passed)
+            if(@event.Action == Models.GroupRequestState.TargetPassed)
             {
                 await _groupService.MakeGroupRequestAsync(@event.UserId, @event.InviteUserId,@event.GroupId);
             }

backend/IM_API/IM_API.sln.DotSettings.user

@@ -0,0 +1,4 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/Environment/Hierarchy/Build/BuildTool/RecentDotNetCliExePaths/=_002Fhome_002Fnanxun_002Fdotnet_002Fdotnet/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/Environment/Hierarchy/Build/BuildTool/DotNetCliExePath/@EntryValue">/home/nanxun/dotnet/dotnet</s:String>
+	<s:String x:Key="/Default/Environment/Hierarchy/Build/BuildTool/CustomBuildToolPath/@EntryValue">/home/nanxun/dotnet/sdk/10.0.201/MSBuild.dll</s:String></wpf:ResourceDictionary>

backend/IM_API/Models/GroupRequestState.cs

@@ -21,6 +21,10 @@
         /// <summary>
         /// 对方拒绝
         /// </summary>
-        TargetDeclined = 4
+        TargetDeclined = 4,
+        /// <summary>
+        /// 对方同意
+        /// </summary>
+        TargetPassed = 5
     }
 }

backend/IM_API/Services/GroupService.cs

@@ -167,7 +167,7 @@ namespace IM_API.Services
             var inviteInfo = await _context.GroupRequests
                 .FirstOrDefaultAsync(x => x.UserId == userid && x.StateEnum == GroupRequestState.TargetPending)
                 ?? throw new BaseException(CodeDefine.INVALID_ACTION);
-            if (!(dto.Action == GroupRequestState.TargetPending ||
+            if (!(dto.Action == GroupRequestState.TargetPassed ||
                 dto.Action == GroupRequestState.TargetDeclined))
                 return;
             inviteInfo.StateEnum = dto.Action;