修复字体空指针报错

dustlight-cn · Feb 22, 2021 · 9251adc · 9251adc
1 parent 820a96a
commit 9251adc
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@
 <dependency>
     <groupId>cn.dustlight.captcha</groupId>
     <artifactId>captcha-core</artifactId>
-    <version>0.0.4</version>
+    <version>0.0.5</version>
 </dependency>
 ```
 

diff --git a/captcha-core/pom.xml b/captcha-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.dustlight.captcha</groupId>
         <artifactId>captcha</artifactId>
-        <version>0.0.4</version>
+        <version>0.0.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>captcha-core</artifactId>

diff --git a/captcha-core/src/main/java/cn/dustlight/captcha/sender/SimpleImageCodeSender.java b/captcha-core/src/main/java/cn/dustlight/captcha/sender/SimpleImageCodeSender.java
@@ -1,6 +1,7 @@
 package cn.dustlight.captcha.sender;
 
 import cn.dustlight.captcha.core.Code;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
@@ -107,8 +108,13 @@ public static class DefaultImageHandler implements ImageHandler {
 
         public DefaultImageHandler(String... fontNames) {
             this.secureRandom = new SecureRandom();
-            Collection<String> availableFonts = Arrays.asList(GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames());
-            if (fontNames != null) {
+            Collection<String> availableFonts = null;
+            try {
+                availableFonts = Arrays.asList(GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames());
+            } catch (NullPointerException e) {
+                LoggerFactory.getLogger(getClass()).error("GraphicsEnvironment Error", e);
+            }
+            if (availableFonts != null && fontNames != null) {
                 for (String fn : fontNames) {
                     if (fn != null && fn.trim().length() > 0 && availableFonts.contains(fn)) {
                         this.font = fn;

diff --git a/extensions/email-sender/README.md b/extensions/email-sender/README.md
@@ -12,7 +12,7 @@
 <dependency>
     <groupId>cn.dustlight.captcha</groupId>
     <artifactId>email-sender</artifactId>
-    <version>0.0.4</version>
+    <version>0.0.5</version>
 </dependency>
 ```
 

diff --git a/extensions/email-sender/pom.xml b/extensions/email-sender/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.dustlight.captcha</groupId>
         <artifactId>captcha</artifactId>
-        <version>0.0.4</version>
+        <version>0.0.5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>email-sender</artifactId>

diff --git a/extensions/reCAPTCHA/README.md b/extensions/reCAPTCHA/README.md
@@ -13,7 +13,7 @@
 <dependency>
     <groupId>cn.dustlight.captcha</groupId>
     <artifactId>recaptcha</artifactId>
-    <version>0.0.4</version>
+    <version>0.0.5</version>
 </dependency>
 ```
 

diff --git a/extensions/reCAPTCHA/pom.xml b/extensions/reCAPTCHA/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.dustlight.captcha</groupId>
         <artifactId>captcha</artifactId>
-        <version>0.0.4</version>
+        <version>0.0.5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>recaptcha</artifactId>

diff --git a/extensions/redis-store/README.md b/extensions/redis-store/README.md
@@ -11,7 +11,7 @@
 <dependency>
     <groupId>cn.dustlight.captcha</groupId>
     <artifactId>redis-store</artifactId>
-    <version>0.0.4</version>
+    <version>0.0.5</version>
 </dependency>
 ```
 

diff --git a/extensions/redis-store/pom.xml b/extensions/redis-store/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.dustlight.captcha</groupId>
         <artifactId>captcha</artifactId>
-        <version>0.0.4</version>
+        <version>0.0.5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>redis-store</artifactId>

diff --git a/extensions/tencent-sms/README.md b/extensions/tencent-sms/README.md
@@ -20,7 +20,7 @@
 <dependency>
     <groupId>cn.dustlight.captcha</groupId>
     <artifactId>tencent-sms</artifactId>
-    <version>0.0.4</version>
+    <version>0.0.5</version>
 </dependency>
 ```
 

diff --git a/extensions/tencent-sms/pom.xml b/extensions/tencent-sms/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cn.dustlight.captcha</groupId>
         <artifactId>captcha</artifactId>
-        <version>0.0.4</version>
+        <version>0.0.5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>tencent-sms</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
     <packaging>pom</packaging>
     <groupId>cn.dustlight.captcha</groupId>
     <artifactId>captcha</artifactId>
-    <version>0.0.4</version>
+    <version>0.0.5</version>
     <name>captcha</name>
     <description>CAPTCHA service parent project for Spring Boot</description>