Commit b7587db059803a6fd8ccf7bbac7e562e6157980d
1 parent
b908076a
perf: login
Showing
1 changed file
with
17 additions
and
30 deletions
yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue
| @@ -155,22 +155,7 @@ import type { RouteLocationNormalizedLoaded } from 'vue-router' | @@ -155,22 +155,7 @@ import type { RouteLocationNormalizedLoaded } from 'vue-router' | ||
| 155 | import { useI18n } from '@/hooks/web/useI18n' | 155 | import { useI18n } from '@/hooks/web/useI18n' |
| 156 | import { useIcon } from '@/hooks/web/useIcon' | 156 | import { useIcon } from '@/hooks/web/useIcon' |
| 157 | import { required } from '@/utils/formRules' | 157 | import { required } from '@/utils/formRules' |
| 158 | -import { | ||
| 159 | - setToken, | ||
| 160 | - setTenantId, | ||
| 161 | - setUsername, | ||
| 162 | - setPassword, | ||
| 163 | - setRememberMe, | ||
| 164 | - setTenantName, | ||
| 165 | - removeUsername, | ||
| 166 | - removePassword, | ||
| 167 | - removeRememberMe, | ||
| 168 | - removeTenantName, | ||
| 169 | - getUsername, | ||
| 170 | - getPassword, | ||
| 171 | - getRememberMe, | ||
| 172 | - getTenantName | ||
| 173 | -} from '@/utils/auth' | 158 | +import * as authUtil from '@/utils/auth' |
| 174 | import { decrypt } from '@/utils/jsencrypt' | 159 | import { decrypt } from '@/utils/jsencrypt' |
| 175 | import { Icon } from '@/components/Icon' | 160 | import { Icon } from '@/components/Icon' |
| 176 | import { Verify } from '@/components/Verifition' | 161 | import { Verify } from '@/components/Verifition' |
| @@ -230,14 +215,16 @@ const getCode = async () => { | @@ -230,14 +215,16 @@ const getCode = async () => { | ||
| 230 | //获取租户ID | 215 | //获取租户ID |
| 231 | const getTenantId = async () => { | 216 | const getTenantId = async () => { |
| 232 | const res = await LoginApi.getTenantIdByNameApi(loginData.loginForm.tenantName) | 217 | const res = await LoginApi.getTenantIdByNameApi(loginData.loginForm.tenantName) |
| 233 | - setTenantId(res) | 218 | + authUtil.setTenantId(res) |
| 234 | } | 219 | } |
| 235 | // 记住我 | 220 | // 记住我 |
| 236 | const getCookie = () => { | 221 | const getCookie = () => { |
| 237 | - const username = getUsername() | ||
| 238 | - const password = getPassword() ? decrypt(getPassword() as unknown as string) : undefined | ||
| 239 | - const rememberMe = getRememberMe() | ||
| 240 | - const tenantName = getTenantName() | 222 | + const username = authUtil.getUsername() |
| 223 | + const password = authUtil.getPassword() | ||
| 224 | + ? decrypt(authUtil.getPassword() as unknown as string) | ||
| 225 | + : undefined | ||
| 226 | + const rememberMe = authUtil.getRememberMe() | ||
| 227 | + const tenantName = authUtil.getTenantName() | ||
| 241 | loginData.loginForm = { | 228 | loginData.loginForm = { |
| 242 | ...loginData.loginForm, | 229 | ...loginData.loginForm, |
| 243 | username: username ? username : loginData.loginForm.username, | 230 | username: username ? username : loginData.loginForm.username, |
| @@ -266,17 +253,17 @@ const handleLogin = async (params) => { | @@ -266,17 +253,17 @@ const handleLogin = async (params) => { | ||
| 266 | background: 'rgba(0, 0, 0, 0.7)' | 253 | background: 'rgba(0, 0, 0, 0.7)' |
| 267 | }) | 254 | }) |
| 268 | if (loginData.loginForm.rememberMe) { | 255 | if (loginData.loginForm.rememberMe) { |
| 269 | - setUsername(loginData.loginForm.username) | ||
| 270 | - setPassword(loginData.loginForm.password) | ||
| 271 | - setRememberMe(loginData.loginForm.rememberMe) | ||
| 272 | - setTenantName(loginData.loginForm.tenantName) | 256 | + authUtil.setUsername(loginData.loginForm.username) |
| 257 | + authUtil.setPassword(loginData.loginForm.password) | ||
| 258 | + authUtil.setRememberMe(loginData.loginForm.rememberMe) | ||
| 259 | + authUtil.setTenantName(loginData.loginForm.tenantName) | ||
| 273 | } else { | 260 | } else { |
| 274 | - removeUsername() | ||
| 275 | - removePassword() | ||
| 276 | - removeRememberMe() | ||
| 277 | - removeTenantName() | 261 | + authUtil.removeUsername() |
| 262 | + authUtil.removePassword() | ||
| 263 | + authUtil.removeRememberMe() | ||
| 264 | + authUtil.removeTenantName() | ||
| 278 | } | 265 | } |
| 279 | - setToken(res) | 266 | + authUtil.setToken(res) |
| 280 | if (!redirect.value) { | 267 | if (!redirect.value) { |
| 281 | redirect.value = '/' | 268 | redirect.value = '/' |
| 282 | } | 269 | } |