From 5602837980ce539a5076471b76b95169283222c8 Mon Sep 17 00:00:00 2001 From: zpc Date: Tue, 16 Jul 2024 14:42:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MultiTenant/MultiTenantDbContext.cs | 24 +++++++++---------- .../Character/CharacterBLL.cs | 14 +++++------ .../Dto/Chat/CharacterId.cs | 20 ++++++++++++++++ .../Controllers/AccountController.cs | 6 ++--- .../Controllers/CategoryController.cs | 6 ++--- .../Controllers/ChatController.cs | 16 ++++++------- 6 files changed, 53 insertions(+), 33 deletions(-) create mode 100644 src/0-core/HuanMeng.MiaoYu.Model/Dto/Chat/CharacterId.cs diff --git a/src/0-core/HuanMeng.DotNetCore/MultiTenant/MultiTenantDbContext.cs b/src/0-core/HuanMeng.DotNetCore/MultiTenant/MultiTenantDbContext.cs index e2ac17e..5e5a991 100644 --- a/src/0-core/HuanMeng.DotNetCore/MultiTenant/MultiTenantDbContext.cs +++ b/src/0-core/HuanMeng.DotNetCore/MultiTenant/MultiTenantDbContext.cs @@ -59,19 +59,19 @@ namespace HuanMeng.DotNetCore.MultiTenant { if (TenantInfo?.TenantId != null) { - var entries = ChangeTracker.Entries() - .Where(e => e.Entity is IMultiTenantEntity && - (e.State == EntityState.Added || e.State == EntityState.Modified)) - .Select(e => e.Entity as IMultiTenantEntity) - .ToList(); + //var entries = ChangeTracker.Entries() + //.Where(e => e.Entity is IMultiTenantEntity && + // (e.State == EntityState.Added || e.State == EntityState.Modified)) + //.Select(e => e.Entity as IMultiTenantEntity) + //.ToList(); - foreach (var entity in entries) - { - if (entity?.TenantId == null) - { - entity.TenantId = TenantInfo.TenantId; - } - } + //foreach (var entity in entries) + //{ + // if (entity?.TenantId == null) + // { + // entity.TenantId = TenantInfo.TenantId; + // } + //} } return base.SaveChanges(); } diff --git a/src/0-core/HuanMeng.MiaoYu.Code/Character/CharacterBLL.cs b/src/0-core/HuanMeng.MiaoYu.Code/Character/CharacterBLL.cs index f46f005..ee8a773 100644 --- a/src/0-core/HuanMeng.MiaoYu.Code/Character/CharacterBLL.cs +++ b/src/0-core/HuanMeng.MiaoYu.Code/Character/CharacterBLL.cs @@ -26,7 +26,7 @@ namespace HuanMeng.MiaoYu.Code.Character } /// - /// 首页获取角色列表 + /// 首页-获取角色列表 /// /// public async Task>> GetHomeCharacter(RequestCharacterInfoPage requestCharacterInfo) @@ -58,7 +58,7 @@ namespace HuanMeng.MiaoYu.Code.Character /// - /// 获取角色详情 + /// 首页-获取角色详情 /// /// /// @@ -82,18 +82,18 @@ namespace HuanMeng.MiaoYu.Code.Character } /// - /// 获取全部角色的Id + /// 首页-获取全部角色的Id /// /// - public BaseResponse> GetCharacters() + public BaseResponse> GetCharacters() { Random rng = new Random(); - var charactersIds = MiaoYuCache.CharacterList.Select(it => it.Id).OrderBy(x => rng.Next()).ToList(); + var charactersIds = MiaoYuCache.CharacterList.Select(it => new CharacterId { Id = it.Id }).OrderBy(x => rng.Next()).ToList(); if (charactersIds == null) { - charactersIds = new List(); + charactersIds = new List(); } - return new BaseResponse>(ResonseCode.Success, "", charactersIds); + return new BaseResponse>(ResonseCode.Success, "", charactersIds); } } } diff --git a/src/0-core/HuanMeng.MiaoYu.Model/Dto/Chat/CharacterId.cs b/src/0-core/HuanMeng.MiaoYu.Model/Dto/Chat/CharacterId.cs new file mode 100644 index 0000000..c093cd3 --- /dev/null +++ b/src/0-core/HuanMeng.MiaoYu.Model/Dto/Chat/CharacterId.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HuanMeng.MiaoYu.Model.Dto.Chat +{ + /// + /// 角色Id + /// + public class CharacterId + { + + /// + /// 角色Id + /// + public int Id { get; set; } + } +} diff --git a/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/AccountController.cs b/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/AccountController.cs index a888601..4363d7d 100644 --- a/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/AccountController.cs +++ b/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/AccountController.cs @@ -31,7 +31,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers } /// - /// 发送手机号验证码 + /// 登录-发送手机号验证码 /// /// /// @@ -47,7 +47,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers return await userBLL.SendPhoneNumber(phone.PhoneNumber); } /// - /// 登录 + /// 登录- 登录 /// /// /// @@ -60,7 +60,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers } /// - /// + /// 用户-用户 /// /// [Authorize] diff --git a/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/CategoryController.cs b/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/CategoryController.cs index b0a0995..652d80c 100644 --- a/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/CategoryController.cs +++ b/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/CategoryController.cs @@ -25,7 +25,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers } /// - /// 获取分类列表 + /// 发现-获取分类列表 /// /// [HttpGet] @@ -37,7 +37,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers } /// - /// 获取类型中的角色信息 + /// 发现-获取类型中的角色信息 /// /// [HttpGet] @@ -49,7 +49,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers } /// - /// 获取推荐页数据 + /// 发现-获取推荐页数据 /// 返回的data是一个数组，当数组中的对象type为banner，data类型看201，当数组中的对象type为tuijian、xiaoshuo时，data类型看202 /// /// diff --git a/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/ChatController.cs b/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/ChatController.cs index e245b48..bc5408e 100644 --- a/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/ChatController.cs +++ b/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/ChatController.cs @@ -32,12 +32,12 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers } /// - /// 获取角色Id + /// 首页 - 获取角色Id /// /// [HttpGet] [AllowAnonymous] - public BaseResponse> GetCharacterIdList() + public BaseResponse> GetCharacterIdList() { CharacterBLL characterBLL = new CharacterBLL(ServiceProvider); var obj = characterBLL.GetCharacters(); @@ -47,7 +47,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers /// - /// 获取角色人物信息 + /// 首页 - 获取角色人物信息 /// /// [HttpGet] @@ -63,7 +63,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers } /// - /// 获取聊天记录 + /// 聊天-获取聊天记录 /// /// /// @@ -79,7 +79,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers } /// - /// 发送消息接口 + /// 聊天-发送消息接口 /// /// /// @@ -91,7 +91,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers return obj; } /// - /// 删除聊天记录 + /// 聊天-删除聊天记录 /// /// /// @@ -110,7 +110,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers } /// - /// 清空聊天记录 + /// 聊天-清空聊天记录 /// /// 人物id /// @@ -125,7 +125,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers /// - /// 获取消息页面的聊天记录列表 + /// 聊天-获取消息页面的聊天记录列表 /// /// [HttpGet]