From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/service/inter/config/ConfigService.java | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/config/ConfigService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/config/ConfigService.java
index fc67a2b..69dfdbd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/config/ConfigService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/config/ConfigService.java
@@ -2,6 +2,8 @@
import java.util.List;
+import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import org.yeshi.utils.entity.ProxyIP;
import com.yeshi.fanli.entity.common.Config;
@@ -10,7 +12,7 @@
public interface ConfigService {
- List<Config> getAllList();
+ List<Config> getAllList(SystemEnum system);
void update(List<Config> list);
@@ -18,11 +20,13 @@
void save(Config config);
- String get(String string);
+ String getValue(String string,SystemEnum system);
+
+ String getValue(ConfigKeyEnum key, SystemEnum system);
- String getByVersion(String key,String platform,int version);
+ String getByVersion(String key,String platform,int version,SystemEnum system);
- Config getConfig(String key);
+ Config getConfig(String key,SystemEnum system);
/**
* 灏忕▼搴忚缃�
@@ -31,25 +35,24 @@
* @param version
* @return
*/
- boolean xcxShow(String appId, Integer version);
+ boolean xcxShow(String appId, Integer version,SystemEnum system);
+
/**
* 灏忕▼搴忚缃�
- *
- * @param appId
- * @param version
+ * @param ghId
* @return
*/
- XCXSettingConfig getXCXInfoByGhId(String ghId);
+ XCXSettingConfig getXCXInfoByGhId(String ghId,SystemEnum system);
/**
* H5鍩熷悕閰嶇疆
*
* @return
*/
- String getH5Host();
+ String getH5Host(SystemEnum system);
- boolean iosOnLining(int version);
+ boolean iosOnLining(int version,SystemEnum system);
/**
* 鏄惁闇�瑕佸湪鏈嶅姟鍣ㄥ唴閮ㄨ浆閾�
@@ -57,28 +60,22 @@
* @return
*/
- boolean isConvertTaoBaoLinkInServer();
+ boolean isConvertTaoBaoLinkInServer(SystemEnum system);
/**
* 鑾峰彇棣栭〉鎮诞澶у浘
*
* @return
*/
- AppHomeFloatImg getAppHomeFloatImg();
+ AppHomeFloatImg getAppHomeFloatImg(SystemEnum system);
/**
* 鑾峰彇棣栭〉鎻愮ず澶у浘
*
* @return
*/
- String getAppHomeFloatNotifyImg();
+ String getAppHomeFloatNotifyImg(SystemEnum system);
- /**
- * 鑾峰彇棣栭〉weex鐨勯摼鎺�
- *
- * @return
- */
- public String getHomeWEEXUrl();
/**
* 鍚庣鏌ヨ鍒嗛〉
@@ -87,16 +84,15 @@
* @param page
* @return
*/
- public List<Config> listObjects(String key, int page);
+ public List<Config> listObjects(String key, int page,SystemEnum system);
/**
* 鍚庣鏌ヨ缁熻
- *
* @param key
- * @param page
+ * @param system
* @return
*/
- public int getCount(String key);
+ public int getCount(String key,SystemEnum system);
public Config getConfig(long id);
@@ -105,31 +101,35 @@
*
* @return
*/
- public ProxyIP getTaoBaoProxyIP();
+ public ProxyIP getTaoBaoProxyIP(SystemEnum system);
/**
* 鎼滅储鍙戠幇璇�
* @return
*/
- public String getSearchDiscoveryKeys();
+ public String getSearchDiscoveryKeys(SystemEnum system);
/**
* 鏍规嵁key鏌ヨ 鏃犵紦瀛�
* @param key
* @return
*/
- public Config getConfigBykeyNoCache(String key);
+ public Config getConfigBykeyNoCache(String key,SystemEnum system);
+
/**
* 浜戝彂鍗曟槸鍚﹀紑鍚�
- * @param uid
+ * @param key
+ * @param system
+ * @param platform
+ * @param version
* @return
*/
- public boolean isRobotCloudOpen(String key);
+ public boolean isRobotCloudOpen(String key,String platform,String version,SystemEnum system);
/**
* 娴嬭瘯鐢ㄦ埛淇℃伅
* @return
*/
- public List<String> getTestUsers();
+ public List<String> getTestUsers(SystemEnum system);
}
--
Gitblit v1.8.0