From eed607d87b2eee1f09b4a28da614f3ad0b46601d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 16:14:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 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 cf041ce..4a5bc46 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
@@ -6,6 +6,7 @@
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;
@@ -14,12 +15,12 @@
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.BusinessSystem;
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.BusinessSystemService;
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;
@@ -31,7 +32,7 @@
public class SystemClientController {
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private SystemClientParamsService systemClientParamsService;
@@ -47,13 +48,13 @@
@RequestMapping("getsystemclientparams")
public void getSystemClientParams(AcceptData acceptData, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print("绯荤粺涓嶅瓨鍦�");
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;
@@ -62,20 +63,27 @@
// TODO 闇�瑕佹敼鎴愭暟鎹簱鎺у埗锛屾殏鏃跺啓鎴愯繖鏍�
List<SystemClientParams> list = new ArrayList<>();
- list.addAll(systemClientParamsList);
- for (SystemClientParams sp : list) {
- if (sp.getKey().equalsIgnoreCase("iosonling") && "ios".equalsIgnoreCase(acceptData.getPlatform())
+ 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()))) {
- sp.setValue("1");
- } else if (sp.getKey().equalsIgnoreCase("home_weex_url")) {
+ 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涔嬪墠鐨勶級
- sp.setValue("http://ec-1255749512.file.myqcloud.com/resource/weex/flq_index_v2.js");
+ 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)
- sp.setValue("http://ec-1255749512.file.myqcloud.com/resource/weex/flq_index_v2.js");
+ ssp.setValue("http://ec-1255749512.file.myqcloud.com/resource/weex/flq_index_v2.js");
}
+ list.add(ssp);
}
Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
--
Gitblit v1.8.0