From 7f252909fc5c805c658a8da2e9dadab1fb03d329 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 15 Aug 2022 20:36:16 +0800 Subject: [PATCH] fix code --- internal/demo/register/ip_limit.go | 15 ++++++--------- .../db/mysql_model/im_mysql_model/ip_model.go | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/internal/demo/register/ip_limit.go b/internal/demo/register/ip_limit.go index aab0c407c..ae842e66e 100644 --- a/internal/demo/register/ip_limit.go +++ b/internal/demo/register/ip_limit.go @@ -44,17 +44,14 @@ func QueryIPRegister(c *gin.Context) { resp.UserIDList = userIDList ipLimit, err := imdb.QueryIPLimits(req.IP) if err != nil { - if gorm.IsRecordNotFoundError(err) { - resp.Status = 0 - } else { - log.NewError(req.OperationID, "QueryIPLimits failed", req.IP, err.Error()) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": constant.ErrDB.ErrCode, "errMsg": "QueryIPLimits error!"}) - return - } + log.NewError(req.OperationID, "QueryIPLimits failed", req.IP, err.Error()) } else { - if ipLimit.Ip != "" { - resp.Status = 1 + if ipLimit != nil { + if ipLimit.Ip != "" { + resp.Status = 1 + } } + } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp:", resp) c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": "", "data": resp}) diff --git a/pkg/common/db/mysql_model/im_mysql_model/ip_model.go b/pkg/common/db/mysql_model/im_mysql_model/ip_model.go index b1727eddb..cad838a50 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/ip_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/ip_model.go @@ -34,7 +34,7 @@ func IsLimitUserLoginIp(userID string, LoginIp string) (bool, error) { func QueryIPLimits(ip string) (*db.IpLimit, error) { var ipLimit db.IpLimit - err := db.DB.MysqlDB.DefaultGormDB().Model(&db.IpLimit{}).Where("ip=?", ip).Find(&ip).Error + err := db.DB.MysqlDB.DefaultGormDB().Model(&db.IpLimit{}).Where("ip=?", ip).First(&ip).Error return &ipLimit, err }