⬆️ 升级依赖版本，修复安全漏洞

src/main/java/im/zhaojun/zfile/core/config/SaTokenConfigure.java

@@ -1 +1 @@
-package im.zhaojun.zfile.core.config;
+package im.zhaojun.zfile.core.config;

src/main/java/im/zhaojun/zfile/core/httpclient/logging/HttpLoggingInterceptor.java

@@ -118,7 +118,7 @@ public final class HttpLoggingInterceptor implements Interceptor {
 		void log(String message);
 		
 		/** A {@link Logger} defaults output appropriate for the current platform. */
-		Logger DEFAULT = message -> Platform.get().log(INFO, message, null);
+		Logger DEFAULT = message -> Platform.get().log(message, INFO, null);
 		
 		Logger DEBUG = log::debug;
 		Logger TRACE = log::trace;

src/main/java/im/zhaojun/zfile/module/link/service/ShortLinkService.java

@@ -5,7 +5,7 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson2.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import im.zhaojun.zfile.core.exception.file.InvalidStorageSourceException;

src/main/java/im/zhaojun/zfile/module/storage/controller/callback/GoogleDriveCallbackController.java

@@ -2,7 +2,7 @@ package im.zhaojun.zfile.module.storage.controller.callback;
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import im.zhaojun.zfile.module.storage.model.dto.OAuth2TokenDTO;
 import io.swagger.annotations.Api;

src/main/java/im/zhaojun/zfile/module/storage/controller/helper/GoogleDriveHelperController.java

@@ -3,9 +3,9 @@ package im.zhaojun.zfile.module.storage.controller.helper;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import im.zhaojun.zfile.module.storage.model.request.GetGoogleDriveListRequest;
 import im.zhaojun.zfile.module.storage.model.result.GoogleDriveInfoResult;

src/main/java/im/zhaojun/zfile/module/storage/controller/helper/SharePointHelperController.java

@@ -4,8 +4,8 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import im.zhaojun.zfile.module.storage.model.request.SharePointSearchSitesRequest;
 import im.zhaojun.zfile.module.storage.model.request.SharePointSiteListsRequest;

src/main/java/im/zhaojun/zfile/module/storage/service/impl/DogeCloudServiceImpl.java

@@ -4,9 +4,10 @@ import cn.hutool.crypto.SecureUtil;
 import cn.hutool.http.Header;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.auth.BasicSessionCredentials;
 import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;

src/main/java/im/zhaojun/zfile/module/storage/service/impl/GoogleDriveServiceImpl.java

@@ -10,9 +10,9 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import im.zhaojun.zfile.core.exception.StorageSourceRefreshTokenException;
 import im.zhaojun.zfile.core.exception.http.HttpResponseStatusErrorException;
 import im.zhaojun.zfile.core.util.RequestHolder;

src/main/java/im/zhaojun/zfile/module/storage/service/impl/UpYunServiceImpl.java

@@ -5,7 +5,7 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 import com.UpYun;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.upyun.Params;
 import com.upyun.UpException;
 import com.upyun.UpYunUtils;

src/main/java/springfox/documentation/swagger2/web/Swagger2ControllerWebFlux.java

@@ -0,0 +1,106 @@
+/*
+ *
+ *  Copyright 2017-2018 the original author or authors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *
+ */
+
+package springfox.documentation.swagger2.web;
+
+import io.swagger.models.Swagger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.plugin.core.PluginRegistry;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.util.HtmlUtils;
+import springfox.documentation.annotations.ApiIgnore;
+import springfox.documentation.service.Documentation;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.DocumentationCache;
+import springfox.documentation.spring.web.OnReactiveWebApplication;
+import springfox.documentation.spring.web.json.Json;
+import springfox.documentation.spring.web.json.JsonSerializer;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.mappers.ServiceModelToSwagger2Mapper;
+
+import java.util.List;
+import java.util.Optional;
+
+import static org.springframework.util.MimeTypeUtils.*;
+import static springfox.documentation.swagger2.web.Swagger2ControllerWebMvc.*;
+
+@RestController
+@ApiIgnore
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
+@RequestMapping(SWAGGER2_SPECIFICATION_PATH)
+@Conditional({OnReactiveWebApplication.class})
+public class Swagger2ControllerWebFlux {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(Swagger2ControllerWebFlux.class);
+  private static final String HAL_MEDIA_TYPE = "application/hal+json";
+
+  private final DocumentationCache documentationCache;
+  private final ServiceModelToSwagger2Mapper mapper;
+  private final JsonSerializer jsonSerializer;
+  private final PluginRegistry<WebFluxSwaggerTransformationFilter, DocumentationType> transformations;
+
+  @Autowired
+  public Swagger2ControllerWebFlux(
+      DocumentationCache documentationCache,
+      ServiceModelToSwagger2Mapper mapper,
+      JsonSerializer jsonSerializer,
+      @Qualifier("webFluxSwaggerTransformationFilterRegistry")
+          PluginRegistry<WebFluxSwaggerTransformationFilter, DocumentationType> transformations) {
+    this.documentationCache = documentationCache;
+    this.mapper = mapper;
+    this.jsonSerializer = jsonSerializer;
+    this.transformations = transformations;
+  }
+
+  @RequestMapping(
+      method = RequestMethod.GET,
+      produces = {APPLICATION_JSON_VALUE, HAL_MEDIA_TYPE})
+  @ResponseBody
+  public ResponseEntity<Json> getDocumentation(
+      @RequestParam(value = "group", required = false) String swaggerGroup,
+      ServerHttpRequest request) {
+
+    String groupName = Optional.ofNullable(swaggerGroup).orElse(Docket.DEFAULT_GROUP_NAME);
+    Documentation documentation = documentationCache.documentationByGroup(groupName);
+    if (documentation == null) {
+      LOGGER.warn("Unable to find specification for group {}", HtmlUtils.htmlEscape(groupName));
+      return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+    }
+    Swagger swagger = mapper.mapDocumentation(documentation);
+    SwaggerTransformationContext<ServerHttpRequest> context
+        = new SwaggerTransformationContext<>(swagger, request);
+    List<WebFluxSwaggerTransformationFilter> filters = transformations.getPluginsFor(DocumentationType.SWAGGER_2);
+    for (WebFluxSwaggerTransformationFilter each : filters) {
+      context = context.next(each.transform(context));
+    }
+    return new ResponseEntity<>(jsonSerializer.toJson(context.getSpecification()), HttpStatus.OK);
+  }
+}

src/main/java/springfox/documentation/swagger2/web/Swagger2ControllerWebMvc.java

@@ -0,0 +1,110 @@
+/*
+ *
+ *  Copyright 2017-2018 the original author or authors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *
+ */
+
+package springfox.documentation.swagger2.web;
+
+import io.swagger.models.Swagger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.plugin.core.PluginRegistry;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.util.HtmlUtils;
+import springfox.documentation.annotations.ApiIgnore;
+import springfox.documentation.service.Documentation;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.DocumentationCache;
+import springfox.documentation.spring.web.OnServletBasedWebApplication;
+import springfox.documentation.spring.web.json.Json;
+import springfox.documentation.spring.web.json.JsonSerializer;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.mappers.ServiceModelToSwagger2Mapper;
+
+import javax.servlet.http.HttpServletRequest;
+
+import java.util.List;
+
+import static java.util.Optional.*;
+import static org.springframework.util.MimeTypeUtils.*;
+import static springfox.documentation.swagger2.web.Swagger2ControllerWebMvc.*;
+
+@ApiIgnore
+@RestController
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
+@RequestMapping(SWAGGER2_SPECIFICATION_PATH)
+@Conditional(OnServletBasedWebApplication.class)
+@Order(Ordered.HIGHEST_PRECEDENCE)
+public class Swagger2ControllerWebMvc {
+  public static final String SWAGGER2_SPECIFICATION_PATH
+      = "${springfox.documentation.swagger.v2.path:/v2/api-docs}";
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(Swagger2ControllerWebMvc.class);
+  private static final String HAL_MEDIA_TYPE = "application/hal+json";
+  private final DocumentationCache documentationCache;
+  private final ServiceModelToSwagger2Mapper mapper;
+  private final JsonSerializer jsonSerializer;
+  private final PluginRegistry<WebMvcSwaggerTransformationFilter, DocumentationType> transformations;
+
+  @Autowired
+  public Swagger2ControllerWebMvc(
+      DocumentationCache documentationCache,
+      ServiceModelToSwagger2Mapper mapper,
+      JsonSerializer jsonSerializer,
+      @Qualifier("webMvcSwaggerTransformationFilterRegistry")
+          PluginRegistry<WebMvcSwaggerTransformationFilter, DocumentationType> transformations) {
+    this.documentationCache = documentationCache;
+    this.mapper = mapper;
+    this.jsonSerializer = jsonSerializer;
+    this.transformations = transformations;
+  }
+
+  @RequestMapping(
+      method = RequestMethod.GET,
+      produces = {APPLICATION_JSON_VALUE, HAL_MEDIA_TYPE})
+  public ResponseEntity<Json> getDocumentation(
+      @RequestParam(value = "group", required = false) String swaggerGroup,
+      HttpServletRequest servletRequest) {
+
+    String groupName = ofNullable(swaggerGroup).orElse(Docket.DEFAULT_GROUP_NAME);
+    Documentation documentation = documentationCache.documentationByGroup(groupName);
+    if (documentation == null) {
+      LOGGER.warn("Unable to find specification for group {}", HtmlUtils.htmlEscape(groupName));
+      return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+    }
+    Swagger swagger = mapper.mapDocumentation(documentation);
+    SwaggerTransformationContext<HttpServletRequest> context
+        = new SwaggerTransformationContext<>(swagger, servletRequest);
+    List<WebMvcSwaggerTransformationFilter> filters = transformations.getPluginsFor(DocumentationType.SWAGGER_2);
+    for (WebMvcSwaggerTransformationFilter each : filters) {
+      context = context.next(each.transform(context));
+    }
+    return new ResponseEntity<>(jsonSerializer.toJson(context.getSpecification()), HttpStatus.OK);
+  }
+
+}