generator-mico-cli 0.2.8 → 0.2.9

package/generators/micro-react/index.js

@@ -139,15 +139,20 @@ module.exports = class extends Generator {
     }
   }
 
+  install() {
+    this.log('');
+    this.log('📦 正在安装依赖...');
+    this.spawnCommandSync('pnpm', ['install'], {
+      cwd: this.destDir
+    });
+  }
+
   end() {
     this.log('');
     this.log('✅ 项目创建成功！');
     this.log('');
     this.log('   后续步骤:');
     this.log('');
-    this.log('   # 安装依赖');
-    this.log('   pnpm install');
-    this.log('');
     this.log('   # 启动开发服务器');
     this.log('   pnpm dev');
     this.log('');

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

@@ -10,15 +10,18 @@ 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,
   setMicroAppProps,
 } from './common/micro';
+import {
+  ensureSsoSession,
+  handleAuthFailureRedirect,
+} from './common/request/sso';
 import { initTheme } from './common/theme';
 import MicroAppLoader from './components/MicroAppLoader';
-import { NO_AUTH_ROUTE_LIST } from '@/constants';
+import { isNoAuthRoute } from '@/constants';
 import './global.less';
 
 // ==================== qiankun 全局错误处理 ====================
@@ -110,10 +113,10 @@ export async function getInitialState(): Promise<{
   };
 
   const { location } = history;
-  const isNoAuthRoute = NO_AUTH_ROUTE_LIST.includes(location.pathname);
+  const noAuthRoute = isNoAuthRoute(location.pathname);
 
   // 非免认证路由：走 SSO 流程
-  if (!isNoAuthRoute) {
+  if (!noAuthRoute) {
     await ensureSsoSession();
   }
 
@@ -128,6 +131,15 @@ export async function getInitialState(): Promise<{
     }
   }
 
+  // 非免认证路由且没有 token，跳转到 SSO 登录
+  if (!noAuthRoute) {
+    handleAuthFailureRedirect();
+    // 返回空状态，页面会被重定向
+    return {
+      fetchUserInfo: fetchUserInfoFn,
+    };
+  }
+
   return {
     fetchUserInfo: fetchUserInfoFn,
   };

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

@@ -157,6 +157,10 @@ declare global {
       apiBaseUrl?: string;
       /** 默认重定向路径，访问 "/" 时自动跳转到此路径 */
       defaultPath?: string;
+      /** 动态配置的免鉴权路由列表，支持精确匹配和前缀匹配（以 /* 结尾） */
+      noAuthRouteList?: string[];
+      /** 动态配置的不显示布局路由列表，支持精确匹配和前缀匹配（以 /* 结尾） */
+      noLayoutRouteList?: string[];
       [key: string]: unknown;
     };
     __MICO_WORKSPACE__?: WorkspaceConfig | null;

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

@@ -16,7 +16,7 @@
 
 import { request as rawRequest } from '@umijs/max';
 import { setStoredAuthToken } from '../auth/auth-manager';
