Merge branch 'master' of shikejing/guns-separation into master

guns-main/src/main/java/cn/stylefeng/guns/zjxlUtil/FastDFSClientPool.java

@@ -7,11 +7,15 @@ import org.csource.fastdfs.TrackerClient;
import org.csource.fastdfs.TrackerServer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import java.io.*;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
/**
 * Created by szx on 2015/9/19.
@@ -27,10 +31,12 @@ public class FastDFSClientPool {
    {
        try {
            
            String basePath = FastDFSClientPool.class.getResource("/").getPath();
            ClientGlobal.init("/data/guns-separation/config/fdfs_client.conf");
           ClientGlobal.init("/data/guns-separation/config/fdfs_client.conf");//测试环境固定使用
//            ClientGlobal.init(FastDFSUtil.class.getResource("/config/fdfs_client.conf").getPath());//本地
            System.out.println("FastDFSClientPool→fdfs_client.conf  ===  ");