Merge remote-tracking branch 'origin/dev' into dev

blade-auth/src/main/java/org/springblade/auth/endpoint/BladeTokenEndPoint.java

@@ -45,6 +45,8 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpSession;
 import java.time.Duration;
+import java.util.List;
+import java.util.Map;
 
 import static org.springblade.core.cache.constant.CacheConstant.*;
 
@@ -124,6 +126,9 @@ public class BladeTokenEndPoint {
 		// 清空资源服务器保存的token
 		OAuth2AccessToken accessToken = tokenStore.readAccessToken(token);
 		OAuth2RefreshToken refreshToken = null;
+		String string = CacheNames.tenantKeyObj(user.getTenantId(), "logpm:user:warehouse:own:", user.getUserId());
+//		List<Map<String,Object>> o = bladeRedis.get(string);
+		bladeRedis.del(CacheNames.tenantKeyObj(user.getTenantId(),"logpm:user:warehouse:own:", user.getUserId()));
 		if (accessToken != null && StringUtil.isNoneBlank(accessToken.getValue())) {
 			refreshToken = accessToken.getRefreshToken();
 			tokenStore.removeAccessToken(accessToken);
@@ -131,6 +136,7 @@ public class BladeTokenEndPoint {
 		if (refreshToken != null && StringUtil.isNoneBlank(refreshToken.getValue())) {
 			tokenStore.removeRefreshToken(refreshToken);
 		}
+
 		return Kv.create().set("success", "true").set("msg", "success");
 	}