From 055fb8d085efd7e120d69aba6c0fbb8db5867553 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 七月 2020 14:37:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 9fa526f..2d4382f 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
@@ -436,10 +436,15 @@
// 浜戝彂鍗曢摼鎺�
if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {
- // 楠岃瘉鏄惁寮�鍚�
- String cloudState = configService.getByVersion(ConfigKeyEnum.robotCloudOpen.getKey(), acceptData.getPlatform(),
- Integer.parseInt(acceptData.getVersion()));
- if (!StringUtil.isNullOrEmpty(cloudState) && "1".equals(cloudState)) {
+ boolean cloudOpen = configService.isRobotCloudOpen(ConfigKeyEnum.robotCloudOpen.getKey(),acceptData.getPlatform(), acceptData.getVersion());
+ if (!cloudOpen && uid != null) {
+ List<String> testUsers = configService.getTestUsers();
+ if (testUsers != null && testUsers.contains(uid+"")) {
+ cloudOpen = true;
+ }
+ }
+
+ if (cloudOpen) {
data.put("cloudLink", configService.get(ConfigKeyEnum.robotCloudLink.getKey()));
}
}
--
Gitblit v1.8.0