修改部分代码

src/Hotline.Api/Controllers/KnowledgeApplyController.cs

@@ -48,8 +48,8 @@ namespace Hotline.Api.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [Permission(EPermission.KnowledgeApplyAdd)]
-        [HttpPost("apply-add")]
-        public async Task<string> ApplyAdd([FromBody] KnowledgeApplyDto dto)
+        [HttpPost("add")]
+        public async Task<string> AddApply([FromBody] KnowledgeApplyDto dto)
         {
             var ka = _mapper.Map<KnowledgeApply>(dto);
             ka.Status = EKnowledgeApplyStatus.Handling;
@@ -62,8 +62,8 @@ namespace Hotline.Api.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [Permission(EPermission.KnowledgeUpdateAdd)]
-        [HttpPut("apply-update")]
-        public async Task UpdateAdd([FromBody] UpdateKnowledgeApplyDto dto)
+        [HttpPut("update")]
+        public async Task UpdateApply([FromBody] UpdateKnowledgeApplyDto dto)
         {
             var ka = _mapper.Map<KnowledgeApply>(dto);
             await _knowledgeApplyRepository.UpdateAsync(ka, HttpContext.RequestAborted);
@@ -75,8 +75,8 @@ namespace Hotline.Api.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [Permission(EPermission.KnowApplyHandle)]
-        [HttpPut("apply-handle")]
-        public async Task ApplyHandle([FromBody] KnowledgeApplyHandleDto dto)
+        [HttpPut("handle")]
+        public async Task HandleApply([FromBody] KnowledgeApplyHandleDto dto)
         {
             //查询申请信息
             var handle = await _knowledgeApplyRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
@@ -98,7 +98,7 @@ namespace Hotline.Api.Controllers
         /// <returns></returns>
         [Permission(EPermission.KnowledgeApplyRevoke)]
         [HttpPut("apply-handle/{Id}")]
-        public async Task ApplyRevoke(string Id)
+        public async Task RevokeApply(string Id)
         {
             var handle = await _knowledgeApplyRepository.GetAsync(Id, HttpContext.RequestAborted);
             if (handle is null)
@@ -116,7 +116,7 @@ namespace Hotline.Api.Controllers
         /// <returns></returns>
         [Permission(EPermission.KnowledgeApplyReturn)]
         [HttpPut("return")]
-        public async Task ApplyReturn([FromBody] KnowledgeApplyReturnDto dto)
+        public async Task ReturnApply([FromBody] KnowledgeApplyReturnDto dto)
         {
             //查询申请信息
             var handle = await _knowledgeApplyRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
@@ -138,8 +138,8 @@ namespace Hotline.Api.Controllers
         /// <param name="Id"></param>
         /// <returns></returns>
         [Permission(EPermission.KnowledgeApplyDelete)]
-        [HttpDelete("delete")]
-        public async Task ApplyDelete(string Id)
+        [HttpDelete("remove")]
+        public async Task RemoveApply(string Id)
         {
             var handle = await _knowledgeApplyRepository.GetAsync(Id, HttpContext.RequestAborted);
             if (handle is null)
@@ -155,7 +155,7 @@ namespace Hotline.Api.Controllers
         /// <param name="Id"></param>
         /// <returns></returns>
         [HttpGet("info/{Id}")]
-        public async Task<DataKnowledgeApplyDto> ApplyInfo(string Id)
+        public async Task<DataKnowledgeApplyDto> GetApply(string Id)
         {
             var handle = await _knowledgeApplyRepository.GetAsync(Id, HttpContext.RequestAborted);
             if (handle is null)

src/Hotline.Api/Controllers/KnowledgeCommonController.cs

@@ -44,9 +44,9 @@ namespace Hotline.Api.Controllers
         /// <returns></returns>
         [Permission(EPermission.AddKnowledgeType)]
         [HttpPost("add")]
-        public async Task<string> TypeAdd([FromBody] AddKnowledgeTypeDto dto)
+        public async Task<string> AddType([FromBody] AddKnowledgeTypeDto dto)
         {
-            return await _knowledgeTypeDomainService.TypeAdd(dto, HttpContext.RequestAborted);
+            return await _knowledgeTypeDomainService.AddType(dto, HttpContext.RequestAborted);
         }
 
         /// <summary>
@@ -56,9 +56,9 @@ namespace Hotline.Api.Controllers
         /// <returns></returns>
         [Permission(EPermission.UpdateKnowledgeType)]
         [HttpPut("update")]
-        public async Task TypeUpdate([FromBody] UpdateKnowledgeTypeDto dto)
+        public async Task UpdateType([FromBody] UpdateKnowledgeTypeDto dto)
         {
-            await _knowledgeTypeDomainService.TypeUpdate(dto, HttpContext.RequestAborted);
+            await _knowledgeTypeDomainService.UpdateType(dto, HttpContext.RequestAborted);
         }
 
         /// <summary>
@@ -68,9 +68,9 @@ namespace Hotline.Api.Controllers
         /// <param name="ParentId"></param>
         /// <returns></returns>
         [HttpGet("init")]
-        public async Task<KnowledgeTypeDto> TypeInit(string Id, string ParentId)
+        public async Task<KnowledgeTypeDto> InitType(string Id, string ParentId)
         {
-            return await _knowledgeTypeDomainService.TypeInit(Id, ParentId, HttpContext.RequestAborted);
+            return await _knowledgeTypeDomainService.InitType(Id, ParentId, HttpContext.RequestAborted);
         }
 
         /// <summary>
@@ -78,8 +78,8 @@ namespace Hotline.Api.Controllers
         /// </summary>
         /// <param name="Id"></param>
         /// <returns></returns>
-        [HttpGet("info")]
-        public async Task<KnowledgeType> TypeInfo(string Id)
+        [HttpGet("info/{Id}")]
+        public async Task<KnowledgeType> GetType(string Id)
         {
             var types = await _knowledgeTypeRepository.GetAsync(Id, HttpContext.RequestAborted);
             if (types is null)
@@ -93,10 +93,10 @@ namespace Hotline.Api.Controllers
         /// <param name="Id"></param>
         /// <returns></returns>
         [Permission(EPermission.RemoveKnowledgeType)]
-        [HttpDelete("delete")]
-        public async Task TypeDelete(string Id)
+        [HttpDelete("remove")]
+        public async Task RemoveType(string Id)
         {
-            await _knowledgeTypeDomainService.TypeDelete(Id, HttpContext.RequestAborted);
+            await _knowledgeTypeDomainService.RemoveType(Id, HttpContext.RequestAborted);
         }
 
         /// <summary>
@@ -106,9 +106,9 @@ namespace Hotline.Api.Controllers
         /// <returns></returns>
         [Permission(EPermission.KnowledgeTypeChangeState)]
         [HttpPut("changestate")]
-        public async Task TypeChangeState(string Id)
+        public async Task ChangeStateType(string Id)
         {
-            await _knowledgeTypeDomainService.TypeChangeState(Id, HttpContext.RequestAborted);
+            await _knowledgeTypeDomainService.ChangeStateType(Id, HttpContext.RequestAborted);
         }
 
         /// <summary>
@@ -120,7 +120,7 @@ namespace Hotline.Api.Controllers
         [HttpPut("changestateandoffshelf")]
         public async Task TypeChangeStateAndOffShelf(string Id)
         {
-            await _knowledgeTypeDomainService.TypeChangeStateAndOffShelf(Id, HttpContext.RequestAborted);
+            await _knowledgeTypeDomainService.ChangeStateTypeAndOffShelf(Id, HttpContext.RequestAborted);
         }
 
         /// <summary>
@@ -157,8 +157,8 @@ namespace Hotline.Api.Controllers
         /// </summary>
         /// <param name="Id"></param>
         /// <returns></returns>
-        [HttpGet("standard-info/{Id}")]
-        public async Task<KnowledgeStandard> StandardInfo(string Id)
+        [HttpGet("info-standard/{Id}")]
+        public async Task<KnowledgeStandard> GetStandard(string Id)
         {
             if (string.IsNullOrEmpty(Id))
                 throw UserFriendlyException.SameMessage("ID不能为空！");
@@ -175,8 +175,8 @@ namespace Hotline.Api.Controllers
         /// <param name="Id"></param>
         /// <returns></returns>
         [Permission(EPermission.RemoveKnowledgeStandard)]
-        [HttpDelete("standard-delete")]
-        public async Task StandardDelete(string Id)
+        [HttpDelete("remove-standard")]
+        public async Task RemoveStandard(string Id)
         {
             if (string.IsNullOrEmpty(Id))
                 throw UserFriendlyException.SameMessage("ID不能为空！");
@@ -191,8 +191,8 @@ namespace Hotline.Api.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [Permission(EPermission.KnowledgeStandardAdd)]
-        [HttpPost("standard-add")]
-        public async Task StandardAdd([FromBody] AddKnowledgeStandardDto dto)
+        [HttpPost("add-standard")]
+        public async Task AddStandard([FromBody] AddKnowledgeStandardDto dto)
         {
             var sandard = _mapper.Map<KnowledgeStandard>(dto);
             await _knowledgeStandardRepository.AddAsync(sandard, HttpContext.RequestAborted);
@@ -204,8 +204,8 @@ namespace Hotline.Api.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [Permission(EPermission.KnowledgeStandardUpdate)]
-        [HttpPut("standard-update")]
-        public async Task StandardUpdate([FromBody] UpdateKnowledgeStandardDto dto)
+        [HttpPut("update-standard")]
+        public async Task UpdateStandard([FromBody] UpdateKnowledgeStandardDto dto)
         {
             var sandard = _mapper.Map<KnowledgeStandard>(dto);
             await _knowledgeStandardRepository.UpdateAsync(sandard, HttpContext.RequestAborted);

src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -74,8 +74,8 @@ namespace Hotline.Api.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [Permission(EPermission.KnowledgeDraftsAdd)]
-        [HttpPost("draftsadd")]
-        public async Task<string> KnowledgeDraftsAdd([FromBody] AddKnowledgeDto dto)
+        [HttpPost("adddrafts")]
+        public async Task<string> AddKnowledgeDrafts([FromBody] AddKnowledgeDto dto)
         {
             var kn = _mapper.Map<KnowledgeTemp>(dto);
             if (string.IsNullOrEmpty(dto.Code))
@@ -90,8 +90,8 @@ namespace Hotline.Api.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [Permission(EPermission.KnowledgeDraftsUpdate)]
-        [HttpPut("draftsupdate")]
-        public async Task KnowledgeDraftsUpdate([FromBody] UpdateKnowledgeDto dto)
+        [HttpPut("updatedrafts")]
+        public async Task UpdateKnowledgeDrafts([FromBody] UpdateKnowledgeDto dto)
         {
             var kn = _mapper.Map<KnowledgeTemp>(dto);
             await _knowledgeTempRepository.UpdateAsync(kn, HttpContext.RequestAborted);
@@ -117,8 +117,8 @@ namespace Hotline.Api.Controllers
         /// <param name="Id"></param>
         /// <returns></returns>
         [Permission(EPermission.KnowledgeDraftsDelete)]
-        [HttpDelete("draftsdelete")]
-        public async Task KnowledgeDraftsDelete(string Id)
+        [HttpDelete("removedrafts")]
+        public async Task RemoveKnowledgeDrafts(string Id)
         {
             if (string.IsNullOrEmpty(Id))
                 throw UserFriendlyException.SameMessage("Id不能为空！");
@@ -184,8 +184,8 @@ namespace Hotline.Api.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [Permission(EPermission.AddKnowledge)]
-        [HttpPost("knowadd")]
-        public async Task<string> KnowledgeAdd([FromBody] AddKnowledgeDto dto)
+        [HttpPost("add")]
+        public async Task<string> AddKnowledge([FromBody] AddKnowledgeDto dto)
         {
             //知识处理逻辑
             var knowledgeId = await _knowledgeDomainService.KnowledgeAdd(dto, HttpContext.RequestAborted);
@@ -211,8 +211,8 @@ namespace Hotline.Api.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [Permission(EPermission.KnowledgeUpdate)]
-        [HttpPut("knowupdate")]
-        public async Task KnowledgeUpdate([FromBody] UpdateKnowledgeDto dto)
+        [HttpPut("update")]
+        public async Task UpdateKnowledge([FromBody] UpdateKnowledgeDto dto)
         {
             //知识更新流程业务
             var knowId = await _knowledgeDomainService.KnowledgeUpdate(dto, HttpContext.RequestAborted);
@@ -237,8 +237,8 @@ namespace Hotline.Api.Controllers
         /// <param name="workDto"></param>
         /// <returns></returns>
         [Permission(EPermission.KnowledgeDelete)]
-        [HttpPost("knowdelete")]
-        public async Task KnowledgeDelete(string Id, [FromBody] StartWorkflowDto workDto)
+        [HttpPost("remove")]
+        public async Task RemoveKnowledge(string Id, [FromBody] StartWorkflowDto workDto)
         {
             var know = await _knowledgeRepository.GetAsync(Id, HttpContext.RequestAborted);
             if (know != null && know.IsDeleted == false)

src/Hotline/KnowledgeBase/IKnowledgeTypeDomainService.cs

@@ -9,14 +9,14 @@ namespace Hotline.KnowledgeBase
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        Task<string> TypeAdd(AddKnowledgeTypeDto dto, CancellationToken cancellationToken);
+        Task<string> AddType(AddKnowledgeTypeDto dto, CancellationToken cancellationToken);
 
         /// <summary>
         ///知识分类- 编辑
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        Task TypeUpdate(UpdateKnowledgeTypeDto dto, CancellationToken cancellationToken);
+        Task UpdateType(UpdateKnowledgeTypeDto dto, CancellationToken cancellationToken);
 
         /// <summary>
         /// 知识分类-新增、编辑初始化
@@ -24,27 +24,27 @@ namespace Hotline.KnowledgeBase
         /// <param name="Id"></param>
         /// <param name="ParentId"></param>
         /// <returns></returns>
-        Task<KnowledgeTypeDto> TypeInit(string Id, string ParentId, CancellationToken cancellationToken);
+        Task<KnowledgeTypeDto> InitType(string Id, string ParentId, CancellationToken cancellationToken);
 
         /// <summary>
         /// 知识分类-启用、禁用切换
         /// </summary>
         /// <param name="Id"></param>
         /// <returns></returns>
-        Task TypeChangeState(string Id, CancellationToken cancellationToken);
+        Task ChangeStateType(string Id, CancellationToken cancellationToken);
 
         /// <summary>
         /// 知识分类-禁用，并且下架知识
         /// </summary>
         /// <param name="Id"></param>
         /// <returns></returns>
-        Task TypeChangeStateAndOffShelf(string Id, CancellationToken cancellationToken);
+        Task ChangeStateTypeAndOffShelf(string Id, CancellationToken cancellationToken);
 
         /// <summary>
         /// 知识分类-删除
         /// </summary>
         /// <param name="Id"></param>
         /// <returns></returns>
-        Task TypeDelete(string Id, CancellationToken cancellationToken);
+        Task RemoveType(string Id, CancellationToken cancellationToken);
     }
 }

src/Hotline/KnowledgeBase/KnowledgeTypeDomainService.cs

@@ -34,7 +34,7 @@ namespace Hotline.KnowledgeBase
         /// <param name="dto"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public async Task<string> TypeAdd(AddKnowledgeTypeDto dto, CancellationToken cancellationToken)
+        public async Task<string> AddType(AddKnowledgeTypeDto dto, CancellationToken cancellationToken)
         {
             var type = _mapper.Map<KnowledgeType>(dto);
             type.IsEnable = true;
@@ -51,7 +51,7 @@ namespace Hotline.KnowledgeBase
         /// <param name="dto"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public async Task TypeUpdate(UpdateKnowledgeTypeDto dto, CancellationToken cancellationToken)
+        public async Task UpdateType(UpdateKnowledgeTypeDto dto, CancellationToken cancellationToken)
         {
             //查询原有数据
             var type = await _knowledgeTypeRepository.GetAsync(dto.Id, cancellationToken);
@@ -83,7 +83,7 @@ namespace Hotline.KnowledgeBase
         /// <param name="ParentId"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public async Task<KnowledgeTypeDto> TypeInit(string Id, string ParentId, CancellationToken cancellationToken)
+        public async Task<KnowledgeTypeDto> InitType(string Id, string ParentId, CancellationToken cancellationToken)
         {
             KnowledgeTypeDto knowledgeTypeDto = new();
             //查询是否有数据
@@ -106,7 +106,7 @@ namespace Hotline.KnowledgeBase
         /// <param name="Id"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public async Task TypeChangeState(string Id, CancellationToken cancellationToken)
+        public async Task ChangeStateType(string Id, CancellationToken cancellationToken)
         {
             //查询数据是否存在
             var type = await _knowledgeTypeRepository.GetAsync(Id);
@@ -147,7 +147,7 @@ namespace Hotline.KnowledgeBase
         /// <param name="Id"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public async Task TypeChangeStateAndOffShelf(string Id, CancellationToken cancellationToken)
+        public async Task ChangeStateTypeAndOffShelf(string Id, CancellationToken cancellationToken)
         {
             //查询数据是否存在
             var type = await _knowledgeTypeRepository.GetAsync(Id, cancellationToken);
@@ -191,7 +191,7 @@ namespace Hotline.KnowledgeBase
         /// <param name="Id"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public async Task TypeDelete(string Id, CancellationToken cancellationToken)
+        public async Task RemoveType(string Id, CancellationToken cancellationToken)
         {
             //查询数据是否存在
             var sandard = await _knowledgeTypeRepository.GetAsync(Id, cancellationToken);