修改返回类型
This commit is contained in:
parent
0df30ce492
commit
5602837980
|
|
@ -59,19 +59,19 @@ namespace HuanMeng.DotNetCore.MultiTenant
|
||||||
{
|
{
|
||||||
if (TenantInfo?.TenantId != null)
|
if (TenantInfo?.TenantId != null)
|
||||||
{
|
{
|
||||||
var entries = ChangeTracker.Entries()
|
//var entries = ChangeTracker.Entries()
|
||||||
.Where(e => e.Entity is IMultiTenantEntity &&
|
//.Where(e => e.Entity is IMultiTenantEntity &&
|
||||||
(e.State == EntityState.Added || e.State == EntityState.Modified))
|
// (e.State == EntityState.Added || e.State == EntityState.Modified))
|
||||||
.Select(e => e.Entity as IMultiTenantEntity)
|
//.Select(e => e.Entity as IMultiTenantEntity)
|
||||||
.ToList();
|
//.ToList();
|
||||||
|
|
||||||
foreach (var entity in entries)
|
//foreach (var entity in entries)
|
||||||
{
|
//{
|
||||||
if (entity?.TenantId == null)
|
// if (entity?.TenantId == null)
|
||||||
{
|
// {
|
||||||
entity.TenantId = TenantInfo.TenantId;
|
// entity.TenantId = TenantInfo.TenantId;
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
}
|
}
|
||||||
return base.SaveChanges();
|
return base.SaveChanges();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ namespace HuanMeng.MiaoYu.Code.Character
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 首页获取角色列表
|
/// 首页-获取角色列表
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public async Task<BaseResponse<List<CharacterInfoDto>>> GetHomeCharacter(RequestCharacterInfoPage requestCharacterInfo)
|
public async Task<BaseResponse<List<CharacterInfoDto>>> GetHomeCharacter(RequestCharacterInfoPage requestCharacterInfo)
|
||||||
|
|
@ -58,7 +58,7 @@ namespace HuanMeng.MiaoYu.Code.Character
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取角色详情
|
/// 首页-获取角色详情
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="requestCharacterInfo"></param>
|
/// <param name="requestCharacterInfo"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
|
|
@ -82,18 +82,18 @@ namespace HuanMeng.MiaoYu.Code.Character
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取全部角色的Id
|
/// 首页-获取全部角色的Id
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public BaseResponse<List<int>> GetCharacters()
|
public BaseResponse<List<CharacterId>> GetCharacters()
|
||||||
{
|
{
|
||||||
Random rng = new Random();
|
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)
|
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
20
src/0-core/HuanMeng.MiaoYu.Model/Dto/Chat/CharacterId.cs
Normal 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; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -31,7 +31,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 发送手机号验证码
|
/// 登录-发送手机号验证码
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="phone"></param>
|
/// <param name="phone"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
|
|
@ -47,7 +47,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
|
||||||
return await userBLL.SendPhoneNumber(phone.PhoneNumber);
|
return await userBLL.SendPhoneNumber(phone.PhoneNumber);
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 登录
|
/// 登录- 登录
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="requestLoginModel"></param>
|
/// <param name="requestLoginModel"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
|
|
@ -60,7 +60,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
/// 用户-用户
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[Authorize]
|
[Authorize]
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取分类列表
|
/// 发现-获取分类列表
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
|
|
@ -37,7 +37,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取类型中的角色信息
|
/// 发现-获取类型中的角色信息
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
|
|
@ -49,7 +49,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取推荐页数据
|
/// 发现-获取推荐页数据
|
||||||
/// 返回的data是一个数组,当数组中的对象type为banner,data类型看201,当数组中的对象type为tuijian、xiaoshuo时,data类型看202
|
/// 返回的data是一个数组,当数组中的对象type为banner,data类型看201,当数组中的对象type为tuijian、xiaoshuo时,data类型看202
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
|
|
|
||||||
|
|
@ -32,12 +32,12 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取角色Id
|
/// 首页 - 获取角色Id
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
[AllowAnonymous]
|
[AllowAnonymous]
|
||||||
public BaseResponse<List<int>> GetCharacterIdList()
|
public BaseResponse<List<CharacterId>> GetCharacterIdList()
|
||||||
{
|
{
|
||||||
CharacterBLL characterBLL = new CharacterBLL(ServiceProvider);
|
CharacterBLL characterBLL = new CharacterBLL(ServiceProvider);
|
||||||
var obj = characterBLL.GetCharacters();
|
var obj = characterBLL.GetCharacters();
|
||||||
|
|
@ -47,7 +47,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取角色人物信息
|
/// 首页 - 获取角色人物信息
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
|
|
@ -63,7 +63,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取聊天记录
|
/// 聊天-获取聊天记录
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="characterId"></param>
|
/// <param name="characterId"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
|
|
@ -79,7 +79,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 发送消息接口
|
/// 聊天-发送消息接口
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="requestMessage"></param>
|
/// <param name="requestMessage"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
|
|
@ -91,7 +91,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 删除聊天记录
|
/// 聊天-删除聊天记录
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="delChat"></param>
|
/// <param name="delChat"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
|
|
@ -110,7 +110,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 清空聊天记录
|
/// 聊天-清空聊天记录
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="characterId">人物id</param>
|
/// <param name="characterId">人物id</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
|
|
@ -125,7 +125,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取消息页面的聊天记录列表
|
/// 聊天-获取消息页面的聊天记录列表
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user