Branch 1.4.1

CONTRIBUTING.md

@@ -0,0 +1,51 @@
+Contributing
+============
+
+Contributions are welcome!
+
+**Please carefully read this page to make the code review process go as smoothly as possible and to maximize the likelihood of your contribution being merged.**
+
+## Bug Reports
+
+For bug reports or requests [submit an issue](https://gitee.com/anji-plus/captcha/issues).
+
+## Pull Requests
+
+The preferred way to contribute is to fork the
+[main repository](https://gitee.com/anji-plus/captcha) on Gitee.
+
+1. Fork the [main repository](https://gitee.com/anji-plus/captcha).  Click on the 'Fork' button near the top of the page.  This creates a copy of the code under your account on the Gitee.
+
+2. Clone this copy to your local disk:
+
+        $ git clone git@gitee.com:%YourLogin%/captcha.git
+        $ cd captcha
+
+3. Create a branch to hold your changes and start making changes. 
+
+   !!!!Note:: Don't work in the `master` branch!
+
+        $ git checkout -b my-feature
+
+4. Work on this copy on your computer using Git to do the version control. When you're done editing, run the following to record your changes in Git:
+
+        $ git add modified_files
+        $ git commit
+
+5. Push your changes to Gitee with:
+
+        $ git push -u origin my-feature
+
+6. Finally, go to the web page of your fork of the `captcha` repo and click 'Pull Request' to send your changes for review.
+
+7. If you want to update your pull request, just commit your changes to your branch and push to your fork.
+
+8. ***important***: By submitting a patch, you agree to allow the project owners to license your work under the terms of the [Apache License 2.0](https://github.com/anji-plus/captcha/blob/master/LICENSE).
+
+9. REMEMBER:  submitting PR to branch anji-plus:dev instead of anji-plus:master.
+
+### GitHub Pull Requests Docs
+
+If you are not familiar with pull requests, review the [pull request docs](https://help.github.com/articles/using-pull-requests/).
+
+

README_CN.md

@@ -6,7 +6,7 @@
 [![EN doc](https://img.shields.io/badge/document-English-blue.svg)](README.md)[![CN doc](https://img.shields.io/badge/文档-中文版-blue.svg)](README_CN.md)
 
 ## 简介
-    AJ-Captcha行为验证码，包含滑动拼图、文字点选两种方式，UI支持弹出和嵌入两种方式。后端提供Java实现，前端提供了php、angular、html、vue、uni-app、flutter、android、ios等代码示例。
+    AJ-Captcha行为验证码，包含滑动拼图、文字点选两种方式，UI支持弹出和嵌入两种方式。后端提供Java、Golang实现，前端提供了php、angular、html、vue、uni-app、flutter、android、ios等代码示例。
 
 # 1 在线体验
 **在线体验暂时下线**
@@ -47,7 +47,9 @@
 ├─service<br>
 │&emsp;├─go   &emsp;&emsp;    后端为go项目示例<br>
 │&emsp;├─php   &emsp;&emsp;    后端为php项目示例<br>
-│&emsp;├─springboot   &emsp;&emsp;    后端为springboot项目示例<br>
+│&emsp;├─go   &emsp;&emsp;    后端为go项目示例<br>
+│&emsp;├─springboot   &emsp;&emsp;    后端为springboot-2.x项目示例<br>
+│&emsp;├─springboot3   &emsp;&emsp;    后端为springboot-3.x项目示例<br>
 │&emsp;└─springmvc    &emsp;&emsp;    后端为springmvc非springboot项目示例<br>
 └─view    &emsp;&emsp;&emsp;&emsp;&emsp;    多语言客户端示例<br>
 &emsp;├─android    &emsp;&emsp;    原生android实现示例<br>
@@ -75,8 +77,13 @@ I  Your application is running here: http://localhost:8081
 ``` 
 &emsp;详细的前后端接入文档，后端示例代码service目录下，前端示例代码view目录下。
 
-
 # 6 技术支持，如有问题，请提交Issue
+提交Issue前请查阅已有Issue.
+如有兴趣提交PR,请参考[提交PR规范](./CONTRIBUTING.md),切忌不要直接提交大PR，否则会影响合并流程和审核时效，也不要提交到master分支。
+
+技术交流群：新群可直接进<br>
+<img src="https://ajreport.beliefteam.cn/file/download/495faaaa-4277-45e8-979a-ffccb6b1e86f" width = "200" height = auto />
+
 加微信前请备注AJ-Captcha。
 <br>微信群地址
 

core/captcha-spring-boot-starter/pom.xml

@@ -7,29 +7,29 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.5.RELEASE</version>
+        <version>4.0.3</version>
     </parent>
 
     <groupId>com.anji-plus</groupId>
-    <artifactId>spring-boot-starter-captcha</artifactId>
-    <version>1.3.1</version>
+    <artifactId>captcha-spring-boot-starter</artifactId>
+    <version>1.4.1</version>
 
     <name>captcha-spring-boot-starter</name>
     <description>anji-plus captcha captcha-spring-boot-starter</description>
     <url>https://github.com/anji-plus/captcha</url>
     <packaging>jar</packaging>
 
     <properties>
-        <java.version>1.8</java.version>
-        <spring-boot-version>2.3.5.RELEASE</spring-boot-version>
+        <java.version>17</java.version>
+        <spring-boot-version>4.0.3</spring-boot-version>
     </properties>
 
     <!-- Add typical dependencies for a web application -->
     <dependencies>
         <dependency>
             <groupId>com.anji-plus</groupId>
             <artifactId>captcha</artifactId>
-            <version>1.3.1</version>
+            <version>1.4.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -40,16 +40,17 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
         </dependency>
-        <!-- @ConfigurationProperties annotation processing (metadata for IDEs) -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
-
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+            <version>4.0.0-M2</version>
+        </dependency>
     </dependencies>
-
     <!--中央仓库上传配置开始-->
     <licenses>
         <!-- Apache许可证 -->
@@ -83,25 +84,22 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.3</version>
                         <configuration>
-                            <source>1.8</source>
-                            <target>1.8</target>
+                            <source>17</source>
+                            <target>17</target>
                             <encoding>UTF-8</encoding>
                         </configuration>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-resources-plugin</artifactId>
-                        <version>2.4</version>
                         <configuration>
                             <encoding>UTF-8</encoding>
                         </configuration>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>2.2.1</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -114,7 +112,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.9.1</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -125,17 +122,18 @@
                         </executions>
                         <configuration>
                             <encoding>UTF-8</encoding>
-                            <additionalparam>-Xdoclint:none</additionalparam>
+                            <source>1.8</source>
+                            <failOnError>false</failOnError>
                         </configuration>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.5</version>
+                        <version>3.1.0</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
-                                <phase>site</phase>
+                                <phase>verify</phase>
                                 <goals>
                                     <goal>sign</goal>
                                 </goals>
@@ -147,11 +145,11 @@
             <!-- 【注】snapshotRepository 与 repository 中的 id 一定要与 setting.xml 中 server 的 id 保持一致！ -->
             <distributionManagement>
                 <snapshotRepository>
-                    <id>releases</id>
+                    <id>center-releases</id>
                     <url>https://oss.sonatype.org/content/repositories/snapshots</url>
                 </snapshotRepository>
                 <repository>
-                    <id>releases</id>
+                    <id>center-releases</id>
                     <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
                 </repository>
             </distributionManagement>

core/captcha-spring-boot-starter/src/main/java/com/anji/captcha/config/AjCaptchaServiceAutoConfiguration.java

@@ -5,6 +5,7 @@
 import com.anji.captcha.properties.AjCaptchaProperties;
 import com.anji.captcha.service.CaptchaService;
 import com.anji.captcha.service.impl.CaptchaServiceFactory;
+import com.anji.captcha.util.Base64Utils;
 import com.anji.captcha.util.ImageUtils;
 import com.anji.captcha.util.StringUtils;
 import org.slf4j.Logger;
@@ -15,7 +16,6 @@
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.util.Base64Utils;
 import org.springframework.util.FileCopyUtils;
 
 import java.util.HashMap;

core/captcha-spring-boot-starter/src/main/java/com/anji/captcha/config/I18nAspect.java

@@ -0,0 +1,70 @@
+package com.anji.captcha.config;
+
+import com.anji.captcha.model.common.ResponseModel;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.MessageSource;
+import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.core.MethodParameter;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
+
+import java.util.Objects;
+
+@Aspect
+@ControllerAdvice
+@Component
+@ConditionalOnProperty(value = "aj.captcha.i18n.enabled",matchIfMissing = false)
+public class I18nAspect implements ResponseBodyAdvice<Object> {
+
+    {
+        System.out.println("===>I18nAspect init...");
+    }
+
+    @Override
+    public boolean supports(MethodParameter returnType, Class<? extends HttpMessageConverter<?>> converterType) {
+        return returnType.getParameterType().isAssignableFrom(ResponseModel.class);
+    }
+
+    @Override
+    public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType,
+                                  Class<? extends HttpMessageConverter<?>> selectedConverterType,
+                                  ServerHttpRequest request, ServerHttpResponse response) {
+        if (body instanceof ResponseModel) {
+            ResponseModel res = (ResponseModel) body;
+            String code = res.getRepCode();
+            String desc = getMessage(code,res);
+            res.setRepMsg(desc);
+            return res;
+        }
+        return body;
+    }
+
+    private String getMessage(String code,ResponseModel res){
+        try {
+            if(Objects.isNull(messageSource)){
+                messageSource = applicationContext.getBean(MessageSource.class);
+            }
+            return messageSource.getMessage(prefix + code, null, LocaleContextHolder.getLocale());
+        } catch (Exception e) {
+            return res.getRepMsg(); // 如果找不到对应的国际化信息，返回默认信息
+        }
+    }
+
+    @Autowired(required = false)
+    private MessageSource messageSource;
+
+    @Value("${aj.captcha.i18n.prefix:aj.captcha.}")
+    private String prefix;
+
+    @Autowired
+    private ApplicationContext applicationContext;
+}

core/captcha-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+com.anji.captcha.config.AjCaptchaAutoConfiguration

core/captcha/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.anji-plus</groupId>
     <artifactId>captcha</artifactId>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>anji-plus captcha.jar</description>
@@ -63,7 +63,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.3</version>
                         <configuration>
                             <source>1.8</source>
                             <target>1.8</target>
@@ -81,7 +80,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>2.2.1</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -94,7 +92,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.9.1</version>
+                        <version>3.11.2</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -105,7 +103,8 @@
                         </executions>
                         <configuration>
                             <encoding>UTF-8</encoding>
-                            <additionalparam>-Xdoclint:none</additionalparam>
+                            <source>1.8</source>
+                            <failOnError>false</failOnError>
                         </configuration>
                     </plugin>
                     <plugin>
@@ -115,7 +114,7 @@
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
-                                <phase>site</phase>
+                                <phase>verify</phase>
                                 <goals>
                                     <goal>sign</goal>
                                 </goals>
@@ -127,11 +126,11 @@
             <!-- 【注】snapshotRepository 与 repository 中的 id 一定要与 setting.xml 中 server 的 id 保持一致！ -->
             <distributionManagement>
                 <snapshotRepository>
-                    <id>releases</id>
+                    <id>center-releases</id>
                     <url>https://oss.sonatype.org/content/repositories/snapshots</url>
                 </snapshotRepository>
                 <repository>
-                    <id>releases</id>
+                    <id>center-releases</id>
                     <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
                 </repository>
             </distributionManagement>

core/captcha/src/main/java/com/anji/captcha/service/CaptchaCacheService.java

@@ -29,15 +29,17 @@ public interface CaptchaCacheService {
 	String type();
 
 	/***
-	 *
+	 * key 存在，返回存在的值+val，key不存在 返回val
 	 * @param key
 	 * @param val
 	 * @return
 	 */
 	default Long increment(String key, long val){
-		return 0L;
+		return val;
 	};
 
-	void setExpire(String key, long l);
+	default void setExpire(String key, long l){
+
+	};
 
 }