Skip to content

Commit ff4be7a

Browse files
anjoy8anjoy8
committed
vue.admin -> roles's CURD
1 parent 41febed commit ff4be7a

12 files changed

Lines changed: 260 additions & 57 deletions

‎Blog.Core.Model/MessageModel.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ public class MessageModel<T>
1212
/// <summary>
1313
/// 操作是否成功
1414
/// </summary>
15-
public bool Success { get; set; } = false;
15+
public bool success { get; set; } = false;
1616
/// <summary>
1717
/// 返回信息
1818
/// </summary>
19-
public string Msg { get; set; } = "服务器异常";
19+
public string msg { get; set; } = "服务器异常";
2020
/// <summary>
2121
/// 返回数据集合
2222
/// </summary>
23-
public T Response { get; set; }
23+
public T response { get; set; }
2424

2525
}
2626
}

‎Blog.Core.Model/Models/Role.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ public class Role : RootEntity
1414
{
1515
public Role()
1616
{
17+
OrderSort = 1;
18+
CreateTime = DateTime.Now;
19+
ModifyTime = DateTime.Now;
20+
IsDeleted = false;
1721
}
1822
public Role(string name)
1923
{

‎Blog.Core.Model/Models/sysUserInfo.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,5 +99,9 @@ public sysUserInfo(string loginName, string loginPWD)
9999
[SugarColumn(IsNullable = true)]
100100
public bool tdIsDelete { get; set; }
101101

102+
103+
[SugarColumn(IsIgnore = true)]
104+
public string RID { get; set; }
105+
102106
}
103107
}

‎Blog.Core/Blog.Core.Model.xml‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Blog.Core/Blog.Core.xml‎

Lines changed: 15 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Blog.Core/Controllers/ImgController.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public async Task<MessageModel<string>> InsertPicture([FromServices]IHostingEnvi
3737
string path = string.Empty;
3838
string foldername = "images";
3939
var files = Request.Form.Files;
40-
if (files == null || files.Count() <= 0) { data.Msg = "请选择上传的文件。"; return data; }
40+
if (files == null || files.Count() <= 0) { data.msg = "请选择上传的文件。"; return data; }
4141
//格式限制
4242
var allowType = new string[] { "image/jpg", "image/png", "image/jpeg" };
4343

@@ -63,22 +63,22 @@ public async Task<MessageModel<string>> InsertPicture([FromServices]IHostingEnvi
6363

6464
data = new MessageModel<string>()
6565
{
66-
Response = strpath,
67-
Msg = "上传成功",
68-
Success = true,
66+
response = strpath,
67+
msg = "上传成功",
68+
success = true,
6969
};
7070
return data;
7171
}
7272
else
7373
{
74-
data.Msg = "图片过大";
74+
data.msg = "图片过大";
7575
return data;
7676
}
7777
}
7878
else
7979

8080
{
81-
data.Msg = "图片格式错误";
81+
data.msg = "图片格式错误";
8282
return data;
8383
}
8484
}

‎Blog.Core/Controllers/LoginController.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.IdentityModel.Tokens.Jwt;
34
using System.Linq;
45
using System.Security.Claims;
56
using System.Threading.Tasks;
@@ -137,7 +138,7 @@ public async Task<object> GetJWTToken3(string name = "", string pass = "")
137138
return new JsonResult(new
138139
{
139140
Status = false,
140-
Message = "用户名或密码不能为空"
141+
message = "用户名或密码不能为空"
141142
});
142143
}
143144

@@ -148,6 +149,7 @@ public async Task<object> GetJWTToken3(string name = "", string pass = "")
148149
//如果是基于用户的授权策略，这里要添加用户;如果是基于角色的授权策略，这里要添加角色
149150
var claims = new List<Claim> {
150151
new Claim(ClaimTypes.Name, name),
152+
new Claim(JwtRegisteredClaimNames.Jti, user.FirstOrDefault().uID.ToString()),
151153
new Claim(ClaimTypes.Expiration, DateTime.Now.AddSeconds(_requirement.Expiration.TotalSeconds).ToString()) };
152154
claims.AddRange(userRoles.Split(',').Select(s => new Claim(ClaimTypes.Role, s)));
153155

