update

landyking · Feb 5, 2018 · d1a69b8 · d1a69b8
1 parent 71e4071
commit d1a69b8
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/learn-fastdfs/src/main/java/com/github/landyking/learnFastdfs/FastdfsClientService.java b/learn-fastdfs/src/main/java/com/github/landyking/learnFastdfs/FastdfsClientService.java
@@ -91,6 +91,9 @@ public FdfsFileInfo getFileInfo(String fileId) throws IOException, MyException {
  return null;
  }
  NameValuePair[] metadata1 = client.get_metadata1(fileId);
+ if (metadata1 == null) {
+ return null;
+ }
  FdfsFileInfo rst = new FdfsFileInfo();
  rst.setFileName(getFileName(metadata1));
  rst.setFileSize(file_info1.getFileSize());

diff --git a/learn-fastdfs/src/main/resources/application.properties b/learn-fastdfs/src/main/resources/application.properties
@@ -1,5 +1,5 @@
-fastdfs.tracker_server=yepool.com:22122
-fastdfs.fastdfs.tracker_http_port=8080
+fastdfs.tracker_server=
+fastdfs.tracker_http_port=8080
 
 server.port=9090
 spring.http.multipart.max-file-size=5MB

diff --git a/learn-fastdfs/src/main/resources/logback.xml b/learn-fastdfs/src/main/resources/logback.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true">
+ <property name="log_home" value="${catalina.base:-${java.io.tmpdir:-/tmp}}/csHome/logs"/>
+ <!-- 项目发布时，为提高运行效率可以去掉stdout -->
+ <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%date{yy-MM-dd HH:mm:ss} [%thread] %-5level %logger{10}.%M\(%line\) - %msg%n</pattern>
+ </encoder>
+ </appender>
+ <appender name="logfile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <File>${log_home}/csagent.log</File>
+ <encoder>
+ <pattern>%date{yy-MM-dd HH:mm:ss} [%thread] %-5level %logger{10} - %msg%n</pattern>
+ </encoder>
+ <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+ <maxIndex>30</maxIndex>
+ <FileNamePattern>${log_home}/csagent.%i.log</FileNamePattern>
+ </rollingPolicy>
+ <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+ <MaxFileSize>100MB</MaxFileSize>
+ </triggeringPolicy>
+ <!--<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>csagent.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <maxHistory>30</maxHistory>
+ </rollingPolicy>-->
+ </appender>
+ <logger name="org.springframework.web" level="ERROR"/>
+ <logger name="com.xdja" level="INFO"/>
+ <root level="INFO">
+ <appender-ref ref="stdout"/>
+ <!--<appender-ref ref="logfile"/>-->
+ </root>
+</configuration>