v2

internal/router/manage/oauth/oauth.go

@@ -8,9 +8,7 @@ import (
 
 	"management/internal/db/model/dto"
 	db "management/internal/db/sqlc"
-	authglobal "management/internal/global/auth"
 	"management/internal/pkg/crypto"
-	"management/internal/pkg/session"
 	captchaservice "management/internal/service/captcha"
 	systemservice "management/internal/service/system"
 	"management/internal/tpl"
@@ -19,19 +17,19 @@ import (
 )
 
 func Login(w http.ResponseWriter, r *http.Request) {
-	ctx := r.Context()
-	var user dto.AuthorizeUser
-	u := session.GetBytes(ctx, authglobal.StoreName)
-	if err := json.Unmarshal(u, &user); err == nil {
-		// 判断租户是否一致, 一致则刷新令牌，跳转到首页
-		if err := session.RenewToken(ctx); err == nil {
-			session.Put(ctx, authglobal.StoreName, u)
-			http.Redirect(w, r, "/home.html", http.StatusFound)
-			return
-		}
-	}
+	// ctx := r.Context()
+	// var user dto.AuthorizeUser
+	// u := session.GetBytes(ctx, authglobal.StoreName)
+	// if err := json.Unmarshal(u, &user); err == nil {
+	// 	// 判断租户是否一致, 一致则刷新令牌，跳转到首页
+	// 	if err := session.RenewToken(ctx); err == nil {
+	// 		session.Put(ctx, authglobal.StoreName, u)
+	// 		http.Redirect(w, r, "/home.html", http.StatusFound)
+	// 		return
+	// 	}
+	// }
 
-	session.Destroy(ctx)
+	// session.Destroy(ctx)
 	tpl.HTML(w, r, "oauth/login.tmpl", nil)
 }
 
@@ -122,7 +120,7 @@ func PostLogin(w http.ResponseWriter, r *http.Request) {
 		Browser:  log.Browser,
 	}
 
-	b, err := json.Marshal(auth)
+	_, err = json.Marshal(auth)
 	if err != nil {
 		log.Message = err.Error()
 		_ = systemservice.CreateSysUserLoginLog(ctx, log)
@@ -130,15 +128,15 @@ func PostLogin(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	session.Put(ctx, authglobal.StoreName, b)
+	// session.Put(ctx, authglobal.StoreName, b)
 
 	log.IsSuccess = true
 	log.Message = "登陆成功"
 	_ = systemservice.CreateSysUserLoginLog(ctx, log)
-	tpl.JSON(w, tpl.Response{Success: true, Message: "login successful"})
+	tpl.JSONOK(w, "login successful")
 }
 
 func Logout(w http.ResponseWriter, r *http.Request) {
-	session.Destroy(r.Context())
+	// session.Destroy(r.Context())
 	http.Redirect(w, r, "/", http.StatusFound)
 }