Browse Source

解决BUG

pull/13/head
fanshuai 1 year ago
parent
commit
84c150295c
2 changed files with 7 additions and 13 deletions
  1. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java
  2. +6
    -12
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/MinioUtil.java

+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java View File

@@ -50,7 +50,7 @@ public class K8sClientUtil {
* 3. service-account namespace * 3. service-account namespace
* 4. master endpoints(ip, port) from pre-set environment variables * 4. master endpoints(ip, port) from pre-set environment variables
*/ */
// @Autowired
@Autowired
public K8sClientUtil(@Value("${k8s.http}") String http, @Value("${k8s.token}") String token) { public K8sClientUtil(@Value("${k8s.http}") String http, @Value("${k8s.token}") String token) {
this.http = http; this.http = http;
this.token = token; this.token = token;


+ 6
- 12
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/MinioUtil.java View File

@@ -4,10 +4,11 @@ package com.ruoyi.platform.utils;
import io.minio.*; import io.minio.*;
import io.minio.errors.MinioException; import io.minio.errors.MinioException;
import io.minio.messages.Item; 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.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;


import javax.annotation.PostConstruct;
import java.io.*; import java.io.*;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.Path; import java.nio.file.Path;
@@ -18,27 +19,20 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream; import java.util.zip.ZipOutputStream;
@Slf4j
@Component @Component
public class MinioUtil { public class MinioUtil {


@Value("${minio.endpoint}")
private String minioEndpoint;

@Value("${minio.accessKey}")
private String minioAccessKey;

@Value("${minio.secretKey}")
private String minioSecretKey;
private MinioClient minioClient; 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() this.minioClient = MinioClient.builder()
.endpoint(minioEndpoint) .endpoint(minioEndpoint)
.credentials(minioAccessKey, minioSecretKey) .credentials(minioAccessKey, minioSecretKey)
.build(); .build();
} }

public void createBucket(String bucketName) throws Exception { public void createBucket(String bucketName) throws Exception {
if (!minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build())) { if (!minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build())) {
minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucketName).build()); minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucketName).build());


Loading…
Cancel
Save