From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 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 ab33d2e..473ba6d 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
@@ -71,19 +71,37 @@
@RequestMapping(value = "updateApp")
public void updateApp(AcceptData acceptData, PrintWriter out) {
Map<String, String> params = new HashMap<>();
- 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() + "");
+ 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);
- out.print(result);
+ try {
+ out.print(new String(result.getBytes("ISO-8859-1"), "UTF-8"));
+ } catch (UnsupportedEncodingException e) {
+ out.print(result);
+ }
}
}
--
Gitblit v1.8.0