wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决文件本地上传报错问题，速率限制独立配置文件，解决通知公告修改删除报错，nlog增加速率限制日志文件写入，增加业务单号模块，生成业务单号工具类，IIS部署用web.config

Browse Source
This commit is contained in:
wenyongda
2023-10-19 16:28:09 +08:00
parent 5174fc9ec0
commit 99d2ebcbe8
20 changed files with 598 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ZR.Admin.WebApi/Controllers/CommonController.cs
+11 -4
View File
@@ -1,5 +1,7 @@
using System.Net;
using System.Net.Sockets;
using Infrastructure.Helper;
using JinianNet.JNTemplate;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using Newtonsoft.Json;
@@ -9,6 +11,7 @@ using ZR.Service.IService;
using ZR.Service.System;
using ZR.Service.System.IService;
using ZR.ServiceCore.Model;
using ZR.ServiceCore.Services.IService;
namespace ZR.Admin.WebApi.Controllers
{
@@ -47,8 +50,11 @@ namespace ZR.Admin.WebApi.Controllers
[HttpGet]
public IActionResult Index()
{
return Ok("看到这里页面说明你已经成功启动了本项目:)\n\n" +
"如果觉得项目有用，打赏作者喝杯咖啡作为奖励\n☛☛http://www.izhaorui.cn/doc/support.html\n");
var contentTpl = JnHelper.ReadTemplate("", "logo.txt");
var content = contentTpl?.Render();
// return Ok("看到这里页面说明你已经成功启动了本项目:)\n\n" +
// $"{content}如果觉得项目有用，打赏作者喝杯咖啡作为奖励\n☛☛http://www.izhaorui.cn/doc/support.html\n");
return Ok($"{content}\n\n看到这里页面说明你已经成功启动了本项目:)\n");
}
/// <summary>
@@ -160,7 +166,7 @@ namespace ZR.Admin.WebApi.Controllers
uploadDto.FileDir = OptionsSetting.Upload.LocalSavePath;
}
file = await SysFileService.SaveFileToLocal(savePath, uploadDto.FileName, uploadDto.FileDir,
HttpContext.GetName(), formFile, scheme + serverIP);
HttpContext.GetUId(), HttpContext.GetName(), formFile, scheme + serverIP);
break;
case StoreType.REMOTE:
break;
@@ -174,7 +180,8 @@ namespace ZR.Admin.WebApi.Controllers
{
return ToResponse(ResultCode.CUSTOM_ERROR, "上传文件过大，不能超过 " + AlimaxContentLength + " MB");
}
file = new(formFile.FileName, uploadDto.FileName, fileExt, fileSize + "kb", uploadDto.FileDir, HttpContext.GetName())
file = new(formFile.FileName, uploadDto.FileName, fileExt, fileSize + "kb",
uploadDto.FileDir, HttpContext.GetUId(), HttpContext.GetName())
{
StoreType = (int)StoreType.ALIYUN,
FileType = formFile.ContentType
ZR.Admin.WebApi/Controllers/System/BaseCodeRuleController.cs
+45
View File
@@ -0,0 +1,45 @@
using ZR.Model;
using ZR.Model.System;
using ZR.ServiceCore.Services.IService;
namespace ZR.Admin.WebApi.Controllers.System;
[Route("base/codeRule")]
public class BaseCodeRuleController : BaseController
{
private static readonly NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger();
private readonly IBaseCodeRuleService _baseCodeRuleService;
public BaseCodeRuleController(IBaseCodeRuleService baseCodeRuleService)
{
_baseCodeRuleService = baseCodeRuleService;
}
[HttpPost("addBaseCodeRule")]
public async Task<IActionResult> AddBaseCodeRule([FromBody] BaseCodeRule baseCodeRule)
{
var result = await _baseCodeRuleService.InsertBaseCodeRuleAsync(baseCodeRule);
return SUCCESS(result);
}
[HttpDelete("deleteBaseCodeRule/{code}")]
public async Task<IActionResult> DeleteBaseCodeRule(string code)
{
var result = await _baseCodeRuleService.DeleteBaseCodeRuleAsync(code);
return SUCCESS(result);
}
[HttpPut("updateBaseCodeRule")]
public async Task<IActionResult> UpdateBaseCodeRule([FromBody] BaseCodeRule baseCodeRule)
{
var result = await _baseCodeRuleService.UpdateBaseCodeRule(baseCodeRule);
return SUCCESS(result);
}
[HttpGet("getBaseCodeRuleList")]
public IActionResult GetBaseCodeRuleList([FromQuery] BaseCodeRule baseCodeRule, [FromQuery] PagerInfo pagerInfo)
{
var result = _baseCodeRuleService.SelectBaseCodeRulePage(baseCodeRule, pagerInfo);
return SUCCESS(result);
}
}
ZR.Admin.WebApi/Controllers/System/SysFileController.cs
+1
View File
@@ -5,6 +5,7 @@ using ZR.Model.System;
using ZR.Service.System.IService;
using ZR.ServiceCore.Model;
using ZR.ServiceCore.Model.Dto;
using ZR.ServiceCore.Services.IService;
namespace ZR.Admin.WebApi.Controllers
{
ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs
+17 -17
View File
@@ -22,12 +22,12 @@ namespace ZR.Admin.WebApi.Controllers.System
/// <summary>
/// 通知公告表接口
/// </summary>
private readonly ISysNoticeService _SysNoticeService;
private readonly ISysNoticeService _sysNoticeService;
private readonly IHubContext<MessageHub> _hubContext;
public SysNoticeController(ISysNoticeService SysNoticeService, IHubContext<MessageHub> hubContext)
public SysNoticeController(ISysNoticeService sysNoticeService, IHubContext<MessageHub> hubContext)
{
_SysNoticeService = SysNoticeService;
_sysNoticeService = sysNoticeService;
_hubContext = hubContext;
}
@@ -41,7 +41,7 @@ namespace ZR.Admin.WebApi.Controllers.System
var predicate = Expressionable.Create<SysNotice>();
predicate = predicate.And(m => m.Status == 0);
var response = _SysNoticeService.GetPages(predicate.ToExpression(), parm);
var response = _sysNoticeService.GetPages(predicate.ToExpression(), parm);
return SUCCESS(response);
}
@@ -53,19 +53,19 @@ namespace ZR.Admin.WebApi.Controllers.System
[ActionPermissionFilter(Permission = "system:notice:list")]
public IActionResult QuerySysNotice([FromQuery] SysNoticeQueryDto parm)
{
PagedInfo<SysNotice> response = _SysNoticeService.GetPageList(parm);
PagedInfo<SysNotice> response = _sysNoticeService.GetPageList(parm);
return SUCCESS(response);
}
/// <summary>
/// 查询通知公告表详情
/// </summary>
/// <param name="NoticeId"></param>
/// <param name="noticeId"></param>
/// <returns></returns>
[HttpGet("{NoticeId}")]
public IActionResult GetSysNotice(int NoticeId)
[HttpGet("{noticeId}")]
public IActionResult GetSysNotice(long noticeId)
{
var response = _SysNoticeService.GetFirst(x => x.NoticeId == NoticeId);
var response = _sysNoticeService.GetFirst(x => x.NoticeId == noticeId);
return SUCCESS(response);
}
@@ -95,7 +95,7 @@ namespace ZR.Admin.WebApi.Controllers.System
// it.Create_time
// });
var result = _SysNoticeService.Insertable(modal).ExecuteReturnSnowflakeId();
var result = _sysNoticeService.Insertable(modal).ExecuteReturnSnowflakeId();
return SUCCESS(result);
}
@@ -114,7 +114,7 @@ namespace ZR.Admin.WebApi.Controllers.System
.Map(dest => dest.NoticeId, src => src.NoticeId.ParseToLong());
var model = parm.Adapt<SysNotice>(config).ToUpdate(HttpContext);
var response = _SysNoticeService.Update(w => w.NoticeId == model.NoticeId, it => new SysNotice()
var response = _sysNoticeService.Update(w => w.NoticeId == model.NoticeId, it => new SysNotice()
{
NoticeTitle = model.NoticeTitle,
NoticeType = model.NoticeType,
@@ -132,16 +132,16 @@ namespace ZR.Admin.WebApi.Controllers.System
/// 发送通知公告表
/// </summary>
/// <returns></returns>
[HttpPut("send/{NoticeId}")]
[HttpPut("send/{noticeId}")]
[ActionPermissionFilter(Permission = "system:notice:update")]
[Log(Title = "发送通知公告", BusinessType = BusinessType.OTHER)]
public IActionResult SendNotice(long NoticeId = 0)
public IActionResult SendNotice(long noticeId = 0)
{
if (NoticeId <= 0)
if (noticeId <= 0)
{
throw new CustomException("请求实体不能为空");
}
var response = _SysNoticeService.GetFirst(x => x.NoticeId == NoticeId);
var response = _sysNoticeService.GetFirst(x => x.NoticeId == noticeId);
if (response != null && response.Status == 0)
{
_hubContext.Clients.All.SendAsync(HubsConstant.ReceiveNotice, response.NoticeTitle, response.NoticeContent);
@@ -158,10 +158,10 @@ namespace ZR.Admin.WebApi.Controllers.System
[Log(Title = "通知公告", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteSysNotice(string ids)
{
int[] idsArr = Tools.SpitIntArrary(ids);
var idsArr = Tools.SpitLongArrary(ids);
if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
var response = _SysNoticeService.Delete(idsArr);
var response = _sysNoticeService.Delete(idsArr);
return SUCCESS(response);
}
ZR.Admin.WebApi/Controllers/System/SysProfileController.cs
+2 -1
View File
@@ -6,6 +6,7 @@ using ZR.Model.System;
using ZR.Service.System.IService;
using ZR.ServiceCore.Model;
using ZR.ServiceCore.Model.Dto;
using ZR.ServiceCore.Services.IService;
namespace ZR.Admin.WebApi.Controllers.System
{
@@ -133,7 +134,7 @@ namespace ZR.Admin.WebApi.Controllers.System
}
var file = await FileService.SaveFileToLocal(hostEnvironment.WebRootPath, "", "avatar",
HttpContext.GetName(), formFile, serverIP);
HttpContext.GetUId(), HttpContext.GetName(), formFile, serverIP);
UserService.UpdatePhoto(new SysUser() { Avatar = file.AccessUrl, UserId = userId });
return SUCCESS(new { imgUrl = file.AccessUrl });