From 638232d52546ae6237c796b128fd794a3cf99ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=BA=A2=E4=B8=BD?= <1181930680@qq.com>
Date: Sun, 29 Sep 2024 13:10:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.ts        | 26 ++++++++++++++++++++++++++
 src/store/modules/user.ts     |  5 +++--
 src/views/login/LoginForm.vue |  3 ++-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index a382f5c..74d1830 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -37,6 +37,32 @@ export function login(params) {
     },
   );
 }
+export function login2(data) {
+  const formData = new FormData();
+  formData.append("username", data.username);
+  formData.append("password", data.password);
+  formData.append("code", data.code);
+  formData.append("grant_type", data.grant_type);
+  return http.request<BasicResponseModel>(
+    {
+      url: '/auth/oauth2/token',
+      auth:{
+        ...data
+      },
+      method: 'POST',
+      data: {
+        ...data
+      },
+      headers: {
+        "Content-Type": "application/json;charset=UTF-8",
+        Authorization: "Basic YWRtaW46MTIzNDU2", // 客户端信息Base64明文：mall-admin:123456
+      },
+    },
+    {
+      isTransformResponse: false,
+    },
+  );
+}
 
 /**
  * @description: 用户登录
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 1687334..1154135 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -5,7 +5,7 @@ import { ACCESS_TOKEN, CURRENT_USER, IS_LOCKSCREEN } from '@/store/mutation-type
 import { ResultEnum } from '@/enums/httpEnum';
 
 const Storage = createStorage({ storage: localStorage });
-import { getUserInfo, login } from '@/api/system/user';
+import { getUserInfo, login,login2 } from '@/api/system/user';
 import { storage } from '@/utils/Storage';
 
 export interface IUserState {
@@ -60,7 +60,8 @@ export const useUserStore = defineStore({
     // 登录
     async login(userInfo) {
       try {
-        const response = await login(userInfo);
+        // const response = await login(userInfo);
+        const response = await login2(userInfo);
         const {code,data } = response;
         if (code === ResultEnum.SUCCESS) {
           const ex = 7 * 24 * 60 * 60 * 1000;
diff --git a/src/views/login/LoginForm.vue b/src/views/login/LoginForm.vue
index f8aafa5..987f7cc 100644
--- a/src/views/login/LoginForm.vue
+++ b/src/views/login/LoginForm.vue
@@ -135,7 +135,8 @@
           username:formInline.username,
           password:formInline.password,
           code:formInline.code,
-          key:formInline.key
+          key:formInline.key,
+          grant_type:"password"
         };
 
         try {