图形验证码

server/src/main/java/com/pica/cloud/account/account/server/controller/AccountController.java

@@ -58,7 +58,7 @@ public class AccountController extends AccountBaseController {
                                             @ApiParam(value = "图形验证码答案", required = true) @RequestParam("captchaAnswer") String captchaAnswer) {
         //校验图形验证码
         if (!captchaService.acknowledge(captchaToken, captchaAnswer)) {
-            return PicaResponse.toResponse(null, PicaResultCode.PARAM_IS_INVALID.code(), "图形验证码答案错误！");
+            return PicaResponse.toResponse(null, PicaResultCode.PARAM_IS_INVALID.code(), "图形验证码错误");
         }
         this.checkMobilePhone(mobilePhone);
         String authCode = CommonUtil.createValidateCode();  //随机生成验证码
@@ -186,16 +186,16 @@ public class AccountController extends AccountBaseController {
         String flag = StringUtils.isBlank(req.getFlag()) ? "0" : req.getFlag();
 
         if (StringUtils.isBlank(req.getAuthCode())) {
-            throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "请输入正确的验证码");
+            throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "短信验证码错误");
         }
 
         String authCodeKey = this.getAuthCodeKey(req.getMobilePhone(), flag);
         String cacheCode = redisClient.get(authCodeKey);  //从redis获取验证码
         if (StringUtils.isBlank(cacheCode)) {
-            throw new PicaException(PicaResultCode.RESULE_DATA_NONE.code(), "验证码已过期，请重新获取");
+            throw new PicaException(PicaResultCode.RESULE_DATA_NONE.code(), "短信验证码已过期，请重新获取");
         }
         if (!StringUtils.equals(req.getAuthCode(), cacheCode)) {
-            throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "请输入正确的验证码");
+            throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "短信验证码错误");
         }
         redisClient.del(authCodeKey);  //清除验证码
     }

server/src/main/java/com/pica/cloud/account/account/server/util/captcha/CaptchaGenerator.java

@@ -29,11 +29,11 @@ public class CaptchaGenerator {
 
     public CaptchaGenerator() throws FontFormatException, IOException {
         int h = 40;
-        ctxs.put(Range.closedOpen(0, h), new CaptchaContext(h * 4, h, (h / 2) * 3, true));
+        ctxs.put(Range.closedOpen(0, h), new CaptchaContext(h * 4, h, (int) (h * 1.2), true));
         h *= 2;
-        ctxs.put(Range.closedOpen(h / 2, h), new CaptchaContext(h * 4, h, (h / 2) * 3, true));
+        ctxs.put(Range.closedOpen(h / 2, h), new CaptchaContext(h * 4, h, (int) (h * 1.2), true));
         h *= 2;
-        ctxs.put(Range.closedOpen(h / 2, Integer.MAX_VALUE), new CaptchaContext(h * 4, h, (h / 2) * 3, true));
+        ctxs.put(Range.closedOpen(h / 2, Integer.MAX_VALUE), new CaptchaContext(h * 4, h, (int) (h * 1.2), true));
         gens.add(new NumberLetterGenerator());
     }
 

server/src/main/java/com/pica/cloud/account/account/server/util/captcha/Generator.java

-/**
- * 
- */
 package com.pica.cloud.account.account.server.util.captcha;
 
 /**