OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

refactor: 重构更新多个文件中的相关调用

Browse Source
This commit is contained in:
TsMask
2025-02-20 10:11:40 +08:00
parent f3c33b31ac
commit 5b9bcd6660
34 changed files with 1243 additions and 1894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/core/ctx/ctx.go
View File

@@ -10,9 +10,8 @@ import (
"path/filepath"
"strings"
"be.ems/src/framework/constants/token"
tokenUtils "be.ems/src/framework/utils/token"
"be.ems/src/framework/vo"
"be.ems/src/framework/constants"
"be.ems/src/framework/token"
"github.com/gorilla/mux"
"golang.org/x/text/language"
)
@@ -123,25 +122,25 @@ func SaveUploadedFile(r *http.Request, dst string) error {
// Authorization 解析请求头
func Authorization(r *http.Request) string {
// Query请求查询
if authQuery := r.URL.Query().Get(token.ACCESS_TOKEN); authQuery != "" {
if authQuery := r.URL.Query().Get(constants.ACCESS_TOKEN); authQuery != "" {
return authQuery
}
// Header请求头
if authHeader := r.Header.Get(token.ACCESS_TOKEN); authHeader != "" {
if authHeader := r.Header.Get(constants.ACCESS_TOKEN); authHeader != "" {
return authHeader
}
// Query请求查询
if authQuery := r.URL.Query().Get(token.RESPONSE_FIELD); authQuery != "" {
if authQuery := r.URL.Query().Get(constants.ACCESS_TOKEN_QUERY); authQuery != "" {
return authQuery
}
// Header请求头
authHeader := r.Header.Get(token.HEADER_KEY)
authHeader := r.Header.Get(constants.HEADER_KEY)
if authHeader == "" {
return ""
}
// 拆分 Authorization 请求头，提取 JWT 令牌部分
arr := strings.Split(authHeader, token.HEADER_PREFIX)
arr := strings.Split(authHeader, constants.HEADER_PREFIX)
if len(arr) == 2 && arr[1] == "" {
return ""
}
@@ -177,34 +176,34 @@ func AcceptLanguage(r *http.Request) string {
type ContextKey string
// LoginUser 登录用户信息需要Authorize中间件
func LoginUser(r *http.Request) (vo.LoginUser, error) {
func LoginUser(r *http.Request) (token.TokenInfo, error) {
// 获取请求头标识信息
tokenStr := Authorization(r)
if tokenStr == "" {
return vo.LoginUser{}, fmt.Errorf("not token info")
return token.TokenInfo{}, fmt.Errorf("not token info")
}
// 验证令牌
claims, err := tokenUtils.Verify(tokenStr)
claims, err := token.Verify(tokenStr)
if err != nil {
return vo.LoginUser{}, fmt.Errorf("token verify fail")
return token.TokenInfo{}, fmt.Errorf("token verify fail")
}
// 获取缓存的用户信息
loginUser := tokenUtils.LoginUser(claims)
if loginUser.UserID == "" {
return vo.LoginUser{}, fmt.Errorf("not user info")
loginUser := token.Info(claims)
if loginUser.UserId <= 0 {
return token.TokenInfo{}, fmt.Errorf("not user info")
}
return loginUser, nil
}
// LoginUserToUserID 登录用户信息-用户ID
func LoginUserToUserID(r *http.Request) string {
func LoginUserToUserID(r *http.Request) int64 {
loginUser, err := LoginUser(r)
if err != nil {
return ""
return 0
}
return loginUser.UserID
return loginUser.UserId
}
// LoginUserToUserName 登录用户信息-用户名称