release branch 1.2.1

houbb · Jul 5, 2021 · 9f63204 · 9f63204
1 parent 86ca900
commit 9f63204
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,4 +25,10 @@
 
 | 序号 | 变更类型 | 说明 | 时间 | 备注 |
 |:---|:---|:---|:---|:--|
-| 1 | F | 工具方法引入背景特性 | 2021-07-05 19:21:55 | |
+| 1 | A | 工具方法引入背景特性 | 2021-07-05 19:21:55 | |
+
+# release_1.2.1
+
+| 序号 | 变更类型 | 说明 | 时间 | 备注 |
+|:---|:---|:---|:---|:--|
+| 1 | F | 修复路径 BUG | 2021-07-05 19:21:55 | |
diff --git a/out.png b/out.png
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>com.github.houbb</groupId>
     <artifactId>word-cloud</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
 
     <properties>
         <!--============================== All Plugins START ==============================-->

diff --git a/release.bat b/release.bat
@@ -10,7 +10,7 @@ ECHO "============================= RELEASE START..."
 
 :: 版本号信息(需要手动指定)
 :::: 旧版本名称
-SET version=1.2.0
+SET version=1.2.1
 :::: 新版本名称
 SET newVersion=1.3.0
 :::: 组织名称

diff --git a/src/main/java/com/github/houbb/word/cloud/util/WordCloudHelper.java b/src/main/java/com/github/houbb/word/cloud/util/WordCloudHelper.java
@@ -1,7 +1,9 @@
 package com.github.houbb.word.cloud.util;
 
+import com.github.houbb.heaven.util.lang.StringUtil;
 import com.github.houbb.word.cloud.bs.WordCloudBs;
 import com.github.houbb.word.cloud.exception.WordCloudException;
+import com.kennycason.kumo.bg.Background;
 import com.kennycason.kumo.bg.PixelBoundryBackground;
 
 import java.io.IOException;
@@ -24,10 +26,14 @@ public static void wordCloud(final String text,
                                  final String outPath,
                                  final String backgroundImagePath) {
         try {
+            Background background = null;
+            if(StringUtil.isNotEmptyTrim(backgroundImagePath)) {
+                background = new PixelBoundryBackground(backgroundImagePath);
+            }
             WordCloudBs.newInstance()
                     .text(text)
                     .outPath(outPath)
-                    .background(new PixelBoundryBackground(backgroundImagePath))
+                    .background(background)
                     .wordCloud();
         } catch (IOException e) {
             throw new WordCloudException(e);