fix GeneralUserToken
This commit is contained in:
parent
f2921c91a1
commit
184d61a5c7
@ -1,7 +1,6 @@
|
|||||||
package middleware
|
package middleware
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"qnc-server/app/main/model"
|
"qnc-server/app/main/model"
|
||||||
"qnc-server/common/ctxdata"
|
"qnc-server/common/ctxdata"
|
||||||
@ -25,7 +24,6 @@ func (m *UserAuthInterceptorMiddleware) Handle(next http.HandlerFunc) http.Handl
|
|||||||
httpx.Error(w, errors.Wrapf(xerr.NewErrCode(ErrCodeUnauthorized), "token解析失败: %v", err))
|
httpx.Error(w, errors.Wrapf(xerr.NewErrCode(ErrCodeUnauthorized), "token解析失败: %v", err))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
fmt.Println(claims)
|
|
||||||
if claims.UserType == model.UserTypeTemp {
|
if claims.UserType == model.UserTypeTemp {
|
||||||
httpx.Error(w, errors.Wrapf(xerr.NewErrCode(xerr.USER_NEED_BIND_MOBILE), "token解析失败: %v", err))
|
httpx.Error(w, errors.Wrapf(xerr.NewErrCode(xerr.USER_NEED_BIND_MOBILE), "token解析失败: %v", err))
|
||||||
return
|
return
|
||||||
|
@ -86,10 +86,14 @@ func (s *UserService) GeneralUserToken(ctx context.Context, userID int64) (strin
|
|||||||
var isAgent int64
|
var isAgent int64
|
||||||
var agentID int64
|
var agentID int64
|
||||||
var userType int64
|
var userType int64
|
||||||
user, err := s.userModel.FindOne(ctx, userID)
|
var user *model.User
|
||||||
|
users, err := s.userModel.FindAll(ctx, s.userModel.SelectBuilder().Where("id = ?", userID), "")
|
||||||
if err != nil && !errors.Is(err, model.ErrNotFound) {
|
if err != nil && !errors.Is(err, model.ErrNotFound) {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
if len(users) > 0 {
|
||||||
|
user = users[0]
|
||||||
|
}
|
||||||
if user != nil {
|
if user != nil {
|
||||||
userID = user.Id
|
userID = user.Id
|
||||||
userType = model.UserTypeNormal
|
userType = model.UserTypeNormal
|
||||||
|
@ -9,7 +9,7 @@ import (
|
|||||||
|
|
||||||
func TestAesEcbMobileEncryption(t *testing.T) {
|
func TestAesEcbMobileEncryption(t *testing.T) {
|
||||||
// 测试手机号加密
|
// 测试手机号加密
|
||||||
mobile := "15008098853"
|
mobile := "18889793585"
|
||||||
|
|
||||||
keyStr := "ff83609b2b24fc73196aac3d3dfb874f"
|
keyStr := "ff83609b2b24fc73196aac3d3dfb874f"
|
||||||
// 测试加密
|
// 测试加密
|
||||||
@ -18,8 +18,9 @@ func TestAesEcbMobileEncryption(t *testing.T) {
|
|||||||
t.Fatalf("手机号加密失败: %v", err)
|
t.Fatalf("手机号加密失败: %v", err)
|
||||||
}
|
}
|
||||||
fmt.Println(encrypted)
|
fmt.Println(encrypted)
|
||||||
|
jmstr := "m9EEeW9ZBBJmi1hx1k1uIQ=="
|
||||||
// 测试解密
|
// 测试解密
|
||||||
decrypted, err := DecryptMobile(encrypted, keyStr)
|
decrypted, err := DecryptMobile(jmstr, keyStr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("手机号解密失败: %v", err)
|
t.Fatalf("手机号解密失败: %v", err)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user