dsx преди 2 години
родител
ревизия
255c129b77

+ 1 - 0
4dkankan-common-utils/src/main/java/com/fdkankan/common/util/DateExtUtil.java

@@ -26,6 +26,7 @@ public class DateExtUtil extends DateUtil {
     public static final String dateStyle8 = "yyyy-MM-dd HH:mm";
     public static final String dateStyle9 = "yyyy.MM.dd";
     public static final String dateStyle10 = "yyyyMM";
+    public static final String dateStyle11 = "yyyyMMddHHmmssSSS";
 
     public static Date hoursCalculate(Date beginDate, int hours) {
         return timesCalculate(beginDate, hours, GregorianCalendar.HOUR);

+ 9 - 1
4dkankan-utils-fyun-https/src/main/java/com/fdkankan/fyun/http/HttpFileService.java

@@ -26,6 +26,7 @@ import java.net.URL;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Component
 @ConditionalOnProperty(name = "fyun.type", havingValue = "https")
@@ -323,7 +324,14 @@ public class HttpFileService extends AbstractFYunFileService {
                 throw new BusinessException(ErrorCode.FAILURE_CODE_3002);
             }
             log.info("文件列举成功,path:{}", sourcePath);
-            return JSONObject.parseArray(responseEntity.getBody().getData().toString(),String.class);
+            List<String> list = JSONObject.parseArray(responseEntity.getBody().getData().toString(),String.class);
+            return list.stream().map(str->{
+                if(str.startsWith("/")){
+                    return str.replaceFirst("/", "");
+                }
+                return str;
+            }).collect(Collectors.toList());
+
         } catch (Exception e) {
             log.error("列举文件目录失败,key=" + sourcePath, e);
             throw new BusinessException(ErrorCode.FAILURE_CODE_3002);