From d68fab94cd27e0291cda1787da00c7cc3321e24d Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Fri, 30 Aug 2024 14:15:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=B6=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=92=8Copenid=E4=B8=BA=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/controller/Login.go | 12 ------------
 api/requests/Login.go   |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/api/controller/Login.go b/api/controller/Login.go
index 820d6b0..65d31b4 100644
--- a/api/controller/Login.go
+++ b/api/controller/Login.go
@@ -32,18 +32,6 @@ func (r *Login) Login(c *gin.Context) {
 		return
 	}
 
-	if req.OpenId == "" && req.Mobile == "" {
-		responses.FailWithMessage("登陆失败", c)
-		return
-	}
-
-	if req.Source == 1 {
-		if req.Mobile != "" {
-			responses.FailWithMessage("登陆失败", c)
-			return
-		}
-	}
-
 	// 开始事务
 	tx := global.Db.Begin()
 	defer func() {
diff --git a/api/requests/Login.go b/api/requests/Login.go
index d303021..2fda7d3 100644
--- a/api/requests/Login.go
+++ b/api/requests/Login.go
@@ -6,10 +6,10 @@ type LoginRequest struct {
 
 // Login 登录
 type Login struct {
-	Mobile     string `json:"mobile" form:"mobile" label:"手机号"`
+	Mobile     string `json:"mobile" form:"mobile" label:"手机号" validate:"required"`
 	Code       string `json:"code" form:"code" label:"验证码"`
 	Source     int    `json:"source" form:"source" label:"来源" validate:"required"` // （1：app 2：公众号）
-	OpenId     string `json:"openid" form:"openid" label:"openid"`
+	OpenId     string `json:"openid" form:"openid" label:"openid" validate:"required"`
 	Nickname   string `json:"nickname" form:"nickname" label:"用户昵称"`
 	HeadImgUrl string `json:"headimgurl" form:"headimgurl" label:"头像"`
 	UnionId    string `json:"unionid" form:"unionid" label:"unionid"`