From 819f08fcbe49d94d5d359d7f155861ca2e8abebb Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 08 一月 2020 14:47:25 +0800
Subject: [PATCH] 参数trim
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 52 +++++++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
index 1d6afa3..5064364 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -27,6 +27,7 @@
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.entity.dynamic.DynamicInfo;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.dynamic.ArticleOfficialService;
@@ -371,29 +372,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);
}
}
@@ -468,7 +474,7 @@
@RequestMapping(value = "getArticleHot", method = RequestMethod.POST)
public void getArticleHot(AcceptData acceptData, PrintWriter out) {
JSONObject data = new JSONObject();
- data.put("words", configService.get("article_hot_words"));
+ data.put("words", configService.get(ConfigKeyEnum.articleHotWords.getKey()));
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0