From 075f6eceec6908178ba53b40b7794e2f90f74c92 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 09 一月 2019 17:40:10 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/config/ConfigService.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 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 c2e8652..bd83d88 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 org.yeshi.utils.entity.ProxyIP;
+
 import com.yeshi.fanli.entity.common.Config;
 import com.yeshi.fanli.entity.config.AppHomeFloatImg;
 import com.yeshi.fanli.entity.xcx.XCXSettingConfig;
@@ -67,4 +69,30 @@
 	 */
 	public String getHomeWEEXUrl();
 
+	/**
+	 * 鍚庣鏌ヨ鍒嗛〉
+	 * 
+	 * @param key
+	 * @param page
+	 * @return
+	 */
+	public List<Config> listObjects(String key, int page);
+
+	/**
+	 * 鍚庣鏌ヨ缁熻
+	 * 
+	 * @param key
+	 * @param page
+	 * @return
+	 */
+	public int getCount(String key, int page);
+
+	public Config getConfig(long id);
+
+	/**
+	 * 鑾峰彇娣樺疂浠ｇ悊IP
+	 * 
+	 * @return
+	 */
+	public ProxyIP getTaoBaoProxyIP();
 }

--
Gitblit v1.8.0