Skip to content

Commit 22df809

Browse files
author
宁骑
committed
更改部分接口的返回方式，简化返回代码
1 parent 9243db9 commit 22df809

File tree

6 files changed

+156
-131
lines changed

6 files changed

+156
-131
lines changed

‎Blog.Core.Api/Blog.Core.xml‎

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

‎Blog.Core.Api/Controllers/BaseApiController.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@ public MessageModel<T> Success<T>(T data, string msg = "成功")
1616
response = data,
1717
};
1818
}
19+
// [NonAction]
20+
//public MessageModel<T> Success<T>(T data, string msg = "成功",bool success = true)
21+
//{
22+
// return new MessageModel<T>()
23+
// {
24+
// success = success,
25+
// msg = msg,
26+
// response = data,
27+
// };
28+
//}
1929
[NonAction]
2030
public MessageModel Success(string msg = "成功")
2131
{

‎Blog.Core.Api/Controllers/ModuleController.cs‎

Lines changed: 44 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace Blog.Core.Controllers
1717
[Route("api/[controller]/[action]")]
1818
[ApiController]
1919
[Authorize(Permissions.Name)]
20-
public class ModuleController : ControllerBase
20+
public class ModuleController : BaseApiController
2121
{
2222
readonly IModuleServices _moduleServices;
2323
readonly IUser _user;
@@ -49,12 +49,9 @@ public async Task<MessageModel<PageModel<Modules>>> Get(int page = 1, string key
4949

5050
var data = await _moduleServices.QueryPage(whereExpression, page, intPageSize, " Id desc ");
5151

52-
return new MessageModel<PageModel<Modules>>()
53-
{
54-
msg = "获取成功",
55-
success = data.dataCount >= 0,
56-
response = data
57-
};
52+
53+
return Success(data, "获取成功");
54+
5855

5956
}
6057

@@ -74,20 +71,11 @@ public string Get(string id)
7471
[HttpPost]
7572
public async Task<MessageModel<string>> Post([FromBody] Modules module)
7673
{
77-
var data = new MessageModel<string>();
78-
7974
module.CreateId = _user.ID;
8075
module.CreateBy = _user.Name;
81-
8276
var id = (await _moduleServices.Add(module));
83-
data.success = id > 0;
84-
if (data.success)
85-
{
86-
data.response = id.ObjToString();
87-
data.msg = "添加成功";
88-
}
77+
return id > 0 ? Success(id.ObjToString(), "添加成功") : Failed();
8978

90-
return data;
9179
}
9280

9381
/// <summary>
@@ -99,18 +87,22 @@ public async Task<MessageModel<string>> Post([FromBody] Modules module)
9987
[HttpPut]
10088
public async Task<MessageModel<string>> Put([FromBody] Modules module)
10189
{
102-
var data = new MessageModel<string>();
103-
if (module != null && module.Id > 0)
104-
{
105-
data.success = await _moduleServices.Update(module);
106-
if (data.success)
107-
{
108-
data.msg = "更新成功";
109-
data.response = module?.Id.ObjToString();
110-
}
111-
}
112-
113-
return data;
90+
//var data = new MessageModel<string>();
91+
//if (module != null && module.Id > 0)
92+
//{
93+
//data.success = await _moduleServices.Update(module);
94+
//if (data.success)
95+
//{
96+
// data.msg = "更新成功";
97+
// data.response = module?.Id.ObjToString();
98+
//}
99+
100+
// }
101+
102+
//return data;
103+
if (module == null || module.Id <= 0)
104+
return Failed("缺少参数");
105+
return await _moduleServices.Update(module) ? Success(module?.Id.ObjToString(), "更新成功") : Failed();
114106
}
115107

116108
/// <summary>
@@ -122,20 +114,28 @@ public async Task<MessageModel<string>> Put([FromBody] Modules module)
122114
[HttpDelete]
123115
public async Task<MessageModel<string>> Delete(int id)
124116
{
125-
var data = new MessageModel<string>();
126-
if (id > 0)
127-
{
128-
var userDetail = await _moduleServices.QueryById(id);
129-
userDetail.IsDeleted = true;
130-
data.success = await _moduleServices.Update(userDetail);
131-
if (data.success)
132-
{
133-
data.msg = "删除成功";
134-
data.response = userDetail?.Id.ObjToString();
135-
}
136-
}
137-
138-
return data;
117+
if (id <= 0)
118+
return Failed("缺少参数");
119+
var userDetail = await _moduleServices.QueryById(id);
120+
if (userDetail == null)
121+
return Failed("信息不存在");
122+
123+
userDetail.IsDeleted = true;
124+
return await _moduleServices.Update(userDetail) ? Success(userDetail?.Id.ObjToString(), "删除成功") : Failed("删除失败");
125+
126+
//var data = new MessageModel<string>();
127+
//if (id > 0)
128+
//{
129+
// var userDetail = await _moduleServices.QueryById(id);
130+
// userDetail.IsDeleted = true;
131+
// data.success = await _moduleServices.Update(userDetail);
132+
// if (data.success)
133+
// {
134+
// data.msg = "删除成功";
135+
// data.response = userDetail?.Id.ObjToString();
136+
// }
137+
//}
138+
//return data;
139139
}
140140

141141
/// <summary>
@@ -147,7 +147,6 @@ public async Task<MessageModel<string>> Delete(int id)
147147
[HttpPost]
148148
public async Task<MessageModel<string>> BatchPost([FromBody] List<Modules> modules)
149149
{
150-
var data = new MessageModel<string>();
151150
string ids = string.Empty;
152151
int sucCount = 0;
153152

@@ -162,15 +161,7 @@ public async Task<MessageModel<string>> BatchPost([FromBody] List<Modules> modul
162161
sucCount++;
163162
}
164163
}
165-
166-
data.success = ids.IsNotEmptyOrNull();
167-
if (data.success)
168-
{
169-
data.response = ids;
170-
data.msg = $"{sucCount}条数据添加成功";
171-
}
172-
173-
return data;
164+
return ids.IsNotEmptyOrNull() ? Success(ids, $"{sucCount}条数据添加成功") : Failed();
174165
}
175166
}
176167
}

