yvan/kra-oa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: organize service dto contracts

Browse Source
This commit is contained in:
Yvan
2026-08-21 14:00:19 +08:00
parent e81a641953
commit d91f0554fd
65 changed files with 865 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/server/handler/announcement.go
+5 -4
View File
@@ -2,6 +2,7 @@ package handler
import (
"kra/internal/service"
"kra/internal/service/dto"
"time"
"github.com/gin-gonic/gin"
@@ -13,12 +14,12 @@ func NewAnnouncement(service *service.AnnouncementService) *Announcement {
return &Announcement{service: service}
}
func announcementInput(req service.AnnouncementRequest) service.AnnouncementInput {
func announcementInput(req dto.AnnouncementRequest) service.AnnouncementInput {
return service.AnnouncementInput{ID: req.ID, Title: req.Title, Content: req.Content, UserID: req.UserID, Attachments: req.Attachments}
}
func (h *Announcement) Create(c *gin.Context) {
var req service.AnnouncementRequest
var req dto.AnnouncementRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -47,7 +48,7 @@ func (h *Announcement) DeleteByIDs(c *gin.Context) {
}
func (h *Announcement) Update(c *gin.Context) {
var req service.AnnouncementRequest
var req dto.AnnouncementRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -69,7 +70,7 @@ func (h *Announcement) Find(c *gin.Context) {
}
func (h *Announcement) List(c *gin.Context) {
var req service.AnnouncementSearchRequest
var req dto.AnnouncementSearchRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
internal/server/handler/api.go
+15 -14
View File
@@ -2,6 +2,7 @@ package handler
import (
"kra/internal/service"
"kra/internal/service/dto"
"github.com/gin-gonic/gin"
)
@@ -11,7 +12,7 @@ type API struct{ service *service.APIService }
func NewAPI(service *service.APIService) *API { return &API{service: service} }
func (h *API) List(c *gin.Context) {
var req service.APIListRequest
var req dto.APIListRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -40,7 +41,7 @@ func (h *API) All(c *gin.Context) {
Write(c, CodeSuccess, gin.H{"apis": items}, "获取成功")
}
func (h *API) Create(c *gin.Context) {
var req service.APIRequest
var req dto.APIRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -57,7 +58,7 @@ func (h *API) Create(c *gin.Context) {
Write(c, CodeSuccess, created, "创建成功")
}
func (h *API) Update(c *gin.Context) {
var req service.APIRequest
var req dto.APIRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -73,7 +74,7 @@ func (h *API) Update(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "修改成功")
}
func (h *API) Delete(c *gin.Context) {
var req service.DeleteAPIRequest
var req dto.DeleteAPIRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -89,7 +90,7 @@ func (h *API) Delete(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "删除成功")
}
func (h *API) DeleteByIDs(c *gin.Context) {
var req service.DeleteAPIsRequest
var req dto.DeleteAPIsRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -101,7 +102,7 @@ func (h *API) DeleteByIDs(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "删除成功")
}
func (h *API) Find(c *gin.Context) {
var req service.GetAPIRequest
var req dto.GetAPIRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -142,7 +143,7 @@ func (h *API) Roles(c *gin.Context) {
Write(c, CodeSuccess, ids, "获取成功")
}
func (h *API) SetRoles(c *gin.Context) {
var req service.SetAPIRolesRequest
var req dto.SetAPIRolesRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -160,9 +161,9 @@ func (h *API) SetRoles(c *gin.Context) {
func (h *API) Sync(engine *gin.Engine) gin.HandlerFunc {
return func(c *gin.Context) {
routes := engine.Routes()
values := make([]service.APIRequest, 0, len(routes))
values := make([]dto.APIRequest, 0, len(routes))
for _, route := range routes {
values = append(values, service.APIRequest{Path: route.Path, Method: route.Method})
values = append(values, dto.APIRequest{Path: route.Path, Method: route.Method})
}
result, err := h.service.SyncAPIResponses(c.Request.Context(), values)
if err != nil {
@@ -173,7 +174,7 @@ func (h *API) Sync(engine *gin.Engine) gin.HandlerFunc {
}
}
func (h *API) Ignore(c *gin.Context) {
var req service.IgnoreAPIRequest
var req dto.IgnoreAPIRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -185,7 +186,7 @@ func (h *API) Ignore(c *gin.Context) {
OK(c)
}
func (h *API) ApplySync(c *gin.Context) {
var req service.ApplyAPISyncRequest
var req dto.ApplyAPISyncRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -205,7 +206,7 @@ func (h *API) FreshCasbin(c *gin.Context) {
}
func (h *API) SetPolicyPaths(c *gin.Context) {
var req service.SetPolicyPathsRequest
var req dto.SetPolicyPathsRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -221,7 +222,7 @@ func (h *API) SetPolicyPaths(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "更新成功")
}
func (h *API) PolicyPaths(c *gin.Context) {
var req service.GetPolicyPathsRequest
var req dto.GetPolicyPathsRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -238,7 +239,7 @@ func (h *API) PolicyPaths(c *gin.Context) {
Write(c, CodeSuccess, gin.H{"paths": paths}, "获取成功")
}
func validateAPIRequest(req *service.APIRequest) string {
func validateAPIRequest(req *dto.APIRequest) string {
switch {
case req.Path == "":
return "Path值不能为空"
internal/server/handler/api_token.go
+4 -3
View File
@@ -2,6 +2,7 @@ package handler
import (
"kra/internal/service"
"kra/internal/service/dto"
"github.com/gin-gonic/gin"
)
@@ -15,7 +16,7 @@ func NewAPIToken(service *service.TokenService) *APIToken {
}
func (h *APIToken) Create(c *gin.Context) {
var req service.CreateAPITokenRequest
var req dto.CreateAPITokenRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -29,7 +30,7 @@ func (h *APIToken) Create(c *gin.Context) {
}
func (h *APIToken) List(c *gin.Context) {
var req service.APITokenListRequest
var req dto.APITokenListRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -43,7 +44,7 @@ func (h *APIToken) List(c *gin.Context) {
}
func (h *APIToken) Delete(c *gin.Context) {
var req service.IDRequest
var req dto.IDRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
internal/server/handler/audit.go
+13 -12
View File
@@ -8,6 +8,7 @@ import (
"kra/internal/biz"
"kra/internal/service"
"kra/internal/service/dto"
"github.com/gin-gonic/gin"
)
@@ -24,7 +25,7 @@ func NewAudit(service *service.AuditService, recorder *service.AuditRecorder, lo
}
func (h *Audit) Operations(c *gin.Context) {
var req service.OperationRecordSearchRequest
var req dto.OperationRecordSearchRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
@@ -37,7 +38,7 @@ func (h *Audit) Operations(c *gin.Context) {
Write(c, CodeSuccess, PageResult{List: items, Total: total, Page: req.Page, PageSize: req.PageSize}, "获取成功")
}
func (h *Audit) Operation(c *gin.Context) {
var req service.AuditIDQuery
var req dto.AuditIDQuery
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
@@ -54,7 +55,7 @@ func (h *Audit) Operation(c *gin.Context) {
Write(c, CodeSuccess, gin.H{"reSysOperationRecord": item}, "查询成功")
}
func (h *Audit) DeleteOperation(c *gin.Context) {
var req service.IDRequest
var req dto.IDRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -66,7 +67,7 @@ func (h *Audit) DeleteOperation(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "删除成功")
}
func (h *Audit) DeleteOperations(c *gin.Context) {
var req service.AuditIDsRequest
var req dto.AuditIDsRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -79,7 +80,7 @@ func (h *Audit) DeleteOperations(c *gin.Context) {
}
func (h *Audit) Logins(c *gin.Context) {
var req service.LoginLogSearchRequest
var req dto.LoginLogSearchRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
@@ -92,7 +93,7 @@ func (h *Audit) Logins(c *gin.Context) {
Write(c, CodeSuccess, PageResult{List: items, Total: total, Page: req.Page, PageSize: req.PageSize}, "获取成功")
}
func (h *Audit) Login(c *gin.Context) {
var req service.AuditIDQuery
var req dto.AuditIDQuery
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
@@ -105,7 +106,7 @@ func (h *Audit) Login(c *gin.Context) {
Write(c, CodeSuccess, item, "查询成功")
}
func (h *Audit) DeleteLogin(c *gin.Context) {
var req service.IDRequest
var req dto.IDRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -117,7 +118,7 @@ func (h *Audit) DeleteLogin(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "删除成功")
}
func (h *Audit) DeleteLogins(c *gin.Context) {
var req service.AuditIDsRequest
var req dto.AuditIDsRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -130,7 +131,7 @@ func (h *Audit) DeleteLogins(c *gin.Context) {
}
func (h *Audit) DataAccess(c *gin.Context) {
var req service.DataAccessListRequest
var req dto.DataAccessListRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -143,7 +144,7 @@ func (h *Audit) DataAccess(c *gin.Context) {
Write(c, CodeSuccess, PageResult{List: items, Total: total, Page: req.Page, PageSize: req.PageSize}, "获取成功")
}
func (h *Audit) DeleteDataAccess(c *gin.Context) {
var req service.IDsRequest
var req dto.IDsRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -246,7 +247,7 @@ func (h *Audit) DeleteErrors(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "批量删除成功")
}
func (h *Audit) UpdateError(c *gin.Context) {
var req service.ErrorRecordMutationRequest
var req dto.ErrorRecordMutationRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -289,7 +290,7 @@ func (h *Audit) Errors(c *gin.Context) {
Write(c, CodeSuccess, PageResult{List: items, Total: total, Page: p, PageSize: size}, "获取成功")
}
func (h *Audit) CreateError(c *gin.Context) {
var req service.ErrorRecordMutationRequest
var req dto.ErrorRecordMutationRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
internal/server/handler/authority.go
+9 -8
View File
@@ -2,6 +2,7 @@ package handler
import (
"kra/internal/service"
"kra/internal/service/dto"
"github.com/gin-gonic/gin"
)
@@ -19,7 +20,7 @@ func (h *Authority) List(c *gin.Context) {
Write(c, CodeSuccess, items, "获取成功")
}
func (h *Authority) Create(c *gin.Context) {
var req service.AuthorityRequest
var req dto.AuthorityRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -40,7 +41,7 @@ func (h *Authority) Create(c *gin.Context) {
Write(c, CodeSuccess, gin.H{"authority": value}, "创建成功")
}
func (h *Authority) Copy(c *gin.Context) {
var req service.CopyAuthorityRequest
var req dto.CopyAuthorityRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -65,7 +66,7 @@ func (h *Authority) Copy(c *gin.Context) {
Write(c, CodeSuccess, gin.H{"authority": value}, "拷贝成功")
}
func (h *Authority) Update(c *gin.Context) {
var req service.AuthorityRequest
var req dto.AuthorityRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -86,7 +87,7 @@ func (h *Authority) Update(c *gin.Context) {
Write(c, CodeSuccess, gin.H{"authority": value}, "更新成功")
}
func (h *Authority) Delete(c *gin.Context) {
var req service.DeleteAuthorityRequest
var req dto.DeleteAuthorityRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -102,7 +103,7 @@ func (h *Authority) Delete(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "删除成功")
}
func (h *Authority) SetUsers(c *gin.Context) {
var req service.SetRoleUsersRequest
var req dto.SetRoleUsersRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -118,7 +119,7 @@ func (h *Authority) SetUsers(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "设置成功")
}
func (h *Authority) Users(c *gin.Context) {
var req service.SetRoleUsersRequest
var req dto.SetRoleUsersRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
@@ -134,7 +135,7 @@ func (h *Authority) Users(c *gin.Context) {
Write(c, CodeSuccess, ids, "获取成功")
}
func (h *Authority) SetDataScope(c *gin.Context) {
var req service.SetDataScopeRequest
var req dto.SetDataScopeRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -150,7 +151,7 @@ func (h *Authority) SetDataScope(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "设置成功")
}
func (h *Authority) DataScopeDepartments(c *gin.Context) {
var req service.SetDataScopeRequest
var req dto.SetDataScopeRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
internal/server/handler/dictionary.go
+13 -12
View File
@@ -2,6 +2,7 @@ package handler
import (
"kra/internal/service"
"kra/internal/service/dto"
"strconv"
"github.com/gin-gonic/gin"
@@ -14,7 +15,7 @@ func NewDictionary(service *service.DictionaryService) *Dictionary {
}
func (h *Dictionary) Create(c *gin.Context) {
var req service.DictionaryRequest
var req dto.DictionaryRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -27,7 +28,7 @@ func (h *Dictionary) Create(c *gin.Context) {
Write(c, CodeSuccess, created, "创建成功")
}
func (h *Dictionary) Update(c *gin.Context) {
var req service.DictionaryRequest
var req dto.DictionaryRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -39,7 +40,7 @@ func (h *Dictionary) Update(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "更新成功")
}
func (h *Dictionary) Delete(c *gin.Context) {
var req service.DictionaryRequest
var req dto.DictionaryRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -51,7 +52,7 @@ func (h *Dictionary) Delete(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "删除成功")
}
func (h *Dictionary) Find(c *gin.Context) {
var req service.DictionaryRequest
var req dto.DictionaryRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
@@ -74,7 +75,7 @@ func (h *Dictionary) List(details bool) gin.HandlerFunc {
}
}
func (h *Dictionary) Export(c *gin.Context) {
var req service.DictionaryRequest
var req dto.DictionaryRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
@@ -91,7 +92,7 @@ func (h *Dictionary) Export(c *gin.Context) {
Write(c, CodeSuccess, item, "导出成功")
}
func (h *Dictionary) Import(c *gin.Context) {
var req service.ImportDictionaryRequest
var req dto.ImportDictionaryRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -104,7 +105,7 @@ func (h *Dictionary) Import(c *gin.Context) {
}
func (h *Dictionary) CreateDetail(c *gin.Context) {
var req service.DictionaryDetailRequest
var req dto.DictionaryDetailRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -116,7 +117,7 @@ func (h *Dictionary) CreateDetail(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "创建成功")
}
func (h *Dictionary) UpdateDetail(c *gin.Context) {
var req service.DictionaryDetailRequest
var req dto.DictionaryDetailRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -128,7 +129,7 @@ func (h *Dictionary) UpdateDetail(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "更新成功")
}
func (h *Dictionary) DeleteDetail(c *gin.Context) {
var req service.DictionaryDetailRequest
var req dto.DictionaryDetailRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -140,7 +141,7 @@ func (h *Dictionary) DeleteDetail(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "删除成功")
}
func (h *Dictionary) FindDetail(c *gin.Context) {
var req service.DictionaryDetailRequest
var req dto.DictionaryDetailRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
@@ -171,7 +172,7 @@ func (h *Dictionary) Details(c *gin.Context) {
return
}
}
filter := service.DictionaryDetailListRequest{DictionaryID: uint(dictionaryID), Label: c.Query("label"), Value: c.Query("value")}
filter := dto.DictionaryDetailListRequest{DictionaryID: uint(dictionaryID), Label: c.Query("label"), Value: c.Query("value")}
if raw, exists := c.GetQuery("status"); exists {
value, parseErr := strconv.ParseBool(raw)
if parseErr != nil {
@@ -231,7 +232,7 @@ func (h *Dictionary) Tree(byType bool) gin.HandlerFunc {
}
}
func (h *Dictionary) DetailsByParent(c *gin.Context) {
var req service.DictionaryDetailsByParentRequest
var req dto.DictionaryDetailsByParentRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
internal/server/handler/email.go
+2 -1
View File
@@ -2,6 +2,7 @@ package handler
import (
"kra/internal/service"
"kra/internal/service/dto"
"github.com/gin-gonic/gin"
)
@@ -19,7 +20,7 @@ func (h *Email) Test(c *gin.Context) {
}
func (h *Email) Send(c *gin.Context) {
var req service.SendEmailRequest
var req dto.SendEmailRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
internal/server/handler/export.go
+6 -5
View File
@@ -3,6 +3,7 @@ package handler
import (
"errors"
"kra/internal/service"
"kra/internal/service/dto"
"net/http"
"net/url"
"strings"
@@ -42,7 +43,7 @@ func exportIssueParams(values url.Values, blank bool) (map[string]string, error)
}
func (h *Export) Create(c *gin.Context) {
var req service.ExportTemplateRequest
var req dto.ExportTemplateRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -58,7 +59,7 @@ func (h *Export) Create(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "创建成功")
}
func (h *Export) Update(c *gin.Context) {
var req service.ExportTemplateRequest
var req dto.ExportTemplateRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -74,7 +75,7 @@ func (h *Export) Update(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "更新成功")
}
func (h *Export) Delete(c *gin.Context) {
var req service.IDRequest
var req dto.IDRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -92,7 +93,7 @@ func (h *Export) Delete(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "删除成功")
}
func (h *Export) DeleteMany(c *gin.Context) {
var req service.IDsRequest
var req dto.IDsRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -104,7 +105,7 @@ func (h *Export) DeleteMany(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "批量删除成功")
}
func (h *Export) Find(c *gin.Context) {
var req service.ExportTemplateRequest
var req dto.ExportTemplateRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
internal/server/handler/integration_config.go
+2 -1
View File
@@ -2,6 +2,7 @@ package handler
import (
"kra/internal/service"
"kra/internal/service/dto"
"github.com/gin-gonic/gin"
)
@@ -33,7 +34,7 @@ func (h *IntegrationConfig) Find(c *gin.Context) {
}
func (h *IntegrationConfig) Save(c *gin.Context) {
var req service.IntegrationConfigRequest
var req dto.IntegrationConfigRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
internal/server/handler/media.go
+11 -10
View File
@@ -3,6 +3,7 @@ package handler
import (
"errors"
"kra/internal/service"
"kra/internal/service/dto"
"net/http"
"strconv"
@@ -66,7 +67,7 @@ func (h *Media) Upload(c *gin.Context) {
}
func (h *Media) List(c *gin.Context) {
var req service.MediaListRequest
var req dto.MediaListRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -79,7 +80,7 @@ func (h *Media) List(c *gin.Context) {
Write(c, CodeSuccess, PageResult{List: items, Total: total, Page: req.Page, PageSize: req.PageSize}, "获取成功")
}
func (h *Media) Delete(c *gin.Context) {
var req service.IDRequest
var req dto.IDRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -91,7 +92,7 @@ func (h *Media) Delete(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "删除成功")
}
func (h *Media) DeleteMany(c *gin.Context) {
var req service.MediaBatchDeleteRequest
var req dto.MediaBatchDeleteRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -122,7 +123,7 @@ func (h *Media) Find(c *gin.Context) {
OKWithData(c, item)
}
func (h *Media) Rename(c *gin.Context) {
var req service.RenameMediaRequest
var req dto.RenameMediaRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -134,7 +135,7 @@ func (h *Media) Rename(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "编辑成功")
}
func (h *Media) ImportURLs(c *gin.Context) {
var req []service.ImportMediaRequest
var req []dto.ImportMediaRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -146,7 +147,7 @@ func (h *Media) ImportURLs(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "导入URL成功")
}
func (h *Media) Storage(c *gin.Context) {
var req service.StorageListRequest
var req dto.StorageListRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -168,7 +169,7 @@ func (h *Media) Categories(c *gin.Context) {
OKWithData(c, items)
}
func (h *Media) SaveCategory(c *gin.Context) {
var req service.CategoryRequest
var req dto.CategoryRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, "参数错误")
return
@@ -180,7 +181,7 @@ func (h *Media) SaveCategory(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "创建/更新成功")
}
func (h *Media) DeleteCategory(c *gin.Context) {
var req service.IDRequest
var req dto.IDRequest
if c.ShouldBindJSON(&req) != nil || req.ID == 0 {
Fail(c, "参数错误")
return
@@ -194,7 +195,7 @@ func (h *Media) DeleteCategory(c *gin.Context) {
func (h *Media) InitUpload(c *gin.Context) {
claims := Claims(c)
var req service.InitUploadRequest
var req dto.InitUploadRequest
if claims == nil {
Fail(c, "参数错误")
return
@@ -257,7 +258,7 @@ func (h *Media) SaveChunk(c *gin.Context) {
}
func (h *Media) CompleteUpload(c *gin.Context) {
claims := Claims(c)
var req service.CompleteUploadRequest
var req dto.CompleteUploadRequest
if claims == nil {
Fail(c, "参数错误")
return
internal/server/handler/menu.go
+9 -8
View File
@@ -2,6 +2,7 @@ package handler
import (
"kra/internal/service"
"kra/internal/service/dto"
"github.com/gin-gonic/gin"
)
@@ -29,7 +30,7 @@ func (h *Menu) Tree(c *gin.Context) {
}
func (h *Menu) Create(c *gin.Context) {
var req service.MenuRequest
var req dto.MenuRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -62,7 +63,7 @@ func (h *Menu) Create(c *gin.Context) {
}
func (h *Menu) Update(c *gin.Context) {
var req service.MenuRequest
var req dto.MenuRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -95,7 +96,7 @@ func (h *Menu) Update(c *gin.Context) {
}
func (h *Menu) Delete(c *gin.Context) {
var req service.DeleteMenuRequest
var req dto.DeleteMenuRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -112,7 +113,7 @@ func (h *Menu) Delete(c *gin.Context) {
}
func (h *Menu) Find(c *gin.Context) {
var req service.GetMenuRequest
var req dto.GetMenuRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -130,7 +131,7 @@ func (h *Menu) Find(c *gin.Context) {
}
func (h *Menu) SetAuthorityMenus(c *gin.Context) {
var req service.SetAuthorityMenusRequest
var req dto.SetAuthorityMenusRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -147,7 +148,7 @@ func (h *Menu) SetAuthorityMenus(c *gin.Context) {
}
func (h *Menu) AuthorityMenus(c *gin.Context) {
var req service.GetAuthorityMenusRequest
var req dto.GetAuthorityMenusRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -165,7 +166,7 @@ func (h *Menu) AuthorityMenus(c *gin.Context) {
}
func (h *Menu) RoleIDs(c *gin.Context) {
var req service.SetMenuRolesRequest
var req dto.SetMenuRolesRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
@@ -194,7 +195,7 @@ func (h *Menu) RoleIDs(c *gin.Context) {
}
func (h *Menu) SetRoles(c *gin.Context) {
var req service.SetMenuRolesRequest
var req dto.SetMenuRolesRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
internal/server/handler/organization.go
+17 -16
View File
@@ -2,6 +2,7 @@ package handler
import (
"kra/internal/service"
"kra/internal/service/dto"
"github.com/gin-gonic/gin"
)
@@ -16,7 +17,7 @@ func NewOrganization(departments *service.DepartmentService, positions *service.
}
func (h *Organization) ListDepartments(c *gin.Context) {
var req service.DepartmentListRequest
var req dto.DepartmentListRequest
_ = c.ShouldBindJSON(&req)
items, err := h.departments.Departments(c.Request.Context(), req.Name)
if err != nil {
@@ -26,7 +27,7 @@ func (h *Organization) ListDepartments(c *gin.Context) {
Write(c, CodeSuccess, items, "获取成功")
}
func (h *Organization) CreateDepartment(c *gin.Context) {
var req service.DepartmentRequest
var req dto.DepartmentRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -42,7 +43,7 @@ func (h *Organization) CreateDepartment(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "创建成功")
}
func (h *Organization) UpdateDepartment(c *gin.Context) {
var req service.DepartmentRequest
var req dto.DepartmentRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -58,7 +59,7 @@ func (h *Organization) UpdateDepartment(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "更新成功")
}
func (h *Organization) DeleteDepartment(c *gin.Context) {
var req service.DeleteDepartmentRequest
var req dto.DeleteDepartmentRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -70,7 +71,7 @@ func (h *Organization) DeleteDepartment(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "删除成功")
}
func (h *Organization) FindDepartment(c *gin.Context) {
var req service.DeleteDepartmentRequest
var req dto.DeleteDepartmentRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
@@ -83,7 +84,7 @@ func (h *Organization) FindDepartment(c *gin.Context) {
Write(c, CodeSuccess, item, "获取成功")
}
func (h *Organization) DepartmentUsers(c *gin.Context) {
var req service.SetDepartmentUsersRequest
var req dto.SetDepartmentUsersRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
@@ -99,7 +100,7 @@ func (h *Organization) DepartmentUsers(c *gin.Context) {
Write(c, CodeSuccess, ids, "获取成功")
}
func (h *Organization) SetDepartmentUsers(c *gin.Context) {
var req service.SetDepartmentUsersRequest
var req dto.SetDepartmentUsersRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -115,7 +116,7 @@ func (h *Organization) SetDepartmentUsers(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "设置成功")
}
func (h *Organization) SetUserDepartments(c *gin.Context) {
var req service.SetUserDepartmentsRequest
var req dto.SetUserDepartmentsRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -132,7 +133,7 @@ func (h *Organization) SetUserDepartments(c *gin.Context) {
}
func (h *Organization) ListPositions(c *gin.Context) {
var req service.PositionListRequest
var req dto.PositionListRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -145,7 +146,7 @@ func (h *Organization) ListPositions(c *gin.Context) {
Write(c, CodeSuccess, PageResult{List: items, Total: total, Page: req.Page, PageSize: req.PageSize}, "获取成功")
}
func (h *Organization) CreatePosition(c *gin.Context) {
var req service.PositionRequest
var req dto.PositionRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -161,7 +162,7 @@ func (h *Organization) CreatePosition(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "创建成功")
}
func (h *Organization) UpdatePosition(c *gin.Context) {
var req service.PositionRequest
var req dto.PositionRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -177,7 +178,7 @@ func (h *Organization) UpdatePosition(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "更新成功")
}
func (h *Organization) DeletePosition(c *gin.Context) {
var req service.DeletePositionRequest
var req dto.DeletePositionRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -189,7 +190,7 @@ func (h *Organization) DeletePosition(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "删除成功")
}
func (h *Organization) FindPosition(c *gin.Context) {
var req service.DeletePositionRequest
var req dto.DeletePositionRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
@@ -202,7 +203,7 @@ func (h *Organization) FindPosition(c *gin.Context) {
Write(c, CodeSuccess, item, "获取成功")
}
func (h *Organization) PositionUsers(c *gin.Context) {
var req service.SetPositionUsersRequest
var req dto.SetPositionUsersRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
@@ -218,7 +219,7 @@ func (h *Organization) PositionUsers(c *gin.Context) {
Write(c, CodeSuccess, ids, "获取成功")
}
func (h *Organization) SetPositionUsers(c *gin.Context) {
var req service.SetPositionUsersRequest
var req dto.SetPositionUsersRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -234,7 +235,7 @@ func (h *Organization) SetPositionUsers(c *gin.Context) {
Write(c, CodeSuccess, gin.H{}, "设置成功")
}
func (h *Organization) SetUserPositions(c *gin.Context) {
var req service.SetUserPositionsRequest
var req dto.SetUserPositionsRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
internal/server/handler/parameter.go
+4 -3
View File
@@ -2,6 +2,7 @@ package handler
import (
"kra/internal/service"
"kra/internal/service/dto"
"github.com/gin-gonic/gin"
)
@@ -15,7 +16,7 @@ func NewParameter(service *service.ParameterService) *Parameter {
}
func (h *Parameter) Create(c *gin.Context) {
var req service.SystemParameterRequest
var req dto.SystemParameterRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -28,7 +29,7 @@ func (h *Parameter) Create(c *gin.Context) {
}
func (h *Parameter) Update(c *gin.Context) {
var req service.SystemParameterRequest
var req dto.SystemParameterRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -76,7 +77,7 @@ func (h *Parameter) Get(c *gin.Context) {
}
func (h *Parameter) List(c *gin.Context) {
var req service.SystemParameterSearchRequest
var req dto.SystemParameterSearchRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
internal/server/handler/payment.go
+11 -10
View File
@@ -3,6 +3,7 @@ package handler
import (
"io"
"kra/internal/service"
"kra/internal/service/dto"
"net/http"
"github.com/gin-gonic/gin"
@@ -12,7 +13,7 @@ type Payment struct{ service *service.PaymentService }
func NewPayment(service *service.PaymentService) *Payment { return &Payment{service: service} }
func (h *Payment) Order(c *gin.Context) {
var req service.PaymentQueryRequest
var req dto.PaymentQueryRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -42,7 +43,7 @@ func (h *Payment) RefundByPath(c *gin.Context) {
Fail(c, err.Error())
return
}
result, err := h.service.Refund(c.Request.Context(), &service.PaymentRefundRequest{
result, err := h.service.Refund(c.Request.Context(), &dto.PaymentRefundRequest{
Provider: c.Param("provider"), TradeNo: c.Param("tradeNo"), Amount: req.Amount,
})
if err != nil {
@@ -53,7 +54,7 @@ func (h *Payment) RefundByPath(c *gin.Context) {
}
func (h *Payment) FulfillByPath(c *gin.Context) {
result, err := h.service.Fulfill(c.Request.Context(), &service.PaymentFulfillRequest{
result, err := h.service.Fulfill(c.Request.Context(), &dto.PaymentFulfillRequest{
Provider: c.Param("provider"), TradeNo: c.Param("tradeNo"),
})
if err != nil {
@@ -64,7 +65,7 @@ func (h *Payment) FulfillByPath(c *gin.Context) {
}
func (h *Payment) Orders(c *gin.Context) {
var req service.PaymentOrderListRequest
var req dto.PaymentOrderListRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
@@ -90,7 +91,7 @@ func (h *Payment) TestProvider(c *gin.Context) {
OKWithData(c, result)
}
func (h *Payment) Create(c *gin.Context) {
var req service.PaymentRequest
var req dto.PaymentRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -104,7 +105,7 @@ func (h *Payment) Create(c *gin.Context) {
OKWithData(c, result)
}
func (h *Payment) Query(c *gin.Context) {
var req service.PaymentQueryRequest
var req dto.PaymentQueryRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -117,7 +118,7 @@ func (h *Payment) Query(c *gin.Context) {
OKWithData(c, result)
}
func (h *Payment) Refund(c *gin.Context) {
var req service.PaymentRefundRequest
var req dto.PaymentRefundRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -131,7 +132,7 @@ func (h *Payment) Refund(c *gin.Context) {
}
func (h *Payment) Fulfill(c *gin.Context) {
var req service.PaymentFulfillRequest
var req dto.PaymentFulfillRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -162,12 +163,12 @@ func (h *Payment) Callback(c *gin.Context) {
query[k] = v[0]
}
}
ack, err := h.service.Callback(c.Request.Context(), &service.PaymentCallbackRequest{Provider: c.Param("provider"), Headers: headers, Body: raw, Query: query})
ack, err := h.service.Callback(c.Request.Context(), &dto.PaymentCallbackRequest{Provider: c.Param("provider"), Headers: headers, Body: raw, Query: query})
writePaymentCallbackAck(c, ack)
_ = err
}
func writePaymentCallbackAck(c *gin.Context, ack service.PaymentCallbackAck) {
func writePaymentCallbackAck(c *gin.Context, ack dto.PaymentCallbackAck) {
if ack.StatusCode == 0 {
ack.StatusCode = http.StatusInternalServerError
}
internal/server/handler/payment_test.go
+2 -2
View File
@@ -1,18 +1,18 @@
package handler
import (
"kra/internal/service/dto"
"net/http/httptest"
"testing"
"github.com/gin-gonic/gin"
"kra/internal/service"
)
func TestWritePaymentCallbackAckDoesNotExposeError(t *testing.T) {
gin.SetMode(gin.TestMode)
recorder := httptest.NewRecorder()
context, _ := gin.CreateTestContext(recorder)
writePaymentCallbackAck(context, service.PaymentCallbackAck{
writePaymentCallbackAck(context, dto.PaymentCallbackAck{
StatusCode: 500,
ContentType: "text/plain; charset=utf-8",
Body: []byte("failure"),
internal/server/handler/permission.go
+3 -2
View File
@@ -2,6 +2,7 @@ package handler
import (
"kra/internal/service"
"kra/internal/service/dto"
"github.com/gin-gonic/gin"
)
@@ -13,7 +14,7 @@ func NewPermission(service *service.PermissionService) *Permission {
}
func (h *Permission) Buttons(c *gin.Context) {
var req service.GetAuthorityButtonsRequest
var req dto.GetAuthorityButtonsRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -27,7 +28,7 @@ func (h *Permission) Buttons(c *gin.Context) {
}
func (h *Permission) SetButtons(c *gin.Context) {
var req service.SetAuthorityButtonsRequest
var req dto.SetAuthorityButtonsRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
internal/server/handler/public.go
+5 -4
View File
@@ -9,6 +9,7 @@ import (
"kra/internal/biz"
"kra/internal/service"
"kra/internal/service/dto"
"github.com/gin-gonic/gin"
"github.com/mojocn/base64Captcha"
@@ -58,7 +59,7 @@ func (h *Public) Captcha(c *gin.Context) {
}
func (h *Public) Login(c *gin.Context) {
var req service.LoginRequest
var req dto.LoginRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -126,15 +127,15 @@ func (h *Public) InitializeDatabase(engine *gin.Engine) gin.HandlerFunc {
Fail(c, "已存在数据库配置")
return
}
var input service.DatabaseInitRequest
var input dto.DatabaseInitRequest
if c.ShouldBindJSON(&input) != nil {
Fail(c, "参数校验不通过")
return
}
routes := engine.Routes()
values := make([]service.Route, 0, len(routes))
values := make([]dto.Route, 0, len(routes))
for _, route := range routes {
values = append(values, service.Route{Path: route.Path, Method: route.Method})
values = append(values, dto.Route{Path: route.Path, Method: route.Method})
}
if err := h.system.InitializeRoutes(c.Request.Context(), &input, values); err != nil {
Fail(c, "自动创建数据库失败，请查看后台日志，检查后在进行初始化")
internal/server/handler/system_config.go
+3 -2
View File
@@ -2,6 +2,7 @@ package handler
import (
"kra/internal/service"
"kra/internal/service/dto"
"github.com/gin-gonic/gin"
)
@@ -25,7 +26,7 @@ func (h *SystemConfig) GetSecurity(c *gin.Context) {
}
func (h *SystemConfig) SetSecurity(c *gin.Context) {
var req service.SecurityConfigRequest
var req dto.SecurityConfigRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -48,7 +49,7 @@ func (h *SystemConfig) Get(c *gin.Context) {
}
func (h *SystemConfig) Set(c *gin.Context) {
var req service.SetSystemConfigRequest
var req dto.SetSystemConfigRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
internal/server/handler/task.go
+8 -7
View File
@@ -3,6 +3,7 @@ package handler
import (
"fmt"
"kra/internal/service"
"kra/internal/service/dto"
"net/http"
"time"
@@ -18,7 +19,7 @@ func NewTask(service *service.TaskService) *Task {
}
func (h *Task) Create(c *gin.Context) {
var req service.TaskRequest
var req dto.TaskRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -32,7 +33,7 @@ func (h *Task) Create(c *gin.Context) {
}
func (h *Task) Update(c *gin.Context) {
var req service.TaskRequest
var req dto.TaskRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -45,7 +46,7 @@ func (h *Task) Update(c *gin.Context) {
}
func (h *Task) Delete(c *gin.Context) {
var req service.DeleteTaskRequest
var req dto.DeleteTaskRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -58,7 +59,7 @@ func (h *Task) Delete(c *gin.Context) {
}
func (h *Task) Toggle(c *gin.Context) {
var req service.ToggleTaskRequest
var req dto.ToggleTaskRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -71,7 +72,7 @@ func (h *Task) Toggle(c *gin.Context) {
}
func (h *Task) Trigger(c *gin.Context) {
var req service.DeleteTaskRequest
var req dto.DeleteTaskRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -84,7 +85,7 @@ func (h *Task) Trigger(c *gin.Context) {
}
func (h *Task) List(c *gin.Context) {
var req service.TaskListRequest
var req dto.TaskListRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
@@ -98,7 +99,7 @@ func (h *Task) List(c *gin.Context) {
}
func (h *Task) Logs(c *gin.Context) {
var req service.TaskLogListRequest
var req dto.TaskLogListRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
internal/server/handler/user.go
+11 -10
View File
@@ -2,6 +2,7 @@ package handler
import (
"kra/internal/service"
"kra/internal/service/dto"
"strconv"
"time"
@@ -18,7 +19,7 @@ func NewUser(user *service.UserService, auth *service.AuthService) *User {
}
func (h *User) List(c *gin.Context) {
var req service.UserListRequest
var req dto.UserListRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -40,7 +41,7 @@ func (h *User) List(c *gin.Context) {
}
func (h *User) Create(c *gin.Context) {
var req service.UserRequest
var req dto.UserRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -68,7 +69,7 @@ func (h *User) Create(c *gin.Context) {
return
}
if result == nil {
result = &service.UserResponse{}
result = &dto.UserResponse{}
}
Write(c, CodeError, gin.H{"user": result}, "注册失败")
return
@@ -77,7 +78,7 @@ func (h *User) Create(c *gin.Context) {
}
func (h *User) Update(c *gin.Context) {
var req service.UserRequest
var req dto.UserRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -99,7 +100,7 @@ func (h *User) UpdateSelf(c *gin.Context) {
NoAuth(c, "未登录或非法访问")
return
}
var req service.SelfUserRequest
var req dto.SelfUserRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -112,7 +113,7 @@ func (h *User) UpdateSelf(c *gin.Context) {
}
func (h *User) Delete(c *gin.Context) {
var req service.IDRequest
var req dto.IDRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -134,7 +135,7 @@ func (h *User) Delete(c *gin.Context) {
}
func (h *User) ResetPassword(c *gin.Context) {
var req service.ResetPasswordRequest
var req dto.ResetPasswordRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -152,7 +153,7 @@ func (h *User) ResetPassword(c *gin.Context) {
func (h *User) ChangePassword(c *gin.Context) {
claims := Claims(c)
var req service.ChangePasswordRequest
var req dto.ChangePasswordRequest
if claims == nil {
NoAuth(c, "未登录或非法访问")
return
@@ -199,7 +200,7 @@ func (h *User) SetSelfSetting(c *gin.Context) {
}
func (h *User) SetAuthorities(c *gin.Context) {
var req service.UserAuthoritiesRequest
var req dto.UserAuthoritiesRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -213,7 +214,7 @@ func (h *User) SetAuthorities(c *gin.Context) {
func (h *User) SwitchAuthority(c *gin.Context) {
claims := Claims(c)
var req service.SwitchAuthorityRequest
var req dto.SwitchAuthorityRequest
if claims == nil {
NoAuth(c, "未登录或非法访问")
return
internal/server/handler/version.go
+4 -3
View File
@@ -9,6 +9,7 @@ import (
"kra/internal/biz"
"kra/internal/service"
"kra/internal/service/dto"
"github.com/gin-gonic/gin"
)
@@ -56,7 +57,7 @@ func (h *Version) Find(c *gin.Context) {
OKWithData(c, item)
}
func (h *Version) List(c *gin.Context) {
var req service.VersionSearchRequest
var req dto.VersionSearchRequest
if err := c.ShouldBindQuery(&req); err != nil {
Fail(c, err.Error())
return
@@ -81,7 +82,7 @@ func (h *Version) List(c *gin.Context) {
}
func (h *Version) Export(c *gin.Context) {
var req service.ExportVersionRequest
var req dto.ExportVersionRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
@@ -124,7 +125,7 @@ func (h *Version) Download(c *gin.Context) {
c.Data(http.StatusOK, "application/json", []byte(raw))
}
func (h *Version) Import(c *gin.Context) {
var req service.ImportVersionRequest
var req dto.ImportVersionRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, "解析JSON数据失败:"+err.Error())
return