From 06c6f278baf9f1ccceb46f3a029e7d51a746401f Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 30 Mar 2020 21:20:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=99=A4=E7=BC=93=E5=AD=98=E8=AF=AF?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E5=B0=86=20CacheUtils=20=E9=87=8C=E7=9A=84?= =?UTF-8?q?=20sysCache=20=E5=88=86=E7=A6=BB=E5=87=BA=20SysUtils=20?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E3=80=82CacheUtils.get=E3=80=81put=E3=80=81r?= =?UTF-8?q?emove=20=E6=9B=BF=E6=8D=A2=E4=B8=BA=20SysUtils.getCache?= =?UTF-8?q?=E3=80=81putCache=E3=80=81remove=20=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jeesite/modules/sys/utils/AreaUtils.java | 8 +++----- .../com/jeesite/modules/sys/web/OnlineController.java | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/utils/AreaUtils.java b/modules/core/src/main/java/com/jeesite/modules/sys/utils/AreaUtils.java index d3013a38..ddaf003c 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/utils/AreaUtils.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/utils/AreaUtils.java @@ -5,7 +5,6 @@ package com.jeesite.modules.sys.utils; import java.util.List; -import com.jeesite.common.cache.CacheUtils; import com.jeesite.common.utils.SpringUtils; import com.jeesite.modules.sys.entity.Area; import com.jeesite.modules.sys.service.AreaService; @@ -32,11 +31,10 @@ public class AreaUtils { * @return */ public static List getAreaAllList(){ - @SuppressWarnings("unchecked") - List areaList = (List)CacheUtils.get(CACHE_AREA_ALL_LIST); + List areaList = SysUtils.getCache(CACHE_AREA_ALL_LIST); if (areaList == null){ areaList = Static.areaService.findList(new Area()); - CacheUtils.put(CACHE_AREA_ALL_LIST, areaList); + SysUtils.putCache(CACHE_AREA_ALL_LIST, areaList); } return areaList; } @@ -45,7 +43,7 @@ public class AreaUtils { * 清理区域缓存 */ public static void clearCache(){ - CacheUtils.remove(CACHE_AREA_ALL_LIST); + SysUtils.removeCache(CACHE_AREA_ALL_LIST); } } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java index 18d48a3d..d9ef7a22 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java @@ -23,7 +23,6 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.jeesite.common.cache.CacheUtils; import com.jeesite.common.collect.ListUtils; import com.jeesite.common.collect.MapUtils; import com.jeesite.common.config.Global; @@ -33,6 +32,7 @@ import com.jeesite.common.lang.TimeUtils; import com.jeesite.common.shiro.realm.LoginInfo; import com.jeesite.common.shiro.session.SessionDAO; import com.jeesite.common.web.BaseController; +import com.jeesite.modules.sys.utils.SysUtils; import com.jeesite.modules.sys.utils.UserUtils; /** @@ -145,7 +145,7 @@ public class OnlineController extends BaseController{ public String kickOut(String sessionId) { Session session = sessionDAO.readSession(sessionId); if (session != null){ - Map onlineTickOutMap = CacheUtils.get("onlineTickOutMap"); + Map onlineTickOutMap = SysUtils.getCache("onlineTickOutMap"); if (onlineTickOutMap == null){ onlineTickOutMap = MapUtils.newConcurrentMap(); } @@ -157,7 +157,7 @@ public class OnlineController extends BaseController{ onlineTickOutMap.put(key, StringUtils.EMPTY); } } - CacheUtils.put("onlineTickOutMap", onlineTickOutMap); + SysUtils.putCache("onlineTickOutMap", onlineTickOutMap); sessionDAO.delete(session); return renderResult(Global.TRUE, text("踢出已成功!")); }