更新

Author: diyhi

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>bbs</groupId>
 	<artifactId>bbs</artifactId>
-	<version>6.8</version>
+	<version>6.9</version>
 	<packaging>war</packaging>
 	<name>bbs</name>
 	<description/>

src/main/java/cms/bean/question/Question.java

@@ -87,6 +87,10 @@ public class Question implements Serializable{
 	/** 查看总数 **/
 	private Long viewTotal = 0L;
 
+	/** 投票主题Id **/
+	@Column(length=32)
+	private String voteThemeId;
+	
 	/** 用户名称 **/
 	@Column(length=30)
 	private String userName;
@@ -347,6 +351,16 @@ public String getMarkdownContent() {
 	public void setMarkdownContent(String markdownContent) {
 		this.markdownContent = markdownContent;
 	}
+
+
+	public String getVoteThemeId() {
+		return voteThemeId;
+	}
+
+
+	public void setVoteThemeId(String voteThemeId) {
+		this.voteThemeId = voteThemeId;
+	}
 
 
 }

src/main/java/cms/bean/setting/SystemSetting.java

@@ -214,6 +214,13 @@ public class SystemSetting implements Serializable{
 	private Integer allowMentionMaxNumber = 30;
 	/** 每用户每24小时内发送短信次数 **/
 	private Integer userSentSmsCount = 10;
+	
+	
+	/** 话题发起投票选项数量 空值为不限制  0为不允许发起投票  **/
+	private Integer topicMaxVoteOptions = 0;
+	/** 问答发起投票选项数量 空值为不限制  0为不允许发起投票  **/
+	private Integer questionMaxVoteOptions = 0;
+	
 	/** 话题编辑器标签  json **/
 	@Lob
 	private String topicEditorTag;
@@ -867,6 +874,22 @@ public void setAllowLoginAccountTypeCodeList(List<Integer> allowLoginAccountType
 		this.allowLoginAccountTypeCodeList = allowLoginAccountTypeCodeList;
 	}
 
+	public Integer getTopicMaxVoteOptions() {
+		return topicMaxVoteOptions;
+	}
+
+	public void setTopicMaxVoteOptions(Integer topicMaxVoteOptions) {
+		this.topicMaxVoteOptions = topicMaxVoteOptions;
+	}
+
+	public Integer getQuestionMaxVoteOptions() {
+		return questionMaxVoteOptions;
+	}
+
+	public void setQuestionMaxVoteOptions(Integer questionMaxVoteOptions) {
+		this.questionMaxVoteOptions = questionMaxVoteOptions;
+	}
+	
 
 
 

src/main/java/cms/bean/template/Forum_TopicRelated_TopicEssence.java

@@ -0,0 +1,52 @@
+package cms.bean.template;
+
+import java.io.Serializable;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * 版块---话题相关--话题精华
+ *
+ */
+public class Forum_TopicRelated_TopicEssence implements Serializable{
+	private static final long serialVersionUID = 5919976916881666241L;
+
+	/** 版块---话题相关--话题精华Id **/
+	private String topicEssence_id;
+	
+	/** 排序 **/
+	private Integer topicEssence_sort;
+
+	/** 每页显示记录数 **/
+	private Integer  topicEssence_maxResult;
+	/** 页码显示总数 **/
+	private Integer  topicEssence_pageCount;
+	
+	public String getTopicEssence_id() {
+		return topicEssence_id;
+	}
+	public void setTopicEssence_id(String topicEssence_id) {
+		this.topicEssence_id = topicEssence_id;
+	}
+	public Integer getTopicEssence_sort() {
+		return topicEssence_sort;
+	}
+	public void setTopicEssence_sort(Integer topicEssence_sort) {
+		this.topicEssence_sort = topicEssence_sort;
+	}
+	public Integer getTopicEssence_maxResult() {
+		return topicEssence_maxResult;
+	}
+	public void setTopicEssence_maxResult(Integer topicEssence_maxResult) {
+		this.topicEssence_maxResult = topicEssence_maxResult;
+	}
+	public Integer getTopicEssence_pageCount() {
+		return topicEssence_pageCount;
+	}
+	public void setTopicEssence_pageCount(Integer topicEssence_pageCount) {
+		this.topicEssence_pageCount = topicEssence_pageCount;
+	}
+	
+	
+	
+}

src/main/java/cms/bean/topic/Topic.java

@@ -129,6 +129,9 @@ public class Topic implements Serializable{
 	/** 发红包Id **/
 	@Column(length=32)
 	private String giveRedEnvelopeId;
+	/** 投票主题Id **/
+	@Column(length=32)
+	private String voteThemeId;
 
 	/** 是否为员工 true:员工  false:会员 **/
 	private Boolean isStaff = false;
@@ -354,5 +357,11 @@ public String getTagIdGroup() {
 	public void setTagIdGroup(String tagIdGroup) {
 		this.tagIdGroup = tagIdGroup;
 	}
+	public String getVoteThemeId() {
+		return voteThemeId;
+	}
+	public void setVoteThemeId(String voteThemeId) {
+		this.voteThemeId = voteThemeId;
+	}
 
 }

src/main/java/cms/utils/Verification.java

@@ -38,7 +38,7 @@ public class Verification {
 	private static Pattern ZIP = Pattern.compile("^[0-9]{6}$");
 
 	/** 邮箱 **/
-	private static Pattern EMAIL = Pattern.compile("^([a-zA-Z0-9]+[_|\\_|\\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\\_|\\.]?)*[a-zA-Z0-9]+\\.[a-zA-Z]{2,3}$");
+	private static Pattern EMAIL = Pattern.compile("^(?=.{1,64}@)[A-Za-z0-9_-]+(\\.[A-Za-z0-9_-]+)*@[^-][A-Za-z0-9-]+(\\.[A-Za-z0-9-]+)*(\\.[A-Za-z]{2,})$");
 
 	/** 座机 **/
 	private static Pattern PHONE = Pattern.compile("1([\\d]{10})|((\\+[0-9]{2,4})?\\(?[0-9]+\\)?-?)?[0-9]{7,8}");

src/main/java/cms/web/action/TextFilterManage.java

@@ -751,9 +751,10 @@ public Object[] filterHtml(HttpServletRequest request,String html,String item,Ed
 	 * @param html 富文本内容
 	 * @param item 项目
 	 * @param url
+	 * @param prettyPrint 是否重新格式化
 	 * @return
 	 */
-	public String processFilePath(String html,String item,String url){
+	public String processFilePath(String html,String item,String url,boolean prettyPrint){
 		if(!StringUtils.isBlank(html)){
 			Document doc = Jsoup.parseBodyFragment(html);
 
@@ -810,6 +811,7 @@ public String processFilePath(String html,String item,String url){
 					}
 				}
 			}
+			doc.outputSettings().prettyPrint(prettyPrint);
 			html = doc.body().html();
 		}
 		return html;

src/main/java/cms/web/action/common/HomeManageAction.java

@@ -4870,13 +4870,12 @@ public String likeList(ModelMap model,PageForm pageForm,
 			for(Like like : qr.getResultlist()){
 
 				if(like.getModule().equals(10) || like.getModule().equals(20) || like.getModule().equals(30)){
-					Topic topic = topicManage.queryTopicCache(like.getTopicId());//查询缓存
-					if(topic != null){
-						like.setTopicTitle(topic.getTitle());
-					}
-					
 					if(like.getModule().equals(10)){//10:话题 
-						like.setSummary(topic.getSummary());
+						Topic topic = topicManage.queryTopicCache(like.getTopicId());//查询缓存
+						if(topic != null){
+							like.setTopicTitle(topic.getTitle());
+							like.setSummary(topic.getSummary());
+						}
 					}else if(like.getModule().equals(20)){//20:评论
 						Comment comment = commentManage.query_cache_findByCommentId(like.getCommentId());//查询缓存
 						if(comment != null && comment.getStatus().equals(20)){

src/main/java/cms/web/action/fileSystem/FileManage.java

@@ -109,7 +109,7 @@ public String processRichTextFilePath(String html,String item){
 		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();  
 
 		if(html != null && !"".equals(html.trim())){
-			return textFilterManage.processFilePath(html, item, this.fileServerAddress(request));
+			return textFilterManage.processFilePath(html, item, this.fileServerAddress(request),true);
 		}
 
 		return html;

src/main/java/cms/web/action/forumCode/ForumCodeManage.java

@@ -60,6 +60,7 @@ public List<ForumCodeNode> forumCodeNodeList(String dirName){
 		childNode.add(new ForumCodeNode(1014,"删除评论","topicRelated_deleteComment_",Arrays.asList(new String[]{"集合"})));
 		childNode.add(new ForumCodeNode(1015,"删除评论回复","topicRelated_deleteReply_",Arrays.asList(new String[]{"集合"})));
 		childNode.add(new ForumCodeNode(1016,"热门话题","topicRelated_hotTopic_",Arrays.asList(new String[]{"集合"})));
+		childNode.add(new ForumCodeNode(1017,"话题精华列表","topicRelated_topicEssence_",Arrays.asList(new String[]{"分页"})));
 		forumCodeNodeList.add(new ForumCodeNode(100,"话题",childNode));//添加一级节点
 
 		//问答