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

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

@@ -34,7 +34,9 @@ public class FastDFSClientPool {
    //        ClientGlobal.init("/data/guns-separation/config/fdfs_client.conf");//测试环境固定使用
            Resource resource = new ClassPathResource("/config/fdfs_client.conf");
            InputStream inputStream = resource.getInputStream();
            File file = new File("fdfs_client.conf");
            long time = System.currentTimeMillis();
            String pathName = time + "fdfs_client.conf";
            File file = new File(pathName);
            try {
                //将读取到的类容存储到临时文件中，后面就可以用这个临时文件访问了
                FileUtils.copyInputStreamToFile(inputStream,file);
@@ -43,11 +45,25 @@ public class FastDFSClientPool {
            }
            System.out.println("********************************************************"+file.getName());
            ClientGlobal.init(file.getName());//
            deleteFolder(file);
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
    public static void deleteFolder(File folder){
        File[] files  = folder.listFiles();
        if (files != null){
            for(File f: files){
                if (f.isDirectory()){
                    deleteFolder(f);
                }else {
                    f.delete();
                }
            }
        }
        folder.delete();
    }
    public  String readfile(String file){