init 4
This commit is contained in:
@@ -1,8 +1,8 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# shellcheck source=./_/husky.sh
|
# shellcheck source=./_/husky.sh
|
||||||
. "$(dirname "$0")/_/husky.sh"
|
#. "$(dirname "$0")/_/husky.sh"
|
||||||
|
|
||||||
PATH="/usr/local/bin:$PATH"
|
PATH="/usr/local/bin:$PATH"
|
||||||
|
|
||||||
npx --no-install commitlint --edit "$1"
|
npx --no-install commitlint --edit "$1"
|
||||||
|
|||||||
@@ -11,7 +11,8 @@ export const request = async (url: string, options: RequestInit = {}) => {
|
|||||||
|
|
||||||
// 非登录接口才添加token
|
// 非登录接口才添加token
|
||||||
if (!url.includes("/login") && token) {
|
if (!url.includes("/login") && token) {
|
||||||
defaultHeaders["Authorization"] = `Bearer ${token}`; // 添加Bearer前缀
|
// defaultHeaders["Authorization"] = `Bearer ${token}`; // 添加Bearer前缀
|
||||||
|
defaultHeaders["Authorization"] = `Bearer ${token.accessToken}`; // 添加Bearer前缀
|
||||||
}
|
}
|
||||||
|
|
||||||
const config = {
|
const config = {
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import { ref, reactive, toRaw, onMounted, onBeforeUnmount } from "vue";
|
|||||||
import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
|
import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
|
||||||
import { request, loginApi } from "@/api/utils";
|
import { request, loginApi } from "@/api/utils";
|
||||||
import { ElMessage } from "element-plus";
|
import { ElMessage } from "element-plus";
|
||||||
import { setToken } from "@/utils/auth";
|
import { setToken, getToken } from "@/utils/auth";
|
||||||
|
|
||||||
import dayIcon from "@/assets/svg/day.svg?component";
|
import dayIcon from "@/assets/svg/day.svg?component";
|
||||||
import darkIcon from "@/assets/svg/dark.svg?component";
|
import darkIcon from "@/assets/svg/dark.svg?component";
|
||||||
@@ -61,8 +61,13 @@ const onLogin = async (formEl: FormInstance | undefined) => {
|
|||||||
console.log("登录成功,开始初始化路由");
|
console.log("登录成功,开始初始化路由");
|
||||||
console.log("accessToken:", res.data.accessToken);
|
console.log("accessToken:", res.data.accessToken);
|
||||||
|
|
||||||
// 存储token
|
// 存储token 格式为 DataInfo<T>
|
||||||
setToken(res.data.accessToken);
|
//setToken(res.data.accessToken);
|
||||||
|
setToken(res.data);
|
||||||
|
|
||||||
|
// 获取token
|
||||||
|
console.log("获取token:", getToken());
|
||||||
|
console.log(getToken());
|
||||||
|
|
||||||
// 更新用户信息
|
// 更新用户信息
|
||||||
const userStore = useUserStoreHook();
|
const userStore = useUserStoreHook();
|
||||||
|
|||||||
Reference in New Issue
Block a user