From 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 15:33:00 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java
index 473ba6d..df4d4ca 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java
@@ -15,6 +15,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.help.AppPageNotification;
import com.yeshi.fanli.service.inter.help.AppPageNotificationService;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.VersionUtil;
@@ -42,7 +43,7 @@
return;
}
- AppPageNotification ap = appPageNotificationService.getAppPageNotificationByTypeCache(type);
+ AppPageNotification ap = appPageNotificationService.getValidNotificationByTypeCache(type);
if ("home".equalsIgnoreCase(type)
&& VersionUtil.smallerThan_1_5_1(acceptData.getPlatform(), acceptData.getVersion()) && ap != null) {
AppPageNotification no = new AppPageNotification();
@@ -53,7 +54,7 @@
no.setType(ap.getType());
no.setUpdateTime(ap.getUpdateTime());
no.setCanClose(false);
- no.setContent("灏婃暚鐨勭敤鎴凤紝涓烘洿鍔犲噯纭珮鏁堢殑涓轰綘杩斿埄銆佺渷閽憋紝璇峰崌绾у埌杩斿埄鍒告渶鏂扮増鏈�");
+ no.setContent(String.format("灏婃暚鐨勭敤鎴凤紝涓烘洿鍔犲噯纭珮鏁堢殑涓轰綘杩斿埄銆佺渷閽憋紝璇峰崌绾у埌%s鏈�鏂扮増鏈�",Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion())));
Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
out.print(JsonUtil.loadTrueResult(gson.toJson(no)));
return;
--
Gitblit v1.8.0