From 010760fd974453a70948fef465284d8c817314f5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 25 三月 2020 11:27:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div-1
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java | 45 ++++++++++-----------------------------------
1 files changed, 10 insertions(+), 35 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 fb61fd5..39d7cec 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
@@ -2,25 +2,22 @@
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-import java.util.Map;
import javax.annotation.Resource;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
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.service.manger.AppUpdateManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.VersionUtil;
-
-import org.yeshi.utils.HttpUtil;
-import org.yeshi.utils.JsonUtil;
@Controller
@RequestMapping("api/v1/help")
@@ -28,6 +25,9 @@
@Resource
private AppPageNotificationService appPageNotificationService;
+
+ @Resource
+ private AppUpdateManager appUpdateManager;
/**
* 鑾峰彇app椤甸潰鐨勯�氱煡
@@ -45,8 +45,9 @@
String platform = acceptData.getPlatform();
String version = acceptData.getVersion();
-
- AppPageNotification ap = appPageNotificationService.getValidNotificationByTypeCache(type,platform, Integer.parseInt(version));
+
+ AppPageNotification ap = appPageNotificationService.getValidNotificationByTypeCache(type, platform,
+ Integer.parseInt(version));
if ("home".equalsIgnoreCase(type) && VersionUtil.smallerThan_1_5_1(platform, version) && ap != null) {
AppPageNotification no = new AppPageNotification();
no.setContentUrl("");
@@ -56,7 +57,7 @@
no.setType(ap.getType());
no.setUpdateTime(ap.getUpdateTime());
no.setCanClose(false);
- no.setContent(String.format("灏婃暚鐨勭敤鎴凤紝涓烘洿鍔犲噯纭珮鏁堢殑涓轰綘杩斿埄銆佺渷閽憋紝璇峰崌绾у埌%s鏈�鏂扮増鏈�",Constant.getAppName(platform, version)));
+ no.setContent(String.format("灏婃暚鐨勭敤鎴凤紝涓烘洿鍔犲噯纭珮鏁堢殑涓轰綘杩斿埄銆佺渷閽憋紝璇峰崌绾у埌%s鏈�鏂扮増鏈�", Constant.getAppName(platform, version)));
Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
out.print(JsonUtil.loadTrueResult(gson.toJson(no)));
return;
@@ -73,33 +74,7 @@
@RequestMapping(value = "updateApp")
public void updateApp(AcceptData acceptData, PrintWriter out) {
- Map<String, String> params = new HashMap<>();
- if ("android".equalsIgnoreCase(acceptData.getPlatform())) {// android鏇存柊
-// acceptData.setVersion("10");
- params.put("method", "update");
- params.put("Platform", "Android");
- params.put("Version", acceptData.getVersion());
- params.put("device ", acceptData.getDevice());
- params.put("time", System.currentTimeMillis() + "");
- params.put("Package", acceptData.getPackages());
- params.put("device", acceptData.getDevice());
- params.put("platform", "Android");
- params.put("key", "a3f390d88e4c41f2747bfa2f1b5f87db");
- params.put("versionCode", acceptData.getVersion() + "");
- } else {// IOS鏇存柊
- params.put("method", "update");
- params.put("Platform", "IOS");
- params.put("Version", acceptData.getVersion());
- params.put("device ", acceptData.getDevice());
- params.put("time", System.currentTimeMillis() + "");
- params.put("Package", acceptData.getPackages());
- params.put("device", acceptData.getDevice());
- params.put("platform", "IOS");
- params.put("key", "32bb90e8976aab5298d5da10fe66f21d");
- params.put("versionCode", acceptData.getVersion() + "");
- }
- String url = "http://update.yeshitv.com:8090/update/update";
- String result = HttpUtil.post(url, params, null);
+ String result = appUpdateManager.getUpdateInfoCache(acceptData);
try {
out.print(new String(result.getBytes("ISO-8859-1"), "UTF-8"));
} catch (UnsupportedEncodingException e) {
--
Gitblit v1.8.0