1

controllers/controller.go

@@ -22,10 +22,9 @@ func init() {
 
 func CheckToken(c *gin.Context) (tokenInfo *model.TokenInfo) {
 	var (
-		cookie   *http.Cookie
-		err      error
-		tokenMap map[string]interface{}
-		user     *model.User
+		cookie *http.Cookie
+		err    error
+		user   *model.User
 	)
 	tokenInfo = &model.TokenInfo{}
 	//验证token
@@ -40,8 +39,9 @@ func CheckToken(c *gin.Context) (tokenInfo *model.TokenInfo) {
 		} else {
 			tokenInfo.Token = cookie.Value
 		}
-		globals.SugarLogger.Debugf("checkToken token: %v", tokenInfo.Token)
-		if tokenMap = putils.GetKey(tokenInfo.Token).(map[string]interface{}); tokenMap == nil {
+
+		tokenMap2 := putils.GetKey(tokenInfo.Token)
+		if utils.IsNil(tokenMap2) {
 			err = fmt.Errorf("token过期或无效，请重新登录！")
 			c.JSON(http.StatusOK, &model.CallBack{
 				Desc: err.Error(),
@@ -49,7 +49,8 @@ func CheckToken(c *gin.Context) (tokenInfo *model.TokenInfo) {
 			})
 			return nil
 		}
-		data, _ := json.Marshal(tokenMap)
+
+		data, _ := json.Marshal(tokenMap2)
 		if err = json.Unmarshal(data, &user); err == nil && user != nil {
 			tokenInfo.User = user
 		} else {
@@ -152,8 +153,8 @@ func createToken(user *model.User) (token string) {
 		wxConst.TokenHeader,
 		wxConst.TokenVer,
 		user.UserID,
-		time.Now().Format("20060102-150405"),
-		utils.GetUUID(),
+		time.Now().Format("20060102"),
+		utils.Int2Str(user.ID),
 		user.Mobile,
 	}, wxConst.TokenTypeSep)
 }