renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into obf

Browse Source
This commit is contained in:
lianlonggang
2025-07-23 16:38:35 +08:00
parent 0d6efc7a0c 36603cbda9
commit a3bf49c0fc
5 changed files with 569 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java
+551 -551
View File
File diff suppressed because it is too large Load Diff
jeecg-boot-base-core/src/main/java/org/jeecg/config/StaticConfig.java
+3 -3
View File
@@ -14,13 +14,13 @@ import org.springframework.stereotype.Component;
@Data
public class StaticConfig {
@Value("${jeecg.oss.accessKey}")
@Value("${jeecg.oss.accessKey:}")
private String accessKeyId;
@Value("${jeecg.oss.secretKey}")
@Value("${jeecg.oss.secretKey:}")
private String accessKeySecret;
@Value(value = "${spring.mail.username}")
@Value(value = "${spring.mail.username:}")
private String emailFrom;
static {
jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java
+4 -4
View File
@@ -13,13 +13,13 @@ import org.springframework.context.annotation.Configuration;
@Configuration
public class OssConfiguration {
@Value("${jeecg.oss.endpoint}")
@Value("${jeecg.oss.endpoint:}")
private String endpoint;
@Value("${jeecg.oss.accessKey}")
@Value("${jeecg.oss.accessKey:}")
private String accessKeyId;
@Value("${jeecg.oss.secretKey}")
@Value("${jeecg.oss.secretKey:}")
private String accessKeySecret;
@Value("${jeecg.oss.bucketName}")
@Value("${jeecg.oss.bucketName:}")
private String bucketName;
@Value("${jeecg.oss.staticDomain:}")
private String staticDomain;