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

优化代码

Browse Source
This commit is contained in:
不做码农 2021-12-04 08:24:38 +08:00
parent ea81780636
commit 94d586ee9e
8 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
View File

@ -27,6 +27,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <summary> /// <summary>
/// 代码生成 /// 代码生成
/// </summary> /// </summary>
[Verify]
[Route("tool/gen")] [Route("tool/gen")]
public class CodeGeneratorController : BaseController public class CodeGeneratorController : BaseController
{ {

7
ZR.Admin.WebApi/Controllers/System/SysProfileController.cs
View File

@ -120,10 +120,11 @@ namespace ZR.Admin.WebApi.Controllers.System
/// <summary> /// <summary>
/// 修改头像 /// 修改头像
/// </summary> /// </summary>
/// <param name="formFile"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("Avatar")] [HttpPost("Avatar")]
[ActionPermissionFilter(Permission = "system")] [ActionPermissionFilter(Permission = "system")]
//[Log(Title = "修改头像", BusinessType = BusinessType.UPDATE)] [Log(Title = "修改头像", BusinessType = BusinessType.UPDATE, IsSaveRequestData = false)]
public IActionResult Avatar([FromForm(Name = "picture")] IFormFile formFile) public IActionResult Avatar([FromForm(Name = "picture")] IFormFile formFile)
{ {
LoginUser loginUser = Framework.JwtUtil.GetLoginUser(HttpContext); LoginUser loginUser = Framework.JwtUtil.GetLoginUser(HttpContext);
@ -131,7 +132,7 @@ namespace ZR.Admin.WebApi.Controllers.System
if (formFile == null) throw new CustomException("请选择文件"); if (formFile == null) throw new CustomException("请选择文件");
string fileExt = Path.GetExtension(formFile.FileName); string fileExt = Path.GetExtension(formFile.FileName);
string savePath = Path.Combine("wwwroot", FileUtil.GetdirPath("uploads")); string savePath = Path.Combine(hostEnvironment.WebRootPath, FileUtil.GetdirPath("uploads"));
Console.WriteLine(savePath); Console.WriteLine(savePath);
if (!Directory.Exists(savePath)) { Directory.CreateDirectory(savePath); } if (!Directory.Exists(savePath)) { Directory.CreateDirectory(savePath); }
@ -141,7 +142,7 @@ namespace ZR.Admin.WebApi.Controllers.System
using (var stream = new FileStream(finalFilePath, FileMode.Create)) using (var stream = new FileStream(finalFilePath, FileMode.Create))
{ {
formFile.CopyToAsync(stream); formFile.CopyTo(stream);
} }
string accessUrl = $"{OptionsSetting.Upload.UploadUrl}/{FileUtil.GetdirPath("uploads")}{fileName}"; string accessUrl = $"{OptionsSetting.Upload.UploadUrl}/{FileUtil.GetdirPath("uploads")}{fileName}";

2
ZR.Admin.WebApi/Controllers/System/TasksController.cs
View File

@ -20,7 +20,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <summary> /// <summary>
/// 计划任务 /// 计划任务
/// </summary> /// </summary>
//[Verify] [Verify]
[Route("system/Tasks")] [Route("system/Tasks")]
public class TasksController : BaseController public class TasksController : BaseController
{ {

1
ZR.Admin.WebApi/Controllers/System/TasksLogController.cs
View File

@ -13,6 +13,7 @@ using Infrastructure;
namespace ZR.Admin.WebApi.Controllers.System namespace ZR.Admin.WebApi.Controllers.System
{ {
[Verify]
[Route("/monitor/jobLog")] [Route("/monitor/jobLog")]
public class TasksLogController : BaseController public class TasksLogController : BaseController
{ {

7
ZR.Admin.WebApi/Startup.cs
View File

@ -90,7 +90,12 @@ namespace ZR.Admin.WebApi
services.AddSwaggerGen(c => services.AddSwaggerGen(c =>
{ {
c.SwaggerDoc("v1", new OpenApiInfo { Title = "ZrAdmin", Version = "v1" }); c.SwaggerDoc("v1", new OpenApiInfo
{
Title = "ZrAdmin.NET Api - .NET5",
Version = "v1",
Description = "",
});
//if (CurrentEnvironment.IsDevelopment()) //if (CurrentEnvironment.IsDevelopment())
//{ //{
//添加文档注释 //添加文档注释

2
ZR.CodeGenerator/CodeGeneratorTool.cs
View File

@ -409,7 +409,7 @@ namespace ZR.CodeGenerator
/// <param name="replaceDto"></param> /// <param name="replaceDto"></param>
private static void InitJntTemplate(GenerateDto dto, ReplaceDto replaceDto) private static void InitJntTemplate(GenerateDto dto, ReplaceDto replaceDto)
{ {
//Engine.Current.Clean(); Engine.Current.Clean();
//jnt模板引擎全局变量 //jnt模板引擎全局变量
Engine.Configure((options) => Engine.Configure((options) =>

2
ZR.Vue/src/permission.js
View File

@ -17,7 +17,7 @@ const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/demo']
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
NProgress.start() NProgress.start()
console.log(to.path); console.log('router to ' + to.path);
const hasToken = getToken() const hasToken = getToken()
if (hasToken) { if (hasToken) {

4
ZR.Vue/src/store/modules/permission.js
View File

@ -21,10 +21,10 @@ const permission = {
}, },
SET_TOPBAR_ROUTES: (state, routes) => { SET_TOPBAR_ROUTES: (state, routes) => {
// 顶部导航菜单默认添加统计报表栏指向首页 // 顶部导航菜单默认添加统计报表栏指向首页
// const index = [{ const index = [{
// path: 'index', // path: 'index',
// meta: { title: '系统首页', icon: 'dashboard' } // meta: { title: '系统首页', icon: 'dashboard' }
// }] }]
state.topbarRouters = routes;//.concat(index); state.topbarRouters = routes;//.concat(index);
}, },
SET_SIDEBAR_ROUTERS: (state, routes) => { SET_SIDEBAR_ROUTERS: (state, routes) => {