diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 4825b0939..4befc844b 100755
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -48,6 +48,7 @@ class UsersController extends AbstractController
      * @apiParam {String} email          邮箱
      * @apiParam {String} password       密码
      * @apiParam {String} [code]         登录验证码
+     * @apiParam {String} [code_key]     验证码通过key验证
      * @apiParam {String} [invite]       注册邀请码
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
@@ -79,10 +80,16 @@ class UsersController extends AbstractController
             $needCode = !Base::isError(User::needCode($email));
             if ($needCode) {
                 $code = trim(Request::input('code'));
+                $codeKey = trim(Request::input('code_key'));
                 if (empty($code)) {
                     return Base::retError('请输入验证码', ['code' => 'need']);
                 }
-                if (!Captcha::check($code)) {
+                if ($codeKey) {
+                    $check = Captcha::check_api($code, $codeKey);
+                } else {
+                    $check = Captcha::check($code);
+                }
+                if (!$check) {
                     return Base::retError('请输入正确的验证码', ['code' => 'need']);
                 }
             }
diff --git a/resources/assets/js/pages/login.vue b/resources/assets/js/pages/login.vue
index 4681ca2ef..90bb74abd 100644
--- a/resources/assets/js/pages/login.vue
+++ b/resources/assets/js/pages/login.vue
@@ -88,7 +88,11 @@
                             @on-enter="onLogin"
                             clearable>
                             <Icon type="ios-checkmark-circle-outline" class="login-icon" slot="prepend"></Icon>
-                            <div slot="append" class="login-code-end" @click="reCode"><img :src="codeUrl"/></div>
+                            <div slot="append" class="login-code-end" @click="refreshCode">
+                                <div v-if="codeLoad > 0" class="code-load"><Loading/></div>
+                                <span v-else-if="codeUrl === 'error'" class="code-error">{{$L('加载失败')}}</span>
+                                <img v-else :src="codeUrl"/>
+                            </div>
                         </Input>
 
                         <Button type="primary" :loading="loadIng > 0 || loginJump" size="large" long @click="onLogin">{{$L(loginText)}}</Button>
@@ -178,7 +182,9 @@ export default {
             qrcodeLoad: false,
 
             codeNeed: false,
-            codeUrl: $A.apiUrl('users/login/codeimg?_=' + Math.random()),
+            codeLoad: 0,
+            codeKey: '',
+            codeUrl: '',
 
             loginMode: 'access',
             loginType: 'login',
@@ -398,8 +404,23 @@ export default {
             $A.modalWarning("请联系管理员！");
         },
 
-        reCode() {
-            this.codeUrl = $A.apiUrl('users/login/codeimg?_=' + Math.random())
+        refreshCode() {
+            if (this.codeLoad > 0) {
+                return;
+            }
+            setTimeout(_ => {
+                this.codeLoad++
+            }, 600)
+            this.$store.dispatch("call", {
+                url: 'users/login/codejson',
+            }).then(({data}) => {
+                this.codeKey = data.key
+                this.codeUrl = data.img
+            }).catch(_ => {
+                this.codeUrl = "error"
+            }).finally(_ => {
+                this.codeLoad--
+            });
         },
 
         inputServerUrl() {
@@ -487,12 +508,12 @@ export default {
                     email: this.email,
                 },
             }).then(() => {
-                this.reCode();
-                this.codeNeed = true;
+                this.refreshCode()
+                this.codeNeed = true
             }).catch(_ => {
-                this.codeNeed = false;
+                this.codeNeed = false
             }).finally(_ => {
-                this.loadIng--;
+                this.loadIng--
             });
         },
 
@@ -538,6 +559,7 @@ export default {
                         email: this.email,
                         password: this.password,
                         code: this.code,
+                        code_key: this.codeKey,
                         invite: this.invite,
                     },
                 }).then(({data}) => {
@@ -557,7 +579,7 @@ export default {
                         })
                     }
                     if (data.code === 'need') {
-                        this.reCode()
+                        this.refreshCode()
                         this.codeNeed = true
                     }
                 }).finally(_ => {
diff --git a/resources/assets/sass/pages/page-login.scss b/resources/assets/sass/pages/page-login.scss
index e872fd117..bc1130cb2 100644
--- a/resources/assets/sass/pages/page-login.scss
+++ b/resources/assets/sass/pages/page-login.scss
@@ -130,8 +130,23 @@
                         height: 38px;
                         overflow: hidden;
                         cursor: pointer;
+                        .code-load,
+                        .code-error {
+                            height: 100%;
+                            display: flex;
+                            align-items: center;
+                            justify-content: center;
+                            width: 20px;
+                            margin: 0 20px;
+                        }
+                        .code-error {
+                            width: auto;
+                            font-size: 14px;
+                            opacity: 0.8;
+                        }
                         img {
                             height: 100%;
+                            min-width: 60px;
                         }
                     }
                 }