Merge branch 'main' of http://1.117.67.95:3000/team/qnc-server-v3

app/main/api/internal/handler/agent/generateinviteposterhandler.go

@@ -0,0 +1,33 @@
+// Code scaffolded by goctl. Safe to edit.
+// goctl 1.9.2
+
+package agent
+
+import (
+	"net/http"
+
+	"qnc-server/app/main/api/internal/logic/agent"
+	"qnc-server/app/main/api/internal/svc"
+	"qnc-server/app/main/api/internal/types"
+	"qnc-server/common/result"
+	"qnc-server/pkg/lzkit/validator"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+)
+
+func GenerateInvitePosterHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.GenerateInvitePosterReq
+		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 := agent.NewGenerateInvitePosterLogic(r.Context(), svcCtx)
+		resp, err := l.GenerateInvitePoster(&req)
+		result.HttpResult(r, w, resp, err)
+	}
+}

app/main/api/internal/handler/agent/getlastwithdrawalinfohandler.go

@@ -0,0 +1,30 @@
+package agent
+
+import (
+	"net/http"
+
+	"qnc-server/app/main/api/internal/logic/agent"
+	"qnc-server/app/main/api/internal/svc"
+	"qnc-server/app/main/api/internal/types"
+	"qnc-server/common/result"
+	"qnc-server/pkg/lzkit/validator"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+)
+
+func GetLastWithdrawalInfoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.GetLastWithdrawalInfoReq
+		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 := agent.NewGetLastWithdrawalInfoLogic(r.Context(), svcCtx)
+		resp, err := l.GetLastWithdrawalInfo(&req)
+		result.HttpResult(r, w, resp, err)
+	}
+}

app/main/api/internal/handler/auth/sendsmshandler.go

@@ -23,8 +23,27 @@ func SendSmsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 			result.ParamValidateErrorResult(r, w, err)
 			return
 		}
+		// 获取客户端真实 IP
+		clientIP := getClientIP(r)
+		// 获取 User-Agent 用于判断微信环境
+		userAgent := r.Header.Get("User-Agent")
 		l := auth.NewSendSmsLogic(r.Context(), svcCtx)
-		err := l.SendSms(&req)
+		err := l.SendSms(&req, clientIP, userAgent)
 		result.HttpResult(r, w, nil, err)
 	}
 }
+
+// getClientIP 获取客户端真实 IP
+func getClientIP(r *http.Request) string {
+	// 优先从 X-Forwarded-For 获取
+	if xff := r.Header.Get("X-Forwarded-For"); xff != "" {
+		// X-Forwarded-For 可能包含多个 IP，取第一个
+		return xff
+	}
+	// 其次从 X-Real-IP 获取
+	if xri := r.Header.Get("X-Real-IP"); xri != "" {
+		return xri
+	}
+	// 最后使用 RemoteAddr
+	return r.RemoteAddr
+}

app/main/api/internal/handler/captcha/getencryptedsceneidhandler.go

@@ -0,0 +1,21 @@
+package captcha
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"qnc-server/app/main/api/internal/logic/captcha"
+	"qnc-server/app/main/api/internal/svc"
+)
+
+func GetEncryptedSceneIdHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		l := captcha.NewGetEncryptedSceneIdLogic(r.Context(), svcCtx)
+		resp, err := l.GetEncryptedSceneId()
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

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

@@ -22,6 +22,7 @@ import (
 	app "qnc-server/app/main/api/internal/handler/app"
 	auth "qnc-server/app/main/api/internal/handler/auth"
 	authorization "qnc-server/app/main/api/internal/handler/authorization"
+	captcha "qnc-server/app/main/api/internal/handler/captcha"
 	notification "qnc-server/app/main/api/internal/handler/notification"
 	pay "qnc-server/app/main/api/internal/handler/pay"
 	product "qnc-server/app/main/api/internal/handler/product"
@@ -104,7 +105,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				},
 				{
 					Method:  http.MethodPost,
-					Path:    "/upgrade",
+					Path:    "/upgrade/agent",
 					Handler: admin_agent.AdminUpgradeAgentHandler(serverCtx),
 				},
 				{
@@ -661,6 +662,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 					Path:    "/info",
 					Handler: agent.GetAgentInfoHandler(serverCtx),
 				},
+				{
+					Method:  http.MethodGet,
+					Path:    "/invite/poster",
+					Handler: agent.GenerateInvitePosterHandler(serverCtx),
+				},
 				{
 					Method:  http.MethodPost,
 					Path:    "/invite_code/delete",
@@ -786,6 +792,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 					Path:    "/withdrawal/apply",
 					Handler: agent.ApplyWithdrawalHandler(serverCtx),
 				},
+				{
+					Method:  http.MethodGet,
+					Path:    "/withdrawal/last_info",
+					Handler: agent.GetLastWithdrawalInfoHandler(serverCtx),
+				},
 				{
 					Method:  http.MethodGet,
 					Path:    "/withdrawal/list",
@@ -862,6 +873,18 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 		rest.WithPrefix("/api/v1"),
 	)
 
+	server.AddRoutes(
+		[]rest.Route{
+			{
+				// get encrypted scene id for aliyun captcha
+				Method:  http.MethodPost,
+				Path:    "/captcha/encryptedSceneId",
+				Handler: captcha.GetEncryptedSceneIdHandler(serverCtx),
+			},
+		},
+		rest.WithPrefix("/api/v1"),
+	)
+
 	server.AddRoutes(
 		[]rest.Route{
 			{