From 090cfce650d6334af42fc26a1341732667fd2c9d Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Mon, 29 Jul 2024 15:52:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E5=87=BA=E6=B5=8B=E8=AF=95=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E9=AA=8C=E8=AF=81=E7=A0=81=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/controller/Login.go | 32 ++++++++++++++++++++++----------
 api/requests/Login.go   | 12 +++++-------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/api/controller/Login.go b/api/controller/Login.go
index 5d98d58..e9f33bf 100644
--- a/api/controller/Login.go
+++ b/api/controller/Login.go
@@ -9,6 +9,7 @@ import (
 	"hepa-calc-api/api/requests"
 	"hepa-calc-api/api/responses"
 	"hepa-calc-api/api/service"
+	"hepa-calc-api/config"
 	"hepa-calc-api/extend/weChat"
 	"hepa-calc-api/global"
 	"hepa-calc-api/utils"
@@ -33,15 +34,17 @@ func (r *Login) LoginPhone(c *gin.Context) {
 	}
 
 	// 检测验证码
-	code, _ := global.Redis.Get(c, "login_code_count_"+req.Mobile).Result()
-	if code == "" {
-		responses.FailWithMessage("验证码失效", c)
-		return
-	}
+	if config.C.Env != "dev" {
+		code, _ := global.Redis.Get(c, "login_code_count_"+req.Mobile).Result()
+		if code == "" {
+			responses.FailWithMessage("验证码失效", c)
+			return
+		}
 
-	if req.Code != code {
-		responses.FailWithMessage("验证码错误", c)
-		return
+		if req.Code != code {
+			responses.FailWithMessage("验证码错误", c)
+			return
+		}
 	}
 
 	// 检测用户信息
@@ -60,8 +63,13 @@ func (r *Login) LoginPhone(c *gin.Context) {
 			}
 		}()
 
+		// 头像
 		avatar := "www.baidu.com"
 
+		// 登录ip
+		publicService := service.PublicService{}
+		loginIp := publicService.GetUserIP(c.Request)
+
 		// 新增用户
 		user = &model.User{
 			UserName:         "",
@@ -75,7 +83,7 @@ func (r *Login) LoginPhone(c *gin.Context) {
 			IsMember:         0,
 			MemberExpireDate: nil,
 			LoginAt:          model.LocalTime(time.Now()),
-			LoginIp:          req.LoginIp,
+			LoginIp:          loginIp,
 		}
 		user, err := userDao.AddUser(tx, user)
 		if err != nil {
@@ -171,6 +179,10 @@ func (r *Login) LoginWx(c *gin.Context) {
 			return
 		}
 
+		// 登录ip
+		publicService := service.PublicService{}
+		loginIp := publicService.GetUserIP(c.Request)
+
 		// 新增用户
 		user = &model.User{
 			UserName:         userInfo.Nickname,
@@ -184,7 +196,7 @@ func (r *Login) LoginWx(c *gin.Context) {
 			IsMember:         0,
 			MemberExpireDate: nil,
 			LoginAt:          model.LocalTime(time.Now()),
-			LoginIp:          req.LoginIp,
+			LoginIp:          loginIp,
 		}
 		user, err = userDao.AddUser(tx, user)
 		if err != nil {
diff --git a/api/requests/Login.go b/api/requests/Login.go
index 92cec89..2a50c03 100644
--- a/api/requests/Login.go
+++ b/api/requests/Login.go
@@ -7,15 +7,13 @@ type LoginRequest struct {
 
 // LoginWx 微信授权登录
 type LoginWx struct {
-	Code    string `json:"code" form:"code" label:"授权码" validate:"required"`
-	Source  int    `json:"source" form:"source" label:"来源" validate:"required,oneof=1 2"` // （1：app 2：公众号
-	LoginIp string `json:"login_ip" form:"login_ip" label:"登录ip"`
+	Code   string `json:"code" form:"code" label:"授权码" validate:"required"`
+	Source int    `json:"source" form:"source" label:"来源" validate:"required,oneof=1 2"` // （1：app 2：公众号
 }
 
 // LoginPhone 手机号登录
 type LoginPhone struct {
-	Mobile  string `json:"mobile" form:"mobile" label:"手机号" validate:"required"`
-	Code    string `json:"code" form:"code" label:"手机号" validate:"required"`
-	Source  int    `json:"source" form:"source" label:"来源）" validate:"required"` // （1：app 2：公众号
-	LoginIp string `json:"login_ip" form:"login_ip" label:"登录ip"`
+	Mobile string `json:"mobile" form:"mobile" label:"手机号" validate:"required"`
+	Code   string `json:"code" form:"code" label:"手机号" validate:"required"`
+	Source int    `json:"source" form:"source" label:"来源）" validate:"required"` // （1：app 2：公众号
 }