King_Tech/Blog.Core
King_Tech/Blog.Core
2
0
Fork 0
mirror of https://github.com/anjoy8/Blog.Core.git synced 2024-09-20 23:48:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: ✈️ change id to long

Browse Source
This commit is contained in:
anjoy8 2023-03-30 15:49:30 +08:00
parent d1288b103e
commit 7b1f3a4c74
37 changed files with 130 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Blog.Core.Api/Blog.Core.Model.xml
View File

@ -1795,11 +1795,6 @@
修改时间
</summary>
</member>
<member name="P:Blog.Core.Model.RootEntity.Id">
<summary>
ID
</summary>
</member>
<member name="T:Blog.Core.Model.DepartmentRoot`1">
<summary>
部门表

4
Blog.Core.Api/Blog.Core.xml
View File

@ -413,14 +413,14 @@
<param name="needbtn"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.PermissionController.GetNavigationBar(System.Int32)">
<member name="M:Blog.Core.Controllers.PermissionController.GetNavigationBar(System.Int64)">
<summary>
获取路由树
</summary>
<param name="uid"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.PermissionController.GetNavigationBarPro(System.Int32)">
<member name="M:Blog.Core.Controllers.PermissionController.GetNavigationBarPro(System.Int64)">
<summary>
获取路由树
</summary>

30
Blog.Core.Api/Controllers/DbFirst/MigrateController.cs
View File

@ -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<int> filterPermissionIds = new();
List<long> 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<Permission> permissionsAll, List<int> actionPermissionId, List<int> filterPermissionIds)
private void FilterPermissionTree(List<Permission> permissionsAll, List<long> actionPermissionId, List<long> 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<Permission> permissionsTree, List<PM> pms, int permissionId = 0)
private async Task SavePermissionTreeAsync(List<Permission> permissionsTree, List<PM> 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; }
}
}

2
Blog.Core.Api/Controllers/DepartmentController.cs
View File

