diff --git a/sf-admin/src/main/java/com/sf/web/controller/system/SysLoginController.java b/sf-admin/src/main/java/com/sf/web/controller/system/SysLoginController.java
index 2bfa6b5..27c4781 100644
--- a/sf-admin/src/main/java/com/sf/web/controller/system/SysLoginController.java
+++ b/sf-admin/src/main/java/com/sf/web/controller/system/SysLoginController.java
@@ -48,10 +48,9 @@ public class SysLoginController
     public AjaxResult login(@RequestBody LoginBody loginBody, HttpSession session)
     {
         AjaxResult ajax = AjaxResult.success();
-        loginService.validateCaptcha(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode());
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(),
-                session);
+                loginBody.getCode(),loginBody.getUuid(), session);
         ajax.put(Constants.TOKEN, token);
         return ajax;
     }
diff --git a/sf-framework/src/main/java/com/sf/framework/web/service/SysLoginService.java b/sf-framework/src/main/java/com/sf/framework/web/service/SysLoginService.java
index 737f482..6ad43d9 100644
--- a/sf-framework/src/main/java/com/sf/framework/web/service/SysLoginService.java
+++ b/sf-framework/src/main/java/com/sf/framework/web/service/SysLoginService.java
@@ -68,8 +68,10 @@ public class SysLoginService
      * @param password 密码
      * @return 结果
      */
-    public String login(String username, String password, HttpSession session)
+    public String login(String username, String password, String code, String uuid, HttpSession session)
     {
+        // 验证码校验
+        validateCaptcha(username, code, uuid);
         // 登录前置校验
         loginPreCheck(username, password);
         // 用户验证