文件上传服务

src/main/java/com/taiji/system/oss/MinIoTemplate.java

@@ -90,11 +90,11 @@ public class MinIoTemplate {
      * @return OssFile
      */
     public OssFile putObject(MultipartFile file, String bucketName, String originalFileName, boolean deduplication, String busCode) {
-        String uuidFileName = deduplication ? generateOssUuidFileName(originalFileName, busCode) : generateOssFileName(originalFileName, busCode);
+        if (!StringUtils.hasLength(bucketName)) {
+            bucketName = ossProperties.getDefaultBucketName();
+        }
+        String uuidFileName = deduplication ? generateOssUuidFileName(bucketName, originalFileName, busCode) : generateOssFileName(bucketName, originalFileName, busCode);
         try {
-            if (!StringUtils.hasLength(bucketName)) {
-                bucketName = ossProperties.getDefaultBucketName();
-            }
             InputStream inputStream = file.getInputStream();
             minioClient.putObject(PutObjectArgs.builder()
                     .bucket(bucketName)
@@ -134,7 +134,7 @@ public class MinIoTemplate {
         }
         ChannelModel data = imodel.getData();
         MinioClient minioClient = minioBuild(data);
-        String uuidFileName = deduplication ? generateOssUuidFileName(originalFileName, "") : generateOssFileName(originalFileName,"");
+        String uuidFileName = deduplication ? generateOssUuidFileName("agent-issues", originalFileName, "") : generateOssFileName("agent-issues", originalFileName,"");
         try {
             InputStream inputStream = file.getInputStream();
             minioClient.putObject(PutObjectArgs.builder()
@@ -187,7 +187,7 @@ public class MinIoTemplate {
      * @param originalFilename 原始文件名
      * @return 、
      */
-    public String generateOssUuidFileName(String originalFilename, String busCode) {
+    public String generateOssUuidFileName(String bucketName, String originalFilename, String busCode) {
         // 原始文件名前加 24位uuid + "_"
         String uuid = UUID.randomUUID().toString().replace("-", "").substring(0, 24);
         if (!StringUtils.hasLength(busCode))
@@ -202,12 +202,12 @@ public class MinIoTemplate {
      * @param originalFilename 原始文件名
      * @return 、
      */
-    public String generateOssFileName(String originalFilename, String busCode) {
+    public String generateOssFileName(String bucketName, String originalFilename, String busCode) {
         // 原始文件名前加 24位uuid + "_"
         if (!StringUtils.hasLength(busCode))
-            return DateUtil.format(new Date(), "yyyyMMdd") + StrUtil.SLASH + originalFilename;
+            return bucketName + StrUtil.SLASH + DateUtil.format(new Date(), "yyyyMMdd") + StrUtil.SLASH + originalFilename;
         else
-            return DateUtil.format(new Date(), "yyyyMMdd") + StrUtil.SLASH + busCode + StrUtil.SLASH + originalFilename;
+            return bucketName + StrUtil.SLASH + DateUtil.format(new Date(), "yyyyMMdd") + StrUtil.SLASH + busCode + StrUtil.SLASH + originalFilename;
     }
 
     /**

src/main/resources/application-prod.yml

@@ -11,8 +11,6 @@ oss:
 
   # 内网
   endpoint: http://100.64.2.113:9000
-  access-key: GtqvpOTqhWe4NRMr
-  secret-key: 7y4oeNnV8AcPqOopq9VS3lTC2EdQUFAc
-  default-bucket-name: default-bucket
-channel:
-  channelProperties: {["appId": "52188938", "data": {"accessKey": "ngHXrWydteDe2L17","SecretKey": "6nIZwuHr9d2kYnNUJXTVTRLKLAE6EvUO","bucketName": "agent-issues"}], ["appId": "52188919", "data": {"accessKey": "9ui9dR6auFRFlN8d","SecretKey": "BqVD75Sm0uiWI7OyZLl7jXkM80YpYZ6D","bucketName": "agent-issues"}], ["appId": "52106998", "data": {"accessKey": "zt2LEYdnJ3GEYDX9","SecretKey": "dGYME50FgvV07aa7cB8MZy3xrAyya9Lm","bucketName": "agent-issues"}]}
+  access-key: JxlYQgJIBE6sGfaq
+  secret-key: 1xAaPnnJHyJnixxtPoCiQW0GHL0hLjLK
+  default-bucket-name: zhywpt-issuer