From 4d7dc3a400b3396a4d44478bd436bc13855ef9b1 Mon Sep 17 00:00:00 2001
From: haoxr <1490493387@qq.com>
Date: Thu, 22 Jun 2023 05:36:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?docs:=20:memo:=20=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E4=BA=A4=E6=B5=81=E7=BE=A4=E5=8A=A0=E5=85=A5=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Former-commit-id: 153f9587dd59bf02f4369fac553ac310037ddc90
---
README.md | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index d10bd5e6..c4f23b88 100644
--- a/README.md
+++ b/README.md
@@ -148,15 +148,13 @@ server {

-## 公众号🎉
+## 交流群🚀
> 无广告,佛系公众号,随缘更新开源组织成员技术分享,期待您的关注!
-
+如果交流群的二维码过期,请加我微信,备注「前端」、「后端」或「全栈」即可,我将邀请您加入对应的微信群。
-## 交流群🚀
-
-> 如果交流群的二维码过期,请加我微信,备注「前端」、「后端」或「全栈」即可,我将邀请您加入对应的微信群。
-
-
+|公众号|交流群|
+|-|-|
+|
|
|
From fc9dae4d859c22f33fc42d111485282cea2283a2 Mon Sep 17 00:00:00 2001
From: haoxr <1490493387@qq.com>
Date: Thu, 22 Jun 2023 05:36:51 +0800
Subject: [PATCH 2/3] =?UTF-8?q?docs:=20:memo:=20=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E4=BA=A4=E6=B5=81=E7=BE=A4=E5=8A=A0=E5=85=A5=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Former-commit-id: db69d6e749e1b64d7f94069229426d52aa51fa90
---
README.md | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index c4f23b88..19fb7631 100644
--- a/README.md
+++ b/README.md
@@ -150,11 +150,13 @@ server {
## 交流群🚀
-> 无广告,佛系公众号,随缘更新开源组织成员技术分享,期待您的关注!
-
-如果交流群的二维码过期,请加我微信,备注「前端」、「后端」或「全栈」即可,我将邀请您加入对应的微信群。
+> 关注「有来技术」公众号,获取交流群二维码。
+>
+> 如果交流群的二维码过期,加我微信,备注「前端」、「后端」或「全栈」即可。
+>
+> 为了避免营销广告人群混入,此举无奈,望理解!
|公众号|交流群|
|-|-|
-|
|
|
+|
|
|
From ccdbaf7ce658fd967384450e6610714d5c0bcfb4 Mon Sep 17 00:00:00 2001
From: haoxr <1490493387@qq.com>
Date: Sat, 24 Jun 2023 23:50:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20=E7=99=BB=E5=BD=95=E8=A1=A8?=
=?UTF-8?q?=E5=8D=95=E5=8F=82=E6=95=B0=E4=BB=8EURL=E7=A7=BB=E5=85=A5?=
=?UTF-8?q?=E5=88=B0=E8=AF=B7=E6=B1=82=E4=BD=93=E7=9A=84FormData?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Former-commit-id: 474e69601fc257661fe8bed68f45c62990613cd0
---
src/api/auth/index.ts | 30 ++++++++++++++++++------------
src/api/auth/types.ts | 5 ++---
2 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/api/auth/index.ts b/src/api/auth/index.ts
index d75d67b1..92663750 100644
--- a/src/api/auth/index.ts
+++ b/src/api/auth/index.ts
@@ -1,6 +1,6 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { CaptchaResult, LoginData, LoginResult } from './types';
+import request from "@/utils/request";
+import { AxiosPromise } from "axios";
+import { CaptchaResult, LoginData, LoginResult } from "./types";
/**
* 登录API
@@ -9,10 +9,18 @@ import { CaptchaResult, LoginData, LoginResult } from './types';
* @returns
*/
export function loginApi(data: LoginData): AxiosPromise {
+ const formData = new FormData();
+ formData.append("username", data.username);
+ formData.append("password", data.password);
+ formData.append("verifyCodeKey", data.verifyCodeKey || "");
+ formData.append("verifyCode", data.verifyCode || "");
return request({
- url: '/api/v1/auth/login',
- method: 'post',
- params: data
+ url: "/api/v1/auth/login",
+ method: "post",
+ data: formData,
+ headers: {
+ "Content-Type": "multipart/form-data",
+ },
});
}
@@ -21,19 +29,17 @@ export function loginApi(data: LoginData): AxiosPromise {
*/
export function logoutApi() {
return request({
- url: '/api/v1/auth/logout',
- method: 'delete'
+ url: "/api/v1/auth/logout",
+ method: "delete",
});
}
-
-
/**
* 获取验证码
*/
export function getCaptchaApi(): AxiosPromise {
return request({
- url: '/api/v1/auth/captcha',
- method: 'get'
+ url: "/api/v1/auth/captcha",
+ method: "get",
});
}
diff --git a/src/api/auth/types.ts b/src/api/auth/types.ts
index dcc47d09..858f1d9e 100644
--- a/src/api/auth/types.ts
+++ b/src/api/auth/types.ts
@@ -5,11 +5,11 @@ export interface LoginData {
/**
* 用户名
*/
- username?: string;
+ username: string;
/**
* 密码
*/
- password?: string;
+ password: string;
/**
* 验证码缓存key
@@ -57,4 +57,3 @@ export interface CaptchaResult {
*/
verifyCodeBase64: string;
}
-