diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/shiro/service/LoginService.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/shiro/service/LoginService.java
index 0f20c934..1ba5164f 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/shiro/service/LoginService.java
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/shiro/service/LoginService.java
@@ -41,11 +41,11 @@ public class LoginService
     public User login(String username, String password)
     {
         // 验证码校验
-//        if (!StringUtils.isEmpty(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA)))
-//        {
-//            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
-//            throw new CaptchaException();
-//        }
+        if (!StringUtils.isEmpty(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA)))
+        {
+            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
+            throw new CaptchaException();
+        }
         // 用户名或密码为空 错误
         if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password))
         {
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/login.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/login.html
index 8611e6e1..58630d91 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/login.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/login.html
@@ -56,17 +56,17 @@
                                 <div class="form-group">
                                     <input id="login-password" type="password" name="password" required data-msg="请输入密码" placeholder="密码" class="input-material">
                                 </div>
-                                <!--<div class="form-group" th:if="${captchaEnabled==true}">-->
-                                    <!--&lt;!&ndash;<div class="col-xs-6">&ndash;&gt;-->
-                                        <!--<input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" autocomplete="off">-->
-                                        <!--<a href="javascript:void(0);" title="点击更换验证码">-->
-                                            <!--<img th:src="@{captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/>-->
-                                        <!--</a>-->
-                                    <!--</div>-->
+                                <div class="form-group" th:if="${captchaEnabled==true}">
                                     <!--<div class="col-xs-6">-->
+                                        <input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" autocomplete="off">
+                                        <a href="javascript:void(0);" title="点击更换验证码">
+                                            <img th:src="@{captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/>
+                                        </a>
+                                    </div>
+                                    <div class="col-xs-6">
 
-                                    <!--</div>-->
-                                <!--</div>-->
+                                    </div>
+                                </div>
                                 <button id="login" type="submit" class="btn btn-primary">登录</button>
                                 <div style="margin-top: -40px;">
 
@@ -142,6 +142,15 @@
         /*if(localStorage.getItem("name")!=null){
             $("#login-username").val(localStorage.getItem("name"));
         }*/
+
+        $(function() {
+            $('.imgcode').click(function() {
+                var url = ctx + "captcha/captchaImage?type=" + captchaType + "&s=" + Math.random();
+                $(".imgcode").attr("src", url);
+            });
+        });
+
+
         /*登录*/
         $("#login").click(function(){
             login();
@@ -162,12 +171,14 @@
         //var rememberMe = false;
         var userName=$("#login-username").val();
         var passWord=$("#login-password").val();
+        var validateCode=$("[name = 'validateCode']").val();
         $.ajax({
             type: "post",
             url: ctx + "login",
             data: {
                 "username": userName,
-                "password": Encrypt(passWord)
+                "password": Encrypt(passWord),
+                "validateCode": validateCode
                 //"rememberMe": rememberMe
             },
             success: function(r) {