diff --git a/internal/app/api/user.go b/internal/app/api/user.go index 0f12253..aa5e632 100644 --- a/internal/app/api/user.go +++ b/internal/app/api/user.go @@ -27,7 +27,6 @@ func (u *userApi) LoginHandler(ctx *gin.Context, req model.LoginHandlerReq) any return err } return gin.H{ - "code": 0, "token": token, "username": req.Account, "role": repository.UserRepository.GetUserByName(req.Account).Role, diff --git a/resources/src/locales/en.ts b/resources/src/locales/en.ts index c0b06f2..ab29b16 100644 --- a/resources/src/locales/en.ts +++ b/resources/src/locales/en.ts @@ -1,4 +1,9 @@ export default { + login: { + account: "Account", + password: "Password", + button: "Login", + }, common: { add: "Add", cancel: "Cancel", @@ -11,17 +16,6 @@ export default { tos: "Terms of Service", policy: "Privacy Policy", }, - login: { - title: "Sign In", - email: "Email", - password: "Password", - button: "Sign In", - orsign: "Or sign in with", - forgot: "Forgot password?", - noaccount: "Don't have an account?", - create: "Create one here", - error: "The email / password combination is invalid", - }, register: { title: "Create Account", username: "Username", @@ -34,7 +28,7 @@ export default { signin: "Sign In", }, menu: { - process: 'ProcessManager', + process: "ProcessManager", search: 'Search (press "ctrl + /" to focus)', dashboard: "Dashboard", logout: "Logout", diff --git a/resources/src/locales/zhHans.ts b/resources/src/locales/zhHans.ts index 60825fd..2a4eaf9 100644 --- a/resources/src/locales/zhHans.ts +++ b/resources/src/locales/zhHans.ts @@ -1,4 +1,9 @@ export default { + login: { + account: "账号", + password: "密码", + button: "登入", + }, common: { add: "新增", cancel: "取消", @@ -11,17 +16,6 @@ export default { tos: "服务条款", policy: "隐私政策", }, - login: { - title: "登录", - email: "电子邮件", - password: "密码", - button: "登录", - orsign: "或使用", - forgot: "忘记密码?", - noaccount: "还没有帐号?", - create: "在此处创建一个", - error: "电子邮件/密码组合无效", - }, register: { title: "创建帐号", username: "全名", @@ -34,7 +28,7 @@ export default { signin: "登录", }, menu: { - process: '进程管理', + process: "进程管理", search: "搜索(按“ Ctrl + /”进行聚焦)", dashboard: "仪表板", logout: "登出", @@ -246,4 +240,5 @@ export default { }, }, }, -}; `` +}; +``; diff --git a/resources/src/views/login/Login.vue b/resources/src/views/login/Login.vue index d492c3c..08b8420 100644 --- a/resources/src/views/login/Login.vue +++ b/resources/src/views/login/Login.vue @@ -6,7 +6,7 @@ const isLoading = ref(false); const isSignInDisabled = ref(false); const refLoginForm = ref(); -const username = ref(""); +const account = ref(""); const password = ref(""); const isFormValid = ref(true); @@ -18,7 +18,7 @@ const handleLogin = async () => { isLoading.value = true; isSignInDisabled.value = true; login({ - username: username.value, + account: account.value, password: password.value, }).then((e) => { isLoading.value = false; @@ -62,7 +62,7 @@ const resetErrors = () => { > path.replace(/^\/sdApi/, ""), },