Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth

utils/basic/basic.go

@@ -84,8 +84,9 @@ var (
 	CodeSharedStateErr       = &StatusResponse{5201, "shared state server  err"} // 状态机错误
 	CodeEmailConfirmationErr = &StatusResponse{5202, "email confirmation   err"} // email 验证错误
 
-	CodeFileUploadErr     = &StatusResponse{5110, "file upload  err"} // 文件上传失败
-	CodeFileUploadLogoErr = &StatusResponse{5111, "logo upload  err"} // 用户上传LOGO失败
+	CodeFileUploadErr      = &StatusResponse{5110, "file upload  err"} // 文件上传失败
+	CodeFileUploadLogoErr  = &StatusResponse{5111, "logo upload  err"} // 用户上传LOGO失败
+	CodeFileLogoCombineErr = &StatusResponse{5112, "logo upload  err"} // 用户合图失败
 )
 
 type Response struct {

utils/basic/request_parse.go

@@ -52,7 +52,7 @@ func NormalAfterLogic(w http.ResponseWriter, r *http.Request, resp *Response) {
 }
 
 func RequestParse(w http.ResponseWriter, r *http.Request, state *fsm.SharedState, LogicRequest any) (*auth.UserInfo, error) {
-
+	// log.Println(io.ReadAll(r.Body))
 	token, info, err := auth.ParseJwtTokenHeader[auth.UserInfo](r) //解析Token头, 和payload信息
 	if err != nil {
 		logx.Error(err)
@@ -60,16 +60,19 @@ func RequestParse(w http.ResponseWriter, r *http.Request, state *fsm.SharedState
 	}
 
 	var secret uint64 = 0
-	if info.IsUser() {
-		us, err := state.GetUserState(info.UserId) //获取缓存的用户状态
-		if err != nil {
-			logx.Error(err)
-			return nil, err
-		}
-		secret = us.PwdHash // 获取密码的hash做jwt, 便于重置密码的使用
+	if info != nil {
 
-	} else if info.IsGuest() {
-		secret = DefaultJwtSecret //获取默认的hash
+		if info.IsUser() {
+			us, err := state.GetUserState(info.UserId) //获取缓存的用户状态
+			if err != nil {
+				logx.Error(err)
+				return nil, err
+			}
+			secret = us.PwdHash // 获取密码的hash做jwt, 便于重置密码的使用
+
+		} else if info.IsGuest() {
+			secret = DefaultJwtSecret //获取默认的hash
+		}
 	}
 
 	var userinfo *auth.UserInfo