From 7abc563e709c3a7e1f7740505c30ba58c3afb920 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 12 四月 2019 12:14:30 +0800
Subject: [PATCH] bug修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 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 664e008..449f159 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,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;
@@ -34,7 +32,7 @@
public class SystemClientController {
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private SystemClientParamsService systemClientParamsService;
@@ -50,7 +48,7 @@
@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;
@@ -82,7 +80,7 @@
// 鑰佺増鏈瑆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)
+ && 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);
--
Gitblit v1.8.0