diff --git a/api/user/login.go b/api/user/login.go index e8f241b..e4143ec 100644 --- a/api/user/login.go +++ b/api/user/login.go @@ -65,7 +65,7 @@ func userLogin(x *vigo.X) (any, error) { } err = query.First(user).Error if err != nil { - return nil, err + return nil, vigo.ErrNotFound } logv.Info().Str("user", user.ID).Msg("login") code, err := base64.URLEncoding.DecodeString(opts.Code) diff --git a/ui/env.js b/ui/env.js index 8066815..5c8eae1 100644 --- a/ui/env.js +++ b/ui/env.js @@ -2,7 +2,6 @@ import routes from './routes.js' import token from './token.js' export default ($env) => { - console.log($env, $vyes.root) token.setBaseUrl($env.root) token.wrapAxios($env.$axios) $env.$G.token = token @@ -27,10 +26,10 @@ export default ($env) => { } }; $env.$axios.interceptors.response.use(function(response) { + console.log(response) return response?.data || response; }, function(error) { - console.error('Axios Error:', error); error = error?.response?.data || error?.response || error - return Promise.reject(error.message || error); + return Promise.reject(error); }); } diff --git a/ui/page/login.html b/ui/page/login.html index c44671d..7b011b3 100644 --- a/ui/page/login.html +++ b/ui/page/login.html @@ -377,7 +377,7 @@ const response = await $axios.post('/api/user', { username: signUpForm.username, code: btoa(signUpForm.password), - }); + }, {noretry: true}); if (response) { alert('注册成功！'); switchToSignIn(); @@ -395,13 +395,17 @@ const loginResponse = await $axios.post('/api/user/login', { username: signInForm.username, code: btoa(signInForm.password), - }); - if (loginResponse) { + }, {noretry: true}); + if (loginResponse && typeof loginResponse === 'string') { localStorage.setItem('refresh', loginResponse) window.location.href = redirect + } else { + console.warn('登录失败，服务器返回异常数据', loginResponse); + $message.warning('服务器异常'); } } catch (error) { - alert(error.message || '登录失败，请检查您的凭据。'); + console.warn(error.message || error) + $message.warning('登录失败，请检查您的凭据。'); } }; diff --git a/ui/page/login2.html b/ui/page/login2.html deleted file mode 100644 index f520eff..0000000 --- a/ui/page/login2.html +++ /dev/null @@ -1,396 +0,0 @@ - - - - - - Login - - - - -
-
-
- -
OneAuth
-
-
-
- -
-
- -
-
- -
-
- - -
-
-
-
- -
-
- - -
-
- - -
-
- - - - diff --git a/ui/token.js b/ui/token.js index c1e2f06..f576779 100644 --- a/ui/token.js +++ b/ui/token.js @@ -69,7 +69,7 @@ class TokenService { const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/'); return JSON.parse(window.atob(base64)); } catch (error) { - console.warn('Token解析失败:', error); + console.info('Token解析失败:', error); return null; } } @@ -173,7 +173,7 @@ class TokenService { // 检查错误响应状态码是否为 401 (未授权) // 并且确保这不是一个已经重试过的请求 (通过 originalRequest._retry 标记) - if (error.response && error.response.status === 401) { + if (error.response && error.response.status === 401 && !originalRequest.noretry) { // 统计该请求的重试次数 originalRequest.__retryCount = originalRequest.__retryCount || 0;