Merge remote-tracking branch 'origin/master'

src/main/java/net/mingsoft/cms/biz/ICacheBiz.java

@@ -1,11 +0,0 @@
-package net.mingsoft.cms.biz;
-
-public interface ICacheBiz {
-
-    void set(String cacheName, String key, Object value);
-
-    <T> T get(String cacheName, String key, Class<T> cls);
-
-    void del(String cacheName, String key);
-
-}

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;
 
 /**
  * 文章管理持久化层

src/main/java/net/mingsoft/cms/biz/impl/EhcacheBizImpl.java

@@ -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> T get(String cacheName, String key, Class<T> 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);
-    }
-}

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;