From 35e2964b491b95cc8fafda255274a3d90d584cdb Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sat, 4 Feb 2023 13:16:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=9A=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=89=8D=E7=AB=AF=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 continew-admin-ui/src/api/auth/login.ts       |  10 +-
 .../src/views/login/components/login-form.vue | 190 ++++++++----------
 continew-admin-ui/src/views/login/index.vue   |   9 +-
 3 files changed, 95 insertions(+), 114 deletions(-)

diff --git a/continew-admin-ui/src/api/auth/login.ts b/continew-admin-ui/src/api/auth/login.ts
index 4a9533d8..f4377be0 100644
--- a/continew-admin-ui/src/api/auth/login.ts
+++ b/continew-admin-ui/src/api/auth/login.ts
@@ -2,25 +2,29 @@ import axios from 'axios';
 import type { RouteRecordNormalized } from 'vue-router';
 import { UserState } from '@/store/modules/login/types';
 
+const BASE_URL = '/auth';
+
 export interface LoginReq {
   username: string;
   password: string;
   captcha: string;
   uuid: string;
 }
+
 export interface LoginRes {
   token: string;
 }
+
 export function login(req: LoginReq) {
-  return axios.post<LoginRes>('/auth/login', req);
+  return axios.post<LoginRes>(`${BASE_URL}/login`, req);
 }
 
 export function logout() {
-  return axios.post('/auth/logout');
+  return axios.post(`${BASE_URL}/logout`);
 }
 
 export function getUserInfo() {
-  return axios.get<UserState>('/auth/user/info');
+  return axios.get<UserState>(`${BASE_URL}/user/info`);
 }
 
 export function getMenuList() {
diff --git a/continew-admin-ui/src/views/login/components/login-form.vue b/continew-admin-ui/src/views/login/components/login-form.vue
index 0150e589..c7c400cc 100644
--- a/continew-admin-ui/src/views/login/components/login-form.vue
+++ b/continew-admin-ui/src/views/login/components/login-form.vue
@@ -2,66 +2,46 @@
   <div class="login-form-wrapper">
     <div class="login-form-title">{{ $t('login.form.title') }}</div>
     <div class="login-form-sub-title">{{ $t('login.form.subTitle') }}</div>
-    <div class="login-form-error-msg">{{ errorMessage }}</div>
     <a-form
       ref="formRef"
-      :model="formData"
+      :model="form"
       :rules="rules"
-      class="login-form"
       layout="vertical"
+      class="login-form"
       @submit="handleLogin"
     >
-      <a-form-item
-        field="username"
-        :validate-trigger="['change', 'blur']"
-        hide-label
-      >
+      <a-form-item field="username" hide-label>
         <a-input
-          v-model="formData.username"
+          v-model="form.username"
           :placeholder="$t('login.form.placeholder.username')"
-          size="large"
           max-length="50"
+          size="large"
         >
-          <template #prefix>
-            <icon-user />
-          </template>
+          <template #prefix><icon-user /></template>
         </a-input>
       </a-form-item>
-      <a-form-item
-        field="password"
-        :validate-trigger="['change', 'blur']"
-        hide-label
-      >
+      <a-form-item field="password" hide-label>
         <a-input-password
-          v-model="formData.password"
+          v-model="form.password"
           :placeholder="$t('login.form.placeholder.password')"
-          size="large"
-          allow-clear
           max-length="32"
+          allow-clear
+          size="large"
         >
-          <template #prefix>
-            <icon-lock />
-          </template>
+          <template #prefix><icon-lock /></template>
         </a-input-password>
       </a-form-item>
-      <a-form-item
-        class="login-form-captcha"
-        field="captcha"
-        :validate-trigger="['change', 'blur']"
-        hide-label
-      >
+      <a-form-item class="login-form-captcha" field="captcha" hide-label>
         <a-input
-          v-model="formData.captcha"
+          v-model="form.captcha"
           :placeholder="$t('login.form.placeholder.captcha')"
+          allow-clear
           size="large"
           style="width: 63%"
-          allow-clear
         >
-          <template #prefix>
-            <icon-check-circle />
-          </template>
+          <template #prefix><icon-check-circle /></template>
         </a-input>
-        <img :src="captchaImgBase64" @click="getCaptcha" :alt="$t('login.form.captcha')">
+        <img :src="captchaImgBase64" :alt="$t('login.form.captcha')" @click="getCaptcha">
       </a-form-item>
       <a-space :size="16" direction="vertical">
         <div class="login-form-remember-me">
@@ -73,7 +53,7 @@
             {{ $t('login.form.rememberMe') }}
           </a-checkbox>
         </div>
-        <a-button type="primary" size="large" html-type="submit" long :loading="loading">
+        <a-button :loading="loading" type="primary" size="large" long html-type="submit">
           {{ $t('login.form.login') }}
         </a-button>
       </a-space>
@@ -82,23 +62,23 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, reactive, computed, onMounted } from 'vue';
-  import { useRouter } from 'vue-router';
-  import { FieldRule, Message } from '@arco-design/web-vue';
-  import { ValidatedError } from '@arco-design/web-vue/es/form/interface';
+import { getCurrentInstance, ref, toRefs, reactive, computed } from "vue";
+  import { FieldRule, ValidatedError } from '@arco-design/web-vue';
+  import { LoginReq } from '@/api/auth/login';
   import { useI18n } from 'vue-i18n';
-  // import debug from '@/utils/env';
-  import { encryptByRsa } from '@/utils/encrypt';
+  import { useRouter } from 'vue-router';
   import { useStorage } from '@vueuse/core';
   import { useLoginStore } from '@/store';
