diff --git a/Admin.NET/Admin.NET.Core/Utils/AggregationBuilder.cs b/Admin.NET/Admin.NET.Core/Utils/AggregationBuilder.cs index 235346ac..1516e17f 100644 --- a/Admin.NET/Admin.NET.Core/Utils/AggregationBuilder.cs +++ b/Admin.NET/Admin.NET.Core/Utils/AggregationBuilder.cs @@ -98,9 +98,9 @@ public class AggregationBuilder return fields .Where(f => !string.IsNullOrWhiteSpace(f)) .Select(f => f.Trim()) - .Where(f => targetType.GetProperty( - targetType == typeof(UsagetokenOutput) ? - $"{f}Sum" : f) != null) + // .Where(f => targetType.GetProperty( + // targetType == typeof(UsagetokenOutput) ? + // $"{f}Sum" : f) != null) .ToList(); } } diff --git a/Web/src/i18n/pages/login/de.ts b/Web/src/i18n/pages/login/de.ts index a6b9aa40..9c9b6896 100644 --- a/Web/src/i18n/pages/login/de.ts +++ b/Web/src/i18n/pages/login/de.ts @@ -19,6 +19,9 @@ export default { codeNeed: 'Bitte geben Sie den Verifizierungscode ein', splitslive: 'Bitte halten Sie den Schieberegler fest', success: 'Überprüfung erfolgreich', + loginfail: 'Anmeldung fehlgeschlagen, bitte überprüfen Sie Ihre Anmeldeinformationen', + notprivilege: 'Entschuldigung, Sie haben keine Anmeldeberechtigung', + captchaExpired: 'Code abgelaufen', }, mobile: { placeholder1: 'Bitte Mobiltelefonnummer eingeben', @@ -27,6 +30,8 @@ export default { btnText: 'Anmelden', msgText: 'Wichtiger Hinweis: Es wird empfohlen, Google, Microsoft Edge Version 79.0.1072.62 oder höher und den 360-Browser im Schnellmodus zu verwenden', + loginfail: 'Anmeldung fehlgeschlagen, bitte überprüfen Sie Ihre Anmeldeinformationen', + retry: '{duration} Sekunden nachdem der Code erneut angefordert wird', }, scan: { text: 'Öffnen Sie Ihr Mobiltelefon zum Scannen und melden Sie sich schnell an / registrieren Sie sich', diff --git a/Web/src/i18n/pages/login/en.ts b/Web/src/i18n/pages/login/en.ts index 395d7baf..f8c39def 100644 --- a/Web/src/i18n/pages/login/en.ts +++ b/Web/src/i18n/pages/login/en.ts @@ -19,12 +19,17 @@ export default { codeNeed: 'Please enter the verification code', splitslive: 'Please hold down the slider to drag', success: 'Verification passed', + loginfail: 'Login failed, please check your account password!', + notprivilege: 'Sorry, you do not have login permission', + captchaExpired: 'code expired', }, mobile: { placeholder1: 'Please input mobile phone number', placeholder2: 'Please enter the verification code', codeText: 'Get code', btnText: 'Sign in', + loginfail: 'Login failed, please check your account!', + retry: '{duration} seconds after the code is requested again', msgText: 'Warm tip: it is recommended to use Google, Microsoft edge, version 79.0.1072.62 and above browsers, and 360 browser, please use speed mode', }, diff --git a/Web/src/i18n/pages/login/es.ts b/Web/src/i18n/pages/login/es.ts index ace89397..1a58903e 100644 --- a/Web/src/i18n/pages/login/es.ts +++ b/Web/src/i18n/pages/login/es.ts @@ -19,12 +19,17 @@ export default { codeNeed: 'Por favor, introduce el código de verificación', splitslive: 'Por favor, mantén el deslizador', success: 'Verificación superada', + loginfail: 'Inicio de sesión fallido, por favor, verifica tus credenciales', + notprivilege: 'Lo siento, no tienes permiso para iniciar sesión', + captchaExpired: 'código expirado', }, mobile: { placeholder1: 'Por favor, introduce el número de teléfono móvil', placeholder2: 'Por favor, introduce el código de verificación', codeText: 'Obtener código', btnText: 'Iniciar sesión', + loginfail: 'Inicio de sesión fallido, por favor, verifica tus credenciales', + retry: '{duration} segundos después de que se solicite el código nuevamente', msgText: 'Consejo importante: se recomienda usar Google, Microsoft Edge versión 79.0.1072.62 o superior y el navegador 360 en modo rápido', }, diff --git a/Web/src/i18n/pages/login/fi.ts b/Web/src/i18n/pages/login/fi.ts index c14254f4..5c0d9ce9 100644 --- a/Web/src/i18n/pages/login/fi.ts +++ b/Web/src/i18n/pages/login/fi.ts @@ -19,12 +19,17 @@ export default { codeNeed: 'Syötä vahvistuskoodi', splitslive: 'Sulje liukusäädin', success: 'Vahvistus onnistui', + loginfail: 'Kirjautuminen epäonnistui, tarkista käyttäjätunnus ja salasana', + notprivilege: 'Anteeksi, sinulla ei ole kirjautumisluottoa', + captchaExpired: 'koodi vanhentunut', }, mobile: { placeholder1: 'Syötä matkapuhelinnumero', placeholder2: 'Syötä vahvistuskoodi', codeText: 'Hanki koodi', btnText: 'Kirjaudu sisään', + loginfail: 'Kirjautuminen epäonnistui, tarkista käyttäjätunnus', + retry: '{duration} sekunnin kuluttua koodi pyydetään uudestaan', msgText: 'Tärkeä huomautus: on suositeltavaa käyttää Google-, Microsoft Edge -versiota 79.0.1072.62 tai uudempaa ja 360-selainta nopeustilassa', }, diff --git a/Web/src/i18n/pages/login/fr.ts b/Web/src/i18n/pages/login/fr.ts index f817f1ac..16d49ee1 100644 --- a/Web/src/i18n/pages/login/fr.ts +++ b/Web/src/i18n/pages/login/fr.ts @@ -19,12 +19,17 @@ export default { codeNeed: 'Veuillez saisir le code de vérification', splitslive: 'Veuillez maintenir le curseur', success: 'Vérification réussie', + loginfail: 'Connexion échouée, veuillez vérifier vos informations de connexion', + notprivilege: 'Désolé, vous n\'avez pas de permission de connexion', + captchaExpired: 'code expiré', }, mobile: { placeholder1: 'Veuillez saisir le numéro de téléphone mobile', placeholder2: 'Veuillez saisir le code de vérification', codeText: 'Obtenir le code', btnText: 'Se connecter', + loginfail: 'Connexion échouée, veuillez vérifier votre compte', + retry: '{duration} secondes après que le code soit demandé à nouveau', msgText: 'Conseil important : il est recommandé d\'utiliser Google, Microsoft Edge version 79.0.1072.62 ou supérieure et le navigateur 360 en mode rapide', }, diff --git a/Web/src/i18n/pages/login/it.ts b/Web/src/i18n/pages/login/it.ts index 05c8bcbf..befb2525 100644 --- a/Web/src/i18n/pages/login/it.ts +++ b/Web/src/i18n/pages/login/it.ts @@ -19,12 +19,17 @@ export default { codeNeed: 'Inserisci il codice di verifica', splitslive: 'Tieni premuto lo scorrimento', success: 'Verifica superata', + loginfail: 'Accesso fallito, per favore controlla le tue credenziali', + notprivilege: 'Scusa, non hai permesso di accesso', + captchaExpired: 'codice scaduto', }, mobile: { placeholder1: 'Inserisci il numero di cellulare', placeholder2: 'Inserisci il codice di verifica', codeText: 'Ottieni codice', btnText: 'Accedi', + loginfail: 'Accesso fallito, per favore controlla le tue credenziali', + retry: '{duration} secondi dopo che il codice viene richiesto di nuovo', msgText: 'Suggerimento importante: si consiglia di utilizzare Google, Microsoft Edge versione 79.0.1072.62 o superiore e il browser 360 in modalità veloce', }, diff --git a/Web/src/i18n/pages/login/ja.ts b/Web/src/i18n/pages/login/ja.ts index a9aa1113..223925f8 100644 --- a/Web/src/i18n/pages/login/ja.ts +++ b/Web/src/i18n/pages/login/ja.ts @@ -19,12 +19,17 @@ export default { codeNeed: '認証コードを入力してください', splitslive: 'スライダーを押してください', success: '認証成功', + loginfail: 'ログインに失敗しました。アカウント名とパスワードを確認してください', + notprivilege: '申し訳ありません。ログイン権限がありません', + captchaExpired: 'コードが期限切れ', }, mobile: { placeholder1: '携帯電話番号を入力してください', placeholder2: '認証コードを入力してください', codeText: 'コードを取得', btnText: 'ログイン', + loginfail: 'ログインに失敗しました。アカウント名を確認してください', + retry: '{duration}秒後にコードを再要求します', msgText: '重要なお知らせ：Google、Microsoft Edge バージョン79.0.1072.62以上、および360ブラウザの高速モードの使用を推奨します', }, diff --git a/Web/src/i18n/pages/login/ko.ts b/Web/src/i18n/pages/login/ko.ts index bc176a73..9ccd00a0 100644 --- a/Web/src/i18n/pages/login/ko.ts +++ b/Web/src/i18n/pages/login/ko.ts @@ -19,12 +19,17 @@ export default { codeNeed: '인증 코드를 입력해 주세요', splitslive: '슬라이더를 누르세요', success: '인증 성공', + loginfail: '로그인에 실패했습니다. 계정 이름과 비밀번호를 확인해 주세요', + notprivilege: '죄송합니다. 로그인 권한이 없습니다', + captchaExpired: '코드가 만료됨', }, mobile: { placeholder1: '휴대폰 번호를 입력해 주세요', placeholder2: '인증 코드를 입력해 주세요', codeText: '코드 받기', btnText: '로그인', + loginfail: '로그인에 실패했습니다. 계정 이름을 확인해 주세요', + retry: '{duration}초 후 코드를 다시 요청합니다', msgText: '중요 안내: Google, Microsoft Edge 버전 79.0.1072.62 이상 및 360 브라우저의 고속 모드 사용을 권장합니다', }, diff --git a/Web/src/i18n/pages/login/no.ts b/Web/src/i18n/pages/login/no.ts index fe2c88be..b8c1d1ed 100644 --- a/Web/src/i18n/pages/login/no.ts +++ b/Web/src/i18n/pages/login/no.ts @@ -19,12 +19,17 @@ export default { codeNeed: 'Vennligst skriv inn bekreftelseskoden', splitslive: 'Vennligst trykk på skjermen', success: 'Bekreftelse vellykket', + loginfail: 'Innlogging feilet, vennligst sjekk ditt brukernavn og passord', + notprivilege: 'Beklager, du har ikke tilgang til å logge inn', + captchaExpired: 'koden utløpt', }, mobile: { placeholder1: 'Vennligst skriv inn mobilnummer', placeholder2: 'Vennligst skriv inn bekreftelseskoden', codeText: 'Få kode', btnText: 'Logg inn', + loginfail: 'Innlogging feilet, vennligst sjekk ditt brukernavn', + retry: '{duration} sekunder etter at koden blir bedt om igjen', msgText: 'Viktig merknad: det anbefales å bruke Google, Microsoft Edge versjon 79.0.1072.62 eller nyere, og 360-nettleseren i hurtigmodus', }, diff --git a/Web/src/i18n/pages/login/pl.ts b/Web/src/i18n/pages/login/pl.ts index 05bd964d..bcfd0ca6 100644 --- a/Web/src/i18n/pages/login/pl.ts +++ b/Web/src/i18n/pages/login/pl.ts @@ -19,12 +19,17 @@ export default { codeNeed: 'Proszę wprowadzić kod weryfikacyjny', splitslive: 'Proszę nacisnąć ekran', success: 'Weryfikacja przeszła pomyślnie', + loginfail: 'Logowanie nie powiodło się, sprawdź swoje poświadczenia', + notprivilege: 'Przepraszamy, nie masz uprawnień do logowania', + captchaExpired: 'kod wygasł', }, mobile: { placeholder1: 'Proszę wprowadzić numer telefonu komórkowego', placeholder2: 'Proszę wprowadzić kod weryfikacyjny', codeText: 'Otrzymaj kod', btnText: 'Zaloguj się', + loginfail: 'Logowanie nie powiodło się, sprawdź swoje poświadczenia', + retry: '{duration} sekund po ponownym żądaniu kodu', msgText: 'Ważna informacja: zaleca się korzystanie z przeglądarki Google, Microsoft Edge w wersji 79.0.1072.62 lub nowszej oraz przeglądarki 360 w trybie szybkim', }, diff --git a/Web/src/i18n/pages/login/pt.ts b/Web/src/i18n/pages/login/pt.ts index 578c53ad..79b14c4f 100644 --- a/Web/src/i18n/pages/login/pt.ts +++ b/Web/src/i18n/pages/login/pt.ts @@ -19,12 +19,17 @@ export default { codeNeed: 'Por favor, insira o código de verificação', splitslive: 'Por favor, mantenha o deslizador', success: 'Verificação superada', + loginfail: 'Login falhou, por favor, verifique suas credenciais', + notprivilege: 'Desculpe, você não tem permissão para fazer login', + captchaExpired: 'código expirado', }, mobile: { placeholder1: 'Por favor, insira o número do celular', placeholder2: 'Por favor, insira o código de verificação', codeText: 'Obter código', btnText: 'Entrar', + loginfail: 'Login falhou, por favor, verifique suas credenciais', + retry: '{duration} segundos após o código ser solicitado novamente', msgText: 'Aviso importante: recomenda-se usar o Google, Microsoft Edge versão 79.0.1072.62 ou superior e o navegador 360 no modo rápido', }, diff --git a/Web/src/i18n/pages/login/ru.ts b/Web/src/i18n/pages/login/ru.ts index 16b34119..ca4227e8 100644 --- a/Web/src/i18n/pages/login/ru.ts +++ b/Web/src/i18n/pages/login/ru.ts @@ -19,12 +19,17 @@ export default { codeNeed: 'Пожалуйста, введите код подтверждения', splitslive: 'Пожалуйста, нажмите на экран', success: 'Версия прошла успешно', + loginfail: 'Вход не выполнен, пожалуйста, проверьте свои учетные данные', + notprivilege: 'Извините, у вас нет прав для входа', + captchaExpired: 'код истек', }, mobile: { placeholder1: 'Пожалуйста, введите номер мобильного телефона', placeholder2: 'Пожалуйста, введите код подтверждения', codeText: 'Получить код', btnText: 'Войти', + loginfail: 'Вход не выполнен, пожалуйста, проверьте свои учетные данные', + retry: '{duration} секунд после повторного запроса кода', msgText: 'Важное примечание: рекомендуется использовать Google, Microsoft Edge версии 79.0.1072.62 или выше и браузер 360 в скоростном режиме', }, diff --git a/Web/src/i18n/pages/login/zh-HK.ts b/Web/src/i18n/pages/login/zh-HK.ts index adaffd85..4f6e9164 100644 --- a/Web/src/i18n/pages/login/zh-HK.ts +++ b/Web/src/i18n/pages/login/zh-HK.ts @@ -19,12 +19,17 @@ export default { codeNeed: '請輸入驗證碼', splitslive: '請按住滑塊拖動', success: '驗證通過', + loginfail: '登入失敗，請檢查帳號密碼！', + notprivilege: '抱歉，您沒有登入權限', + captchaExpired: '驗證碼已過期', }, mobile: { placeholder1: '請輸入手機號碼', placeholder2: '請輸入驗證碼', codeText: '獲取驗證碼', btnText: '登入', + loginfail: '登入失敗，請檢查帳號！', + retry: '{duration}秒後重新獲取', msgText: '溫馨提示：建議使用 Google、Microsoft Edge 79.0.1072.62 或以上版本，以及 360 瀏覽器的極速模式', }, diff --git a/Web/src/i18n/pages/login/zh-cn.ts b/Web/src/i18n/pages/login/zh-cn.ts index 41768396..b9d82071 100644 --- a/Web/src/i18n/pages/login/zh-cn.ts +++ b/Web/src/i18n/pages/login/zh-cn.ts @@ -18,7 +18,10 @@ export default { passwordneed: '请输入密码', codeNeed: '请输入验证码', splitslive: '请按住滑块拖动', + loginfail: '登录失败，请检查账号密码！', + notprivilege: '抱歉，您没有登录权限', success: '验证通过', + captchaExpired: '验证码已过期', }, mobile: { placeholder1: '请输入手机号', @@ -26,6 +29,8 @@ export default { codeText: '获取验证码', btnText: '登 录', msgText: '* 温馨提示：建议使用谷歌、Microsoft Edge，版本 79.0.1072.62 及以上浏览器，360浏览器请使用极速模式', + loginfail: '登录失败，请检查账号！', + retry: '{duration}秒后重新获取', }, scan: { text: '打开手机扫一扫，快速登录/注册', diff --git a/Web/src/i18n/pages/login/zh-tw.ts b/Web/src/i18n/pages/login/zh-tw.ts index bbbda544..def343e9 100644 --- a/Web/src/i18n/pages/login/zh-tw.ts +++ b/Web/src/i18n/pages/login/zh-tw.ts @@ -19,12 +19,17 @@ export default { codeNeed: '請輸入驗證碼', splitslive: '請按住滑塊拖動', success: '驗證通過', + loginfail: '登入失敗，請檢查帳號密碼！', + notprivilege: '抱歉，您沒有登入權限', + captchaExpired: '驗證碼已過期', }, mobile: { placeholder1: '請輸入手機號', placeholder2: '請輸入驗證碼', codeText: '獲取驗證碼', btnText: '登入', + loginfail: '登入失敗，請檢查帳號！', + retry: '{duration}秒後重新獲取', msgText: '* 溫馨提示：建議使用穀歌、Microsoft Edge，版本79.0.1072.62及以上瀏覽器，360瀏覽器請使用極速模式', }, scan: { diff --git a/Web/src/views/login/component/account.vue b/Web/src/views/login/component/account.vue index e1f27d56..306182bc 100644 --- a/Web/src/views/login/component/account.vue +++ b/Web/src/views/login/component/account.vue @@ -1,8 +1,8 @@