From e40d1c22c7202aac843c66f9ee9cc000744f9e10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 15:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java
index 2e6ecd1..de4ba28 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java
@@ -1,6 +1,7 @@
 package com.yeshi.fanli.service.impl.config;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -19,6 +20,7 @@
 import com.yeshi.fanli.entity.config.AppHomeFloatImg;
 import com.yeshi.fanli.entity.system.ConfigKeyEnum;
 import com.yeshi.fanli.entity.xcx.XCXSettingConfig;
+import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
@@ -190,6 +192,37 @@
 		return value;
 	}
 
+	
+	@Cacheable(value = "config", key = "'isRobotCloudOpen'+'-'+#key+'-'+#platform+'-'+#version")
+	@Override
+	public boolean isRobotCloudOpen(String key,String platform,String version) {
+		String value = getByVersion(key, platform,Integer.parseInt(version));
+		if (StringUtil.isNullOrEmpty(value))
+			return false;
+		if ("1".equalsIgnoreCase(value.trim())) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	
+	@Cacheable(value = "config", key = "'getTestUsers'")
+	@Override
+	public List<String> getTestUsers() {
+		String value = get(ConfigKeyEnum.testUserArray.getKey());
+		if (StringUtil.isNullOrEmpty(value))
+			return null;
+		try {
+			return Arrays.asList(value.split(","));
+		} catch (Exception e) {
+			LogHelper.errorDetailInfo(e);
+		}
+		return null;
+	}
+	
+	
+	
 	@Override
 	public Config getConfig(long id) {
 		return configMapper.selectByPrimaryKey(id);

--
Gitblit v1.8.0