From 5eb8331f1190d2bc1bf35774f1a8d12ead1208c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com> Date: Tue, 22 Oct 2024 11:41:37 +0800 Subject: [PATCH] upgrade(core): 2.2.4 Closes #17 --- README.md | 6 +- captcha-core/pom.xml | 4 +- .../pig4cloud}/captcha/ArithmeticCaptcha.java | 4 +- .../pig4cloud}/captcha/ChineseCaptcha.java | 4 +- .../pig4cloud}/captcha/ChineseGifCaptcha.java | 6 +- .../pig4cloud}/captcha/GifCaptcha.java | 6 +- .../pig4cloud}/captcha/SpecCaptcha.java | 4 +- .../base/ArithmeticCaptchaAbstract.java | 4 +- .../pig4cloud}/captcha/base/Captcha.java | 4 +- .../captcha/base/ChineseCaptchaAbstract.java | 2 +- .../pig4cloud}/captcha/base/Randoms.java | 2 +- .../pig4cloud}/captcha/engine/Symbol.java | 2 +- .../servlet/CaptchaJakartaServlet.java | 4 +- .../captcha/servlet/CaptchaServlet.java | 4 +- .../captcha/utils/AbstractCaptchaUtil.java | 2 +- .../captcha/utils/CaptchaJakartaUtil.java | 6 +- .../pig4cloud}/captcha/utils/CaptchaUtil.java | 6 +- .../pig4cloud}/captcha/utils/Encoder.java | 2 +- .../pig4cloud}/captcha/utils/FileUtil.java | 2 +- .../pig4cloud}/captcha/utils/FontsUtil.java | 5 +- .../pig4cloud}/captcha/utils/GifEncoder.java | 2 +- .../pig4cloud}/captcha/utils/Quant.java | 2 +- .../com/pig4cloud/captcha/CaptchaTest.java | 2 +- captcha-spring-boot-starter/pom.xml | 6 +- .../captcha/CaptchaAutoConfiguration.java | 6 +- .../captcha/config/CaptchaEndpoint.java | 6 +- .../captcha/config/CaptchaProperties.java | 2 +- pom.xml | 101 ++++++++++++++++-- 28 files changed, 146 insertions(+), 60 deletions(-) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/ArithmeticCaptcha.java (96%) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/ChineseCaptcha.java (96%) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/ChineseGifCaptcha.java (96%) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/GifCaptcha.java (97%) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/SpecCaptcha.java (97%) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/base/ArithmeticCaptchaAbstract.java (97%) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/base/Captcha.java (98%) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/base/ChineseCaptchaAbstract.java (99%) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/base/Randoms.java (98%) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/engine/Symbol.java (97%) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/servlet/CaptchaJakartaServlet.java (88%) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/servlet/CaptchaServlet.java (89%) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/utils/AbstractCaptchaUtil.java (92%) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/utils/CaptchaJakartaUtil.java (97%) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/utils/CaptchaUtil.java (97%) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/utils/Encoder.java (99%) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/utils/FileUtil.java (98%) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/utils/FontsUtil.java (93%) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/utils/GifEncoder.java (99%) rename captcha-core/src/main/java/{io/springboot => com/pig4cloud}/captcha/utils/Quant.java (99%) rename captcha-spring-boot-starter/src/main/java/{io/springboot => com/pig4cloud}/captcha/CaptchaAutoConfiguration.java (82%) rename captcha-spring-boot-starter/src/main/java/{io/springboot => com/pig4cloud}/captcha/config/CaptchaEndpoint.java (87%) rename captcha-spring-boot-starter/src/main/java/{io/springboot => com/pig4cloud}/captcha/config/CaptchaProperties.java (92%) diff --git a/README.md b/README.md index 393560c..75bb7f4 100644 --- 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 - io.springboot.plugin + com.pig4cloud.plugin captcha-spring-boot-starter - 2.2.3 + 2.2.4 ``` diff --git a/captcha-core/pom.xml b/captcha-core/pom.xml index c0c6979..811e71c 100644 --- a/captcha-core/pom.xml +++ b/captcha-core/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - io.springboot.plugin + com.pig4cloud.plugin easy-captcha - 2.2.3 + 2.2.4 captcha-core captcha-core diff --git a/captcha-core/src/main/java/io/springboot/captcha/ArithmeticCaptcha.java b/captcha-core/src/main/java/com/pig4cloud/captcha/ArithmeticCaptcha.java similarity index 96% rename from captcha-core/src/main/java/io/springboot/captcha/ArithmeticCaptcha.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/ArithmeticCaptcha.java index 25f7f00..e02a855 100755 --- a/captcha-core/src/main/java/io/springboot/captcha/ArithmeticCaptcha.java +++ b/captcha-core/src/main/java/com/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/captcha-core/src/main/java/io/springboot/captcha/ChineseCaptcha.java b/captcha-core/src/main/java/com/pig4cloud/captcha/ChineseCaptcha.java similarity index 96% rename from captcha-core/src/main/java/io/springboot/captcha/ChineseCaptcha.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/ChineseCaptcha.java index 8787a01..548afc3 100755 --- a/captcha-core/src/main/java/io/springboot/captcha/ChineseCaptcha.java +++ b/captcha-core/src/main/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/captcha-core/src/main/java/io/springboot/captcha/ChineseGifCaptcha.java b/captcha-core/src/main/java/com/pig4cloud/captcha/ChineseGifCaptcha.java similarity index 96% rename from captcha-core/src/main/java/io/springboot/captcha/ChineseGifCaptcha.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/ChineseGifCaptcha.java index 8823cc2..d8f9951 100755 --- a/captcha-core/src/main/java/io/springboot/captcha/ChineseGifCaptcha.java +++ b/captcha-core/src/main/java/com/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/captcha-core/src/main/java/io/springboot/captcha/GifCaptcha.java b/captcha-core/src/main/java/com/pig4cloud/captcha/GifCaptcha.java similarity index 97% rename from captcha-core/src/main/java/io/springboot/captcha/GifCaptcha.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/GifCaptcha.java index 324d78f..fbe5ef1 100755 --- a/captcha-core/src/main/java/io/springboot/captcha/GifCaptcha.java +++ b/captcha-core/src/main/java/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/captcha-core/src/main/java/io/springboot/captcha/SpecCaptcha.java b/captcha-core/src/main/java/com/pig4cloud/captcha/SpecCaptcha.java similarity index 97% rename from captcha-core/src/main/java/io/springboot/captcha/SpecCaptcha.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/SpecCaptcha.java index 730a4d8..2293e76 100755 --- a/captcha-core/src/main/java/io/springboot/captcha/SpecCaptcha.java +++ b/captcha-core/src/main/java/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/captcha-core/src/main/java/io/springboot/captcha/base/ArithmeticCaptchaAbstract.java b/captcha-core/src/main/java/com/pig4cloud/captcha/base/ArithmeticCaptchaAbstract.java similarity index 97% rename from captcha-core/src/main/java/io/springboot/captcha/base/ArithmeticCaptchaAbstract.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/base/ArithmeticCaptchaAbstract.java index 9153494..cb162bd 100644 --- a/captcha-core/src/main/java/io/springboot/captcha/base/ArithmeticCaptchaAbstract.java +++ b/captcha-core/src/main/java/com/pig4cloud/captcha/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/captcha-core/src/main/java/io/springboot/captcha/base/Captcha.java b/captcha-core/src/main/java/com/pig4cloud/captcha/base/Captcha.java similarity index 98% rename from captcha-core/src/main/java/io/springboot/captcha/base/Captcha.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/base/Captcha.java index 91bc014..da5caba 100755 --- a/captcha-core/src/main/java/io/springboot/captcha/base/Captcha.java +++ b/captcha-core/src/main/java/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-core/src/main/java/io/springboot/captcha/base/ChineseCaptchaAbstract.java b/captcha-core/src/main/java/com/pig4cloud/captcha/base/ChineseCaptchaAbstract.java similarity index 99% rename from captcha-core/src/main/java/io/springboot/captcha/base/ChineseCaptchaAbstract.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/base/ChineseCaptchaAbstract.java index a94b782..9a33163 100755 --- a/captcha-core/src/main/java/io/springboot/captcha/base/ChineseCaptchaAbstract.java +++ b/captcha-core/src/main/java/com/pig4cloud/captcha/base/ChineseCaptchaAbstract.java @@ -1,4 +1,4 @@ -package io.springboot.captcha.base; +package com.pig4cloud.captcha.base; import java.awt.*; diff --git a/captcha-core/src/main/java/io/springboot/captcha/base/Randoms.java b/captcha-core/src/main/java/com/pig4cloud/captcha/base/Randoms.java similarity index 98% rename from captcha-core/src/main/java/io/springboot/captcha/base/Randoms.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/base/Randoms.java index 0047872..04db008 100755 --- a/captcha-core/src/main/java/io/springboot/captcha/base/Randoms.java +++ b/captcha-core/src/main/java/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/captcha-core/src/main/java/io/springboot/captcha/engine/Symbol.java b/captcha-core/src/main/java/com/pig4cloud/captcha/engine/Symbol.java similarity index 97% rename from captcha-core/src/main/java/io/springboot/captcha/engine/Symbol.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/engine/Symbol.java index e02c0fc..36cacc4 100755 --- a/captcha-core/src/main/java/io/springboot/captcha/engine/Symbol.java +++ b/captcha-core/src/main/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/captcha-core/src/main/java/io/springboot/captcha/servlet/CaptchaJakartaServlet.java b/captcha-core/src/main/java/com/pig4cloud/captcha/servlet/CaptchaJakartaServlet.java similarity index 88% rename from captcha-core/src/main/java/io/springboot/captcha/servlet/CaptchaJakartaServlet.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/servlet/CaptchaJakartaServlet.java index c217427..52baab3 100644 --- a/captcha-core/src/main/java/io/springboot/captcha/servlet/CaptchaJakartaServlet.java +++ b/captcha-core/src/main/java/com/pig4cloud/captcha/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/captcha-core/src/main/java/io/springboot/captcha/servlet/CaptchaServlet.java b/captcha-core/src/main/java/com/pig4cloud/captcha/servlet/CaptchaServlet.java similarity index 89% rename from captcha-core/src/main/java/io/springboot/captcha/servlet/CaptchaServlet.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/servlet/CaptchaServlet.java index 87447de..9b1828c 100644 --- a/captcha-core/src/main/java/io/springboot/captcha/servlet/CaptchaServlet.java +++ b/captcha-core/src/main/java/com/pig4cloud/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/captcha-core/src/main/java/io/springboot/captcha/utils/AbstractCaptchaUtil.java b/captcha-core/src/main/java/com/pig4cloud/captcha/utils/AbstractCaptchaUtil.java similarity index 92% rename from captcha-core/src/main/java/io/springboot/captcha/utils/AbstractCaptchaUtil.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/utils/AbstractCaptchaUtil.java index 495637c..e890bcc 100644 --- a/captcha-core/src/main/java/io/springboot/captcha/utils/AbstractCaptchaUtil.java +++ b/captcha-core/src/main/java/com/pig4cloud/captcha/utils/AbstractCaptchaUtil.java @@ -1,4 +1,4 @@ -package io.springboot.captcha.utils; +package com.pig4cloud.captcha.utils; /** * 图形验证码工具抽象父类 diff --git a/captcha-core/src/main/java/io/springboot/captcha/utils/CaptchaJakartaUtil.java b/captcha-core/src/main/java/com/pig4cloud/captcha/utils/CaptchaJakartaUtil.java similarity index 97% rename from captcha-core/src/main/java/io/springboot/captcha/utils/CaptchaJakartaUtil.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/utils/CaptchaJakartaUtil.java index 1c2f4a7..0210d74 100644 --- a/captcha-core/src/main/java/io/springboot/captcha/utils/CaptchaJakartaUtil.java +++ b/captcha-core/src/main/java/com/pig4cloud/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/captcha-core/src/main/java/io/springboot/captcha/utils/CaptchaUtil.java b/captcha-core/src/main/java/com/pig4cloud/captcha/utils/CaptchaUtil.java similarity index 97% rename from captcha-core/src/main/java/io/springboot/captcha/utils/CaptchaUtil.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/utils/CaptchaUtil.java index 1ad0a5e..6baea6c 100644 --- a/captcha-core/src/main/java/io/springboot/captcha/utils/CaptchaUtil.java +++ b/captcha-core/src/main/java/com/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/captcha-core/src/main/java/io/springboot/captcha/utils/Encoder.java b/captcha-core/src/main/java/com/pig4cloud/captcha/utils/Encoder.java similarity index 99% rename from captcha-core/src/main/java/io/springboot/captcha/utils/Encoder.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/utils/Encoder.java index 0e8be0b..62661ff 100755 --- a/captcha-core/src/main/java/io/springboot/captcha/utils/Encoder.java +++ b/captcha-core/src/main/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/captcha-core/src/main/java/io/springboot/captcha/utils/FileUtil.java b/captcha-core/src/main/java/com/pig4cloud/captcha/utils/FileUtil.java similarity index 98% rename from captcha-core/src/main/java/io/springboot/captcha/utils/FileUtil.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/utils/FileUtil.java index a4cfeb1..0069bf2 100644 --- a/captcha-core/src/main/java/io/springboot/captcha/utils/FileUtil.java +++ b/captcha-core/src/main/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/captcha-core/src/main/java/io/springboot/captcha/utils/FontsUtil.java b/captcha-core/src/main/java/com/pig4cloud/captcha/utils/FontsUtil.java similarity index 93% rename from captcha-core/src/main/java/io/springboot/captcha/utils/FontsUtil.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/utils/FontsUtil.java index 31e3444..13df737 100644 --- a/captcha-core/src/main/java/io/springboot/captcha/utils/FontsUtil.java +++ b/captcha-core/src/main/java/com/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/captcha-core/src/main/java/io/springboot/captcha/utils/GifEncoder.java b/captcha-core/src/main/java/com/pig4cloud/captcha/utils/GifEncoder.java similarity index 99% rename from captcha-core/src/main/java/io/springboot/captcha/utils/GifEncoder.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/utils/GifEncoder.java index 10b5c01..66b79a1 100755 --- a/captcha-core/src/main/java/io/springboot/captcha/utils/GifEncoder.java +++ b/captcha-core/src/main/java/com/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/captcha-core/src/main/java/io/springboot/captcha/utils/Quant.java b/captcha-core/src/main/java/com/pig4cloud/captcha/utils/Quant.java similarity index 99% rename from captcha-core/src/main/java/io/springboot/captcha/utils/Quant.java rename to captcha-core/src/main/java/com/pig4cloud/captcha/utils/Quant.java index 0f6d521..bb6c6b6 100755 --- a/captcha-core/src/main/java/io/springboot/captcha/utils/Quant.java +++ b/captcha-core/src/main/java/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 index 8831dcb..b1e1eac 100755 --- 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 index b521878..b9d9e9f 100644 --- 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"> 4.0.0 - io.springboot.plugin + com.pig4cloud.plugin easy-captcha - 2.2.3 + 2.2.4 captcha-spring-boot-starter captcha-spring-boot-starter @@ -46,7 +46,7 @@ - io.springboot.plugin + com.pig4cloud.plugin captcha-core 2.2.3 diff --git a/captcha-spring-boot-starter/src/main/java/io/springboot/captcha/CaptchaAutoConfiguration.java b/captcha-spring-boot-starter/src/main/java/com/pig4cloud/captcha/CaptchaAutoConfiguration.java similarity index 82% rename from captcha-spring-boot-starter/src/main/java/io/springboot/captcha/CaptchaAutoConfiguration.java rename to captcha-spring-boot-starter/src/main/java/com/pig4cloud/captcha/CaptchaAutoConfiguration.java index 94ace3d..4f0dfc5 100644 --- a/captcha-spring-boot-starter/src/main/java/io/springboot/captcha/CaptchaAutoConfiguration.java +++ b/captcha-spring-boot-starter/src/main/java/com/pig4cloud/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/captcha-spring-boot-starter/src/main/java/io/springboot/captcha/config/CaptchaEndpoint.java b/captcha-spring-boot-starter/src/main/java/com/pig4cloud/captcha/config/CaptchaEndpoint.java similarity index 87% rename from captcha-spring-boot-starter/src/main/java/io/springboot/captcha/config/CaptchaEndpoint.java rename to captcha-spring-boot-starter/src/main/java/com/pig4cloud/captcha/config/CaptchaEndpoint.java index 895ed08..0aab643 100644 --- a/captcha-spring-boot-starter/src/main/java/io/springboot/captcha/config/CaptchaEndpoint.java +++ b/captcha-spring-boot-starter/src/main/java/com/pig4cloud/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/captcha-spring-boot-starter/src/main/java/io/springboot/captcha/config/CaptchaProperties.java b/captcha-spring-boot-starter/src/main/java/com/pig4cloud/captcha/config/CaptchaProperties.java similarity index 92% rename from captcha-spring-boot-starter/src/main/java/io/springboot/captcha/config/CaptchaProperties.java rename to captcha-spring-boot-starter/src/main/java/com/pig4cloud/captcha/config/CaptchaProperties.java index bf41399..77eb7b1 100644 --- a/captcha-spring-boot-starter/src/main/java/io/springboot/captcha/config/CaptchaProperties.java +++ b/captcha-spring-boot-starter/src/main/java/com/pig4cloud/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; diff --git a/pom.xml b/pom.xml index 83c49c6..848bae3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.springboot.plugin + com.pig4cloud.plugin easy-captcha - 2.2.3 + 2.2.4 pom easy-captcha @@ -66,7 +66,92 @@ + + + snapshot + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.1 + + + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.10.1 + + private + true + UTF-8 + UTF-8 + UTF-8 + none + false + + + + package + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.2.7 + + + sign-artifacts + verify + + sign + + + + + + --pinentry-mode + loopback + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.7.0 + true + + sonatype + https://oss.sonatype.org/ + true + + + + + + + sonatype + + https://oss.sonatype.org/content/repositories/snapshots/ + + + + release @@ -75,7 +160,7 @@ org.apache.maven.plugins maven-source-plugin - 2.2.1 + 3.3.1 package @@ -89,7 +174,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.10.1 private true @@ -112,7 +197,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.2.7 sign-artifacts @@ -132,11 +217,11 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.13 + 1.7.0 true sonatype - https://s01.oss.sonatype.org/ + https://oss.sonatype.org/ true @@ -146,7 +231,7 @@ sonatype - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + https://oss.sonatype.org/service/local/staging/deploy/maven2/