linlinjava 5 years ago
parent
commit
c733a28a3e

+ 1 - 1
litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAuthController.java

@@ -111,7 +111,7 @@ public class AdminAuthController {
             currentUser.login(new UsernamePasswordToken(username, password));
         } catch (UnknownAccountException uae) {
             logHelper.logAuthFail("登录", "用户帐号或密码不正确");
-            return ResponseUtil.fail(ADMIN_INVALID_ACCOUNT, "用户帐号或密码不正确");
+            return ResponseUtil.fail(ADMIN_INVALID_ACCOUNT, "用户帐号或密码不正确", doKaptcha(request));
         } catch (LockedAccountException lae) {
             logHelper.logAuthFail("登录", "用户帐号已锁定不可用");
             return ResponseUtil.fail(ADMIN_INVALID_ACCOUNT, "用户帐号已锁定不可用");

+ 1 - 1
litemall-admin/package.json

@@ -46,7 +46,7 @@
     "@tinymce/tinymce-vue": "3.0.1",
     "lodash": "^4.17.11",
     "v-charts": "1.19.0",
-    "axios": "0.18.1",
+    "axios": "0.21.1",
     "clipboard": "2.0.4",
     "connect": "3.6.6",
     "echarts": "4.2.1",

+ 1 - 1
litemall-admin/src/views/login/index.vue

@@ -113,7 +113,7 @@ export default {
             this.loading = false
             this.$router.push({ path: this.redirect || '/' })
           }).catch(response => {
-            if (response.data.errno === 606 || response.data.errno === 605) {
+            if (response.data.data) {
               this.codeImg = response.data.data
             }
             this.$notify.error({