提交 904733c2 作者: yanxin

文件访问地址提取单独配置

上级 0f078e57
...@@ -14,6 +14,8 @@ import org.springframework.context.annotation.Configuration; ...@@ -14,6 +14,8 @@ import org.springframework.context.annotation.Configuration;
public class MinioConfig { public class MinioConfig {
@Value(value = "${minio.minio_url}") @Value(value = "${minio.minio_url}")
private String minioUrl; private String minioUrl;
@Value(value = "${minio.visit_url}")
private String visitUrl;
@Value(value = "${minio.minio_name}") @Value(value = "${minio.minio_name}")
private String minioName; private String minioName;
@Value(value = "${minio.minio_pass}") @Value(value = "${minio.minio_pass}")
...@@ -30,6 +32,7 @@ public class MinioConfig { ...@@ -30,6 +32,7 @@ public class MinioConfig {
minioUrl = minioUrl.concat("/"); minioUrl = minioUrl.concat("/");
} }
MinioUtil.setMinioUrl(minioUrl); MinioUtil.setMinioUrl(minioUrl);
MinioUtil.setVisitUrl(visitUrl);
MinioUtil.setMinioName(minioName); MinioUtil.setMinioName(minioName);
MinioUtil.setMinioPass(minioPass); MinioUtil.setMinioPass(minioPass);
MinioUtil.setBucketName(bucketName); MinioUtil.setBucketName(bucketName);
......
...@@ -108,7 +108,7 @@ public class KnowledgeController { ...@@ -108,7 +108,7 @@ public class KnowledgeController {
if(byId==null){ if(byId==null){
return Result.OK("文件不存在!"); return Result.OK("文件不存在!");
} }
byId.setUrlDomain(MinioUtil.getDomainUrl()); byId.setUrlDomain(MinioUtil.getVisitUrl());
return Result.OK(byId); return Result.OK(byId);
} }
/** /**
......
...@@ -908,7 +908,7 @@ class KnowledgeServiceImpl implements IKnowledgeService { ...@@ -908,7 +908,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
@Override @Override
public List<String> groupUserList(String kbKnowledgeId) { public List<String> groupUserList(String kbKnowledgeId) {
List<String> userIds = new ArrayList<>(); List<String> userIds = new ArrayList<>();
SearchRequest searchRequest = new SearchRequest(); SearchRequest searchRequest = new SearchRequest(Constants.ES_DATA_FOR_KNOWLEDGE);
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
searchSourceBuilder.size(0); searchSourceBuilder.size(0);
TermsAggregationBuilder aggTerms = AggregationBuilders.terms("userId").field("userId").size(1000); TermsAggregationBuilder aggTerms = AggregationBuilders.terms("userId").field("userId").size(1000);
......
...@@ -20,6 +20,7 @@ import java.util.Date; ...@@ -20,6 +20,7 @@ import java.util.Date;
@Slf4j @Slf4j
public class MinioUtil { public class MinioUtil {
private static String minioUrl; private static String minioUrl;
private static String visitUrl;
private static String minioName; private static String minioName;
private static String minioPass; private static String minioPass;
private static String bucketName; private static String bucketName;
...@@ -28,6 +29,10 @@ public class MinioUtil { ...@@ -28,6 +29,10 @@ public class MinioUtil {
MinioUtil.minioUrl = minioUrl; MinioUtil.minioUrl = minioUrl;
} }
public static void setVisitUrl(String visitUrl) {
MinioUtil.visitUrl = visitUrl;
}
public static void setMinioName(String minioName) { public static void setMinioName(String minioName) {
MinioUtil.minioName = minioName; MinioUtil.minioName = minioName;
} }
...@@ -43,9 +48,11 @@ public class MinioUtil { ...@@ -43,9 +48,11 @@ public class MinioUtil {
public static String getMinioUrl() { public static String getMinioUrl() {
return minioUrl; return minioUrl;
} }
public static String getDomainUrl() {
return minioUrl.substring(0,minioUrl.lastIndexOf("/")); public static String getVisitUrl() {
return visitUrl;
} }
public static String getBucketName() { public static String getBucketName() {
return bucketName; return bucketName;
} }
......
...@@ -15,7 +15,7 @@ spring: ...@@ -15,7 +15,7 @@ spring:
password: gt@zzsn9988 password: gt@zzsn9988
elasticsearch: elasticsearch:
rest: rest:
uris: ["114.116.90.53:9200"] uris: ["1.95.69.2:9200"]
username: elastic username: elastic
password: elastic password: elastic
cloud: cloud:
...@@ -33,7 +33,7 @@ spring: ...@@ -33,7 +33,7 @@ spring:
# sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username="gangtie" password="krJZbb#S5UNR"; # sasl.jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username="gangtie" password="krJZbb#S5UNR";
redis: redis:
database: 9 database: 9
host: 114.116.90.53 host: 1.95.69.2
lettuce: lettuce:
pool: pool:
max-active: 8 #最大连接数据库连接数,设 0 为没有限制 max-active: 8 #最大连接数据库连接数,设 0 为没有限制
...@@ -41,8 +41,8 @@ spring: ...@@ -41,8 +41,8 @@ spring:
max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 min-idle: 0 #最小等待连接中的数量,设 0 为没有限制
shutdown-timeout: 100ms shutdown-timeout: 100ms
port: 6379 port: 6380
password: zzsn9988 password: RPHZgkDQ4zGJ
thymeleaf: thymeleaf:
prefix: classpath:/templates prefix: classpath:/templates
...@@ -88,6 +88,7 @@ filesize-max: 52428800 ...@@ -88,6 +88,7 @@ filesize-max: 52428800
minio: minio:
minio_url: http://1.95.13.40:19000 minio_url: http://1.95.13.40:19000
visit_url: http://1.95.13.40:88
minio_name: minioadmin minio_name: minioadmin
minio_pass: minioadmin minio_pass: minioadmin
bucketName: know bucketName: know
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论