generator-mico-cli 0.1.28 → 0.2.1

package/generators/micro-react/templates/apps/layout/src/app.tsx

@@ -3,14 +3,14 @@ import { prefetchApps } from 'qiankun';
 import { errorConfig } from './requestErrorConfig';
 // 解决「React19 中无法使用 Message/Notification」的问题。 @see https://github.com/arco-design/arco-design/issues/2900#issuecomment-2796571653
 import * as arco from '@arco-design/web-react';
-import '@arco-design/web-react/dist/css/arco.css';
-import '@arco-design/web-react/es/_util/react-19-adapter';
 import React from 'react';
 import ReactDOM from 'react-dom/client';
 
-import { getAuthInfo } from './common/auth/tool';
-import { NO_AUTH_ROUTE_LIST } from './constants';
+import { getStoredAuthToken } from './common/auth/auth-manager';
+import type { IUserInfo } from './common/auth/type';
+import { fetchUserInfo } from './services/user';
 import { extractRoutes, getWindowMenus } from './common/menu';
+import { ensureSsoSession } from './common/request/sso';
 import {
   clearMicroAppProps,
   type IMicroAppProps,
@@ -18,6 +18,7 @@ import {
 } from './common/micro';
 import { initTheme } from './common/theme';
 import MicroAppLoader from './components/MicroAppLoader';
+import { NO_AUTH_ROUTE_LIST } from './constants';
 import './global.less';
 
 // ==================== 微应用预加载 ====================
@@ -104,38 +105,48 @@ initTheme();
  * @see https://umijs.org/docs/api/runtime-config#getinitialstate
  */
 export async function getInitialState(): Promise<{
-  // FIXME: 待修改类型
   settings?: any;
-  currentUser?: any;
+  currentUser?: IUserInfo;
   loading?: boolean;
-  fetchUserInfo?: () => Promise<void>;
+  fetchUserInfo?: () => Promise<IUserInfo | null>;
 }> {
-  const fetchUserInfo = async () => {};
-  // 如果不是登录页面，执行
+  /**
+   * 获取用户信息
+   */
+  const fetchUserInfoFn = async (): Promise<IUserInfo | null> => {
+    try {
+      return await fetchUserInfo();
+    } catch (e) {
+      console.warn('[App] 获取用户信息失败', e);
+      return null;
+    }
+  };
+
   const { location } = history;
-  if (
-    !NO_AUTH_ROUTE_LIST.includes(
-      location.pathname,
-    )
-  ) {
-    const authInfo = getAuthInfo();
-    const currentUser = {
-      name: authInfo.nickname || '未知用户',
-      avatar:
-        authInfo.avatar ||
-        'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png',
-      userid: authInfo.uid,
-    };
-    return {
-      fetchUserInfo,
-      currentUser,
-    };
+  const isNoAuthRoute = NO_AUTH_ROUTE_LIST.includes(location.pathname);
+
+  // 非免认证路由：走 SSO 流程
+  if (!isNoAuthRoute) {
+    await ensureSsoSession();
   }
+
+  // 有 token 就获取用户信息（无论在哪个页面，支持登录后 refresh 场景）
+  if (getStoredAuthToken()) {
+    const userInfo = await fetchUserInfoFn();
+    if (userInfo) {
+      return {
+        fetchUserInfo: fetchUserInfoFn,
+        currentUser: userInfo,
+      };
+    }
+  }
+
   return {
-    fetchUserInfo,
+    fetchUserInfo: fetchUserInfoFn,
   };
 }
 
+
 /**
  * @name request 配置，可以配置错误处理
  * 它基于 axios 和 ahooks 的 useRequest 提供了一套统一的网络请求和错误处理方案。
@@ -168,7 +179,11 @@ export function patchClientRoutes({ routes }: { routes: UmiRoute[] }) {
   const menus = getWindowMenus();
   const dynamicRoutes = extractRoutes(menus);
 
-  console.log('[app.tsx] patchClientRoutes:', { menus, dynamicRoutes, routes });
+  console.log('[app.tsx] patchClientRoutes:', {
+    menus,
+    dynamicRoutes,
+    routes,
+  });
 
   // 找到根路由（全局布局）
   const rootRoute = routes.find((r) => r.path === '/');

package/generators/micro-react/templates/apps/layout/src/common/auth/{cs-auth-manager.ts → auth-manager.ts}

@@ -16,20 +16,16 @@ export interface IAuthInfo {
   nickname: string;
   uid: string;
   token: string;
-  wsToken: string;
   refreshToken: string;
 }
 
 /**
- * Mibot Token 信息类型
+ * 用户信息类型（yufu_login 接口返回）
  */
-interface MibotTokenInfo {
-  token?: string;
-  staff_uid?: string;
-  staff_prop?: {
-    avatar?: string;
-    nickname?: string;
-  };
+interface YufuUserInfo {
+  user_name?: string;
+  email?: string;
+  avatar?: string;
 }
 
 /**
@@ -38,14 +34,13 @@ interface MibotTokenInfo {
 interface AuthResponseData {
   access?: string;
   refresh?: string;
-  mibot_token_info?: MibotTokenInfo;
+  user_info?: YufuUserInfo;
 }
 
 interface AuthResponse {
   code?: number;
   data?: AuthResponseData;
   refresh?: string;
-  mibot_token_info?: MibotTokenInfo;
 }
 
 /**
@@ -64,14 +59,6 @@ export const getStoredRefreshToken = (): string | undefined => {
   return getFromStorage(REFRESH_TOKEN_KEY) ?? undefined;
 };
 
-/**
- * 获取存储的 WebSocket token
- * @returns WebSocket token，如果不存在则返回 undefined
- */
-export const getStoredWsToken = (): string | undefined => {
-  return getFromStorage(WS_TOKEN_KEY) ?? undefined;
-};
-
 /**
  * 设置存储的认证 token
  * @param token - 认证 token，如果为 null 或 undefined 则删除
@@ -96,18 +83,6 @@ export const setStoredRefreshToken = (token?: string | null): void => {
   setStorage(REFRESH_TOKEN_KEY, token);
 };
 
-/**
- * 设置存储的 WebSocket token
- * @param token - WebSocket token，如果为 null 或 undefined 则删除
- */
-export const setStoredWsToken = (token?: string | null): void => {
-  if (!token) {
-    removeStorage(WS_TOKEN_KEY);
-    return;
-  }
-  setStorage(WS_TOKEN_KEY, token);
-};
-
 /**
  * 清除所有存储的认证相关 token 和信息
  */
@@ -130,7 +105,6 @@ export const getAuthInfo = (): IAuthInfo => {
     nickname: getFromStorage(NICKNAME) || '',
     uid: getFromStorage(UID) || '',
     token: getFromStorage(AUTH_TOKEN_KEY) || '',
-    wsToken: getFromStorage(WS_TOKEN_KEY) || '',
     refreshToken: getFromStorage(REFRESH_TOKEN_KEY) || '',
   };
 };
@@ -152,32 +126,11 @@ export const setAuthInfo = (info: IAuthInfo): void => {
   if (info.token) {
     setStorage(AUTH_TOKEN_KEY, info.token);
   }
-  if (info.wsToken) {
-    setStorage(WS_TOKEN_KEY, info.wsToken);
-  }
   if (info.refreshToken) {
     setStorage(REFRESH_TOKEN_KEY, info.refreshToken);
   }
 };
 
-/**
- * 持久化 Mibot Token 信息（提取的公共函数）
- */
-const persistMibotTokenInfo = (mibotTokenInfo: MibotTokenInfo): void => {
-  if (mibotTokenInfo.token) {
-    setStoredWsToken(mibotTokenInfo.token);
-  }
-  if (mibotTokenInfo.staff_uid) {
-    setStorage(UID, mibotTokenInfo.staff_uid);
-  }
-  if (mibotTokenInfo.staff_prop?.avatar) {
-    setStorage(AVATAR, mibotTokenInfo.staff_prop.avatar);
-  }
-  if (mibotTokenInfo.staff_prop?.nickname) {
-    setStorage(NICKNAME, mibotTokenInfo.staff_prop.nickname);
-  }
-};
-
 /**
  * 从响应数据中持久化 token 信息
  * 支持多种响应格式：
@@ -194,13 +147,6 @@ export const maybePersistTokens = (payload: AuthResponse | null): void => {
     if (refresh) {
       setStoredRefreshToken(refresh);
     }
-
-    const mibotTokenInfo =
-      payload.mibot_token_info ?? payload.data?.mibot_token_info;
-    if (mibotTokenInfo) {
-      console.info('设置用户TOKEN信息', mibotTokenInfo);
-      persistMibotTokenInfo(mibotTokenInfo);
-    }
   }
 
   // 处理 code === 200 格式的响应（登录接口）
@@ -213,8 +159,5 @@ export const maybePersistTokens = (payload: AuthResponse | null): void => {
     if (data.refresh) {
       setStoredRefreshToken(data.refresh);
     }
-    if (data.mibot_token_info) {
-      persistMibotTokenInfo(data.mibot_token_info);
-    }
   }
 };

package/generators/micro-react/templates/apps/layout/src/common/auth/index.ts

@@ -1,7 +1,7 @@
 import { authLogger } from '@/common/logger';
 import { checkStaffAuth } from '@/services/auth';
 import { handleAuthFailureRedirect } from '../request';
-import { clearStoredTokens, getAuthInfo } from './cs-auth-manager';
+import { clearStoredTokens, getAuthInfo } from './auth-manager';
 
 export function logout(): void {
   clearStoredTokens();

package/generators/micro-react/templates/apps/layout/src/common/auth/tool.ts

@@ -1,3 +1,2 @@
-// localStorage 相关的认证函数已迁移到 @/common/auth/cs-auth-manager
-// 重新导出以保持向后兼容
-export { getAuthInfo, setAuthInfo, type IAuthInfo } from './cs-auth-manager';
+export { getAuthInfo, setAuthInfo } from './auth-manager';
+export type { IAuthInfo } from './auth-manager';

package/generators/micro-react/templates/apps/layout/src/common/auth/type.ts

@@ -7,3 +7,41 @@ export const UID = 'uid';
 
 /** 微应用模式下主应用传递的环境标识 */
 export const MICRO_ENV_KEY = 'micro_env';
+
+/**
+ * 权限树节点
+ */
+export interface IPermissionNode {
+  id: number;
+  name: string;
+  sort: number;
+  level: number;
+  parent: number | null;
+  codename: string;
+  sub_menu?: IPermissionNode[];
+}
+
+/**
+ * 完整用户信息（/api/user/info 接口返回的 data 字段）
+ */
+export interface IUserInfo {
+  id: number;
+  username: string;
+  email: string;
+  user_name: string;
+  avatar: string;
+  phone: string;
+  first_name: string;
+  last_name: string;
+  is_superuser: boolean;
+  is_staff: boolean;
+  is_active: boolean;
+  type: number;
+  agency_id: number;
+  last_login: string;
+  permission_tree: IPermissionNode[];
+  miss_permissions: string[];
+  side_menus: string[];
+  app_permissions: string[];
+  groups: string[];
+}

package/generators/micro-react/templates/apps/layout/src/common/menu/parser.ts

@@ -4,7 +4,111 @@ import type { MenuItem, ParsedMenuItem, ParsedRoute } from './types';
  * 获取 window 上挂载的菜单数据
  */
 export const getWindowMenus = (): MenuItem[] => {
-  return window.__MICO_MENUS__ || [];
+  if (typeof window === 'undefined') return [];
+  const menus = window.__MICO_MENUS__;
+  return Array.isArray(menus) ? menus : [];
+};
+
+export interface MenuFilterOptions {
+  /** 是否是超级用户 */
+  isSuperuser?: boolean | number;
+  /** 允许访问的菜单路径列表（白名单） */
+  sideMenus?: string[];
+}
+
+const isSuperuserUser = (value?: boolean | number): boolean => {
+  return value === true || value === 1;
+};
+
+export const buildMenuPath = (parentPath: string, name: string): string => {
+  return parentPath ? `${parentPath}.${name}` : name;
+};
+
+/**
+ * 检查菜单路径是否允许访问（白名单逻辑）
+ * - 超级用户可以访问所有菜单
+ * - 非超级用户不能访问"权限管理"
+ * - 菜单路径在 sideMenus 中，或是 sideMenus 中某项的前缀（父级菜单）
+ */
+const isMenuAllowed = (
+  menuPath: string,
+  options: MenuFilterOptions,
+): boolean => {
+  // 超级用户可以访问所有菜单
+  if (isSuperuserUser(options.isSuperuser)) return true;
+
+  // 非超级用户不能访问"权限管理"
+  if (menuPath === '权限管理') return false;
+
+  const sideMenus = options.sideMenus || [];
+
+  // 如果没有配置 sideMenus，非超级用户没有任何菜单权限
+  if (sideMenus.length === 0) return false;
+
+  // 检查是否在白名单中（精确匹配或前缀匹配）
+  return sideMenus.some((allowedPath) => {
+    // 精确匹配：菜单路径完全等于白名单中的路径
+    if (menuPath === allowedPath) return true;
+    // 前缀匹配：白名单路径以菜单路径开头（说明菜单是父级）
+    if (allowedPath.startsWith(menuPath + '.')) return true;
+    return false;
+  });
+};
+
+export const isRouteAllowed = (
+  menuPath: string,
+  options: MenuFilterOptions = {},
+): boolean => {
+  return isMenuAllowed(menuPath, options);
+};
+
+/**
+ * 根据权限过滤菜单项（白名单逻辑）
+ */
+export const filterMenuItems = (
+  items: MenuItem[],
+  options: MenuFilterOptions = {},
+  parentPath = '',
+): MenuItem[] => {
+  return items
+    .filter((item) => item.enabled)
+    .map((item) => {
+      const menuPath = buildMenuPath(parentPath, item.name);
+      const isAllowed = isMenuAllowed(menuPath, options);
+
+      // 递归处理子菜单
+      const nextChildren = item.children?.length
+        ? filterMenuItems(item.children, options, menuPath)
+        : [];
+
+      // 分组类型：如果没有子菜单，不显示
+      if (item.type === 'group' && nextChildren.length === 0) {
+        return null;
+      }
+
+      // 当前菜单不允许访问
+      if (!isAllowed) {
+        // 但如果有允许的子菜单，仍需显示当前菜单作为容器
+        if (nextChildren.length > 0) {
+          return { ...item, children: nextChildren };
+        }
+        return null;
+      }
+
+      // 当前菜单允许访问
+      const hasChildren = (item.children?.length || 0) > 0;
+      if (!hasChildren) {
+        return item;
+      }
+
+      // 有子菜单但过滤后为空，不显示
+      if (nextChildren.length === 0) {
+        return null;
+      }
+
+      return { ...item, children: nextChildren };
+    })
+    .filter((item): item is MenuItem => Boolean(item));
 };
 
 /**
@@ -38,10 +142,13 @@ const getEntry = (page: MenuItem['page']): string | undefined => {
 export const extractRoutes = (
   items: MenuItem[],
   routes: ParsedRoute[] = [],
+  parentPath = '',
 ): ParsedRoute[] => {
   for (const item of items) {
     if (!item.enabled) continue;
 
+    const menuPath = buildMenuPath(parentPath, item.name);
+
     if (item.type === 'page' && item.page && item.page.enabled) {
       const loadType = getLoadType(item.page);
       routes.push({
@@ -55,7 +162,7 @@ export const extractRoutes = (
     }
 
     if (item.children && item.children.length > 0) {
-      extractRoutes(item.children, routes);
+      extractRoutes(item.children, routes, menuPath);
     }
   }
 

package/generators/micro-react/templates/apps/layout/src/common/menu/types.ts

@@ -1,18 +1,43 @@
+/**
+ * 页面路由匹配模式
+ */
+export type PageRouteMode = 'prefix' | 'exact';
+
 /**
  * 页面配置 - 从统一中台获取
  */
 export interface PageConfig {
   id: number;
+  /** 页面名称 */
   name: string;
   /** 路由路径 */
   route: string;
+  /** 是否启用 */
   enabled: boolean;
   /** 微应用 HTML 入口 URL (用于 qiankun 加载) */
-  htmlUrl: string | null;
+  htmlUrl: string;
   /** 微应用 JS 入口 URL 列表 */
   jsUrls: string[];
   /** 微应用 CSS URL 列表 */
   cssUrls: string[];
+  /** 路由前缀路径 */
+  prefixPath: string;
+  /** 路由匹配模式 */
+  routeMode: PageRouteMode;
+  /** 关联的主文档 ID */
+  mainDocumentId: number;
+  /** 所属工作空间子域名 */
+  workspaceSubdomain: string;
+  /** 当前版本号 */
+  version: string;
+  /** 历史版本列表 */
+  versions: string[];
+  /** 发布者邮箱 */
+  publishedBy: string;
+  /** 创建时间 */
+  createdAt: string;
+  /** 更新时间 */
+  updatedAt: string;
 }
 
 /**
@@ -77,6 +102,50 @@ export interface MicroAppProps {
   request: <T = any>(url: string, options?: any) => Promise<T>;
 }
 
+/**
+ * 工作空间渲染模式
+ */
+export type WorkspaceRenderMode = 'micro-frontend' | 'default';
+
+/**
+ * 工作空间状态
+ */
+export type WorkspaceStatus = 'active' | 'inactive' | 'pending';
+
+/**
+ * 工作空间配置 - 从统一中台获取
+ */
+export interface WorkspaceConfig {
+  /** 关联的应用 ID（可能为空） */
+  appId: number | null;
+  /** 创建时间 */
+  createdAt: string;
+  /** 创建者 ID */
+  createdBy: number;
+  /** 描述信息 */
+  description: string;
+  /** 首页路径 */
+  homePath: string;
+  /** 最后更新时间 */
+  lastUpdate: string;
+  /** 工作空间名称 */
+  name: string;
+  /** 生产环境域名 */
+  productionDomain: string;
+  /** 渲染模式 */
+  renderMode: WorkspaceRenderMode;
+  /** 仓库地址 */
+  repository: string;
+  /** 是否启用 SSO */
+  ssoEnabled: boolean;
+  /** 状态 */
+  status: WorkspaceStatus;
+  /** 子域名标识 */
+  subdomain: string;
+  /** 测试环境域名 */
+  testDomain: string;
+}
+
 /**
  * Window 上挂载的菜单数据
  */
@@ -88,5 +157,9 @@ declare global {
       apiBaseUrl?: string;
       [key: string]: unknown;
     };
+    __MICO_WORKSPACE__?: WorkspaceConfig | null;
+    __MICO_PAGE__?: PageConfig | null;
+    /** qiankun 注入的全局变量，表示当前运行在 qiankun 子应用环境中 */
+    __POWERED_BY_QIANKUN__?: boolean;
   }
 }

