server/HuanMengProject
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 53 Wiki Activity

修改返回类型

Browse Source
This commit is contained in:
zpc 2024-07-16 14:42:25 +08:00
parent 0df30ce492
commit 5602837980
6 changed files with 53 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/0-core/HuanMeng.DotNetCore/MultiTenant/MultiTenantDbContext.cs
View File

@ -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();
}

14
src/0-core/HuanMeng.MiaoYu.Code/Character/CharacterBLL.cs
View File

@ -26,7 +26,7 @@ namespace HuanMeng.MiaoYu.Code.Character
}
/// <summary>
/// 首页获取角色列表
/// 首页-获取角色列表
/// </summary>
/// <returns></returns>
public async Task<BaseResponse<List<CharacterInfoDto>>> GetHomeCharacter(RequestCharacterInfoPage requestCharacterInfo)
@ -58,7 +58,7 @@ namespace HuanMeng.MiaoYu.Code.Character
/// <summary>
/// 获取角色详情
/// 首页-获取角色详情
/// </summary>
/// <param name="requestCharacterInfo"></param>
/// <returns></returns>
@ -82,18 +82,18 @@ namespace HuanMeng.MiaoYu.Code.Character
}
/// <summary>
/// 获取全部角色的Id
/// 首页-获取全部角色的Id
/// </summary>
/// <returns></returns>
public BaseResponse<List<int>> GetCharacters()
public BaseResponse<List<CharacterId>> 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<int>();
charactersIds = new List<CharacterId>();
}
return new BaseResponse<List<int>>(ResonseCode.Success, "", charactersIds);
return new BaseResponse<List<CharacterId>>(ResonseCode.Success, "", charactersIds);
}
}
}

20
src/0-core/HuanMeng.MiaoYu.Model/Dto/Chat/CharacterId.cs Normal file
View File

@ -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
{
/// <summary>
/// 角色Id
/// </summary>
public class CharacterId
{
/// <summary>
/// 角色Id
/// </summary>
public int Id { get; set; }
}
}

6
src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/AccountController.cs
View File

@ -31,7 +31,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
}
/// <summary>
/// 发送手机号验证码
/// 登录-发送手机号验证码
/// </summary>
/// <param name="phone"></param>
/// <returns></returns>
@ -47,7 +47,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
return await userBLL.SendPhoneNumber(phone.PhoneNumber);
}
/// <summary>
/// 登录
/// 登录- 登录
/// </summary>
/// <param name="requestLoginModel"></param>
/// <returns></returns>
@ -60,7 +60,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
}
/// <summary>
///
/// 用户-用户
/// </summary>
/// <returns></returns>
[Authorize]

6
src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/CategoryController.cs
View File

@ -25,7 +25,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
}
/// <summary>
/// 获取分类列表
/// 发现-获取分类列表
/// </summary>
/// <returns></returns>
[HttpGet]
@ -37,7 +37,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
}
/// <summary>
/// 获取类型中的角色信息
/// 发现-获取类型中的角色信息
/// </summary>
/// <returns></returns>
[HttpGet]
@ -49,7 +49,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
}
/// <summary>
/// 获取推荐页数据
/// 发现-获取推荐页数据
/// 返回的data是一个数组，当数组中的对象type为banner，data类型看201，当数组中的对象type为tuijian、xiaoshuo时，data类型看202
/// </summary>
/// <returns></returns>

16
src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/ChatController.cs
View File

@ -32,12 +32,12 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
}
/// <summary>
/// 获取角色Id
/// 首页 - 获取角色Id
/// </summary>
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public BaseResponse<List<int>> GetCharacterIdList()
public BaseResponse<List<CharacterId>> GetCharacterIdList()
{
CharacterBLL characterBLL = new CharacterBLL(ServiceProvider);
var obj = characterBLL.GetCharacters();
@ -47,7 +47,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
/// <summary>
/// 获取角色人物信息
/// 首页 - 获取角色人物信息
/// </summary>
/// <returns></returns>
[HttpGet]
@ -63,7 +63,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
}
/// <summary>
/// 获取聊天记录
/// 聊天-获取聊天记录
/// </summary>
/// <param name="characterId"></param>
/// <returns></returns>
@ -79,7 +79,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
}
/// <summary>
/// 发送消息接口
/// 聊天-发送消息接口
/// </summary>
/// <param name="requestMessage"></param>
/// <returns></returns>
@ -91,7 +91,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
return obj;
}
/// <summary>
/// 删除聊天记录
/// 聊天-删除聊天记录
/// </summary>
/// <param name="delChat"></param>
/// <returns></returns>
@ -110,7 +110,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
}
/// <summary>
/// 清空聊天记录
/// 聊天-清空聊天记录
/// </summary>
/// <param name="characterId">人物id</param>
/// <returns></returns>
@ -125,7 +125,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
/// <summary>
/// 获取消息页面的聊天记录列表
/// 聊天-获取消息页面的聊天记录列表
/// </summary>
/// <returns></returns>
[HttpGet]