From 48a204f4c90a80c0bb4e5ba1f9f0f42939cadba8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 一月 2020 10:19:34 +0800
Subject: [PATCH] 用户资金记录bug修改，京东，拼多多小程序商品转链
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 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 eb95d6a..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;
@@ -72,7 +73,7 @@
public void updateApp(AcceptData acceptData, PrintWriter out) {
Map<String, String> params = new HashMap<>();
if ("android".equalsIgnoreCase(acceptData.getPlatform())) {// android鏇存柊
- acceptData.setVersion("10");
+// acceptData.setVersion("10");
params.put("method", "update");
params.put("Platform", "Android");
params.put("Version", acceptData.getVersion());
@@ -83,13 +84,6 @@
params.put("platform", "Android");
params.put("key", "a3f390d88e4c41f2747bfa2f1b5f87db");
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);
- }
} else {// IOS鏇存柊
params.put("method", "update");
params.put("Platform", "IOS");
--
Gitblit v1.8.0