diff --git a/Blog.Core.Api/Blog.Core.Model.xml b/Blog.Core.Api/Blog.Core.Model.xml
index 6bbfd4f..fe62d8e 100644
--- a/Blog.Core.Api/Blog.Core.Model.xml
+++ b/Blog.Core.Api/Blog.Core.Model.xml
@@ -1795,11 +1795,6 @@
修改时间
-
-
- ID
-
-
部门表
diff --git a/Blog.Core.Api/Blog.Core.xml b/Blog.Core.Api/Blog.Core.xml
index 89cb321..faf9d52 100644
--- a/Blog.Core.Api/Blog.Core.xml
+++ b/Blog.Core.Api/Blog.Core.xml
@@ -413,14 +413,14 @@
-
+
获取路由树
-
+
获取路由树
diff --git a/Blog.Core.Api/Controllers/DbFirst/MigrateController.cs b/Blog.Core.Api/Controllers/DbFirst/MigrateController.cs
index 8006d1f..7865cc6 100644
--- a/Blog.Core.Api/Controllers/DbFirst/MigrateController.cs
+++ b/Blog.Core.Api/Controllers/DbFirst/MigrateController.cs
@@ -81,7 +81,7 @@ namespace Blog.Core.Controllers
InitPermissionTree(permissions, permissionsAllList, apiList);
var actionPermissionIds = permissionsAllList.Where(d => d.Id >= filterPermissionId).Select(d => d.Id).ToList();
- List filterPermissionIds = new();
+ List filterPermissionIds = new();
FilterPermissionTree(permissionsAllList, actionPermissionIds, filterPermissionIds);
permissions = permissions.Where(d => filterPermissionIds.Contains(d.Id)).ToList();
@@ -93,10 +93,10 @@ namespace Blog.Core.Controllers
// 1、保持菜单和接口
await SavePermissionTreeAsync(permissions, pms);
- var rid = 0;
- var pid = 0;
- var mid = 0;
- var rpmid = 0;
+ long rid = 0;
+ long pid = 0;
+ long mid = 0;
+ long rpmid = 0;
// 2、保存关系表
foreach (var item in rmps)
@@ -116,8 +116,8 @@ namespace Blog.Core.Controllers
}
}
- pid = (pms.FirstOrDefault(d => d.PidOld == item.PermissionId)?.PidNew).ObjToInt();
- mid = (pms.FirstOrDefault(d => d.MidOld == item.ModuleId)?.MidNew).ObjToInt();
+ pid = (pms.FirstOrDefault(d => d.PidOld == item.PermissionId)?.PidNew).ObjToLong();
+ mid = (pms.FirstOrDefault(d => d.MidOld == item.ModuleId)?.MidNew).ObjToLong();
// 关系
if (rid > 0 && pid > 0)
{
@@ -282,7 +282,7 @@ namespace Blog.Core.Controllers
}
}
- private void FilterPermissionTree(List permissionsAll, List actionPermissionId, List filterPermissionIds)
+ private void FilterPermissionTree(List permissionsAll, List actionPermissionId, List filterPermissionIds)
{
actionPermissionId = actionPermissionId.Distinct().ToList();
var doneIds = permissionsAll.Where(d => actionPermissionId.Contains(d.Id) && d.Pid == 0).Select(d => d.Id).ToList();
@@ -295,7 +295,7 @@ namespace Blog.Core.Controllers
}
}
- private async Task SavePermissionTreeAsync(List permissionsTree, List pms, int permissionId = 0)
+ private async Task SavePermissionTreeAsync(List permissionsTree, List pms, long permissionId = 0)
{
var parendId = permissionId;
@@ -304,9 +304,9 @@ namespace Blog.Core.Controllers
PM pm = new PM();
// 保留原始主键id
pm.PidOld = item.Id;
- pm.MidOld = (item.Module?.Id).ObjToInt();
+ pm.MidOld = (item.Module?.Id).ObjToLong();
- var mid = 0;
+ long mid = 0;
// 接口
if (item.Module != null)
{
@@ -351,9 +351,9 @@ namespace Blog.Core.Controllers
public class PM
{
- public int PidOld { get; set; }
- public int MidOld { get; set; }
- public int PidNew { get; set; }
- public int MidNew { get; set; }
+ public long PidOld { get; set; }
+ public long MidOld { get; set; }
+ public long PidNew { get; set; }
+ public long MidNew { get; set; }
}
}
diff --git a/Blog.Core.Api/Controllers/DepartmentController.cs b/Blog.Core.Api/Controllers/DepartmentController.cs
index bca7bf6..b8174e9 100644
--- a/Blog.Core.Api/Controllers/DepartmentController.cs
+++ b/Blog.Core.Api/Controllers/DepartmentController.cs
@@ -83,7 +83,7 @@ namespace Blog.Core.Api.Controllers
foreach (var item in departments)
{
- List pidarr = new() { };
+ List pidarr = new() { };
var parent = departmentList.FirstOrDefault(d => d.Id == item.Pid);
while (parent != null)
diff --git a/Blog.Core.Api/Controllers/PermissionController.cs b/Blog.Core.Api/Controllers/PermissionController.cs
index 70f8f68..9277a36 100644
--- a/Blog.Core.Api/Controllers/PermissionController.cs
+++ b/Blog.Core.Api/Controllers/PermissionController.cs
@@ -99,7 +99,7 @@ namespace Blog.Core.Controllers
var permissionAll = await _permissionServices.Query(d => d.IsDeleted != true);
foreach (var item in permissionsView)
{
- List pidarr = new List
+ List pidarr = new()
{
item.Pid
};
@@ -177,7 +177,7 @@ namespace Blog.Core.Controllers
foreach (var item in permissions)
{
- List pidarr = new List { };
+ List pidarr = new() { };
var parent = permissionsList.FirstOrDefault(d => d.Id == item.Pid);
while (parent != null)
@@ -353,13 +353,13 @@ namespace Blog.Core.Controllers
///
///
[HttpGet]
- public async Task> GetNavigationBar(int uid)
+ public async Task> GetNavigationBar(long uid)
{
var data = new MessageModel();
var uidInHttpcontext1 = 0;
- var roleIds = new List();
+ var roleIds = new List();
// ids4和jwt切换
if (Permissions.IsUseIds4)
{
@@ -369,13 +369,13 @@ namespace Blog.Core.Controllers
select item.Value).FirstOrDefault().ObjToInt();
roleIds = (from item in _httpContext.HttpContext.User.Claims
where item.Type == "role"
- select item.Value.ObjToInt()).ToList();
+ select item.Value.ObjToLong()).ToList();
}
else
{
// jwt
uidInHttpcontext1 = ((JwtHelper.SerializeJwt(_httpContext.HttpContext.Request.Headers["Authorization"].ObjToString().Replace("Bearer ", "")))?.Uid).ObjToInt();
- roleIds = (await _userRoleServices.Query(d => d.IsDeleted == false && d.UserId == uid)).Select(d => d.RoleId.ObjToInt()).Distinct().ToList();
+ roleIds = (await _userRoleServices.Query(d => d.IsDeleted == false && d.UserId == uid)).Select(d => d.RoleId.ObjToLong()).Distinct().ToList();
}
@@ -383,7 +383,7 @@ namespace Blog.Core.Controllers
{
if (roleIds.Any())
{
- var pids = (await _roleModulePermissionServices.Query(d => d.IsDeleted == false && roleIds.Contains(d.RoleId))).Select(d => d.PermissionId.ObjToInt()).Distinct();
+ var pids = (await _roleModulePermissionServices.Query(d => d.IsDeleted == false && roleIds.Contains(d.RoleId))).Select(d => d.PermissionId.ObjToLong()).Distinct();
if (pids.Any())
{
var rolePermissionMoudles = (await _permissionServices.Query(d => pids.Contains(d.Id))).OrderBy(c => c.OrderSort);
@@ -445,12 +445,12 @@ namespace Blog.Core.Controllers
///
///
[HttpGet]
- public async Task>> GetNavigationBarPro(int uid)
+ public async Task>> GetNavigationBarPro(long uid)
{
var data = new MessageModel>();
var uidInHttpcontext1 = 0;
- var roleIds = new List();
+ var roleIds = new List();
// ids4和jwt切换
if (Permissions.IsUseIds4)
{
@@ -460,13 +460,13 @@ namespace Blog.Core.Controllers
select item.Value).FirstOrDefault().ObjToInt();
roleIds = (from item in _httpContext.HttpContext.User.Claims
where item.Type == "role"
- select item.Value.ObjToInt()).ToList();
+ select item.Value.ObjToLong()).ToList();
}
else
{
// jwt
uidInHttpcontext1 = ((JwtHelper.SerializeJwt(_httpContext.HttpContext.Request.Headers["Authorization"].ObjToString().Replace("Bearer ", "")))?.Uid).ObjToInt();
- roleIds = (await _userRoleServices.Query(d => d.IsDeleted == false && d.UserId == uid)).Select(d => d.RoleId.ObjToInt()).Distinct().ToList();
+ roleIds = (await _userRoleServices.Query(d => d.IsDeleted == false && d.UserId == uid)).Select(d => d.RoleId.ObjToLong()).Distinct().ToList();
}
if (uid > 0 && uid == uidInHttpcontext1)
@@ -474,7 +474,7 @@ namespace Blog.Core.Controllers
if (roleIds.Any())
{
var pids = (await _roleModulePermissionServices.Query(d => d.IsDeleted == false && roleIds.Contains(d.RoleId)))
- .Select(d => d.PermissionId.ObjToInt()).Distinct();
+ .Select(d => d.PermissionId.ObjToLong()).Distinct();
if (pids.Any())
{
var rolePermissionMoudles = (await _permissionServices.Query(d => pids.Contains(d.Id) && d.IsButton == false)).OrderBy(c => c.OrderSort);
diff --git a/Blog.Core.Api/Controllers/UserController.cs b/Blog.Core.Api/Controllers/UserController.cs
index 43f7f61..2798982 100644
--- a/Blog.Core.Api/Controllers/UserController.cs
+++ b/Blog.Core.Api/Controllers/UserController.cs
@@ -103,15 +103,15 @@ namespace Blog.Core.Controllers
return Success(data.ConvertTo(_mapper));
}
- private (string, List) GetFullDepartmentName(List departments, int departmentId)
+ private (string, List) GetFullDepartmentName(List departments, int departmentId)
{
var departmentModel = departments.FirstOrDefault(d => d.Id == departmentId);
if (departmentModel == null)
{
- return ("", new List());
+ return ("", new List());
}
- var pids = departmentModel.CodeRelationship?.TrimEnd(',').Split(',').Select(d => d.ObjToInt()).ToList();
+ var pids = departmentModel.CodeRelationship?.TrimEnd(',').Split(',').Select(d => d.ObjToLong()).ToList();
pids.Add(departmentModel.Id);
var pnams = departments.Where(d => pids.Contains(d.Id)).ToList().Select(d => d.Name).ToArray();
var fullName = string.Join("/", pnams);
diff --git a/Blog.Core.Api/wwwroot/BlogCore.Data.json/Permission.tsv b/Blog.Core.Api/wwwroot/BlogCore.Data.json/Permission.tsv
index d1a5c3f..c026f01 100644
--- a/Blog.Core.Api/wwwroot/BlogCore.Data.json/Permission.tsv
+++ b/Blog.Core.Api/wwwroot/BlogCore.Data.json/Permission.tsv
@@ -2323,28 +2323,28 @@
"Pid": 94,
"Mid": 63
},
- {
- "Id": 114,
- "Code": " ",
- "Name": "推送文字消息",
- "IsButton": 1,
- "IsHide": 0,
- "IskeepAlive": 0,
- "Func": null,
- "OrderSort": 0,
- "Icon": null,
- "Description": null,
- "Enabled": 1,
- "CreateId": 8,
- "CreateBy": "test",
- "CreateTime": "2020-04-23 16:22:11",
- "ModifyId": null,
- "ModifyBy": null,
- "ModifyTime": "2021-09-29 00:00:00",
- "IsDeleted": 0,
- "Pid": 95,
- "Mid": 0
- },
+ //{
+ // "Id": 114,
+ // "Code": " ",
+ // "Name": "推送文字消息",
+ // "IsButton": 1,
+ // "IsHide": 0,
+ // "IskeepAlive": 0,
+ // "Func": null,
+ // "OrderSort": 0,
+ // "Icon": null,
+ // "Description": null,
+ // "Enabled": 1,
+ // "CreateId": 8,
+ // "CreateBy": "test",
+ // "CreateTime": "2020-04-23 16:22:11",
+ // "ModifyId": null,
+ // "ModifyBy": null,
+ // "ModifyTime": "2021-09-29 00:00:00",
+ // "IsDeleted": 0,
+ // "Pid": 95,
+ // "Mid": 0
+ //},
{
"Code": "-",
"Name": "部门权限管理",
diff --git a/Blog.Core.Api/wwwroot/BlogCore.Data.json/RoleModulePermission.tsv b/Blog.Core.Api/wwwroot/BlogCore.Data.json/RoleModulePermission.tsv
index b7923ab..eb72738 100644
--- a/Blog.Core.Api/wwwroot/BlogCore.Data.json/RoleModulePermission.tsv
+++ b/Blog.Core.Api/wwwroot/BlogCore.Data.json/RoleModulePermission.tsv
@@ -1647,7 +1647,7 @@
"ModifyId": null,
"ModifyBy": null,
"ModifyTime": "\/Date(1546272000000+0800)\/",
- "Id": 128
+ "Id": 228
},
{
"IsDeleted": false,
@@ -1658,7 +1658,7 @@
"RoleId": 6,
"ModuleId": 0,
"PermissionId": 114,
- "Id": 129
+ "Id": 229
},
{
"IsDeleted": false,
@@ -1669,7 +1669,7 @@
"RoleId": 6,
"ModuleId": 66,
"PermissionId": 115,
- "Id": 130
+ "Id": 230
},
{
"IsDeleted": false,
@@ -1680,7 +1680,7 @@
"RoleId": 6,
"ModuleId": 70,
"PermissionId": 120,
- "Id": 131
+ "Id": 231
},
{
"IsDeleted": false,
@@ -1691,7 +1691,7 @@
"RoleId": 6,
"ModuleId": 66,
"PermissionId": 116,
- "Id": 132
+ "Id": 232
},
{
"IsDeleted": false,
@@ -1702,6 +1702,6 @@
"RoleId": 4,
"ModuleId": 72,
"PermissionId": 122,
- "Id": 133
+ "Id": 233
}
]
diff --git a/Blog.Core.Common/DB/Aop/SqlsugarAop.cs b/Blog.Core.Common/DB/Aop/SqlsugarAop.cs
index 3d83b00..c1417a5 100644
--- a/Blog.Core.Common/DB/Aop/SqlsugarAop.cs
+++ b/Blog.Core.Common/DB/Aop/SqlsugarAop.cs
@@ -1,4 +1,5 @@
-using Blog.Core.Model.Models.RootTkey;
+using Blog.Core.Model;
+using Blog.Core.Model.Models.RootTkey;
using Blog.Core.Model.Tenants;
using SqlSugar;
using System;
@@ -16,6 +17,13 @@ public static class SqlSugarAop
root.Id = SnowFlakeSingle.Instance.NextId();
}
}
+ if (entityInfo.EntityValue is RootEntityTkey rootEntity)
+ {
+ if (rootEntity.Id == 0)
+ {
+ rootEntity.Id = SnowFlakeSingle.Instance.NextId();
+ }
+ }
if (entityInfo.EntityValue is BaseEntity baseEntity)
{
diff --git a/Blog.Core.Common/Helper/RecursionHelper.cs b/Blog.Core.Common/Helper/RecursionHelper.cs
index 9b27a37..f6f21a3 100644
--- a/Blog.Core.Common/Helper/RecursionHelper.cs
+++ b/Blog.Core.Common/Helper/RecursionHelper.cs
@@ -117,8 +117,8 @@ namespace Blog.Core.Common.Helper
public class PermissionTree
{
- public int value { get; set; }
- public int Pid { get; set; }
+ public long value { get; set; }
+ public long Pid { get; set; }
public string label { get; set; }
public int order { get; set; }
public bool isbtn { get; set; }
@@ -139,8 +139,8 @@ namespace Blog.Core.Common.Helper
public class NavigationBar
{
- public int id { get; set; }
- public int pid { get; set; }
+ public long id { get; set; }
+ public long pid { get; set; }
public int order { get; set; }
public string name { get; set; }
public bool IsHide { get; set; } = false;
@@ -165,8 +165,8 @@ namespace Blog.Core.Common.Helper
public class NavigationBarPro
{
- public int id { get; set; }
- public int parentId { get; set; }
+ public long id { get; set; }
+ public long parentId { get; set; }
public int order { get; set; }
public string name { get; set; }
public bool IsHide { get; set; } = false;
diff --git a/Blog.Core.Common/Seed/DBSeed.cs b/Blog.Core.Common/Seed/DBSeed.cs
index 7b59410..94893c3 100644
--- a/Blog.Core.Common/Seed/DBSeed.cs
+++ b/Blog.Core.Common/Seed/DBSeed.cs
@@ -175,7 +175,11 @@ namespace Blog.Core.Common.Seed
{
var data = JsonConvert.DeserializeObject>(FileHelper.ReadFile(string.Format(SeedDataFolder, "Permission"), Encoding.UTF8), setting);
- myContext.GetEntityDB().InsertRange(data);
+ foreach (var item in data)
+ {
+ Console.WriteLine($"{item.Name}:{item.Id}");
+ myContext.GetEntityDB().Insert(item);
+ }
Console.WriteLine("Table:Permission created success!");
}
else
@@ -190,10 +194,10 @@ namespace Blog.Core.Common.Seed
if (!await myContext.Db.Queryable().AnyAsync())
{
- //var data = JsonConvert.DeserializeObject>(FileHelper.ReadFile(string.Format(SeedDataFolder, "Role"), Encoding.UTF8), setting);
- using var stream = new FileStream(Path.Combine(WebRootPath, "BlogCore.Data.excel", "Role.xlsx"), FileMode.Open);
- var result = await importer.Import(stream);
- var data = result.Data.ToList();
+ var data = JsonConvert.DeserializeObject>(FileHelper.ReadFile(string.Format(SeedDataFolder, "Role"), Encoding.UTF8), setting);
+ //using var stream = new FileStream(Path.Combine(WebRootPath, "BlogCore.Data.excel", "Role.xlsx"), FileMode.Open);
+ //var result = await importer.Import(stream);
+ //var data = result.Data.ToList();
myContext.GetEntityDB().InsertRange(data);
Console.WriteLine("Table:Role created success!");
@@ -212,7 +216,11 @@ namespace Blog.Core.Common.Seed
{
var data = JsonConvert.DeserializeObject>(FileHelper.ReadFile(string.Format(SeedDataFolder, "RoleModulePermission"), Encoding.UTF8), setting);
- myContext.GetEntityDB().InsertRange(data);
+ foreach (var item in data)
+ {
+ Console.WriteLine($"{item.Id}");
+ myContext.GetEntityDB().Insert(item);
+ }
Console.WriteLine("Table:RoleModulePermission created success!");
}
else
@@ -261,10 +269,7 @@ namespace Blog.Core.Common.Seed
if (!await myContext.Db.Queryable().AnyAsync())
{
- //var data = JsonConvert.DeserializeObject>(FileHelper.ReadFile(string.Format(SeedDataFolder, "UserRole"), Encoding.UTF8), setting);
- using var stream = new FileStream(Path.Combine(WebRootPath, "BlogCore.Data.excel", "UserRole.xlsx"), FileMode.Open);
- var result = await importer.Import(stream);
- var data = result.Data.ToList();
+ var data = JsonConvert.DeserializeObject>(FileHelper.ReadFile(string.Format(SeedDataFolder, "UserRole"), Encoding.UTF8), setting);
myContext.GetEntityDB().InsertRange(data);
Console.WriteLine("Table:UserRole created success!");
@@ -281,10 +286,7 @@ namespace Blog.Core.Common.Seed
if (!await myContext.Db.Queryable().AnyAsync())
{
- //var data = JsonConvert.DeserializeObject>(FileHelper.ReadFile(string.Format(SeedDataFolder, "sysUserInfo"), Encoding.UTF8), setting);
- using var stream = new FileStream(Path.Combine(WebRootPath, "BlogCore.Data.excel", "SysUserInfo.xlsx"), FileMode.Open);
- var result = await importer.Import(stream);
- var data = result.Data.ToList();
+ var data = JsonConvert.DeserializeObject>(FileHelper.ReadFile(string.Format(SeedDataFolder, "sysUserInfo"), Encoding.UTF8), setting);
myContext.GetEntityDB().InsertRange(data);
Console.WriteLine("Table:sysUserInfo created success!");
diff --git a/Blog.Core.IServices/IRoleModulePermissionServices.cs b/Blog.Core.IServices/IRoleModulePermissionServices.cs
index 2253247..2a5c734 100644
--- a/Blog.Core.IServices/IRoleModulePermissionServices.cs
+++ b/Blog.Core.IServices/IRoleModulePermissionServices.cs
@@ -21,6 +21,6 @@ namespace Blog.Core.IServices
/// ˵
/// ӿ
///
- Task UpdateModuleId(int permissionId, int moduleId);
+ Task UpdateModuleId(long permissionId, long moduleId);
}
}
diff --git a/Blog.Core.Model/Models/AccessTrendLog.cs b/Blog.Core.Model/Models/AccessTrendLog.cs
index 4a87b13..fd6dbae 100644
--- a/Blog.Core.Model/Models/AccessTrendLog.cs
+++ b/Blog.Core.Model/Models/AccessTrendLog.cs
@@ -6,7 +6,7 @@ namespace Blog.Core.Model.Models
///
/// 用户访问趋势日志
///
- public class AccessTrendLog : RootEntityTkey
+ public class AccessTrendLog : RootEntityTkey
{
///
/// 用户
diff --git a/Blog.Core.Model/Models/Advertisement.cs b/Blog.Core.Model/Models/Advertisement.cs
index c2babd7..3b11b21 100644
--- a/Blog.Core.Model/Models/Advertisement.cs
+++ b/Blog.Core.Model/Models/Advertisement.cs
@@ -3,7 +3,7 @@ using System;
namespace Blog.Core.Model.Models
{
- public class Advertisement : RootEntityTkey
+ public class Advertisement : RootEntityTkey
{
///
diff --git a/Blog.Core.Model/Models/BlogArticle.cs b/Blog.Core.Model/Models/BlogArticle.cs
index 66f05bd..8b75c8d 100644
--- a/Blog.Core.Model/Models/BlogArticle.cs
+++ b/Blog.Core.Model/Models/BlogArticle.cs
@@ -13,8 +13,8 @@ namespace Blog.Core.Model.Models
/// 主键
///
/// 这里之所以没用RootEntity,是想保持和之前的数据库一致,主键是bID,不是Id
- [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = true)]
- public int bID { get; set; }
+ [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = false)]
+ public long bID { get; set; }
///
/// 创建人
diff --git a/Blog.Core.Model/Models/BlogArticleComment.cs b/Blog.Core.Model/Models/BlogArticleComment.cs
index 0801086..519fb00 100644
--- a/Blog.Core.Model/Models/BlogArticleComment.cs
+++ b/Blog.Core.Model/Models/BlogArticleComment.cs
@@ -7,7 +7,7 @@ namespace Blog.Core.Model.Models;
///
public class BlogArticleComment : RootEntityTkey
{
- public int bID { get; set; }
+ public long bID { get; set; }
public string Comment { get; set; }
diff --git a/Blog.Core.Model/Models/Department.cs b/Blog.Core.Model/Models/Department.cs
index 3583bcf..424bcf4 100644
--- a/Blog.Core.Model/Models/Department.cs
+++ b/Blog.Core.Model/Models/Department.cs
@@ -7,7 +7,7 @@ namespace Blog.Core.Model.Models
///
/// 部门表
///
- public class Department : DepartmentRoot
+ public class Department : DepartmentRoot
{
///
/// Desc:部门关系编码
diff --git a/Blog.Core.Model/Models/GblLogAudit.cs b/Blog.Core.Model/Models/GblLogAudit.cs
index 4b1bd9c..2cecce8 100644
--- a/Blog.Core.Model/Models/GblLogAudit.cs
+++ b/Blog.Core.Model/Models/GblLogAudit.cs
@@ -12,8 +12,8 @@ namespace Blog.Core.Model.Models
///
///ID
///
- [SugarColumn(ColumnDescription = "ID", IsNullable = false, IsPrimaryKey = true, IsIdentity = true)]
- public int Id { get; set; }
+ [SugarColumn(ColumnDescription = "ID", IsNullable = false, IsPrimaryKey = true, IsIdentity = false)]
+ public long Id { get; set; }
///
///HttpContext.TraceIdentifier 事件链路ID(获取或设置一个唯一标识符,用于在跟踪日志中表示此请求。)
diff --git a/Blog.Core.Model/Models/Guestbook.cs b/Blog.Core.Model/Models/Guestbook.cs
index d1f671c..0cd5dce 100644
--- a/Blog.Core.Model/Models/Guestbook.cs
+++ b/Blog.Core.Model/Models/Guestbook.cs
@@ -3,13 +3,13 @@ using System;
namespace Blog.Core.Model.Models
{
- public class Guestbook:RootEntityTkey
+ public class Guestbook : RootEntityTkey
{
-
+
/// 博客ID
///
///
- public int? blogId { get; set; }
+ public long? blogId { get; set; }
/// 创建时间
///
///
diff --git a/Blog.Core.Model/Models/Modules.cs b/Blog.Core.Model/Models/Modules.cs
index b62c0a4..6e41aaa 100644
--- a/Blog.Core.Model/Models/Modules.cs
+++ b/Blog.Core.Model/Models/Modules.cs
@@ -6,7 +6,7 @@ namespace Blog.Core.Model.Models
///
/// 接口API地址信息表
///
- public class Modules : ModulesRoot
+ public class Modules : ModulesRoot
{
public Modules()
{
diff --git a/Blog.Core.Model/Models/OperateLog.cs b/Blog.Core.Model/Models/OperateLog.cs
index 4086781..3c2fb54 100644
--- a/Blog.Core.Model/Models/OperateLog.cs
+++ b/Blog.Core.Model/Models/OperateLog.cs
@@ -6,7 +6,7 @@ namespace Blog.Core.Model.Models
///
/// 日志记录
///
- public class OperateLog : RootEntityTkey
+ public class OperateLog : RootEntityTkey
{
///
diff --git a/Blog.Core.Model/Models/PasswordLib.cs b/Blog.Core.Model/Models/PasswordLib.cs
index 2b43c26..b8b633d 100644
--- a/Blog.Core.Model/Models/PasswordLib.cs
+++ b/Blog.Core.Model/Models/PasswordLib.cs
@@ -7,11 +7,11 @@ namespace Blog.Core.Model.Models
/// 密码库表
///
[SugarTable("PasswordLib", "密码库表")]//('数据库表名','数据库表备注')
- [TenantAttribute("WMBLOG_MYSQL_2")] //('代表是哪个数据库,名字是appsettings.json 的 ConnId')
+ [Tenant("WMBLOG_MYSQL_2")] //('代表是哪个数据库,名字是appsettings.json 的 ConnId')
public class PasswordLib
{
- [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = true)]
- public int PLID { get; set; }
+ [SugarColumn(IsNullable = false, IsPrimaryKey = true, IsIdentity = false)]
+ public long PLID { get; set; }
///
///获取或设置是否禁用,逻辑上的删除,非物理删除
diff --git a/Blog.Core.Model/Models/Permission.cs b/Blog.Core.Model/Models/Permission.cs
index c650cb5..deece0c 100644
--- a/Blog.Core.Model/Models/Permission.cs
+++ b/Blog.Core.Model/Models/Permission.cs
@@ -7,7 +7,7 @@ namespace Blog.Core.Model.Models
///
/// 路由菜单表
///
- public class Permission : PermissionRoot
+ public class Permission : PermissionRoot
{
public Permission()
{
diff --git a/Blog.Core.Model/Models/Role.cs b/Blog.Core.Model/Models/Role.cs
index e34ccdd..1357afb 100644
--- a/Blog.Core.Model/Models/Role.cs
+++ b/Blog.Core.Model/Models/Role.cs
@@ -6,7 +6,7 @@ namespace Blog.Core.Model.Models
///
/// 角色表
///
- public class Role : RootEntityTkey
+ public class Role : RootEntityTkey
{
public Role()
{
diff --git a/Blog.Core.Model/Models/RoleModulePermission.cs b/Blog.Core.Model/Models/RoleModulePermission.cs
index 13d82a8..482b9b4 100644
--- a/Blog.Core.Model/Models/RoleModulePermission.cs
+++ b/Blog.Core.Model/Models/RoleModulePermission.cs
@@ -6,7 +6,7 @@ namespace Blog.Core.Model.Models
///
/// 按钮跟权限关联表
///
- public class RoleModulePermission : RoleModulePermissionRoot
+ public class RoleModulePermission : RoleModulePermissionRoot
{
public RoleModulePermission()
{
diff --git a/Blog.Core.Model/Models/RootEntity.cs b/Blog.Core.Model/Models/RootEntity.cs
deleted file mode 100644
index d3874bb..0000000
--- a/Blog.Core.Model/Models/RootEntity.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using SqlSugar;
-
-namespace Blog.Core.Model
-{
- public class RootEntity
- {
- ///
- /// ID
- ///
- [SugarColumn(IsNullable = false, IsPrimaryKey = true)]
- public int Id { get; set; }
-
-
- }
-}
\ No newline at end of file
diff --git a/Blog.Core.Model/Models/TasksLog.cs b/Blog.Core.Model/Models/TasksLog.cs
index b4317c9..c79e807 100644
--- a/Blog.Core.Model/Models/TasksLog.cs
+++ b/Blog.Core.Model/Models/TasksLog.cs
@@ -6,12 +6,12 @@ namespace Blog.Core.Model.Models
///
/// 任务日志表
///
- public class TasksLog : RootEntityTkey
+ public class TasksLog : RootEntityTkey
{
///
/// 任务ID
///
- public int JobId { get; set; }
+ public long JobId { get; set; }
///
/// 任务耗时
///
diff --git a/Blog.Core.Model/Models/TasksQz.cs b/Blog.Core.Model/Models/TasksQz.cs
index 1c07b60..b029a99 100644
--- a/Blog.Core.Model/Models/TasksQz.cs
+++ b/Blog.Core.Model/Models/TasksQz.cs
@@ -8,7 +8,7 @@ namespace Blog.Core.Model.Models
///
/// 任务计划表
///
- public class TasksQz : RootEntityTkey
+ public class TasksQz : RootEntityTkey
{
///
/// 任务名称
diff --git a/Blog.Core.Model/Models/TestModels.cs b/Blog.Core.Model/Models/TestModels.cs
index f5fa7dc..8a8d123 100644
--- a/Blog.Core.Model/Models/TestModels.cs
+++ b/Blog.Core.Model/Models/TestModels.cs
@@ -5,9 +5,9 @@
{
public string moduleName { get; set; }
public string permName { get; set; }
- public int rid { get; set; }
- public int mid { get; set; }
- public int? pid { get; set; }
+ public long rid { get; set; }
+ public long mid { get; set; }
+ public long? pid { get; set; }
}
}
diff --git a/Blog.Core.Model/Models/Topic.cs b/Blog.Core.Model/Models/Topic.cs
index 16bf7da..e57bd56 100644
--- a/Blog.Core.Model/Models/Topic.cs
+++ b/Blog.Core.Model/Models/Topic.cs
@@ -7,7 +7,7 @@ namespace Blog.Core.Model.Models
///
/// Tibug 类别
///
- public class Topic : RootEntityTkey
+ public class Topic : RootEntityTkey
{
public Topic()
{
diff --git a/Blog.Core.Model/Models/TopicDetail.cs b/Blog.Core.Model/Models/TopicDetail.cs
index 87e16eb..1a98f3a 100644
--- a/Blog.Core.Model/Models/TopicDetail.cs
+++ b/Blog.Core.Model/Models/TopicDetail.cs
@@ -6,7 +6,7 @@ namespace Blog.Core.Model.Models
///
/// Tibug 博文
///
- public class TopicDetail : TopicDetailRoot
+ public class TopicDetail : TopicDetailRoot
{
public TopicDetail()
{
diff --git a/Blog.Core.Model/Models/UserRole.cs b/Blog.Core.Model/Models/UserRole.cs
index 996eea2..7ed9c6b 100644
--- a/Blog.Core.Model/Models/UserRole.cs
+++ b/Blog.Core.Model/Models/UserRole.cs
@@ -6,11 +6,11 @@ namespace Blog.Core.Model.Models
///
/// 用户跟角色关联表
///
- public class UserRole : UserRoleRoot
+ public class UserRole : UserRoleRoot
{
public UserRole() { }
- public UserRole(int uid, int rid)
+ public UserRole(long uid, long rid)
{
UserId = uid;
RoleId = rid;
@@ -31,7 +31,7 @@ namespace Blog.Core.Model.Models
/// 创建ID
///
[SugarColumn(IsNullable = true)]
- public int? CreateId { get; set; }
+ public long? CreateId { get; set; }
///
/// 创建者
///
diff --git a/Blog.Core.Model/Models/sysUserInfo.cs b/Blog.Core.Model/Models/sysUserInfo.cs
index 366b229..2a417a1 100644
--- a/Blog.Core.Model/Models/sysUserInfo.cs
+++ b/Blog.Core.Model/Models/sysUserInfo.cs
@@ -9,7 +9,7 @@ namespace Blog.Core.Model.Models
///
//[SugarTable("SysUserInfo")]
[SugarTable("SysUserInfo", "用户表")] //('数据库表名','数据库表备注')
- public class SysUserInfo : SysUserInfoRoot
+ public class SysUserInfo : SysUserInfoRoot
{
public SysUserInfo()
{
@@ -133,7 +133,7 @@ namespace Blog.Core.Model.Models
public List RoleNames { get; set; }
[SugarColumn(IsIgnore = true)]
- public List Dids { get; set; }
+ public List Dids { get; set; }
[SugarColumn(IsIgnore = true)]
public string DepartmentName { get; set; }
diff --git a/Blog.Core.Model/ViewModels/BlogViewModels.cs b/Blog.Core.Model/ViewModels/BlogViewModels.cs
index f959270..411a8ef 100644
--- a/Blog.Core.Model/ViewModels/BlogViewModels.cs
+++ b/Blog.Core.Model/ViewModels/BlogViewModels.cs
@@ -34,7 +34,7 @@ namespace Blog.Core.Model.ViewModels
///
/// 上一篇id
///
- public int previousID { get; set; }
+ public long previousID { get; set; }
///
/// 下一篇
@@ -44,7 +44,7 @@ namespace Blog.Core.Model.ViewModels
///
/// 下一篇id
///
- public int nextID { get; set; }
+ public long nextID { get; set; }
/// 类别
///
diff --git a/Blog.Core.Repository/IRoleModulePermissionRepository.cs b/Blog.Core.Repository/IRoleModulePermissionRepository.cs
index c66448f..9ba3d4e 100644
--- a/Blog.Core.Repository/IRoleModulePermissionRepository.cs
+++ b/Blog.Core.Repository/IRoleModulePermissionRepository.cs
@@ -19,6 +19,6 @@ namespace Blog.Core.IRepository
/// 菜单主键
/// 接口主键
///
- Task UpdateModuleId(int permissionId, int moduleId);
+ Task UpdateModuleId(long permissionId, long moduleId);
}
}
diff --git a/Blog.Core.Repository/RoleModulePermissionRepository.cs b/Blog.Core.Repository/RoleModulePermissionRepository.cs
index 1cb21eb..9438ff5 100644
--- a/Blog.Core.Repository/RoleModulePermissionRepository.cs
+++ b/Blog.Core.Repository/RoleModulePermissionRepository.cs
@@ -99,7 +99,7 @@ namespace Blog.Core.Repository
/// 菜单主键
/// 接口主键
///
- public async Task UpdateModuleId(int permissionId, int moduleId)
+ public async Task UpdateModuleId(long permissionId, long moduleId)
{
await Db.Updateable(it => it.ModuleId == moduleId).Where(
it => it.PermissionId == permissionId).ExecuteCommandAsync();
diff --git a/Blog.Core.Services/RoleModulePermissionServices.cs b/Blog.Core.Services/RoleModulePermissionServices.cs
index c0248e1..d3834f8 100644
--- a/Blog.Core.Services/RoleModulePermissionServices.cs
+++ b/Blog.Core.Services/RoleModulePermissionServices.cs
@@ -83,7 +83,7 @@ namespace Blog.Core.Services
/// 菜单主键
/// 接口主键
///
- public async Task UpdateModuleId(int permissionId, int moduleId)
+ public async Task UpdateModuleId(long permissionId, long moduleId)
{
await _dal.UpdateModuleId(permissionId, moduleId);
}