Commit 02c96536 by zry

swagger

parent f24a58d2
...@@ -75,11 +75,11 @@ public ApiResponse<UserIdentity> Login([FromBody]LoginRequest request) ...@@ -75,11 +75,11 @@ public ApiResponse<UserIdentity> Login([FromBody]LoginRequest request)
/// <returns></returns> /// <returns></returns>
[Route("insert")] [Route("insert")]
[HttpPost] [HttpPost]
public ApiResponse Insert([CustomizeValidator(RuleSet = "Insert"), FromBody]UserRequest request) public ApiResponse<UserResponse> Insert([CustomizeValidator(RuleSet = "Insert"), FromBody]UserRequest request)
{ {
var userid = _claim.At(request.Token).UserID; var userid = _claim.At(request.Token).UserID;
var user = _userService.Insert(request, userid); var user = _userService.Insert(request, userid);
return new ApiResponse(ResponseType.OK, user); return new ApiResponse<UserResponse>(ResponseType.OK, user);
} }
/// <summary> /// <summary>
...@@ -89,10 +89,10 @@ public ApiResponse Insert([CustomizeValidator(RuleSet = "Insert"), FromBody]User ...@@ -89,10 +89,10 @@ public ApiResponse Insert([CustomizeValidator(RuleSet = "Insert"), FromBody]User
/// <returns></returns> /// <returns></returns>
[Route("update")] [Route("update")]
[HttpPost] [HttpPost]
public ApiResponse Update([CustomizeValidator(RuleSet = "Update"), FromBody]UserRequest request) public ApiResponse<UserResponse> Update([CustomizeValidator(RuleSet = "Update"), FromBody]UserRequest request)
{ {
var user = _userService.Update(request); var user = _userService.Update(request);
return new ApiResponse(ResponseType.OK, user); return new ApiResponse<UserResponse>(ResponseType.OK, user);
} }
/// <summary> /// <summary>
......
...@@ -46,18 +46,18 @@ public ApiResponse List([FromBody]AllotRequest request) ...@@ -46,18 +46,18 @@ public ApiResponse List([FromBody]AllotRequest request)
[Route("insert")] [Route("insert")]
[HttpPost] [HttpPost]
public ApiResponse Insert([CustomizeValidator(RuleSet = "Insert"), FromBody]AllotRequest request) public ApiResponse<AllotResponse> Insert([CustomizeValidator(RuleSet = "Insert"), FromBody]AllotRequest request)
{ {
var result = _allotService.InsertAllot(request); var result = _allotService.InsertAllot(request);
return new ApiResponse(ResponseType.OK, result); return new ApiResponse<AllotResponse>(ResponseType.OK, result);
} }
[Route("update")] [Route("update")]
[HttpPost] [HttpPost]
public ApiResponse Update([CustomizeValidator(RuleSet = "Update"), FromBody]AllotRequest request) public ApiResponse<AllotResponse> Update([CustomizeValidator(RuleSet = "Update"), FromBody]AllotRequest request)
{ {
var result = _allotService.UpdateAllot(request); var result = _allotService.UpdateAllot(request);
return new ApiResponse(ResponseType.OK, result); return new ApiResponse<AllotResponse>(ResponseType.OK, result);
} }
[Route("delete")] [Route("delete")]
...@@ -69,6 +69,7 @@ public ApiResponse Delete([CustomizeValidator(RuleSet = "Delete"), FromBody]Allo ...@@ -69,6 +69,7 @@ public ApiResponse Delete([CustomizeValidator(RuleSet = "Delete"), FromBody]Allo
} }
[Route("import")] [Route("import")]
[HttpPost]
public ApiResponse Import([FromForm] IFormCollection form) public ApiResponse Import([FromForm] IFormCollection form)
{ {
var allotid = form.ToDictionary().GetValue("allotid", 0); var allotid = form.ToDictionary().GetValue("allotid", 0);
......
...@@ -32,19 +32,19 @@ public ApiResponse<List<HospitalResponse>> GetHospitalList([FromBody]ApiRequest ...@@ -32,19 +32,19 @@ public ApiResponse<List<HospitalResponse>> GetHospitalList([FromBody]ApiRequest
[Route("insert")] [Route("insert")]
[HttpPost] [HttpPost]
public ApiResponse Insert([CustomizeValidator(RuleSet = "Insert"), FromBody]HospitalRequest request) public ApiResponse<HospitalResponse> Insert([CustomizeValidator(RuleSet = "Insert"), FromBody]HospitalRequest request)
{ {
var userid = _claim.At(request.Token).UserID; var userid = _claim.At(request.Token).UserID;
var hospital = _hospitalService.Insert(request, userid); var hospital = _hospitalService.Insert(request, userid);
return new ApiResponse(ResponseType.OK, hospital); return new ApiResponse<HospitalResponse>(ResponseType.OK, hospital);
} }
[Route("update")] [Route("update")]
[HttpPost] [HttpPost]
public ApiResponse Update([CustomizeValidator(RuleSet = "Update"), FromBody]HospitalRequest request) public ApiResponse<HospitalResponse> Update([CustomizeValidator(RuleSet = "Update"), FromBody]HospitalRequest request)
{ {
var hospital = _hospitalService.Update(request); var hospital = _hospitalService.Update(request);
return new ApiResponse(ResponseType.OK, hospital); return new ApiResponse<HospitalResponse>(ResponseType.OK, hospital);
} }
[Route("delete")] [Route("delete")]
......
...@@ -32,10 +32,10 @@ public MenuController(MenuService menuService, ClaimService claimService) ...@@ -32,10 +32,10 @@ public MenuController(MenuService menuService, ClaimService claimService)
/// <returns></returns> /// <returns></returns>
[Route("menulist")] [Route("menulist")]
[HttpPost] [HttpPost]
public ApiResponse MenuList([FromBody]ApiRequest request) public ApiResponse<List<MenuResponse>> MenuList([FromBody]ApiRequest request)
{ {
var menuList = _menuService.GetMenuList(_claim.At(request.Token).UserID); var menuList = _menuService.GetMenuList(_claim.At(request.Token).UserID);
return new ApiResponse(ResponseType.OK, menuList); return new ApiResponse<List<MenuResponse>>(ResponseType.OK, menuList);
} }
} }
} }
...@@ -11,6 +11,7 @@ namespace Performance.Api.Controllers ...@@ -11,6 +11,7 @@ namespace Performance.Api.Controllers
public class NotFoundController : ControllerBase public class NotFoundController : ControllerBase
{ {
[Route("error/404")] [Route("error/404")]
[HttpGet]
public ActionResult<ApiResponse> Get() public ActionResult<ApiResponse> Get()
{ {
return new ApiResponse(ResponseType.NotFound, "not found"); return new ApiResponse(ResponseType.NotFound, "not found");
......
...@@ -12,6 +12,7 @@ public class ValuesController : ControllerBase ...@@ -12,6 +12,7 @@ public class ValuesController : ControllerBase
{ {
// GET api/values // GET api/values
[HttpGet] [HttpGet]
[NoVerify]
public ActionResult<IEnumerable<string>> Get() public ActionResult<IEnumerable<string>> Get()
{ {
//var excel = _excelService.Analyze(@"C:\Users\ry\Desktop\文件\测试.xlsx"); //var excel = _excelService.Analyze(@"C:\Users\ry\Desktop\文件\测试.xlsx");
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
<PackageReference Include="NLog" Version="4.5.11" /> <PackageReference Include="NLog" Version="4.5.11" />
<PackageReference Include="NLog.Extensions.Logging" Version="1.4.0" /> <PackageReference Include="NLog.Extensions.Logging" Version="1.4.0" />
<PackageReference Include="NLog.Web.AspNetCore" Version="4.8.0" /> <PackageReference Include="NLog.Web.AspNetCore" Version="4.8.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
using Performance.Infrastructure; using Performance.Infrastructure;
using Performance.Repository; using Performance.Repository;
using Performance.Services; using Performance.Services;
using Swashbuckle.AspNetCore.Swagger;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
...@@ -94,6 +95,11 @@ public void ConfigureServices(IServiceCollection services) ...@@ -94,6 +95,11 @@ public void ConfigureServices(IServiceCollection services)
.Configure<Application>(Configuration.GetSection("Application")) .Configure<Application>(Configuration.GetSection("Application"))
.Configure<HuyiSmsConfig>(Configuration.GetSection("HuyiSmsConfig")); .Configure<HuyiSmsConfig>(Configuration.GetSection("HuyiSmsConfig"));
services.AddSwaggerGen(c =>
{
c.SwaggerDoc("v1", new Info { Title = "My API", Version = "v1" });
});
//huyi短信发送注入 //huyi短信发送注入
services.AddScoped<HuyiSmsNotify>(); services.AddScoped<HuyiSmsNotify>();
//用户身份信息服务 //用户身份信息服务
...@@ -119,6 +125,18 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF ...@@ -119,6 +125,18 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
{ {
app.UseStatusCodePagesWithReExecute("/error/{0}"); app.UseStatusCodePagesWithReExecute("/error/{0}");
} }
// Enable middleware to serve generated Swagger as a JSON endpoint.
app.UseSwagger();
// Enable middleware to serve swagger-ui (HTML, JS, CSS, etc.),
// specifying the Swagger JSON endpoint.
app.UseSwaggerUI(c =>
{
c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1");
c.RoutePrefix = string.Empty;
});
loggerFactory.CreateLogger<Startup>().LogDebug(env.EnvironmentName); loggerFactory.CreateLogger<Startup>().LogDebug(env.EnvironmentName);
app.UseMvc(); app.UseMvc();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment