Merge remote-tracking branch 'origin/dev/icss' into debug

gateway-service/src/main/resources/fdfs_client.conf

@@ -1,7 +0,0 @@
-connect_timeout = 60
-network_timeout = 60
-charset = UTF-8
-http.tracker_http_port = 8080
-http.anti_steal_token = no
-
-tracker_server = 192.168.2.236:22122

icssman-service/src/main/java/com/diagbot/client/fastdfs/FastDFSClient.java

@@ -25,7 +25,7 @@ public class FastDFSClient {
 
     static {
         try {
-            String filePath = new ClassPathResource("fdfs_client.conf").getFile().getAbsolutePath();
+            String filePath = new ClassPathResource("fdfs_client.conf").getFile().getPath();
             ClientGlobal.init(filePath);
         } catch (Exception e) {
             logger.error("FastDFS Client Init Fail!", e);
@@ -114,7 +114,6 @@ public class FastDFSClient {
 
     private static StorageClient getTrackerClient() throws IOException {
         TrackerServer trackerServer = getTrackerServer();
-        logger.info("http://" + getTrackerServer().getInetSocketAddress().getHostString() + ":" + ClientGlobal.getG_tracker_http_port() + "/");
         StorageClient storageClient = new StorageClient(trackerServer, null);
         return storageClient;
     }

icssman-service/src/main/resources/fdfs_client.conf

@@ -1,5 +1,5 @@
-connect_timeout = 6000
-network_timeout = 6000
+connect_timeout = 60
+network_timeout = 60
 charset = UTF-8
 http.tracker_http_port = 8080
 http.anti_steal_token = no