@ -83,7 +83,7 @@ namespace Blog.Core.Api.Controllers
foreach (var item in departments)
{
List<int> pidarr = new() { };
List<long> pidarr = new() { };
var parent = departmentList.FirstOrDefault(d => d.Id == item.Pid);
while (parent != null)

24
Blog.Core.Api/Controllers/PermissionController.cs
View File

@ -99,7 +99,7 @@ namespace Blog.Core.Controllers
var permissionAll = await _permissionServices.Query(d => d.IsDeleted != true);
foreach (var item in permissionsView)
{
List<int> pidarr = new List<int>
List<long> pidarr = new()
{
item.Pid
};
@ -177,7 +177,7 @@ namespace Blog.Core.Controllers
foreach (var item in permissions)
{
List<int> pidarr = new List<int> { };
List<long> pidarr = new() { };
var parent = permissionsList.FirstOrDefault(d => d.Id == item.Pid);
while (parent != null)
@ -353,13 +353,13 @@ namespace Blog.Core.Controllers
/// <param name="uid"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<NavigationBar>> GetNavigationBar(int uid)
public async Task<MessageModel<NavigationBar>> GetNavigationBar(long uid)
{
var data = new MessageModel<NavigationBar>();
var uidInHttpcontext1 = 0;
var roleIds = new List<int>();
var roleIds = new List<long>();
// 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
/// <param name="uid"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<List<NavigationBarPro>>> GetNavigationBarPro(int uid)
public async Task<MessageModel<List<NavigationBarPro>>> GetNavigationBarPro(long uid)
{
var data = new MessageModel<List<NavigationBarPro>>();
var uidInHttpcontext1 = 0;
var roleIds = new List<int>();
var roleIds = new List<long>();
// 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);

6
Blog.Core.Api/Controllers/UserController.cs
View File

@ -103,15 +103,15 @@ namespace Blog.Core.Controllers
return Success(data.ConvertTo<SysUserInfoDto>(_mapper));
}
private (string, List<int>) GetFullDepartmentName(List<Department> departments, int departmentId)
private (string, List<long>) GetFullDepartmentName(List<Department> departments, int departmentId)
{
var departmentModel = departments.FirstOrDefault(d => d.Id == departmentId);
if (departmentModel == null)
{
return ("", new List<int>());
return ("", new List<long>());
}
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);

44
Blog.Core.Api/wwwroot/BlogCore.Data.json/Permission.tsv
View File

@ -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": "部门权限管理",

Can't render this file because it contains an unexpected character in line 3 and column 5.

12
Blog.Core.Api/wwwroot/BlogCore.Data.json/RoleModulePermission.tsv
View File

@ -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
}
]

Can't render this file because it contains an unexpected character in line 3 and column 5.

10
Blog.Core.Common/DB/Aop/SqlsugarAop.cs
View File

@ -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<long> rootEntity)
{
if (rootEntity.Id == 0)
{
rootEntity.Id = SnowFlakeSingle.Instance.NextId();
}
}
if (entityInfo.EntityValue is BaseEntity baseEntity)
{

12
Blog.Core.Common/Helper/RecursionHelper.cs
View File

@ -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;

30
Blog.Core.Common/Seed/DBSeed.cs
View File

@ -175,7 +175,11 @@ namespace Blog.Core.Common.Seed
{
var data = JsonConvert.DeserializeObject<List<Permission>>(FileHelper.ReadFile(string.Format(SeedDataFolder, "Permission"), Encoding.UTF8), setting);
myContext.GetEntityDB<Permission>().InsertRange(data);
foreach (var item in data)
{
Console.WriteLine($"{item.Name}:{item.Id}");
myContext.GetEntityDB<Permission>().Insert(item);
}
Console.WriteLine("Table:Permission created success!");
}
else
@ -190,10 +194,10 @@ namespace Blog.Core.Common.Seed
if (!await myContext.Db.Queryable<Role>().AnyAsync())
{
//var data = JsonConvert.DeserializeObject<List<Role>>(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<Role>(stream);
var data = result.Data.ToList();
var data = JsonConvert.DeserializeObject<List<Role>>(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<Role>(stream);
//var data = result.Data.ToList();
myContext.GetEntityDB<Role>().InsertRange(data);
Console.WriteLine("Table:Role created success!");
@ -212,7 +216,11 @@ namespace Blog.Core.Common.Seed
{
var data = JsonConvert.DeserializeObject<List<RoleModulePermission>>(FileHelper.ReadFile(string.Format(SeedDataFolder, "RoleModulePermission"), Encoding.UTF8), setting);
myContext.GetEntityDB<RoleModulePermission>().InsertRange(data);
foreach (var item in data)
{
Console.WriteLine($"{item.Id}");
myContext.GetEntityDB<RoleModulePermission>().Insert(item);
}
Console.WriteLine("Table:RoleModulePermission created success!");
}
else
@ -261,10 +269,7 @@ namespace Blog.Core.Common.Seed
if (!await myContext.Db.Queryable<UserRole>().AnyAsync())
{
//var data = JsonConvert.DeserializeObject<List<UserRole>>(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<UserRole>(stream);
var data = result.Data.ToList();
var data = JsonConvert.DeserializeObject<List<UserRole>>(FileHelper.ReadFile(string.Format(SeedDataFolder, "UserRole"), Encoding.UTF8), setting);
myContext.GetEntityDB<UserRole>().InsertRange(data);
Console.WriteLine("Table:UserRole created success!");
@ -281,10 +286,7 @@ namespace Blog.Core.Common.Seed
if (!await myContext.Db.Queryable<SysUserInfo>().AnyAsync())
{
//var data = JsonConvert.DeserializeObject<List<SysUserInfo>>(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<SysUserInfo>(stream);
var data = result.Data.ToList();
var data = JsonConvert.DeserializeObject<List<SysUserInfo>>(FileHelper.ReadFile(string.Format(SeedDataFolder, "sysUserInfo"), Encoding.UTF8), setting);
myContext.GetEntityDB<SysUserInfo>().InsertRange(data);
Console.WriteLine("Table:sysUserInfo created success!");

2
Blog.Core.IServices/IRoleModulePermissionServices.cs
View File

@ -21,6 +21,6 @@ namespace Blog.Core.IServices
/// <param name="permissionId">꽉데寮숩</param>
/// <param name="moduleId">쌈왯寮숩</param>
/// <returns></returns>
Task UpdateModuleId(int permissionId, int moduleId);
Task UpdateModuleId(long permissionId, long moduleId);
}
}

2
Blog.Core.Model/Models/AccessTrendLog.cs
View File

@ -6,7 +6,7 @@ namespace Blog.Core.Model.Models
/// <summary>
/// 用户访问趋势日志
/// </summary>
public class AccessTrendLog : RootEntityTkey<int>
public class AccessTrendLog : RootEntityTkey<long>
{
/// <summary>
/// 用户

2
Blog.Core.Model/Models/Advertisement.cs
View File

@ -3,7 +3,7 @@ using System;
namespace Blog.Core.Model.Models
{
public class Advertisement : RootEntityTkey<int>
public class Advertisement : RootEntityTkey<long>
{
/// <summary>

4
Blog.Core.Model/Models/BlogArticle.cs
View File

@ -13,8 +13,8 @@ namespace Blog.Core.Model.Models
/// 主键
/// </summary>
/// 这里之所以没用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; }
/// <summary>
/// 创建人

2
Blog.Core.Model/Models/BlogArticleComment.cs
View File

@ -7,7 +7,7 @@ namespace Blog.Core.Model.Models;
/// </summary>
public class BlogArticleComment : RootEntityTkey<long>
{
public int bID { get; set; }
public long bID { get; set; }
public string Comment { get; set; }

2
Blog.Core.Model/Models/Department.cs
View File

@ -7,7 +7,7 @@ namespace Blog.Core.Model.Models
///<summary>
/// 部门表
///</summary>
public class Department : DepartmentRoot<int>
public class Department : DepartmentRoot<long>
{
/// <summary>
/// Desc:部门关系编码

4
Blog.Core.Model/Models/GblLogAudit.cs
View File

@ -12,8 +12,8 @@ namespace Blog.Core.Model.Models
///<summary>
///ID
///</summary>
[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; }
///<summary>
///HttpContext.TraceIdentifier 事件链路ID（获取或设置一个唯一标识符，用于在跟踪日志中表示此请求。）

6
Blog.Core.Model/Models/Guestbook.cs
View File

@ -3,13 +3,13 @@ using System;
namespace Blog.Core.Model.Models
{
public class Guestbook:RootEntityTkey<int>
public class Guestbook : RootEntityTkey<long>
{
/// <summary>博客ID
///
/// </summary>
public int? blogId { get; set; }
public long? blogId { get; set; }
/// <summary>创建时间
///
/// </summary>

2
Blog.Core.Model/Models/Modules.cs
View File

@ -6,7 +6,7 @@ namespace Blog.Core.Model.Models
/// <summary>
/// 接口API地址信息表
/// </summary>
public class Modules : ModulesRoot<int>
public class Modules : ModulesRoot<long>
{
public Modules()
{

2
Blog.Core.Model/Models/OperateLog.cs
View File

@ -6,7 +6,7 @@ namespace Blog.Core.Model.Models
/// <summary>
/// 日志记录
/// </summary>
public class OperateLog : RootEntityTkey<int>
public class OperateLog : RootEntityTkey<long>
{
/// <summary>

6
Blog.Core.Model/Models/PasswordLib.cs
View File

@ -7,11 +7,11 @@ namespace Blog.Core.Model.Models
/// 密码库表
/// </summary>
[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; }
/// <summary>
///获取或设置是否禁用，逻辑上的删除，非物理删除

2
Blog.Core.Model/Models/Permission.cs
View File

@ -7,7 +7,7 @@ namespace Blog.Core.Model.Models
/// <summary>
/// 路由菜单表
/// </summary>
public class Permission : PermissionRoot<int>
public class Permission : PermissionRoot<long>
{
public Permission()
{

2
Blog.Core.Model/Models/Role.cs
View File

@ -6,7 +6,7 @@ namespace Blog.Core.Model.Models
/// <summary>
/// 角色表
/// </summary>
public class Role : RootEntityTkey<int>
public class Role : RootEntityTkey<long>
{
public Role()
{

2
Blog.Core.Model/Models/RoleModulePermission.cs
View File

@ -6,7 +6,7 @@ namespace Blog.Core.Model.Models
/// <summary>
/// 按钮跟权限关联表
/// </summary>
public class RoleModulePermission : RoleModulePermissionRoot<int>
public class RoleModulePermission : RoleModulePermissionRoot<long>
{
public RoleModulePermission()
{

15
Blog.Core.Model/Models/RootEntity.cs
View File

@ -1,15 +0,0 @@
using SqlSugar;
namespace Blog.Core.Model
{
public class RootEntity
{
/// <summary>
/// ID
/// </summary>
[SugarColumn(IsNullable = false, IsPrimaryKey = true)]
public int Id { get; set; }
}
}

4
Blog.Core.Model/Models/TasksLog.cs
View File

@ -6,12 +6,12 @@ namespace Blog.Core.Model.Models
/// <summary>
/// 任务日志表
/// </summary>
public class TasksLog : RootEntityTkey<int>
public class TasksLog : RootEntityTkey<long>
{
/// <summary>
/// 任务ID
/// </summary>
public int JobId { get; set; }
public long JobId { get; set; }
/// <summary>
/// 任务耗时
/// </summary>

2
Blog.Core.Model/Models/TasksQz.cs
View File

@ -8,7 +8,7 @@ namespace Blog.Core.Model.Models
/// <summary>
/// 任务计划表
/// </summary>
public class TasksQz : RootEntityTkey<int>
public class TasksQz : RootEntityTkey<long>
{
/// <summary>
/// 任务名称

6
Blog.Core.Model/Models/TestModels.cs
View File

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

2
Blog.Core.Model/Models/Topic.cs
View File

@ -7,7 +7,7 @@ namespace Blog.Core.Model.Models
/// <summary>
/// Tibug 类别
/// </summary>
public class Topic : RootEntityTkey<int>
public class Topic : RootEntityTkey<long>
{
public Topic()
{

2
Blog.Core.Model/Models/TopicDetail.cs
View File

@ -6,7 +6,7 @@ namespace Blog.Core.Model.Models
/// <summary>
/// Tibug 博文
/// </summary>
public class TopicDetail : TopicDetailRoot<int>
public class TopicDetail : TopicDetailRoot<long>
{
public TopicDetail()
{

6
Blog.Core.Model/Models/UserRole.cs
View File

@ -6,11 +6,11 @@ namespace Blog.Core.Model.Models
/// <summary>
/// 用户跟角色关联表
/// </summary>
public class UserRole : UserRoleRoot<int>
public class UserRole : UserRoleRoot<long>
{
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
/// </summary>
[SugarColumn(IsNullable = true)]
public int? CreateId { get; set; }
public long? CreateId { get; set; }
/// <summary>
/// 创建者
/// </summary>

4
Blog.Core.Model/Models/sysUserInfo.cs
View File

@ -9,7 +9,7 @@ namespace Blog.Core.Model.Models
/// </summary>
//[SugarTable("SysUserInfo")]
[SugarTable("SysUserInfo", "用户表")] //('数据库表名'，'数据库表备注')
public class SysUserInfo : SysUserInfoRoot<int>
public class SysUserInfo : SysUserInfoRoot<long>
{
public SysUserInfo()
{
@ -133,7 +133,7 @@ namespace Blog.Core.Model.Models
public List<string> RoleNames { get; set; }
[SugarColumn(IsIgnore = true)]
public List<int> Dids { get; set; }
public List<long> Dids { get; set; }
[SugarColumn(IsIgnore = true)]
public string DepartmentName { get; set; }

4
Blog.Core.Model/ViewModels/BlogViewModels.cs
View File

@ -34,7 +34,7 @@ namespace Blog.Core.Model.ViewModels
/// <summary>
/// 上一篇id
/// </summary>
public int previousID { get; set; }
public long previousID { get; set; }
/// <summary>
/// 下一篇
@ -44,7 +44,7 @@ namespace Blog.Core.Model.ViewModels
/// <summary>
/// 下一篇id
/// </summary>
public int nextID { get; set; }
public long nextID { get; set; }
/// <summary>类别
///

2
Blog.Core.Repository/IRoleModulePermissionRepository.cs
View File

@ -19,6 +19,6 @@ namespace Blog.Core.IRepository
/// <param name="permissionId">菜单主键</param>
/// <param name="moduleId">接口主键</param>
/// <returns></returns>
Task UpdateModuleId(int permissionId, int moduleId);
Task UpdateModuleId(long permissionId, long moduleId);
}
}

2
Blog.Core.Repository/RoleModulePermissionRepository.cs
View File

@ -99,7 +99,7 @@ namespace Blog.Core.Repository
/// <param name="permissionId">菜单主键</param>
/// <param name="moduleId">接口主键</param>
/// <returns></returns>
public async Task UpdateModuleId(int permissionId, int moduleId)
public async Task UpdateModuleId(long permissionId, long moduleId)
{
await Db.Updateable<RoleModulePermission>(it => it.ModuleId == moduleId).Where(
it => it.PermissionId == permissionId).ExecuteCommandAsync();

2
Blog.Core.Services/RoleModulePermissionServices.cs
View File

@ -83,7 +83,7 @@ namespace Blog.Core.Services
/// <param name="permissionId">菜单主键</param>
/// <param name="moduleId">接口主键</param>
/// <returns></returns>
public async Task UpdateModuleId(int permissionId, int moduleId)
public async Task UpdateModuleId(long permissionId, long moduleId)
{
await _dal.UpdateModuleId(permissionId, moduleId);
}