From e283023f8193d5d9da75bcbbb0c8746d90a8985f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:26:14 +0800
Subject: [PATCH] Merge branch 'div_11'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 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 c1009de..34601eb 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,10 +1,8 @@
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;
@@ -17,12 +15,13 @@
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.CustomerContentService;
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;
@@ -34,7 +33,7 @@
public class SystemClientController {
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private SystemClientParamsService systemClientParamsService;
@@ -47,16 +46,19 @@
@Resource
private DeviceActiveService deviceActiveService;
+
+ @Resource
+ private CustomerContentService customerContentService;
@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;
@@ -73,17 +75,17 @@
}
- if (sp.getKey().equalsIgnoreCase("iosonling") && "ios".equalsIgnoreCase(acceptData.getPlatform())
+ 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");
+ && Integer.parseInt(acceptData.getVersion()) < 44&&system.getId().longValue()!=5L)
+ ssp.setValue("http://ec-1255749512.file.myqcloud.com/resource/weex/flq_index_v2.js");
}
list.add(ssp);
}
@@ -123,7 +125,7 @@
@RequestMapping("contactCustomerService")
public void contactCustomerService(AcceptData acceptData, PrintWriter out) {
String title = "鑱旂郴瀹㈡湇";
- List<CustomerContent> contentList = systemClientParamsService.contactCustomerService(title);
+ List<CustomerContent> contentList = customerContentService.contactCustomerService(title);
JSONObject data = new JSONObject();
data.put("contentList", JsonUtil.getSimpleGsonWithDate().toJson(contentList));
out.print(JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0