From 64bd2204be459b47e008b79073a143684140ff24 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 18:20:45 +0800
Subject: [PATCH] mapper xml文件位置移动
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SystemClientController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 5c9f6e4..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())
@@ -100,7 +102,7 @@
// 鍚屾绠＄悊config
if (ssp.getKey().equalsIgnoreCase("inviteRules")) {
- ssp.setValue(configService.get(ConfigKeyEnum.inviteRules.getKey()) );
+ ssp.setValue(configService.getValue(ConfigKeyEnum.inviteRules.getKey(),acceptData.getSystem()));
}
list.add(ssp);
--
Gitblit v1.8.0