Merge pull request #54 from OOrangeeee/online/deploy-debug

feat(ci/cd):add (ci/cd)
OOrangeeee · Oct 14, 2024 · 1782cd6 · 1782cd6
2 parents e598255 + 6e2deba
commit 1782cd6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/cmd/SEP/main.go b/cmd/SEP/main.go
@@ -5,16 +5,14 @@ import (
 	"SEP/internal/router"
 	"SEP/internal/utils"
 	"github.com/labstack/echo/v4"
-	"os"
 )
 
 func main() {
 	e := echo.New()
-	jwtS := os.Getenv("JWT_SECRET")
 	utils.InitLog()
 	configs.InitViper()
 	utils.InitDB()
-	configs.InitMiddleware(e, jwtS)
+	configs.InitMiddleware(e)
 	router.GetRouterConfig(e)
 	router.PostRouterConfig(e)
 	router.PutRouterConfig(e)

diff --git a/internal/configs/middlewareConfig.go b/internal/configs/middlewareConfig.go
@@ -7,12 +7,13 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	"github.com/sirupsen/logrus"
+	"github.com/spf13/viper"
 	"net/http"
 	"os"
 	"path/filepath"
 )
 
-func InitMiddleware(e *echo.Echo, jwtSecret string) {
+func InitMiddleware(e *echo.Echo) {
 
 	//recover
 	e.Use(middleware.Recover())
@@ -77,17 +78,16 @@ func InitMiddleware(e *echo.Echo, jwtSecret string) {
 			if (c.Path() == "/users" && c.Request().Method == "GET") || (c.Path() == "/users" && c.Request().Method == "DELETE") || (c.Path() == "/config" && c.Request().Method == "PUT") || (c.Path() == "/csrf-token" && c.Request().Method == "GET") || (c.Path() == "/users/account/activation/:activationCode" && c.Request().Method == "GET") || (c.Path() == "/users/account" && c.Request().Method == "POST") || (c.Path() == "/users/login" && c.Request().Method == "POST") {
 				return true
 			}
-			utils.Log.WithFields(logrus.Fields{
-				"jwtSecret": jwtSecret,
-			}).Info("JWT中间件启用")
 			return false
 		},
-		SigningKey:  []byte(jwtSecret),
+		SigningKey: func(c echo.Context) []byte {
+			return []byte(viper.GetString("jwt.jwtSecret"))
+		},
 		TokenLookup: "header:Authorization:Bearer ",
 		ErrorHandler: func(c echo.Context, err error) error {
 			utils.Log.WithFields(logrus.Fields{
 				"error": err.Error(),
-				"jwtS":  jwtSecret,
+				"jwtS":  viper.GetString("jwt.jwtSecret"),
 				"jwt":   c.Request().Header.Get("Authorization"),
 			}).Error("JWT validation failed")
 			return echo.NewHTTPError(http.StatusUnauthorized, "Invalid or expired JWT")