@@ -163,7 +165,7 @@ public async Task<object> GetJWTToken3(string name = "", string pass = "")
163165
return new JsonResult(new
164166
{
165167
success = false,
166-
Message = "认证失败"
168+
message = "认证失败"
167169
});
168170
}
169171

‎Blog.Core/Controllers/RoleController.cs‎

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Threading.Tasks;
5+
using Blog.Core.IServices;
6+
using Blog.Core.Model;
7+
using Blog.Core.Model.Models;
8+
using Microsoft.AspNetCore.Authorization;
9+
using Microsoft.AspNetCore.Http;
10+
using Microsoft.AspNetCore.Mvc;
11+
12+
namespace Blog.Core.Controllers
13+
{
14+
[Route("api/[controller]")]
15+
[ApiController]
16+
//[Authorize("Permission")]
17+
public class RoleController : ControllerBase
18+
{
19+
IRoleServices _roleServices;
20+
21+
/// <summary>
22+
/// 构造函数
23+
/// </summary>
24+
/// <param name="roleServices"></param>
25+
public RoleController(IRoleServices roleServices )
26+
{
27+
_roleServices = roleServices;
28+
}
29+
30+
// GET: api/User
31+
[HttpGet]
32+
public async Task<MessageModel<PageModel<Role>>> Get(int page = 1, string key = "")
33+
{
34+
var data = new MessageModel<PageModel<Role>>();
35+
int intTotalCount = 100;
36+
int TotalCount = 0;
37+
int PageCount = 1;
38+
List<Role> Roles = new List<Role>();
39+
40+
Roles = await _roleServices.Query(a => a.IsDeleted != true );
41+
42+
if (!string.IsNullOrEmpty(key))
43+
{
44+
Roles = Roles.Where(t => (t.Name != null && t.Name.Contains(key))).ToList();
45+
}
46+
47+
48+
//筛选后的数据总数
49+
TotalCount = Roles.Count;
50+
//筛选后的总页数
51+
PageCount = (Math.Ceiling(TotalCount.ObjToDecimal() / intTotalCount.ObjToDecimal())).ObjToInt();
52+
53+
Roles = Roles.OrderByDescending(d => d.Id).Skip((page - 1) * intTotalCount).Take(intTotalCount).ToList();
54+
55+
return new MessageModel<PageModel<Role>>()
56+
{
57+
msg = "获取成功",
58+
success = TotalCount >= 0,
59+
response = new PageModel<Role>()
60+
{
61+
page = page,
62+
pageCount = PageCount,
63+
dataCount = TotalCount,
64+
data = Roles,
65+
}
66+
};
67+
68+
}
69+
70+
// GET: api/User/5
71+
[HttpGet("{id}")]
72+
public string Get(string id)
73+
{
74+
return "value";
75+
}
76+
77+
// POST: api/User
78+
[HttpPost]
79+
public async Task<MessageModel<string>> Post([FromBody] Role Role)
80+
{
81+
var data = new MessageModel<string>();
82+
83+
var id = (await _roleServices.Add(Role));
84+
data.success = id > 0;
85+
if (data.success)
86+
{
87+
data.response = id.ObjToString();
88+
data.msg = "添加成功";
89+
}
90+
91+
return data;
92+
}
93+
94+
// PUT: api/User/5
95+
[HttpPut]
96+
public async Task<MessageModel<string>> Put([FromBody] Role Role)
97+
{
98+
var data = new MessageModel<string>();
99+
if (Role != null && Role.Id > 0)
100+
{
101+
data.success = await _roleServices.Update(Role);
102+
if (data.success)
103+
{
104+
data.msg = "更新成功";
105+
data.response = Role?.Id.ObjToString();
106+
}
107+
}
108+
109+
return data;
110+
}
111+
112+
// DELETE: api/ApiWithActions/5
113+
[HttpDelete]
114+
public async Task<MessageModel<string>> Delete(int id)
115+
{
116+
var data = new MessageModel<string>();
117+
if (id > 0)
118+
{
119+
var userDetail = await _roleServices.QueryByID(id);
120+
userDetail.IsDeleted = true;
121+
data.success = await _roleServices.Update(userDetail);
122+
if (data.success)
123+
{
124+
data.msg = "删除成功";
125+
data.response = userDetail?.Id.ObjToString();
126+
}
127+
}
128+
129+
return data;
130+
}
131+
}
132+
}

