Explorar o código

更新vue3路由权限
优化个人设置接口无需授权

zhontai %!s(int64=2) %!d(string=hai) anos
pai
achega
3b3741620b

+ 7 - 1
src/platform/ZhonTai.Admin/Domain/Permission/PermissionEntity.cs

@@ -48,7 +48,13 @@ public partial class PermissionEntity : EntityBase
     public ViewEntity View { get; set; }
 
     /// <summary>
-    /// 菜单路由地址
+    /// 路由命名
+    /// </summary>
+    [Column(StringLength = 100)]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 路由地址
     /// </summary>
     [Column(StringLength = 500)]
     public string Path { get; set; }

+ 1 - 1
src/platform/ZhonTai.Admin/Services/Auth/AuthService.cs

@@ -169,7 +169,7 @@ public class AuthService : BaseService, IAuthService, IDynamicApi
 
             var menuList = await menuSelect
                 .Where(a => new[] { PermissionType.Group, PermissionType.Menu }.Contains(a.Type))
-                .ToListAsync(a => new AuthUserMenuDto { ViewPath = a.View.Path, ViewName = a.View.Name });
+                .ToListAsync(a => new AuthUserMenuDto { ViewPath = a.View.Path });
 
             //用户菜单
             authGetUserInfoOutput.Menus = menuList.DistinctBy(a => a.Id).OrderBy(a => a.ParentId).ThenBy(a => a.Sort).ToList();

+ 5 - 5
src/platform/ZhonTai.Admin/Services/Auth/Dto/AuthUserMenuDto.cs

@@ -15,19 +15,19 @@ public class AuthUserMenuDto
     public long ParentId { get; set; }
 
     /// <summary>
-    /// 访问地址
+    /// 路由地址
     /// </summary>
     public string Path { get; set; }
 
     /// <summary>
-    /// 视图地址
+    /// 路由命名
     /// </summary>
-    public string ViewPath { get; set; }
+    public string Name { get; set; }
 
     /// <summary>
-    /// 视图命名
+    /// 视图地址
     /// </summary>
-    public string ViewName { get; set; }
+    public string ViewPath { get; set; }
 
     /// <summary>
     /// 重定向地址

+ 5 - 0
src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionAddGroupInput.cs

@@ -12,6 +12,11 @@ public class PermissionAddGroupInput
     /// </summary>
     public long? ViewId { get; set; }
 
+    /// <summary>
+    /// 路由命名
+    /// </summary>
+    public string Name { get; set; }
+
     /// <summary>
     /// 访问路由地址
     /// </summary>

+ 5 - 0
src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionAddMenuInput.cs

@@ -14,6 +14,11 @@ public class PermissionAddMenuInput
     /// </summary>
     public long? ViewId { get; set; }
 
+    /// <summary>
+    /// 路由命名
+    /// </summary>
+    public string Name { get; set; }
+
     /// <summary>
     /// 路由地址
     /// </summary>

+ 5 - 0
src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionListOutput.cs

@@ -39,6 +39,11 @@ public class PermissionListOutput
     /// </summary>
     public string ViewPath { get; set; }
 
+    /// <summary>
+    /// 链接地址
+    /// </summary>
+    public string Link { get; set; }
+
     /// <summary>
     /// 接口路径
     /// </summary>

+ 3 - 0
src/platform/ZhonTai.Admin/Services/User/UserService.cs

@@ -240,6 +240,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
     /// 查询用户基本信息
     /// </summary>
     /// <returns></returns>
+    [Login]
     public async Task<UserUpdateBasicInput> GetBasicAsync()
     {
         if (!(User?.Id > 0))
@@ -502,6 +503,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [Login]
     public async Task UpdateBasicAsync(UserUpdateBasicInput input)
     {
         var entity = await _userRepository.GetAsync(input.Id);
@@ -514,6 +516,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [Login]
     public async Task ChangePasswordAsync(UserChangePasswordInput input)
     {
         if (input.ConfirmPassword != input.NewPassword)

+ 26 - 6
src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -2273,9 +2273,14 @@
             视图
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Domain.Permission.PermissionEntity.Name">
+            <summary>
+            路由命名
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Domain.Permission.PermissionEntity.Path">
             <summary>
-            菜单路由地址
+            路由地址
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Domain.Permission.PermissionEntity.Redirect">
@@ -3503,17 +3508,17 @@
         </member>
         <member name="P:ZhonTai.Admin.Services.Auth.Dto.AuthUserMenuDto.Path">
             <summary>
-            访问地址
+            路由地址
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Auth.Dto.AuthUserMenuDto.ViewPath">
+        <member name="P:ZhonTai.Admin.Services.Auth.Dto.AuthUserMenuDto.Name">
             <summary>
-            视图地址
+            路由命名
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Auth.Dto.AuthUserMenuDto.ViewName">
+        <member name="P:ZhonTai.Admin.Services.Auth.Dto.AuthUserMenuDto.ViewPath">
             <summary>
-            视图命名
+            视图地址
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Services.Auth.Dto.AuthUserMenuDto.Redirect">
@@ -4748,6 +4753,11 @@
             视图
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Services.Permission.Dto.PermissionAddGroupInput.Name">
+            <summary>
+            路由命名
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Services.Permission.Dto.PermissionAddGroupInput.Path">
             <summary>
             访问路由地址
@@ -4798,6 +4808,11 @@
             视图
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Services.Permission.Dto.PermissionAddMenuInput.Name">
+            <summary>
+            路由命名
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Services.Permission.Dto.PermissionAddMenuInput.Path">
             <summary>
             路由地址
@@ -4898,6 +4913,11 @@
             视图地址
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Services.Permission.Dto.PermissionListOutput.Link">
+            <summary>
+            链接地址
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Services.Permission.Dto.PermissionListOutput.ApiPaths">
             <summary>
             接口路径