‎Blog.Core.Api/Controllers/MonitorController.cs‎

Lines changed: 55 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public MessageModel<ServerViewModel> Server()
5757
FrameworkDescription = RuntimeInformation.FrameworkDescription,
5858
MemoryFootprint = (Process.GetCurrentProcess().WorkingSet64 / 1048576).ToString("N2") + " MB",
5959
WorkingTime = DateHelper.TimeSubTract(DateTime.Now, Process.GetCurrentProcess().StartTime)
60-
});
60+
}, "获取服务器配置信息成功");
6161
}
6262

6363

@@ -72,37 +72,41 @@ public MessageModel<List<LogInfo>> Get()
7272

7373
_hubContext.Clients.All.SendAsync("ReceiveUpdate", LogLock.GetLogData()).Wait();
7474

75-
return Success<List<LogInfo>>(null);
75+
return Success<List<LogInfo>>(null, "执行成功");
7676
}
7777

7878

7979

8080
[HttpGet]
8181
public MessageModel<RequestApiWeekView> GetRequestApiinfoByWeek()
8282
{
83-
return Success(LogLock.RequestApiinfoByWeek());
83+
return Success(LogLock.RequestApiinfoByWeek(), "成功");
8484
}
8585

8686
[HttpGet]
8787
public MessageModel<AccessApiDateView> GetAccessApiByDate()
8888
{
89-
return new MessageModel<AccessApiDateView>()
90-
{
91-
msg = "获取成功",
92-
success = true,
93-
response = LogLock.AccessApiByDate()
94-
};
89+
//return new MessageModel<AccessApiDateView>()
90+
//{
91+
// msg = "获取成功",
92+
// success = true,
93+
// response = LogLock.AccessApiByDate()
94+
//};
95+
96+
return Success(LogLock.AccessApiByDate(), "获取成功");
9597
}
9698

9799
[HttpGet]
98100
public MessageModel<AccessApiDateView> GetAccessApiByHour()
99101
{
100-
return new MessageModel<AccessApiDateView>()
101-
{
102-
msg = "获取成功",
103-
success = true,
104-
response = LogLock.AccessApiByHour()
105-
};
102+
//return new MessageModel<AccessApiDateView>()
103+
//{
104+
// msg = "获取成功",
105+
// success = true,
106+
// response = LogLock.AccessApiByHour()
107+
//};
108+
109+
return Success(LogLock.AccessApiByHour(), "获取成功");
106110
}
107111

108112
private List<UserAccessModel> GetAccessLogsToday(IWebHostEnvironment environment)
@@ -192,19 +196,28 @@ public MessageModel<WelcomeInitData> GetActiveUsers([FromServices] IWebHostEnvir
192196
int activeUsersCount = activeUsers.Count;
193197
activeUsers = activeUsers.OrderByDescending(d => d.count).Take(10).ToList();
194198

195-
return new MessageModel<WelcomeInitData>()
199+
//return new MessageModel<WelcomeInitData>()
200+
//{
201+
// msg = "获取成功",
202+
// success = true,
203+
// response = new WelcomeInitData()
204+
// {
205+
// activeUsers = activeUsers,
206+
// activeUserCount = activeUsersCount,
207+
// errorCount = errorCountToday,
208+
// logs = Logs,
209+
// activeCount = GetAccessLogsTrend(environment)
210+
// }
211+
//};
212+
213+
return Success(new WelcomeInitData()
196214
{
197-
msg = "获取成功",
198-
success = true,
199-
response = new WelcomeInitData()
200-
{
201-
activeUsers = activeUsers,
202-
activeUserCount = activeUsersCount,
203-
errorCount = errorCountToday,
204-
logs = Logs,
205-
activeCount = GetAccessLogsTrend(environment)
206-
}
207-
};
215+
activeUsers = activeUsers,
216+
activeUserCount = activeUsersCount,
217+
errorCount = errorCountToday,
218+
logs = Logs,
219+
activeCount = GetAccessLogsTrend(environment)
220+
}, "获取成功");
208221
}
209222

210223
[HttpGet]
@@ -236,16 +249,22 @@ public async Task<MessageModel<AccessApiDateView>> GetIds4Users()
236249
count = 0
237250
});
238251
}
239-
return new MessageModel<AccessApiDateView>()
252+
//return new MessageModel<AccessApiDateView>()
253+
//{
254+
// msg = "获取成功",
255+
// success = true,
256+
// response = new AccessApiDateView
257+
// {
258+
// columns = new string[] { "date", "count" },
259+
// rows = apiDates.OrderBy(d => d.date).ToList(),
260+
// }
261+
//};
262+
263+
return Success(new AccessApiDateView
240264
{
241-
msg = "获取成功",
242-
success = true,
243-
response = new AccessApiDateView
244-
{
245-
columns = new string[] { "date", "count" },
246-
rows = apiDates.OrderBy(d => d.date).ToList(),
247-
}
248-
};
265+
columns = new string[] { "date", "count" },
266+
rows = apiDates.OrderBy(d => d.date).ToList(),
267+
}, "获取成功");
249268
}
250269

251270
}

0 commit comments

Comments
 (0)