Rename kapcha to kaptcha

README.md

@@ -1,6 +1,6 @@
 # Kaptcha Spring Boot Starter
 
-Kaptcha Spring Boot Starter will help you use Google Kaptcha with Spring Boot.
+Kaptcha Spring Boot Starter can help you use [Google Kaptcha](http://code.google.com/p/kaptcha/) with [Spring Boot](https://github.com/spring-projects/spring-boot) easier.
 
 ## Usage
 
@@ -10,7 +10,7 @@ Declare `kaptcha-spring-boot-starter` dependency in your `pom.xml` file.
 <dependency>
     <groupId>com.oopsguy.kaptcha</groupId>
     <artifactId>kaptcha-spring-boot-starter</artifactId>
-    <version>1.0.0-beta</version>
+    <version>1.0.0-beta-2</version>
 </dependency>
 ```
 
@@ -108,7 +108,7 @@ Then browse [http://localhost:8080/home/capthca](http://localhost:8080/home/capt
 
 ### Java Code
 
-You can also inject `Producer` Bean directly by annotation to generate captcha.
+You can also inject a `Producer` bean directly by annotation to generate captcha.
 
 ```java
 @Controller

kapcha-spring-boot-autoconfigure/pom.xml → kaptcha-spring-boot-autoconfigure/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <groupId>com.oopsguy.kaptcha</groupId>
         <artifactId>kaptcha-spring-boot-parent</artifactId>
-        <version>1.0.0-beta</version>
+        <version>1.0.0-beta-2</version>
         <relativePath>../kaptcha-spring-boot-parent</relativePath>
     </parent>
     <packaging>jar</packaging>
-    <artifactId>kapcha-spring-boot-autoconfigure</artifactId>
-    <name>kapcha-spring-boot-autoconfigure</name>
+    <artifactId>kaptcha-spring-boot-autoconfigure</artifactId>
+    <name>kaptcha-spring-boot-autoconfigure</name>
     <url>https://github.com/12software/kaptcha-spring-boot</url>
     <description>Kaptcha Spring Boot AutoConfigurer</description>
 
@@ -19,6 +19,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
@@ -29,14 +34,14 @@
             <artifactId>kaptcha</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

kaptcha-spring-boot-parent/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>kaptcha-spring-boot</artifactId>
         <groupId>com.oopsguy.kaptcha</groupId>
-        <version>1.0.0-beta</version>
+        <version>1.0.0-beta-2</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -17,7 +17,7 @@
 
     <modules>
         <module>../kaptcha</module>
-        <module>../kapcha-spring-boot-autoconfigure</module>
+        <module>../kaptcha-spring-boot-autoconfigure</module>
         <module>../kaptcha-spring-boot-starter</module>
         <module>../kaptcha-spring-boot-starter-example</module>
     </modules>

kaptcha-spring-boot-starter-example/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.oopsguy.kaptcha</groupId>
         <artifactId>kaptcha-spring-boot-parent</artifactId>
-        <version>1.0.0-beta</version>
+        <version>1.0.0-beta-2</version>
         <relativePath>../kaptcha-spring-boot-parent</relativePath>
     </parent>
     <artifactId>kaptcha-spring-boot-starter-example</artifactId>

kaptcha-spring-boot-starter-example/src/main/java/com/oopsguy/kaptcha/example/KaptchaController.java

@@ -13,12 +13,20 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
+import java.util.Date;
 
 @Controller
 public class KaptchaController {
 
     private final static String HOME_CAPTCHA_SESSION_KEY = "homeCaptcha";
 
+    private final static String HOME_CAPTCHA_SESSION_DATE = "homeCaptchaDate";
+
+    /**
+     * captcha expire time, millis
+     */
+    private final static long VALID_MILLIS_TIME = 10 * 1000;
+
     @Resource
     private Producer captchaProducer;
 
@@ -44,7 +52,12 @@ public String checkHomeCaptcha(HttpServletRequest req) {
             return "empty captcha";
         }
         String savedCaptcha = (String) req.getSession().getAttribute(HOME_CAPTCHA_SESSION_KEY);
+        Date sessionDate = (Date) req.getSession().getAttribute(HOME_CAPTCHA_SESSION_DATE);
         if (captcha.equalsIgnoreCase(savedCaptcha)) {
+            if (sessionDate == null
+                    || System.currentTimeMillis() - sessionDate.getTime() > VALID_MILLIS_TIME) {
+                return "expired";
+            }
             return "valid!";
         }
         return "invalid";

kaptcha-spring-boot-starter-example/src/main/resources/application.yml

@@ -47,6 +47,7 @@ kaptcha:
       path: /home/captcha
       session:
         key: homeCaptcha
+        date: homeCaptchaDate
       background:
         color-from: '255,255,255'
         color-to: '255,255,255'

kaptcha-spring-boot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.oopsguy.kaptcha</groupId>
         <artifactId>kaptcha-spring-boot-parent</artifactId>
-        <version>1.0.0-beta</version>
+        <version>1.0.0-beta-2</version>
         <relativePath>../kaptcha-spring-boot-parent</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>com.oopsguy.kaptcha</groupId>
-            <artifactId>kapcha-spring-boot-autoconfigure</artifactId>
+            <artifactId>kaptcha-spring-boot-autoconfigure</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

kaptcha/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>kaptcha-spring-boot-parent</artifactId>
         <groupId>com.oopsguy.kaptcha</groupId>
-        <version>1.0.0-beta</version>
+        <version>1.0.0-beta-2</version>
         <relativePath>../kaptcha-spring-boot-parent</relativePath>
     </parent>
 

pom.xml

@@ -12,7 +12,7 @@
     <groupId>com.oopsguy.kaptcha</groupId>
     <artifactId>kaptcha-spring-boot</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.0-beta</version>
+    <version>1.0.0-beta-2</version>
 
     <name>kaptcha-spring-boot</name>
     <url>https://github.com/12software/kaptcha-spring-boot</url>