diff --git a/src/pages/login/Login.tsx b/src/pages/login/Login.tsx index 752344b..0d97b06 100644 --- a/src/pages/login/Login.tsx +++ b/src/pages/login/Login.tsx @@ -15,14 +15,14 @@ export default function Login() { const onFinish = (values: any) => { console.log("Received values of form: ", values); login({ account: values["username"], password: values["password"] }).then(res => { - if (res.status !== 0) { + if (!res.success) { messageApi.open({ type: "error", content: res.data.info, }); } else { - dispatch(updateUser(res.data)); - localStorage.setItem('user',JSON.stringify(res.data)) + dispatch(updateUser({ loginFlag: true, loginUser: res.data })); + localStorage.setItem("user", JSON.stringify(res.data)); navigate("/measure/config"); } }); diff --git a/src/services/user/user.ts b/src/services/user/user.ts index d0c6bc3..8e4ec22 100644 --- a/src/services/user/user.ts +++ b/src/services/user/user.ts @@ -1,17 +1,26 @@ import httpRequest, { BaseResponse } from "../httpRequest"; +export type User = { + id: number; + account: string; + nickname: string; + password: string; + userRole: "Admin" | "User" | "Dev"; + isBuiltInUser: boolean; +}; + export function login(params: { account: string; password: string }) { - return httpRequest({ + return httpRequest>({ url: "/auth/login", - params, + params, method: "POST", }); } export function logout(params: {}) { - return httpRequest({ + return httpRequest({ url: "/auth/logout", - params, + params, method: "POST", }); }