github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/zhangdaiscott/jeecg-boot

pull/4077/head
zhangdaiscott 2022-09-29 13:49:46 +08:00
parent d5ef6106db 394c0e2caf
commit 5c00114d7c
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java
View File

@ -36,6 +36,12 @@ public class ResourceUtil {
*/ */
private final static String CLASS_PATTERN="/**/*.class"; private final static String CLASS_PATTERN="/**/*.class";
/**
* 所有枚举java类
*/
private final static String CLASS_ENMU_PATTERN="/**/*Enum.class";
/** /**
* 包路径 org.jeecg * 包路径 org.jeecg
*/ */
@ -55,7 +61,7 @@ public class ResourceUtil {
return enumDictData; return enumDictData;
} }
ResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver(); ResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver();
String pattern = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX + ClassUtils.convertClassNameToResourcePath(BASE_PACKAGE) + CLASS_PATTERN; String pattern = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX + ClassUtils.convertClassNameToResourcePath(BASE_PACKAGE) + CLASS_ENMU_PATTERN;
try { try {
Resource[] resources = resourcePatternResolver.getResources(pattern); Resource[] resources = resourcePatternResolver.getResources(pattern);
MetadataReaderFactory readerFactory = new CachingMetadataReaderFactory(resourcePatternResolver); MetadataReaderFactory readerFactory = new CachingMetadataReaderFactory(resourcePatternResolver);

3
jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/SentinelConfig.java
View File

@ -157,6 +157,9 @@ public class SentinelConfig {
if(StringUtils.isNotBlank(nacosConfigProperties.getPassword())){ if(StringUtils.isNotBlank(nacosConfigProperties.getPassword())){
properties.put(PropertyKeyConst.PASSWORD,nacosConfigProperties.getPassword()); properties.put(PropertyKeyConst.PASSWORD,nacosConfigProperties.getPassword());
} }
if(StringUtils.isNotBlank(nacosConfigProperties.getNamespace())){
properties.put(PropertyKeyConst.NAMESPACE,nacosConfigProperties.getNamespace());
}
return ConfigFactory.createConfigService(properties); return ConfigFactory.createConfigService(properties);
} }
} }