From 84c150295c1a4c6176be22b26fbb102e2ce7dfa7 Mon Sep 17 00:00:00 2001
From: fanshuai <1141904845@qq.com>
Date: Mon, 8 Apr 2024 16:39:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/platform/utils/K8sClientUtil.java    |  2 +-
 .../com/ruoyi/platform/utils/MinioUtil.java    | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java
index e412cdde..e6386b0e 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java
@@ -50,7 +50,7 @@ public class K8sClientUtil {
      * 3. service-account namespace
      * 4. master endpoints(ip, port) from pre-set environment variables
      */
-//    @Autowired
+    @Autowired
     public K8sClientUtil(@Value("${k8s.http}") String http, @Value("${k8s.token}") String token) {
         this.http = http;
         this.token = token;
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/MinioUtil.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/MinioUtil.java
index 363f1508..ccfc1712 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/MinioUtil.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/MinioUtil.java
@@ -4,10 +4,11 @@ package com.ruoyi.platform.utils;
 import io.minio.*;
 import io.minio.errors.MinioException;
 import io.minio.messages.Item;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
@@ -18,27 +19,20 @@ import java.util.List;
 import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
+@Slf4j
 @Component
 public class MinioUtil {
 
-    @Value("${minio.endpoint}")
-    private String minioEndpoint;
-
-    @Value("${minio.accessKey}")
-    private String minioAccessKey;
-
-    @Value("${minio.secretKey}")
-    private String minioSecretKey;
     private MinioClient minioClient;
 
-    @PostConstruct
-    public void init() {
+    @Autowired
+    public MinioUtil(@Value("${minio.endpoint}")String minioEndpoint,@Value("${minio.accessKey}")String minioAccessKey,@Value("${minio.secretKey}") String minioSecretKey) {
         this.minioClient = MinioClient.builder()
                 .endpoint(minioEndpoint)
                 .credentials(minioAccessKey, minioSecretKey)
                 .build();
     }
+
     public void createBucket(String bucketName) throws Exception {
         if (!minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build())) {
             minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucketName).build());