update login api

uxff · uxff · commit 83bcfd74d7bb · 2025-03-30T10:44:18.000+08:00
diff --git a/pkg/app/customer/apihandler/login.go b/pkg/app/customer/apihandler/login.go
@@ -76,12 +76,13 @@ func LoginForm(c *gin.Context) {
 	}
 
 	// &#30331;&#24405;&#25104;&#21151; &#31181;&#19979;cookie
-	AcceptLogin(c, userEnt)
+	tokenStr, _ := AcceptLogin(c, userEnt)
 
 	// c.Redirect(http.StatusMovedPermanently, RouteHome)
 	//StdResponse(c, ErrSuccess, "/")
 	JsonOk(c, gin.H{
-		"user": userEnt,
+		"user":      userEnt,
+		"API-Token": tokenStr,
 	})
 }
 
@@ -124,7 +125,7 @@ func Logout(c *gin.Context) {
 }
 
 // &#21463;&#29702;&#30331;&#24405;
-func AcceptLogin(c *gin.Context, userEnt *dao.User) error {
+func AcceptLogin(c *gin.Context, userEnt *dao.User) (tokenStr string, err error) {
 	userEnt.LastLoginIp = getRemoteIp(c)
 	userEnt.LastLoginAt = time.Now() //util.JsonTime(time.Now()) // time.Now().Format("2006-01-02 15:04:05")
 
@@ -138,7 +139,7 @@ func AcceptLogin(c *gin.Context, userEnt *dao.User) error {
 	cuaToken, jwtTokenStr, err := genJwtSignedTokenFromUserEnt(userEnt)
 	if err != nil {
 		log.Errorf("gen jwt token failed:%v", err)
-		return err
+		return "", err
 	}
 
 	c.SetCookie(CookieKeyAuth, jwtTokenStr, LoginCookieExpire, "", "", false, false)
@@ -147,7 +148,7 @@ func AcceptLogin(c *gin.Context, userEnt *dao.User) error {
 
 	// record login
 	go userEnt.UpdateById([]string{"lastLoginAt", "lastLoginIp"})
-	return nil
+	return jwtTokenStr, nil
 }
 
 func ClearLogin(c *gin.Context) {
diff --git a/pkg/app/customer/apihandler/signup.go b/pkg/app/customer/apihandler/signup.go
@@ -108,9 +108,11 @@ func SignupForm(c *gin.Context) {
 	}
 
 	// &#27880;&#20876;&#25104;&#21151; &#31181;&#19979;cookie
-	AcceptLogin(c, userEnt)
+	tokenStr, _ := AcceptLogin(c, userEnt)
 
 	// c.Redirect(http.StatusMovedPermanently, RouteHome)
 	//StdResponse(c, ErrSuccess, "/")
-	JsonOk(c, nil)
+	JsonOk(c, gin.H{
+		"API-Token": tokenStr,
+	})
 }

Original file line number	Diff line number	Diff line change
`@@ -108,9 +108,11 @@ func SignupForm(c *gin.Context) {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`// 注册成功种下cookie`
`111`		`- AcceptLogin(c, userEnt)`
	`111`	`+ tokenStr, _ := AcceptLogin(c, userEnt)`
`112`	`112`
`113`	`113`	`// c.Redirect(http.StatusMovedPermanently, RouteHome)`
`114`	`114`	`//StdResponse(c, ErrSuccess, "/")`
`115`		`- JsonOk(c, nil)`
	`115`	`+ JsonOk(c, gin.H{`
	`116`	`+ "API-Token": tokenStr,`
	`117`	`+ })`
`116`	`118`	`}`