优化代码

ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs

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

ZR.Admin.WebApi/Controllers/System/SysProfileController.cs

@@ -120,10 +120,11 @@ namespace ZR.Admin.WebApi.Controllers.System
         /// <summary>
         /// 修改头像
         /// </summary>
+        /// <param name="formFile"></param>
         /// <returns></returns>
         [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}";
 

ZR.Admin.WebApi/Controllers/System/TasksController.cs

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

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
     {

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())
                 //{
                 //添加文档注释

ZR.CodeGenerator/CodeGeneratorTool.cs

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

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) {

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