From 94d586ee9e43b27a2e6a17d233844f6a3e9b467b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sat, 4 Dec 2021 08:24:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/System/CodeGeneratorController.cs | 1 +
.../Controllers/System/SysProfileController.cs | 7 ++++---
ZR.Admin.WebApi/Controllers/System/TasksController.cs | 2 +-
.../Controllers/System/TasksLogController.cs | 1 +
ZR.Admin.WebApi/Startup.cs | 7 ++++++-
ZR.CodeGenerator/CodeGeneratorTool.cs | 2 +-
ZR.Vue/src/permission.js | 2 +-
ZR.Vue/src/store/modules/permission.js | 10 +++++-----
8 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
index 53c9d73..61fc996 100644
--- a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
@@ -27,6 +27,7 @@ namespace ZR.Admin.WebApi.Controllers
///
/// 代码生成
///
+ [Verify]
[Route("tool/gen")]
public class CodeGeneratorController : BaseController
{
diff --git a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs
index c846d5a..bb310ac 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs
@@ -120,10 +120,11 @@ namespace ZR.Admin.WebApi.Controllers.System
///
/// 修改头像
///
+ ///
///
[HttpPost("Avatar")]
[ActionPermissionFilter(Permission = "system")]
- //[Log(Title = "修改头像", BusinessType = BusinessType.UPDATE)]
+ [Log(Title = "修改头像", BusinessType = BusinessType.UPDATE, IsSaveRequestData = false)]
public IActionResult Avatar([FromForm(Name = "picture")] IFormFile formFile)
{
LoginUser loginUser = Framework.JwtUtil.GetLoginUser(HttpContext);
@@ -131,7 +132,7 @@ namespace ZR.Admin.WebApi.Controllers.System
if (formFile == null) throw new CustomException("请选择文件");
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);
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))
{
- formFile.CopyToAsync(stream);
+ formFile.CopyTo(stream);
}
string accessUrl = $"{OptionsSetting.Upload.UploadUrl}/{FileUtil.GetdirPath("uploads")}{fileName}";
diff --git a/ZR.Admin.WebApi/Controllers/System/TasksController.cs b/ZR.Admin.WebApi/Controllers/System/TasksController.cs
index b869435..d2d8148 100644
--- a/ZR.Admin.WebApi/Controllers/System/TasksController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/TasksController.cs
@@ -20,7 +20,7 @@ namespace ZR.Admin.WebApi.Controllers
///
/// 计划任务
///
- //[Verify]
+ [Verify]
[Route("system/Tasks")]
public class TasksController : BaseController
{
diff --git a/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs b/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs
index 8a670e5..867ba3d 100644
--- a/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs
@@ -13,6 +13,7 @@ using Infrastructure;
namespace ZR.Admin.WebApi.Controllers.System
{
+ [Verify]
[Route("/monitor/jobLog")]
public class TasksLogController : BaseController
{
diff --git a/ZR.Admin.WebApi/Startup.cs b/ZR.Admin.WebApi/Startup.cs
index 1614b35..4e74224 100644
--- a/ZR.Admin.WebApi/Startup.cs
+++ b/ZR.Admin.WebApi/Startup.cs
@@ -90,7 +90,12 @@ namespace ZR.Admin.WebApi
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())
//{
//ĵע
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index 8a1873d..eadb973 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -409,7 +409,7 @@ namespace ZR.CodeGenerator
///
private static void InitJntTemplate(GenerateDto dto, ReplaceDto replaceDto)
{
- //Engine.Current.Clean();
+ Engine.Current.Clean();
//jnt模板引擎全局变量
Engine.Configure((options) =>
diff --git a/ZR.Vue/src/permission.js b/ZR.Vue/src/permission.js
index 32676e7..b8f84ae 100644
--- a/ZR.Vue/src/permission.js
+++ b/ZR.Vue/src/permission.js
@@ -17,7 +17,7 @@ const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/demo']
router.beforeEach((to, from, next) => {
NProgress.start()
- console.log(to.path);
+ console.log('router to ' + to.path);
const hasToken = getToken()
if (hasToken) {
diff --git a/ZR.Vue/src/store/modules/permission.js b/ZR.Vue/src/store/modules/permission.js
index 093d46d..5493903 100644
--- a/ZR.Vue/src/store/modules/permission.js
+++ b/ZR.Vue/src/store/modules/permission.js
@@ -21,11 +21,11 @@ const permission = {
},
SET_TOPBAR_ROUTES: (state, routes) => {
// 顶部导航菜单默认添加统计报表栏指向首页
- // const index = [{
- // path: 'index',
- // meta: { title: '系统首页', icon: 'dashboard' }
- // }]
- state.topbarRouters = routes; //.concat(index);
+ const index = [{
+ // path: 'index',
+ // meta: { title: '系统首页', icon: 'dashboard' }
+ }]
+ state.topbarRouters = routes;//.concat(index);
},
SET_SIDEBAR_ROUTERS: (state, routes) => {
state.sidebarRouters = routes