Merge remote-tracking branch 'origin/master'

src/main/java/io/office/modules/manage/controller/LogLoginController.java

@@ -42,8 +42,6 @@ public class LogLoginController {
     private SysCaptchaService sysCaptchaService;
 
 
-
-
     /**
      * 用户登录
      */
@@ -51,11 +49,11 @@ public class LogLoginController {
     @Login
     // @RequiresPermissions("manage:member:list")
     public R login(@RequestBody Map<String, Object> params, HttpServletRequest request, HttpServletResponse response){
-        /*DomesticCodeVo domesticCodeVo = new DomesticCodeVo();
+        DomesticCodeVo domesticCodeVo = new DomesticCodeVo(params.get("uuid").toString(),params.get("captcha").toString());
         boolean captcha = sysCaptchaService.validate(domesticCodeVo.getUuid(), domesticCodeVo.getCaptcha());
         if(!captcha){
             return R.error("验证码不正确");
-        }*/
+        }
         return R.ok().put("data",logLoginService.login(params,request,response));
     }
 

src/main/java/io/office/modules/manage/vo/request/DomesticCodeVo.java

@@ -17,6 +17,11 @@ public class DomesticCodeVo implements Serializable {
     private String captcha;
     private String uuid;
 
+    public DomesticCodeVo(String uuid,String captcha) {
+        this.captcha = captcha;
+        this.uuid = uuid;
+    }
+
     private String type;
     private String code;