用户编辑界面

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml

@@ -115,7 +115,7 @@
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.BaseSimpleCrudController`1.GetList(Yi.Framework.Model.Query.QueryCondition)">
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.BaseSimpleCrudController`1.GetList">
             <summary>
             全部列表查询
             </summary>
@@ -150,40 +150,6 @@
             <param name="page"></param>
             <returns></returns>
         </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryController.Add(Yi.Framework.Model.Models.DictionaryEntity)">
-            <summary>
-            添加字典表
-            </summary>
-            <param name="dic"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryController.GetById(System.Int64)">
-            <summary>
-            根据字典id获取字典表
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryController.GetList">
-            <summary>
-            获取全部字典表
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryController.DelList(System.Collections.Generic.List{System.Int64})">
-            <summary>
-            id范围删除
-            </summary>
-            <param name="ids"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryController.Update(Yi.Framework.Model.Models.DictionaryEntity)">
-            <summary>
-            更新
-            </summary>
-            <param name="dic"></param>
-            <returns></returns>
-        </member>
         <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryInfoController.PageList(Yi.Framework.Model.Models.DictionaryInfoEntity,Yi.Framework.Common.Models.PageParModel)">
             <summary>
             动态条件分页查询
@@ -192,13 +158,6 @@
             <param name="page"></param>
             <returns></returns>
         </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryInfoController.Add(Yi.Framework.Model.Models.DictionaryInfoEntity)">
-            <summary>
-            添加字典信息表
-            </summary>
-            <param name="dicInfo"></param>
-            <returns></returns>
-        </member>
         <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryInfoController.GetListByType(System.String)">
             <summary>
             根据字典类别获取字典信息
@@ -206,27 +165,6 @@
             <param name="type"></param>
             <returns></returns>
         </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryInfoController.DelList(System.Collections.Generic.List{System.Int64})">
-            <summary>
-            id范围删除
-            </summary>
-            <param name="ids"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryInfoController.Update(Yi.Framework.Model.Models.DictionaryInfoEntity)">
-            <summary>
-            更新
-            </summary>
-            <param name="dicInfo"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryInfoController.GetById(System.Int64)">
-            <summary>
-            根据字典id获取字典信息表
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
         <member name="T:Yi.Framework.ApiMicroservice.Controllers.FileController">
             <summary>
             文件
@@ -416,9 +354,9 @@
             <param name="giveUserSetRoleDto"></param>
             <returns></returns>
         </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.UserController.GetRoleListByUserId(System.Int64)">
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.UserController.GetById(System.Int64)">
             <summary>
-            通过用户id得到角色列表
+            通过用户id得到用户信息关联部门、岗位、角色
             </summary>
             <returns></returns>
         </member>

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs

@@ -92,7 +92,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+        //[Authorize]
         public async Task<Result> GetUserAllInfo()
         {
             //通过鉴权jwt获取到用户的id
@@ -111,7 +111,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         {
             var userId = HttpContext.GetCurrentUserEntityInfo(out _).Id;
             var data = await _iUserService.GetUserAllInfo(userId);
-           
+            
             //将后端菜单转换成前端路由，组件级别需要过滤
             List<VueRouterModel> routers = _iUserService.RouterBuild(data.Menus.ToList());
             return Result.Success().SetData(routers);

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseSimpleCrudController.cs

@@ -34,8 +34,9 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// <param name="id"></param>
         /// <returns></returns>
         [Permission($"{nameof(T)}:get")]
+        [Route("{id}")]
         [HttpGet]
-        public virtual async Task<Result> GetById(long id)
+        public virtual async Task<Result> GetById([FromRoute]long id)
         {
             return Result.Success().SetData(await _repository.GetByIdAsync(id));
         }
@@ -45,7 +46,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// </summary>
         /// <returns></returns>
         [Permission($"{nameof(T)}:get")]
-        [HttpPost]
+        [HttpGet]
         public virtual async Task<Result> GetList()
         {
             return Result.Success().SetData(await _repository.GetListAsync());

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs

@@ -21,7 +21,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
     /// </summary>
     [ApiController]
     [Route("api/[controller]/[action]")]
-    public class RoleController : BaseCrudController<RoleEntity>
+    public class RoleController : BaseSimpleCrudController<RoleEntity>
     {
         private IRoleService _iRoleService;
         public RoleController(ILogger<RoleEntity> logger, IRoleService iRoleService) : base(logger, iRoleService)

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs

@@ -21,7 +21,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
     /// </summary>
     [ApiController]
     [Route("api/[controller]/[action]")]
-    public class UserController : BaseCrudController<UserEntity>
+    public class UserController : BaseSimpleCrudController<UserEntity>
     {
         private IUserService _iUserService;
         public UserController(ILogger<UserEntity> logger, IUserService iUserService) : base(logger, iUserService)
@@ -85,13 +85,14 @@ namespace Yi.Framework.ApiMicroservice.Controllers
 
 
         /// <summary>
-        /// 通过用户id得到角色列表
+        /// 通过用户id得到用户信息关联部门、岗位、角色
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Result> GetRoleListByUserId(long userId)
+        [Route("{id}")]
+        public override async Task<Result> GetById(long id)
         {
-            return Result.Success().SetData(await _iUserService.GetRoleListByUserId(userId));
+            return Result.Success().SetData(await _iUserService.GetInfoById(id));
         }
     }
 }