home

libs/base/api_handler.go

@@ -3,10 +3,12 @@ package base
 import (
 	"OneAuth/libs/oerr"
 	"OneAuth/libs/tools"
+	"errors"
 	"github.com/json-iterator/go"
 	"github.com/veypi/OneBD"
 	"github.com/veypi/OneBD/rfc"
 	"github.com/veypi/utils/log"
+	"gorm.io/gorm"
 	"strconv"
 	"sync"
 	"time"
@@ -14,6 +16,41 @@ import (
 
 var json = jsoniter.ConfigFastest
 
+func JSONResponse(m OneBD.Meta, data interface{}, err error) {
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			err = oerr.ResourceNotExist
+		}
+	}
+	if m.Method() == rfc.MethodHead {
+		if err != nil {
+			m.SetHeader("status", "0")
+			m.SetHeader("code", strconv.Itoa(int(oerr.OfType(err.Error()))))
+			m.SetHeader("err", err.Error())
+		} else {
+			m.SetHeader("status", "1")
+		}
+		return
+	}
+	res := map[string]interface{}{
+		"status": 1,
+	}
+	if err != nil {
+		res["status"] = 0
+		res["code"] = oerr.OfType(err.Error())
+		res["err"] = err.Error()
+	} else {
+		res["status"] = 1
+		res["content"] = data
+	}
+	p, err := json.Marshal(res)
+	if err != nil {
+		log.Warn().Err(err).Msg("encode json data error")
+		return
+	}
+	_, _ = m.Write(p)
+}
+
 type ApiHandler struct {
 	OneBD.BaseHandler
 	UserHandler
@@ -24,29 +61,12 @@ func (h *ApiHandler) Init(m OneBD.Meta) error {
 }
 
 func (h *ApiHandler) OnResponse(data interface{}) {
-	if h.Meta().Method() == rfc.MethodHead {
-		h.Meta().SetHeader("status", "1")
-		return
-	}
-	p, err := json.Marshal(map[string]interface{}{"status": 1, "content": data})
-	if err != nil {
-		log.Warn().Err(err).Msg("encode json data error")
-		return
-	}
-	h.Meta().Write(p)
+	JSONResponse(h.Meta(), data, nil)
 }
 
 func (h *ApiHandler) OnError(err error) {
 	log.WithNoCaller.Warn().Err(err).Msg(h.Meta().RequestPath())
-	msg := err.Error()
-	if h.Meta().Method() == rfc.MethodHead {
-		h.Meta().SetHeader("status", "0")
-		h.Meta().SetHeader("code", strconv.Itoa(int(oerr.OfType(msg))))
-		h.Meta().SetHeader("err", msg)
-	} else {
-		p, _ := json.Marshal(map[string]interface{}{"status": 0, "code": oerr.OfType(msg), "err": msg})
-		h.Meta().Write(p)
-	}
+	JSONResponse(h.Meta(), nil, err)
 }
 
 var ioNumLimit = make(map[string]time.Time)

libs/base/user_handler.go

@@ -1,6 +1,7 @@
 package base
 
 import (
+	"OneAuth/cfg"
 	"OneAuth/libs/oerr"
 	"OneAuth/libs/token"
 	"OneAuth/models"
@@ -26,7 +27,7 @@ func (a *UserHandler) ParsePayload(m OneBD.Meta) error {
 	if tokenStr == "" {
 		return oerr.NotLogin
 	}
-	ok, err := token.ParseToken(tokenStr, a.Payload)
+	ok, err := token.ParseToken(tokenStr, a.Payload, cfg.CFG.APPKey)
 	if ok {
 		return nil
 	}