chore: 优化退出登录

react-ui/src/components/RightContent/AvatarDropdown.tsx

@@ -2,6 +2,7 @@ import { clearSessionToken } from '@/access';
 import { setRemoteMenu } from '@/services/session';
 import { logout } from '@/services/system/auth';
 import { ClientInfo } from '@/types';
+import { sleep } from '@/utils/promise';
 import SessionStorage from '@/utils/sessionStorage';
 import { gotoLoginPage, oauthLogout } from '@/utils/ui';
 import { LogoutOutlined, UserOutlined } from '@ant-design/icons';
@@ -63,16 +64,15 @@ const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
    */
   const loginOut = async () => {
     oauthLogout('http://172.20.32.197:31209/oauth/logout');
-    await logout();
+    // 至少 1 秒后跳转，希望子系统能完成注销
+    await Promise.all([logout(), sleep(1000)]);
     clearSessionToken();
     setRemoteMenu(null);
     gotoLoginPage();
     const clientInfo: ClientInfo = SessionStorage.getItem(SessionStorage.clientInfoKey, true);
     if (clientInfo) {
       const { logoutUri } = clientInfo;
-      setTimeout(async () => {
-        location.replace(logoutUri);
-      }, 1000);
+      location.replace(logoutUri);
     }
   };
   const actionClassName = useEmotionCss(({ token }) => {

react-ui/src/utils/promise.ts

@@ -13,3 +13,16 @@ export async function to<T, U = any>(promise: Promise<T>): Promise<[T, null] | [
 }
 
 export default to;
+
+/**
+ * 休眠
+ * @param ms - The number of milliseconds to sleep.
+ * @return A promise that resolves after the specified amount of time.
+ */
+export function sleep(ms: number) {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve(true);
+    }, ms);
+  });
+}