From 4c5b1a725a071043ff11cf7d53ba010fbe8e88a1 Mon Sep 17 00:00:00 2001
From: FanQinghui <fanqinghui100@126.com>
Date: Tue, 29 Nov 2016 10:41:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0String=E6=9E=84=E9=80=A0?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E8=A7=A3=E5=86=B3=E4=B8=8Espring?=
 =?UTF-8?q?=E9=9B=86=E6=88=90=EF=BC=8C=E5=8F=82=E6=95=B0=E4=B8=BAstring?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fastdfs/conn/DefaultCommandExecutor.java  | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/cleverframe/fastdfs/conn/DefaultCommandExecutor.java b/src/main/java/org/cleverframe/fastdfs/conn/DefaultCommandExecutor.java
index 5c2eb51..665fcf6 100644
--- a/src/main/java/org/cleverframe/fastdfs/conn/DefaultCommandExecutor.java
+++ b/src/main/java/org/cleverframe/fastdfs/conn/DefaultCommandExecutor.java
@@ -38,27 +38,15 @@ public class DefaultCommandExecutor implements CommandExecutor {
      */
     private ConnectionPool pool;
 
+
     /**
      * 构造函数
      *
-     * @param trackerStr Tracker Server服务器IP地址,格式 host:port(多个用用“,”隔开)
-     * @param pool       连接池
+     * @param trackers Tracker Server服务器IP地址集合
+     * @param pool     连接池
      */
-    public DefaultCommandExecutor(String trackerStr, ConnectionPool pool) {
-        logger.debug("初始化Tracker Server连接 {}", trackerStr);
-        Set<String> trackerSet = new HashSet<String>();
-        String[] trackerArray = StringUtils.split(trackerStr, ",");
-        for (String tracker : trackerArray) {
-            if (StringUtils.isBlank(tracker)) {
-                continue;
-            }
-            trackerSet.add(tracker.trim());
-        }
-        if (trackerSet.size() <= 0) {
-            throw new RuntimeException("Tracker Server服务器IP地址解析失败[" + trackerStr + "]");
-        }
-        this.pool = pool;
-        trackerLocator = new TrackerLocator(trackerSet);
+    public DefaultCommandExecutor(String trackers, ConnectionPool pool) {
+        this(StringUtils.string2Set(trackers, ","), pool);
     }
 
     /**
@@ -73,6 +61,7 @@ public class DefaultCommandExecutor implements CommandExecutor {
         trackerLocator = new TrackerLocator(trackerSet);
     }
 
+
     @Override
     public <T> T execute(TrackerCommand<T> command) {
         Connection conn;
-- 
Gitee


From f10aa2211d11461e58b41f3b7562396d353ff7d6 Mon Sep 17 00:00:00 2001
From: FanQinghui <fanqinghui100@126.com>
Date: Tue, 29 Nov 2016 10:42:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0string2Set=20=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=20=EF=BC=9A=E6=8A=8A=E5=AD=97=E7=AC=A6=E4=B8=B2?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=88=86=E9=9A=94=E5=88=86=E5=89=B2=EF=BC=8C?=
 =?UTF-8?q?=E5=AD=98=E6=94=BE=E5=88=B0Set=E9=87=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fastdfs/utils/StringUtils.java            | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/main/java/org/cleverframe/fastdfs/utils/StringUtils.java b/src/main/java/org/cleverframe/fastdfs/utils/StringUtils.java
index d771ce2..e967799 100644
--- a/src/main/java/org/cleverframe/fastdfs/utils/StringUtils.java
+++ b/src/main/java/org/cleverframe/fastdfs/utils/StringUtils.java
@@ -1,7 +1,9 @@
 package org.cleverframe.fastdfs.utils;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 @SuppressWarnings("Duplicates")
 public class StringUtils {
@@ -319,4 +321,25 @@ public class StringUtils {
     public static <T extends CharSequence> T defaultIfBlank(final T str, final T defaultStr) {
         return isBlank(str) ? defaultStr : str;
     }
+
+
+    /**
+     *
+     * @param source  the string to parse may be null
+     * @param separator the separate character
+     * @return
+     */
+    public static Set<String> string2Set(String source,String separator){
+        if(isBlank(source)){
+            return null;
+        }
+        Set<String> resultSet = new HashSet<String>();
+        if (!StringUtils.isBlank(source)) {
+            String[] trackerArr=source.split(separator);
+            for (String tracker:trackerArr) {
+                resultSet.add(tracker);
+            }
+        }
+        return resultSet;
+    }
 }
-- 
Gitee