From 207dc8655711cddac2653e18b51e58a88dba2084 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 06 三月 2020 18:14:36 +0800
Subject: [PATCH] 发圈处理
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 1 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 e8f9325..fb61fd5 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
@@ -1,6 +1,9 @@
package com.yeshi.fanli.controller.client.v1;
import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+import java.util.Map;
import javax.annotation.Resource;
@@ -12,7 +15,11 @@
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;
+
+import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.JsonUtil;
@Controller
@@ -36,7 +43,25 @@
return;
}
- AppPageNotification ap = appPageNotificationService.getAppPageNotificationByTypeCache(type);
+ String platform = acceptData.getPlatform();
+ String version = acceptData.getVersion();
+
+ 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("");
+ no.setMd5("111111111111111111");
+ no.setPageName(ap.getPageName());
+ no.setShow(true);
+ no.setType(ap.getType());
+ no.setUpdateTime(ap.getUpdateTime());
+ no.setCanClose(false);
+ no.setContent(String.format("灏婃暚鐨勭敤鎴凤紝涓烘洿鍔犲噯纭珮鏁堢殑涓轰綘杩斿埄銆佺渷閽憋紝璇峰崌绾у埌%s鏈�鏂扮増鏈�",Constant.getAppName(platform, version)));
+ Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+ out.print(JsonUtil.loadTrueResult(gson.toJson(no)));
+ return;
+ }
+
// 娌℃湁閫氱煡
if (ap == null || !ap.getShow()) {
out.print(JsonUtil.loadFalseResult(2, "鏃犻�氱煡"));
@@ -46,4 +71,40 @@
}
}
+ @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);
+ try {
+ out.print(new String(result.getBytes("ISO-8859-1"), "UTF-8"));
+ } catch (UnsupportedEncodingException e) {
+ out.print(result);
+ }
+ }
+
}
--
Gitblit v1.8.0