From 56e258fa6c23469ea825f6b11d458df9ba577e9f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 01 三月 2019 14:38:50 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java
index d1f71ac..14453a2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java
@@ -13,12 +13,14 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.push.DeviceActive;
import com.yeshi.fanli.entity.system.CustomerContent;
import com.yeshi.fanli.entity.system.System;
import com.yeshi.fanli.entity.system.SystemClientParams;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemClientParamsService;
import com.yeshi.fanli.service.inter.config.SystemService;
+import com.yeshi.fanli.service.inter.push.DeviceActiveService;
import com.yeshi.fanli.service.inter.push.IOSPushService;
import com.yeshi.fanli.util.ThreadUtil;
@@ -39,6 +41,9 @@
@Resource
private ConfigService configService;
+
+ @Resource
+ private DeviceActiveService deviceActiveService;
@RequestMapping("getsystemclientparams")
public void getSystemClientParams(AcceptData acceptData, PrintWriter out) {
@@ -62,7 +67,14 @@
if (sp.getKey().equalsIgnoreCase("iosonling") && "ios".equalsIgnoreCase(acceptData.getPlatform())
&& configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
sp.setValue("1");
- break;
+ } else if (sp.getKey().equalsIgnoreCase("home_weex_url")) {
+ if (("android".equalsIgnoreCase(acceptData.getPlatform())
+ && Integer.parseInt(acceptData.getVersion()) < 36)) {
+ // 鑰佺増鏈瑆eex锛�1.5.1涔嬪墠鐨勶級
+ sp.setValue("http://ec-1255749512.file.myqcloud.com/resource/weex/flq_index_v2.js");
+ } else if ("ios".equalsIgnoreCase(acceptData.getPlatform())
+ && Integer.parseInt(acceptData.getVersion()) < 44)
+ sp.setValue("http://ec-1255749512.file.myqcloud.com/resource/weex/flq_index_v2_iosold.js");
}
}
@@ -75,8 +87,15 @@
@Override
public void run() {
try {
- iosPushService.addDeviceToken(null, Integer.parseInt(acceptData.getVersion()), null,
- acceptData.getDevice());
+ // 瀹夊崜骞冲彴娣诲姞璁惧娲昏穬璁板綍
+ if ("android".equalsIgnoreCase(acceptData.getPlatform())) {
+ DeviceActive da = new DeviceActive();
+ da.setDevice(acceptData.getDevice());
+ da.setPlatform(DeviceActive.PLATFORM_ANDROID);
+ da.setVersionCode(Integer.parseInt(acceptData.getVersion()));
+ deviceActiveService.addDeviceActive(da);
+ }
+
} catch (Exception e) {
}
}
--
Gitblit v1.8.0