From ba40a797df3e189da40126caeeb8f410ce7c1008 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Wed, 10 May 2023 17:13:44 +0800 Subject: [PATCH] =?UTF-8?q?---author:scott---date:2023-05-10---for:yml?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=B8=BA=E7=A9=BA=E5=AF=BC=E8=87=B4=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=AF=E5=8A=A8=E6=8A=A5=E9=94=99=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E9=80=A0=E5=90=8E=E6=94=AF=E6=8C=81=E5=8D=95=E4=BD=93=E9=9D=9E?= =?UTF-8?q?system=E7=8B=AC=E7=AB=8B=E5=90=AF=E5=8A=A8---?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/es/JeecgElasticsearchTemplate.java | 2 ++ .../base/controller/JeecgController.java | 12 +++++---- .../org/jeecg/common/util/DySmsHelper.java | 2 ++ .../java/org/jeecg/common/util/PmsUtil.java | 2 +- .../org/jeecg/config/JeecgBaseConfig.java | 13 ++++++++++ .../java/org/jeecg/config/StaticConfig.java | 6 ++--- .../org/jeecg/config/WebMvcConfiguration.java | 14 +++++----- .../org/jeecg/config/oss/MinioConfig.java | 2 ++ .../jeecg/config/oss/OssConfiguration.java | 2 ++ .../org/jeecg/config/vo/Elasticsearch.java | 26 +++++++++++++++++++ 10 files changed, 66 insertions(+), 15 deletions(-) create mode 100644 jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/Elasticsearch.java diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java index e30a6c85..525d461a 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java @@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils; import org.jeecg.common.util.RestUtil; import org.jeecg.common.util.oConvertUtils; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; @@ -22,6 +23,7 @@ import java.util.*; */ @Slf4j @Component +@ConditionalOnProperty(prefix = "jeecg.elasticsearch", name = "cluster-nodes") public class JeecgElasticsearchTemplate { /** es服务地址 */ private String baseUrl; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java index fdb1506b..3bb08f1b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java @@ -11,6 +11,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; +import org.jeecg.config.JeecgBaseConfig; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -23,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -40,9 +42,9 @@ public class JeecgController> { /**issues/2933 JeecgController注入service时改用protected修饰，能避免重复引用service*/ @Autowired protected S service; - - @Value("${jeecg.path.upload}") - private String upLoadPath; + @Resource + private JeecgBaseConfig jeecgBaseConfig; + /** * 导出excel * @@ -69,7 +71,7 @@ public class JeecgController> { mv.addObject(NormalExcelConstants.CLASS, clazz); //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title); - exportParams.setImageBasePath(upLoadPath); + exportParams.setImageBasePath(jeecgBaseConfig.getPath().getUpload()); //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- mv.addObject(NormalExcelConstants.PARAMS,exportParams); mv.addObject(NormalExcelConstants.DATA_LIST, exportList); @@ -108,7 +110,7 @@ public class JeecgController> { IPage pageList = service.page(page, queryWrapper); List exportList = pageList.getRecords(); Map map = new HashMap<>(5); - ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title+i,upLoadPath); + ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title+i,jeecgBaseConfig.getPath().getUpload()); exportParams.setType(ExcelType.XSSF); //map.put("title",exportParams); //表格Title diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java index 48df5678..783d7212 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java @@ -62,6 +62,8 @@ public class DySmsHelper { //update-begin-author：taoyan date:20200811 for:配置类数据获取 StaticConfig staticConfig = SpringContextUtils.getBean(StaticConfig.class); + logger.info("阿里大鱼短信秘钥 accessKeyId：" + staticConfig.getAccessKeyId()); + logger.info("阿里大鱼短信秘钥 accessKeySecret："+ staticConfig.getAccessKeySecret()); setAccessKeyId(staticConfig.getAccessKeyId()); setAccessKeySecret(staticConfig.getAccessKeySecret()); //update-end-author：taoyan date:20200811 for:配置类数据获取 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PmsUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PmsUtil.java index 09262026..6711b882 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PmsUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PmsUtil.java @@ -21,7 +21,7 @@ public class PmsUtil { private static String uploadPath; - @Value("${jeecg.path.upload}") + @Value("${jeecg.path.upload:}") public void setUploadPath(String uploadPath) { PmsUtil.uploadPath = uploadPath; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgBaseConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgBaseConfig.java index 62a995c9..7de2361b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgBaseConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgBaseConfig.java @@ -1,6 +1,7 @@ package org.jeecg.config; import org.jeecg.config.vo.DomainUrl; +import org.jeecg.config.vo.Elasticsearch; import org.jeecg.config.vo.Path; import org.jeecg.config.vo.Shiro; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -52,6 +53,18 @@ public class JeecgBaseConfig { * 文件预览 */ private String fileViewDomain; + /** + * ES配置 + */ + private Elasticsearch elasticsearch; + + public Elasticsearch getElasticsearch() { + return elasticsearch; + } + + public void setElasticsearch(Elasticsearch elasticsearch) { + this.elasticsearch = elasticsearch; + } public Boolean getSafeMode() { return safeMode; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/StaticConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/StaticConfig.java index f5ecdf1c..6b2090c9 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/StaticConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/StaticConfig.java @@ -12,13 +12,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; // /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java index d0ba9c95..3e55b737 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java @@ -25,6 +25,7 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistration; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -59,12 +60,13 @@ public class WebMvcConfiguration implements WebMvcConfigurer { */ @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { - registry.addResourceHandler("/**") - //update-begin-author:taoyan date:20211116 for: jeecg.path.webapp配置无效 #3126 - .addResourceLocations("file:" + jeecgBaseConfig.getPath().getUpload() + "//") - .addResourceLocations("file:" + jeecgBaseConfig.getPath().getWebapp() + "//") - //update-end-author:taoyan date:20211116 for: jeecg.path.webapp配置无效 #3126 - .addResourceLocations(staticLocations.split(",")); + ResourceHandlerRegistration resourceHandlerRegistration = registry.addResourceHandler("/**"); + if (jeecgBaseConfig.getPath() != null && jeecgBaseConfig.getPath().getUpload() != null) { + resourceHandlerRegistration + .addResourceLocations("file:" + jeecgBaseConfig.getPath().getUpload() + "//") + .addResourceLocations("file:" + jeecgBaseConfig.getPath().getWebapp() + "//"); + } + resourceHandlerRegistration.addResourceLocations(staticLocations.split(",")); } /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/MinioConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/MinioConfig.java index 5f308bc8..df709b13 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/MinioConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/MinioConfig.java @@ -5,6 +5,7 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.util.MinioUtil; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -14,6 +15,7 @@ import org.springframework.context.annotation.Configuration; */ @Slf4j @Configuration +@ConditionalOnProperty(prefix = "jeecg.minio.minio", name = "minio_url") public class MinioConfig { @Value(value = "${jeecg.minio.minio_url}") private String minioUrl; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java index efaa2e68..0734b95b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java @@ -2,6 +2,7 @@ package org.jeecg.config.oss; import org.jeecg.common.util.oss.OssBootUtil; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -10,6 +11,7 @@ import org.springframework.context.annotation.Configuration; * @author: jeecg-boot */ @Configuration +@ConditionalOnProperty(prefix = "jeecg.oss", name = "endpoint") public class OssConfiguration { @Value("${jeecg.oss.endpoint}") diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/Elasticsearch.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/Elasticsearch.java new file mode 100644 index 00000000..ec6fa0d3 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/Elasticsearch.java @@ -0,0 +1,26 @@ +package org.jeecg.config.vo; + +/** + * @author: scott + * @date: 2023年05月10日 16:06 + */ +public class Elasticsearch { + private String clusterNodes; + private boolean checkEnabled; + + public String getClusterNodes() { + return clusterNodes; + } + + public void setClusterNodes(String clusterNodes) { + this.clusterNodes = clusterNodes; + } + + public boolean isCheckEnabled() { + return checkEnabled; + } + + public void setCheckEnabled(boolean checkEnabled) { + this.checkEnabled = checkEnabled; + } +}