修改表单

server/home-user-auth/internal/handler/routes.go

@@ -72,6 +72,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/api/user/oauth2/login/google",
 				Handler: UserGoogleLoginHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodGet,
+				Path:    "/api/user/oauth2/login/register",
+				Handler: UserEmailRegisterHandler(serverCtx),
+			},
 			{
 				Method:  http.MethodGet,
 				Path:    "/api/user/order-list",

server/home-user-auth/internal/handler/useremailregisterhandler.go

@@ -0,0 +1,35 @@
+package handler
+
+import (
+	"net/http"
+	"reflect"
+
+	"fusenapi/utils/basic"
+
+	"fusenapi/server/home-user-auth/internal/logic"
+	"fusenapi/server/home-user-auth/internal/svc"
+	"fusenapi/server/home-user-auth/internal/types"
+)
+
+func UserEmailRegisterHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+
+		var req types.RequestEmailRegister
+		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		if err != nil {
+			return
+		}
+
+		// 创建一个业务逻辑层实例
+		l := logic.NewUserEmailRegisterLogic(r.Context(), svcCtx)
+
+		rl := reflect.ValueOf(l)
+		basic.BeforeLogic(w, r, rl)
+
+		resp := l.UserEmailRegister(&req, userinfo)
+
+		if !basic.AfterLogic(w, r, rl) {
+			basic.NormalAfterLogic(w, r, resp)
+		}
+	}
+}

server/home-user-auth/internal/handler/userloginhandler.go

@@ -1,40 +1,35 @@
 package handler
 
 import (
-	"errors"
-	"fmt"
 	"net/http"
+	"reflect"
 
-	"github.com/zeromicro/go-zero/core/logx"
-	"github.com/zeromicro/go-zero/rest/httpx"
+	"fusenapi/utils/basic"
 
 	"fusenapi/server/home-user-auth/internal/logic"
 	"fusenapi/server/home-user-auth/internal/svc"
 	"fusenapi/server/home-user-auth/internal/types"
-	"fusenapi/utils/basic"
 )
 
-// UserLoginHandler 特殊的登录获取jwt token处理
 func UserLoginHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 
 		var req types.RequestUserLogin
+		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		if err != nil {
+			return
+		}
 
 		// 创建一个业务逻辑层实例
 		l := logic.NewUserLoginLogic(r.Context(), svcCtx)
-		resp, token := l.UserLogin(&req)
-		if resp.Code == basic.CodeOK.Code {
-			w.Header().Add("Authorization", fmt.Sprintf("Bearer %s", token))
-		}
 
-		// 如果响应不为nil，则使用httpx.OkJsonCtx方法返回JSON响应;
-		// 否则，发送500内部服务器错误的JSON响应并记录错误消息logx.Error。
-		if resp != nil {
-			httpx.OkJsonCtx(r.Context(), w, resp)
-		} else {
-			err := errors.New("server logic is error, resp must not be nil")
-			httpx.ErrorCtx(r.Context(), w, err)
-			logx.Error(err)
+		rl := reflect.ValueOf(l)
+		basic.BeforeLogic(w, r, rl)
+
+		resp := l.UserLogin(&req, userinfo)
+
+		if !basic.AfterLogic(w, r, rl) {
+			basic.NormalAfterLogic(w, r, resp)
 		}
 	}
 }