手机号适配双端

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

@@ -516,113 +516,132 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 
 	server.AddRoutes(
 		[]rest.Route{
-			{
-				Method:  http.MethodGet,
-				Path:    "/audit/status",
-				Handler: agent.GetAgentAuditStatusHandler(serverCtx),
-			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/generating_link",
-				Handler: agent.GeneratingLinkHandler(serverCtx),
-			},
 			{
 				Method:  http.MethodGet,
 				Path:    "/info",
 				Handler: agent.GetAgentInfoHandler(serverCtx),
 			},
-			{
-				Method:  http.MethodGet,
-				Path:    "/product_config",
-				Handler: agent.GetAgentProductConfigHandler(serverCtx),
-			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/real_name",
-				Handler: agent.AgentRealNameHandler(serverCtx),
-			},
-			{
-				Method:  http.MethodGet,
-				Path:    "/subordinate/contribution/detail",
-				Handler: agent.GetAgentSubordinateContributionDetailHandler(serverCtx),
-			},
-			{
-				Method:  http.MethodGet,
-				Path:    "/subordinate/list",
-				Handler: agent.GetAgentSubordinateListHandler(serverCtx),
-			},
-		},
-		rest.WithJwt(serverCtx.Config.JwtAuth.AccessSecret),
-		rest.WithPrefix("/api/v1/agent"),
-	)
-
-	server.AddRoutes(
-		[]rest.Route{
-			{
-				Method:  http.MethodPost,
-				Path:    "/membership/save_user_config",
-				Handler: agent.SaveAgentMembershipUserConfigHandler(serverCtx),
-			},
-			{
-				Method:  http.MethodGet,
-				Path:    "/membership/user_config",
-				Handler: agent.GetAgentMembershipProductConfigHandler(serverCtx),
-			},
-		},
-		rest.WithJwt(serverCtx.Config.JwtAuth.AccessSecret),
-		rest.WithPrefix("/api/v1/agent"),
-	)
-
-	server.AddRoutes(
-		[]rest.Route{
-			{
-				Method:  http.MethodGet,
-				Path:    "/commission",
-				Handler: agent.GetAgentCommissionHandler(serverCtx),
-			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/membership/activate",
-				Handler: agent.ActivateAgentMembershipHandler(serverCtx),
-			},
 			{
 				Method:  http.MethodGet,
 				Path:    "/revenue",
 				Handler: agent.GetAgentRevenueInfoHandler(serverCtx),
 			},
-			{
-				Method:  http.MethodGet,
-				Path:    "/rewards",
-				Handler: agent.GetAgentRewardsHandler(serverCtx),
-			},
-			{
-				Method:  http.MethodGet,
-				Path:    "/withdrawal",
-				Handler: agent.GetAgentWithdrawalHandler(serverCtx),
-			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/withdrawal",
-				Handler: agent.AgentWithdrawalHandler(serverCtx),
-			},
 		},
 		rest.WithJwt(serverCtx.Config.JwtAuth.AccessSecret),
 		rest.WithPrefix("/api/v1/agent"),
 	)
 
 	server.AddRoutes(
-		[]rest.Route{
-			{
-				Method:  http.MethodPost,
-				Path:    "/apply",
-				Handler: agent.ApplyForAgentHandler(serverCtx),
-			},
-			{
-				Method:  http.MethodGet,
-				Path:    "/link",
-				Handler: agent.GetLinkDataHandler(serverCtx),
-			},
-		},
+		rest.WithMiddlewares(
+			[]rest.Middleware{serverCtx.UserAuthInterceptor},
+			[]rest.Route{
+				{
+					Method:  http.MethodGet,
+					Path:    "/audit/status",
+					Handler: agent.GetAgentAuditStatusHandler(serverCtx),
+				},
+				{
+					Method:  http.MethodPost,
+					Path:    "/generating_link",
+					Handler: agent.GeneratingLinkHandler(serverCtx),
+				},
+				{
+					Method:  http.MethodGet,
+					Path:    "/product_config",
+					Handler: agent.GetAgentProductConfigHandler(serverCtx),
+				},
+				{
+					Method:  http.MethodPost,
+					Path:    "/real_name",
+					Handler: agent.AgentRealNameHandler(serverCtx),
+				},
+				{
+					Method:  http.MethodGet,
+					Path:    "/subordinate/contribution/detail",
+					Handler: agent.GetAgentSubordinateContributionDetailHandler(serverCtx),
+				},
+				{
+					Method:  http.MethodGet,
+					Path:    "/subordinate/list",
+					Handler: agent.GetAgentSubordinateListHandler(serverCtx),
+				},
+			}...,
+		),
+		rest.WithJwt(serverCtx.Config.JwtAuth.AccessSecret),
+		rest.WithPrefix("/api/v1/agent"),
+	)
+
+	server.AddRoutes(
+		rest.WithMiddlewares(
+			[]rest.Middleware{serverCtx.UserAuthInterceptor},
+			[]rest.Route{
+				{
+					Method:  http.MethodPost,
+					Path:    "/membership/save_user_config",
+					Handler: agent.SaveAgentMembershipUserConfigHandler(serverCtx),
+				},
+				{
+					Method:  http.MethodGet,
+					Path:    "/membership/user_config",
+					Handler: agent.GetAgentMembershipProductConfigHandler(serverCtx),
+				},
+			}...,
+		),
+		rest.WithJwt(serverCtx.Config.JwtAuth.AccessSecret),
+		rest.WithPrefix("/api/v1/agent"),
+	)
+
+	server.AddRoutes(
+		rest.WithMiddlewares(
+			[]rest.Middleware{serverCtx.UserAuthInterceptor},
+			[]rest.Route{
+				{
+					Method:  http.MethodGet,
+					Path:    "/commission",
+					Handler: agent.GetAgentCommissionHandler(serverCtx),
+				},
+				{
+					Method:  http.MethodPost,
+					Path:    "/membership/activate",
+					Handler: agent.ActivateAgentMembershipHandler(serverCtx),
+				},
+				{
+					Method:  http.MethodGet,
+					Path:    "/rewards",
+					Handler: agent.GetAgentRewardsHandler(serverCtx),
+				},
+				{
+					Method:  http.MethodGet,
+					Path:    "/withdrawal",
+					Handler: agent.GetAgentWithdrawalHandler(serverCtx),
+				},
+				{
+					Method:  http.MethodPost,
+					Path:    "/withdrawal",
+					Handler: agent.AgentWithdrawalHandler(serverCtx),
+				},
+			}...,
+		),
+		rest.WithJwt(serverCtx.Config.JwtAuth.AccessSecret),
+		rest.WithPrefix("/api/v1/agent"),
+	)
+
+	server.AddRoutes(
+		rest.WithMiddlewares(
+			[]rest.Middleware{serverCtx.AuthInterceptor},
+			[]rest.Route{
+				{
+					Method:  http.MethodPost,
+					Path:    "/apply",
+					Handler: agent.ApplyForAgentHandler(serverCtx),
+				},
+				{
+					Method:  http.MethodGet,
+					Path:    "/link",
+					Handler: agent.GetLinkDataHandler(serverCtx),
+				},
+			}...,
+		),
 		rest.WithPrefix("/api/v1/agent"),
 	)
 
