add: user accomplished

app/users/api/internal/handler/routes.go

@@ -17,18 +17,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 		rest.WithMiddlewares(
 			[]rest.Middleware{serverCtx.Logger},
 			[]rest.Route{
-				{
-					// 获取用户信息
-					Method:  http.MethodGet,
-					Path:    "/:userId",
-					Handler: user.GetUserInfoHandler(serverCtx),
-				},
-				{
-					// 修改用户信息
-					Method:  http.MethodPut,
-					Path:    "/:userId",
-					Handler: user.UpdateUserInfoHandler(serverCtx),
-				},
 				{
 					// 用户登出
 					Method:  http.MethodPost,
@@ -41,6 +29,12 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 					Path:    "/:userId/password",
 					Handler: user.UpdatePasswordHandler(serverCtx),
 				},
+				{
+					// 修改密码-使用验证码
+					Method:  http.MethodPut,
+					Path:    "/forgot-password/reset",
+					Handler: user.UpdatePasswordByVcodeHandler(serverCtx),
+				},
 				{
 					// 用户登录接口
 					Method:  http.MethodPost,
@@ -55,6 +49,39 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				},
 			}...,
 		),
-		rest.WithPrefix("/api/users"),
+		rest.WithPrefix("/api/v1/auth"),
+	)
+
+	server.AddRoutes(
+		rest.WithMiddlewares(
+			[]rest.Middleware{serverCtx.Logger},
+			[]rest.Route{
+				{
+					// 获取用户信息
+					Method:  http.MethodGet,
+					Path:    "/:userId",
+					Handler: user.GetUserInfoHandler(serverCtx),
+				},
+				{
+					// 修改用户信息
+					Method:  http.MethodPut,
+					Path:    "/:userId",
+					Handler: user.UpdateUserInfoHandler(serverCtx),
+				},
+				{
+					// 获取当前登录用户信息
+					Method:  http.MethodGet,
+					Path:    "/me",
+					Handler: user.GetMeHandler(serverCtx),
+				},
+				{
+					// 更改当前登录用户信息
+					Method:  http.MethodPut,
+					Path:    "/me",
+					Handler: user.UpdateMeHandler(serverCtx),
+				},
+			}...,
+		),
+		rest.WithPrefix("/api/v1/user"),
 	)
 }

app/users/api/internal/handler/user/getMeHandler.go

@@ -0,0 +1,30 @@
+// Code scaffolded by goctl. Safe to edit.
+// goctl 1.9.2
+
+package user
+
+import (
+	"net/http"
+
+	"juwan-backend/app/users/api/internal/logic/user"
+	"juwan-backend/app/users/api/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/rest/httpx"
+)
+
+// 获取当前登录用户信息
+func GetMeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		l := user.NewGetMeLogic(r.Context(), svcCtx)
+		resp, err := l.GetMe()
+		logx.Infof("req header: %v", r.Header)
+		logx.Infof("cookies: %v", r.Cookies())
+		//r.Cookie()
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

app/users/api/internal/handler/user/loginHandler.go

@@ -7,6 +7,7 @@ import (
 	"juwan-backend/app/users/api/internal/logic/user"
 	"juwan-backend/app/users/api/internal/svc"
 	"juwan-backend/app/users/api/internal/types"
+	"juwan-backend/common/utils"
 	"net/http"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
@@ -25,7 +26,7 @@ func LoginHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		resp, err := l.Login(&req)
 
 		if err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			httpx.ErrorCtx(r.Context(), w, utils.NewErrorResp(400, err))
 		} else {
 			token := resp.Token
 			resp.Token = ""

app/users/api/internal/handler/user/updateMeHandler.go

@@ -0,0 +1,32 @@
+// Code scaffolded by goctl. Safe to edit.
+// goctl 1.9.2
+
+package user
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"juwan-backend/app/users/api/internal/logic/user"
+	"juwan-backend/app/users/api/internal/svc"
+	"juwan-backend/app/users/api/internal/types"
+)
+
+// 更改当前登录用户信息
+func UpdateMeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.UpdateUserInfoReq
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := user.NewUpdateMeLogic(r.Context(), svcCtx)
+		resp, err := l.UpdateMe(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

app/users/api/internal/handler/user/updatePasswordByVcodeHandler.go

@@ -0,0 +1,32 @@
+// Code scaffolded by goctl. Safe to edit.
+// goctl 1.9.2
+
+package user
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"juwan-backend/app/users/api/internal/logic/user"
+	"juwan-backend/app/users/api/internal/svc"
+	"juwan-backend/app/users/api/internal/types"
+)
+
+// 修改密码-使用验证码
+func UpdatePasswordByVcodeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.ResetPasswordByVcode
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := user.NewUpdatePasswordByVcodeLogic(r.Context(), svcCtx)
+		resp, err := l.UpdatePasswordByVcode(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}