Browse Source

update minio上传路径

18339543638 3 years ago
parent
commit
c597dc83ac

+ 9 - 3
nb-admin/src/main/resources/application-dev.yml

@@ -14,12 +14,18 @@ app:
   cachePrefix: ${app.name}:dev
 # MinIO相关配置
 minio:
-  endpoint: 192.168.100.32
+  upload:
+    endpoint: 192.168.100.32
+    port: 7001
+    secure: false
+  down:
+    endpoint: 192.168.100.32
+    port: 7001
+    secure: false
   accessKey: nbnetpump
   secretKey: tuoren123
   bucketName: ${app.name}-${profiles.active}-bucket
-  port: 7001
-  secure: false
+
 
 # 数据源配置
 spring:

+ 8 - 3
nb-admin/src/main/resources/application-prod.yml

@@ -16,9 +16,14 @@ app:
 # MinIO相关配置
 # MinIO相关配置
 minio:
-  endpoint: pca.tuoren.com
-  accessKey: tuoren
-  secretKey: Tuoren@123
+  upload:
+    endpoint: pca.tuoren.com
+    accessKey: tuoren
+    secretKey: Tuoren@123
+  down:
+    endpoint: pca.tuoren.com
+    accessKey: tuoren
+    secretKey: Tuoren@123
   bucketName: ${app.name}-${profiles.active}-bucket
   port: 5001
   secure: true

+ 3 - 2
nb-admin/src/main/resources/application.yml

@@ -3,10 +3,11 @@ spring:
     multipart:
       max-file-size: 1024MB
       max-request-size: 1024MB
+      enabled: true
   application:
     name: nb
   profiles:
-    active: dev
+    active: prod
   jackson:
     time-zone: GMT+8
 
@@ -18,7 +19,7 @@ server:
     accesslog:
       enabled: true
     max-http-post-size: -1
-    buffer-size: 512
+    buffer-size: 1024
     direct-buffers: true
     threads:
       io: 16

+ 28 - 6
nb-oss/src/main/java/com/nb/oss/strategy/MinioConfig.java

@@ -13,14 +13,36 @@ import org.springframework.stereotype.Component;
 @ConfigurationProperties(prefix = "minio")
 @Data
 public class MinioConfig {
+    /***'
+     * 上传路径
+     */
+    private String uploadEndpoint;
+
+    /***'
+     * 上传路径
+     */
+    private int uploadPort;
+    /***'
+     * 上传路径
+     */
+    private boolean uploadSecure;
+
+
+    /***'
+     * 下载路径
+     */
+    private String downEndpoint;
+
+    /***'
+     * 下载路径
+     */
+    private int downPort;
+    /***'
+     * 下载路径
+     */
+    private boolean downSecure;
 
 
-    private String endpoint;
-
-    private int port;
-
-    private boolean secure;
-
     private String accessKey;
 
     private String secretKey;

+ 1 - 1
nb-oss/src/main/java/com/nb/oss/strategy/MinioUtil.java

@@ -28,7 +28,7 @@ public class MinioUtil {
     @Bean
     private MinioClient minioClient() {
         MinioClient minioClient = MinioClient.builder()
-                .endpoint(minioConfig.getEndpoint(),minioConfig.getPort(),minioConfig.isSecure())
+                .endpoint(minioConfig.getUploadEndpoint(),minioConfig.getUploadPort(),minioConfig.isUploadSecure())
                 .credentials(minioConfig.getAccessKey(), minioConfig.getSecretKey())
                 .build();
         return minioClient;

+ 1 - 1
nb-oss/src/main/java/com/nb/oss/strategy/impl/MinioStorageStrategy.java

@@ -46,7 +46,7 @@ public class MinioStorageStrategy extends AbstractFileStorage {
         String type = FileUtil.getFileType(suffix);
         String filepath = this.getFilepath(file, bizPath);
         String url = minioUtils.uploadObject(file.getInputStream(), filepath);
-        String urlPrefix= (minioConfig.isSecure()?"https://":"http://")+minioConfig.getEndpoint()+":"+minioConfig.getPort() ;
+        String urlPrefix= (minioConfig.isUploadSecure()?"https://":"http://")+minioConfig.getDownEndpoint()+":"+minioConfig.getDownPort() ;
         name = CharSequenceUtil.isBlank(name) ? FileUtil.getFileNameNoEx(file.getOriginalFilename()) : name;
 
         SysStorage localStorage = new SysStorage(file.getName(), name, suffix,urlPrefix,url, type,