优化结构

internal/data/repository/runtime.go

@@ -4,9 +4,9 @@ package system
 
 import (
 	"errors"
+	"kra/internal/biz/system"
 	"time"
 
-	"kra/internal/biz"
 	"kra/internal/conf"
 	"kra/internal/security"
 
@@ -15,7 +15,7 @@ import (
 
 type runtimeSettings struct{ runtime *conf.Runtime }
 
-func NewRuntimeSettings(runtime *conf.Runtime) biz.RuntimeSettings {
+func NewRuntimeSettings(runtime *conf.Runtime) system.RuntimeSettings {
 	return &runtimeSettings{runtime: runtime}
 }
 
@@ -27,8 +27,8 @@ func (s *runtimeSettings) RouterPrefix() string {
 	return config.RouterPrefix
 }
 
-func (s *runtimeSettings) JWTSettings() biz.JWTSettings {
-	value := biz.JWTSettings{Issuer: "kra", Expires: 7 * 24 * time.Hour, Buffer: 24 * time.Hour}
+func (s *runtimeSettings) JWTSettings() system.JWTSettings {
+	value := system.JWTSettings{Issuer: "kra", Expires: 7 * 24 * time.Hour, Buffer: 24 * time.Hour}
 	config := s.runtime.Admin()
 	if config == nil || config.Jwt == nil {
 		return value
@@ -46,8 +46,8 @@ func (s *runtimeSettings) JWTSettings() biz.JWTSettings {
 	return value
 }
 
-func (s *runtimeSettings) CaptchaSettings() biz.CaptchaSettings {
-	value := biz.CaptchaSettings{KeyLong: 6, ImageWidth: 240, ImageHeight: 80, StoreExpiration: 3 * time.Minute}
+func (s *runtimeSettings) CaptchaSettings() system.CaptchaSettings {
+	value := system.CaptchaSettings{KeyLong: 6, ImageWidth: 240, ImageHeight: 80, StoreExpiration: 3 * time.Minute}
 	config := s.runtime.Admin()
 	if config == nil || config.Captcha == nil {
 		return value
@@ -67,12 +67,12 @@ func (s *runtimeSettings) CaptchaSettings() biz.CaptchaSettings {
 	return value
 }
 
-func (s *runtimeSettings) MediaSettings() biz.MediaSettings {
+func (s *runtimeSettings) MediaSettings() system.MediaSettings {
 	config := s.runtime.Admin()
 	if config == nil || config.Media == nil {
-		return biz.MediaSettings{}
+		return system.MediaSettings{}
 	}
-	return biz.MediaSettings{SessionTTL: int(config.Media.SessionTtl), MaxFileSize: config.Media.MaxFileSize, ChunkDir: config.Media.ChunkDir}
+	return system.MediaSettings{SessionTTL: int(config.Media.SessionTtl), MaxFileSize: config.Media.MaxFileSize, ChunkDir: config.Media.ChunkDir}
 }
 
 func (s *runtimeSettings) UseMultipoint() bool {
@@ -80,13 +80,13 @@ func (s *runtimeSettings) UseMultipoint() bool {
 	return config != nil && config.System != nil && config.System.UseMultipoint
 }
 
-type tokenIssuer struct{ settings biz.RuntimeSettings }
+type tokenIssuer struct{ settings system.RuntimeSettings }
 
-func NewTokenIssuer(settings biz.RuntimeSettings) biz.TokenIssuer {
+func NewTokenIssuer(settings system.RuntimeSettings) system.TokenIssuer {
 	return &tokenIssuer{settings: settings}
 }
 
-func (i *tokenIssuer) IssueToken(user *biz.User, authorityID uint, mustChangePassword bool, expires time.Duration) (*biz.IssuedToken, error) {
+func (i *tokenIssuer) IssueToken(user *system.User, authorityID uint, mustChangePassword bool, expires time.Duration) (*system.IssuedToken, error) {
 	settings := i.settings.JWTSettings()
 	if expires <= 0 {
 		expires = settings.Expires
@@ -99,10 +99,10 @@ func (i *tokenIssuer) IssueToken(user *biz.User, authorityID uint, mustChangePas
 	if err != nil {
 		return nil, err
 	}
-	return &biz.IssuedToken{Value: token, ExpiresAt: claims.ExpiresAt.Time, TTL: expires}, nil
+	return &system.IssuedToken{Value: token, ExpiresAt: claims.ExpiresAt.Time, TTL: expires}, nil
 }
 
-func (i *tokenIssuer) ReissueToken(source *biz.AuthClaims, authorityID uint) (*biz.IssuedToken, error) {
+func (i *tokenIssuer) ReissueToken(source *system.AuthClaims, authorityID uint) (*system.IssuedToken, error) {
 	if source == nil {
 		return nil, errors.New("nil JWT claims")
 	}
@@ -120,23 +120,23 @@ func (i *tokenIssuer) ReissueToken(source *biz.AuthClaims, authorityID uint) (*b
 	if err != nil {
 		return nil, err
 	}
-	return &biz.IssuedToken{Value: token, ExpiresAt: source.ExpiresAt, TTL: time.Until(source.ExpiresAt)}, nil
+	return &system.IssuedToken{Value: token, ExpiresAt: source.ExpiresAt, TTL: time.Until(source.ExpiresAt)}, nil
 }
 
-func (i *tokenIssuer) ParseToken(token string) (*biz.AuthClaims, error) {
+func (i *tokenIssuer) ParseToken(token string) (*system.AuthClaims, error) {
 	claims, err := security.Parse(token, i.settings.JWTSettings().SigningKey)
 	if err != nil {
 		switch {
 		case errors.Is(err, security.ErrTokenExpired):
-			return nil, biz.ErrTokenExpired
+			return nil, system.ErrTokenExpired
 		case errors.Is(err, security.ErrTokenMalformed):
-			return nil, biz.ErrTokenMalformed
+			return nil, system.ErrTokenMalformed
 		case errors.Is(err, security.ErrTokenSignatureInvalid):
-			return nil, biz.ErrTokenSignatureInvalid
+			return nil, system.ErrTokenSignatureInvalid
 		case errors.Is(err, security.ErrTokenNotValidYet):
-			return nil, biz.ErrTokenNotValidYet
+			return nil, system.ErrTokenNotValidYet
 		default:
-			return nil, biz.ErrTokenInvalid
+			return nil, system.ErrTokenInvalid
 		}
 	}
 	audience := append([]string(nil), claims.Audience...)
@@ -144,5 +144,5 @@ func (i *tokenIssuer) ParseToken(token string) (*biz.AuthClaims, error) {
 	if claims.IssuedAt != nil {
 		issuedAt = claims.IssuedAt.Time
 	}
-	return &biz.AuthClaims{UUID: claims.UUID, ID: claims.ID, Username: claims.Username, NickName: claims.NickName, AuthorityID: claims.AuthorityID, UserType: claims.UserType, BufferTime: time.Duration(claims.BufferTime) * time.Second, MustChangePwd: claims.MustChangePwd, PasswordVersion: claims.PasswordVersion, Issuer: claims.Issuer, Audience: audience, IssuedAt: issuedAt, NotBefore: claims.NotBefore.Time, ExpiresAt: claims.ExpiresAt.Time}, nil
+	return &system.AuthClaims{UUID: claims.UUID, ID: claims.ID, Username: claims.Username, NickName: claims.NickName, AuthorityID: claims.AuthorityID, UserType: claims.UserType, BufferTime: time.Duration(claims.BufferTime) * time.Second, MustChangePwd: claims.MustChangePwd, PasswordVersion: claims.PasswordVersion, Issuer: claims.Issuer, Audience: audience, IssuedAt: issuedAt, NotBefore: claims.NotBefore.Time, ExpiresAt: claims.ExpiresAt.Time}, nil
 }