From f94a5a1d3fe9bde0e599d41f2d97caea1b08a88d Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 29 六月 2020 15:48:12 +0800
Subject: [PATCH] 免单调整

---
 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..d3d245a 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());
+				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