@@ -690,7 +709,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 
 	server.AddRoutes(
 		rest.WithMiddlewares(
-			[]rest.Middleware{serverCtx.SourceInterceptor},
+			[]rest.Middleware{serverCtx.UserAuthInterceptor},
 			[]rest.Route{
 				{
 					Method:  http.MethodPost,
@@ -714,18 +733,21 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 	)
 
 	server.AddRoutes(
-		[]rest.Route{
-			{
-				Method:  http.MethodGet,
-				Path:    "/:id",
-				Handler: product.GetProductByIDHandler(serverCtx),
-			},
-			{
-				Method:  http.MethodGet,
-				Path:    "/en/:product_en",
-				Handler: product.GetProductByEnHandler(serverCtx),
-			},
-		},
+		rest.WithMiddlewares(
+			[]rest.Middleware{serverCtx.UserAuthInterceptor},
+			[]rest.Route{
+				{
+					Method:  http.MethodGet,
+					Path:    "/:id",
+					Handler: product.GetProductByIDHandler(serverCtx),
+				},
+				{
+					Method:  http.MethodGet,
+					Path:    "/en/:product_en",
+					Handler: product.GetProductByEnHandler(serverCtx),
+				},
+			}...,
+		),
 		rest.WithJwt(serverCtx.Config.JwtAuth.AccessSecret),
 		rest.WithPrefix("/api/v1/product"),
 	)
@@ -762,63 +784,69 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 	)
 
 	server.AddRoutes(
-		[]rest.Route{
-			{
-				// query service
-				Method:  http.MethodPost,
-				Path:    "/query/service/:product",
-				Handler: query.QueryServiceHandler(serverCtx),
-			},
-		},
+		rest.WithMiddlewares(
+			[]rest.Middleware{serverCtx.UserAuthInterceptor},
+			[]rest.Route{
+				{
+					// query service
+					Method:  http.MethodPost,
+					Path:    "/query/service/:product",
+					Handler: query.QueryServiceHandler(serverCtx),
+				},
+			}...,
+		),
 		rest.WithJwt(serverCtx.Config.JwtAuth.AccessSecret),
 		rest.WithPrefix("/api/v1"),
 	)
 
 	server.AddRoutes(
-		[]rest.Route{
-			{
-				// 生成分享链接
-				Method:  http.MethodPost,
-				Path:    "/query/generate_share_link",
-				Handler: query.QueryGenerateShareLinkHandler(serverCtx),
-			},
-			{
-				// 查询列表
-				Method:  http.MethodGet,
-				Path:    "/query/list",
-				Handler: query.QueryListHandler(serverCtx),
-			},
-			{
-				// 查询详情 按订单号 付款查询时
-				Method:  http.MethodGet,
-				Path:    "/query/orderId/:order_id",
-				Handler: query.QueryDetailByOrderIdHandler(serverCtx),
-			},
-			{
-				// 查询详情 按订单号
-				Method:  http.MethodGet,
-				Path:    "/query/orderNo/:order_no",
-				Handler: query.QueryDetailByOrderNoHandler(serverCtx),
-			},
-			{
-				// 获取查询临时订单
-				Method:  http.MethodGet,
-				Path:    "/query/provisional_order/:id",
-				Handler: query.QueryProvisionalOrderHandler(serverCtx),
-			},
-			{
-				// 重试查询
-				Method:  http.MethodPost,
-				Path:    "/query/retry/:id",
-				Handler: query.QueryRetryHandler(serverCtx),
-			},
-			{
-				// 更新查询数据
-				Method:  http.MethodPost,
-				Path:    "/query/update_data",
-				Handler: query.UpdateQueryDataHandler(serverCtx),
-			},
-		},
+		rest.WithMiddlewares(
+			[]rest.Middleware{serverCtx.UserAuthInterceptor},
+			[]rest.Route{
+				{
+					// 生成分享链接
+					Method:  http.MethodPost,
+					Path:    "/query/generate_share_link",
+					Handler: query.QueryGenerateShareLinkHandler(serverCtx),
+				},
+				{
+					// 查询列表
+					Method:  http.MethodGet,
+					Path:    "/query/list",
+					Handler: query.QueryListHandler(serverCtx),
+				},
+				{
+					// 查询详情 按订单号 付款查询时
+					Method:  http.MethodGet,
+					Path:    "/query/orderId/:order_id",
+					Handler: query.QueryDetailByOrderIdHandler(serverCtx),
+				},
+				{
+					// 查询详情 按订单号
+					Method:  http.MethodGet,
+					Path:    "/query/orderNo/:order_no",
+					Handler: query.QueryDetailByOrderNoHandler(serverCtx),
+				},
+				{
+					// 获取查询临时订单
+					Method:  http.MethodGet,
+					Path:    "/query/provisional_order/:id",
+					Handler: query.QueryProvisionalOrderHandler(serverCtx),
+				},
+				{
+					// 重试查询
+					Method:  http.MethodPost,
+					Path:    "/query/retry/:id",
+					Handler: query.QueryRetryHandler(serverCtx),
+				},
+				{
+					// 更新查询数据
+					Method:  http.MethodPost,
+					Path:    "/query/update_data",
+					Handler: query.UpdateQueryDataHandler(serverCtx),
+				},
+			}...,
+		),
 		rest.WithJwt(serverCtx.Config.JwtAuth.AccessSecret),
 		rest.WithPrefix("/api/v1"),
 	)
@@ -848,30 +876,12 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 
 	server.AddRoutes(
 		[]rest.Route{
-			{
-				// agent mobile code login
-				Method:  http.MethodPost,
-				Path:    "/user/agent_mobile_code_login",
-				Handler: user.AgentMobileCodeLoginHandler(serverCtx),
-			},
 			{
 				// mobile code login
 				Method:  http.MethodPost,
 				Path:    "/user/mobileCodeLogin",
 				Handler: user.MobileCodeLoginHandler(serverCtx),
 			},
-			{
-				// mobile login
-				Method:  http.MethodPost,
-				Path:    "/user/mobileLogin",
-				Handler: user.MobileLoginHandler(serverCtx),
-			},
-			{
-				// register
-				Method:  http.MethodPost,
-				Path:    "/user/register",
-				Handler: user.RegisterHandler(serverCtx),
-			},
 			{
 				// wechat mini auth
 				Method:  http.MethodPost,
@@ -888,14 +898,23 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 		rest.WithPrefix("/api/v1"),
 	)
 
+	server.AddRoutes(
+		rest.WithMiddlewares(
+			[]rest.Middleware{serverCtx.AuthInterceptor},
+			[]rest.Route{
+				{
+					// 绑定手机号
+					Method:  http.MethodPost,
+					Path:    "/user/bindMobile",
+					Handler: user.BindMobileHandler(serverCtx),
+				},
+			}...,
+		),
+		rest.WithPrefix("/api/v1"),
+	)
+
 	server.AddRoutes(
 		[]rest.Route{
-			{
-				// 绑定手机号
-				Method:  http.MethodPost,
-				Path:    "/user/bindMobile",
-				Handler: user.BindMobileHandler(serverCtx),
-			},
 			{
 				Method:  http.MethodPost,
 				Path:    "/user/cancelOut",

app/main/api/internal/handler/user/agentmobilecodeloginhandler.go

@@ -1,30 +0,0 @@
-package user
-
-import (
-	"net/http"
-
-	"tydata-server/app/main/api/internal/logic/user"
-	"tydata-server/app/main/api/internal/svc"
-	"tydata-server/app/main/api/internal/types"
-	"tydata-server/common/result"
-	"tydata-server/pkg/lzkit/validator"
-
-	"github.com/zeromicro/go-zero/rest/httpx"
-)
-
-func AgentMobileCodeLoginHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.MobileCodeLoginReq
-		if err := httpx.Parse(r, &req); err != nil {
-			result.ParamErrorResult(r, w, err)
-			return
-		}
-		if err := validator.Validate(req); err != nil {
-			result.ParamValidateErrorResult(r, w, err)
-			return
-		}
-		l := user.NewAgentMobileCodeLoginLogic(r.Context(), svcCtx)
-		resp, err := l.AgentMobileCodeLogin(&req)
-		result.HttpResult(r, w, resp, err)
-	}
-}

app/main/api/internal/handler/user/mobileloginhandler.go

@@ -1,30 +0,0 @@
-package user
-
-import (
-	"net/http"
-
-	"tydata-server/app/main/api/internal/logic/user"
-	"tydata-server/app/main/api/internal/svc"
-	"tydata-server/app/main/api/internal/types"
-	"tydata-server/common/result"
-	"tydata-server/pkg/lzkit/validator"
-
-	"github.com/zeromicro/go-zero/rest/httpx"
-)
-
-func MobileLoginHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.MobileLoginReq
-		if err := httpx.Parse(r, &req); err != nil {
-			result.ParamErrorResult(r, w, err)
-			return
-		}
-		if err := validator.Validate(req); err != nil {
-			result.ParamValidateErrorResult(r, w, err)
-			return
-		}
-		l := user.NewMobileLoginLogic(r.Context(), svcCtx)
-		resp, err := l.MobileLogin(&req)
-		result.HttpResult(r, w, resp, err)
-	}
-}

app/main/api/internal/handler/user/registerhandler.go

@@ -1,30 +0,0 @@
-package user
-
-import (
-	"net/http"
-
-	"tydata-server/app/main/api/internal/logic/user"
-	"tydata-server/app/main/api/internal/svc"
-	"tydata-server/app/main/api/internal/types"
-	"tydata-server/common/result"
-	"tydata-server/pkg/lzkit/validator"
-
-	"github.com/zeromicro/go-zero/rest/httpx"
-)
-
-func RegisterHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.RegisterReq
-		if err := httpx.Parse(r, &req); err != nil {
-			result.ParamErrorResult(r, w, err)
-			return
-		}
-		if err := validator.Validate(req); err != nil {
-			result.ParamValidateErrorResult(r, w, err)
-			return
-		}
-		l := user.NewRegisterLogic(r.Context(), svcCtx)
-		resp, err := l.Register(&req)
-		result.HttpResult(r, w, resp, err)
-	}
-}