优化结构

internal/server/handler/announcement.go

@@ -1,16 +1,18 @@
 package handler
 
 import (
-	"kra/internal/service"
 	"kra/internal/service/dto"
+	systemservice "kra/internal/service/system"
 	"time"
 
 	"github.com/gin-gonic/gin"
 )
 
-type Announcement struct{ service *service.AnnouncementService }
+type Announcement struct {
+	service *systemservice.AnnouncementService
+}
 
-func NewAnnouncement(service *service.AnnouncementService) *Announcement {
+func NewAnnouncement(service *systemservice.AnnouncementService) *Announcement {
 	return &Announcement{service: service}
 }
 

internal/server/handler/api.go

@@ -1,15 +1,15 @@
 package handler
 
 import (
-	"kra/internal/service"
 	"kra/internal/service/dto"
+	systemservice "kra/internal/service/system"
 
 	"github.com/gin-gonic/gin"
 )
 
-type API struct{ service *service.APIService }
+type API struct{ service *systemservice.APIService }
 
-func NewAPI(service *service.APIService) *API { return &API{service: service} }
+func NewAPI(service *systemservice.APIService) *API { return &API{service: service} }
 
 func (h *API) List(c *gin.Context) {
 	var req dto.APIListRequest

internal/server/handler/api_token.go

@@ -1,17 +1,17 @@
 package handler
 
 import (
-	"kra/internal/service"
 	"kra/internal/service/dto"
+	systemservice "kra/internal/service/system"
 
 	"github.com/gin-gonic/gin"
 )
 
 type APIToken struct {
-	service *service.TokenService
+	service *systemservice.TokenService
 }
 
-func NewAPIToken(service *service.TokenService) *APIToken {
+func NewAPIToken(service *systemservice.TokenService) *APIToken {
 	return &APIToken{service: service}
 }
 

internal/server/handler/audit.go

@@ -7,20 +7,20 @@ import (
 	"strconv"
 	"time"
 
-	"kra/internal/service"
 	"kra/internal/service/dto"
+	systemservice "kra/internal/service/system"
 
 	"github.com/gin-gonic/gin"
 )
 
 type Audit struct {
-	service  *service.AuditService
-	recorder *service.AuditRecorder
-	logs     *service.LogViewerService
+	service  *systemservice.AuditService
+	recorder *systemservice.AuditRecorder
+	logs     *systemservice.LogViewerService
 	logger   *slog.Logger
 }
 
-func NewAudit(service *service.AuditService, recorder *service.AuditRecorder, logs *service.LogViewerService, logger *slog.Logger) *Audit {
+func NewAudit(service *systemservice.AuditService, recorder *systemservice.AuditRecorder, logs *systemservice.LogViewerService, logger *slog.Logger) *Audit {
 	return &Audit{service: service, recorder: recorder, logs: logs, logger: logger}
 }
 
@@ -85,7 +85,7 @@ func (h *Audit) Logins(c *gin.Context) {
 		Fail(c, err.Error())
 		return
 	}
-	items, total, err := h.service.LoginsFilter(c.Request.Context(), req.Page, req.PageSize, req.Username, req.Status)
+	items, total, err := h.service.LoginsFilter(c.Request.Context(), req)
 	if err != nil {
 		Fail(c, "获取失败")
 		return

internal/server/handler/authority.go

@@ -1,15 +1,19 @@
 package handler
 
 import (
-	"kra/internal/service"
 	"kra/internal/service/dto"
+	systemservice "kra/internal/service/system"
 
 	"github.com/gin-gonic/gin"
 )
 
-type Authority struct{ service *service.AuthorityService }
+type Authority struct {
+	service *systemservice.AuthorityService
+}
 
-func NewAuthority(service *service.AuthorityService) *Authority { return &Authority{service: service} }
+func NewAuthority(service *systemservice.AuthorityService) *Authority {
+	return &Authority{service: service}
+}
 
 func (h *Authority) List(c *gin.Context) {
 	items, err := h.service.Authorities(c.Request.Context())

internal/server/handler/dictionary.go

@@ -1,16 +1,18 @@
 package handler
 
 import (
-	"kra/internal/service"
 	"kra/internal/service/dto"
+	systemservice "kra/internal/service/system"
 	"strconv"
 
 	"github.com/gin-gonic/gin"
 )
 
-type Dictionary struct{ service *service.DictionaryService }
+type Dictionary struct {
+	service *systemservice.DictionaryService
+}
 
-func NewDictionary(service *service.DictionaryService) *Dictionary {
+func NewDictionary(service *systemservice.DictionaryService) *Dictionary {
 	return &Dictionary{service: service}
 }
 

internal/server/handler/email.go

@@ -1,15 +1,15 @@
 package handler
 
 import (
-	"kra/internal/service"
 	"kra/internal/service/dto"
+	systemservice "kra/internal/service/system"
 
 	"github.com/gin-gonic/gin"
 )
 
-type Email struct{ service *service.EmailService }
+type Email struct{ service *systemservice.EmailService }
 
-func NewEmail(service *service.EmailService) *Email { return &Email{service: service} }
+func NewEmail(service *systemservice.EmailService) *Email { return &Email{service: service} }
 
 func (h *Email) Test(c *gin.Context) {
 	if err := h.service.Test(c.Request.Context()); err != nil {

internal/server/handler/export.go

@@ -2,8 +2,8 @@ package handler
 
 import (
 	"errors"
-	"kra/internal/service"
 	"kra/internal/service/dto"
+	systemservice "kra/internal/service/system"
 	"net/http"
 	"net/url"
 	"strings"
@@ -13,10 +13,10 @@ import (
 )
 
 type Export struct {
-	service *service.ExportService
+	service *systemservice.ExportService
 }
 
-func NewExport(service *service.ExportService) *Export {
+func NewExport(service *systemservice.ExportService) *Export {
 	return &Export{service: service}
 }
 
@@ -214,9 +214,9 @@ func (h *Export) Download(expectBlank bool) gin.HandlerFunc {
 		value, err := h.service.ConsumeToken(c.Request.Context(), token, expectBlank)
 		if err != nil {
 			switch {
-			case errors.Is(err, service.ErrExportTokenMalformed):
+			case errors.Is(err, systemservice.ErrExportTokenMalformed):
 				Fail(c, "解析导出参数失败")
-			case errors.Is(err, service.ErrExportTokenType):
+			case errors.Is(err, systemservice.ErrExportTokenType):
 				Fail(c, "token类型错误")
 			default:
 				Fail(c, "导出token无效或已过期")

internal/server/handler/http.go

@@ -5,8 +5,8 @@ package handler
 
 import (
 	"kra/internal/biz/system"
+	"kra/internal/server/httpx"
 	"kra/internal/server/middleware"
-	"kra/pkg/httpx"
 
 	"github.com/gin-gonic/gin"
 )

internal/server/handler/integration_config.go

@@ -1,17 +1,17 @@
 package handler
 
 import (
-	"kra/internal/service"
 	"kra/internal/service/dto"
+	integrationservice "kra/internal/service/integration"
 
 	"github.com/gin-gonic/gin"
 )
 
 type IntegrationConfig struct {
-	service *service.IntegrationConfigService
+	service *integrationservice.IntegrationConfigService
 }
 
-func NewIntegrationConfig(service *service.IntegrationConfigService) *IntegrationConfig {
+func NewIntegrationConfig(service *integrationservice.IntegrationConfigService) *IntegrationConfig {
 	return &IntegrationConfig{service: service}
 }
 

internal/server/handler/media.go

@@ -2,17 +2,17 @@ package handler
 
 import (
 	"errors"
-	"kra/internal/service"
 	"kra/internal/service/dto"
+	systemservice "kra/internal/service/system"
 	"net/http"
 	"strconv"
 
 	"github.com/gin-gonic/gin"
 )
 
-type Media struct{ service *service.MediaService }
+type Media struct{ service *systemservice.MediaService }
 
-func NewMedia(service *service.MediaService) *Media { return &Media{service: service} }
+func NewMedia(service *systemservice.MediaService) *Media { return &Media{service: service} }
 
 func (h *Media) limitMultipartBody(c *gin.Context) int64 {
 	limit := h.service.MediaConfig().EffectiveMaxFileSize()

internal/server/handler/menu.go

@@ -2,15 +2,15 @@ package handler
 
 import (
 	"errors"
-	"kra/internal/service"
 	"kra/internal/service/dto"
+	systemservice "kra/internal/service/system"
 
 	"github.com/gin-gonic/gin"
 )
 
-type Menu struct{ service *service.MenuService }
+type Menu struct{ service *systemservice.MenuService }
 
-func NewMenu(service *service.MenuService) *Menu { return &Menu{service: service} }
+func NewMenu(service *systemservice.MenuService) *Menu { return &Menu{service: service} }
 
 func validateMenuRequest(req *dto.MenuRequest) error {
 	if req == nil {

internal/server/handler/navigation.go

@@ -1,14 +1,16 @@
 package handler
 
 import (
-	"kra/internal/service"
+	systemservice "kra/internal/service/system"
 
 	"github.com/gin-gonic/gin"
 )
 
-type Navigation struct{ service *service.UserService }
+type Navigation struct{ service *systemservice.UserService }
 
-func NewNavigation(service *service.UserService) *Navigation { return &Navigation{service: service} }
+func NewNavigation(service *systemservice.UserService) *Navigation {
+	return &Navigation{service: service}
+}
 func (h *Navigation) Menu(c *gin.Context) {
 	claims := Claims(c)
 	if claims == nil {

internal/server/handler/organization.go

@@ -1,18 +1,18 @@
 package handler
 
 import (
-	"kra/internal/service"
 	"kra/internal/service/dto"
+	systemservice "kra/internal/service/system"
 
 	"github.com/gin-gonic/gin"
 )
 
 type Organization struct {
-	departments *service.DepartmentService
-	positions   *service.PositionService
+	departments *systemservice.DepartmentService
+	positions   *systemservice.PositionService
 }
 
-func NewOrganization(departments *service.DepartmentService, positions *service.PositionService) *Organization {
+func NewOrganization(departments *systemservice.DepartmentService, positions *systemservice.PositionService) *Organization {
 	return &Organization{departments: departments, positions: positions}
 }
 

internal/server/handler/parameter.go

@@ -1,17 +1,17 @@
 package handler
 
 import (
-	"kra/internal/service"
 	"kra/internal/service/dto"
+	systemservice "kra/internal/service/system"
 
 	"github.com/gin-gonic/gin"
 )
 
 type Parameter struct {
-	service *service.ParameterService
+	service *systemservice.ParameterService
 }
 
-func NewParameter(service *service.ParameterService) *Parameter {
+func NewParameter(service *systemservice.ParameterService) *Parameter {
 	return &Parameter{service: service}
 }
 

internal/server/handler/payment.go

@@ -2,16 +2,18 @@ package handler
 
 import (
 	"io"
-	"kra/internal/service"
 	"kra/internal/service/dto"
+	paymentservice "kra/internal/service/payment"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
 )
 
-type Payment struct{ service *service.PaymentService }
+type Payment struct {
+	service *paymentservice.PaymentService
+}
 
-func NewPayment(service *service.PaymentService) *Payment { return &Payment{service: service} }
+func NewPayment(service *paymentservice.PaymentService) *Payment { return &Payment{service: service} }
 func (h *Payment) Order(c *gin.Context) {
 	var req dto.PaymentQueryRequest
 	if err := c.ShouldBindJSON(&req); err != nil {
@@ -148,7 +150,8 @@ func (h *Payment) Callback(c *gin.Context) {
 	c.Request.Body = http.MaxBytesReader(c.Writer, c.Request.Body, 8<<20)
 	raw, err := io.ReadAll(c.Request.Body)
 	if err != nil {
-		writePaymentCallbackAck(c, service.DefaultPaymentCallbackAck(c.Param("provider"), false))
+		_ = c.Error(err)
+		writePaymentCallbackAck(c, paymentservice.DefaultPaymentCallbackAck(c.Param("provider"), false))
 		return
 	}
 	headers := map[string]string{}

internal/server/handler/permission.go

@@ -1,15 +1,17 @@
 package handler
 
 import (
-	"kra/internal/service"
 	"kra/internal/service/dto"
+	systemservice "kra/internal/service/system"
 
 	"github.com/gin-gonic/gin"
 )
 
-type Permission struct{ service *service.PermissionService }
+type Permission struct {
+	service *systemservice.PermissionService
+}
 
-func NewPermission(service *service.PermissionService) *Permission {
+func NewPermission(service *systemservice.PermissionService) *Permission {
 	return &Permission{service: service}
 }
 

internal/server/handler/public.go

@@ -9,21 +9,21 @@ import (
 	"strings"
 	"time"
 
-	"kra/internal/service"
 	"kra/internal/service/dto"
+	systemservice "kra/internal/service/system"
 
 	"github.com/gin-gonic/gin"
 	"github.com/mojocn/base64Captcha"
 )
 
 type Public struct {
-	auth     *service.AuthService
-	system   *service.SystemConfigService
-	settings *service.SecurityService
+	auth     *systemservice.AuthService
+	system   *systemservice.SystemConfigService
+	settings *systemservice.SecurityService
 	store    *captchaStore
 }
 
-func NewPublic(auth *service.AuthService, system *service.SystemConfigService, settings *service.SecurityService) *Public {
+func NewPublic(auth *systemservice.AuthService, system *systemservice.SystemConfigService, settings *systemservice.SecurityService) *Public {
 	return &Public{auth: auth, system: system, settings: settings, store: &captchaStore{service: settings}}
 }
 
@@ -155,7 +155,7 @@ func (h *Public) InitializeDatabase(engine *gin.Engine) gin.HandlerFunc {
 }
 
 type captchaStore struct {
-	service *service.SecurityService
+	service *systemservice.SecurityService
 }
 
 func (s *captchaStore) Set(id, value string) error {

internal/server/handler/session.go

@@ -2,14 +2,14 @@ package handler
 
 import (
 	"kra/internal/server/middleware"
-	"kra/internal/service"
+	systemservice "kra/internal/service/system"
 
 	"github.com/gin-gonic/gin"
 )
 
-type Session struct{ tokens *service.TokenService }
+type Session struct{ tokens *systemservice.TokenService }
 
-func NewSession(tokens *service.TokenService) *Session { return &Session{tokens: tokens} }
+func NewSession(tokens *systemservice.TokenService) *Session { return &Session{tokens: tokens} }
 func (h *Session) Logout(c *gin.Context) {
 	token := middleware.RequestToken(c, false)
 	if token == "" {

internal/server/handler/system_config.go

@@ -3,19 +3,19 @@ package handler
 import (
 	"errors"
 	"kra/internal/biz/system"
-	"kra/internal/service"
 	"kra/internal/service/dto"
+	systemservice "kra/internal/service/system"
 	"log/slog"
 
 	"github.com/gin-gonic/gin"
 )
 
 type SystemConfig struct {
-	system   *service.SystemConfigService
-	settings *service.SecurityService
+	system   *systemservice.SystemConfigService
+	settings *systemservice.SecurityService
 }
 
-func NewSystemConfig(system *service.SystemConfigService, settings *service.SecurityService) *SystemConfig {
+func NewSystemConfig(system *systemservice.SystemConfigService, settings *systemservice.SecurityService) *SystemConfig {
 	return &SystemConfig{system: system, settings: settings}
 }
 

internal/server/handler/task.go

@@ -2,8 +2,8 @@ package handler
 
 import (
 	"fmt"
-	"kra/internal/service"
 	"kra/internal/service/dto"
+	taskservice "kra/internal/service/task"
 	"net/http"
 	"time"
 
@@ -11,10 +11,10 @@ import (
 )
 
 type Task struct {
-	service *service.TaskService
+	service *taskservice.TaskService
 }
 
-func NewTask(service *service.TaskService) *Task {
+func NewTask(service *taskservice.TaskService) *Task {
 	return &Task{service: service}
 }
 

internal/server/handler/user.go

@@ -1,8 +1,10 @@
 package handler
 
 import (
-	"kra/internal/service"
+	"errors"
+	"kra/internal/biz/system"
 	"kra/internal/service/dto"
+	systemservice "kra/internal/service/system"
 	"strconv"
 	"time"
 
@@ -10,11 +12,11 @@ import (
 )
 
 type User struct {
-	service *service.UserService
-	auth    *service.AuthService
+	service *systemservice.UserService
+	auth    *systemservice.AuthService
 }
 
-func NewUser(user *service.UserService, auth *service.AuthService) *User {
+func NewUser(user *systemservice.UserService, auth *systemservice.AuthService) *User {
 	return &User{service: user, auth: auth}
 }
 
@@ -64,7 +66,7 @@ func (h *User) Create(c *gin.Context) {
 	}
 	result, err := h.service.CreateUserRequest(c.Request.Context(), &req)
 	if err != nil {
-		if service.IsPasswordPolicyError(err) {
+		if systemservice.IsPasswordPolicyError(err) {
 			Fail(c, err.Error())
 			return
 		}
@@ -141,7 +143,7 @@ func (h *User) ResetPassword(c *gin.Context) {
 		return
 	}
 	if err := h.service.ResetPassword(c.Request.Context(), req.ID, req.Password); err != nil {
-		if service.IsPasswordPolicyError(err) {
+		if systemservice.IsPasswordPolicyError(err) {
 			Fail(c, err.Error())
 			return
 		}
@@ -171,7 +173,7 @@ func (h *User) ChangePassword(c *gin.Context) {
 		return
 	}
 	if err := h.service.ChangePassword(c.Request.Context(), claims.ID, req.Password, req.NewPassword); err != nil {
-		if service.IsPasswordPolicyError(err) {
+		if systemservice.IsPasswordPolicyError(err) {
 			Fail(c, err.Error())
 			return
 		}
@@ -206,7 +208,11 @@ func (h *User) SetAuthorities(c *gin.Context) {
 		return
 	}
 	if err := h.service.SetUserAuthorities(c.Request.Context(), req.ID, req.AuthorityIDs); err != nil {
-		Fail(c, "修改失败")
+		if errors.Is(err, system.ErrAuthoritiesRequired) {
+			Fail(c, err.Error())
+		} else {
+			Fail(c, "修改失败")
+		}
 		return
 	}
 	Write(c, CodeSuccess, gin.H{}, "修改成功")

internal/server/handler/version.go

@@ -8,15 +8,15 @@ import (
 	"strconv"
 	"time"
 
-	"kra/internal/service"
 	"kra/internal/service/dto"
+	systemservice "kra/internal/service/system"
 
 	"github.com/gin-gonic/gin"
 )
 
-type Version struct{ service *service.VersionService }
+type Version struct{ service *systemservice.VersionService }
 
-func NewVersion(service *service.VersionService) *Version { return &Version{service: service} }
+func NewVersion(service *systemservice.VersionService) *Version { return &Version{service: service} }
 
 func versionStage(err error) (system.VersionStage, bool) {
 	var stageErr *system.VersionStageError