去掉swagger

pom.xml

@@ -45,7 +45,7 @@
         <commons.codec.version>1.15</commons.codec.version>
         <jackson.version>2.11.0</jackson.version>
         <!--        <ehcache.version>2.10.6</ehcache.version>-->
-        <swagger2-bootstrap.version>1.9.6</swagger2-bootstrap.version>
+<!--        <swagger2-bootstrap.version>1.9.6</swagger2-bootstrap.version>-->
         <jetbrains.version>13.0</jetbrains.version>
         <tencentyun.version>1.1</tencentyun.version>
     </properties>
@@ -99,11 +99,11 @@
                 <artifactId>springfox-swagger2</artifactId>
                 <version>${swagger2.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.github.xiaoymin</groupId>
-                <artifactId>swagger-bootstrap-ui</artifactId>
-                <version>${swagger2-bootstrap.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.github.xiaoymin</groupId>-->
+<!--                <artifactId>swagger-bootstrap-ui</artifactId>-->
+<!--                <version>${swagger2-bootstrap.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>druid</artifactId>

themis-business/pom.xml

@@ -76,10 +76,10 @@
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.github.xiaoymin</groupId>
-			<artifactId>swagger-bootstrap-ui</artifactId>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>com.github.xiaoymin</groupId>-->
+<!--			<artifactId>swagger-bootstrap-ui</artifactId>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid</artifactId>

themis-business/src/main/java/com/qmth/themis/business/templete/TaskExportCommon.java

@@ -117,7 +117,7 @@ public class TaskExportCommon {
         if (oss) {//上传至oss
             stringJoiner.add(path).add(File.separator).add(String.valueOf(UUID.randomUUID()).replaceAll("-", ""))
                     .add(SystemConstant.EXCEL_PREFIX).toString();
-            this.ossUtil.upload(false, stringJoiner.toString(), inputStream);
+            this.ossUtil.upload(false, stringJoiner.toString(), inputStream, null);
         }
         return stringJoiner.toString();
     }

themis-business/src/main/java/com/qmth/themis/business/util/OssUtil.java

@@ -25,6 +25,7 @@ import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @Description: oss工具
@@ -103,26 +104,10 @@ public class OssUtil {
         String bucket = isPublic ? aliYunOssPublicDomain.getPublicBucket() : aliYunOssPrivateDomain.getPrivateBucket();
         OSS client = isPublic ? publicClient : privateClient;
         ObjectMetadata meta = new ObjectMetadata();
-        // 设置MD5校验。
-        meta.setContentMD5(md5);
-        // 上传内容到指定的存储空间（bucketName）并保存为指定的文件名称（objectName）。
-        PutObjectRequest putObjectRequest = new PutObjectRequest(bucket, objectName, inputStream);
-        PutObjectResult por = client.putObject(putObjectRequest);
-        log.info("objectName:{},requestid:{}", objectName, por.getRequestId());
-    }
-
-    /**
-     * oss上传数据流
-     *
-     * @param isPublic
-     * @param objectName
-     * @param inputStream
-     */
-    public void upload(boolean isPublic, String objectName, InputStream inputStream) {
-        log.info("oss  upload stream is come in");
-        String bucket = isPublic ? aliYunOssPublicDomain.getPublicBucket() : aliYunOssPrivateDomain.getPrivateBucket();
-        OSS client = isPublic ? publicClient : privateClient;
-        ObjectMetadata meta = new ObjectMetadata();
+        if (Objects.nonNull(md5)) {
+            // 设置MD5校验。
+            meta.setContentMD5(md5);
+        }
         // 上传内容到指定的存储空间（bucketName）并保存为指定的文件名称（objectName）。
         PutObjectRequest putObjectRequest = new PutObjectRequest(bucket, objectName, inputStream);
         PutObjectResult por = client.putObject(putObjectRequest);