From d5be9ce579347c31bbbc69b698cdf2ead351c502 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Wed, 28 Feb 2024 09:18:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=99=BB=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/stores/AuthStore.js | 52 ++++++++++++++++++++++-------------- src/views/AuthApp.jsx | 20 ++++++-------- src/views/DingdingQRCode.jsx | 15 +++++------ src/views/Standlone.jsx | 20 +++++++++----- 4 files changed, 61 insertions(+), 46 deletions(-) diff --git a/src/stores/AuthStore.js b/src/stores/AuthStore.js index b111120..610855c 100644 --- a/src/stores/AuthStore.js +++ b/src/stores/AuthStore.js @@ -1,19 +1,27 @@ import { create } from 'zustand' -import { devtools } from 'zustand/middleware' -import { fetchJSON, postJSON } from '@/utils/request' +import { fetchJSON } from '@/utils/request' const useAuthStore = create((set, get) => ({ // GLOBAL_SALES_LOGIN_USER // {"userId":"383","username":"廖一军","avatarUrl":"https://static-legacy.dingtalk.com/media/lALPBDDrhXr716HNAoDNAoA_640_640.png","mobile":"+86-18777396951","email":"lyj@hainatravel.com","openId":"iioljiPmZ4RPoOYpkFiSn7IKAiEiE","accountList":[{"OPI_SN":383,"OPI_Code":"LYJ","OPI_NameCN":"廖一军","OPI_DEI_SN":7,"OPI_NameEN":"Jimmy Liow"},{"OPI_SN":609,"OPI_Code":"LYJAH","OPI_NameCN":"廖一军（ah）","OPI_DEI_SN":28,"OPI_NameEN":"Jimmy Liow"}]} - loginUser: {}, + loginUser: { + userId: -1, + username: '', + avatarUrl: '', + mobile: '', + email: '', + openId: '', + accountList: [], + permissionList: [], + }, loginStatus: 0, authenticate: async (authCode) => { const { saveUserSession, updateLoginStatus } = get() - + updateLoginStatus(200) const json = await fetchJSON(`https://p9axztuwd7x8a7.mycht.cn/dingtalk/dingtalkwork/WhatsAppAuth`, { authCode }) @@ -44,26 +52,30 @@ const useAuthStore = create((set, get) => ({ })) }, + logout: () => { + window.sessionStorage.clear() + set(() => ({ + loginUser: { + userId: -1, + username: '', + avatarUrl: '', + mobile: '', + email: '', + openId: '', + accountList: [], + permissionList: [], + } + })) + + }, + loadUserSession: () => { const sessionData = window.sessionStorage.getItem('GLOBAL_SALES_LOGIN_USER') - let userData = { - userId: -1, - username: '', - avatarUrl: '', - mobile: '', - email: '', - openId: '', - accountList: [], - permissionList: [], - } if (sessionData !== null) { - userData = JSON.parse(sessionData) + set(() => ({ + loginUser: JSON.parse(sessionData) + })) } - set(() => ({ - loginUser: userData - })) - - return userData }, saveUserSession: () => { diff --git a/src/views/AuthApp.jsx b/src/views/AuthApp.jsx index c11b43a..3112a5e 100644 --- a/src/views/AuthApp.jsx +++ b/src/views/AuthApp.jsx @@ -1,18 +1,17 @@ -import { useEffect } from 'react'; -import { Outlet, Link, useHref, useNavigate, NavLink } from 'react-router-dom' -import { Layout, Menu, ConfigProvider, theme, Empty, Row, Col, Avatar, Dropdown, Space, Typography, App as AntApp } from 'antd' -import { DownOutlined } from '@ant-design/icons' import ErrorBoundary from '@/components/ErrorBoundary' -import zhLocale from 'antd/locale/zh_CN' -import { useThemeContext } from '@/stores/ThemeContext' -import { useAuthContext } from '@/stores/AuthContext' -import useConversationStore from '@/stores/ConversationStore' import useAuthStore from '@/stores/AuthStore' +import useConversationStore from '@/stores/ConversationStore' +import { useThemeContext } from '@/stores/ThemeContext' +import { DownOutlined } from '@ant-design/icons' +import { App as AntApp, Avatar, Col, ConfigProvider, Dropdown, Empty, Layout, Menu, Row, Space, Typography, theme } from 'antd' +import zhLocale from 'antd/locale/zh_CN' import 'dayjs/locale/zh-cn' +import { useEffect } from 'react' +import { Link, NavLink, Outlet, useHref, useNavigate } from 'react-router-dom' -import 'react-chat-elements/dist/main.css' import '@/assets/App.css' import AppLogo from '@/assets/logo-gh.png' +import 'react-chat-elements/dist/main.css' const { Header, Footer, Content } = Layout const { Title } = Typography @@ -112,9 +111,6 @@ function AuthApp() { > e.preventDefault()} style={{ color: colorPrimary }}> {loginUser?.username?.substring(1)}{loginUser.username}​ diff --git a/src/views/DingdingQRCode.jsx b/src/views/DingdingQRCode.jsx index 92df5df..d4b86a4 100644 --- a/src/views/DingdingQRCode.jsx +++ b/src/views/DingdingQRCode.jsx @@ -1,8 +1,7 @@ -import { Result, Spin, Flex, Typography } from 'antd' -import React, { useEffect, useState } from 'react' -import { useNavigate } from 'react-router-dom' import useAuthStore from '@/stores/AuthStore' -import { fetchJSON } from '@/utils/request' +import { Flex, Result, Spin, Typography } from 'antd' +import { useEffect } from 'react' +import { useNavigate } from 'react-router-dom' const { Title } = Typography @@ -12,11 +11,11 @@ function DingdingQRCode() { const navigate = useNavigate() - const { loginStatus, authenticate } = useAuthStore() + const { loginStatus, authenticate, logout, updateLoginStatus } = useAuthStore() useEffect (() => { - if (location.search === '?out') { - window.sessionStorage.clear() + if (location.search === '?out') { + logout() navigate('/p/dingding/qrcode') } }, []) @@ -63,7 +62,7 @@ function DingdingQRCode() { ) } else if (loginStatus === 302) { - navigate('/account/profile') + navigate('/') } else if (loginStatus === 403) { return ( diff --git a/src/views/Standlone.jsx b/src/views/Standlone.jsx index 4efac98..765890c 100644 --- a/src/views/Standlone.jsx +++ b/src/views/Standlone.jsx @@ -1,18 +1,26 @@ -import { Outlet, Link, useHref, NavLink } from 'react-router-dom' -import { useRef, useEffect, useState } from 'react' -import { Layout, Menu, ConfigProvider, theme, Empty, Row, Col, Dropdown, Space, Typography, Result, App as AntApp } from 'antd' -import { DownOutlined } from "@ant-design/icons"; import '@/assets/App.css' import AppLogo from '@/assets/logo-gh.png' +import useAuthStore from '@/stores/AuthStore' import { useThemeContext } from '@/stores/ThemeContext' -import { isEmpty } from '@/utils/commons' - +import { App as AntApp, Col, ConfigProvider, Empty, Layout, Row, Typography, theme } from 'antd' +import { NavLink, Outlet, useHref, useNavigate } from 'react-router-dom' +import { useEffect } from 'react' const { Header, Footer, Content } = Layout const { Title } = Typography function Standlone() { const {colorPrimary, borderRadius} = useThemeContext() + const { loginUser } = useAuthStore() + const navigate = useNavigate() + const href = useHref() + + useEffect(() => { + // 除了路由 /p...以外都需要登陆系统 + if (loginUser.userId > 0) { + navigate('/'); + } + }, [href]) const { token: { colorBgContainer }, From b0c2e700c74fc418ef16e2e4ea871dd6d1586885 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Wed, 28 Feb 2024 09:46:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/stores/AuthStore.js | 19 +++++++++++++------ src/views/DingdingQRCode.jsx | 6 +++--- src/views/OrderFollow.jsx | 4 ++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/stores/AuthStore.js b/src/stores/AuthStore.js index 610855c..eb7bf98 100644 --- a/src/stores/AuthStore.js +++ b/src/stores/AuthStore.js @@ -7,6 +7,7 @@ const useAuthStore = create((set, get) => ({ // {"userId":"383","username":"廖一军","avatarUrl":"https://static-legacy.dingtalk.com/media/lALPBDDrhXr716HNAoDNAoA_640_640.png","mobile":"+86-18777396951","email":"lyj@hainatravel.com","openId":"iioljiPmZ4RPoOYpkFiSn7IKAiEiE","accountList":[{"OPI_SN":383,"OPI_Code":"LYJ","OPI_NameCN":"廖一军","OPI_DEI_SN":7,"OPI_NameEN":"Jimmy Liow"},{"OPI_SN":609,"OPI_Code":"LYJAH","OPI_NameCN":"廖一军（ah）","OPI_DEI_SN":28,"OPI_NameEN":"Jimmy Liow"}]} loginUser: { userId: -1, + userIdStr: '-1', username: '', avatarUrl: '', mobile: '', @@ -18,18 +19,23 @@ const useAuthStore = create((set, get) => ({ loginStatus: 0, - authenticate: async (authCode) => { + login: async (authCode) => { - const { saveUserSession, updateLoginStatus } = get() + const { saveUserSession, setLoginStatus } = get() - updateLoginStatus(200) + setLoginStatus(200) const json = await fetchJSON(`https://p9axztuwd7x8a7.mycht.cn/dingtalk/dingtalkwork/WhatsAppAuth`, { authCode }) if (json.errcode === 0) { + + set(() => ({ loginUser: { userId: json.result.opisn, + userIdStr: json.result?.accountlist.map(acc => { + return acc.OPI_SN + }).join(','), accountName: json.result.opicode, username: json.result.nick, avatarUrl: json.result.avatarUrl, @@ -40,13 +46,13 @@ const useAuthStore = create((set, get) => ({ } })) saveUserSession() - updateLoginStatus(302) + setLoginStatus(302) } else { - updateLoginStatus(403) + setLoginStatus(403) } }, - updateLoginStatus: (code) => { + setLoginStatus: (code) => { set(() => ({ loginStatus: code })) @@ -57,6 +63,7 @@ const useAuthStore = create((set, get) => ({ set(() => ({ loginUser: { userId: -1, + userIdStr: '-1', username: '', avatarUrl: '', mobile: '', diff --git a/src/views/DingdingQRCode.jsx b/src/views/DingdingQRCode.jsx index d4b86a4..f1edae1 100644 --- a/src/views/DingdingQRCode.jsx +++ b/src/views/DingdingQRCode.jsx @@ -11,7 +11,7 @@ function DingdingQRCode() { const navigate = useNavigate() - const { loginStatus, authenticate, logout, updateLoginStatus } = useAuthStore() + const { loginStatus, login, logout, setLoginStatus } = useAuthStore() useEffect (() => { if (location.search === '?out') { @@ -38,10 +38,10 @@ function DingdingQRCode() { }, (loginResult) => { const { authCode } = loginResult - authenticate(authCode) + login(authCode) }, (errorMsg) => { - updateLoginStatus(403) + setLoginStatus(403) console.error(`Login Error: ${errorMsg}`) }, ) diff --git a/src/views/OrderFollow.jsx b/src/views/OrderFollow.jsx index 45996e2..595b822 100644 --- a/src/views/OrderFollow.jsx +++ b/src/views/OrderFollow.jsx @@ -206,7 +206,7 @@ function OrderList({ formValues }) { const [orderData, setOrderData] = useState([]) const [loading, setLoading] = useState(false) const { loginUser } = useAuthStore() - let fetchOrderUrl = `${API_HOST}/getwlorder?opisn=${loginUser.userId}&otype=${formValues.type}` + let fetchOrderUrl = `${API_HOST}/getwlorder?opisn=${loginUser.userIdStr}&otype=${formValues.type}` if (formValues.type === 'advance') { const fromDate = formValues.startDateRange[0].format('YYYY-MM-DD') @@ -219,7 +219,7 @@ function OrderList({ formValues }) { confirmThruDate = formValues.confirmDateRange[1].format('YYYY-MM-DD') } fetchOrderUrl = prepareUrl('https://p9axztuwd7x8a7.mycht.cn/whatsapp_server/getdvancedwlorder') - .append('opisn', loginUser.userId) + .append('opisn', loginUser.userIdStr) .append('startdate', fromDate) .append('enddate', thruDate) .append('tag', formValues.orderLabel)