Skip to content

Commit c733a28

Browse files
committed
chore
1 parent 5f05422 commit c733a28

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public Object login(@RequestBody String body, HttpServletRequest request) {
111111
currentUser.login(new UsernamePasswordToken(username, password));
112112
} catch (UnknownAccountException uae) {
113113
logHelper.logAuthFail("登录", "用户帐号或密码不正确");
114-
return ResponseUtil.fail(ADMIN_INVALID_ACCOUNT, "用户帐号或密码不正确");
114+
return ResponseUtil.fail(ADMIN_INVALID_ACCOUNT, "用户帐号或密码不正确", doKaptcha(request));
115115
} catch (LockedAccountException lae) {
116116
logHelper.logAuthFail("登录", "用户帐号已锁定不可用");
117117
return ResponseUtil.fail(ADMIN_INVALID_ACCOUNT, "用户帐号已锁定不可用");

litemall-admin/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"@tinymce/tinymce-vue": "3.0.1",
4747
"lodash": "^4.17.11",
4848
"v-charts": "1.19.0",
49-
"axios": "0.18.1",
49+
"axios": "0.21.1",
5050
"clipboard": "2.0.4",
5151
"connect": "3.6.6",
5252
"echarts": "4.2.1",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ export default {
113113
this.loading = false
114114
this.$router.push({ path: this.redirect || '/' })
115115
}).catch(response => {
116-
if (response.data.errno === 606 || response.data.errno === 605) {
116+
if (response.data.data) {
117117
this.codeImg = response.data.data
118118
}
119119
this.$notify.error({

0 commit comments

Comments
 (0)