no commit message

JeeSpringCloud/src/main/java/com/jeespring/modules/aop/AOPService.java

+package com.jeespring.modules.aop;
+
+import com.jeespring.common.utils.SendMailUtil;
+import com.jeespring.modules.activeMQ.Email;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * JeeSpring AOP
+ * @author 黄炳桂 516821420@qq.com
+ * @version v.0.1
+ * @date 2016年8月23日
+ */
+@Aspect
+@Component
+public class AOPService {
+    private static Logger logger = LoggerFactory.getLogger(AOPService.class);
+    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    // defined aop pointcut
+    //@Pointcut("execution(* com.company.project.modules.*.*(..))")
+    //@Pointcut("execution(* com.company.project.modules..*.*(..))")
+    /*任意公共方法的执行：
+    execution(public * *(..))
+    任何一个以“set”开始的方法的执行：
+    execution(* set*(..))
+    AccountService 接口的任意方法的执行：
+    execution(* com.xyz.service.AccountService.*(..))
+    定义在service包里的任意方法的执行：
+    execution(* com.xyz.service.*.*(..))
+    定义在service包和所有子包里的任意类的任意方法的执行：
+    execution(* com.xyz.service..*.*(..))
+    定义在pointcutexp包和所有子包里的JoinPointObjP2类的任意方法的执行：
+    execution(* com.test.spring.aop.pointcutexp..JoinPointObjP2.*(..))
+    最靠近(..)的为方法名,靠近.*(..))的为类名或者接口名,如上例的JoinPointObjP2.*(..))*/
+    @Pointcut("execution(* com.company.project.modules.*.*.*.*(..))")
+    public void controllerLog() {
+    }
+
+    // log all of controller
+    @Before("controllerLog()")
+    public void before(JoinPoint joinPoint) {
+        //System.out.println("AOP Before:"+joinPoint.getSignature().getDeclaringType() + ",method:" + joinPoint.getSignature().getName()
+                //+ ",params:" + Arrays.asList(joinPoint.getArgs()));
+        logger.debug(dateFormat.format(new Date()) + " | " +"AOP Before:"+joinPoint.getSignature().getDeclaringType() + ",method:" + joinPoint.getSignature().getName());
+        /*Email email=new Email();
+        email.setToMailAddr("516821420@qq.com");
+        email.setSubject("JeeSpring");
+        email.setMessage("JeeSpring AOP!");
+        SendMailUtil.sendCommonMail(email.getToMailAddr(),email.getSubject(),email.getMessage());*/
+    }
+
+    /*@Around("controllerLog()")
+    public void around(ProceedingJoinPoint pjp) throws Throwable{
+        pjp.proceed();
+    }*/
+
+    // result of return
+    @AfterReturning(pointcut = "controllerLog()", returning = "retVal")
+    public void after(JoinPoint joinPoint, Object retVal) {
+        //System.out.println("AOP AfterReturning:"+retVal);
+        logger.debug(dateFormat.format(new Date()) + " | " +"AOP AfterReturning:Object");
+    }
+
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/baiduface/rest/FaceRecognitionRestController.java

+package com.jeespring.modules.baiduface.rest;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jeespring.common.utils.GsonUtils;
+import com.jeespring.common.utils.HttpUtil;
+import com.jeespring.common.web.AbstractBaseController;
+import com.jeespring.common.web.Result;
+import com.jeespring.common.web.ResultFactory;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 人脸识别Controller
+ * @author 唐继涛
+ * @version 2018-7-13
+ */
+@RestController
+@RequestMapping(value = "/rest/face")
+@Api(value = "face百度人脸识别API接口", description = "face百度人脸识别API接口")
+public class FaceRecognitionRestController extends AbstractBaseController {
+    //设置APPID/AK/SK
+    public static final String APP_ID = "11483847";
+    public static final String API_KEY = "Hn5zrGgRe5WWiXV1GcWYirFT";
+    public static final String SECRET_KEY = "vlzV3XEvuc1zGa9cfi5PpdRuFlfz08gu";
+    public String id = null;
+
+    @RequestMapping(value = {"match"}, method = {RequestMethod.POST})
+    @ApiOperation(value = "人脸对比(Content-Type为application/json)", notes = "人脸对比(Content-Type为application/json)")
+    @ApiImplicitParam(name = "String", value = "人脸对比", dataType = "String")
+    public String match(@RequestBody String imgStr) {
+        // 请求url
+        String url = "https://aip.baidubce.com/rest/2.0/face/v3/match"; //百度人脸对比的API
+        try {
+//            String str = this.getUser(userId);
+
+            List<Map<String, Object>> images = new ArrayList<>();
+
+            Map<String, Object> map1 = new HashMap<>();
+            map1.put("image", imgStr);
+            map1.put("image_type", "BASE64");
+            map1.put("face_type", "LIVE");
+            map1.put("quality_control", "LOW");
+            map1.put("liveness_control", "NORMAL");
+
+            Map<String, Object> map2 = new HashMap<>();
+            map2.put("image", imgStr);
+            map2.put("image_type", "BASE64");
+            map2.put("face_type", "LIVE");
+            map2.put("quality_control", "LOW");
+            map2.put("liveness_control", "NORMAL");
+            images.add(map1);
+            images.add(map2);
+            String param = GsonUtils.toJson(images);
+            String token =  FaceRecognitionRestController.getAuth();
+            String result = HttpUtil.post(url, token, "application/json", param);
+            System.out.println(result);
+            return result;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    @RequestMapping(value = {"search"}, method = {RequestMethod.POST})
+    @ApiOperation(value = "人脸搜索(Content-Type为application/json)", notes = "人脸搜索(Content-Type为application/json)")
+    @ApiImplicitParam(name = "String", value = "人脸搜索", dataType = "String")
+    public Result search(@RequestBody String imgStr) {
+        // 请求url
+        String url = "https://aip.baidubce.com/rest/2.0/face/v3/search"; //百度人脸搜索的API
+        Result result = ResultFactory.getSuccessResult();
+        try {
+            String Str = this.GroupGetlist(); //调用百度查询用户组的API接口，将查询返回的数据接收。
+            JSONObject baiJsonObject = JSONObject.parseObject(Str); //将数据转换为json对象类型的数据。
+            String str = baiJsonObject.getJSONObject("result").getString("group_id_list").replace("\"", "").replace("[", "").replace("]", "");
+            Map<String, Object> map = new HashMap<>();
+            map.put("image", imgStr);
+            map.put("liveness_control", "NORMAL");
+            map.put("group_id_list", str);
+            map.put("image_type", "BASE64");
+            map.put("quality_control", "LOW");
+            String param = GsonUtils.toJson(map);
+            //调用百度的人脸检测API获取百度API返回的数据。
+            String token =  FaceRecognitionRestController.getAuth();
+            String baiDuResult = HttpUtil.post(url, token, "application/json", param);
+
+            JSONObject returnResult = JSONObject.parseObject(baiDuResult);  //将百度返回的数据转为json对象类型的数据。
+            String user = returnResult.getJSONObject("result").getString("user_list").replace("\"", "").replace("[", "")
+                    .replace("]", "").replace("{","").replace("}","");
+            String[] userList = user.split(",");  //根据逗号分隔用户信息。
+            JSONArray jsonArray = (JSONArray) JSONArray.toJSON(userList);  //将字符串数组转为json 数组类型的。
+
+            String[] scoreList = ((String) jsonArray.get(0)).split(":"); //获取json数组第一条数据然后根据:分隔。
+            JSONArray json = (JSONArray) JSONArray.toJSON(scoreList);  //获取百度返回user_list数据的score评分。
+            String scoreString = String.valueOf(json.get(1));  //将分数值转成string类型的。
+            Double score = Double.parseDouble(scoreString);    //将string类型的转换成double。
+            //判断分数值
+            if(score >= 80){
+                result = ResultFactory.getSuccessResult("检测成功！");
+            }else {
+                result = ResultFactory.getErrorResult("检测失败，请重新扫描!！");
+            }
+
+            return result;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    @RequestMapping(value = {"add"}, method = {RequestMethod.POST})
+    @ApiOperation(value = "人脸注册(Content-Type为application/json)", notes = "人脸注册(Content-Type为application/json)")
+    @ApiImplicitParam(name = "String", value = "人脸注册", dataType = "String")
+    public Result add(@RequestBody String imgStr, String userId) {
+        // 请求url
+        String url = "https://aip.baidubce.com/rest/2.0/face/v3/faceset/user/add"; //百度添加到人脸库的API
+        Result result = ResultFactory.getSuccessResult();
+        try {
+
+            Map<String, Object> map = new HashMap<>();
+            map.put("image", imgStr);
+            map.put("group_id", "测试人脸库");
+            map.put("user_id", 11);
+            map.put("user_info","测试");
+            map.put("liveness_control", "NORMAL");
+            map.put("image_type", "BASE64");
+            map.put("quality_control", "NORMAL");
+            String param = GsonUtils.toJson(map);
+            String token =  FaceRecognitionRestController.getAuth();
+            String baiDuResult = HttpUtil.post(url, token, "application/json", param);
+            if (baiDuResult.contains("SUCCESS")) {
+                result = ResultFactory.getSuccessResult("注册成功！");
+            } else {
+                result = ResultFactory.getErrorResult("注册失败！");
+            }
+            return result;
+        } catch (Exception e) {
+            logger.info(e.toString());
+        }
+        return null;
+    }
+
+    /**
+     * 组列表查询
+     */
+    private String GroupGetlist() {
+        // 请求url
+        String url = "https://aip.baidubce.com/rest/2.0/face/v3/faceset/group/getlist";
+        try {
+            Map<String, Object> map = new HashMap<>();
+            map.put("start", 0);
+            map.put("length", 100);
+            String param = GsonUtils.toJson(map);
+            String token =  FaceRecognitionRestController.getAuth();
+            String result = HttpUtil.post(url, token, "application/json", param);
+            return result;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 获取API访问token
+     * 该token有一定的有效期，需要自行管理，当失效时需重新获取.
+     * @return assess_token 示例：
+     * "24.460da4889caad24cccdb1fea17221975.2592000.1491995545.282335-1234567"
+     */
+    public static  String getAuth() {
+        // 获取token地址
+        String authHost = "https://aip.baidubce.com/oauth/2.0/token?";
+        String getAccessTokenUrl = authHost
+                // 1. grant_type为固定参数
+                + "grant_type=client_credentials"
+                // 2. 官网获取的 API Key
+                + "&client_id=" + API_KEY
+                // 3. 官网获取的 Secret Key
+                + "&client_secret=" + SECRET_KEY;
+        try {
+            URL realUrl = new URL(getAccessTokenUrl);
+            // 打开和URL之间的连接
+            HttpURLConnection connection = (HttpURLConnection) realUrl.openConnection();
+            connection.setRequestMethod("GET");
+            connection.connect();
+            // 获取所有响应头字段
+            Map<String, List<String>> map = connection.getHeaderFields();
+            // 遍历所有的响应头字段
+            for (String key : map.keySet()) {
+                System.err.println(key + "--->" + map.get(key));
+            }
+            // 定义 BufferedReader输入流来读取URL的响应
+            BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+            String result = "";
+            String line;
+            while ((line = in.readLine()) != null) {
+                result += line;
+            }
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            String access_token = jsonObject.getString("access_token");
+            System.out.print(access_token);
+            return access_token;
+        } catch (Exception e) {
+            System.err.printf("获取token失败！");
+            e.printStackTrace(System.err);
+        }
+        return null;
+    }
+
+    public static void main(String[] args) {
+
+//        new FaceSpot().getAuth();
+        getAuth();
+    }
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/cms/dao/ArticleDao.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://gitee.com/JeeHuangBingGui/jeeSpringCloud">JeeSpring</a>All rights reserved.
+ */
+package com.jeespring.modules.cms.dao;
+
+import java.util.List;
+
+import com.jeespring.common.persistence.InterfaceBaseDao;
+import com.jeespring.common.persistence.annotation.MyBatisDao;
+import com.jeespring.modules.cms.entity.Article;
+import com.jeespring.modules.cms.entity.Category;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 文章DAO接口
+ * @author JeeSpring
+ * @version 2013-8-23
+ */
+@Mapper
+public interface ArticleDao extends InterfaceBaseDao<Article> {
+	
+	public List<Article> findByIdIn(String[] ids);
+//	{
+//		return find("from Article where id in (:p1)", new Parameter(new Object[]{ids}));
+//	}
+	
+	public int updateHitsAddOne(String id);
+//	{
+//		return update("update Article set hits=hits+1 where id = :p1", new Parameter(id));
+//	}
+	
+	public int updateExpiredWeight(Article article);
+	
+	public List<Category> findStats(Category category);
+//	{
+//		return update("update Article set weight=0 where weight > 0 and weightDate < current_timestamp()");
+//	}
+	
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/cms/dao/ArticleDataDao.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://gitee.com/JeeHuangBingGui/jeeSpringCloud">JeeSpring</a>All rights reserved.
+ */
+package com.jeespring.modules.cms.dao;
+
+import com.jeespring.common.persistence.InterfaceBaseDao;
+import com.jeespring.common.persistence.annotation.MyBatisDao;
+import com.jeespring.modules.cms.entity.ArticleData;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 文章DAO接口
+ * @author JeeSpring
+ * @version 2013-8-23
+ */
+@Mapper
+public interface ArticleDataDao extends InterfaceBaseDao<ArticleData> {
+	
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/cms/dao/CategoryDao.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://gitee.com/JeeHuangBingGui/jeeSpringCloud">JeeSpring</a>All rights reserved.
+ */
+package com.jeespring.modules.cms.dao;
+
+import java.util.List;
+import java.util.Map;
+
+import com.jeespring.common.persistence.TreeDao;
+import com.jeespring.common.persistence.annotation.MyBatisDao;
+import com.jeespring.modules.cms.entity.Category;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 栏目DAO接口
+ * @author JeeSpring
+ * @version 2013-8-23
+ */
+@Mapper
+public interface CategoryDao extends TreeDao<Category> {
+	
+	public List<Category> findModule(Category category);
+	
+//	public List<Category> findByParentIdsLike(Category category);
+//	{
+//		return find("from Category where parentIds like :p1", new Parameter(parentIds));
+//	}
+
+	public List<Category> findByModule(String module);
+//	{
+//		return find("from Category where delFlag=:p1 and (module='' or module=:p2) order by site.id, sort", 
+//				new Parameter(Category.DEL_FLAG_NORMAL, module));
+//	}
+	
+	public List<Category> findByParentId(String parentId, String isMenu);
+//	{
+//		return find("from Category where delFlag=:p1 and parent.id=:p2 and inMenu=:p3 order by site.id, sort", 
+//				new Parameter(Category.DEL_FLAG_NORMAL, parentId, isMenu));
+//	}
+
+	public List<Category> findByParentIdAndSiteId(Category entity);
+	
+	public List<Map<String, Object>> findStats(String sql);
+//	{
+//		return find("from Category where delFlag=:p1 and parent.id=:p2 and site.id=:p3 order by site.id, sort", 
+//				new Parameter(Category.DEL_FLAG_NORMAL, parentId, siteId));
+//	}
+	
+	//public List<Category> findByIdIn(String[] ids);
+//	{
+//		return find("from Category where id in (:p1)", new Parameter(new Object[]{ids}));
+//	}
+	//public List<Category> find(Category category);
+
+//	@Query("select distinct c from Category c, Role r, User u where c in elements (r.categoryList) and r in elements (u.roleList)" +
+//			" and c.delFlag='" + Category.DEL_FLAG_NORMAL + "' and r.delFlag='" + Role.DEL_FLAG_NORMAL + 
+//			"' and u.delFlag='" + User.DEL_FLAG_NORMAL + "' and u.id=?1 or (c.user.id=?1 and c.delFlag='" + Category.DEL_FLAG_NORMAL +
+//			"') order by c.site.id, c.sort")
+//	public List<Category> findByUserId(Long userId);
+	
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/cms/dao/CommentDao.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://gitee.com/JeeHuangBingGui/jeeSpringCloud">JeeSpring</a>All rights reserved.
+ */
+package com.jeespring.modules.cms.dao;
+
+import com.jeespring.common.persistence.InterfaceBaseDao;
+import com.jeespring.common.persistence.annotation.MyBatisDao;
+import com.jeespring.modules.cms.entity.Comment;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 评论DAO接口
+ * @author JeeSpring
+ * @version 2013-8-23
+ */
+@Mapper
+public interface CommentDao extends InterfaceBaseDao<Comment> {
+
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/cms/dao/GuestbookDao.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://gitee.com/JeeHuangBingGui/jeeSpringCloud">JeeSpring</a>All rights reserved.
+ */
+package com.jeespring.modules.cms.dao;
+
+import com.jeespring.common.persistence.InterfaceBaseDao;
+import com.jeespring.common.persistence.annotation.MyBatisDao;
+import com.jeespring.modules.cms.entity.Guestbook;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 留言DAO接口
+ * @author JeeSpring
+ * @version 2013-8-23
+ */
+@Mapper
+public interface GuestbookDao extends InterfaceBaseDao<Guestbook> {
+
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/cms/dao/LinkDao.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://gitee.com/JeeHuangBingGui/jeeSpringCloud">JeeSpring</a>All rights reserved.
+ */
+package com.jeespring.modules.cms.dao;
+
+import java.util.List;
+
+import com.jeespring.common.persistence.InterfaceBaseDao;
+import com.jeespring.common.persistence.annotation.MyBatisDao;
+import com.jeespring.modules.cms.entity.Link;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 链接DAO接口
+ * @author JeeSpring
+ * @version 2013-8-23
+ */
+@Mapper
+public interface LinkDao extends InterfaceBaseDao<Link> {
+	
+	public List<Link> findByIdIn(String[] ids);
+//	{
+//		return find("front Like where id in (:p1)", new Parameter(new Object[]{ids}));
+//	}
+	
+	public int updateExpiredWeight(Link link);
+//	{
+//		return update("update Link set weight=0 where weight > 0 and weightDate < current_timestamp()");
+//	}
+//	public List<Link> fjindListByEntity();
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/cms/dao/SiteDao.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://gitee.com/JeeHuangBingGui/jeeSpringCloud">JeeSpring</a>All rights reserved.
+ */
+package com.jeespring.modules.cms.dao;
+
+import com.jeespring.common.persistence.InterfaceBaseDao;
+import com.jeespring.common.persistence.annotation.MyBatisDao;
+import com.jeespring.modules.cms.entity.Site;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 站点DAO接口
+ * @author JeeSpring
+ * @version 2013-8-23
+ */
+@Mapper
+public interface SiteDao extends InterfaceBaseDao<Site> {
+
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/cms/entity/Article.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://gitee.com/JeeHuangBingGui/jeeSpringCloud">JeeSpring</a>All rights reserved.
+ */
+package com.jeespring.modules.cms.entity;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.validator.constraints.Length;
+
+import com.jeespring.modules.sys.entity.User;
+import com.google.common.collect.Lists;
+import com.jeespring.common.persistence.AbstractBaseEntity;
+import com.jeespring.modules.cms.utils.CmsUtils;
+
+/**
+ * 文章Entity
+ * @author JeeSpring
+ * @version 2013-05-15
+ */
+public class Article extends AbstractBaseEntity<Article> {
+
+    public static final String DEFAULT_TEMPLATE = "frontViewArticle";
+	
+	private static final long serialVersionUID = 1L;
+	private Category category;// 分类编号
+	private String title;	// 标题
+    private String link;	// 外部链接
+	private String color;	// 标题颜色（red：红色；green：绿色；blue：蓝色；yellow：黄色；orange：橙色）
+	private String image;	// 文章图片
+	private String keywords;// 关键字
+	private String description;// 描述、摘要
+	private Integer weight;	// 权重，越大越靠前
+	private Date weightDate;// 权重期限，超过期限，将weight设置为0
+	private Integer hits;	// 点击数
+	private String posid;	// 推荐位，多选（1：首页焦点图；2：栏目页文章推荐；）
+    private String customContentView;	// 自定义内容视图
+   	private String viewConfig;	// 视图参数
+
+	private ArticleData articleData;	//文章副表
+	
+	private Date beginDate;	// 开始时间
+	private Date endDate;	// 结束时间
+	
+	private User user;
+    
+	public Article() {
+		super();
+		this.weight = 0;
+		this.hits = 0;
+		this.posid = "";
+	}
+
+	public Article(String id){
+		this();
+		this.id = id;
+	}
+	
+	public Article(Category category){
+		this();
+		this.category = category;
+	}
+
+	public void prePersist(){
+		//TODO 后续处理，暂不知有何用处
+		//super.prePersist();
+		articleData.setId(this.id);
+	}
+	
+	public Category getCategory() {
+		return category;
+	}
+
+	public void setCategory(Category category) {
+		this.category = category;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+    @Length(min=0, max=255)
+    public String getLink() {
+        return link;
+    }
+
+    public void setLink(String link) {
+        this.link = link;
+    }
+
+	@Length(min=0, max=50)
+	public String getColor() {
+		return color;
+	}
+
+	public void setColor(String color) {
+		this.color = color;
+	}
+
+	@Length(min=0, max=255)
+	public String getImage() {
+		return image;
+	}
+
+	public void setImage(String image) {
+        this.image = image;//CmsUtils.formatImageSrcToDb(image);
+	}
+
+	@Length(min=0, max=255)
+	public String getKeywords() {
+		return keywords;
+	}
+
+	public void setKeywords(String keywords) {
+		this.keywords = keywords;
+	}
+
+	@Length(min=0, max=255)
+	public String getDescription() {
+		return description;
+	}
+
+	public Date getBeginDate() {
+		return beginDate;
+	}
+
+	public void setBeginDate(Date beginDate) {
+		this.beginDate = beginDate;
+	}
+
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	@NotNull
+	public Integer getWeight() {
+		return weight;
+	}
+
+	public void setWeight(Integer weight) {
+		this.weight = weight;
+	}
+
+	public Date getWeightDate() {
+		return weightDate;
+	}
+
+	public void setWeightDate(Date weightDate) {
+		this.weightDate = weightDate;
+	}
+
+	public Integer getHits() {
+		return hits;
+	}
+
+	public void setHits(Integer hits) {
+		this.hits = hits;
+	}
+
+	@Length(min=0, max=10)
+	public String getPosid() {
+		return posid;
+	}
+
+	public void setPosid(String posid) {
+		this.posid = posid;
+	}
+
+    public String getCustomContentView() {
+        return customContentView;
+    }
+
+    public void setCustomContentView(String customContentView) {
+        this.customContentView = customContentView;
+    }
+
+    public String getViewConfig() {
+        return viewConfig;
+    }
+
+    public void setViewConfig(String viewConfig) {
+        this.viewConfig = viewConfig;
+    }
+
+	public ArticleData getArticleData() {
+		return articleData;
+	}
+
+	public void setArticleData(ArticleData articleData) {
+		this.articleData = articleData;
+	}
+
+	public List<String> getPosidList() {
+		List<String> list = Lists.newArrayList();
+		if (posid != null){
+			for (String s : StringUtils.split(posid, ",")) {
+				list.add(s);
+			}
+		}
+		return list;
+	}
+
+	public User getUser() {
+		return user;
+	}
+
+	public void setUser(User user) {
+		this.user = user;
+	}
+
+	public void setPosidList(List<String> list) {
+		posid = ","+StringUtils.join(list, ",")+",";
+	}
+
+   	public String getUrl() {
+        return CmsUtils.getUrlDynamic(this);
+   	}
+
+   	public String getImageSrc() {
+        return CmsUtils.formatImageSrcToWeb(this.image);
+   	}
+	
+}
+
+

JeeSpringCloud/src/main/java/com/jeespring/modules/cms/entity/ArticleData.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://gitee.com/JeeHuangBingGui/jeeSpringCloud">JeeSpring</a>All rights reserved.
+ */
+package com.jeespring.modules.cms.entity;
+
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.NotBlank;
+
+import com.jeespring.common.config.Global;
+import com.jeespring.common.persistence.AbstractBaseEntity;
+
+/**
+ * 文章Entity
+ * @author JeeSpring
+ * @version 2013-01-15
+ */
+public class ArticleData extends AbstractBaseEntity<ArticleData> {
+
+	private static final long serialVersionUID = 1L;
+	private String id;		// 编号
+	private String content;	// 内容
+	private String copyfrom;// 来源
+	private String relation;// 相关文章
+	private String allowComment;// 是否允许评论
+
+	private Article article;
+	
+	public ArticleData() {
+		super();
+		this.allowComment = Global.YES;
+	}
+	
+	public ArticleData(String id){
+		this();
+		this.id = id;
+	}
+
+	@Override
+    public String getId() {
+		return id;
+	}
+
+	@Override
+    public void setId(String id) {
+		this.id = id;
+	}
+
+	@NotBlank
+	public String getContent() {
+		return content;
+	}
+
+	public void setContent(String content) {
+		this.content = content;
+	}
+
+	@Length(min=0, max=255)
+	public String getCopyfrom() {
+		return copyfrom;
+	}
+
+	public void setCopyfrom(String copyfrom) {
+		this.copyfrom = copyfrom;
+	}
+
+	@Length(min=0, max=255)
+	public String getRelation() {
+		return relation;
+	}
+
+	public void setRelation(String relation) {
+		this.relation = relation;
+	}
+
+	@Length(min=1, max=1)
+	public String getAllowComment() {
+		return allowComment;
+	}
+
+	public void setAllowComment(String allowComment) {
+		this.allowComment = allowComment;
+	}
+
+	public Article getArticle() {
+		return article;
+	}
+
+	public void setArticle(Article article) {
+		this.article = article;
+	}
+
+}
\ No newline at end of file

JeeSpringCloud/src/main/java/com/jeespring/modules/cms/entity/Category.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://gitee.com/JeeHuangBingGui/jeeSpringCloud">JeeSpring</a>All rights reserved.
+ */
+package com.jeespring.modules.cms.entity;
+
+import java.util.Date;
+import java.util.List;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.google.common.collect.Lists;
+import com.jeespring.common.config.Global;
+import com.jeespring.common.persistence.TreeEntity;
+import com.jeespring.modules.cms.utils.CmsUtils;
+import com.jeespring.modules.sys.entity.Office;
+
+/**
+ * 栏目Entity
+ * @author JeeSpring
+ * @version 2013-05-15
+ */
+public class Category extends TreeEntity<Category> {
+
+    public static final String DEFAULT_TEMPLATE = "frontList";
+
+	private static final long serialVersionUID = 1L;
+	private Site site;		// 归属站点
+	private Office office;	// 归属部门
+//	private Category parent;// 父级菜单
+//	private String parentIds;// 所有父级编号
+	private String module; 	// 栏目模型（article：文章；picture：图片；download：下载；link：链接；special：专题）
+//	private String name; 	// 栏目名称
+	private String image; 	// 栏目图片
+	private String href; 	// 链接
+	private String target; 	// 目标（ _blank、_self、_parent、_top）
+	private String description; 	// 描述，填写有助于搜索引擎优化
+	private String keywords; 	// 关键字，填写有助于搜索引擎优化
+//	private Integer sort; 		// 排序（升序）
+	private String inMenu; 		// 是否在导航中显示（1：显示；0：不显示）
+	private String inList; 		// 是否在分类页中显示列表（1：显示；0：不显示）
+	private String showModes; 	// 展现方式（0:有子栏目显示栏目列表，无子栏目显示内容列表;1：首栏目内容列表；2：栏目第一条内容）
+	private String allowComment;// 是否允许评论
+	private String isAudit;	// 是否需要审核
+	private String customListView;		// 自定义列表视图
+	private String customContentView;	// 自定义内容视图
+    private String viewConfig;	// 视图参数
+    
+    private Date beginDate;	// 开始时间
+    private Date endDate;	// 结束时间
+    private String cnt;//信息量
+    private String hits;//点击量
+	
+	private List<Category> childList = Lists.newArrayList(); 	// 拥有子分类列表
+
+	public Category(){
+		super();
+		this.module = "";
+		this.sort = 30;
+		this.inMenu = Global.HIDE;
+		this.inList = Global.SHOW;
+		this.showModes = "0";
+		this.allowComment = Global.NO;
+		this.delFlag = DEL_FLAG_NORMAL;
+		this.isAudit = Global.NO;
+	}
+
+	public Category(String id){
+		this();
+		this.id = id;
+	}
+	
+	public Category(String id, Site site){
+		this();
+		this.id = id;
+		this.setSite(site);
+	}
+	
+	public Site getSite() {
+		return site;
+	}
+
+	public String getHits() {
+		return hits;
+	}
+
+	public void setHits(String hits) {
+		this.hits = hits;
+	}
+
+	public void setSite(Site site) {
+		this.site = site;
+	}
+	
+	public Office getOffice() {
+		return office;
+	}
+
+	public void setOffice(Office office) {
+		this.office = office;
+	}
+
+//	@JsonBackReference
+//	@NotNull
+	@Override
+    public Category getParent() {
+		return parent;
+	}
+
+	@Override
+    public void setParent(Category parent) {
+		this.parent = parent;
+	}
+	
+//	@Length(min=1, max=255)
+//	public String getParentIds() {
+//		return parentIds;
+//	}
+//
+//	public void setParentIds(String parentIds) {
+//		this.parentIds = parentIds;
+//	}
+	
+	@Length(min=0, max=20)
+	public String getModule() {
+		return module;
+	}
+
+	public void setModule(String module) {
+		this.module = module;
+	}
+
+//	@Length(min=0, max=100)
+//	public String getName() {
+//		return name;
+//	}
+//
+//	public void setName(String name) {
+//		this.name = name;
+//	}
+
+	@Length(min=0, max=255)
+	public String getImage() {
+		return image;
+	}
+
+	public void setImage(String image) {
+		this.image = image;
+	}
+
+	@Length(min=0, max=255)
+	public String getHref() {
+		return href;
+	}
+
+	public void setHref(String href) {
+		this.href = href;
+	}
+
+	@Length(min=0, max=20)
+	public String getTarget() {
+		return target;
+	}
+
+	public Date getBeginDate() {
+		return beginDate;
+	}
+
+	public void setBeginDate(Date beginDate) {
+		this.beginDate = beginDate;
+	}
+
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+
+	public void setTarget(String target) {
+		this.target = target;
+	}
+
+	@Length(min=0, max=255)
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	@Length(min=0, max=255)
+	public String getKeywords() {
+		return keywords;
+	}
+
+	public void setKeywords(String keywords) {
+		this.keywords = keywords;
+	}
+	
+//	@NotNull
+//	public Integer getSort() {
+//		return sort;
+//	}
+//
+//	public void setSort(Integer sort) {
+//		this.sort = sort;
+//	}
+
+	@Length(min=1, max=1)
+	public String getInMenu() {
+		return inMenu;
+	}
+
+	public void setInMenu(String inMenu) {
+		this.inMenu = inMenu;
+	}
+
+	@Length(min=1, max=1)
+	public String getInList() {
+		return inList;
+	}
+
+	public void setInList(String inList) {
+		this.inList = inList;
+	}
+
+	@Length(min=1, max=1)
+	public String getShowModes() {
+		return showModes;
+	}
+
+	public void setShowModes(String showModes) {
+		this.showModes = showModes;
+	}
+	
+	@Length(min=1, max=1)
+	public String getAllowComment() {
+		return allowComment;
+	}
+
+	public void setAllowComment(String allowComment) {
+		this.allowComment = allowComment;
+	}
+
+	@Length(min=1, max=1)
+	public String getIsAudit() {
+		return isAudit;
+	}
+
+	public void setIsAudit(String isAudit) {
+		this.isAudit = isAudit;
+	}
+
+	public String getCustomListView() {
+		return customListView;
+	}
+
+	public void setCustomListView(String customListView) {
+		this.customListView = customListView;
+	}
+
+	public String getCustomContentView() {
+		return customContentView;
+	}
+
+	public void setCustomContentView(String customContentView) {
+		this.customContentView = customContentView;
+	}
+
+    public String getViewConfig() {
+        return viewConfig;
+    }
+
+    public void setViewConfig(String viewConfig) {
+        this.viewConfig = viewConfig;
+    }
+
+	public List<Category> getChildList() {
+		return childList;
+	}
+
+	public void setChildList(List<Category> childList) {
+		this.childList = childList;
+	}
+
+	public String getCnt() {
+		return cnt;
+	}
+
+	public void setCnt(String cnt) {
+		this.cnt = cnt;
+	}
+	
+	public static void sortList(List<Category> list, List<Category> sourcelist, String parentId){
+		for (int i=0; i<sourcelist.size(); i++){
+			Category e = sourcelist.get(i);
+			if (e.getParent()!=null && e.getParent().getId()!=null
+					&& e.getParent().getId().equals(parentId)){
+				list.add(e);
+				// 判断是否还有子节点, 有则继续获取子节点
+				for (int j=0; j<sourcelist.size(); j++){
+					Category child = sourcelist.get(j);
+					if (child.getParent()!=null && child.getParent().getId()!=null
+							&& child.getParent().getId().equals(e.getId())){
+						sortList(list, sourcelist, e.getId());
+						break;
+					}
+				}
+			}
+		}
+	}
+	
+	public String getIds() {
+		return (this.getParentIds() !=null ? this.getParentIds().replaceAll(",", " ") : "") 
+				+ (this.getId() != null ? this.getId() : "");
+	}
+
+	public boolean isRoot(){
+		return isRoot(this.id);
+	}
+	
+	public static boolean isRoot(String id){
+		return id != null && "1".equals(id);
+	}
+
+   	public String getUrl() {
+        return CmsUtils.getUrlDynamic(this);
+   	}
+}
\ No newline at end of file

JeeSpringCloud/src/main/java/com/jeespring/modules/cms/entity/Comment.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://gitee.com/JeeHuangBingGui/jeeSpringCloud">JeeSpring</a>All rights reserved.
+ */
+package com.jeespring.modules.cms.entity;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.jeespring.common.persistence.AbstractBaseEntity;
+import com.jeespring.modules.sys.entity.User;
+
+/**
+ * 评论Entity
+ * @author JeeSpring
+ * @version 2013-05-15
+ */
+public class Comment extends AbstractBaseEntity<Comment> {
+
+	private static final long serialVersionUID = 1L;
+	private Category category;// 分类编号
+	private String contentId;	// 归属分类内容的编号（Article.id、Photo.id、Download.id）
+	private String title;	// 归属分类内容的标题（Article.title、Photo.title、Download.title）
+	private String content; // 评论内容
+	private String name; 	// 评论姓名
+	private String ip; 		// 评论IP
+	private Date createDate;// 评论时间
+	private User auditUser; // 审核人
+	private Date auditDate;	// 审核时间
+	private String delFlag;	// 删除标记删除标记（0：正常；1：删除；2：审核）
+
+	public Comment() {
+		super();
+		this.delFlag = DEL_FLAG_AUDIT;
+	}
+	
+	public Comment(String id){
+		this();
+		this.id = id;
+	}
+	
+	public Comment(Category category){
+		this();
+		this.category = category;
+	}
+	
+
+
+	@NotNull
+	public Category getCategory() {
+		return category;
+	}
+
+	public void setCategory(Category category) {
+		this.category = category;
+	}
+
+	@NotNull
+	public String getContentId() {
+		return contentId;
+	}
+
+	public void setContentId(String contentId) {
+		this.contentId = contentId;
+	}
+
+	@Length(min=1, max=255)
+	public String getContent() {
+		return content;
+	}
+
+	public void setContent(String content) {
+		this.content = content;
+	}
+	
+	@Length(min=1, max=255)
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	
+	@Length(min=1, max=100)
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public User getAuditUser() {
+		return auditUser;
+	}
+
+	public void setAuditUser(User auditUser) {
+		this.auditUser = auditUser;
+	}
+
+	public Date getAuditDate() {
+		return auditDate;
+	}
+
+	public void setAuditDate(Date auditDate) {
+		this.auditDate = auditDate;
+	}
+
+	public String getIp() {
+		return ip;
+	}
+
+	public void setIp(String ip) {
+		this.ip = ip;
+	}
+
+	@Override
+    @NotNull
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	@Override
+    public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	@Override
+    @Length(min=1, max=1)
+	public String getDelFlag() {
+		return delFlag;
+	}
+
+	@Override
+    public void setDelFlag(String delFlag) {
+		this.delFlag = delFlag;
+	}
+
+}
\ No newline at end of file

JeeSpringCloud/src/main/java/com/jeespring/modules/cms/entity/FileTpl.java

+package com.jeespring.modules.cms.entity;
+
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.util.Date;
+
+/**
+ * User: songlai
+ * Date: 13-8-22
+ * Time: 上午9:44
+ */
+public class FileTpl {
+	
+    private File file;
+    
+   	// 应用的根目录
+   	private String root;
+
+   	public FileTpl(File file, String root) {
+   		this.file = file;
+   		this.root = root;
+   	}
+
+    public File getFile() {
+        return file;
+    }
+
+    public void setFile(File file) {
+        this.file = file;
+    }
+
+    public String getRoot() {
+        return root;
+    }
+
+    public void setRoot(String root) {
+        this.root = root;
+    }
+
+    public String getName() {
+   		String ap = file.getAbsolutePath().substring(root.length());
+   		ap = ap.replace(File.separatorChar, '/');
+   		// 在resin里root的结尾是带'/'的，这样会导致getName返回的名称不以'/'开头。
+   		if (!ap.startsWith("/")) {
+   			ap = "/" + ap;
+   		}
+   		return ap;
+   	}
+
+    public String getParent(){
+        String ap = file.getParent().substring(root.length());
+        ap = ap.replace(File.separatorChar, '/');
+        // 在resin里root的结尾是带'/'的，这样会导致getName返回的名称不以'/'开头。
+        if (!ap.startsWith("/")) {
+            ap = "/" + ap;
+        }
+        return ap;
+    }
+
+   	public String getPath() {
+   		String name = getName();
+   		return name.substring(0, name.lastIndexOf('/'));
+   	}
+
+   	public String getFilename() {
+   		return file.getName();
+   	}
+
+   	public String getSource() {
+   		if (file.isDirectory()) {
+   			return null;
+   		}
+   		try {
+   			return FileUtils.readFileToString(this.file, "UTF-8");
+   		} catch (IOException e) {
+   			throw new RuntimeException(e);
+   		}
+   	}
+
+   	public long getLastModified() {
+   		return file.lastModified();
+   	}
+
+   	public Date getLastModifiedDate() {
+   		return new Timestamp(getLastModified());
+   	}
+
+   	public long getLength() {
+   		return file.length();
+   	}
+
+   	public int getSize() {
+   		return (int) (getLength() / 1024) + 1;
+   	}
+
+   	public boolean isDirectory() {
+   		return file.isDirectory();
+   	}
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/cms/entity/Guestbook.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://gitee.com/JeeHuangBingGui/jeeSpringCloud">JeeSpring</a>All rights reserved.
+ */
+package com.jeespring.modules.cms.entity;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Email;
+import org.hibernate.validator.constraints.Length;
+
+import com.jeespring.common.persistence.AbstractBaseEntity;
+import com.jeespring.common.utils.IdGen;
+import com.jeespring.modules.sys.entity.User;
+
+/**
+ * 留言Entity
+ * @author JeeSpring
+ * @version 2013-05-15
+ */
+public class Guestbook extends AbstractBaseEntity<Guestbook> {
+	
+	private static final long serialVersionUID = 1L;
+	private String type; 	// 留言分类（咨询、建议、投诉、其它）
+	private String content; // 留言内容
+	private String name; 	// 姓名
+	private String email; 	// 邮箱
+	private String phone; 	// 电话
+	private String workunit;// 单位
+	private String ip; 		// 留言IP
+	private Date createDate;// 留言时间
+	private User reUser; 		// 回复人
+	private Date reDate;	// 回复时间
+	private String reContent;// 回复内容
+	private String delFlag;	// 删除标记删除标记（0：正常；1：删除；2：审核）
+
+	public Guestbook() {
+		this.delFlag = DEL_FLAG_AUDIT;
+	}
+
+	public Guestbook(String id){
+		this();
+		this.id = id;
+	}
+	
+	public void prePersist(){
+		this.id = IdGen.uuid();
+		this.createDate = new Date();
+	}
+	
+	@Length(min=1, max=100)
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	@Length(min=1, max=2000)
+	public String getContent() {
+		return content;
+	}
+
+	public void setContent(String content) {
+		this.content = content;
+	}
+	
+	@Length(min=1, max=100)
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Email @Length(min=0, max=100)
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	@Length(min=0, max=100)
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+
+	@Length(min=0, max=100)
+	public String getWorkunit() {
+		return workunit;
+	}
+
+	public void setWorkunit(String workunit) {
+		this.workunit = workunit;
+	}
+
+	@Length(min=1, max=100)
+	public String getIp() {
+		return ip;
+	}
+
+	public void setIp(String ip) {
+		this.ip = ip;
+	}
+
+	@Override
+    @NotNull
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	@Override
+    public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	public User getReUser() {
+		return reUser;
+	}
+
+	public void setReUser(User reUser) {
+		this.reUser = reUser;
+	}
+
+	public String getReContent() {
+		return reContent;
+	}
+
+	public void setReContent(String reContent) {
+		this.reContent = reContent;
+	}
+
+	public Date getReDate() {
+		return reDate;
+	}
+
+	public void setReDate(Date reDate) {
+		this.reDate = reDate;
+	}
+
+	@Override
+    @Length(min=1, max=1)
+	public String getDelFlag() {
+		return delFlag;
+	}
+
+	@Override
+    public void setDelFlag(String delFlag) {
+		this.delFlag = delFlag;
+	}
+	
+}
+
+

JeeSpringCloud/src/main/java/com/jeespring/modules/cms/entity/Link.java

+/**
+\ * Copyright &copy; 2012-2013 <a href="https://gitee.com/JeeHuangBingGui/jeeSpringCloud">JeeSpring</a>All rights reserved.
+ */
+package com.jeespring.modules.cms.entity;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.jeespring.common.persistence.AbstractBaseEntity;
+import com.jeespring.modules.sys.entity.User;
+
+/**
+ * 链接Entity
+ * @author JeeSpring
+ * @version 2013-05-15
+ */
+public class Link extends AbstractBaseEntity<Link> {
+	
+	private static final long serialVersionUID = 1L;
+	private Category category;// 分类编号
+	private String title;	// 链接名称
+	private String color;	// 标题颜色（red：红色；green：绿色；blue：蓝色；yellow：黄色；orange：橙色）
+	private String image;	// 链接图片
+	private String href;	// 链接地址
+	private Integer weight;	// 权重，越大越靠前
+	private Date weightDate;// 权重期限，超过期限，将weight设置为0
+	private User user;		//关联用户
+
+	public Link() {
+		super();
+		this.weight = 0;
+	}
+	
+	public Link(String id){
+		this();
+		this.id = id;
+	}
+
+	public Link(Category category){
+		this();
+		this.category = category;
+	}
+
+	@NotNull
+	public Category getCategory() {
+		return category;
+	}
+
+	public void setCategory(Category category) {
+		this.category = category;
+	}
+
+	@Length(min=1, max=255)
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	@Length(min=0, max=50)
+	public String getColor() {
+		return color;
+	}
+
+	public void setColor(String color) {
+		this.color = color;
+	}
+
+	@Length(min=0, max=255)
+	public String getImage() {
+		return image;
+	}
+
+	public void setImage(String image) {
+		this.image = image;
+	}
+
+	@Length(min=0, max=255)
+	public String getHref() {
+		return href;
+	}
+
+	public void setHref(String href) {
+		this.href = href;
+	}
+
+	public Integer getWeight() {
+		return weight;
+	}
+
+	public void setWeight(Integer weight) {
+		this.weight = weight;
+	}
+
+	public Date getWeightDate() {
+		return weightDate;
+	}
+
+	public void setWeightDate(Date weightDate) {
+		this.weightDate = weightDate;
+	}
+
+	public User getUser() {
+		return user;
+	}
+
+	public void setUser(User user) {
+		this.user = user;
+	}
+	
+}
\ No newline at end of file

JeeSpringCloud/src/main/java/com/jeespring/modules/cms/entity/Site.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://gitee.com/JeeHuangBingGui/jeeSpringCloud">JeeSpring</a>All rights reserved.
+ */
+package com.jeespring.modules.cms.entity;
+
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.validator.constraints.Length;
+
+import com.jeespring.common.persistence.AbstractBaseEntity;
+import com.jeespring.modules.sys.utils.UserUtils;
+
+/**
+ * 站点Entity
+ * @author JeeSpring
+ * @version 2013-05-15
+ */
+public class Site extends AbstractBaseEntity<Site> {
+	
+	private static final long serialVersionUID = 1L;
+	private String name;	// 站点名称
+	private String title;	// 站点标题
+	private String logo;	// 站点logo
+	private String description;// 描述，填写有助于搜索引擎优化
+	private String keywords;// 关键字，填写有助于搜索引擎优化
+	private String theme;	// 主题
+	private String copyright;// 版权信息
+	private String customIndexView;// 自定义首页视图文件
+	private String domain;
+
+	public Site() {
+		super();
+	}
+	
+	public Site(String id){
+		this();
+		this.id = id;
+	}
+
+	@Length(min=1, max=100)
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Length(min=1, max=100)
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	
+	public String getLogo() {
+		return logo;
+	}
+
+	public void setLogo(String logo) {
+		this.logo = logo;
+	}
+
+	@Length(min=0, max=255)
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	@Length(min=0, max=255)
+	public String getKeywords() {
+		return keywords;
+	}
+
+	public void setKeywords(String keywords) {
+		this.keywords = keywords;
+	}
+
+	@Length(min=1, max=255)
+	public String getTheme() {
+		return theme;
+	}
+
+	public void setTheme(String theme) {
+		this.theme = theme;
+	}
+
+	public String getCopyright() {
+		return copyright;
+	}
+
+	public void setCopyright(String copyright) {
+		this.copyright = copyright;
+	}
+
+	public String getCustomIndexView() {
+		return customIndexView;
+	}
+
+	public void setCustomIndexView(String customIndexView) {
+		this.customIndexView = customIndexView;
+	}
+
+	/**
+	 * 获取默认站点ID
+	 */
+	public static String defaultSiteId(){
+		return "1";
+	}
+	
+	/**
+	 * 判断是否为默认（主站）站点
+	 */
+	public static boolean isDefault(String id){
+		return id != null && id.equals(defaultSiteId());
+	}
+	
+	/**
+	 * 获取当前编辑的站点编号
+	 */
+	public static String getCurrentSiteId(){
+		String siteId = (String)UserUtils.getCache("siteId");
+		return StringUtils.isNotBlank(siteId)?siteId:defaultSiteId();
+	}
+
+    /**
+   	 * 模板路径
+   	 */
+   	public static final String TPL_BASE = "/WEB-INF/views/modules/cms/front/themes";
+
+    /**
+   	 * 获得模板方案路径。如：/WEB-INF/views/modules/cms/front/themes/jeesite
+   	 *
+   	 * @return
+   	 */
+   	public String getSolutionPath() {
+   		return TPL_BASE + "/" + getTheme();
+   	}
+
+	public String getDomain() {
+		return domain;
+	}
+
+	public void setDomain(String domain) {
+		this.domain = domain;
+	}
+	
+}
\ No newline at end of file

JeeSpringCloud/src/main/java/com/jeespring/modules/cms/service/ArticleDataService.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://gitee.com/JeeHuangBingGui/jeeSpringCloud">JeeSpring</a>All rights reserved.
+ */
+package com.jeespring.modules.cms.service;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.jeespring.common.service.AbstractBaseService;
+import com.jeespring.modules.cms.dao.ArticleDataDao;
+import com.jeespring.modules.cms.entity.ArticleData;
+
+/**
+ * 站点Service
+ * @author JeeSpring
+ * @version 2013-01-15
+ */
+@Service
+@Transactional(readOnly = true)
+public class ArticleDataService extends AbstractBaseService<ArticleDataDao, ArticleData> {
+
+}

JeeSpringCloud/src/main/java/com/jeespring/modules/cms/service/ArticleService.java

+/**
+ * Copyright &copy; 2012-2016 <a href="https://gitee.com/JeeHuangBingGui/jeeSpringCloud">JeeSpring</a>All rights reserved.
+ */
+package com.jeespring.modules.cms.service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.fastjson.JSON;
+import com.jeespring.common.redis.RedisUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.google.common.collect.Lists;
+import com.jeespring.common.config.Global;
+import com.jeespring.common.persistence.Page;
+import com.jeespring.common.service.AbstractBaseService;
+import com.jeespring.common.utils.CacheUtils;
+import com.jeespring.common.utils.StringUtils;
+import com.jeespring.modules.cms.dao.ArticleDao;
+import com.jeespring.modules.cms.dao.ArticleDataDao;
+import com.jeespring.modules.cms.dao.CategoryDao;
+import com.jeespring.modules.cms.entity.Article;
+import com.jeespring.modules.cms.entity.ArticleData;
+import com.jeespring.modules.cms.entity.Category;
+import com.jeespring.modules.sys.utils.UserUtils;
+
+/**
+ * 文章Service
+ * @author JeeSpring
+ * @version 2013-05-15
+ */
+@Service
+@Transactional(readOnly = true)
+public class ArticleService extends AbstractBaseService<ArticleDao, Article> {
+
+	@Autowired
+	private ArticleDataDao articleDataDao;
+	@Autowired
+	private CategoryDao categoryDao;
+	/**
+	 * redis caches
+	 */
+	@Autowired
+	private RedisUtils redisUtils;
+
+	@Override
+    public Article get(String id) {
+		//获取缓存数据
+		Article article=(Article)redisUtils.get(RedisUtils.getIdKey(ArticleService.class.getName(),id));
+		if( article!=null) {
+            return article;
+        }
+		//获取数据库数据
+		article=super.get(id);
+		//设置缓存数据
+		redisUtils.set(RedisUtils.getIdKey(ArticleService.class.getName(),id),article);
+		return article;
+	}
+	@Transactional(readOnly = false)
+	public Page<Article> findPage(Page<Article> page, Article article, boolean isDataScopeFilter) {
+
+		//获取缓存数据
+		String findPageKey =  RedisUtils.getFindPageKey(ArticleService.class.getName(), JSON.toJSONString(page)+JSON.toJSONString(article));
+		Page<Article> pageReuslt=(Page<Article>)redisUtils.get(findPageKey);
+		if(pageReuslt!=null) {
+            return pageReuslt;
+        }
+
+		// 更新过期的权重，间隔为“6”个小时
+		Date updateExpiredWeightDate =  (Date)CacheUtils.get("updateExpiredWeightDateByArticle");
+		if (updateExpiredWeightDate == null || (updateExpiredWeightDate != null 
+				&& updateExpiredWeightDate.getTime() < new Date().getTime())){
+			dao.updateExpiredWeight(article);
+			CacheUtils.put("updateExpiredWeightDateByArticle", DateUtils.addHours(new Date(), 6));
+		}
+//		DetachedCriteria dc = dao.createDetachedCriteria();
+//		dc.createAlias("category", "category");
+//		dc.createAlias("category.site", "category.site");
+		if (article.getCategory()!=null && StringUtils.isNotBlank(article.getCategory().getId()) && !Category.isRoot(article.getCategory().getId())){
+			Category category = categoryDao.get(article.getCategory().getId());
+			if (category==null){
+				category = new Category();
+			}
+			category.setParentIds(category.getId());
+			category.setSite(category.getSite());
+			article.setCategory(category);
+		}
+		else{
+			article.setCategory(new Category());
+		}
+//		if (StringUtils.isBlank(page.getOrderBy())){
+//			page.setOrderBy("a.weight,a.update_date desc");
+//		}
+//		return dao.find(page, dc);
+	//	article.getSqlMap().put("dsf", dataScopeFilter(article.getCurrentUser(), "o", "u"));
+		pageReuslt=super.findPage(page, article);
+		//设置缓存数据
+		redisUtils.set(findPageKey,pageReuslt);
+		return pageReuslt;
+	}
+
+	@Override
+    @Transactional(readOnly = false)
+	public void save(Article article) {
+		if (article.getArticleData().getContent()!=null){
+			article.getArticleData().setContent(StringEscapeUtils.unescapeHtml4(
+					article.getArticleData().getContent()));
+		}
+		// 如果没有审核权限，则将当前内容改为待审核状态
+		if (!UserUtils.getSubject().isPermitted("cms:article:audit")){
+			article.setDelFlag(Article.DEL_FLAG_AUDIT);
+		}
+		// 如果栏目不需要审核，则将该内容设为发布状态
+		if (article.getCategory()!=null&&StringUtils.isNotBlank(article.getCategory().getId())){
+			Category category = categoryDao.get(article.getCategory().getId());
+			if (!Global.YES.equals(category.getIsAudit())){
+				article.setDelFlag(Article.DEL_FLAG_NORMAL);
+			}
+		}
+		article.setUpdateBy(UserUtils.getUser());
+		article.setUpdateDate(new Date());
+        if (StringUtils.isNotBlank(article.getViewConfig())){
+            article.setViewConfig(StringEscapeUtils.unescapeHtml4(article.getViewConfig()));
+        }
+        
+        ArticleData articleData = new ArticleData();;
+		if (StringUtils.isBlank(article.getId())){
+			article.preInsert();
+			articleData = article.getArticleData();
+			articleData.setId(article.getId());
+			dao.insert(article);
+			articleDataDao.insert(articleData);
+		}else{
+			article.preUpdate();
+			articleData = article.getArticleData();
+			articleData.setId(article.getId());
+			dao.update(article);
+			articleDataDao.update(article.getArticleData());
+		}
+		//设置清除缓存数据
+		redisUtils.remove(RedisUtils.getIdKey(ArticleService.class.getName(),article.getId()));
+		//清除列表和页面缓存数据
+		redisUtils.removePattern(RedisUtils.getFindListKeyPattern(ArticleService.class.getName()));
+		redisUtils.removePattern(RedisUtils.getFinPageKeyPattern(ArticleService.class.getName()));
+	}
+	
+	@Transactional(readOnly = false)
+	public void delete(Article article, Boolean isRe) {
+//		dao.updateDelFlag(id, isRe!=null&&isRe?Article.DEL_FLAG_NORMAL:Article.DEL_FLAG_DELETE);
+		// 使用下面方法，以便更新索引。
+		//Article article = dao.get(id);
+		//article.setDelFlag(isRe!=null&&isRe?Article.DEL_FLAG_NORMAL:Article.DEL_FLAG_DELETE);
+		//dao.insert(article);
+		super.delete(article);
+	}
+	
+	/**
+	 * 通过编号获取内容标题
+	 * @return new Object[]{栏目Id,文章Id,文章标题}
+	 */
+	public List<Object[]> findByIds(String ids) {
+		if(ids == null){
+			return new ArrayList<Object[]>();
+		}
+		List<Object[]> list = Lists.newArrayList();
+		String[] idss = StringUtils.split(ids,",");
+		Article e = null;
+		for(int i=0;(idss.length-i)>0;i++){
+			e = dao.get(idss[i]);
+			list.add(new Object[]{e.getCategory().getId(),e.getId(),StringUtils.abbr(e.getTitle(),50)});
+		}
+		return list;
+	}
+	
+	/**
+	 * 点击数加一
+	 */
+	@Transactional(readOnly = false)
+	public void updateHitsAddOne(String id) {
+		dao.updateHitsAddOne(id);
+	}
+	
+	/**
+	 * 更新索引
+	 */
+	public void createIndex(){
+		//dao.createIndex();
+	}
+	
+	/**
+	 * 全文检索
+	 */
+	//FIXME 暂不提供检索功能
+	public Page<Article> search(Page<Article> page, String q, String categoryId, String beginDate, String endDate){
+		
+		// 设置查询条件
+//		BooleanQuery query = dao.getFullTextQuery(q, "title","keywords","description","articleData.content");
+//		
+//		// 设置过滤条件
+//		List<BooleanClause> bcList = Lists.newArrayList();
+//
+//		bcList.add(new BooleanClause(new TermQuery(new Term(Article.FIELD_DEL_FLAG, Article.DEL_FLAG_NORMAL)), Occur.MUST));
+//		if (StringUtils.isNotBlank(categoryId)){
+//			bcList.add(new BooleanClause(new TermQuery(new Term("category.ids", categoryId)), Occur.MUST));
+//		}
+//		
+//		if (StringUtils.isNotBlank(beginDate) && StringUtils.isNotBlank(endDate)) {   
+//			bcList.add(new BooleanClause(new TermRangeQuery("updateDate", beginDate.replaceAll("-", ""),
+//					endDate.replaceAll("-", ""), true, true), Occur.MUST));
+//		}   
+		
+		//BooleanQuery queryFilter = dao.getFullTextQuery((BooleanClause[])bcList.toArray(new BooleanClause[bcList.size()]));
+
+//		System.out.println(queryFilter);
+		
+		// 设置排序（默认相识度排序）
+		//FIXME 暂时不提供lucene检索
+		//Sort sort = null;//new Sort(new SortField("updateDate", SortField.DOC, true));
+		// 全文检索
+		//dao.search(page, query, queryFilter, sort);
+		// 关键字高亮
+		//dao.keywordsHighlight(query, page.getList(), 30, "title");
+		//dao.keywordsHighlight(query, page.getList(), 130, "description","articleData.content");
+		
+		return page;
+	}
+	
+}