From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 七月 2020 17:52:07 +0800
Subject: [PATCH] 多APP优化
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SystemClientController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 ad1bb65..820aae7 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
@@ -30,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;
@@ -58,6 +59,7 @@
@Resource
private UserInfoExtraService userInfoExtraService;
+ @UserActive(uid="#uid")
@RequestMapping("getsystemclientparams")
public void getSystemClientParams(AcceptData acceptData, Long uid, String mac, HttpServletRequest request,
PrintWriter out) {
@@ -86,7 +88,7 @@
}
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(ConfigKeyEnum.homeWeexUrl.getKey())) {
if (("android".equalsIgnoreCase(acceptData.getPlatform())
@@ -97,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);
}
--
Gitblit v1.8.0