Przeglądaj źródła

资源库统计bug处理

pans 6 miesięcy temu
rodzic
commit
e17b93a188

+ 6 - 0
snowy-base/snowy-common/src/main/java/vip/xiaonuo/common/prop/CommonProperties.java

@@ -40,4 +40,10 @@ public class CommonProperties {
 
     private String minioUrl;
 
+
+    private String accessKey;
+
+    private String secretKey;
+
+    private String bucketName;
 }

+ 5 - 4
snowy-plugin/snowy-plugin-dev/snowy-plugin-dev-func/src/main/java/vip/xiaonuo/dev/modular/file/util/DevFileMinIoUtil.java

@@ -23,6 +23,7 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import io.minio.*;
 import io.minio.http.Method;
+import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.multipart.MultipartFile;
@@ -49,6 +50,7 @@ public class DevFileMinIoUtil {
     @Resource
     private CommonProperties commonProperties;
 
+
     private static MinioClient client;
 
     private static String defaultBucketName;
@@ -67,17 +69,16 @@ public class DevFileMinIoUtil {
      */
     private  void initClient() {
 
-        DevConfigApi devConfigApi = SpringUtil.getBean(DevConfigApi.class);
 
         /* accessKey */
-        String accessKey = devConfigApi.getValueByKey(SNOWY_FILE_MINIO_ACCESS_KEY_KEY);
+        String accessKey = commonProperties.getAccessKey();
 
         if(ObjectUtil.isEmpty(accessKey)) {
             throw new CommonException("MINIO文件操作客户端未正确配置:accessKey为空");
         }
 
         /* secretKey */
-        String secretKey = devConfigApi.getValueByKey(SNOWY_FILE_MINIO_SECRET_KEY_KEY);
+        String secretKey = commonProperties.getSecretKey();
 
         if(ObjectUtil.isEmpty(secretKey)) {
             throw new CommonException("MINIO文件操作客户端未正确配置:secretKey为空");
@@ -91,7 +92,7 @@ public class DevFileMinIoUtil {
         }
 
         /* 默认BucketName */
-        defaultBucketName = devConfigApi.getValueByKey(SNOWY_FILE_MINIO_DEFAULT_BUCKET_NAME);
+        defaultBucketName = commonProperties.getBucketName();
 
         if(ObjectUtil.isEmpty(defaultBucketName)) {
             throw new CommonException("MINIO文件操作客户端未正确配置:defaultBucketName为空");