From a56da36a747c4471515461772d125b839554547a Mon Sep 17 00:00:00 2001 From: guwd Date: Mon, 21 Dec 2020 11:18:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/mingsoft/cms/biz/ICacheBiz.java | 11 ------ .../mingsoft/cms/biz/impl/EhcacheBizImpl.java | 35 ------------------- 2 files changed, 46 deletions(-) delete mode 100644 src/main/java/net/mingsoft/cms/biz/ICacheBiz.java delete mode 100644 src/main/java/net/mingsoft/cms/biz/impl/EhcacheBizImpl.java diff --git a/src/main/java/net/mingsoft/cms/biz/ICacheBiz.java b/src/main/java/net/mingsoft/cms/biz/ICacheBiz.java deleted file mode 100644 index a1fa0e57..00000000 --- a/src/main/java/net/mingsoft/cms/biz/ICacheBiz.java +++ /dev/null @@ -1,11 +0,0 @@ -package net.mingsoft.cms.biz; - -public interface ICacheBiz { - - void set(String cacheName, String key, Object value); - - T get(String cacheName, String key, Class cls); - - void del(String cacheName, String key); - -} \ No newline at end of file diff --git a/src/main/java/net/mingsoft/cms/biz/impl/EhcacheBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/EhcacheBizImpl.java deleted file mode 100644 index 6f5d8c65..00000000 --- a/src/main/java/net/mingsoft/cms/biz/impl/EhcacheBizImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package net.mingsoft.cms.biz.impl; - -import com.alibaba.fastjson.JSONObject; -import net.mingsoft.cms.biz.ICacheBiz; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.CacheManager; -import org.springframework.stereotype.Service; - -@Service("abc") -public class EhcacheBizImpl implements ICacheBiz { - - @Autowired - private CacheManager cacheManager; - - @Override - public void set(String cacheName, String key, Object value) { - this.cacheManager.getCache(cacheName).put(key, JSONObject.toJSONString(value)); - } - - @Override - public T get(String cacheName, String key, Class cls) { - String str = this.cacheManager.getCache(cacheName).get(key, String.class); - if (StringUtils.isBlank(str)) { - return null; - } - - return JSONObject.parseObject(str, cls); - } - - @Override - public void del(String cacheName, String key) { - this.cacheManager.getCache(cacheName).evictIfPresent(key); - } -} \ No newline at end of file From 33fedcbfa56e59076820e32e8ddce2d791309ef6 Mon Sep 17 00:00:00 2001 From: wujj <1027418825@qq.com> Date: Mon, 21 Dec 2020 16:04:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?DataHolder=20=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mingsoft/cms/biz/impl/ContentBizImpl.java | 26 +++++-------------- .../net/mingsoft/cms/util/CmsParserUtil.java | 1 - 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java index 0aed2786..ff82eeed 100755 --- a/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java +++ b/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java @@ -22,37 +22,23 @@ package net.mingsoft.cms.biz.impl; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.io.FileUtil; -import net.mingsoft.basic.constant.Const; -import net.mingsoft.basic.holder.DataHolder; -import net.mingsoft.basic.util.BasicUtil; +import net.mingsoft.base.biz.impl.BaseBizImpl; +import net.mingsoft.base.dao.IBaseDao; import net.mingsoft.cms.bean.CategoryBean; import net.mingsoft.cms.bean.ContentBean; -import net.mingsoft.cms.constant.e.CategoryTypeEnum; +import net.mingsoft.cms.biz.IContentBiz; import net.mingsoft.cms.dao.ICategoryDao; -import net.mingsoft.cms.entity.CategoryEntity; +import net.mingsoft.cms.dao.IContentDao; import net.mingsoft.cms.entity.ContentEntity; -import net.mingsoft.cms.util.CmsParserUtil; -import net.mingsoft.mdiy.bean.PageBean; import net.mingsoft.mdiy.entity.ModelEntity; -import net.mingsoft.mdiy.util.ParserUtil; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import net.mingsoft.base.biz.impl.BaseBizImpl; -import net.mingsoft.base.dao.IBaseDao; -import java.io.IOException; -import java.util.*; - -import net.mingsoft.cms.biz.IContentBiz; -import net.mingsoft.cms.dao.IContentDao; +import java.util.List; +import java.util.Map; /** * 文章管理持久化层 diff --git a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java index 5d734051..a1298566 100755 --- a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java +++ b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java @@ -27,7 +27,6 @@ import freemarker.core.ParseException; import freemarker.template.MalformedTemplateNameException; import freemarker.template.TemplateNotFoundException; import net.mingsoft.base.constant.Const; -import net.mingsoft.basic.holder.DataHolder; import net.mingsoft.basic.util.BasicUtil; import net.mingsoft.basic.util.SpringUtil; import net.mingsoft.cms.bean.CategoryBean;