增加中文验证码功能

README.md

@@ -28,6 +28,21 @@
 ![验证码](https://ws1.sinaimg.cn/large/006a7GCKgy1ftogfxh2rwj303m01cjr5.jpg)
 
 
+**中文验证码：**
+
+![验证码](https://ws1.sinaimg.cn/large/006a7GCKly1ftovnvbgx6g303m01cjrc.jpg)
+  
+![验证码](https://ws1.sinaimg.cn/large/006a7GCKly1ftovojp2gng303m01cq2w.jpg)
+  
+![验证码](https://ws1.sinaimg.cn/large/006a7GCKly1ftovp5u4c4g303m01cdft.jpg)
+
+![验证码](https://ws1.sinaimg.cn/large/006a7GCKly1ftovmfxg71j303m01cq2s.jpg)
+  
+![验证码](https://ws1.sinaimg.cn/large/006a7GCKly1ftovmy720dj303m01cq2s.jpg)
+  
+![验证码](https://ws1.sinaimg.cn/large/006a7GCKly1ftovn68um6j303m01cglf.jpg)
+
+
 
 ## 3.导入项目
 
@@ -126,6 +141,7 @@ public class LoginController {
     public JsonResult login(String username,String password,String code){
         
         if (CaptchaUtil.ver(code, request)) {
+            CaptchaUtil.clear(request);
             return JsonResult.error("验证码不正确");
         }
     }   
@@ -148,6 +164,48 @@ public class MainController {
 }
 ```
 
+### 3.5.不使用工具类
+
+  CaptchaUtil是为了简化操作，封装了生成验证码、存session、判断验证码等功能。CaptchaUtil使用的GifCaptcha
+生成的字母数字混合的gif验证码，如果需要设置更多的参数，请参照如下操作使用：
+
+```java
+@Controller
+public class MainController {
+    
+    @RequestMapping("/images/captcha")
+    public void captcha(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        // 设置请求头为输出图片类型
+        CaptchaUtil.setHeader(response);
+        
+        // 三个参数分别为宽、高、位数
+        GifCaptcha gifCaptcha = new GifCaptcha(130, 48, 5);
+        
+        // 设置字体
+        gifCaptcha.setFont(new Font("Verdana", Font.PLAIN, 32));  // 有默认字体，可以不用设置
+        
+        // 设置类型，纯数字、纯字母、字母数字混合
+        gifCaptcha.setCharType(Captcha.TYPE_ONLY_NUMBER);
+        
+        // 验证码存入session
+        request.getSession().setAttribute("captcha", gifCaptcha.text().toLowerCase());
+        
+        // 输出图片流
+        gifCaptcha.out(response.getOutputStream());
+    }
+    
+    @PostMapping("/login")
+    public JsonResult login(String username,String password,String code){
+        // 获取session中的验证码
+        String sessionCode = request.getSession().getAttribute("captcha");
+        // 判断验证码
+        if (code==null || !sessionCode.equals(code.trim().toLowerCase())) {
+            return JsonResult.error("验证码不正确");
+        }
+    }  
+}
+```
+
 ## 4.更多设置
 
 ### 4.1.使用Gif验证码
@@ -211,3 +269,55 @@ public class Test {
  TYPE_ONLY_CHAR | 纯字母 
 
 
+### 4.4.中文验证码
+
+中文png验证码：
+
+```java
+public class Test {
+    
+    public static void main(String[] args) {
+        OutputStream outputStream = new FileOutputStream(new File("D:/a/aa.png"));
+        
+        // 三个参数分别为宽、高、位数
+        ChineseCaptcha chineseCaptcha = new ChineseCaptcha(130, 48, 4);
+        
+        // 设置字体
+        chineseCaptcha.setFont(new Font("楷体", Font.PLAIN, 28));  // 有默认字体，可以不用设置
+
+        // 生成的验证码
+        String code = chineseCaptcha.text();
+        
+        // 输出图片流
+        chineseCaptcha.out(outputStream);
+    }
+}
+```
+
+中文gif验证码：
+
+```java
+public class Test {
+    
+    public static void main(String[] args) {
+        OutputStream outputStream = new FileOutputStream(new File("D:/a/aa.png"));
+        
+        // 三个参数分别为宽、高、位数
+        ChineseGifCaptcha chineseGifCaptcha = new ChineseGifCaptcha(130, 48, 4);
+        
+        // 设置字体
+        chineseGifCaptcha.setFont(new Font("楷体", Font.PLAIN, 28));  // 有默认字体，可以不用设置
+
+        // 生成的验证码
+        String code = chineseGifCaptcha.text();
+        
+        // 输出图片流
+        chineseGifCaptcha.out(outputStream);
+    }
+}
+```
+
+### 4.5.前后端分离项目的使用
+
+  分离项目建议不要存储在session中，存储在redis中。
+

pom.xml

@@ -5,7 +5,7 @@
     <groupId>com.github.whvcse</groupId>
 
     <artifactId>EasyCaptcha</artifactId>
-    <version>1.2.0-RELEASE</version>
+    <version>1.2.5-RELEASE</version>
     <packaging>jar</packaging>
 
     <name>EasyCaptcha</name>

src/main/java/com/wf/captcha/Captcha.java

@@ -13,7 +13,7 @@ public abstract class Captcha extends Randoms {
     protected int len = 5; // 验证码随机字符长度
     protected int width = 130; // 验证码显示宽度
     protected int height = 48; // 验证码显示高度
-    private String chars = null; // 当前验证码
+    protected String chars = null; // 当前验证码
     protected int charType = TYPE_DEFAULT;  // 验证码类型，1字母数字混合，2纯数字，3纯字母
     public static final int TYPE_DEFAULT = 1;  // 字母数字混合
     public static final int TYPE_ONLY_NUMBER = 2;  // 纯数字
@@ -25,8 +25,6 @@ public abstract class Captcha extends Randoms {
      * @return 验证码字符数组
      */
     protected char[] alphas() {
-        "".toLowerCase();
-        "".toUpperCase();
         char[] cs = new char[len];
         for (int i = 0; i < len; i++) {
             switch (charType) {

src/main/java/com/wf/captcha/ChineseCaptcha.java

@@ -0,0 +1,99 @@
+package com.wf.captcha;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class ChineseCaptcha extends ChineseCaptchaAbstract {
+
+    public ChineseCaptcha() {
+        super();
+    }
+
+    public ChineseCaptcha(int width, int height) {
+        this();
+        setWidth(width);
+        setHeight(height);
+    }
+
+    public ChineseCaptcha(int width, int height, int len) {
+        this(width, height);
+        setLen(len);
+    }
+
+    public ChineseCaptcha(int width, int height, int len, Font font) {
+        this(width, height, len);
+        setFont(font);
+    }
+
+    /**
+     * 生成验证码
+     *
+     * @param out 输出流
+     * @return 是否成功
+     */
+    @Override
+    public boolean out(OutputStream out) {
+        checkAlpha();
+        return graphicsImage(textChar(), out);
+    }
+
+    /**
+     * 生成验证码图形
+     *
+     * @param strs 验证码
+     * @param out  输出流
+     * @return boolean
+     */
+    private boolean graphicsImage(char[] strs, OutputStream out) {
+        boolean ok;
+        try {
+            BufferedImage bi = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+            Graphics2D g = (Graphics2D) bi.getGraphics();
+            AlphaComposite ac3;
+            int len = strs.length;
+            g.setColor(Color.WHITE);
+            g.fillRect(0, 0, width, height);
+            g.setColor(color());
+            g.setFont(font);
+            int h = height - ((height - font.getSize()) >> 1);
+            int w = width / len;
+            // 抗锯齿
+            g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+            // 画字符串
+            for (int i = 0; i < len; i++) {
+                int x = i * w + num(2, 6);
+                int y = h - num(2, 6);
+                g.drawString(String.valueOf(strs[i]), x, y);
+            }
+            // 随机画干扰线
+            g.setStroke(new BasicStroke(1.25f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL));
+            for (int i = 0; i < 8; i++) {
+                ac3 = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.75f);  // 指定透明度
+                g.setComposite(ac3);
+                int x1 = num(-10, width - 10);
+                int y1 = num(5, height - 5);
+                int x2 = num(10, width + 10);
+                int y2 = num(2, height - 2);
+                g.drawLine(x1, y1, x2, y2);
+                // 画干扰圆圈
+                g.drawOval(num(width), num(height), 5 + num(25), 5 + num(25));
+            }
+            ImageIO.write(bi, "png", out);
+            out.flush();
+            ok = true;
+        } catch (IOException e) {
+            ok = false;
+            e.printStackTrace();
+        } finally {
+            try {
+                out.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return ok;
+    }
+}

src/main/java/com/wf/captcha/ChineseCaptchaAbstract.java

@@ -0,0 +1,50 @@
+package com.wf.captcha;
+
+import java.awt.*;
+
+public abstract class ChineseCaptchaAbstract extends Captcha {
+    // 常用汉字
+    public static final String DELTA = "\u7684\u4e00\u4e86\u662f\u6211\u4e0d\u5728\u4eba\u4eec\u6709\u6765\u4ed6\u8fd9\u4e0a\u7740\u4e2a\u5730\u5230\u5927\u91cc\u8bf4\u5c31\u53bb\u5b50\u5f97\u4e5f\u548c\u90a3\u8981\u4e0b\u770b\u5929\u65f6\u8fc7\u51fa\u5c0f\u4e48\u8d77\u4f60\u90fd\u628a\u597d\u8fd8\u591a\u6ca1\u4e3a\u53c8\u53ef\u5bb6\u5b66\u53ea\u4ee5\u4e3b\u4f1a\u6837\u5e74\u60f3\u751f\u540c\u8001\u4e2d\u5341\u4ece\u81ea\u9762\u524d\u5934\u9053\u5b83\u540e\u7136\u8d70\u5f88\u50cf\u89c1\u4e24\u7528\u5979\u56fd\u52a8\u8fdb\u6210\u56de\u4ec0\u8fb9\u4f5c\u5bf9\u5f00\u800c\u5df1\u4e9b\u73b0\u5c71\u6c11\u5019\u7ecf\u53d1\u5de5\u5411\u4e8b\u547d\u7ed9\u957f\u6c34\u51e0\u4e49\u4e09\u58f0\u4e8e\u9ad8\u624b\u77e5\u7406\u773c\u5fd7\u70b9\u5fc3\u6218\u4e8c\u95ee\u4f46\u8eab\u65b9\u5b9e\u5403\u505a\u53eb\u5f53\u4f4f\u542c\u9769\u6253\u5462\u771f\u5168\u624d\u56db\u5df2\u6240\u654c\u4e4b\u6700\u5149\u4ea7\u60c5\u8def\u5206\u603b\u6761\u767d\u8bdd\u4e1c\u5e2d\u6b21\u4eb2\u5982\u88ab\u82b1\u53e3\u653e\u513f\u5e38\u6c14\u4e94\u7b2c\u4f7f\u5199\u519b\u5427\u6587\u8fd0\u518d\u679c\u600e\u5b9a\u8bb8\u5feb\u660e\u884c\u56e0\u522b\u98de\u5916\u6811\u7269\u6d3b\u90e8\u95e8\u65e0\u5f80\u8239\u671b\u65b0\u5e26\u961f\u5148\u529b\u5b8c\u5374\u7ad9\u4ee3\u5458\u673a\u66f4\u4e5d\u60a8\u6bcf\u98ce\u7ea7\u8ddf\u7b11\u554a\u5b69\u4e07\u5c11\u76f4\u610f\u591c\u6bd4\u9636\u8fde\u8f66\u91cd\u4fbf\u6597\u9a6c\u54ea\u5316\u592a\u6307\u53d8\u793e\u4f3c\u58eb\u8005\u5e72\u77f3\u6ee1\u65e5\u51b3\u767e\u539f\u62ff\u7fa4\u7a76\u5404\u516d\u672c\u601d\u89e3\u7acb\u6cb3\u6751\u516b\u96be\u65e9\u8bba\u5417\u6839\u5171\u8ba9\u76f8\u7814\u4eca\u5176\u4e66\u5750\u63a5\u5e94\u5173\u4fe1\u89c9\u6b65\u53cd\u5904\u8bb0\u5c06\u5343\u627e\u4e89\u9886\u6216\u5e08\u7ed3\u5757\u8dd1\u8c01\u8349\u8d8a\u5b57\u52a0\u811a\u7d27\u7231\u7b49\u4e60\u9635\u6015\u6708\u9752\u534a\u706b\u6cd5\u9898\u5efa\u8d76\u4f4d\u5531\u6d77\u4e03\u5973\u4efb\u4ef6\u611f\u51c6\u5f20\u56e2\u5c4b\u79bb\u8272\u8138\u7247\u79d1\u5012\u775b\u5229\u4e16\u521a\u4e14\u7531\u9001\u5207\u661f\u5bfc\u665a\u8868\u591f\u6574\u8ba4\u54cd\u96ea\u6d41\u672a\u573a\u8be5\u5e76\u5e95\u6df1\u523b\u5e73\u4f1f\u5fd9\u63d0\u786e\u8fd1\u4eae\u8f7b\u8bb2\u519c\u53e4\u9ed1\u544a\u754c\u62c9\u540d\u5440\u571f\u6e05\u9633\u7167\u529e\u53f2\u6539\u5386\u8f6c\u753b\u9020\u5634\u6b64\u6cbb\u5317\u5fc5\u670d\u96e8\u7a7f\u5185\u8bc6\u9a8c\u4f20\u4e1a\u83dc\u722c\u7761\u5174\u5f62\u91cf\u54b1\u89c2\u82e6\u4f53\u4f17\u901a\u51b2\u5408\u7834\u53cb\u5ea6\u672f\u996d\u516c\u65c1\u623f\u6781\u5357\u67aa\u8bfb\u6c99\u5c81\u7ebf\u91ce\u575a\u7a7a\u6536\u7b97\u81f3\u653f\u57ce\u52b3\u843d\u94b1\u7279\u56f4\u5f1f\u80dc\u6559\u70ed\u5c55\u5305\u6b4c\u7c7b\u6e10\u5f3a\u6570\u4e61\u547c\u6027\u97f3\u7b54\u54e5\u9645\u65e7\u795e\u5ea7\u7ae0\u5e2e\u5566\u53d7\u7cfb\u4ee4\u8df3\u975e\u4f55\u725b\u53d6\u5165\u5cb8\u6562\u6389\u5ffd\u79cd\u88c5\u9876\u6025\u6797\u505c\u606f\u53e5\u533a\u8863\u822c\u62a5\u53f6\u538b\u6162\u53d4\u80cc\u7ec6";
+    // 常用颜色
+    public static final int[][] COLOR = {{0, 135, 255}, {51, 153, 51}, {255, 102, 102}, {255, 153, 0}, {153, 102, 0}, {153, 102, 153}, {51, 153, 153}, {102, 102, 255}, {0, 102, 204}, {204, 51, 51}, {0, 153, 204}, {0, 51, 102}};
+
+    public ChineseCaptchaAbstract() {
+        setFont(new Font("楷体", Font.PLAIN, 28));
+        setLen(4);
+    }
+
+    /**
+     * 生成随机验证码
+     *
+     * @return 验证码字符数组
+     */
+    @Override
+    protected char[] alphas() {
+        char[] cs = new char[len];
+        for (int i = 0; i < len; i++) {
+            cs[i] = alphaHan();
+        }
+        chars = new String(cs);
+        return cs;
+    }
+
+    /**
+     * 获取随机颜色
+     *
+     * @return 随机颜色
+     */
+    protected Color color() {
+        int[] color = COLOR[num(COLOR.length)];
+        return new Color(color[0], color[1], color[2]);
+    }
+
+    /**
+     * 返回随机汉字
+     *
+     * @return 随机汉字
+     */
+    public static char alphaHan() {
+        return DELTA.charAt(num(DELTA.length()));
+    }
+
+}

src/main/java/com/wf/captcha/ChineseGifCaptcha.java

@@ -0,0 +1,114 @@
+package com.wf.captcha;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class ChineseGifCaptcha extends ChineseCaptchaAbstract {
+
+    public ChineseGifCaptcha() {
+    }
+
+    public ChineseGifCaptcha(int width, int height) {
+        setWidth(width);
+        setHeight(height);
+    }
+
+    public ChineseGifCaptcha(int width, int height, int len) {
+        this(width, height);
+        setLen(len);
+    }
+
+    public ChineseGifCaptcha(int width, int height, int len, Font font) {
+        this(width, height, len);
+        setFont(font);
+    }
+
+    @Override
+    public boolean out(OutputStream os) {
+        checkAlpha();
+        boolean ok = false;
+        try {
+            char[] rands = textChar();  // 获取验证码数组
+            GifEncoder gifEncoder = new GifEncoder();
+            gifEncoder.start(os);
+            gifEncoder.setQuality(180);
+            gifEncoder.setDelay(100);
+            gifEncoder.setRepeat(0);
+            BufferedImage frame;
+            Color fontcolor = color();
+            for (int i = 0; i < len; i++) {
+                frame = graphicsImage(fontcolor, rands, i);
+                gifEncoder.addFrame(frame);
+                frame.flush();
+            }
+            gifEncoder.finish();
+            ok = true;
+        } finally {
+            try {
+                os.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return ok;
+    }
+
+    /**
+     * 画随机码图
+     *
+     * @param fontcolor 随机字体颜色
+     * @param strs      字符数组
+     * @param flag      透明度使用
+     * @return BufferedImage
+     */
+    private BufferedImage graphicsImage(Color fontcolor, char[] strs, int flag) {
+        BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+        Graphics2D g2d = (Graphics2D) image.getGraphics();
+        g2d.setColor(Color.WHITE);  // 填充背景颜色
+        g2d.fillRect(0, 0, width, height);
+        AlphaComposite ac3;
+        int h = height - ((height - font.getSize()) >> 1);
+        int w = width / len;
+        g2d.setFont(font);
+        g2d.setColor(fontcolor);
+        // 抗锯齿
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        // 画验证码
+        for (int i = 0; i < len; i++) {
+            ac3 = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, getAlpha(flag, i));
+            g2d.setComposite(ac3);
+            int x = i * w + num(2, 6);
+            g2d.drawString(String.valueOf(strs[i]), x, h - num(2, 6));
+        }
+        // 随机画干扰线
+        g2d.setStroke(new BasicStroke(1.2f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL));
+        for (int i = 0; i < 5; i++) {
+            ac3 = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.65f);
+            g2d.setComposite(ac3);
+            int x1 = num(-10, width - 10);
+            int y1 = num(5, height - 5);
+            int x2 = num(10, width + 10);
+            int y2 = num(2, height - 2);
+            g2d.drawLine(x1, y1, x2, y2);
+            // 画干扰圆圈
+            g2d.drawOval(num(width), num(height), 5 + num(10), 5 + num(10));
+        }
+        g2d.dispose();
+        return image;
+    }
+
+    /**
+     * 获取透明度,从0到1,自动计算步长
+     *
+     * @param i
+     * @param j
+     * @return 透明度
+     */
+    private float getAlpha(int i, int j) {
+        int num = i + j;
+        float r = (float) 1 / len, s = (len + 1) * r;
+        return num > len ? (num * r - s) : num * r;
+    }
+}

src/main/java/com/wf/captcha/Randoms.java

@@ -7,7 +7,7 @@ import java.util.Random;
  * Created by 王帆 on 2018-07-27 上午 10:08.
  */
 public class Randoms {
-    private static final Random RANDOM = new Random();
+    protected static final Random RANDOM = new Random();
     // 定义验证码字符.去除了O和I等容易混淆的字母
     public static final char ALPHA[] = {'2', '3', '4', '5', '6', '7', '8', '9',
             'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'G', 'K', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',

src/main/java/com/wf/captcha/utils/CaptchaUtil.java

@@ -73,12 +73,21 @@ public class CaptchaUtil {
         captcha.out(response.getOutputStream());
     }
 
+    /**
+     * 清除session中的验证码
+     *
+     * @param request HttpServletRequest
+     */
+    public static void clear(HttpServletRequest request) {
+        request.getSession().removeAttribute(SESSION_KEY);
+    }
+
     /**
      * 设置相应头
      *
      * @param response HttpServletResponse
      */
-    private static void setHeader(HttpServletResponse response) {
+    public static void setHeader(HttpServletResponse response) {
         response.setContentType("image/gif");
         response.setHeader("Pragma", "No-cache");
         response.setHeader("Cache-Control", "no-cache");

src/test/java/com/wf/captcha/CaptchaTest.java

@@ -14,11 +14,11 @@ public class CaptchaTest {
 
     @Test
     public void test() throws Exception {
-        for (int i = 0; i < 100; i++) {
+        for (int i = 0; i < 5; i++) {
             SpecCaptcha specCaptcha = new SpecCaptcha();
-            specCaptcha.setCharType(Captcha.TYPE_ONLY_NUMBER);
+            //specCaptcha.setCharType(Captcha.TYPE_ONLY_NUMBER);
             System.out.println(specCaptcha.text());
-            specCaptcha.out(new FileOutputStream(new File("D:/a/aa" + i + ".png")));
+            //specCaptcha.out(new FileOutputStream(new File("C:/aa" + i + ".png")));
         }
     }
 
@@ -26,6 +26,22 @@ public class CaptchaTest {
     public void testGIf() throws Exception {
         GifCaptcha gifCaptcha = new GifCaptcha(130, 48, 5);
         System.out.println(gifCaptcha.text());
-        //gifCaptcha.out(new FileOutputStream(new File("D:/a/aa.gif")));
+        //gifCaptcha.out(new FileOutputStream(new File("C:/aa.gif")));
+    }
+
+    @Test
+    public void testHan() throws Exception {
+        ChineseCaptcha chineseCaptcha = new ChineseCaptcha();
+        //chineseCaptcha.setFont(new Font("微软雅黑", Font.PLAIN, 25));
+        System.out.println(chineseCaptcha.text());
+        //chineseCaptcha.out(new FileOutputStream(new File("C:/Java/aa.png")));
+    }
+
+    @Test
+    public void testGifHan() throws Exception {
+        ChineseGifCaptcha chineseGifCaptcha = new ChineseGifCaptcha();
+        //chineseGifCaptcha.setFont(new Font("微软雅黑", Font.PLAIN, 30));
+        System.out.println(chineseGifCaptcha.text());
+        chineseGifCaptcha.out(new FileOutputStream(new File("C:/Java/aa.gif")));
     }
 }