ldeyun/RUOYI-geek
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
XSWL1018 2024-06-19 22:41:38 +08:00
parent 8a6f6a055b
commit 306eb37b5b
4 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -8,7 +8,7 @@ spring:
master: master:
url: jdbc:mysql://127.0.0.1/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://127.0.0.1/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root username: root
password: WKY20031018 password: 123456
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭

6
ruoyi-admin/src/main/resources/application-middleware.yml
View File

@ -30,6 +30,6 @@ minio:
client: client:
master: master:
url: http://localhost:9000 url: http://localhost:9000
accessKey: root accessKey:
secretKey: wky20031018 secretKey:
defaultBuket: bim-model defaultBuket: ruoyi

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -12,7 +12,7 @@ ruoyi:
addressEnabled: false addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证 # 验证码类型 math 数组计算 char 字符验证
captchaType: math captchaType: math
# 指定文件服务类型(值为disk代表使用磁盘作为文件操作服务,minio代表使用minio作为文件操作服务)
fileServer: minio fileServer: minio
# 开发环境配置 # 开发环境配置

23
ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/config/MinioConfig.java
View File

@ -1,10 +1,16 @@
package com.ruoyi.middleware.minio.config; package com.ruoyi.middleware.minio.config;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUtils;
import io.minio.MinioClient; import io.minio.MinioClient;
import io.minio.PutObjectArgs;
import io.minio.RemoveObjectArgs;
import io.minio.RemoveObjectsArgs;
import io.minio.errors.*; import io.minio.errors.*;
import io.minio.messages.Bucket; import io.minio.messages.Bucket;
import jakarta.annotation.PostConstruct; import jakarta.annotation.PostConstruct;
import org.apache.http.impl.io.EmptyInputStream;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@ -78,11 +84,6 @@ public class MinioConfig {
entity.setClient(build); entity.setClient(build);
} catch (Exception exception) { } catch (Exception exception) {
MinioClient build = MinioClient.builder().endpoint(entity.getUrl()).build(); MinioClient build = MinioClient.builder().endpoint(entity.getUrl()).build();
try {
build.listBuckets();
} catch (Exception e) {
throw new RuntimeException(e);
}
entity.setClient(build); entity.setClient(build);
} }
} }
@ -93,16 +94,8 @@ public class MinioConfig {
if(StringUtils.isEmpty(defaultBuket)){ if(StringUtils.isEmpty(defaultBuket)){
throw new RuntimeException("defaultBuket without a default value "); throw new RuntimeException("defaultBuket without a default value ");
} }
List<Bucket> buckets = entity.getClient().listBuckets(); RemoveObjectArgs remove = RemoveObjectArgs.builder().bucket(entity.getDefaultBuket()).object("test").build();
if (buckets.isEmpty()) { entity.getClient().removeObject(remove);
throw new RuntimeException("minioClient without any buket");
}
for (Bucket bucket : buckets) {
if (bucket.name().equals(entity.getDefaultBuket())) {
return;
}
}
throw new RuntimeException("configured defaultBucket does not exist");
}catch (Exception e){ }catch (Exception e){
throw new RuntimeException(e); throw new RuntimeException(e);
} }