package/generators/micro-react/templates/apps/layout/src/common/micro/index.ts

@@ -32,13 +32,6 @@ export type {
   MicroAppErrorSource,
 } from './types';
 
-declare global {
-  interface Window {
-    /** qiankun 注入的全局变量，表示当前运行在 qiankun 子应用环境中 */
-    __POWERED_BY_QIANKUN__?: boolean;
-  }
-}
-
 // ============================================
 // 环境检测
 // ============================================
@@ -140,7 +133,6 @@ export const setMicroAppProps = (props: IMicroAppProps): void => {
   // 1. 存储认证信息到 localStorage（复用现有的 setAuthInfo）
   setAuthInfo({
     token: props.authToken || '',
-    wsToken: props.wsToken || '',
     uid: props.uid || '',
     avatar: props.avatar || '',
     nickname: props.nickname || '',

package/generators/micro-react/templates/apps/layout/src/common/micro/types.ts

@@ -124,8 +124,6 @@ export interface IMicroAppProps {
   authToken?: string;
   /** CDN 文件的前缀 host */
   filehost?: string;
-  /** WebSocket 建立连接的 Authorization */
-  wsToken?: string;
   /** 用户头像 URL */
   avatar?: string;
   /** 当前客服 ID */

package/generators/micro-react/templates/apps/layout/src/common/request/config.ts

@@ -2,7 +2,7 @@
  * 请求客户端配置管理
  */
 
-import { getStoredAuthToken } from '../auth/cs-auth-manager';
+import { getStoredAuthToken } from '../auth/auth-manager';
 import type { RequestClientOptions, TokenResolver } from './types';
 
 const defaultClientOptions: RequestClientOptions = {

package/generators/micro-react/templates/apps/layout/src/common/request/index.ts

@@ -15,7 +15,7 @@
  */
 
 import { request as rawRequest } from '@umijs/max';
-import { setStoredAuthToken } from '../auth/cs-auth-manager';
+import { setStoredAuthToken } from '../auth/auth-manager';
 import { ROUTES } from '../constants';
 
 // 配置相关
@@ -36,7 +36,7 @@ import {
 } from './interceptors';
 
 // SSO 相关
-import { ensureSsoSession, handleAuthFailureRedirect } from './sso';
+import { handleAuthFailureRedirect } from './sso';
 
 // Token 刷新相关
 import {
@@ -57,9 +57,6 @@ import type {
 // URL 解析
 import { resolveRequestUrl } from './url-resolver';
 
-// 始终使用远程地址的路径
-const ALWAYS_REMOTE_PATHS: string[] = [];
-
 // 初始化默认拦截器
 initDefaultInterceptors(isFetchingToken, addToPendingQueue);
 
@@ -77,12 +74,7 @@ export const request = async <T = unknown>(
   url: string,
   options?: UnifiedRequestOptions,
 ): Promise<T> => {
-  await ensureSsoSession();
-
-  const isAlwaysRemote = ALWAYS_REMOTE_PATHS.some((path) =>
-    url.startsWith(path),
-  );
-  const resolvedUrl = resolveRequestUrl(url, options, isAlwaysRemote);
+  const resolvedUrl = resolveRequestUrl(url, options);
 
   const ctx: RequestContext = {
     url: resolvedUrl,

package/generators/micro-react/templates/apps/layout/src/common/request/interceptors.ts

@@ -4,8 +4,8 @@
 
 import { getFromStorage, safeParseJSON } from '@/common/helpers';
 import { Message } from '@arco-design/web-react';
-import { maybePersistTokens } from '../auth/cs-auth-manager';
-import { UID } from '../auth/type';
+import { maybePersistTokens } from '@/common/auth/auth-manager';
+import { UID } from '@/common/auth/type';
 import { getClientOptions, resolveAuthToken } from './config';
 import type {
   RequestContext,

package/generators/micro-react/templates/apps/layout/src/common/request/sso.ts

@@ -6,7 +6,8 @@ import { request as rawRequest } from '@umijs/max';
 import {
   maybePersistTokens,
   setStoredAuthToken,
-} from '../auth/cs-auth-manager';
+} from '@/common/auth/auth-manager';
+import { ROUTES } from '@/common/constants';
 import {
   getTicketParam,
   resolveAuthToken,
@@ -49,7 +50,7 @@ export const handleAuthFailureRedirect = (): void => {
     const serviceUrl = redirectUrl.toString();
 
     window.location.href = `${
-      externalLoginPath ?? '/login'
+      externalLoginPath ?? ROUTES.LOGIN
     }?service=${encodeURIComponent(serviceUrl)}`;
   } else {
     console.warn('认证失败，但已达到最大重定向次数，停止重定向');

package/generators/micro-react/templates/apps/layout/src/common/request/token-refresh.ts

@@ -8,7 +8,7 @@ import {
   maybePersistTokens,
   setStoredAuthToken,
   setStoredRefreshToken,
-} from '../auth/cs-auth-manager';
+} from '@/common/auth/auth-manager';
 import { resolveRefreshEndpoint } from './config';
 import type { PendingRequest, RequestContext } from './types';
 
@@ -130,7 +130,7 @@ export const shouldAttemptRefresh = (error: unknown): boolean => {
   if (error && typeof error === 'object' && 'response' in error) {
     const typedError = error as { response?: { status?: number } };
     const status = typedError.response?.status;
-    return status === 401 || status === 403;
+    return status === 401;
   }
   return false;
 };