‎Blog.Core/Controllers/TopicController.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ public TopicController(ITopicServices topicServices)
2626
public async Task<MessageModel<List<Topic>>> Get()
2727
{
2828
var data = new MessageModel<List<Topic>>();
29-
data.Response = await _topicServices.GetTopics();
30-
if (data.Response != null)
29+
data.response = await _topicServices.GetTopics();
30+
if (data.response != null)
3131
{
32-
data.Success = true;
33-
data.Msg = "";
32+
data.success = true;
33+
data.msg = "";
3434
}
3535
return data;
3636
}

‎Blog.Core/Controllers/TopicDetailController.cs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ public async Task<MessageModel<PageModel<TopicDetail>>> Get(int page = 1, string
7070

7171
return new MessageModel<PageModel<TopicDetail>>()
7272
{
73-
Msg = "获取成功",
74-
Success = TotalCount >= 0,
75-
Response = new PageModel<TopicDetail>()
73+
msg = "获取成功",
74+
success = TotalCount >= 0,
75+
response = new PageModel<TopicDetail>()
7676
{
7777
page = page,
7878
pageCount = PageCount,
@@ -90,11 +90,11 @@ public async Task<MessageModel<TopicDetail>> Get(int id)
9090
{
9191
var data = new MessageModel<TopicDetail>();
9292
var response = await _topicDetailServices.QueryByID(id);
93-
data.Response = response.tdIsDelete ? null : response;
94-
if (data.Response != null)
93+
data.response = response.tdIsDelete ? null : response;
94+
if (data.response != null)
9595
{
96-
data.Success = true;
97-
data.Msg = "";
96+
data.success = true;
97+
data.msg = "";
9898
}
9999

100100
return data;
@@ -114,11 +114,11 @@ public async Task<MessageModel<string>> Post([FromBody] TopicDetail topicDetail)
114114
topicDetail.tdTop = 0;
115115

116116
var id = (await _topicDetailServices.Add(topicDetail));
117-
data.Success = id > 0;
118-
if (data.Success)
117+
data.success = id > 0;
118+
if (data.success)
119119
{
120-
data.Response = id.ObjToString();
121-
data.Msg = "添加成功";
120+
data.response = id.ObjToString();
121+
data.msg = "添加成功";
122122
}
123123

124124
return data;
@@ -132,11 +132,11 @@ public async Task<MessageModel<string>> Put([FromBody] TopicDetail topicDetail)
132132
var data = new MessageModel<string>();
133133
if (topicDetail != null && topicDetail.Id > 0)
134134
{
135-
data.Success = await _topicDetailServices.Update(topicDetail);
136-
if (data.Success)
135+
data.success = await _topicDetailServices.Update(topicDetail);
136+
if (data.success)
137137
{
138-
data.Msg = "更新成功";
139-
data.Response = topicDetail?.Id.ObjToString();
138+
data.msg = "更新成功";
139+
data.response = topicDetail?.Id.ObjToString();
140140
}
141141
}
142142

@@ -153,11 +153,11 @@ public async Task<MessageModel<string>> Delete(int id)
153153
{
154154
var topicDetail = await _topicDetailServices.QueryByID(id);
155155
topicDetail.tdIsDelete = true;
156-
data.Success = await _topicDetailServices.Update(topicDetail);
157-
if (data.Success)
156+
data.success = await _topicDetailServices.Update(topicDetail);
157+
if (data.success)
158158
{
159-
data.Msg = "删除成功";
160-
data.Response = topicDetail?.Id.ObjToString();
159+
data.msg = "删除成功";
160+
data.response = topicDetail?.Id.ObjToString();
161161
}
162162
}
163163

0 commit comments

Comments
 (0)