-import { NO_AUTH_ROUTE_LIST } from '@/constants';
+import { isNoAuthRoute } from '@/constants';
 
 // 配置相关
 import {
@@ -64,7 +64,7 @@ initDefaultInterceptors(isFetchingToken, addToPendingQueue);
  * 判断当前路由是否跳过认证
  */
 const shouldSkipAuth = (): boolean => {
-  return NO_AUTH_ROUTE_LIST.includes(location.pathname);
+  return isNoAuthRoute(location.pathname);
 };
 
 /**

package/generators/micro-react/templates/apps/layout/src/components/AppTabs/index.tsx

@@ -1,5 +1,5 @@
 import { findRouteByPath } from '@/common/menu';
-import { NO_AUTH_ROUTE_LIST } from '@/constants';
+import { isNoLayoutRoute } from '@/constants';
 import useMenu from '@/hooks/useMenu';
 import { Tabs } from '@arco-design/web-react';
 import { history, useLocation } from '@umijs/max';
@@ -47,7 +47,7 @@ function AppTabs() {
   const [tabs, setTabs] = useState<TabItem[]>([]);
 
   const showTabs = useMemo(() => {
-    return !NO_AUTH_ROUTE_LIST.includes(location.pathname);
+    return !isNoLayoutRoute(location.pathname);
   }, [location.pathname]);
 
   const microAppPrefixes = useMemo(() => {

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

@@ -19,7 +19,7 @@ export const ROUTES = {
 } as const;
 
 /**
- * 无需认证的路由列表
+ * 无需认证的路由列表（静态配置）
  */
 export const NO_AUTH_ROUTE_LIST: string[] = [
   ROUTES.LOGIN,
@@ -29,12 +29,78 @@ export const NO_AUTH_ROUTE_LIST: string[] = [
   ROUTES.NOT_FOUND,
 ];
 
+/**
+ * 获取合并后的免鉴权路由列表
+ * 合并静态常量 + window.__MICO_CONFIG__.noAuthRouteList
+ */
+export const getNoAuthRouteList = (): string[] => {
+  const dynamicRoutes = window.__MICO_CONFIG__?.noAuthRouteList ?? [];
+  return [...new Set([...NO_AUTH_ROUTE_LIST, ...dynamicRoutes])];
+};
+
+/**
+ * 判断路径是否匹配路由列表（支持精确匹配和前缀匹配）
+ * @param pathname - 当前路由路径
+ * @param routes - 路由列表
+ * @returns 是否匹配
+ */
+const matchRouteList = (pathname: string, routes: string[]): boolean => {
+  return routes.some((route) => {
+    // 前缀匹配：/public/* 匹配 /public/xxx
+    if (route.endsWith('/*')) {
+      const prefix = route.slice(0, -1); // 去掉末尾的 *，保留 /
+      return pathname.startsWith(prefix) || pathname === prefix.slice(0, -1);
+    }
+    // 精确匹配
+    return pathname === route;
+  });
+};
+
+/**
+ * 判断指定路径是否为免鉴权路由
+ * 支持精确匹配和前缀匹配（以 /* 结尾的模式）
+ * @param pathname - 当前路由路径
+ * @returns 是否免鉴权
+ */
+export const isNoAuthRoute = (pathname: string): boolean => {
+  return matchRouteList(pathname, getNoAuthRouteList());
+};
+
+/**
+ * 不显示布局的路由列表（静态配置）
+ * 注意：403/404 保留布局，方便用户通过导航返回
+ */
+export const NO_LAYOUT_ROUTE_LIST: string[] = [
+  ROUTES.LOGIN,
+  ROUTES.REGISTER,
+  ROUTES.REGISTER_RESULT,
+];
+
+/**
+ * 获取合并后的不显示布局路由列表
+ * 合并静态常量 + window.__MICO_CONFIG__.noLayoutRouteList
+ */
+export const getNoLayoutRouteList = (): string[] => {
+  const dynamicRoutes = window.__MICO_CONFIG__?.noLayoutRouteList ?? [];
+  return [...new Set([...NO_LAYOUT_ROUTE_LIST, ...dynamicRoutes])];
+};
+
+/**
+ * 判断指定路径是否不显示布局
+ * 支持精确匹配和前缀匹配（以 /* 结尾的模式）
+ * @param pathname - 当前路由路径
+ * @returns 是否不显示布局
+ */
+export const isNoLayoutRoute = (pathname: string): boolean => {
+  return matchRouteList(pathname, getNoLayoutRouteList());
+};
+
 /**
  * 主题相关常量
  */
 export const THEME = {
   /** localStorage 存储键 */
-  STORAGE_KEY: 'audit-center-theme',
+  STORAGE_KEY: '<%= ProjectName %>-theme',
   /** 默认主题 */
   DEFAULT: 'light' as const,
   /** 可选主题值 */
@@ -46,9 +112,9 @@ export const THEME = {
  */
 export const TIMEZONE = {
   /** localStorage 存储键（IANA 时区，如 Asia/Shanghai） */
-  STORAGE_KEY: 'audit-center-timezone',
+  STORAGE_KEY: '<%= ProjectName %>-timezone',
   /** localStorage 存储键（用于展示的地区/名称，可选） */
-  REGION_STORAGE_KEY: 'audit-center-timezone-region',
+  REGION_STORAGE_KEY: '<%= ProjectName %>-timezone-region',
 } as const;
 
 /**
@@ -56,7 +122,7 @@ export const TIMEZONE = {
  */
 export const PRESENCE = {
   /** localStorage 存储键 */
-  STORAGE_KEY: 'audit-center-presence-status',
+  STORAGE_KEY: '<%= ProjectName %>-presence-status',
 } as const;
 
 /**

package/generators/micro-react/templates/apps/layout/src/hooks/useRoutePermissionRefresh.ts

@@ -1,7 +1,7 @@
 import { useLocation, useModel } from '@umijs/max';
 import { useEffect, useRef, useState } from 'react';
 import { layoutLogger } from '@/common/logger';
-import { NO_AUTH_ROUTE_LIST } from '@/constants';
+import { isNoAuthRoute } from '@/constants';
 
 /**
  * 路由切换时自动刷新用户权限
@@ -39,7 +39,7 @@ export function useRoutePermissionRefresh() {
     prevPathRef.current = location.pathname;
 
     // 免认证路由不需要刷新
-    if (NO_AUTH_ROUTE_LIST.includes(location.pathname)) {
+    if (isNoAuthRoute(location.pathname)) {
       return;
     }
 

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

@@ -8,7 +8,7 @@ import {
 import { getAppNameFromEntry } from '@/common/micro';
 import AppTabs from '@/components/AppTabs';
 import MicroAppLoader from '@/components/MicroAppLoader';
-import { NO_AUTH_ROUTE_LIST } from '@/constants';
+import { isNoLayoutRoute } from '@/constants';
 import { useRoutePermissionRefresh } from '@/hooks/useRoutePermissionRefresh';
 import ForbiddenPage from '@/pages/403';
 import { Layout, Spin } from '@arco-design/web-react';
@@ -83,7 +83,7 @@ const BasicLayout: React.FC = () => {
   }, [currentRoute, allRoutes, allowedRoutes, location.pathname, filterOptions]);
 
   // 判断是否需要显示布局
-  const showLayout = !NO_AUTH_ROUTE_LIST.includes(location.pathname);
+  const showLayout = !isNoLayoutRoute(location.pathname);
 
   // 渲染页面内容
   const renderContent = () => {

package/generators/micro-react/templates/apps/layout/src/services/user.ts

@@ -17,6 +17,7 @@ export interface IUserInfoResponse {
 export async function fetchUserInfo(): Promise<IUserInfo> {
   const response = await request<IUserInfoResponse>(USER_INFO_API, {
     method: 'GET',
+    skipProxy: true,
   });
   if (response.code === 200 && response.data) {
     return response.data;

package/generators/subapp-react/index.js

@@ -177,12 +177,21 @@ module.exports = class extends Generator {
     }
   }
 
+  install() {
+    this.log('');
+    this.log('📦 正在安装依赖...');
+    this.spawnCommandSync('pnpm', ['install'], {
+      cwd: this.monorepoRoot
+    });
+  }
+
   end() {
     this.log('');
     this.log('✅ 子应用创建成功！');
     this.log('');
+    this.log('   后续步骤:');
+    this.log('');
     this.log(`   cd apps/${this.appName}`);
-    this.log('   pnpm install');
     this.log('   pnpm dev');
     this.log('');
   }

package/generators/subapp-react/templates/homepage/config/config.prod.development.ts

@@ -1,7 +1,6 @@
 // https://umijs.org/config/
 
 import { defineConfig } from '@umijs/max';
-const { CDN_PUBLIC_PATH } = process.env;
 
 
 const config: ReturnType<typeof defineConfig> = {

package/generators/subapp-react/templates/homepage/config/config.prod.testing.ts

@@ -1,7 +1,6 @@
 // https://umijs.org/config/
 
 import { defineConfig } from '@umijs/max';
-const { CDN_PUBLIC_PATH } = process.env;
 
 
 const config: ReturnType<typeof defineConfig> = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-mico-cli",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "Yeoman generator for Mico CLI projects",
   "keywords": [
     "yeoman-generator",