From 10993c1c0bdab26c0d28899e164018c9f32b6b64 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Wed, 7 Jul 2021 16:05:20 +0800
Subject: [PATCH] aa

---
 controllers/user_controller.go | 6 +++---
 services/user.go               | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/controllers/user_controller.go b/controllers/user_controller.go
index bcc4446..720e9df 100644
--- a/controllers/user_controller.go
+++ b/controllers/user_controller.go
@@ -118,7 +118,7 @@ func GetTokenInfo(c *gin.Context) {
 	var (
 		err  error
 		user = &struct {
-			Token string `json:"token" form:"token"`
+			Token string `json:"token" form:"token" binding:"required"`
 		}{}
 	)
 	globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP())
@@ -144,7 +144,7 @@ func Logout(c *gin.Context) {
 	var (
 		err  error
 		user = &struct {
-			Token string `json:"token" form:"token"`
+			Token string `json:"token" form:"token" binding:"required"`
 		}{}
 	)
 	globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP())
@@ -170,7 +170,7 @@ func UpdateUser(c *gin.Context) {
 	var (
 		err  error
 		user = &struct {
-			Payload string `json:"payload" form:"payload"` //user 的json格式数据
+			Payload string `json:"payload" form:"payload" binding:"required"` //user 的json格式数据
 		}{}
 	)
 	globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP())
diff --git a/services/user.go b/services/user.go
index 7451265..676943d 100644
--- a/services/user.go
+++ b/services/user.go
@@ -113,8 +113,8 @@ func UpdateUser(c *gin.Context, payload string) (err error) {
 	if err = json.Unmarshal([]byte(payload), &userp); err != nil {
 		return err
 	}
-	if userp.ID == 0 && userp.UserID == "" {
-		return fmt.Errorf("id 和 user_id 至少传一个！")
+	if userp.ID == 0 || userp.UserID == "" {
+		return fmt.Errorf("id 和 user_id 必传！")
 	}
 	if users, err := dao.GetUsers(db, userp.UserID, "", ""); err != nil {
 		return err