From 7912a94e5de72b628bde39b16e6c7b21172910eb Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 08 六月 2020 17:15:39 +0800
Subject: [PATCH] 2.1.2bug
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
index 475ed80..9fa526f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -17,7 +17,6 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.FloatAD;
import com.yeshi.fanli.entity.bus.homemodule.FloatAD.FloatADTypeEnum;
-import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserActiveLog;
@@ -437,9 +436,13 @@
// 浜戝彂鍗曢摼鎺�
if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {
- data.put("cloudLink", configService.get(ConfigKeyEnum.robotCloudLink.getKey()));
+ // 楠岃瘉鏄惁寮�鍚�
+ String cloudState = configService.getByVersion(ConfigKeyEnum.robotCloudOpen.getKey(), acceptData.getPlatform(),
+ Integer.parseInt(acceptData.getVersion()));
+ if (!StringUtil.isNullOrEmpty(cloudState) && "1".equals(cloudState)) {
+ data.put("cloudLink", configService.get(ConfigKeyEnum.robotCloudLink.getKey()));
+ }
}
-
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
--
Gitblit v1.8.0