From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SystemClientController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SystemClientController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SystemClientController.java
index b16c4a7..b1a1ed8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SystemClientController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SystemClientController.java
@@ -18,6 +18,7 @@
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.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.CustomerContent;
import com.yeshi.fanli.entity.system.SystemClientParams;
import com.yeshi.fanli.log.LogHelper;
@@ -29,6 +30,7 @@
import com.yeshi.fanli.service.inter.push.IOSPushService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.util.ThreadUtil;
+import com.yeshi.fanli.util.annotation.UserActive;
import net.sf.json.JSONObject;
@@ -57,11 +59,12 @@
@Resource
private UserInfoExtraService userInfoExtraService;
+ @UserActive(uid="#uid")
@RequestMapping("getsystemclientparams")
public void getSystemClientParams(AcceptData acceptData, Long uid, String mac, HttpServletRequest request,
PrintWriter out) {
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getPackages(),acceptData.getSystem());
if (system == null) {
out.print("绯荤粺涓嶅瓨鍦�");
return;
@@ -85,9 +88,9 @@
}
if (ssp.getKey().equalsIgnoreCase("iosonling") && "ios".equalsIgnoreCase(acceptData.getPlatform())
- && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
+ && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()),acceptData.getSystem())) {
ssp.setValue("1");
- } else if (ssp.getKey().equalsIgnoreCase("home_weex_url")) {
+ } else if (ssp.getKey().equalsIgnoreCase(ConfigKeyEnum.homeWeexUrl.getKey())) {
if (("android".equalsIgnoreCase(acceptData.getPlatform())
&& Integer.parseInt(acceptData.getVersion()) < 36)) {
// 鑰佺増鏈瑆eex锛�1.5.1涔嬪墠鐨勶級
@@ -96,6 +99,12 @@
&& Integer.parseInt(acceptData.getVersion()) < 44 && system.getId().longValue() != 5L)
ssp.setValue("http://ec-1255749512.file.myqcloud.com/resource/weex/flq_index_v2.js");
}
+
+ // 鍚屾绠＄悊config
+ if (ssp.getKey().equalsIgnoreCase("inviteRules")) {
+ ssp.setValue(configService.getValue(ConfigKeyEnum.inviteRules.getKey(),acceptData.getSystem()));
+ }
+
list.add(ssp);
}
@@ -121,6 +130,7 @@
da.setMac(mac);
deviceActiveService.addDeviceActive(da);
} catch (Exception e) {
+ e.printStackTrace();
}
// 鐢ㄦ埛绛夌骇鏇存柊
--
Gitblit v1.8.0