Merge 8cd57d68535f83c6495423e777f6a30c88cbe0f1 into c208c3789fbbc2b11557330c685ba2576bb0223f

internal/api/router.go

@@ -97,11 +97,6 @@ func newGinRouter(ctx context.Context, client discovery.SvcDiscoveryRegistry, cf
 	case BestSpeed:
 		r.Use(gzip.Gzip(gzip.BestSpeed))
 	}
-	if config.Standalone() {
-		r.Use(func(c *gin.Context) {
-			c.Set(authverify.CtxAdminUserIDsKey, cfg.Share.IMAdminUser.UserIDs)
-		})
-	}
 	r.Use(api.GinLogger(), prommetricsGin(), gin.RecoveryWithWriter(gin.DefaultErrorWriter, mw.GinPanicErr), mw.CorsHandler(),
 		mw.GinParseOperationID(), GinParseToken(rpcli.NewAuthClient(authConn)), setGinIsAdmin(cfg.Share.IMAdminUser.UserIDs))
 

pkg/common/storage/cache/redis/token.go

@@ -165,15 +165,16 @@ func (c *tokenCache) DeleteTokenByTokenMap(ctx context.Context, userID string, t
 }
 
 func (c *tokenCache) DeleteAndSetTemporary(ctx context.Context, userID string, platformID int, fields []string) error {
+	key := cachekey.GetTokenKey(userID, platformID)
+	if err := c.rdb.HDel(ctx, key, fields...).Err(); err != nil {
+		return errs.Wrap(err)
+	}
 	for _, f := range fields {
 		k := cachekey.GetTemporaryTokenKey(userID, platformID, f)
 		if err := c.rdb.Set(ctx, k, "", time.Minute*5).Err(); err != nil {
 			return errs.Wrap(err)
 		}
 	}
-	key := cachekey.GetTokenKey(userID, platformID)
-	if err := c.rdb.HDel(ctx, key, fields...).Err(); err != nil {
-		return errs.Wrap(err)
-	}
+
 	return nil
 }