fanli-server.git

			@@ -371,29 +371,34 @@
			if (list != null) {
			for (ArticleVO article: list) {
			String tags = article.getTags();
			if (!StringUtil.isNullOrEmpty(tags)) {
			String[] arrayTags = tags.split("\\s+");
			List<ClientTextStyleVO> labels = new ArrayList<ClientTextStyleVO>();

			String[] arrayTagsColour = null;
			String tagsColour = article.getTagsColour();
			if (!StringUtil.isNullOrEmpty(tagsColour)) {
			arrayTagsColour = tagsColour.split("\\s+");
			}

			String color = "#FE0014";
			for (int i =0; i < arrayTags.length;i ++) {
			String tag = arrayTags[i];
			if (arrayTagsColour.length == arrayTags.length) {
			color = arrayTagsColour[i];
			}
			ClientTextStyleVO styleVO = new ClientTextStyleVO();
			styleVO.setColor(color);
			styleVO.setContent(tag);
			labels.add(styleVO);
			}
			article.setLabels(labels);
			if (StringUtil.isNullOrEmpty(tags)) {
			continue;
			}

			String[] arrayTags = tags.split("\\s+");
			if (arrayTags == null \|\| arrayTags.length == 0) {
			continue;
			}

			String[] arrayTagsColour = null;
			String tagsColour = article.getTagsColour();
			if (!StringUtil.isNullOrEmpty(tagsColour)) {
			arrayTagsColour = tagsColour.split("\\s+");
			}

			String color = "#FE0014";
			List<ClientTextStyleVO> labels = new ArrayList<ClientTextStyleVO>();
			for (int i = 0; i < arrayTags.length;i ++) {
			String tag = arrayTags[i];
			if (arrayTagsColour != null && arrayTagsColour.length == arrayTags.length) {
			color = arrayTagsColour[i];
			}
			ClientTextStyleVO styleVO = new ClientTextStyleVO();
			styleVO.setColor(color);
			styleVO.setContent(tag);
			labels.add(styleVO);
			}
			article.setLabels(labels);
			}
			}

			@@ -434,6 +439,24 @@
			* @param key
			* @param out
			*/
			@RequestMapping(value = "readArticle", method = RequestMethod.POST)
			public void readArticle(AcceptData acceptData, String id, PrintWriter out) {
			if(StringUtil.isNullOrEmpty(id)) {
			out.print(JsonUtil.loadFalseResult("id不能为空"));
			return;
			}
			articleOfficialService.updateReadNum(id);
			out.print(JsonUtil.loadTrueResult("操作成功"));
			}


			/**
			* 文章搜索
			* @param acceptData
			* @param page
			* @param key
			* @param out
			*/
			@RequestMapping(value = "searchArticle", method = RequestMethod.POST)
			public void searchArticle(AcceptData acceptData, Integer page, String key, PrintWriter out) {
			getArticleList(acceptData, page, key, true, out);