From 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 12 三月 2019 16:29:55 +0800
Subject: [PATCH] 冲突提交
---
fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 insertions(+), 10 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 dba8d0c..664e008 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
@@ -1,27 +1,31 @@
package com.yeshi.fanli.controller.client;
import java.io.PrintWriter;
+import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Properties;
import javax.annotation.Resource;
+import org.apache.commons.beanutils.PropertyUtils;
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.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.Constant;
import com.yeshi.fanli.util.ThreadUtil;
-import org.yeshi.utils.JsonUtil;
import net.sf.json.JSONObject;
@@ -41,6 +45,9 @@
@Resource
private ConfigService configService;
+ @Resource
+ private DeviceActiveService deviceActiveService;
+
@RequestMapping("getsystemclientparams")
public void getSystemClientParams(AcceptData acceptData, PrintWriter out) {
System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
@@ -49,7 +56,7 @@
return;
}
List<SystemClientParams> systemClientParamsList = systemClientParamsService
- .getSystemClientParamsBySystemId(system.getId());
+ .getSystemClientParamsBySystemId(system.getId(),Integer.parseInt(acceptData.getVersion()));
if (systemClientParamsList == null || systemClientParamsList.size() == 0) {
out.print(JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
@@ -58,13 +65,27 @@
// TODO 闇�瑕佹敼鎴愭暟鎹簱鎺у埗锛屾殏鏃跺啓鎴愯繖鏍�
List<SystemClientParams> list = new ArrayList<>();
- list.addAll(systemClientParamsList);
- for (SystemClientParams sp : list) {
- if (sp.getKey().equalsIgnoreCase("iosonling") && "ios".equalsIgnoreCase(acceptData.getPlatform())
- && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
- sp.setValue("1");
- break;
+ for (SystemClientParams sp : systemClientParamsList) {
+ SystemClientParams ssp = new SystemClientParams();
+ try {
+ PropertyUtils.copyProperties(ssp, sp);
+ } catch (Exception e) {
+
}
+
+ if (ssp.getKey().equalsIgnoreCase("iosonling") && "ios".equalsIgnoreCase(acceptData.getPlatform())
+ && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
+ ssp.setValue("1");
+ } else if (ssp.getKey().equalsIgnoreCase("home_weex_url")) {
+ if (("android".equalsIgnoreCase(acceptData.getPlatform())
+ && Integer.parseInt(acceptData.getVersion()) < 36)) {
+ // 鑰佺増鏈瑆eex锛�1.5.1涔嬪墠鐨勶級
+ ssp.setValue("http://ec-1255749512.file.myqcloud.com/resource/weex/flq_index_v2.js");
+ } else if ("ios".equalsIgnoreCase(acceptData.getPlatform())
+ && Integer.parseInt(acceptData.getVersion()) < 44)
+ ssp.setValue("http://ec-1255749512.file.myqcloud.com/resource/weex/flq_index_v2.js");
+ }
+ list.add(ssp);
}
Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
@@ -76,7 +97,15 @@
@Override
public void run() {
try {
- iosPushService.addDeviceToken(null, 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