Skip to content

Commit bf1e2b2

Browse files
committed
fix:user sotre
1 parent df179d0 commit bf1e2b2

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

chat2db-client/src/pages/demo/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React, { useEffect } from 'react';
22

33
function Test() {
4-
const token = '1'
4+
const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOjIsImRldmljZSI6ImRlZmF1bHQtZGV2aWNlIiwiZWZmIjoxNzA2ODU0NTMwMDI3LCJyblN0ciI6Ik1RcHRPOUVBVlJlbGRQa1RFN01MZUpLeG5KTGVwRFpaIn0.knOw08E6mwWF_GpkeQ8KflQlfQuNu4jd-_Bgh7EnCj4'
55
useEffect(() => {
6-
const socket = new WebSocket(`ws://127.0.0.1:10821/api/ws/1`);
6+
const socket = new WebSocket(`ws://127.0.0.1:10821/api/ws/${token}`);
77
socket.onopen = () => {
88
console.log('open');
99
socket.send('hello');

chat2db-client/src/service/user.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const userLogout = createRequest<void, void>('/api/oauth/logout_a', {
1313
});
1414

1515
/** 获取用户信息 */
16-
const getUser = createRequest<void, IUserVO>('/api/oauth/user_a', { method: 'get' });
16+
const getUser = createRequest<void, IUserVO | null>('/api/oauth/user_a', { method: 'get' });
1717

1818
/** 获取用户列表信息 */
1919
const getUserList = createRequest<IPageParams, IPageResponse<IUser>>('/api/user/list', {

chat2db-client/src/store/user/index.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { IUserVO } from '@/typings/user';
66
import { getUser } from '@/service/user';
77

88
export interface IUserStore {
9-
curUser: IUserVO | null;
9+
curUser?: IUserVO | null;
1010
}
1111

1212
const initUserStore: IUserStore = {
@@ -35,7 +35,8 @@ export const setCurUser = (curUser: IUserVO) => {
3535
*/
3636

3737
export const queryCurUser = async () => {
38-
const curUser = await getUser();
38+
// null 表示在padding,返回 void 0(undefined)表示未登录
39+
const curUser = await getUser() || void 0;
3940
useUserStore.setState({ curUser });
4041
// 向cookie中写入当前用户id
4142
const date = new Date('2030-12-30 12:30:00').toUTCString();

0 commit comments

Comments
 (0)