From 0e5e21d2f3693dc993b3f49d88a275f7b226eba5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 一月 2019 17:38:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java | 12 ++++++++++++
1 files changed, 12 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 fc00d36..b706acd 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
@@ -12,6 +12,7 @@
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.yeshi.utils.entity.ProxyIP;
import com.google.gson.Gson;
import com.yeshi.fanli.dao.config.ConfigDao;
@@ -193,4 +194,15 @@
return configDao.find(Config.class, id);
}
+ @Override
+ public ProxyIP getTaoBaoProxyIP() {
+ String value = get("taobao_proxy_ip");
+ try {
+ String[] sts = value.split(":");
+ return new ProxyIP(sts[0], Integer.parseInt(sts[1]));
+ } catch (Exception e) {
+ }
+ return null;
+ }
+
}
--
Gitblit v1.8.0