From c07a76d3365e0eface853648816e41d7b8cb2f07 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 16 五月 2019 18:10:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 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..02c4e33 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,28 +1,29 @@
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 javax.servlet.http.HttpServletRequest;
import org.apache.commons.beanutils.PropertyUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.IPUtil;
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.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 +35,7 @@
public class SystemClientController {
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private SystemClientParamsService systemClientParamsService;
@@ -48,15 +49,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());
+ public void getSystemClientParams(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print("绯荤粺涓嶅瓨鍦�");
return;
}
List<SystemClientParams> systemClientParamsList = systemClientParamsService
- .getSystemClientParamsBySystemId(system.getId(),Integer.parseInt(acceptData.getVersion()));
+ .getSystemClientParamsBySystemId(system.getId(), Integer.parseInt(acceptData.getVersion()));
if (systemClientParamsList == null || systemClientParamsList.size() == 0) {
out.print(JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
@@ -82,7 +87,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);
@@ -93,19 +98,19 @@
data.put("count", list.size());
data.put("systemClientParamsList", gson.toJson(list));
out.print(JsonUtil.loadTrueResult(data));
+ String ipInfo = IPUtil.getRemotIP(request) + ":" + request.getRemotePort();
ThreadUtil.run(new Runnable() {
@Override
public void run() {
try {
// 瀹夊崜骞冲彴娣诲姞璁惧娲昏穬璁板綍
- 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);
- }
-
+ DeviceActive da = new DeviceActive();
+ da.setDevice(acceptData.getDevice());
+ da.setPlatform("android".equalsIgnoreCase(acceptData.getPlatform()) ? DeviceActive.PLATFORM_ANDROID
+ : DeviceActive.PLATFORM_IOS);
+ da.setVersionCode(Integer.parseInt(acceptData.getVersion()));
+ da.setIpInfo(ipInfo);
+ deviceActiveService.addDeviceActive(da);
} catch (Exception e) {
}
}
@@ -123,7 +128,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