upgrade(core): 2.2.4

Closes #17
pig-mesh · Oct 22, 2024 · 5eb8331 · 5eb8331
1 parent 659785b
commit 5eb8331
Show file tree

Hide file tree

Showing 28 changed files with 146 additions and 60 deletions.
diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@
 ### 3.1.gradle方式的引入
 ```groovy
 dependencies {
-    implementation 'io.springboot.plugin:easy-captcha:2.2.3'
+    implementation 'com.pig4cloud.plugin:easy-captcha:2.2.4'
 }
 ```
 
@@ -58,9 +58,9 @@ dependencies {
 ```xml
 <dependencies>
    <dependency>
-      <groupId>io.springboot.plugin</groupId>
+      <groupId>com.pig4cloud.plugin</groupId>
       <artifactId>captcha-spring-boot-starter</artifactId>
-      <version>2.2.3</version>
+      <version>2.2.4</version>
    </dependency>
 </dependencies>
 ```

diff --git a/captcha-core/pom.xml b/captcha-core/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.springboot.plugin</groupId>
+        <groupId>com.pig4cloud.plugin</groupId>
         <artifactId>easy-captcha</artifactId>
-        <version>2.2.3</version>
+        <version>2.2.4</version>
     </parent>
     <artifactId>captcha-core</artifactId>
     <name>captcha-core</name>

diff --git a/...springboot/captcha/ArithmeticCaptcha.java → .../pig4cloud/captcha/ArithmeticCaptcha.java b/...springboot/captcha/ArithmeticCaptcha.java → .../pig4cloud/captcha/ArithmeticCaptcha.java
@@ -1,6 +1,6 @@
-package io.springboot.captcha;
+package com.pig4cloud.captcha;
 
-import io.springboot.captcha.base.ArithmeticCaptchaAbstract;
+import com.pig4cloud.captcha.base.ArithmeticCaptchaAbstract;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.imageio.ImageIO;

diff --git a/...io/springboot/captcha/ChineseCaptcha.java → ...com/pig4cloud/captcha/ChineseCaptcha.java b/...io/springboot/captcha/ChineseCaptcha.java → ...com/pig4cloud/captcha/ChineseCaptcha.java
@@ -1,6 +1,6 @@
-package io.springboot.captcha;
+package com.pig4cloud.captcha;
 
-import io.springboot.captcha.base.ChineseCaptchaAbstract;
+import com.pig4cloud.captcha.base.ChineseCaptchaAbstract;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.imageio.ImageIO;

diff --git a/...springboot/captcha/ChineseGifCaptcha.java → .../pig4cloud/captcha/ChineseGifCaptcha.java b/...springboot/captcha/ChineseGifCaptcha.java → .../pig4cloud/captcha/ChineseGifCaptcha.java
@@ -1,7 +1,7 @@
-package io.springboot.captcha;
+package com.pig4cloud.captcha;
 
-import io.springboot.captcha.base.ChineseCaptchaAbstract;
-import io.springboot.captcha.utils.GifEncoder;
+import com.pig4cloud.captcha.base.ChineseCaptchaAbstract;
+import com.pig4cloud.captcha.utils.GifEncoder;
 import lombok.extern.slf4j.Slf4j;
 
 import java.awt.*;

diff --git a/...ava/io/springboot/captcha/GifCaptcha.java → ...ava/com/pig4cloud/captcha/GifCaptcha.java b/...ava/io/springboot/captcha/GifCaptcha.java → ...ava/com/pig4cloud/captcha/GifCaptcha.java
@@ -1,7 +1,7 @@
-package io.springboot.captcha;
+package com.pig4cloud.captcha;
 
-import io.springboot.captcha.base.Captcha;
-import io.springboot.captcha.utils.GifEncoder;
+import com.pig4cloud.captcha.base.Captcha;
+import com.pig4cloud.captcha.utils.GifEncoder;
 import lombok.extern.slf4j.Slf4j;
 
 import java.awt.*;

diff --git a/...va/io/springboot/captcha/SpecCaptcha.java → ...va/com/pig4cloud/captcha/SpecCaptcha.java b/...va/io/springboot/captcha/SpecCaptcha.java → ...va/com/pig4cloud/captcha/SpecCaptcha.java
@@ -1,6 +1,6 @@
-package io.springboot.captcha;
+package com.pig4cloud.captcha;
 
-import io.springboot.captcha.base.Captcha;
+import com.pig4cloud.captcha.base.Captcha;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.imageio.ImageIO;

diff --git a/...ptcha/base/ArithmeticCaptchaAbstract.java → ...ptcha/base/ArithmeticCaptchaAbstract.java b/...ptcha/base/ArithmeticCaptchaAbstract.java → ...ptcha/base/ArithmeticCaptchaAbstract.java
@@ -1,7 +1,7 @@
-package io.springboot.captcha.base;
+package com.pig4cloud.captcha.base;
 
 import com.googlecode.aviator.AviatorEvaluator;
-import io.springboot.captcha.engine.Symbol;
+import com.pig4cloud.captcha.engine.Symbol;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...a/io/springboot/captcha/base/Captcha.java → ...a/com/pig4cloud/captcha/base/Captcha.java b/...a/io/springboot/captcha/base/Captcha.java → ...a/com/pig4cloud/captcha/base/Captcha.java
@@ -1,6 +1,6 @@
-package io.springboot.captcha.base;
+package com.pig4cloud.captcha.base;
 
-import io.springboot.captcha.utils.FontsUtil;
+import com.pig4cloud.captcha.utils.FontsUtil;
 
 import java.awt.*;
 import java.awt.geom.CubicCurve2D;

diff --git a/.../captcha/base/ChineseCaptchaAbstract.java → .../captcha/base/ChineseCaptchaAbstract.java b/.../captcha/base/ChineseCaptchaAbstract.java → .../captcha/base/ChineseCaptchaAbstract.java
@@ -1,4 +1,4 @@
-package io.springboot.captcha.base;
+package com.pig4cloud.captcha.base;
 
 import java.awt.*;
 

diff --git a/...a/io/springboot/captcha/base/Randoms.java → ...a/com/pig4cloud/captcha/base/Randoms.java b/...a/io/springboot/captcha/base/Randoms.java → ...a/com/pig4cloud/captcha/base/Randoms.java
@@ -1,4 +1,4 @@
-package io.springboot.captcha.base;
+package com.pig4cloud.captcha.base;
 
 import java.security.SecureRandom;
 

diff --git a/.../io/springboot/captcha/engine/Symbol.java → .../com/pig4cloud/captcha/engine/Symbol.java b/.../io/springboot/captcha/engine/Symbol.java → .../com/pig4cloud/captcha/engine/Symbol.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.springboot.captcha.engine;
+package com.pig4cloud.captcha.engine;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

diff --git a/...aptcha/servlet/CaptchaJakartaServlet.java → ...aptcha/servlet/CaptchaJakartaServlet.java b/...aptcha/servlet/CaptchaJakartaServlet.java → ...aptcha/servlet/CaptchaJakartaServlet.java
@@ -1,6 +1,6 @@
-package io.springboot.captcha.servlet;
+package com.pig4cloud.captcha.servlet;
 
-import io.springboot.captcha.utils.CaptchaJakartaUtil;
+import com.pig4cloud.captcha.utils.CaptchaJakartaUtil;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;

diff --git a/...gboot/captcha/servlet/CaptchaServlet.java → ...cloud/captcha/servlet/CaptchaServlet.java b/...gboot/captcha/servlet/CaptchaServlet.java → ...cloud/captcha/servlet/CaptchaServlet.java
@@ -1,6 +1,6 @@
-package io.springboot.captcha.servlet;
+package com.pig4cloud.captcha.servlet;
 
-import io.springboot.captcha.utils.CaptchaUtil;
+import com.pig4cloud.captcha.utils.CaptchaUtil;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;

diff --git a/...ot/captcha/utils/AbstractCaptchaUtil.java → ...ud/captcha/utils/AbstractCaptchaUtil.java b/...ot/captcha/utils/AbstractCaptchaUtil.java → ...ud/captcha/utils/AbstractCaptchaUtil.java
@@ -1,4 +1,4 @@
-package io.springboot.captcha.utils;
+package com.pig4cloud.captcha.utils;
 
 /**
  * 图形验证码工具抽象父类

diff --git a/...oot/captcha/utils/CaptchaJakartaUtil.java → ...oud/captcha/utils/CaptchaJakartaUtil.java b/...oot/captcha/utils/CaptchaJakartaUtil.java → ...oud/captcha/utils/CaptchaJakartaUtil.java
@@ -1,8 +1,8 @@
-package io.springboot.captcha.utils;
+package com.pig4cloud.captcha.utils;
 
 
-import io.springboot.captcha.SpecCaptcha;
-import io.springboot.captcha.base.Captcha;
+import com.pig4cloud.captcha.SpecCaptcha;
+import com.pig4cloud.captcha.base.Captcha;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 

diff --git a/...springboot/captcha/utils/CaptchaUtil.java → .../pig4cloud/captcha/utils/CaptchaUtil.java b/...springboot/captcha/utils/CaptchaUtil.java → .../pig4cloud/captcha/utils/CaptchaUtil.java
@@ -1,7 +1,7 @@
-package io.springboot.captcha.utils;
+package com.pig4cloud.captcha.utils;
 
-import io.springboot.captcha.SpecCaptcha;
-import io.springboot.captcha.base.Captcha;
+import com.pig4cloud.captcha.SpecCaptcha;
+import com.pig4cloud.captcha.base.Captcha;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

diff --git a/.../io/springboot/captcha/utils/Encoder.java → .../com/pig4cloud/captcha/utils/Encoder.java b/.../io/springboot/captcha/utils/Encoder.java → .../com/pig4cloud/captcha/utils/Encoder.java
@@ -1,4 +1,4 @@
-package io.springboot.captcha.utils;
+package com.pig4cloud.captcha.utils;
 
 import java.io.IOException;
 import java.io.OutputStream;

diff --git a/...io/springboot/captcha/utils/FileUtil.java → ...com/pig4cloud/captcha/utils/FileUtil.java b/...io/springboot/captcha/utils/FileUtil.java → ...com/pig4cloud/captcha/utils/FileUtil.java
@@ -1,4 +1,4 @@
-package io.springboot.captcha.utils;
+package com.pig4cloud.captcha.utils;
 
 import java.io.*;
 import java.util.Objects;

diff --git a/...o/springboot/captcha/utils/FontsUtil.java → ...om/pig4cloud/captcha/utils/FontsUtil.java b/...o/springboot/captcha/utils/FontsUtil.java → ...om/pig4cloud/captcha/utils/FontsUtil.java
@@ -1,4 +1,4 @@
-package io.springboot.captcha.utils;
+package com.pig4cloud.captcha.utils;
 
 import java.awt.*;
 import java.io.File;
@@ -39,7 +39,8 @@ public static Font getFont(String fontName, int style, float size) {
 
         String path = System.getProperty("java.io.tmpdir");
 
-        File tempFontFile = new File(path + fontName);
+        // https://gitee.com/log4j/pig/issues/IAFW9O
+        File tempFontFile = new File(path + File.separator + fontName);
         if(!tempFontFile.exists()){
             //临时文件不存在
             copyTempFontFile(fontName, tempFontFile);

diff --git a/.../springboot/captcha/utils/GifEncoder.java → ...m/pig4cloud/captcha/utils/GifEncoder.java b/.../springboot/captcha/utils/GifEncoder.java → ...m/pig4cloud/captcha/utils/GifEncoder.java
@@ -1,4 +1,4 @@
-package io.springboot.captcha.utils;
+package com.pig4cloud.captcha.utils;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;

diff --git a/...va/io/springboot/captcha/utils/Quant.java → ...va/com/pig4cloud/captcha/utils/Quant.java b/...va/io/springboot/captcha/utils/Quant.java → ...va/com/pig4cloud/captcha/utils/Quant.java
@@ -1,4 +1,4 @@
-package io.springboot.captcha.utils;
+package com.pig4cloud.captcha.utils;
 
 /**
  *

diff --git a/captcha-core/src/test/java/com/pig4cloud/captcha/CaptchaTest.java b/captcha-core/src/test/java/com/pig4cloud/captcha/CaptchaTest.java
@@ -1,4 +1,4 @@
-package io.springboot.captcha;
+package com.pig4cloud.captcha;
 
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;

diff --git a/captcha-spring-boot-starter/pom.xml b/captcha-spring-boot-starter/pom.xml
@@ -3,9 +3,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>io.springboot.plugin</groupId>
+        <groupId>com.pig4cloud.plugin</groupId>
         <artifactId>easy-captcha</artifactId>
-        <version>2.2.3</version>
+        <version>2.2.4</version>
     </parent>
     <artifactId>captcha-spring-boot-starter</artifactId>
     <name>captcha-spring-boot-starter</name>
@@ -46,7 +46,7 @@
         </dependency>
 
         <dependency>
-            <groupId>io.springboot.plugin</groupId>
+            <groupId>com.pig4cloud.plugin</groupId>
             <artifactId>captcha-core</artifactId>
             <version>2.2.3</version>
         </dependency>

diff --git a/...oot/captcha/CaptchaAutoConfiguration.java → ...oud/captcha/CaptchaAutoConfiguration.java b/...oot/captcha/CaptchaAutoConfiguration.java → ...oud/captcha/CaptchaAutoConfiguration.java
@@ -1,7 +1,7 @@
-package io.springboot.captcha;
+package com.pig4cloud.captcha;
 
-import io.springboot.captcha.config.CaptchaEndpoint;
-import io.springboot.captcha.config.CaptchaProperties;
+import com.pig4cloud.captcha.config.CaptchaEndpoint;
+import com.pig4cloud.captcha.config.CaptchaProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;

diff --git a/...gboot/captcha/config/CaptchaEndpoint.java → ...cloud/captcha/config/CaptchaEndpoint.java b/...gboot/captcha/config/CaptchaEndpoint.java → ...cloud/captcha/config/CaptchaEndpoint.java
@@ -1,6 +1,6 @@
-package io.springboot.captcha.config;
+package com.pig4cloud.captcha.config;
 
-import io.springboot.captcha.ArithmeticCaptcha;
+import com.pig4cloud.captcha.ArithmeticCaptcha;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import net.dreamlu.mica.auto.annotation.AutoIgnore;
@@ -18,7 +18,7 @@
 @RequiredArgsConstructor
 public class CaptchaEndpoint {
 
-	private final io.springboot.captcha.config.CaptchaProperties properties;
+	private final com.pig4cloud.captcha.config.CaptchaProperties properties;
 
 	/**
 	 * 生成验证码

diff --git a/...oot/captcha/config/CaptchaProperties.java → ...oud/captcha/config/CaptchaProperties.java b/...oot/captcha/config/CaptchaProperties.java → ...oud/captcha/config/CaptchaProperties.java
@@ -1,4 +1,4 @@
-package io.springboot.captcha.config;
+package com.pig4cloud.captcha.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;