取出测试环境验证码判断

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 {