diff --git a/controllers/app_controller.go b/controllers/app_controller.go index d69af6f..b28f6d1 100644 --- a/controllers/app_controller.go +++ b/controllers/app_controller.go @@ -26,9 +26,9 @@ func GetApps(c *gin.Context) { } type AddAppParam struct { - Code string `json:"code" form:"code"` //手机验证码 - Mobile string `json:"mobile" form:"mobile"` //手机号 - Name string `json:"name" form:"name"` //应用名称 + Code string `json:"code" form:"code" binding:"required"` //手机验证码 + Mobile string `json:"mobile" form:"mobile" binding:"required"` //手机号 + Name string `json:"name" form:"name" binding:"required"` //应用名称 } //新建app POST diff --git a/controllers/controller.go b/controllers/controller.go index d38d3b8..e003038 100644 --- a/controllers/controller.go +++ b/controllers/controller.go @@ -33,6 +33,7 @@ func checkToken(c *gin.Context) (tokenInfo *model.TokenInfo) { //验证token //v2下的接口需要验证,v1不需要 if !strings.Contains(c.Request.URL.String(), "v1") { + globals.SugarLogger.Debugf("checkToken cookie: %v", utils.Format4Output(c.Request.Cookies(), true)) if cookie, err = c.Request.Cookie("token"); err != nil { c.JSON(http.StatusOK, &CallBack{ Desc: err.Error(), diff --git a/controllers/user_controller.go b/controllers/user_controller.go index 6e6e5d5..ea4a2f1 100644 --- a/controllers/user_controller.go +++ b/controllers/user_controller.go @@ -55,12 +55,8 @@ func RegisterUser(c *gin.Context) { //登录 POST func Login(c *gin.Context) { var ( - err error - user = &UserParam{} - UserServiceHandler = &services.UserService{ - DB: globals.GetDB(), - C: c, - } + err error + user = &UserParam{} ) if err = c.ShouldBind(&user); err != nil { c.JSON(http.StatusOK, &CallBack{ @@ -79,7 +75,7 @@ func Login(c *gin.Context) { return } if !callFunc(c, func() (retVal interface{}, errCode string, err error) { - retVal, err = UserServiceHandler.Login(user.Name, user.Password) + retVal, err = services.Login(c, user.Name, user.Password) return retVal, "", err }) { return diff --git a/services/user.go b/services/user.go index f62a8a4..5b872b8 100644 --- a/services/user.go +++ b/services/user.go @@ -27,6 +27,16 @@ type UserService struct { } type UserServiceInterface interface { + Login(name, password string) (loginResult *LoginResult, err error) + RegisterUser(c *gin.Context, name, password string) (err error) +} + +var ( + UserServiceHandler UserServiceInterface +) + +func InitHandler(handler UserServiceInterface) { + UserServiceHandler = handler } func (c *UserService) GetUsers(name, mobile, userID string) (users []*model.User, err error) { @@ -57,9 +67,9 @@ type LoginResult struct { Token string `json:"token"` //token } -func (c *UserService) Login(name, password string) (loginResult *LoginResult, err error) { +func Login(c *gin.Context, name, password string) (loginResult *LoginResult, err error) { var ( - db = c.DB + db = globals.GetDB() now = time.Now() user = &model.User{} token string @@ -81,7 +91,7 @@ func (c *UserService) Login(name, password string) (loginResult *LoginResult, er loginResult.Token = token //更新登录时间和ip user.LastLoginAt = &now - user.LastLoginIP = c.C.ClientIP() + user.LastLoginIP = c.ClientIP() err = dao.Update(db, user, "last_login_at", "last_login_ip") return loginResult, err }