feat:v1.2.1-beta1

AnswerAIL · Sep 15, 2021 · ff49c0d · ff49c0d
1 parent b4db2fb
commit ff49c0d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.github.answerail</groupId>
     <artifactId>dinger-spring-boot-starter</artifactId>
     <packaging>jar</packaging>
-    <version>1.2.1-beta</version>
+    <version>1.2.1-beta1</version>
 
     <name>dinger-spring-boot-starter</name>
     <description>Dinger-SpringBoot集成钉钉/企业微信群机器人实现消息通知中间件</description>

diff --git a/src/main/java/com/github/jaemon/dinger/config/DingerAutoConfiguration.java b/src/main/java/com/github/jaemon/dinger/config/DingerAutoConfiguration.java
@@ -26,10 +26,13 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
+import java.io.IOException;
+
 /**
  * DingerAutoConfiguration
  *
@@ -42,16 +45,15 @@
 public class DingerAutoConfiguration implements InitializingBean {
     private final DingerProperties properties;
     private final DingerRobot dingerRobot;
-    private final ResourceLoader resourceLoader;
+    private final ResourcePatternResolver resourceLoader;
 
     public DingerAutoConfiguration(
             DingerProperties dingerProperties,
-            DingerRobot dingerRobot,
-            ResourceLoader resourceLoader
+            DingerRobot dingerRobot
     ) {
         this.properties = dingerProperties;
         this.dingerRobot = dingerRobot;
-        this.resourceLoader = resourceLoader;
+        this.resourceLoader = new PathMatchingResourcePatternResolver();
     }
 
     @Bean
@@ -71,15 +73,15 @@ public void afterPropertiesSet() throws Exception {
         checkConfigFileExists();
     }
 
-    private void checkConfigFileExists() {
+    private void checkConfigFileExists() throws IOException {
 
         if (
                 StringUtils.hasText(this.properties.getDingerLocations())
         ) {
 
-            Resource resource = this.resourceLoader.getResource(this.properties.getDingerLocations());
+            Resource[] resources = this.resourceLoader.getResources(this.properties.getDingerLocations());
 
-            Assert.state(resource.exists(), "Cannot find config location: " + resource
+            Assert.state(resources.length > 0, "Cannot find config location: " + this.properties.getDingerLocations()
                     + " (please add config file or check your Dinger configuration)");
         }
     }