-  import useLoading from '@/hooks/loading';
+  import { encryptByRsa } from '@/utils/encrypt';
+  // import debug from '@/utils/env';
 
+  const { proxy } = getCurrentInstance() as any;
+
+  const captchaImgBase64 = ref('');
+  const loginStore = useLoginStore();
+  const loading = ref(false);
   const { t } = useI18n();
   const router = useRouter();
-  const { loading, setLoading } = useLoading();
-  const loginStore = useLoginStore();
-  const errorMessage = ref('');
-  const captchaImgBase64 = ref('');
   const loginConfig = useStorage('login-config', {
     rememberMe: true,
     username: 'admin', // 演示默认值
@@ -106,59 +86,56 @@
     // username: !debug ? '' : 'admin', // 演示默认值
     // password: !debug ? '' : 'admin123', // 演示默认值
   });
-  const formData = reactive({
-    username: loginConfig.value.username,
-    password: loginConfig.value.password,
-    captcha: '',
-    uuid: '',
-  });
-  const rules = computed((): Record<string, FieldRule[]> => {
-    return {
-      username: [
-        { required: true, message: t('login.form.error.required.username') }
-      ],
-      password: [
-        { required: true, message: t('login.form.error.required.password') }
-      ],
-      captcha: [
-        { required: true, message: t('login.form.error.required.captcha') }
-      ],
-    }
-  });
 
-  // 获取验证码
-  const getCaptcha = async () => {
-    const { data } = await loginStore.getImgCaptcha()
-    formData.uuid = data.uuid
-    captchaImgBase64.value = data.img
-  }
-  onMounted(() => {
-    getCaptcha();
-  })
+  const data = reactive({
+    // 表单数据
+    form: {
+      username: loginConfig.value.username,
+      password: loginConfig.value.password,
+      captcha: '',
+      uuid: '',
+    } as LoginReq,
+    // 表单验证规则
+    rules: computed((): Record<string, FieldRule[]> => {
+      return {
+        username: [{ required: true, message: t('login.form.error.required.username') }],
+        password: [{ required: true, message: t('login.form.error.required.password') }],
+        captcha: [{ required: true, message: t('login.form.error.required.captcha') }],
+      }
+    }),
+  });
+  const { form, rules } = toRefs(data);
 
-  // 记住我
-  const setRememberMe = (value: boolean) => {
-    loginConfig.value.rememberMe = value;
+  /**
+   * 获取验证码
+   */
+  const getCaptcha = () => {
+    loginStore.getImgCaptcha().then((res) => {
+      form.value.uuid = res.data.uuid;
+      captchaImgBase64.value = res.data.img;
+    });
   };
+  getCaptcha();
 
-  // 登录处理
-  const handleLogin = async ({
-    errors,
-    values,
-  }: {
+  /**
+   * 登录
+   *
+   * @param errors 表单验证错误
+   * @param values 表单数据
+   */
+  const handleLogin = ({ errors, values, }: {
     errors: Record<string, ValidatedError> | undefined;
     values: Record<string, any>;
   }) => {
     if (loading.value) return;
     if (!errors) {
-      setLoading(true);
-      try {
-        await loginStore.login({
-          username: values.username,
-          password: encryptByRsa(values.password) || '',
-          captcha: values.captcha,
-          uuid: values.uuid
-        });
+      loading.value = true;
+      loginStore.login({
+        username: values.username,
+        password: encryptByRsa(values.password) || '',
+        captcha: values.captcha,
+        uuid: values.uuid
+      }).then(() => {
         const { redirect, ...othersQuery } = router.currentRoute.value.query;
         router.push({
           name: (redirect as string) || 'Workplace',
@@ -166,21 +143,32 @@
             ...othersQuery,
           },
         });
-        Message.success(t('login.form.login.success'));
         const { rememberMe } = loginConfig.value;
         const { username } = values;
         loginConfig.value.username = rememberMe ? username : '';
-      } catch (err) {
-        await getCaptcha();
-      } finally {
-        setLoading(false);
-      }
+        proxy.$message.success(t('login.form.login.success'));
+      }).catch(() => {
+        getCaptcha();
+      }).finally(() => {
+        loading.value = false;
+      });
     }
   };
+
+  /**
+   * 记住我
+   *
+   * @param value 是否记住我
+   */
+  const setRememberMe = (value: boolean) => {
+    loginConfig.value.rememberMe = value;
+  };
 </script>
 
 <style lang="less" scoped>
   .login-form {
+    margin-top: 32px;
+
     &-wrapper {
       width: 320px;
     }
@@ -198,12 +186,6 @@
       line-height: 24px;
     }
 
-    &-error-msg {
-      height: 32px;
-      color: rgb(var(--red-6));
-      line-height: 32px;
-    }
-
     &-captcha img {
       width: 111px;
       height: 36px;
diff --git a/continew-admin-ui/src/views/login/index.vue b/continew-admin-ui/src/views/login/index.vue
index 543bea27..b7c503b6 100644
--- a/continew-admin-ui/src/views/login/index.vue
+++ b/continew-admin-ui/src/views/login/index.vue
@@ -1,10 +1,7 @@
 <template>
   <div class="container">
     <div class="logo">
-      <img
-        alt="logo"
-        src="/logo.svg"
-      />
+      <img src="/logo.svg" alt="logo" />
       <div class="logo-text">{{ $t('title') }}</div>
     </div>
     <LoginBanner />
@@ -67,9 +64,7 @@
       font-size: 20px;
     }
   }
-</style>
 
-<style lang="less" scoped>
   @media (max-width: @screen-lg) {
     .container {
       .banner {
@@ -77,4 +72,4 @@
       }
     }
   }
-</style>
+</style>
\ No newline at end of file