code/IM
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'feature-nxdev' of https://gitea.nxsir.cn/code/IM into feature-nxdev

Browse Source
This commit is contained in:
nanxun
2026-01-28 18:27:08 +08:00
parent e05497a478 ae99d3290f
commit e65eeb5ff7
44 changed files with 815 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/IMTest/obj/Debug/net8.0/IMTest.AssemblyInfo.cs
+1 -1
View File
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("IMTest")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f41e7137fed96054a894ffa374b72ab6dd4a0b6a")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e05497a478c4bb77e993819051ad8d2ff581fa93")]
[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 -1
View File
@@ -1 +1 @@
3c907fc092e5da2dde7386b239ed7e37568883ede28dc96f41506aa4c8b81601
f196a285ecd82a93a930d3cf15e8440cf7ade1451ba42ad34469a54bf70670bc
backend/IMTest/obj/Debug/net8.0/IMTest.assets.cache
BIN
View File
Binary file not shown.
backend/IMTest/obj/Debug/net8.0/IMTest.csproj.AssemblyReference.cache
BIN
View File
Binary file not shown.
backend/IMTest/obj/IMTest.csproj.nuget.dgspec.json
+4
View File
@@ -155,6 +155,10 @@
"target": "Package",
"version": "[12.0.0, )"
},
"MassTransit.RabbitMQ": {
"target": "Package",
"version": "[8.5.5, )"
},
"Microsoft.AspNetCore.Authentication.JwtBearer": {
"target": "Package",
"version": "[8.0.21, )"
backend/IMTest/obj/project.assets.json
+264
View File
@@ -53,6 +53,57 @@
"build/netstandard1.0/coverlet.collector.targets": {}
}
},
"MassTransit/8.5.5": {
"type": "package",
"dependencies": {
"MassTransit.Abstractions": "8.5.5",
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0",
"Microsoft.Extensions.Diagnostics.HealthChecks": "8.0.0",
"Microsoft.Extensions.Hosting.Abstractions": "8.0.0",
"Microsoft.Extensions.Logging.Abstractions": "8.0.0",
"Microsoft.Extensions.Options": "8.0.0"
},
"compile": {
"lib/net8.0/MassTransit.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net8.0/MassTransit.dll": {
"related": ".xml"
}
}
},
"MassTransit.Abstractions/8.5.5": {
"type": "package",
"compile": {
"lib/net8.0/MassTransit.Abstractions.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net8.0/MassTransit.Abstractions.dll": {
"related": ".xml"
}
}
},
"MassTransit.RabbitMQ/8.5.5": {
"type": "package",
"dependencies": {
"MassTransit": "8.5.5",
"RabbitMQ.Client": "7.1.2"
},
"compile": {
"lib/net8.0/MassTransit.RabbitMqTransport.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net8.0/MassTransit.RabbitMqTransport.dll": {
"related": ".xml"
}
}
},
"Microsoft.AspNetCore.Authentication.Abstractions/2.3.0": {
"type": "package",
"dependencies": {
@@ -664,6 +715,38 @@
"buildTransitive/net6.0/_._": {}
}
},
"Microsoft.Extensions.Diagnostics.HealthChecks/8.0.0": {
"type": "package",
"dependencies": {
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "8.0.0",
"Microsoft.Extensions.Hosting.Abstractions": "8.0.0",
"Microsoft.Extensions.Logging.Abstractions": "8.0.0",
"Microsoft.Extensions.Options": "8.0.0"
},
"compile": {
"lib/net8.0/Microsoft.Extensions.Diagnostics.HealthChecks.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net8.0/Microsoft.Extensions.Diagnostics.HealthChecks.dll": {
"related": ".xml"
}
}
},
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/8.0.0": {
"type": "package",
"compile": {
"lib/net8.0/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net8.0/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.dll": {
"related": ".xml"
}
}
},
"Microsoft.Extensions.FileProviders.Abstractions/8.0.0": {
"type": "package",
"dependencies": {
@@ -1360,6 +1443,23 @@
}
}
},
"RabbitMQ.Client/7.1.2": {
"type": "package",
"dependencies": {
"System.IO.Pipelines": "8.0.0",
"System.Threading.RateLimiting": "8.0.0"
},
"compile": {
"lib/net8.0/RabbitMQ.Client.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net8.0/RabbitMQ.Client.dll": {
"related": ".xml"
}
}
},
"runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {
"type": "package",
"runtimeTargets": {
@@ -2655,6 +2755,22 @@
"buildTransitive/net6.0/_._": {}
}
},
"System.Threading.RateLimiting/8.0.0": {
"type": "package",
"compile": {
"lib/net8.0/System.Threading.RateLimiting.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net8.0/System.Threading.RateLimiting.dll": {
"related": ".xml"
}
},
"build": {
"buildTransitive/net6.0/_._": {}
}
},
"System.Threading.Tasks/4.3.0": {
"type": "package",
"dependencies": {
@@ -2859,6 +2975,7 @@
"dependencies": {
"AutoMapper": "12.0.1",
"AutoMapper.Extensions.Microsoft.DependencyInjection": "12.0.0",
"MassTransit.RabbitMQ": "8.5.5",
"Microsoft.AspNetCore.Authentication.JwtBearer": "8.0.21",
"Microsoft.AspNetCore.SignalR": "1.2.0",
"Microsoft.VisualStudio.Azure.Containers.Tools.Targets": "1.22.1",
@@ -2987,6 +3104,69 @@
"coverlet.collector.nuspec"
]
},
"MassTransit/8.5.5": {
"sha512": "bSg8k5q+rP1s+dIGXLLbctqDGdIkfDjdxwNWtCUH7xNCN9ZuM7mqSPQPIFgaYIi34e81m4FqAqo4CAHuWPkhRA==",
"type": "package",
"path": "masstransit/8.5.5",
"files": [
".nupkg.metadata",
".signature.p7s",
"NuGet.README.md",
"lib/net472/MassTransit.dll",
"lib/net472/MassTransit.xml",
"lib/net8.0/MassTransit.dll",
"lib/net8.0/MassTransit.xml",
"lib/net9.0/MassTransit.dll",
"lib/net9.0/MassTransit.xml",
"lib/netstandard2.0/MassTransit.dll",
"lib/netstandard2.0/MassTransit.xml",
"masstransit.8.5.5.nupkg.sha512",
"masstransit.nuspec",
"mt-logo-small.png"
]
},
"MassTransit.Abstractions/8.5.5": {
"sha512": "0mn2Ay17dD6z5tgSLjbVRlldSbL9iowzFEfVgVfBXVG5ttz9dSWeR4TrdD6pqH93GWXp4CvSmF8i1HqxLX7DZw==",
"type": "package",
"path": "masstransit.abstractions/8.5.5",
"files": [
".nupkg.metadata",
".signature.p7s",
"NuGet.README.md",
"lib/net472/MassTransit.Abstractions.dll",
"lib/net472/MassTransit.Abstractions.xml",
"lib/net8.0/MassTransit.Abstractions.dll",
"lib/net8.0/MassTransit.Abstractions.xml",
"lib/net9.0/MassTransit.Abstractions.dll",
"lib/net9.0/MassTransit.Abstractions.xml",
"lib/netstandard2.0/MassTransit.Abstractions.dll",
"lib/netstandard2.0/MassTransit.Abstractions.xml",
"masstransit.abstractions.8.5.5.nupkg.sha512",
"masstransit.abstractions.nuspec",
"mt-logo-small.png"
]
},
"MassTransit.RabbitMQ/8.5.5": {
"sha512": "UxWn4o90YVMF9PBkJeoskOFPneh6YtnI1fLJHtvZiSAG0eoiRrWPGa+6FQCvjkQ/ljCKfjzok2eGZc/vmNZ01A==",
"type": "package",
"path": "masstransit.rabbitmq/8.5.5",
"files": [
".nupkg.metadata",
".signature.p7s",
"NuGet.README.md",
"lib/net472/MassTransit.RabbitMqTransport.dll",
"lib/net472/MassTransit.RabbitMqTransport.xml",
"lib/net8.0/MassTransit.RabbitMqTransport.dll",
"lib/net8.0/MassTransit.RabbitMqTransport.xml",
"lib/net9.0/MassTransit.RabbitMqTransport.dll",
"lib/net9.0/MassTransit.RabbitMqTransport.xml",
"lib/netstandard2.0/MassTransit.RabbitMqTransport.dll",
"lib/netstandard2.0/MassTransit.RabbitMqTransport.xml",
"masstransit.rabbitmq.8.5.5.nupkg.sha512",
"masstransit.rabbitmq.nuspec",
"mt-logo-small.png"
]
},
"Microsoft.AspNetCore.Authentication.Abstractions/2.3.0": {
"sha512": "ve6uvLwKNRkfnO/QeN9M8eUJ49lCnWv/6/9p6iTEuiI6Rtsz+myaBAjdMzLuTViQY032xbTF5AdZF5BJzJJyXQ==",
"type": "package",
@@ -3887,6 +4067,44 @@
"useSharedDesignerContext.txt"
]
},
"Microsoft.Extensions.Diagnostics.HealthChecks/8.0.0": {
"sha512": "P9SoBuVZhJPpALZmSq72aQEb9ryP67EdquaCZGXGrrcASTNHYdrUhnpgSwIipgM5oVC+dKpRXg5zxobmF9xr5g==",
"type": "package",
"path": "microsoft.extensions.diagnostics.healthchecks/8.0.0",
"files": [
".nupkg.metadata",
".signature.p7s",
"Icon.png",
"THIRD-PARTY-NOTICES.TXT",
"lib/net462/Microsoft.Extensions.Diagnostics.HealthChecks.dll",
"lib/net462/Microsoft.Extensions.Diagnostics.HealthChecks.xml",
"lib/net8.0/Microsoft.Extensions.Diagnostics.HealthChecks.dll",
"lib/net8.0/Microsoft.Extensions.Diagnostics.HealthChecks.xml",
"lib/netstandard2.0/Microsoft.Extensions.Diagnostics.HealthChecks.dll",
"lib/netstandard2.0/Microsoft.Extensions.Diagnostics.HealthChecks.xml",
"microsoft.extensions.diagnostics.healthchecks.8.0.0.nupkg.sha512",
"microsoft.extensions.diagnostics.healthchecks.nuspec"
]
},
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions/8.0.0": {
"sha512": "AT2qqos3IgI09ok36Qag9T8bb6kHJ3uT9Q5ki6CySybFsK6/9JbvQAgAHf1pVEjST0/N4JaFaCbm40R5edffwg==",
"type": "package",
"path": "microsoft.extensions.diagnostics.healthchecks.abstractions/8.0.0",
"files": [
".nupkg.metadata",
".signature.p7s",
"Icon.png",
"THIRD-PARTY-NOTICES.TXT",
"lib/net462/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.dll",
"lib/net462/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.xml",
"lib/net8.0/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.dll",
"lib/net8.0/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.xml",
"lib/netstandard2.0/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.dll",
"lib/netstandard2.0/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.xml",
"microsoft.extensions.diagnostics.healthchecks.abstractions.8.0.0.nupkg.sha512",
"microsoft.extensions.diagnostics.healthchecks.abstractions.nuspec"
]
},
"Microsoft.Extensions.FileProviders.Abstractions/8.0.0": {
"sha512": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==",
"type": "package",
@@ -4801,6 +5019,23 @@
"pomelo.entityframeworkcore.mysql.nuspec"
]
},
"RabbitMQ.Client/7.1.2": {
"sha512": "y3c6ulgULScWthHw5PLM1ShHRLhxg0vCtzX/hh61gRgNecL3ZC3WoBW2HYHoXOVRqTl99Br9E7CZEytGZEsCyQ==",
"type": "package",
"path": "rabbitmq.client/7.1.2",
"files": [
".nupkg.metadata",
".signature.p7s",
"README.md",
"icon.png",
"lib/net8.0/RabbitMQ.Client.dll",
"lib/net8.0/RabbitMQ.Client.xml",
"lib/netstandard2.0/RabbitMQ.Client.dll",
"lib/netstandard2.0/RabbitMQ.Client.xml",
"rabbitmq.client.7.1.2.nupkg.sha512",
"rabbitmq.client.nuspec"
]
},
"runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {
"sha512": "HdSSp5MnJSsg08KMfZThpuLPJpPwE5hBXvHwoKWosyHHfe8Mh5WKT0ylEOf6yNzX6Ngjxe4Whkafh5q7Ymac4Q==",
"type": "package",
@@ -8051,6 +8286,35 @@
"useSharedDesignerContext.txt"
]
},
"System.Threading.RateLimiting/8.0.0": {
"sha512": "7mu9v0QDv66ar3DpGSZHg9NuNcxDaaAcnMULuZlaTpP9+hwXhrxNGsF5GmLkSHxFdb5bBc1TzeujsRgTrPWi+Q==",
"type": "package",
"path": "system.threading.ratelimiting/8.0.0",
"files": [
".nupkg.metadata",
".signature.p7s",
"Icon.png",
"LICENSE.TXT",
"THIRD-PARTY-NOTICES.TXT",
"buildTransitive/net461/System.Threading.RateLimiting.targets",
"buildTransitive/net462/_._",
"buildTransitive/net6.0/_._",
"buildTransitive/netcoreapp2.0/System.Threading.RateLimiting.targets",
"lib/net462/System.Threading.RateLimiting.dll",
"lib/net462/System.Threading.RateLimiting.xml",
"lib/net6.0/System.Threading.RateLimiting.dll",
"lib/net6.0/System.Threading.RateLimiting.xml",
"lib/net7.0/System.Threading.RateLimiting.dll",
"lib/net7.0/System.Threading.RateLimiting.xml",
"lib/net8.0/System.Threading.RateLimiting.dll",
"lib/net8.0/System.Threading.RateLimiting.xml",
"lib/netstandard2.0/System.Threading.RateLimiting.dll",
"lib/netstandard2.0/System.Threading.RateLimiting.xml",
"system.threading.ratelimiting.8.0.0.nupkg.sha512",
"system.threading.ratelimiting.nuspec",
"useSharedDesignerContext.txt"
]
},
"System.Threading.Tasks/4.3.0": {
"sha512": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==",
"type": "package",
backend/IMTest/obj/project.nuget.cache
+19 -2
View File
@@ -1,6 +1,6 @@
{
"version": 2,
"dgSpecHash": "XxMlesTFLsE=",
"dgSpecHash": "j7OjEXb1ZGE=",
"success": true,
"projectFilePath": "C:\\Users\\nanxun\\Documents\\IM\\backend\\IMTest\\IMTest.csproj",
"expectedPackageFiles": [
@@ -8,6 +8,9 @@
"C:\\Users\\nanxun\\.nuget\\packages\\automapper.extensions.microsoft.dependencyinjection\\12.0.0\\automapper.extensions.microsoft.dependencyinjection.12.0.0.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\castle.core\\5.1.1\\castle.core.5.1.1.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\coverlet.collector\\6.0.0\\coverlet.collector.6.0.0.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\masstransit\\8.5.5\\masstransit.8.5.5.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\masstransit.abstractions\\8.5.5\\masstransit.abstractions.8.5.5.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\masstransit.rabbitmq\\8.5.5\\masstransit.rabbitmq.8.5.5.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\microsoft.aspnetcore.authentication.abstractions\\2.3.0\\microsoft.aspnetcore.authentication.abstractions.2.3.0.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\microsoft.aspnetcore.authentication.jwtbearer\\8.0.21\\microsoft.aspnetcore.authentication.jwtbearer.8.0.21.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\microsoft.aspnetcore.authorization\\2.3.0\\microsoft.aspnetcore.authorization.2.3.0.nupkg.sha512",
@@ -43,6 +46,8 @@
"C:\\Users\\nanxun\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\8.0.1\\microsoft.extensions.dependencyinjection.8.0.1.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\8.0.2\\microsoft.extensions.dependencyinjection.abstractions.8.0.2.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\microsoft.extensions.diagnostics.abstractions\\8.0.1\\microsoft.extensions.diagnostics.abstractions.8.0.1.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\microsoft.extensions.diagnostics.healthchecks\\8.0.0\\microsoft.extensions.diagnostics.healthchecks.8.0.0.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\microsoft.extensions.diagnostics.healthchecks.abstractions\\8.0.0\\microsoft.extensions.diagnostics.healthchecks.abstractions.8.0.0.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\8.0.0\\microsoft.extensions.fileproviders.abstractions.8.0.0.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\8.0.1\\microsoft.extensions.hosting.abstractions.8.0.1.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\microsoft.extensions.logging\\8.0.1\\microsoft.extensions.logging.8.0.1.nupkg.sha512",
@@ -72,6 +77,7 @@
"C:\\Users\\nanxun\\.nuget\\packages\\nuget.frameworks\\6.5.0\\nuget.frameworks.6.5.0.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\pipelines.sockets.unofficial\\2.2.8\\pipelines.sockets.unofficial.2.2.8.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\pomelo.entityframeworkcore.mysql\\8.0.3\\pomelo.entityframeworkcore.mysql.8.0.3.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\rabbitmq.client\\7.1.2\\rabbitmq.client.7.1.2.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
@@ -148,6 +154,7 @@
"C:\\Users\\nanxun\\.nuget\\packages\\system.text.regularexpressions\\4.3.0\\system.text.regularexpressions.4.3.0.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\system.threading.channels\\8.0.0\\system.threading.channels.8.0.0.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\system.threading.ratelimiting\\8.0.0\\system.threading.ratelimiting.8.0.0.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\system.threading.tasks.extensions\\4.3.0\\system.threading.tasks.extensions.4.3.0.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\system.threading.timer\\4.3.0\\system.threading.timer.4.3.0.nupkg.sha512",
@@ -162,5 +169,15 @@
"C:\\Users\\nanxun\\.nuget\\packages\\xunit.extensibility.execution\\2.5.3\\xunit.extensibility.execution.2.5.3.nupkg.sha512",
"C:\\Users\\nanxun\\.nuget\\packages\\xunit.runner.visualstudio\\2.5.3\\xunit.runner.visualstudio.2.5.3.nupkg.sha512"
],
"logs": []
"logs": [
{
"code": "Undefined",
"level": "Warning",
"message": "读取缓存文件 C:\\Users\\nanxun\\Documents\\IM\\backend\\IMTest\\obj\\project.nuget.cache 时遇到问题: '<' is an invalid start of a property name. Expected a '\"'. Path: $ | LineNumber: 2 | BytePositionInLine: 0.",
"projectPath": "C:\\Users\\nanxun\\Documents\\IM\\backend\\IMTest\\IMTest.csproj",
"warningLevel": 1,
"filePath": "C:\\Users\\nanxun\\Documents\\IM\\backend\\IMTest\\IMTest.csproj",
"targetGraphs": []
}
]
}
backend/IM_API/Application/EventHandlers/FriendAddHandler/FriendAddConversationHandler.cs
+13
View File
@@ -0,0 +1,13 @@
using IM_API.Domain.Events;
using MassTransit;
namespace IM_API.Application.EventHandlers.FriendAddHandler
{
public class FriendAddConversationHandler : IConsumer<FriendAddEvent>
{
public Task Consume(ConsumeContext<FriendAddEvent> context)
{
throw new NotImplementedException();
}
}
}
backend/IM_API/Application/EventHandlers/FriendAddHandler/FriendAddSignalRHandler.cs
+31
View File
@@ -0,0 +1,31 @@
using IM_API.Domain.Events;
using IM_API.Models;
using MassTransit;
namespace IM_API.Application.EventHandlers.FriendAddHandler
{
public class FriendAddSignalRHandler : IConsumer<FriendAddEvent>
{
private readonly ImContext _context;
public FriendAddSignalRHandler(ImContext context)
{
_context = context;
}
public Task Consume(ConsumeContext<FriendAddEvent> context)
{
throw new NotImplementedException();
var @event = context.Message;
var RequestfriendShip = new Friend()
{
Avatar = @event.ResponseUser.Avatar,
UserId = @event.RequestUser.Id,
RemarkName = @event.RequestInfo.NickName,
Created = @event.RequestInfo.Created,
};
}
}
}
backend/IM_API/Application/EventHandlers/ConversationEventHandler.cs → backend/IM_API/Application/EventHandlers/MessageCreatedHandler/ConversationEventHandler.cs
+12 -7
View File
@@ -7,12 +7,13 @@ using IM_API.Interface.Services;
using IM_API.Models;
using IM_API.Services;
using IM_API.Tools;
using MassTransit;
using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json;
namespace IM_API.Application.EventHandlers
namespace IM_API.Application.EventHandlers.MessageCreatedHandler
{
public class ConversationEventHandler : IEventHandler<MessageCreatedEvent>
public class ConversationEventHandler : IConsumer<MessageCreatedEvent>
{
private readonly IConversationService _conversationService;
private readonly ILogger<ConversationEventHandler> _logger;
@@ -30,9 +31,12 @@ namespace IM_API.Application.EventHandlers
_context = imContext;
_mapper = mapper;
}
public async Task Handle(MessageCreatedEvent @event)
public async Task Consume(ConsumeContext<MessageCreatedEvent> context)
{
if(@event.ChatType == ChatType.PRIVATE)
var @event = context.Message;
if (@event.ChatType == ChatType.PRIVATE)
{
Conversation? userAConversation = await _context.Conversations.FirstOrDefaultAsync(
x => x.UserId == @event.MsgSenderId && x.TargetId == @event.MsgRecipientId
@@ -40,9 +44,9 @@ namespace IM_API.Application.EventHandlers
Conversation? userBConversation = await _context.Conversations.FirstOrDefaultAsync(
x => x.UserId == @event.MsgRecipientId && x.TargetId == @event.MsgSenderId
);
if(userAConversation is null || userBConversation is null)
if (userAConversation is null || userBConversation is null)
{
_logger.LogError("消息事件更新会话信息失败：{@event}",@event);
_logger.LogError("消息事件更新会话信息失败：{@event}", @event);
}
userAConversation.LastMessage = @event.MessageContent;
userAConversation.LastReadMessageId = @event.MessageId;
@@ -50,9 +54,10 @@ namespace IM_API.Application.EventHandlers
userBConversation.LastMessage = @event.MessageContent;
userBConversation.UnreadCount += 1;
userBConversation.LastMessageTime = @event.MessageCreated;
_context.UpdateRange(userAConversation,userBConversation);
_context.UpdateRange(userAConversation, userBConversation);
await _context.SaveChangesAsync();
}
}
}
}
backend/IM_API/Application/EventHandlers/SignalREventHandler.cs → backend/IM_API/Application/EventHandlers/MessageCreatedHandler/SignalREventHandler.cs
+6 -4
View File
@@ -5,11 +5,12 @@ using IM_API.Dtos;
using IM_API.Hubs;
using IM_API.Models;
using IM_API.Tools;
using MassTransit;
using Microsoft.AspNetCore.SignalR;
namespace IM_API.Application.EventHandlers
namespace IM_API.Application.EventHandlers.MessageCreatedHandler
{
public class SignalREventHandler : IEventHandler<MessageCreatedEvent>
public class SignalREventHandler : IConsumer<MessageCreatedEvent>
{
private readonly IHubContext<ChatHub> _hub;
private readonly IMapper _mapper;
@@ -19,9 +20,10 @@ namespace IM_API.Application.EventHandlers
_mapper = mapper;
}
public async Task Handle(MessageCreatedEvent @event)
public async Task Consume(ConsumeContext<MessageCreatedEvent> context)
{
if(@event.ChatType == Models.ChatType.PRIVATE)
var @event = context.Message;
if (@event.ChatType == Models.ChatType.PRIVATE)
{
MessageBaseDto messageBaseDto = new MessageBaseDto
{
backend/IM_API/Configs/MQConfig.cs
+40
View File
@@ -0,0 +1,40 @@
using IM_API.Application.EventHandlers.FriendAddHandler;
using IM_API.Application.EventHandlers.MessageCreatedHandler;
using MassTransit;
namespace IM_API.Configs
{
public static class MQConfig
{
public static IServiceCollection AddRabbitMQ(this IServiceCollection services, RabbitMqOptions options)
{
services.AddMassTransit(x =>
{
x.AddConsumer<ConversationEventHandler>();
x.AddConsumer<SignalREventHandler>();
x.AddConsumer<FriendAddConversationHandler>();
x.AddConsumer<FriendAddSignalRHandler>();
x.UsingRabbitMq((ctx,cfg) =>
{
cfg.Host(options.Host, "/", h =>
{
h.Username(options.Username);
h.Password(options.Password);
});
});
});
return services;
}
}
public class RabbitMqOptions
{
public string Host { get; set; }
public int Port { get; set; }
public string Username { get; set; }
public string Password { get;set; }
}
}
backend/IM_API/Configs/MapperConfig.cs
-2
View File
@@ -123,8 +123,6 @@ namespace IM_API.Configs
CreateMap<Group, ConversationDto>()
.ForMember(dest => dest.TargetAvatar, opt => opt.MapFrom(src => src.Avatar))
.ForMember(dest => dest.TargetName, opt => opt.MapFrom(src => src.Name));
}
}
}
backend/IM_API/Configs/ServiceCollectionExtensions.cs
-2
View File
@@ -23,8 +23,6 @@ namespace IM_API.Configs
services.AddTransient<IMessageSevice, MessageService>();
services.AddTransient<IConversationService, ConversationService>();
services.AddScoped<IEventBus, InMemoryEventBus>();
services.AddScoped<IEventHandler<MessageCreatedEvent>, SignalREventHandler>();
services.AddScoped<IEventHandler<MessageCreatedEvent>, ConversationEventHandler>();
services.AddSingleton<IJWTService, JWTService>();
services.AddSingleton<IRefreshTokenService, RedisRefreshTokenService>();
return services;
backend/IM_API/Controllers/FriendController.cs
+3 -1
View File
@@ -59,7 +59,9 @@ namespace IM_API.Controllers
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
public async Task<IActionResult> HandleRequest([FromRoute]int id, [FromBody]FriendRequestHandleDto dto)
public async Task<IActionResult> HandleRequest(
[FromRoute]int id, [FromBody]FriendRequestHandleDto dto
)
{
await _friendService.HandleFriendRequestAsync(new HandleFriendRequestDto()
{
backend/IM_API/Domain/Events/FriendAddEvent.cs
+24
View File
@@ -0,0 +1,24 @@
using IM_API.Dtos;
namespace IM_API.Domain.Events
{
public record FriendAddEvent:DomainEvent
{
public override string EventType => "IM.FRIENDS_FRIEND_ADD";
/// <summary>
/// 发起请求用户
/// </summary>
public UserInfoDto RequestUser { get; set; }
/// <summary>
/// 接受请求用户
/// </summary>
public UserInfoDto ResponseUser { get; set; }
public FriendRequestResDto RequestInfo { get; set; }
/// <summary>
/// 好友关系创建时间
/// </summary>
public DateTime Created { get; set; }
}
}
backend/IM_API/IM_API.csproj
+1
View File
@@ -12,6 +12,7 @@
<ItemGroup>
<PackageReference Include="AutoMapper" Version="12.0.1" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
<PackageReference Include="MassTransit.RabbitMQ" Version="8.5.5" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.21" />
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.21">
backend/IM_API/Program.cs
+2
View File
@@ -33,6 +33,8 @@ namespace IM_API
//注入redis
var redis = ConnectionMultiplexer.Connect(redisConStr);
builder.Services.AddSingleton<IConnectionMultiplexer>(redis);
builder.Services.AddRabbitMQ(configuration.GetSection("RabbitMqOptions").Get<RabbitMqOptions>());
builder.Services.AddAllService(configuration);
backend/IM_API/Services/FriendService.cs
-2
View File
@@ -170,9 +170,7 @@ namespace IM_API.Services
throw new BaseException(CodeDefine.ALREADY_FRIENDS);
//生成实体
var friendRequst = _mapper.Map<FriendRequest>(dto);
var friend = _mapper.Map<Friend>(dto);
_context.FriendRequests.Add(friendRequst);
_context.Friends.Add(friend);
await _context.SaveChangesAsync();
return true;
}
backend/IM_API/Services/MessageService.cs
+15 -6
View File
@@ -6,6 +6,7 @@ using IM_API.Exceptions;
using IM_API.Interface.Services;
using IM_API.Models;
using IM_API.Tools;
using MassTransit;
using Microsoft.EntityFrameworkCore;
namespace IM_API.Services
@@ -15,13 +16,19 @@ namespace IM_API.Services
private readonly ImContext _context;
private readonly ILogger<MessageService> _logger;
private readonly IMapper _mapper;
private readonly IEventBus _eventBus;
public MessageService(ImContext context, ILogger<MessageService> logger, IMapper mapper, IEventBus eventBus)
//废弃，此处已使用rabbitMQ替代
//private readonly IEventBus _eventBus;
private readonly IPublishEndpoint _endpoint;
public MessageService(
ImContext context, ILogger<MessageService> logger, IMapper mapper, IEventBus eventBus,
IPublishEndpoint publishEndpoint
)
{
_context = context;
_logger = logger;
_mapper = mapper;
_eventBus = eventBus;
//_eventBus = eventBus;
_endpoint = publishEndpoint;
}
public async Task<List<MessageBaseDto>> GetMessagesAsync(int userId, int conversationId, int? msgId, int? pageSize, bool desc)
@@ -93,10 +100,12 @@ namespace IM_API.Services
if (!isMember) throw new BaseException(CodeDefine.NO_GROUP_PERMISSION);
var message = _mapper.Map<Message>(dto);
message.Sender = senderId;
message.StreamKey = StreamKeyBuilder.Group(groupId);
message.StreamKey = StreamKeyBuilder.Group(
groupId);
_context.Messages.Add(message);
await _context.SaveChangesAsync();
await _eventBus.PublishAsync(_mapper.Map<MessageCreatedEvent>(message));
await _endpoint.Publish(_mapper.Map<MessageCreatedEvent>(message));
return _mapper.Map<MessageBaseDto>(message);
}
@@ -112,7 +121,7 @@ namespace IM_API.Services
message.StreamKey = StreamKeyBuilder.Private(dto.SenderId, dto.ReceiverId);
_context.Messages.Add(message);
await _context.SaveChangesAsync();
await _eventBus.PublishAsync(_mapper.Map<MessageCreatedEvent>(message));
await _endpoint.Publish(_mapper.Map<MessageCreatedEvent>(message));
return _mapper.Map<MessageBaseDto>(message);
}
#endregion
backend/IM_API/appsettings.json
+6
View File
@@ -16,5 +16,11 @@
"ConnectionStrings": {
"DefaultConnection": "Server=frp-era.com;Port=26582;Database=IM;User=product;Password=12345678;",
"Redis": "192.168.5.100:6379"
},
"RabbitMQOptions": {
"Host": "192.168.5.100",
"Port": 5672,
"Username": "test",
"Password": "123456"
}
}