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 api param

Browse Source
This commit is contained in:
anjoy8 2023-04-02 15:16:37 +08:00
parent 18861bc7de
commit 070e441bc0
22 changed files with 93 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,14 +26,14 @@
<param name="key"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.BlogController.Get(System.Int32)">
<member name="M:Blog.Core.Controllers.BlogController.Get(System.Int64)">
<summary>
获取博客详情
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.BlogController.DetailNuxtNoPer(System.Int32)">
<member name="M:Blog.Core.Controllers.BlogController.DetailNuxtNoPer(System.Int64)">
<summary>
获取详情【无权限】
</summary>
@ -67,7 +67,7 @@
<param name="BlogArticle"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.BlogController.Delete(System.Int32)">
<member name="M:Blog.Core.Controllers.BlogController.Delete(System.Int64)">
<summary>
删除博客
</summary>
@ -276,7 +276,7 @@
<param name="module"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.ModuleController.Delete(System.Int32)">
<member name="M:Blog.Core.Controllers.ModuleController.Delete(System.Int64)">
<summary>
删除一条接口
</summary>
@ -384,7 +384,7 @@
<param name="pageSize"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.PermissionController.GetTreeTable(System.Int32,System.String)">
<member name="M:Blog.Core.Controllers.PermissionController.GetTreeTable(System.Int64,System.String)">
<summary>
查询树形 Table
</summary>
@ -406,7 +406,7 @@
<param name="assignView"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.PermissionController.GetPermissionTree(System.Int32,System.Boolean)">
<member name="M:Blog.Core.Controllers.PermissionController.GetPermissionTree(System.Int64,System.Boolean)">
<summary>
获取菜单树
</summary>
@ -428,7 +428,7 @@
<param name="uid"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.PermissionController.GetPermissionIdByRoleId(System.Int32)">
<member name="M:Blog.Core.Controllers.PermissionController.GetPermissionIdByRoleId(System.Int64)">
<summary>
通过角色获取菜单
</summary>
@ -442,7 +442,7 @@
<param name="permission"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.PermissionController.Delete(System.Int32)">
<member name="M:Blog.Core.Controllers.PermissionController.Delete(System.Int64)">
<summary>
删除菜单
</summary>
@ -456,7 +456,7 @@
<param name="permissions"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.PermissionController.MigratePermission(System.String,System.String,System.Int32,System.Boolean)">
<member name="M:Blog.Core.Controllers.PermissionController.MigratePermission(System.String,System.String,System.Int64,System.Boolean)">
<summary>
系统接口菜单同步接口
</summary>
@ -493,7 +493,7 @@
<param name="role"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.RoleController.Delete(System.Int32)">
<member name="M:Blog.Core.Controllers.RoleController.Delete(System.Int64)">
<summary>
删除角色
</summary>
@ -522,42 +522,42 @@
<param name="tasksQz"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.TasksQzController.Delete(System.Int32)">
<member name="M:Blog.Core.Controllers.TasksQzController.Delete(System.Int64)">
<summary>
删除一个任务
</summary>
<param name="jobId"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.TasksQzController.StartJob(System.Int32)">
<member name="M:Blog.Core.Controllers.TasksQzController.StartJob(System.Int64)">
<summary>
启动计划任务
</summary>
<param name="jobId"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.TasksQzController.StopJob(System.Int32)">
<member name="M:Blog.Core.Controllers.TasksQzController.StopJob(System.Int64)">
<summary>
停止一个计划任务
</summary>
<param name="jobId"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.TasksQzController.PauseJob(System.Int32)">
<member name="M:Blog.Core.Controllers.TasksQzController.PauseJob(System.Int64)">
<summary>
暂停一个计划任务
</summary>
<param name="jobId"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.TasksQzController.ResumeJob(System.Int32)">
<member name="M:Blog.Core.Controllers.TasksQzController.ResumeJob(System.Int64)">
<summary>
恢复一个计划任务
</summary>
<param name="jobId"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.TasksQzController.ReCovery(System.Int32)">
<member name="M:Blog.Core.Controllers.TasksQzController.ReCovery(System.Int64)">
<summary>
重启一个计划任务
</summary>
@ -570,20 +570,20 @@
</summary>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.TasksQzController.ExecuteJob(System.Int32)">
<member name="M:Blog.Core.Controllers.TasksQzController.ExecuteJob(System.Int64)">
<summary>
立即执行任务
</summary>
<param name="jobId"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.TasksQzController.GetTaskLogs(System.Int32,System.Int32,System.Int32,System.Nullable{System.DateTime},System.Nullable{System.DateTime})">
<member name="M:Blog.Core.Controllers.TasksQzController.GetTaskLogs(System.Int64,System.Int32,System.Int32,System.Nullable{System.DateTime},System.Nullable{System.DateTime})">
<summary>
获取任务运行日志
</summary>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.TasksQzController.GetTaskOverview(System.Int32,System.Int32,System.Int32,System.Nullable{System.DateTime},System.Nullable{System.DateTime},System.String)">
<member name="M:Blog.Core.Controllers.TasksQzController.GetTaskOverview(System.Int64,System.Int32,System.Int32,System.Nullable{System.DateTime},System.Nullable{System.DateTime},System.String)">
<summary>
任务概况
</summary>
@ -629,7 +629,7 @@
<param name="intPageSize"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.TopicDetailController.Get(System.Int32)">
<member name="M:Blog.Core.Controllers.TopicDetailController.Get(System.Int64)">
<summary>
获取详情【无权限】
</summary>
@ -650,14 +650,14 @@
<param name="topicDetail"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.TopicDetailController.Delete(System.Int32)">
<member name="M:Blog.Core.Controllers.TopicDetailController.Delete(System.Int64)">
<summary>
删除 bug
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.TransactionController.Delete(System.Int32)">
<member name="M:Blog.Core.Controllers.TransactionController.Delete(System.Int64)">
<summary>
测试事务在AOP中的使用
</summary>
@ -712,7 +712,7 @@
<param name="sysUserInfo"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.UserController.Delete(System.Int32)">
<member name="M:Blog.Core.Controllers.UserController.Delete(System.Int64)">
<summary>
删除用户
</summary>
@ -748,7 +748,7 @@
<param name="roleName"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.UserRoleController.AddUserRole(System.Int32,System.Int32)">
<member name="M:Blog.Core.Controllers.UserRoleController.AddUserRole(System.Int64,System.Int64)">
<summary>
新建用户角色关系
</summary>
@ -1203,7 +1203,7 @@
<param name="key">关键字</param>
<returns></returns>
</member>
<member name="M:Blog.Core.Api.Controllers.DepartmentController.GetDepartmentTree(System.Int32)">
<member name="M:Blog.Core.Api.Controllers.DepartmentController.GetDepartmentTree(System.Int64)">
<summary>
获取部门树
</summary>

