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

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/config/ConfigService.java |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 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 bafa6b4..609d7c6 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
@@ -15,8 +15,12 @@
 	void update(List<Config> list);
 
 	void update(Config config);
+	
+	void save(Config config);
 
 	String get(String string);
+	
+	String getByVersion(String key,String platform,int version);
 
 	Config getConfig(String key);
 
@@ -92,7 +96,7 @@
 	 * @param page
 	 * @return
 	 */
-	public int getCount(String key, int page);
+	public int getCount(String key);
 
 	public Config getConfig(long id);
 
@@ -102,4 +106,30 @@
 	 * @return
 	 */
 	public ProxyIP getTaoBaoProxyIP();
+
+	/**
+	 * 鎼滅储鍙戠幇璇�
+	 * @return
+	 */
+	public String getSearchDiscoveryKeys();
+
+	/**
+	 * 鏍规嵁key鏌ヨ 鏃犵紦瀛�
+	 * @param key
+	 * @return
+	 */
+	public Config getConfigBykeyNoCache(String key);
+
+	/**
+	 * 浜戝彂鍗曟槸鍚﹀紑鍚�
+	 * @param uid
+	 * @return
+	 */
+	public boolean isRobotCloudOpen(String key,String platform,String version);
+
+	/**
+	 * 娴嬭瘯鐢ㄦ埛淇℃伅
+	 * @return
+	 */
+	public List<String> getTestUsers();
 }

--
Gitblit v1.8.0