oss修改

themis-backend/src/main/java/com/qmth/themis/backend/api/SysController.java

@@ -128,6 +128,7 @@ public class SysController {
         } else {
             mapParameter = ossUtil.getAliYunOssPublicDomain().getMap();
         }
+        mapParameter.put(SystemConstant.UPLOAD_TYPE, type.name());
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
         TBAttachment tbAttachment = tbAttachmentService
                 .saveAttachment(file, ServletUtil.getRequestMd5(), ServletUtil.getRequestPath(), mapParameter, type,

themis-business/src/main/java/com/qmth/themis/business/domain/AliYunOssPrivateDomain.java

@@ -1,10 +1,11 @@
 package com.qmth.themis.business.domain;
 
 import com.qmth.themis.business.constant.SystemConstant;
-import org.springframework.context.annotation.Configuration;
+import com.qmth.themis.business.enums.UploadFileEnum;
 
 import java.io.Serializable;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,7 +31,7 @@ public class AliYunOssPrivateDomain implements Serializable {
 
     private Map<String, Object> map;
 
-    public AliYunOssPrivateDomain(String privateEndpoint, String privateName, String privateAccessKeyId, String privateAccessKeySecret, String privateBucket, String privateUrl) {
+    public AliYunOssPrivateDomain(String privateEndpoint, String privateName, String privateAccessKeyId, String privateAccessKeySecret, String privateBucket, String privateUrl, Boolean oss, List<String> attachmentType) {
         this.privateEndpoint = privateEndpoint;
         this.privateName = privateName;
         this.privateAccessKeyId = privateAccessKeyId;
@@ -44,6 +45,9 @@ public class AliYunOssPrivateDomain implements Serializable {
         map.put(SystemConstant.BUCKET, this.privateBucket);
         map.put(SystemConstant.NAME, this.privateName);
         map.put(SystemConstant.URL, this.privateUrl);
+        map.put(SystemConstant.OSS, oss);
+        map.put(SystemConstant.ATTACHMENT_TYPE, attachmentType);
+        map.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.file.name());
     }
 
     public Map<String, Object> getMap() {

themis-business/src/main/java/com/qmth/themis/business/domain/AliYunOssPublicDomain.java

@@ -4,6 +4,7 @@ import com.qmth.themis.business.constant.SystemConstant;
 
 import java.io.Serializable;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -33,7 +34,7 @@ public class AliYunOssPublicDomain implements Serializable {
 
     }
 
-    public AliYunOssPublicDomain(String publicEndpoint, String publicName, String publicAccessKeyId, String publicAccessKeySecret, String publicBucket, String publicUrl) {
+    public AliYunOssPublicDomain(String publicEndpoint, String publicName, String publicAccessKeyId, String publicAccessKeySecret, String publicBucket, String publicUrl, Boolean oss, List<String> attachmentType) {
         this.publicEndpoint = publicEndpoint;
         this.publicName = publicName;
         this.publicAccessKeyId = publicAccessKeyId;
@@ -47,6 +48,8 @@ public class AliYunOssPublicDomain implements Serializable {
         map.put(SystemConstant.BUCKET, this.publicBucket);
         map.put(SystemConstant.NAME, this.publicName);
         map.put(SystemConstant.URL, this.publicUrl);
+        map.put(SystemConstant.OSS, oss);
+        map.put(SystemConstant.ATTACHMENT_TYPE, attachmentType);
     }
 
     public Map<String, Object> getMap() {

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

@@ -7,6 +7,7 @@ import com.aliyun.oss.model.*;
 import com.qmth.themis.business.domain.AliYunOssDomain;
 import com.qmth.themis.business.domain.AliYunOssPrivateDomain;
 import com.qmth.themis.business.domain.AliYunOssPublicDomain;
+import com.qmth.themis.business.domain.SysDomain;
 import com.qmth.themis.business.enums.UploadFileEnum;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
@@ -46,11 +47,11 @@ public class OssUtil {
     private AliYunOssPrivateDomain aliYunOssPrivateDomain;
 
     @Bean
-    public AliYunOssPublicDomain publicOssEnv(AliYunOssDomain aliYunOssDomain) {
+    public AliYunOssPublicDomain publicOssEnv(AliYunOssDomain aliYunOssDomain, SysDomain sysDomain) {
         aliYunOssPublicDomain = new AliYunOssPublicDomain(aliYunOssDomain.getPublicEndpoint(),
                 aliYunOssDomain.getPublicName(), aliYunOssDomain.getPublicAccessKeyId(),
                 aliYunOssDomain.getPublicAccessKeySecret(), aliYunOssDomain.getPublicBucket(),
-                aliYunOssDomain.getPublicUrl());
+                aliYunOssDomain.getPublicUrl(), sysDomain.isOss(), sysDomain.getAttachmentType());
         publicClient = new OSSClientBuilder()
                 .build(aliYunOssDomain.getPublicEndpoint(), aliYunOssDomain.getPublicAccessKeyId(),
                         aliYunOssDomain.getPublicAccessKeySecret());
@@ -58,11 +59,11 @@ public class OssUtil {
     }
 
     @Bean
-    public AliYunOssPrivateDomain privateOssEnv(AliYunOssDomain aliYunOssDomain) {
+    public AliYunOssPrivateDomain privateOssEnv(AliYunOssDomain aliYunOssDomain, SysDomain sysDomain) {
         aliYunOssPrivateDomain = new AliYunOssPrivateDomain(aliYunOssDomain.getPrivateEndpoint(),
                 aliYunOssDomain.getPrivateName(), aliYunOssDomain.getPrivateAccessKeyId(),
                 aliYunOssDomain.getPrivateAccessKeySecret(), aliYunOssDomain.getPrivateBucket(),
-                aliYunOssDomain.getPrivateUrl());
+                aliYunOssDomain.getPrivateUrl(), sysDomain.isOss(), sysDomain.getAttachmentType());
         privateClient = new OSSClientBuilder()
                 .build(aliYunOssDomain.getPrivateEndpoint(), aliYunOssDomain.getPrivateAccessKeyId(),
                         aliYunOssDomain.getPrivateAccessKeySecret());