dockerfile 文件

energy-manage-service/src/main/java/com/energy/manage/service/util/MinioUtils.java

@@ -2,6 +2,7 @@ package com.energy.manage.service.util;
 
 
 import com.energy.manage.service.domain.dto.minio.ObjectItem;
+import com.xxl.job.core.util.IpUtil;
 import io.minio.*;
 import io.minio.messages.DeleteError;
 import io.minio.messages.DeleteObject;
@@ -16,6 +17,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -41,6 +43,9 @@ public class MinioUtils {
     @Value("${minio.endpoint}")
     private String endpoint;
 
+    @Value("${minio.bucketPath}")
+    private String bucketPath;
+
     /**
      * description: 判断bucket是否存在，不存在则创建
      *
@@ -172,7 +177,47 @@ public class MinioUtils {
             }
         }
 
-        return this.endpoint+"/"+this.bucketName+"/"+fileName;
+        return this.bucketPath+"/"+this.bucketName+"/"+fileName;
+    }
+
+    /**
+     * description: 单上传文件uploadRequest
+     *
+     * @param file
+     * @return: java.lang.String
+     */
+    public String upload(MultipartFile file, HttpServletRequest request) {
+
+        String fileName = file.getOriginalFilename();
+        String[] split = fileName.split("\\.");
+        if (split.length > 1) {
+            fileName = split[0] + "_" + System.currentTimeMillis() + "." + split[1];
+        } else {
+            fileName = fileName + System.currentTimeMillis();
+        }
+        InputStream in = null;
+        try {
+            in = file.getInputStream();
+            minioClient.putObject(PutObjectArgs.builder()
+                    .bucket(bucketName)
+                    .object(fileName)
+                    .stream(in, in.available(), -1)
+                    .contentType(file.getContentType())
+                    .build()
+            );
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        String ip = IPUtils.getIpAddr(request);
+        return ip +"/"+this.bucketName+"/"+fileName;
     }
 
     /**

energy-manage-service/src/main/resources/bootstrap.properties

@@ -1,7 +1,7 @@
-
+#大唐部署环境
 #============================nacos配置=========================================
-spring.cloud.nacos.config.server-addr = 192.168.50.234:8848
-spring.cloud.nacos.config.namespace = 79c42a7a-2c7d-4dcf-8a2c-b334271e2191
+spring.cloud.nacos.config.server-addr = 127.0.0.1:8848
+spring.cloud.nacos.config.namespace = 625e87f5-ead5-4867-8aa5-cb855949b2a3
 spring.cloud.nacos.config.name=application.properties
 spring.cloud.nacos.config.group = @profiles.active@
 spring.cloud.nacos.config.extension-configs[0].data-id=analysis_type_config.properties
@@ -45,6 +45,4 @@ spring.jackson.serialization.write-dates-as-timestamps=true
 
 #============================登录拦截器配置=========================================
 #拦截器是否生效
-energy.login.enabled=true
-
-
+energy.login.enabled=true