10
Blog.Core.Api/Controllers/BlogController.cs
View File

@ -83,7 +83,7 @@ namespace Blog.Core.Controllers
[HttpGet("{id}")]
//[Authorize(Policy = "Scope_BlogModule_Policy")]
[Authorize]
public async Task<MessageModel<BlogViewModels>> Get(int id)
public async Task<MessageModel<BlogViewModels>> Get(long id)
{
return Success(await _blogArticleServices.GetBlogDetails(id));
}
@ -96,7 +96,7 @@ namespace Blog.Core.Controllers
/// <returns></returns>
[HttpGet]
[Route("DetailNuxtNoPer")]
public async Task<MessageModel<BlogViewModels>> DetailNuxtNoPer(int id)
public async Task<MessageModel<BlogViewModels>> DetailNuxtNoPer(long id)
{
_logger.LogInformation("xxxxxxxxxxxxxxxxxxx");
return Success(await _blogArticleServices.GetBlogDetails(id));
@ -104,7 +104,7 @@ namespace Blog.Core.Controllers
[HttpGet]
[Route("GoUrl")]
public async Task<IActionResult> GoUrl(int id = 0)
public async Task<IActionResult> GoUrl(long id = 0)
{
var response = await _blogArticleServices.QueryById(id);
if (response != null && response.bsubmitter.IsNotEmptyOrNull())
@ -136,7 +136,7 @@ namespace Blog.Core.Controllers
[HttpGet]
[Route("GetBlogByIdForMVP")]
public async Task<MessageModel<BlogArticle>> GetBlogByIdForMVP(int id = 0)
public async Task<MessageModel<BlogArticle>> GetBlogByIdForMVP(long id = 0)
{
if (id > 0)
{
@ -247,7 +247,7 @@ namespace Blog.Core.Controllers
[HttpDelete]
[Authorize(Permissions.Name)]
[Route("Delete")]
public async Task<MessageModel<string>> Delete(int id)
public async Task<MessageModel<string>> Delete(long id)
{
if (id > 0)
{

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

@ -109,7 +109,7 @@ namespace Blog.Core.Api.Controllers
/// <param name="pid"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<DepartmentTree>> GetDepartmentTree(int pid = 0)
public async Task<MessageModel<DepartmentTree>> GetDepartmentTree(long pid = 0)
{
var departments = await _departmentServices.Query(d => d.IsDeleted == false);
var departmentTrees = (from child in departments
@ -168,7 +168,7 @@ namespace Blog.Core.Api.Controllers
}
[HttpDelete]
public async Task<MessageModel<string>> Delete(int id)
public async Task<MessageModel<string>> Delete(long id)
{
var data = new MessageModel<string>();
var model = await _departmentServices.QueryById(id);

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

@ -119,7 +119,7 @@ namespace Blog.Core.Controllers
/// <returns></returns>
// DELETE: api/ApiWithActions/5
[HttpDelete]
public async Task<MessageModel<string>> Delete(int id)
public async Task<MessageModel<string>> Delete(long id)
{
if (id <= 0)
return Failed("缺少参数");

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

@ -79,21 +79,6 @@ namespace Blog.Core.Controllers
key = "";
}
#region 舍弃
//var permissions = await _permissionServices.Query(a => a.IsDeleted != true);
//if (!string.IsNullOrEmpty(key))
//{
// permissions = permissions.Where(t => (t.Name != null && t.Name.Contains(key))).ToList();
//}
////筛选后的数据总数
//totalCount = permissions.Count;
////筛选后的总页数
//pageCount = (Math.Ceiling(totalCount.ObjToDecimal() / intTotalCount.ObjToDecimal())).ObjToInt();
//permissions = permissions.OrderByDescending(d => d.Id).Skip((page - 1) * intTotalCount).Take(intTotalCount).ToList();
#endregion
permissions = await _permissionServices.QueryPage(a => a.IsDeleted != true && (a.Name != null && a.Name.Contains(key)), page, pageSize, " Id desc ");
@ -162,7 +147,7 @@ namespace Blog.Core.Controllers
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<MessageModel<List<Permission>>> GetTreeTable(int f = 0, string key = "")
public async Task<MessageModel<List<Permission>>> GetTreeTable(long f = 0, string key = "")
{
List<Permission> permissions = new List<Permission>();
var apiList = await _moduleServices.Query(d => d.IsDeleted == false);
@ -245,7 +230,7 @@ namespace Blog.Core.Controllers
/// <returns></returns>
[HttpPost]
public async Task<MessageModel<string>> Assign([FromBody] AssignView assignView)
{
{
if (assignView.rid > 0)
{
//开启事务
@ -258,7 +243,7 @@ namespace Blog.Core.Controllers
var permissions = await _permissionServices.Query(d => d.IsDeleted == false);
List<RoleModulePermission> new_rmps = new List<RoleModulePermission>();
var nowTime = _permissionServices.Db.GetDate();
var nowTime = _permissionServices.Db.GetDate();
foreach (var item in assignView.pids)
{
var moduleid = permissions.Find(p => p.Id == item)?.Mid;
@ -268,7 +253,7 @@ namespace Blog.Core.Controllers
{
IsDeleted = false,
RoleId = assignView.rid,
ModuleId = moduleid.ObjToInt(),
ModuleId = moduleid.ObjToLong(),
PermissionId = item,
CreateId = find_old_rmps == null ? _user.ID : find_old_rmps.CreateId,
CreateBy = find_old_rmps == null ? _user.Name : find_old_rmps.CreateBy,
@ -280,7 +265,7 @@ namespace Blog.Core.Controllers
};
new_rmps.Add(roleModulePermission);
}
if(new_rmps.Count>0) await _roleModulePermissionServices.Add(new_rmps);
if (new_rmps.Count > 0) await _roleModulePermissionServices.Add(new_rmps);
_unitOfWorkManage.CommitTran();
}
catch (Exception)
@ -294,7 +279,7 @@ namespace Blog.Core.Controllers
else
{
return Failed<string>("请选择要操作的角色");
}
}
}
@ -305,7 +290,7 @@ namespace Blog.Core.Controllers
/// <param name="needbtn"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<PermissionTree>> GetPermissionTree(int pid = 0, bool needbtn = false)
public async Task<MessageModel<PermissionTree>> GetPermissionTree(long pid = 0, bool needbtn = false)
{
//var data = new MessageModel<PermissionTree>();
@ -355,7 +340,7 @@ namespace Blog.Core.Controllers
var data = new MessageModel<NavigationBar>();
var uidInHttpcontext1 = 0;
long uidInHttpcontext1 = 0;
var roleIds = new List<long>();
// ids4和jwt切换
if (Permissions.IsUseIds4)
@ -363,7 +348,7 @@ namespace Blog.Core.Controllers
// ids4
uidInHttpcontext1 = (from item in _httpContext.HttpContext.User.Claims
where item.Type == "sub"
select item.Value).FirstOrDefault().ObjToInt();
select item.Value).FirstOrDefault().ObjToLong();
roleIds = (from item in _httpContext.HttpContext.User.Claims
where item.Type == "role"
select item.Value.ObjToLong()).ToList();
@ -371,7 +356,7 @@ namespace Blog.Core.Controllers
else
{
// jwt
uidInHttpcontext1 = ((JwtHelper.SerializeJwt(_httpContext.HttpContext.Request.Headers["Authorization"].ObjToString().Replace("Bearer ", "")))?.Uid).ObjToInt();
uidInHttpcontext1 = ((JwtHelper.SerializeJwt(_httpContext.HttpContext.Request.Headers["Authorization"].ObjToString().Replace("Bearer ", "")))?.Uid).ObjToLong();
roleIds = (await _userRoleServices.Query(d => d.IsDeleted == false && d.UserId == uid)).Select(d => d.RoleId.ObjToLong()).Distinct().ToList();
}
@ -446,7 +431,7 @@ namespace Blog.Core.Controllers
{
var data = new MessageModel<List<NavigationBarPro>>();
var uidInHttpcontext1 = 0;
long uidInHttpcontext1 = 0;
var roleIds = new List<long>();
// ids4和jwt切换
if (Permissions.IsUseIds4)
@ -454,7 +439,7 @@ namespace Blog.Core.Controllers
// ids4
uidInHttpcontext1 = (from item in _httpContext.HttpContext.User.Claims
where item.Type == "sub"
select item.Value).FirstOrDefault().ObjToInt();
select item.Value).FirstOrDefault().ObjToLong();
roleIds = (from item in _httpContext.HttpContext.User.Claims
where item.Type == "role"
select item.Value.ObjToLong()).ToList();
@ -462,7 +447,7 @@ namespace Blog.Core.Controllers
else
{
// jwt
uidInHttpcontext1 = ((JwtHelper.SerializeJwt(_httpContext.HttpContext.Request.Headers["Authorization"].ObjToString().Replace("Bearer ", "")))?.Uid).ObjToInt();
uidInHttpcontext1 = ((JwtHelper.SerializeJwt(_httpContext.HttpContext.Request.Headers["Authorization"].ObjToString().Replace("Bearer ", "")))?.Uid).ObjToLong();
roleIds = (await _userRoleServices.Query(d => d.IsDeleted == false && d.UserId == uid)).Select(d => d.RoleId.ObjToLong()).Distinct().ToList();
}
@ -519,14 +504,14 @@ namespace Blog.Core.Controllers
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<MessageModel<AssignShow>> GetPermissionIdByRoleId(int rid = 0)
public async Task<MessageModel<AssignShow>> GetPermissionIdByRoleId(long rid = 0)
{
//var data = new MessageModel<AssignShow>();
var rmps = await _roleModulePermissionServices.Query(d => d.IsDeleted == false && d.RoleId == rid);
var permissionTrees = (from child in rmps
orderby child.Id
select child.PermissionId.ObjToInt()).ToList();
select child.PermissionId.ObjToLong()).ToList();
var permissions = await _permissionServices.Query(d => d.IsDeleted == false);
List<string> assignbtns = new List<string>();
@ -592,7 +577,7 @@ namespace Blog.Core.Controllers
/// <returns></returns>
// DELETE: api/ApiWithActions/5
[HttpDelete]
public async Task<MessageModel<string>> Delete(int id)
public async Task<MessageModel<string>> Delete(long id)
{
var data = new MessageModel<string>();
if (id > 0)
@ -654,7 +639,7 @@ namespace Blog.Core.Controllers
/// <param name="isAction">是否执行迁移到数据</param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<List<Permission>>> MigratePermission(string action = "", string controllerName = "", int pid = 0, bool isAction = false)
public async Task<MessageModel<List<Permission>>> MigratePermission(string action = "", string controllerName = "", long pid = 0, bool isAction = false)
{
var data = new MessageModel<List<Permission>>();
if (controllerName.IsNullOrEmpty())
@ -776,12 +761,12 @@ namespace Blog.Core.Controllers
public class AssignView
{
public List<int> pids { get; set; }
public int rid { get; set; }
public List<long> pids { get; set; }
public long rid { get; set; }
}
public class AssignShow
{
public List<int> permissionids { get; set; }
public List<long> permissionids { get; set; }
public List<string> assignbtns { get; set; }
}

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

@ -112,7 +112,7 @@ namespace Blog.Core.Controllers
/// <returns></returns>
// DELETE: api/ApiWithActions/5
[HttpDelete]
public async Task<MessageModel<string>> Delete(int id)
public async Task<MessageModel<string>> Delete(long id)
{
var data = new MessageModel<string>();

18
Blog.Core.Api/Controllers/TasksQzController.cs
View File

@ -172,7 +172,7 @@ namespace Blog.Core.Controllers
/// <param name="jobId"></param>
/// <returns></returns>
[HttpDelete]
public async Task<MessageModel<string>> Delete(int jobId)
public async Task<MessageModel<string>> Delete(long jobId)
{
var data = new MessageModel<string>();
@ -221,7 +221,7 @@ namespace Blog.Core.Controllers
/// <param name="jobId"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<string>> StartJob(int jobId)
public async Task<MessageModel<string>> StartJob(long jobId)
{
var data = new MessageModel<string>();
@ -278,7 +278,7 @@ namespace Blog.Core.Controllers
/// <param name="jobId"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<string>> StopJob(int jobId)
public async Task<MessageModel<string>> StopJob(long jobId)
{
var data = new MessageModel<string>();
@ -318,7 +318,7 @@ namespace Blog.Core.Controllers
/// <param name="jobId"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<string>> PauseJob(int jobId)
public async Task<MessageModel<string>> PauseJob(long jobId)
{
var data = new MessageModel<string>();
var model = await _tasksQzServices.QueryById(jobId);
@ -372,7 +372,7 @@ namespace Blog.Core.Controllers
/// <param name="jobId"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<string>> ResumeJob(int jobId)
public async Task<MessageModel<string>> ResumeJob(long jobId)
{
var data = new MessageModel<string>();
@ -428,7 +428,7 @@ namespace Blog.Core.Controllers
/// <param name="jobId"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<string>> ReCovery(int jobId)
public async Task<MessageModel<string>> ReCovery(long jobId)
{
var data = new MessageModel<string>();
var model = await _tasksQzServices.QueryById(jobId);
@ -507,7 +507,7 @@ namespace Blog.Core.Controllers
/// <param name="jobId"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<string>> ExecuteJob(int jobId)
public async Task<MessageModel<string>> ExecuteJob(long jobId)
{
var data = new MessageModel<string>();
@ -527,7 +527,7 @@ namespace Blog.Core.Controllers
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<PageModel<TasksLog>>> GetTaskLogs(int jobId, int page = 1, int pageSize = 10, DateTime? runTimeStart = null, DateTime? runTimeEnd = null)
public async Task<MessageModel<PageModel<TasksLog>>> GetTaskLogs(long jobId, int page = 1, int pageSize = 10, DateTime? runTimeStart = null, DateTime? runTimeEnd = null)
{
var model = await _tasksLogServices.GetTaskLogs(jobId, page, pageSize, runTimeStart, runTimeEnd);
return MessageModel<PageModel<TasksLog>>.Message(model.dataCount >= 0, "获取成功", model);
@ -537,7 +537,7 @@ namespace Blog.Core.Controllers
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<object>> GetTaskOverview(int jobId, int page = 1, int pageSize = 10, DateTime? runTimeStart = null, DateTime? runTimeEnd = null, string type = "month")
public async Task<MessageModel<object>> GetTaskOverview(long jobId, int page = 1, int pageSize = 10, DateTime? runTimeStart = null, DateTime? runTimeEnd = null, string type = "month")
{
var model = await _tasksLogServices.GetTaskOverview(jobId, runTimeStart, runTimeEnd, type);
return MessageModel<object>.Message(true, "获取成功", model);

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

@ -44,7 +44,7 @@ namespace Blog.Core.Controllers
// GET: api/Topic/5
[HttpGet("{id}")]
public string Get(int id)
public string Get(long id)
{
return "value";
}
@ -57,13 +57,13 @@ namespace Blog.Core.Controllers
// PUT: api/Topic/5
[HttpPut("{id}")]
public void Put(int id, [FromBody] string value)
public void Put(long id, [FromBody] string value)
{
}
// DELETE: api/ApiWithActions/5
[HttpDelete("{id}")]
public void Delete(int id)
public void Delete(long id)
{
}
}

8
Blog.Core.Api/Controllers/TopicDetailController.cs
View File

@ -42,7 +42,7 @@ namespace Blog.Core.Controllers
[AllowAnonymous]
public async Task<MessageModel<PageModel<TopicDetail>>> Get(int page = 1, string tname = "", string key = "", int intPageSize = 12)
{
int tid = 0;
long tid = 0;
if (string.IsNullOrEmpty(key) || string.IsNullOrWhiteSpace(key))
{
@ -56,7 +56,7 @@ namespace Blog.Core.Controllers
if (!string.IsNullOrEmpty(tname))
{
tid = ((await _topicServices.Query(ts => ts.tName == tname)).FirstOrDefault()?.Id).ObjToInt();
tid = ((await _topicServices.Query(ts => ts.tName == tname)).FirstOrDefault()?.Id).ObjToLong();
}
@ -81,7 +81,7 @@ namespace Blog.Core.Controllers
// GET: api/TopicDetail/5
[HttpGet("{id}")]
[AllowAnonymous]
public async Task<MessageModel<TopicDetail>> Get(int id)
public async Task<MessageModel<TopicDetail>> Get(long id)
{
var data = new MessageModel<TopicDetail>();
var response = id > 0 ? await _topicDetailServices.QueryById(id) : new TopicDetail();
@ -154,7 +154,7 @@ namespace Blog.Core.Controllers
/// <returns></returns>
// DELETE: api/ApiWithActions/5
[HttpDelete]
public async Task<MessageModel<string>> Delete(int id)
public async Task<MessageModel<string>> Delete(long id)
{
var data = new MessageModel<string>();
if (id > 0)

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

@ -95,7 +95,7 @@ namespace Blog.Core.Controllers
// GET: api/Transaction/5
[HttpGet("{id}")]
public async Task<MessageModel<string>> Get(int id)
public async Task<MessageModel<string>> Get(long id)
{
return await _guestbookServices.TestTranInRepository();
}
@ -126,7 +126,7 @@ namespace Blog.Core.Controllers
// PUT: api/Transaction/5
[HttpPut("{id}")]
public void Put(int id, [FromBody] string value)
public void Put(long id, [FromBody] string value)
{
}
@ -136,7 +136,7 @@ namespace Blog.Core.Controllers
/// <param name="id"></param>
/// <returns></returns>
[HttpDelete("{id}")]
public async Task<bool> Delete(int id)
public async Task<bool> Delete(long id)
{
return await _guestbookServices.TestTranInRepositoryAOP();
}

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

@ -103,7 +103,7 @@ namespace Blog.Core.Controllers
return Success(data.ConvertTo<SysUserInfoDto>(_mapper));
}
private (string, List<long>) GetFullDepartmentName(List<Department> departments, int departmentId)
private (string, List<long>) GetFullDepartmentName(List<Department> departments, long departmentId)
{
var departmentModel = departments.FirstOrDefault(d => d.Id == departmentId);
if (departmentModel == null)
@ -265,7 +265,7 @@ namespace Blog.Core.Controllers
/// <returns></returns>
// DELETE: api/ApiWithActions/5
[HttpDelete]
public async Task<MessageModel<string>> Delete(int id)
public async Task<MessageModel<string>> Delete(long id)
{
var data = new MessageModel<string>();
if (id > 0)

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

@ -80,7 +80,7 @@ namespace Blog.Core.Controllers
/// <param name="rid"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<UserRole>> AddUserRole(int uid, int rid)
public async Task<MessageModel<UserRole>> AddUserRole(long uid, long rid)
{
return new MessageModel<UserRole>()
{

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

@ -8,7 +8,7 @@ namespace Blog.Core.Common.Helper
/// </summary>
public static class RecursionHelper
{
public static void LoopToAppendChildren(List<PermissionTree> all, PermissionTree curItem, int pid, bool needbtn)
public static void LoopToAppendChildren(List<PermissionTree> all, PermissionTree curItem, long pid, bool needbtn)
{
var subItems = all.Where(ee => ee.Pid == curItem.value).ToList();
@ -52,7 +52,7 @@ namespace Blog.Core.Common.Helper
LoopToAppendChildren(all, subItem, pid, needbtn);
}
}
public static void LoopToAppendChildren(List<DepartmentTree> all, DepartmentTree curItem, int pid)
public static void LoopToAppendChildren(List<DepartmentTree> all, DepartmentTree curItem, long pid)
{
var subItems = all.Where(ee => ee.Pid == curItem.value).ToList();

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

@ -9,7 +9,7 @@ namespace Blog.Core.IServices
public interface IBlogArticleServices :IBaseServices<BlogArticle>
{
Task<List<BlogArticle>> GetBlogs();
Task<BlogViewModels> GetBlogDetails(int id);
Task<BlogViewModels> GetBlogDetails(long id);
}

4
Blog.Core.IServices/ITasksLogServices.cs
View File

@ -12,8 +12,8 @@ namespace Blog.Core.IServices
/// </summary>
public interface ITasksLogServices :IBaseServices<TasksLog>
{
public Task<PageModel<TasksLog>> GetTaskLogs(int jobId, int page, int intPageSize,DateTime? runTime,DateTime? endTime);
public Task<object> GetTaskOverview(int jobId, DateTime? runTime, DateTime? endTime, string type);
public Task<PageModel<TasksLog>> GetTaskLogs(long jobId, int page, int intPageSize,DateTime? runTime,DateTime? endTime);
public Task<object> GetTaskOverview(long jobId, DateTime? runTime, DateTime? endTime, string type);
}
}

4
Blog.Core.IServices/IUserRoleServices.cs
View File

@ -10,8 +10,8 @@ namespace Blog.Core.IServices
public interface IUserRoleServices :IBaseServices<UserRole>
{
Task<UserRole> SaveUserRole(int uid, int rid);
Task<int> GetRoleIdByUid(int uid);
Task<UserRole> SaveUserRole(long uid, long rid);
Task<int> GetRoleIdByUid(long uid);
}
}

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

@ -10,7 +10,7 @@ namespace Blog.Core.Model.ViewModels
/// <summary>
///
/// </summary>
public int bID { get; set; }
public long bID { get; set; }
/// <summary>创建人
///
/// </summary>

6
Blog.Core.Model/ViewModels/SysUserInfoDto.cs
View File

@ -3,13 +3,13 @@ using System.Collections.Generic;
namespace Blog.Core.Model.ViewModels
{
public class SysUserInfoDto : SysUserInfoDtoRoot<int>
public class SysUserInfoDto : SysUserInfoDtoRoot<long>
{
public string uLoginName { get; set; }
public string uLoginPWD { get; set; }
public string uRealName { get; set; }
public int uStatus { get; set; }
public int DepartmentId { get; set; }
public long DepartmentId { get; set; }
public string uRemark { get; set; }
public System.DateTime uCreateTime { get; set; } = DateTime.Now;
public System.DateTime uUpdateTime { get; set; } = DateTime.Now;
@ -22,7 +22,7 @@ namespace Blog.Core.Model.ViewModels
public string addr { get; set; }
public bool tdIsDelete { get; set; }
public List<string> RoleNames { get; set; }
public List<int> Dids { get; set; }
public List<long> Dids { get; set; }
public string DepartmentName { get; set; }
}
}

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

@ -23,7 +23,7 @@ namespace Blog.Core.Services
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public async Task<BlogViewModels> GetBlogDetails(int id)
public async Task<BlogViewModels> GetBlogDetails(long id)
{
// 此处想获取上一条下一条数据，因此将全部数据list出来，有好的想法请提出
//var bloglist = await base.Query(a => a.IsDeleted==false, a => a.bID);

4
Blog.Core.Services/TasksLogServices.cs
View File

@ -14,7 +14,7 @@ namespace Blog.Core.Services
{
public partial class TasksLogServices : BaseServices<TasksLog>, ITasksLogServices
{
public async Task<PageModel<TasksLog>> GetTaskLogs(int jobId, int page, int intPageSize, DateTime? runTime, DateTime? endTime)
public async Task<PageModel<TasksLog>> GetTaskLogs(long jobId, int page, int intPageSize, DateTime? runTime, DateTime? endTime)
{
RefAsync<int> totalCount = 0;
Expression<Func<TasksLog, bool>> whereExpression = log => true;
@ -41,7 +41,7 @@ namespace Blog.Core.Services
.ToPageListAsync(page, intPageSize, totalCount);
return new PageModel<TasksLog>(page, totalCount, intPageSize, data);
}
public async Task<object> GetTaskOverview(int jobId, DateTime? runTime, DateTime? endTime, string type)
public async Task<object> GetTaskOverview(long jobId, DateTime? runTime, DateTime? endTime, string type)
{
//按年
if ("year".Equals(type))

4
Blog.Core.Services/UserRoleServices.cs
View File

@ -19,7 +19,7 @@ namespace Blog.Core.Services
/// <param name="uid"></param>
/// <param name="rid"></param>
/// <returns></returns>
public async Task<UserRole> SaveUserRole(int uid, int rid)
public async Task<UserRole> SaveUserRole(long uid, long rid)
{
UserRole userRole = new UserRole(uid, rid);
@ -42,7 +42,7 @@ namespace Blog.Core.Services
[Caching(AbsoluteExpiration = 30)]
public async Task<int> GetRoleIdByUid(int uid)
public async Task<int> GetRoleIdByUid(long uid)
{
return ((await base.Query(d => d.UserId == uid)).OrderByDescending(d => d.Id).LastOrDefault()?.RoleId).ObjToInt();
}

2
Blog.Core.Tests/Controller_Test/BlogController_Should.cs
View File

@ -53,7 +53,7 @@ namespace Blog.Core.Tests
[Fact]
public async void Get_Blog_Test()
{
MessageModel<BlogViewModels> blogVo = await blogController.Get(1);
MessageModel<BlogViewModels> blogVo = await blogController.Get(1.ObjToLong());
Assert.NotNull(blogVo);
}