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

优化结构

Browse Source
This commit is contained in:
Yvan
2026-08-25 00:20:29 +08:00
parent 969afee284
commit ee179d6b34
49 changed files with 289 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/server/handler/announcement.go
+2 -6
View File
@@ -14,17 +14,13 @@ func NewAnnouncement(service *service.AnnouncementService) *Announcement {
return &Announcement{service: service}
}
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 dto.AnnouncementRequest
if err := c.ShouldBindJSON(&req); err != nil {
Fail(c, err.Error())
return
}
if err := h.service.Create(c.Request.Context(), announcementInput(req)); err != nil {
if err := h.service.Create(c.Request.Context(), &req); err != nil {
Fail(c, "创建失败")
return
}
@@ -53,7 +49,7 @@ func (h *Announcement) Update(c *gin.Context) {
Fail(c, err.Error())
return
}
if err := h.service.Update(c.Request.Context(), announcementInput(req)); err != nil {
if err := h.service.Update(c.Request.Context(), &req); err != nil {
Fail(c, "更新失败")
return
}
internal/server/middleware/access.go
+5 -4
View File
@@ -3,6 +3,7 @@ package middleware
import (
"context"
"kra/internal/biz/system"
httpx "kra/pkg/httpx"
"kra/internal/config"
"kra/internal/utils/routepath"
@@ -19,11 +20,11 @@ func AccessControl(runtime *config.Store, access accessController) gin.HandlerFu
return func(c *gin.Context) {
claims := Claims(c)
if claims == nil {
NoAuth(c, "未登录或非法访问")
httpx.NoAuth(c, "未登录或非法访问")
return
}
if access == nil {
Write(c, CodeError, gin.H{}, "权限服务不可用")
httpx.Write(c, httpx.CodeError, gin.H{}, "权限服务不可用")
c.Abort()
return
}
@@ -36,13 +37,13 @@ func AccessControl(runtime *config.Store, access accessController) gin.HandlerFu
}
allowed, err := access.Authorize(c.Request.Context(), claims.AuthorityID, policyPath, c.Request.Method)
if err != nil || !allowed {
Write(c, CodeError, gin.H{}, "权限不足")
httpx.Write(c, httpx.CodeError, gin.H{}, "权限不足")
c.Abort()
return
}
requestContext, err := access.ContextWithDataScope(c.Request.Context(), claims.AuthorityID, claims.ID)
if err != nil {
Write(c, CodeError, gin.H{}, "数据权限解析失败")
httpx.Write(c, httpx.CodeError, gin.H{}, "数据权限解析失败")
c.Abort()
return
}
internal/server/middleware/access_log.go
+8 -18
View File
@@ -7,6 +7,7 @@ import (
"errors"
"io"
"kra/internal/biz/system"
httpx "kra/pkg/httpx"
"log/slog"
"mime"
"net/http"
@@ -51,7 +52,7 @@ func AccessLog(runtime *config.Store, logger *slog.Logger, version string) gin.H
c.Header("X-Kra-Version", version)
requestReadFailed := c.Request.ContentLength > bodyLimit
if requestReadFailed {
c.AbortWithStatusJSON(http.StatusRequestEntityTooLarge, gin.H{"code": CodeError, "msg": "请求体超过大小上限"})
c.AbortWithStatusJSON(http.StatusRequestEntityTooLarge, gin.H{"code": httpx.CodeError, "msg": "请求体超过大小上限"})
} else if c.Request.Body != nil && !mediaUpload {
limited := http.MaxBytesReader(c.Writer, c.Request.Body, bodyLimit)
var err error
@@ -60,9 +61,9 @@ func AccessLog(runtime *config.Store, logger *slog.Logger, version string) gin.H
requestReadFailed = true
var tooLarge *http.MaxBytesError
if errors.As(err, &tooLarge) {
c.AbortWithStatusJSON(http.StatusRequestEntityTooLarge, gin.H{"code": CodeError, "msg": "请求体超过大小上限"})
c.AbortWithStatusJSON(http.StatusRequestEntityTooLarge, gin.H{"code": httpx.CodeError, "msg": "请求体超过大小上限"})
} else {
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"code": CodeError, "msg": "请求体读取失败"})
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"code": httpx.CodeError, "msg": "请求体读取失败"})
}
} else {
c.Request.Body = io.NopCloser(bytes.NewReader(requestBody))
@@ -204,9 +205,8 @@ func paymentConfigSummary(body []byte) string {
func redactHeaders(headers map[string][]string) map[string]string {
out := make(map[string]string, len(headers))
for key, values := range headers {
lower := strings.ToLower(key)
if lower == "authorization" || lower == "cookie" || lower == "set-cookie" || lower == "x-token" {
out[key] = "***"
if isSensitiveHeader(key) {
out[key] = redactedValue
} else {
out[key] = strings.Join(values, ",")
}
@@ -220,23 +220,13 @@ func redactQuery(raw string) string {
}
values, _ := url.ParseQuery(raw)
for key := range values {
if sensitiveQueryKey(key) {
values[key] = []string{"***"}
if isSensitivePayloadKey(key) {
values[key] = []string{redactedValue}
}
}
return values.Encode()
}
func sensitiveQueryKey(key string) bool {
normalized := strings.ToLower(strings.ReplaceAll(strings.ReplaceAll(key, "_", ""), "-", ""))
switch normalized {
case "token", "accesstoken", "refreshtoken", "authorization", "apikey", "secret":
return true
default:
return strings.HasSuffix(normalized, "token")
}
}
func stringValueFromContext(c *gin.Context, key string) string {
value, _ := c.Get(key)
return stringValue(value)
internal/server/middleware/audit.go
+2 -15
View File
@@ -135,25 +135,12 @@ func operationRequestBody(raw []byte, contentType string, limit int) string {
return text
}
// operationSecretKeys holds the normalized JSON keys whose values never reach
// the operation record. Keys are compared after lowercasing and stripping
// separators, so "new_password" and "newPassword" both match "newpassword".
var operationSecretKeys = map[string]struct{}{
"password": {}, "newpassword": {}, "oldpassword": {}, "confirmpassword": {},
"passwd": {}, "pwd": {}, "token": {}, "accesstoken": {}, "refreshtoken": {},
"secret": {}, "clientsecret": {}, "apikey": {}, "privatekey": {}, "idcard": {},
"appkey": {}, "mchkey": {}, "apiv3key": {}, "clientcert": {}, "clientkey": {},
"platformcert": {}, "platformserialno": {}, "credentialcode": {}, "certfile": {},
"keyfile": {}, "publickey": {}, "rootcert": {}, "appcert": {}, "webhookid": {},
}
func maskOperationBody(value any) {
switch current := value.(type) {
case map[string]any:
for key, item := range current {
normalized := strings.ToLower(strings.ReplaceAll(strings.ReplaceAll(key, "_", ""), "-", ""))
if _, secret := operationSecretKeys[normalized]; secret {
current[key] = "***"
if isSensitivePayloadKey(key) {
current[key] = redactedValue
continue
}
maskOperationBody(item)
internal/server/middleware/auth.go
+9 -8
View File
@@ -4,6 +4,7 @@ import (
"context"
"errors"
"kra/internal/biz/system"
httpx "kra/pkg/httpx"
"net/http"
"strconv"
"strings"
@@ -43,11 +44,11 @@ func AuthenticateWebSocket(c *gin.Context, auth TokenAuthenticator) bool {
func authenticate(c *gin.Context, auth TokenAuthenticator, allowQueryToken bool) bool {
token := RequestToken(c, allowQueryToken)
if token == "" {
NoAuth(c, "未登录或非法访问，请登录")
httpx.NoAuth(c, "未登录或非法访问，请登录")
return false
}
if auth == nil {
NoAuth(c, "认证服务不可用")
httpx.NoAuth(c, "认证服务不可用")
return false
}
// Followers of a singleflight flight must not inherit the leader's request
@@ -61,20 +62,20 @@ func authenticate(c *gin.Context, auth TokenAuthenticator, allowQueryToken bool)
return auth.AuthenticateToken(ctx, token)
})
if err != nil {
SetTokenCookie(c, "", -1)
NoAuth(c, tokenErrorMessage(err))
httpx.SetTokenCookie(c, "", -1)
httpx.NoAuth(c, tokenErrorMessage(err))
return false
}
authentication, ok := value.(*system.TokenAuthentication)
if !ok || authentication == nil || authentication.Claims == nil {
SetTokenCookie(c, "", -1)
NoAuth(c, "无法处理此token")
httpx.SetTokenCookie(c, "", -1)
httpx.NoAuth(c, "无法处理此token")
return false
}
if authentication.Refreshed != nil {
c.Header("new-token", authentication.Refreshed.Value)
c.Header("new-expires-at", strconv.FormatInt(authentication.Refreshed.ExpiresAt.Unix(), 10))
SetTokenCookie(c, authentication.Refreshed.Value, int(authentication.Refreshed.TTL.Seconds()))
httpx.SetTokenCookie(c, authentication.Refreshed.Value, int(authentication.Refreshed.TTL.Seconds()))
}
c.Set(claimsKey, authentication.Claims)
return true
@@ -140,6 +141,6 @@ func MustChangePassword() gin.HandlerFunc {
c.Next()
return
}
c.AbortWithStatusJSON(http.StatusConflict, Response{Code: CodePasswordChangeRequired, Data: gin.H{"needChangePassword": true}, Msg: "密码已过期，请先修改密码"})
c.AbortWithStatusJSON(http.StatusConflict, httpx.Response{Code: httpx.CodePasswordChangeRequired, Data: gin.H{"needChangePassword": true}, Msg: "密码已过期，请先修改密码"})
}
}
internal/server/middleware/error_audit.go
+3 -2
View File
@@ -3,6 +3,7 @@ package middleware
import (
"bytes"
"encoding/json"
httpx "kra/pkg/httpx"
"log/slog"
"strings"
@@ -24,7 +25,7 @@ func ErrorAudit(logger *slog.Logger) gin.HandlerFunc {
if auditPersistFailed != true && (strings.Contains(c.Request.URL.Path, "/sysError/") || strings.Contains(c.Request.URL.Path, "/logViewer/") || c.Writer.Status() >= 300 && c.Writer.Status() < 500) {
return
}
var response Response
var response httpx.Response
var body []byte
if value, ok := c.Get(ctxRespBufferKey); ok {
if buffer, valid := value.(*bytes.Buffer); valid {
@@ -34,7 +35,7 @@ func ErrorAudit(logger *slog.Logger) gin.HandlerFunc {
if json.Unmarshal(body, &response) != nil && privateErrors == "" {
return
}
if response.Code == CodeSuccess && privateErrors == "" {
if response.Code == httpx.CodeSuccess && privateErrors == "" {
return
}
if privateErrors == "" && expectedClientFailure(response.Msg) {
internal/server/middleware/http.go
-18
View File
@@ -1,18 +0,0 @@
package middleware
import (
"github.com/gin-gonic/gin"
httpx "kra/pkg/httpx"
)
const (
CodeSuccess = httpx.CodeSuccess
CodeError = httpx.CodeError
CodePasswordChangeRequired = httpx.CodePasswordChangeRequired
)
type Response = httpx.Response
func Write(c *gin.Context, code int, data any, message string) { httpx.Write(c, code, data, message) }
func NoAuth(c *gin.Context, message string) { httpx.NoAuth(c, message) }
func SetTokenCookie(c *gin.Context, value string, maxAge int) { httpx.SetTokenCookie(c, value, maxAge) }
internal/server/middleware/rate_limit.go
+4 -3
View File
@@ -2,6 +2,7 @@ package middleware
import (
"kra/internal/service"
httpx "kra/pkg/httpx"
"net/http"
"strings"
"time"
@@ -22,7 +23,7 @@ func SecurityRateLimit(settings *service.SecurityService) gin.HandlerFunc {
}
config, err := settings.CurrentSecurity(c.Request.Context())
if err != nil || config == nil {
c.AbortWithStatusJSON(http.StatusServiceUnavailable, gin.H{"code": CodeError, "msg": "安全服务暂不可用"})
c.AbortWithStatusJSON(http.StatusServiceUnavailable, gin.H{"code": httpx.CodeError, "msg": "安全服务暂不可用"})
return
}
if !config.LimitEnable {
@@ -40,11 +41,11 @@ func SecurityRateLimit(settings *service.SecurityService) gin.HandlerFunc {
key := "KRA_SecLimit:" + c.ClientIP() + ":" + route
count, cacheErr := settings.IncrementRateLimit(c.Request.Context(), key, time.Duration(window)*time.Second)
if cacheErr != nil {
c.AbortWithStatusJSON(http.StatusServiceUnavailable, gin.H{"code": CodeError, "msg": "安全服务暂不可用"})
c.AbortWithStatusJSON(http.StatusServiceUnavailable, gin.H{"code": httpx.CodeError, "msg": "安全服务暂不可用"})
return
}
if int(count) > config.LimitCount {
c.JSON(200, gin.H{"code": CodeError, "msg": "请求太过频繁，请稍后再试"})
c.JSON(200, gin.H{"code": httpx.CodeError, "msg": "请求太过频繁，请稍后再试"})
c.Abort()
return
}
internal/server/middleware/rate_limit_test.go
+3 -3
View File
@@ -10,7 +10,7 @@ import (
"testing"
"time"
"kra/internal/service"
systemservice "kra/internal/service/system"
"github.com/gin-gonic/gin"
)
@@ -38,7 +38,7 @@ func (c rateLimitCache) Increment(context.Context, string, time.Duration) (int64
func TestSecurityRateLimitMatchesResponseContract(t *testing.T) {
gin.SetMode(gin.TestMode)
settings := service.NewSecurityService(system.NewSecurityUsecase(rateLimitSecurityRepo{}, rateLimitCache{}, nil, nil))
settings := systemservice.NewSecurityService(system.NewSecurityUsecase(rateLimitSecurityRepo{}, rateLimitCache{}, nil, nil))
engine := gin.New()
engine.Use(SecurityRateLimit(settings))
engine.POST("/base/login", func(c *gin.Context) { c.Status(http.StatusNoContent) })
@@ -56,7 +56,7 @@ func TestSecurityRateLimitMatchesResponseContract(t *testing.T) {
func TestSecurityRateLimitFailsClosedWhenCacheIsUnavailable(t *testing.T) {
gin.SetMode(gin.TestMode)
settings := service.NewSecurityService(system.NewSecurityUsecase(rateLimitSecurityRepo{}, rateLimitCache{err: errors.New("cache unavailable")}, nil, nil))
settings := systemservice.NewSecurityService(system.NewSecurityUsecase(rateLimitSecurityRepo{}, rateLimitCache{err: errors.New("cache unavailable")}, nil, nil))
engine := gin.New()
called := false
engine.Use(SecurityRateLimit(settings))
internal/server/middleware/recovery.go
+2 -3
View File
@@ -64,9 +64,8 @@ func recoveryRequestDump(request *http.Request) string {
clone := request.Clone(request.Context())
clone.Header = request.Header.Clone()
for key := range clone.Header {
switch strings.ToLower(key) {
case "authorization", "cookie", "set-cookie", "x-token", "proxy-authorization":
clone.Header[key] = []string{"***"}
if isSensitiveHeader(key) {
clone.Header[key] = []string{redactedValue}
}
}
if request.URL != nil {
internal/server/middleware/redact.go
+41
View File
@@ -0,0 +1,41 @@
package middleware
import "strings"
// redactedValue replaces a sensitive value in every log line and audit record.
const redactedValue = "***"
// sensitiveHeaders lists the headers whose value never reaches a log, compared
// after lowercasing.
var sensitiveHeaders = map[string]struct{}{
"authorization": {}, "proxy-authorization": {}, "cookie": {}, "set-cookie": {}, "x-token": {},
}
// sensitivePayloadKeys holds the normalized query and JSON body keys whose
// values never reach a log or an operation record. Keys are compared after
// lowercasing and stripping separators, so "new_password" and "newPassword"
// both match "newpassword".
var sensitivePayloadKeys = map[string]struct{}{
"password": {}, "newpassword": {}, "oldpassword": {}, "confirmpassword": {},
"passwd": {}, "pwd": {}, "token": {}, "accesstoken": {}, "refreshtoken": {},
"secret": {}, "clientsecret": {}, "apikey": {}, "privatekey": {}, "idcard": {},
"appkey": {}, "mchkey": {}, "apiv3key": {}, "clientcert": {}, "clientkey": {},
"platformcert": {}, "platformserialno": {}, "credentialcode": {}, "certfile": {},
"keyfile": {}, "publickey": {}, "rootcert": {}, "appcert": {}, "webhookid": {},
"authorization": {},
}
func isSensitiveHeader(key string) bool {
_, sensitive := sensitiveHeaders[strings.ToLower(key)]
return sensitive
}
// isSensitivePayloadKey also matches every key ending in "token" so provider
// specific token names stay masked without being enumerated.
func isSensitivePayloadKey(key string) bool {
normalized := strings.ToLower(strings.ReplaceAll(strings.ReplaceAll(key, "_", ""), "-", ""))
if _, sensitive := sensitivePayloadKeys[normalized]; sensitive {
return true
}
return strings.HasSuffix(normalized, "token")
}
internal/server/router/aliases.go
-27
View File
@@ -1,27 +0,0 @@
package router
import "kra/internal/server/handler"
type Set = handler.Set
type Announcement = handler.Announcement
type API = handler.API
type APIToken = handler.APIToken
type Audit = handler.Audit
type Authority = handler.Authority
type Dictionary = handler.Dictionary
type Email = handler.Email
type Export = handler.Export
type Media = handler.Media
type Menu = handler.Menu
type Navigation = handler.Navigation
type Organization = handler.Organization
type Parameter = handler.Parameter
type Payment = handler.Payment
type Permission = handler.Permission
type Public = handler.Public
type Session = handler.Session
type SystemConfig = handler.SystemConfig
type Task = handler.Task
type User = handler.User
type Version = handler.Version
type IntegrationConfig = handler.IntegrationConfig
internal/server/router/announcement.go
+2 -1
View File
@@ -2,9 +2,10 @@ package router
import (
"github.com/gin-gonic/gin"
"kra/internal/server/handler"
)
func RegisterAnnouncement(private, public *gin.RouterGroup, h *Announcement) {
func RegisterAnnouncement(private, public *gin.RouterGroup, h *handler.Announcement) {
privateInfo := private.Group("/info")
privateInfo.POST("/createInfo", h.Create)
privateInfo.DELETE("/deleteInfo", h.Delete)
internal/server/router/api.go
+2 -1
View File
@@ -2,9 +2,10 @@ package router
import (
"github.com/gin-gonic/gin"
"kra/internal/server/handler"
)
func RegisterAPI(group, public *gin.RouterGroup, engine *gin.Engine, h *API) {
func RegisterAPI(group, public *gin.RouterGroup, engine *gin.Engine, h *handler.API) {
api := group.Group("/api")
api.POST("/getApiList", h.List)
api.POST("/getAllApis", h.All)
internal/server/router/api_token.go
+5 -4
View File
@@ -2,11 +2,12 @@ package router
import (
"github.com/gin-gonic/gin"
"kra/internal/server/handler"
)
func RegisterAPIToken(group *gin.RouterGroup, handler *APIToken) {
func RegisterAPIToken(group *gin.RouterGroup, h *handler.APIToken) {
router := group.Group("/sysApiToken")
router.POST("/createApiToken", handler.Create)
router.POST("/getApiTokenList", handler.List)
router.POST("/deleteApiToken", handler.Delete)
router.POST("/createApiToken", h.Create)
router.POST("/getApiTokenList", h.List)
router.POST("/deleteApiToken", h.Delete)
}
internal/server/router/audit.go
+2 -1
View File
@@ -2,9 +2,10 @@ package router
import (
"github.com/gin-gonic/gin"
"kra/internal/server/handler"
)
func RegisterAudit(group, public *gin.RouterGroup, h *Audit) {
func RegisterAudit(group, public *gin.RouterGroup, h *handler.Audit) {
operations := group.Group("/sysOperationRecord")
operations.GET("/getSysOperationRecordList", h.Operations)
operations.GET("/findSysOperationRecord", h.Operation)
internal/server/router/authority.go
+2 -1
View File
@@ -2,9 +2,10 @@ package router
import (
"github.com/gin-gonic/gin"
"kra/internal/server/handler"
)
func RegisterAuthority(group *gin.RouterGroup, h *Authority) {
func RegisterAuthority(group *gin.RouterGroup, h *handler.Authority) {
router := group.Group("/authority")
router.POST("/getAuthorityList", h.List)
router.POST("/createAuthority", h.Create)
internal/server/router/dictionary.go
+2 -1
View File
@@ -2,9 +2,10 @@ package router
import (
"github.com/gin-gonic/gin"
"kra/internal/server/handler"
)
func RegisterDictionary(group *gin.RouterGroup, h *Dictionary) {
func RegisterDictionary(group *gin.RouterGroup, h *handler.Dictionary) {
dictionaries := group.Group("/sysDictionary")
dictionaries.POST("/createSysDictionary", h.Create)
dictionaries.PUT("/updateSysDictionary", h.Update)
internal/server/router/email.go
+2 -1
View File
@@ -2,9 +2,10 @@ package router
import (
"github.com/gin-gonic/gin"
"kra/internal/server/handler"
)
func RegisterEmail(group *gin.RouterGroup, h *Email) {
func RegisterEmail(group *gin.RouterGroup, h *handler.Email) {
email := group.Group("/email")
email.POST("/emailTest", h.Test)
email.POST("/sendEmail", h.Send)
internal/server/router/export.go
+2 -1
View File
@@ -2,9 +2,10 @@ package router
import (
"github.com/gin-gonic/gin"
"kra/internal/server/handler"
)
func RegisterExport(group, public *gin.RouterGroup, h *Export) {
func RegisterExport(group, public *gin.RouterGroup, h *handler.Export) {
router := group.Group("/sysExportTemplate")
router.POST("/createSysExportTemplate", h.Create)
router.PUT("/updateSysExportTemplate", h.Update)
internal/server/router/integration_config.go
+11 -7
View File
@@ -1,12 +1,16 @@
package router
import "github.com/gin-gonic/gin"
import (
"kra/internal/server/handler"
func RegisterIntegrationConfig(group *gin.RouterGroup, handler *IntegrationConfig) {
"github.com/gin-gonic/gin"
)
func RegisterIntegrationConfig(group *gin.RouterGroup, h *handler.IntegrationConfig) {
configs := group.Group("/integration/configs")
configs.GET("/:kind", handler.List)
configs.GET("/:kind/:provider", handler.Find)
configs.PUT("/:kind/:provider", handler.Save)
configs.POST("/:kind/:provider/test", handler.Test)
configs.DELETE("/:kind/:provider", handler.Delete)
configs.GET("/:kind", h.List)
configs.GET("/:kind/:provider", h.Find)
configs.PUT("/:kind/:provider", h.Save)
configs.POST("/:kind/:provider/test", h.Test)
configs.DELETE("/:kind/:provider", h.Delete)
}
internal/server/router/media.go
+2 -1
View File
@@ -2,9 +2,10 @@ package router
import (
"github.com/gin-gonic/gin"
"kra/internal/server/handler"
)
func RegisterMedia(group *gin.RouterGroup, h *Media) {
func RegisterMedia(group *gin.RouterGroup, h *handler.Media) {
files := group.Group("/fileUploadAndDownload")
files.POST("/upload", h.Upload)
files.POST("/getFileList", h.List)
internal/server/router/menu.go
+2 -1
View File
@@ -2,9 +2,10 @@ package router
import (
"github.com/gin-gonic/gin"
"kra/internal/server/handler"
)
func RegisterMenu(group *gin.RouterGroup, h *Menu) {
func RegisterMenu(group *gin.RouterGroup, h *handler.Menu) {
router := group.Group("/menu")
router.POST("/getMenuList", h.List)
router.POST("/getBaseMenuTree", h.Tree)
internal/server/router/organization.go
+2 -1
View File
@@ -2,9 +2,10 @@ package router
import (
"github.com/gin-gonic/gin"
"kra/internal/server/handler"
)
func RegisterOrganization(group *gin.RouterGroup, h *Organization) {
func RegisterOrganization(group *gin.RouterGroup, h *handler.Organization) {
departments := group.Group("/department")
departments.POST("/getDepartmentList", h.ListDepartments)
departments.POST("/createDepartment", h.CreateDepartment)
internal/server/router/parameter.go
+9 -8
View File
@@ -2,15 +2,16 @@ package router
import (
"github.com/gin-gonic/gin"
"kra/internal/server/handler"
)
func RegisterParameter(group *gin.RouterGroup, handler *Parameter) {
func RegisterParameter(group *gin.RouterGroup, h *handler.Parameter) {
router := group.Group("/sysParams")
router.POST("/createSysParams", handler.Create)
router.PUT("/updateSysParams", handler.Update)
router.DELETE("/deleteSysParams", handler.Delete)
router.DELETE("/deleteSysParamsByIds", handler.DeleteMany)
router.GET("/findSysParams", handler.Find)
router.GET("/getSysParam", handler.Get)
router.GET("/getSysParamsList", handler.List)
router.POST("/createSysParams", h.Create)
router.PUT("/updateSysParams", h.Update)
router.DELETE("/deleteSysParams", h.Delete)
router.DELETE("/deleteSysParamsByIds", h.DeleteMany)
router.GET("/findSysParams", h.Find)
router.GET("/getSysParam", h.Get)
router.GET("/getSysParamsList", h.List)
}
internal/server/router/payment.go
+2 -1
View File
@@ -2,9 +2,10 @@ package router
import (
"github.com/gin-gonic/gin"
"kra/internal/server/handler"
)
func RegisterPayment(group, public *gin.RouterGroup, h *Payment) {
func RegisterPayment(group, public *gin.RouterGroup, h *handler.Payment) {
payment := group.Group("/payment")
payment.GET("/orders", h.Orders)
payment.POST("/providers/:provider/test", h.TestProvider)
internal/server/router/permission.go
+2 -1
View File
@@ -2,9 +2,10 @@ package router
import (
"github.com/gin-gonic/gin"
"kra/internal/server/handler"
)
func RegisterPermission(group *gin.RouterGroup, h *Permission) {
func RegisterPermission(group *gin.RouterGroup, h *handler.Permission) {
buttons := group.Group("/authorityBtn")
buttons.POST("/getAuthorityBtn", h.Buttons)
buttons.POST("/setAuthorityBtn", h.SetButtons)
internal/server/router/public.go
+6 -5
View File
@@ -2,13 +2,14 @@ package router
import (
"github.com/gin-gonic/gin"
"kra/internal/server/handler"
)
func RegisterPublic(group *gin.RouterGroup, engine *gin.Engine, handler *Public) {
func RegisterPublic(group *gin.RouterGroup, engine *gin.Engine, h *handler.Public) {
base := group.Group("/base")
base.POST("/captcha", handler.Captcha)
base.POST("/login", handler.Login)
base.POST("/captcha", h.Captcha)
base.POST("/login", h.Login)
init := group.Group("/init")
init.POST("/checkdb", handler.CheckDatabase)
init.POST("/initdb", handler.InitializeDatabase(engine))
init.POST("/checkdb", h.CheckDatabase)
init.POST("/initdb", h.InitializeDatabase(engine))
}
internal/server/router/routes.go
+3 -2
View File
@@ -1,16 +1,17 @@
package router
import (
"kra/internal/server/handler"
platformmodule "kra/pkg/module"
"github.com/gin-gonic/gin"
)
type Routes struct {
handlers *Set
handlers *handler.Set
}
func NewRoutes(handlers *Set) *Routes { return &Routes{handlers: handlers} }
func NewRoutes(handlers *handler.Set) *Routes { return &Routes{handlers: handlers} }
var _ platformmodule.RouteRegistrar = (*Routes)(nil)
internal/server/router/system_config.go
+8 -7
View File
@@ -2,16 +2,17 @@ package router
import (
"github.com/gin-gonic/gin"
"kra/internal/server/handler"
)
func RegisterSystemConfig(group *gin.RouterGroup, handler *SystemConfig) {
func RegisterSystemConfig(group *gin.RouterGroup, h *handler.SystemConfig) {
security := group.Group("/securityConfig")
security.GET("/getSecurityConfig", handler.GetSecurity)
security.POST("/setSecurityConfig", handler.SetSecurity)
security.GET("/getSecurityConfig", h.GetSecurity)
security.POST("/setSecurityConfig", h.SetSecurity)
system := group.Group("/system")
system.POST("/getSystemConfig", handler.Get)
system.POST("/setSystemConfig", handler.Set)
system.POST("/reloadSystem", handler.Reload)
system.POST("/getServerInfo", handler.ServerInfo)
system.POST("/getSystemConfig", h.Get)
system.POST("/setSystemConfig", h.Set)
system.POST("/reloadSystem", h.Reload)
system.POST("/getServerInfo", h.ServerInfo)
}
internal/server/router/task.go
+2 -1
View File
@@ -2,9 +2,10 @@ package router
import (
"github.com/gin-gonic/gin"
"kra/internal/server/handler"
)
func RegisterTask(group *gin.RouterGroup, h *Task) {
func RegisterTask(group *gin.RouterGroup, h *handler.Task) {
router := group.Group("/timedTask")
router.POST("/createTimedTask", h.Create)
router.PUT("/updateTimedTask", h.Update)
internal/server/router/user.go
+17 -16
View File
@@ -2,27 +2,28 @@ package router
import (
"github.com/gin-gonic/gin"
"kra/internal/server/handler"
)
func RegisterUser(group *gin.RouterGroup, handler *User) {
func RegisterUser(group *gin.RouterGroup, h *handler.User) {
user := group.Group("/user")
user.POST("/getUserList", handler.List)
user.POST("/admin_register", handler.Create)
user.PUT("/setUserInfo", handler.Update)
user.PUT("/setSelfInfo", handler.UpdateSelf)
user.DELETE("/deleteUser", handler.Delete)
user.POST("/resetPassword", handler.ResetPassword)
user.POST("/changePassword", handler.ChangePassword)
user.PUT("/setSelfSetting", handler.SetSelfSetting)
user.POST("/setUserAuthorities", handler.SetAuthorities)
user.POST("/setUserAuthority", handler.SwitchAuthority)
user.GET("/getUserInfo", handler.Get)
user.POST("/getUserList", h.List)
user.POST("/admin_register", h.Create)
user.PUT("/setUserInfo", h.Update)
user.PUT("/setSelfInfo", h.UpdateSelf)
user.DELETE("/deleteUser", h.Delete)
user.POST("/resetPassword", h.ResetPassword)
user.POST("/changePassword", h.ChangePassword)
user.PUT("/setSelfSetting", h.SetSelfSetting)
user.POST("/setUserAuthorities", h.SetAuthorities)
user.POST("/setUserAuthority", h.SwitchAuthority)
user.GET("/getUserInfo", h.Get)
}
func RegisterNavigation(group *gin.RouterGroup, handler *Navigation) {
group.Group("/menu").POST("/getMenu", handler.Menu)
func RegisterNavigation(group *gin.RouterGroup, h *handler.Navigation) {
group.Group("/menu").POST("/getMenu", h.Menu)
}
func RegisterSession(group *gin.RouterGroup, handler *Session) {
group.Group("/jwt").POST("/jsonInBlacklist", handler.Logout)
func RegisterSession(group *gin.RouterGroup, h *handler.Session) {
group.Group("/jwt").POST("/jsonInBlacklist", h.Logout)
}
internal/server/router/version.go
+2 -1
View File
@@ -2,9 +2,10 @@ package router
import (
"github.com/gin-gonic/gin"
"kra/internal/server/handler"
)
func RegisterVersion(group *gin.RouterGroup, h *Version) {
func RegisterVersion(group *gin.RouterGroup, h *handler.Version) {
router := group.Group("/sysVersion")
router.DELETE("/deleteSysVersion", h.Delete)
router.DELETE("/deleteSysVersionByIds", h.DeleteMany)