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-08-05 17:00:20 +08:00
parent 0fc00bcab3
commit dc5bf3ad88
29 changed files with 65 additions and 48 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 == Guid.Empty)
{
entity.TenantId = TenantInfo.TenantId;
}
}
}
return base.SaveChanges();
}

1
src/0-core/HuanMeng.MiaoYu.Code/Chat/ChatBLL.cs
View File

@ -78,7 +78,6 @@ namespace HuanMeng.MiaoYu.Code.Chat
list.Add(chat);
return new BaseResponse<List<ChatMessageDto>>(ResonseCode.Success, "", list);
}
//if(timeStamp.)
var userChatSession = await Dao.daoDbMiaoYu.context.T_User_Chat.Where(it => it.CharacterId == characterId && it.UserId == _UserId && !it.IsDelete).FirstOrDefaultAsync();
if (userChatSession == null)
{

2
src/0-core/HuanMeng.MiaoYu.Code/Users/UserAccount/PhoneAccount/PhoneAccountLogin.cs
View File

@ -81,7 +81,7 @@ namespace HuanMeng.MiaoYu.Code.Users.UserAccount.PhoneAccount
Key = phone,
Remarks = "登录验证码",
VerificationType = 0,
TenantId = dao.daoDbMiaoYu.context?.TenantInfo?.TenantId ?? Guid.Empty,
// TenantId = dao.daoDbMiaoYu.context?.TenantInfo?.TenantId ?? Guid.Empty,
};
dao.daoDbMiaoYu.Add(t_Verification_Code);
dao.daoDbMiaoYu.context.SaveChanges();

5
src/0-core/HuanMeng.MiaoYu.Model/CodeTemplates/EFCore/EntityType.t4
View File

@ -77,10 +77,7 @@ public partial class <#= EntityType.Name #>: MultiTenantEntity
if(property.Name=="TenantId"){
#>
/// <summary>
/// <#= code.XmlComment(property.GetComment(), indent: 1) #>
/// </summary>
public override Guid TenantId { get; set; }
public override Guid TenantId { get; set; }
<#
continue;
}

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Category_Child_Menu.cs
View File

@ -53,4 +53,5 @@ public partial class T_Category_Child_Menu: MultiTenantEntity
/// </summary>
public string? SubTitle { get; set; }
}
public override Guid TenantId { get; set; }
}

9
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
namespace HuanMeng.MiaoYu.Model.DbSqlServer.Db_MiaoYu;
@ -7,10 +7,6 @@ namespace HuanMeng.MiaoYu.Model.DbSqlServer.Db_MiaoYu;
/// </summary>
public partial class T_Character: MultiTenantEntity
{
/// <summary>
/// 租户
/// </summary>
public override Guid TenantId { get; set; }
/// <summary>
/// 人物id
/// </summary>
@ -26,7 +22,8 @@ public partial class T_Character: MultiTenantEntity
/// </summary>
public string? Biography { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 开场白，剧情
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character_Label.cs
View File

@ -12,7 +12,8 @@ public partial class T_Character_Label: MultiTenantEntity
/// </summary>
public int Id { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 标签名称
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character_Label_Relation.cs
View File

@ -12,7 +12,8 @@ public partial class T_Character_Label_Relation: MultiTenantEntity
/// </summary>
public int Id { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 人物Id
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character_Personality.cs
View File

@ -12,7 +12,8 @@ public partial class T_Character_Personality: MultiTenantEntity
/// </summary>
public int Id { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 性格名称
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character_Personality_Relation.cs
View File

@ -12,7 +12,8 @@ public partial class T_Character_Personality_Relation: MultiTenantEntity
/// </summary>
public int Id { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 性格Id
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character_Type.cs
View File

@ -27,7 +27,8 @@ public partial class T_Character_Type: MultiTenantEntity
/// </summary>
public DateTime UpdateTime { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 分类页不显示
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character_Type_Intimacy.cs
View File

@ -12,7 +12,8 @@ public partial class T_Character_Type_Intimacy: MultiTenantEntity
/// </summary>
public int Id { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 列表Id
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character_User_Intimacy.cs
View File

@ -12,7 +12,8 @@ public partial class T_Character_User_Intimacy: MultiTenantEntity
/// </summary>
public int Id { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 人物Id
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Chat.cs
View File

@ -12,7 +12,8 @@ public partial class T_Chat: MultiTenantEntity
/// </summary>
public int Id { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 聊天内容
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_CoinPrices_Config.cs
View File

@ -12,7 +12,8 @@ public partial class T_CoinPrices_Config: MultiTenantEntity
/// </summary>
public int Id { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 金币数量
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Image_Config.cs
View File

@ -9,7 +9,8 @@ public partial class T_Image_Config: MultiTenantEntity
{
public int Id { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 图片Id
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Model_Config.cs
View File

@ -49,7 +49,8 @@ public partial class T_Model_Config: MultiTenantEntity
/// </summary>
public DateTime UpdateTime { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// system上下文模板
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Orders.cs
View File

@ -12,7 +12,8 @@ public partial class T_Orders: MultiTenantEntity
/// </summary>
public int Id { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 用户id
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_ShoppingMall.cs
View File

@ -42,7 +42,8 @@ public partial class T_ShoppingMall: MultiTenantEntity
/// </summary>
public DateTime? UpdateTime { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 商品上架时间
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_TransactionRecord.cs
View File

@ -52,4 +52,5 @@ public partial class T_TransactionRecord: MultiTenantEntity
/// </summary>
public DateTime? UpdateTime { get; set; }
}
public override Guid TenantId { get; set; }
}

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User.cs
View File

@ -12,7 +12,8 @@ public partial class T_User: MultiTenantEntity
/// </summary>
public int Id { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 用户昵称
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User_Chat.cs
View File

@ -29,7 +29,8 @@ public partial class T_User_Chat: MultiTenantEntity
/// </summary>
public int ModelConfigId { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 用户Id
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User_Currency.cs
View File

@ -39,4 +39,5 @@ public partial class T_User_Currency: MultiTenantEntity
/// </summary>
public int UserId { get; set; }
}
public override Guid TenantId { get; set; }
}

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User_Currency_Log.cs
View File

@ -9,7 +9,8 @@ public partial class T_User_Currency_Log: MultiTenantEntity
{
public int Id { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 用户
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User_Data.cs
View File

@ -17,7 +17,8 @@ public partial class T_User_Data: MultiTenantEntity
/// </summary>
public int UserId { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 用户昵称，需要和主表保持一致
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User_MemoryCard.cs
View File

@ -9,7 +9,8 @@ public partial class T_User_MemoryCard: MultiTenantEntity
{
public int Id { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 记忆卡名称
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User_Phone_Account.cs
View File

@ -12,7 +12,8 @@ public partial class T_User_Phone_Account: MultiTenantEntity
/// </summary>
public int Id { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 用户Id
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_User_Prop.cs
View File

@ -17,7 +17,8 @@ public partial class T_User_Prop: MultiTenantEntity
/// </summary>
public int UserId { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 道具Id
/// </summary>

3
src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Verification_Code.cs
View File

@ -42,7 +42,8 @@ public partial class T_Verification_Code: MultiTenantEntity
/// </summary>
public string? Remarks { get; set; }
public override Guid TenantId { get; set; }
/// <summary>
/// 0手机，1邮箱
/// </summary>