From e7920b14a9baab97035a1a529da85d124a2bcacd Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 16 六月 2020 10:54:29 +0800
Subject: [PATCH] 云发单对测试用户显示
---
fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java | 74 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 11 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 75fb82d..716705f 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;
@@ -17,7 +18,9 @@
import com.yeshi.fanli.dao.mybatis.ConfigMapper;
import com.yeshi.fanli.entity.common.Config;
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;
@@ -30,6 +33,7 @@
@Resource
private ConfigMapper configMapper;
+
@Cacheable(value = "config")
public List<Config> getAllList() {
@@ -51,6 +55,9 @@
@Transactional
public void update(List<Config> list) {
for (Config config : list) {
+ if (config.getValue() == null) {
+ config.setValue("");
+ }
config.setCreatetime(new Date().getTime() + "");
configMapper.updateByPrimaryKeySelective(config);
}
@@ -58,6 +65,9 @@
@CacheEvict(value = "config", allEntries = true)
public void update(Config config) {
+ if (config.getValue() == null)
+ config.setValue("");
+
config.setCreatetime(new Date().getTime() + "");
configMapper.updateByPrimaryKeySelective(config);
}
@@ -103,7 +113,7 @@
if (version == null)
return false;
- String value = get("xcx_setting");
+ String value = get(ConfigKeyEnum.xcxSetting.getKey());
if (StringUtil.isNullOrEmpty(value))
return false;
JSONArray array = JSONArray.fromObject(value);
@@ -121,7 +131,7 @@
@Override
public XCXSettingConfig getXCXInfoByGhId(String ghId) {
- String value = get("xcx_setting");
+ String value = get(ConfigKeyEnum.xcxSetting.getKey());
JSONArray array = JSONArray.fromObject(value);
for (int i = 0; i < array.size(); i++) {
XCXSettingConfig config = new Gson().fromJson(array.optJSONObject(i).toString(), XCXSettingConfig.class);
@@ -134,7 +144,7 @@
@Override
public String getH5Host() {
- String value = get("h5_url");
+ String value = get(ConfigKeyEnum.h5Url.getKey());
String[] sts = value.split(",");
value = sts[(int) (sts.length * Math.random())];
return value.trim();
@@ -143,7 +153,7 @@
@Cacheable(value = "config", key = "'iosOnLining'+#version")
@Override
public boolean iosOnLining(int version) {
- String value = get("ios_onling_version");
+ String value = get(ConfigKeyEnum.iosOnlingVersion.getKey());
if (StringUtil.isNullOrEmpty(value))
return false;
return version >= Integer.parseInt(value);
@@ -152,7 +162,7 @@
@Cacheable(value = "config", key = "'isConvertTaoBaoLinkInServer'")
@Override
public boolean isConvertTaoBaoLinkInServer() {
- String value = get("convert_taobao_link_in_server");
+ String value = get(ConfigKeyEnum.convertTaoBaoLinkInServer.getKey());
if (StringUtil.isNullOrEmpty(value))
return false;
if ("1".equalsIgnoreCase(value.trim()))
@@ -164,7 +174,7 @@
@Cacheable(value = "config", key = "'getAppHomeFloatImg'")
@Override
public AppHomeFloatImg getAppHomeFloatImg() {
- String value = get("app_float_img");
+ String value = get(ConfigKeyEnum.appFloatImg.getKey());
if (!StringUtil.isNullOrEmpty(value)) {
Gson gson = new Gson();
AppHomeFloatImg appHomeFloatImg = gson.fromJson(value, AppHomeFloatImg.class);
@@ -178,10 +188,43 @@
@Cacheable(value = "config", key = "'getHomeWEEXUrl'")
@Override
public String getHomeWEEXUrl() {
- String value = get("home_weex_url");
+ String value = get(ConfigKeyEnum.homeWeexUrl.getKey());
return value;
}
+
+ @Cacheable(value = "config", key = "'isRobotCloudOpen'")
+ @Override
+ public boolean isRobotCloudOpen() {
+ String value = get(ConfigKeyEnum.robotCloudOpen.getKey());
+ 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);
@@ -189,7 +232,7 @@
@Override
public ProxyIP getTaoBaoProxyIP() {
- String value = get("taobao_proxy_ip");
+ String value = get(ConfigKeyEnum.taobaoProxyIP.getKey());
try {
String[] sts = value.split(":");
return new ProxyIP(sts[0], Integer.parseInt(sts[1]));
@@ -200,8 +243,7 @@
@Override
public String getAppHomeFloatNotifyImg() {
-
- return get("home_float_notify_img");
+ return get(ConfigKeyEnum.homeFloatNotifyImg.getKey());
}
@Override
@@ -215,7 +257,7 @@
@Cacheable(value = "config", key = "'getSearchDiscoveryKeys'")
@Override
public String getSearchDiscoveryKeys() {
- List<Config> list = configMapper.listByKey("search_discovery_keys", null, null);
+ List<Config> list = configMapper.listByKey(ConfigKeyEnum.searchDiscoveryKeys.getKey(), null, null);
if (list == null || list.size() == 0)
return null;
@@ -262,4 +304,14 @@
config.setCreatetime(currentTime + "");
configMapper.updateByPrimaryKeySelective(config);
}
+
+
+ @Override
+ public Config getConfigBykeyNoCache(String key) {
+ List<Config> list = configMapper.listByKey(key, null, null);
+ if (list.size() == 0) {
+ return null;
+ }
+ return list.get(0);
+ }
}
--
Gitblit v1.8.0