nsgm-cli 2.1.21 → 2.1.23

package/lib/utils.js

@@ -21,7 +21,7 @@ exports.firstUpperCase = firstUpperCase;
 const mkdirSync = (dirPath) => {
     if (mkdirFlag) {
         if (!fs_1.default.existsSync(dirPath)) {
-            fs_1.default.mkdirSync(dirPath);
+            fs_1.default.mkdirSync(dirPath, { recursive: true });
         }
     }
 };

package/next-env.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
+import "./build/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.

package/next-i18next.config.js

@@ -1,3 +1,5 @@
+const path = require('path');
+
 /**
  * @type {import('next-i18next').UserConfig}
  */
@@ -5,14 +7,14 @@ module.exports = {
   i18n: {
     defaultLocale: 'zh-CN',
     locales: ['zh-CN', 'en-US', 'ja-JP'],
-    localeDetection: false, // 禁用自动语言检测
+    localeDetection: false,
   },
-  localePath: './public/locales',
-  /** To avoid issues when deploying to some platforms, we can configure the cache */
+  localePath: path.resolve(process.cwd(), 'public/locales'),
   saveMissing: false,
-  strictMode: true,
-  serializeConfig: false,
+  strictMode: false,
+  serializeConfig: true,
   react: {
     useSuspense: false,
   },
+  reloadOnPrerender: process.env.NODE_ENV === 'development',
 }

package/next.config.js

@@ -4,7 +4,13 @@
 const { PHASE_DEVELOPMENT_SERVER, PHASE_EXPORT } = require('next/constants')
 const fs = require('fs')
 const path = require('path')
-const { i18n } = require('./next-i18next.config')
+
+// 直接定义 i18n 配置，避免在 Vercel 上找不到配置文件
+const i18n = {
+  defaultLocale: 'zh-CN',
+  locales: ['zh-CN', 'en-US', 'ja-JP'],
+  localeDetection: false,
+}
 
 module.exports = (phase, defaultConfig, options) => {
   let projectConfig = null
@@ -16,8 +22,18 @@ module.exports = (phase, defaultConfig, options) => {
 
   if (fs.existsSync(curProjectConfigPath)) {
     projectConfig = require(curProjectConfigPath)
-  } else {
+  } else if (fs.existsSync('./project.config.js')) {
     projectConfig = require('./project.config.js')
+  } else {
+    // 默认配置（用于 Vercel 等环境）
+    projectConfig = {
+      env: 'production',
+      version: '1.0.0',
+      prefix: '',
+      protocol: 'https',
+      host: 'localhost',
+      port: '443'
+    }
   }
 
   if (fs.existsSync(curPkgPath)) {
@@ -40,21 +56,19 @@ module.exports = (phase, defaultConfig, options) => {
     prefix = ''
   }
 
+  // 设置环境变量用于客户端访问
+  process.env.NEXT_PUBLIC_VERSION = version
+  process.env.NEXT_PUBLIC_PREFIX = prefix
+  process.env.NEXT_PUBLIC_PROTOCOL = protocol
+  process.env.NEXT_PUBLIC_HOST = host
+  process.env.NEXT_PUBLIC_PORT = port
+  process.env.NEXT_PUBLIC_ENV = env
+  process.env.NEXT_PUBLIC_IS_EXPORT = phase === PHASE_EXPORT ? 'true' : 'false'
+
   let configObj = {
     // target: 'serverless',
     // crossOrign: 'anonymous',
     i18n,
-    serverRuntimeConfig: {},
-    publicRuntimeConfig: {
-      version,
-      prefix,
-      protocol,
-      host,
-      port,
-      env,
-      phase,
-      isExport: phase === PHASE_EXPORT,
-    },
     transpilePackages: [
       'antd',
       '@ant-design',
@@ -72,7 +86,7 @@ module.exports = (phase, defaultConfig, options) => {
       esmExternals: true, // 支持 ESM 外部依赖
     },
     compiler: {
-      removeConsole: phase !== PHASE_DEVELOPMENT_SERVER,
+      removeConsole: phase !== PHASE_DEVELOPMENT_SERVER ? { exclude: ['warn', 'error'] } : false,
       styledComponents: true,
     },
     ...(phase === PHASE_DEVELOPMENT_SERVER && {
@@ -90,114 +104,22 @@ module.exports = (phase, defaultConfig, options) => {
       '127.0.0.1',
       'localhost',
     ],
-    webpack: (config, { buildId, dev, isServer, defaultLoaders, webpack }) => {
-      // 抑制服务端渲染时的 useLayoutEffect 警告
-      if (dev && isServer) {
-        const originalWarn = console.warn
-        const originalError = console.error
-
-        console.warn = (...args) => {
-          const warnMessage = args[0]
-          if (
-            typeof warnMessage === 'string' &&
-            (warnMessage.includes('useLayoutEffect does nothing on the server') ||
-              warnMessage.includes('Warning: useLayoutEffect does nothing on the server'))
-          ) {
-            return
-          }
-          originalWarn.apply(console, args)
-        }
-
-        console.error = (...args) => {
-          const errorMessage = args[0]
-          if (
-            typeof errorMessage === 'string' &&
-            (errorMessage.includes('useLayoutEffect does nothing on the server') ||
-              errorMessage.includes('Warning: useLayoutEffect does nothing on the server'))
-          ) {
-            return
-          }
-          originalError.apply(console, args)
-        }
-      }
-
-      // 启用压缩
-      if (!dev && !isServer) {
-        config.optimization = {
-          ...config.optimization,
-          splitChunks: {
-            chunks: 'all',
-            cacheGroups: {
-              vendor: {
-                test: /[\\/]node_modules[\\/]/,
-                name: 'vendors',
-                chunks: 'all',
-                enforce: true,
-              },
-              antd: {
-                test: /[\\/]node_modules[\\/](antd|@ant-design)[\\/]/,
-                name: 'antd',
-                chunks: 'all',
-                priority: 10,
-              },
-              react: {
-                test: /[\\/]node_modules[\\/](react|react-dom)[\\/]/,
-                name: 'react',
-                chunks: 'all',
-                priority: 10,
-              },
-              common: {
-                name: 'common',
-                minChunks: 2,
-                chunks: 'all',
-                priority: 5,
-              },
-            },
-          },
-          minimize: true,
-        }
-
-        // 添加分析工具
-        if (process.env.ANALYZE === 'true') {
-          const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer')
-          config.plugins.push(
-            new BundleAnalyzerPlugin({
-              analyzerMode: 'static',
-              openAnalyzer: false,
-            })
-          )
-        }
-      }
-
-      // 优化模块解析
-      config.resolve.alias = {
-        ...config.resolve.alias,
-        '@': path.resolve(__dirname, 'client'),
-      }
-
-      // 支持 TypeScript 路径映射
-      config.resolve.modules = [path.resolve(__dirname, 'client'), 'node_modules']
-
-      return config
-    },
+    // 使用 Turbopack（Next.js 16 默认）
+    turbopack: {},
     generateBuildId: async () => {
       return 'nsgm-cli-' + version
     },
-    exportPathMap: async function (defaultPathMap, { dev, dir, outDir }) {
-      if (dev) {
-        return defaultPathMap
-      }
-
-      return defaultPathMap
-    },
     generateEtags: false,
     useFileSystemPublicRoutes: true,
   }
 
   if (phase !== PHASE_DEVELOPMENT_SERVER) {
+    // 在 Vercel 环境中使用默认的 .next 目录，否则使用 build 目录
+    const distDir = process.env.VERCEL ? '.next' : 'build'
+    
     configObj = {
       ...configObj,
-      distDir: 'build',
+      distDir,
       assetPrefix: prefix,
       async rewrites() {
         return [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nsgm-cli",
-  "version": "2.1.21",
+  "version": "2.1.23",
   "description": "A CLI tool to run Next/Style-components and Graphql/Mysql fullstack project",
   "main": "index.js",
   "scripts": {
@@ -33,7 +33,9 @@
     "test:coverage": "jest --coverage",
     "test:watch": "jest --watch",
     "performance": "./scripts/performance-check.sh",
-    "generate-password": "node scripts/generate-password-hash.js"
+    "generate-password": "node scripts/generate-password-hash.js",
+    "vercel-build": "npm run tsbuild && npm run build",
+    "vercel-dev": "npm run tsbuild && npm run dev"
   },
   "repository": {
     "type": "git",
@@ -88,6 +90,7 @@
     "commander": "14.0.0",
     "cors": "2.8.5",
     "critters": "0.0.25",
+    "dataloader": "2.2.3",
     "dayjs": "1.11.13",
     "dotenv": "17.2.1",
     "exceljs": "4.4.0",
@@ -105,7 +108,7 @@
     "lusca": "1.7.0",
     "markdown-it": "14.1.0",
     "mysql2": "3.14.2",
-    "next": "15.4.4",
+    "next": "16.1.0",
     "next-i18next": "15.3.0",
     "ora": "8.2.0",
     "rc-util": "5.44.4",

package/pages/_app.tsx

@@ -1,7 +1,7 @@
 // 必须在所有其他导入之前执行
 import "@/utils/suppressWarnings";
 
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import { Provider } from "react-redux";
 import { Spin } from "antd";
 import { appWithTranslation } from "next-i18next";
@@ -15,7 +15,6 @@ import SSRSafeAntdProvider from "@/components/SSRSafeAntdProvider";
 import { login } from "@/utils/sso";
 import { getAntdLocale } from "@/utils/i18n";
 import { navigateToLogin } from "@/utils/navigation";
-import nextI18NextConfig from "../next-i18next.config.js";
 import "antd/dist/reset.css";
 
 const theme = {
@@ -46,7 +45,10 @@ const App = ({ Component, pageProps }) => {
 
   useEffect(() => {
     setMounted(true);
-    // 只在客户端设置当前语言
+  }, []);
+
+  useEffect(() => {
+    // 同步当前语言
     if (typeof window !== "undefined") {
       const locale = router.locale || "zh-CN";
       setCurrentLocale(locale);
@@ -133,7 +135,5 @@ const App = ({ Component, pageProps }) => {
   );
 };
 
-// 移除 getInitialProps 以启用静态优化
-// 如果需要页面级别的数据获取，请在各个页面中使用 getStaticProps 或 getServerSideProps
-
-export default appWithTranslation(App, nextI18NextConfig);
+// appWithTranslation 会自动从 next.config.js 读取 i18n 配置
+export default appWithTranslation(App);

package/pages/_document.tsx

@@ -1,5 +1,4 @@
 import Document, { Html, Head, Main, NextScript, DocumentContext } from "next/document";
-import React from "react";
 import { ServerStyleSheet } from "styled-components";
 
 const MyDocument = (props) => {

package/pages/_error.tsx

@@ -1,4 +1,3 @@
-import React from "react";
 import { Result, Button } from "antd";
 import { NextPageContext } from "next";
 

package/pages/api/sso/ticketCheck.ts

@@ -0,0 +1,117 @@
+import type { NextApiRequest, NextApiResponse } from "next";
+import bcrypt from "bcrypt";
+
+type ResponseData = {
+  name: string;
+  returnCode: number;
+  userAttr?: {
+    displayName: string;
+    username?: string;
+  };
+  cookieValue?: string;
+  cookieExpire?: number;
+  message?: string;
+};
+
+const getLoginCredentials = () => {
+  const username = process.env.LOGIN_USERNAME || "admin";
+  const passwordHash = process.env.LOGIN_PASSWORD_HASH;
+
+  console.warn("[SSO] getLoginCredentials - username:", username);
+  console.warn(
+    "[SSO] getLoginCredentials - passwordHash from env:",
+    passwordHash ? `${passwordHash.substring(0, 20)}...` : "undefined"
+  );
+
+  if (!passwordHash) {
+    console.warn("[SSO] ⚠️  警告: LOGIN_PASSWORD_HASH 环境变量未设置，使用默认密码哈希");
+    return {
+      username,
+      passwordHash: "$2b$10$K5O.TJLKGPmKGHJK8KzN5u8qUYKzq5vLcXlP7vGUzq5vLcXlP7vGUz",
+    };
+  }
+
+  console.warn("[SSO] getLoginCredentials - final passwordHash:", `${passwordHash.substring(0, 20)}...`);
+  return { username, passwordHash };
+};
+
+const validateCredentials = async (inputUsername: string, inputPassword: string): Promise<boolean> => {
+  const { username, passwordHash } = getLoginCredentials();
+
+  if (inputUsername !== username) {
+    return false;
+  }
+
+  try {
+    return await bcrypt.compare(inputPassword, passwordHash);
+  } catch (error) {
+    console.warn("[SSO] 密码验证失败:", error);
+    return false;
+  }
+};
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse<ResponseData>) {
+  if (req.method !== "GET") {
+    res.status(405).json({
+      name: "ticketCheck",
+      returnCode: -1,
+      message: "Method not allowed",
+    });
+    return;
+  }
+
+  const { name } = req.query;
+
+  console.warn("[SSO] ticketCheck called, name:", name);
+
+  try {
+    if (!name || typeof name !== "string") {
+      throw new Error("Invalid name parameter");
+    }
+
+    // 使用 Buffer 解码 Base64 字符串，然后使用 decodeURIComponent 处理特殊字符
+    const decodedBase64 = Buffer.from(name, "base64").toString("utf-8");
+    console.warn("[SSO] Decoded Base64:", decodedBase64);
+
+    const decodedName = decodeURIComponent(decodedBase64);
+    console.warn("[SSO] Decoded name:", decodedName);
+
+    const [inputUsername, inputPassword] = decodedName.split(",");
+    console.warn("[SSO] Input username:", inputUsername, "password length:", inputPassword?.length);
+
+    const { username: expectedUsername, passwordHash } = getLoginCredentials();
+    console.warn("[SSO] Expected username:", expectedUsername, "passwordHash length:", passwordHash?.length);
+
+    const isValid = await validateCredentials(inputUsername, inputPassword);
+    console.warn("[SSO] Credentials valid:", isValid);
+
+    if (isValid) {
+      console.warn("[SSO] Login successful for user:", inputUsername);
+      res.status(200).json({
+        name: "ticketCheck",
+        returnCode: 0,
+        userAttr: {
+          displayName: "System Admin",
+          username: inputUsername,
+        },
+        cookieValue: `login_cookie_${Date.now()}`,
+        cookieExpire: 7200000, // 2小时
+      });
+    } else {
+      console.warn(`[SSO] 登录失败 - 用户名: ${inputUsername}, 时间: ${new Date().toISOString()}`);
+
+      res.status(200).json({
+        name: "ticketCheck",
+        returnCode: -1,
+        message: "用户名或密码错误",
+      });
+    }
+  } catch (error) {
+    console.warn("[SSO] 登录验证出错:", error);
+    res.status(500).json({
+      name: "ticketCheck",
+      returnCode: -1,
+      message: "服务器内部错误",
+    });
+  }
+}

package/pages/index.tsx

@@ -1,6 +1,5 @@
 import _ from "lodash";
 import { Container } from "../client/styled/common";
-import React from "react";
 import { Card, Typography, Divider, Row, Col, Tag } from "antd";
 import { CodeOutlined, BookOutlined, DatabaseOutlined, SettingOutlined } from "@ant-design/icons";
 import { useTranslation } from "next-i18next";
@@ -160,12 +159,20 @@ const Page = () => {
 };
 
 export const getServerSideProps = async ({ locale }) => {
-  // 确保 locale 有默认值，避免 serverSideTranslations 报错
   const currentLocale = locale || "zh-CN";
 
+  const path = require("path");
+  const i18nConfig = {
+    i18n: {
+      defaultLocale: "zh-CN",
+      locales: ["zh-CN", "en-US", "ja-JP"],
+    },
+    localePath: path.resolve(process.cwd(), "public/locales"),
+  };
+
   return {
     props: {
-      ...(await serverSideTranslations(currentLocale, ["common", "home", "layout"])),
+      ...(await serverSideTranslations(currentLocale, ["common", "home", "layout"], i18nConfig)),
     },
   };
 };

package/pages/login.tsx

@@ -2,10 +2,11 @@ import MarkdownIt from "markdown-it";
 import _ from "lodash";
 import { LoginContainer } from "../client/styled/common";
 // import getConfig from 'next/config'
-import React, { useState, useEffect } from "react";
+import { useState, useEffect } from "react";
 import { Input, Button, Form, Typography, message } from "antd";
 import { UserOutlined, LockOutlined } from "@ant-design/icons";
 import { directLogin } from "../client/utils/sso";
+import { getLocalApiPrefix } from "../client/utils/common";
 import { serverSideTranslations } from "next-i18next/serverSideTranslations";
 import { useTranslation } from "next-i18next";
 import { useRouter } from "next/router";
@@ -27,14 +28,18 @@ const renderArr: any = [];
 renderArr.push("NSGM");
 
 const Page = ({ html }) => {
-  const { t } = useTranslation(["login"]);
+  const { t } = useTranslation("login");
   const router = useRouter();
   const [userName, setUserName] = useState("");
   const [userPassword, setUserPassword] = useState("");
   const [mounted, setMounted] = useState(false);
+  const [debugInfo, setDebugInfo] = useState("");
 
   useEffect(() => {
     setMounted(true);
+    // 显示调试信息
+    const apiPrefix = getLocalApiPrefix();
+    setDebugInfo(`API: ${apiPrefix}`);
   }, []);
 
   const createMarkup = () => {
@@ -47,11 +52,11 @@ const Page = ({ html }) => {
     if (!mounted || typeof window === "undefined") return;
 
     if (userName === "") {
-      message.error(t("login:login.errors.usernameRequired"));
+      message.error(t("login.errors.usernameRequired"));
       return;
     }
     if (userPassword === "") {
-      message.error(t("login:login.errors.passwordRequired"));
+      message.error(t("login.errors.passwordRequired"));
       return;
     }
 
@@ -65,6 +70,7 @@ const Page = ({ html }) => {
     // 检查是否是 Promise
     if (result && typeof (result as any).then === "function") {
       (result as Promise<any>).then((loginResult) => {
+        setDebugInfo(`Login result: ${JSON.stringify(loginResult)}`);
         if (!loginResult.success) {
           message.error(loginResult.message);
         }
@@ -72,8 +78,9 @@ const Page = ({ html }) => {
     } else {
       // 直接返回的结果
       const syncResult = result as { success: boolean; message?: string };
+      setDebugInfo(`Login result: ${JSON.stringify(syncResult)}`);
       if (!syncResult.success) {
-        message.error(syncResult.message || t("login:login.errors.loginFailed"));
+        message.error(syncResult.message || t("login.errors.loginFailed"));
       }
     }
   };
@@ -91,15 +98,30 @@ const Page = ({ html }) => {
       <div style={{ position: "absolute", top: "20px", right: "20px" }}>
         <LanguageSwitcher />
       </div>
+      {debugInfo && (
+        <div
+          style={{
+            position: "absolute",
+            top: "60px",
+            right: "20px",
+            fontSize: "12px",
+            color: "#999",
+            maxWidth: "300px",
+            wordBreak: "break-all",
+          }}
+        >
+          {debugInfo}
+        </div>
+      )}
       <div dangerouslySetInnerHTML={createMarkup()} />
       <Typography.Title level={3} style={{ textAlign: "center", marginBottom: 24 }}>
-        {t("login:login.title")}
+        {t("login.title")}
       </Typography.Title>
       <Form layout="vertical" style={{ width: "100%" }}>
         <Form.Item>
           <Input
             prefix={<UserOutlined style={{ color: "rgba(0,0,0,.25)" }} />}
-            placeholder={t("login:login.username")}
+            placeholder={t("login.username")}
             size="large"
             value={userName}
             onChange={doChangeName}
@@ -109,7 +131,7 @@ const Page = ({ html }) => {
         <Form.Item>
           <Input.Password
             prefix={<LockOutlined style={{ color: "rgba(0,0,0,.25)" }} />}
-            placeholder={t("login:login.password")}
+            placeholder={t("login.password")}
             size="large"
             value={userPassword}
             onChange={doChangePassword}
@@ -118,7 +140,7 @@ const Page = ({ html }) => {
         </Form.Item>
         <Form.Item>
           <Button type="primary" onClick={doLogin} size="large" block>
-            {t("login:login.loginButton")}
+            {t("login.loginButton")}
           </Button>
         </Form.Item>
       </Form>
@@ -127,7 +149,6 @@ const Page = ({ html }) => {
 };
 
 export const getServerSideProps = async ({ locale }) => {
-  // 确保 locale 有默认值，避免 serverSideTranslations 报错
   const currentLocale = locale || "zh-CN";
 
   // 处理 markdown 内容
@@ -136,10 +157,19 @@ export const getServerSideProps = async ({ locale }) => {
     html += md.render(item);
   });
 
+  const path = require("path");
+  const i18nConfig = {
+    i18n: {
+      defaultLocale: "zh-CN",
+      locales: ["zh-CN", "en-US", "ja-JP"],
+    },
+    localePath: path.resolve(process.cwd(), "public/locales"),
+  };
+
   return {
     props: {
       html,
-      ...(await serverSideTranslations(currentLocale, ["common", "layout", "login"])),
+      ...(await serverSideTranslations(currentLocale, ["common", "layout", "login"], i18nConfig)),
     },
   };
 };

package/pages/template/manage.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from "react";
+import { useState, useEffect } from "react";
 import { ConfigProvider, Modal, Space, Upload, message } from "antd";
 import {
   Container,
@@ -412,7 +412,21 @@ export async function getServerSideProps(context) {
   });
 
   const { locale } = context;
-  const translations = await serverSideTranslations(locale || "zh-CN", ["common", "template", "layout", "login"]);
+
+  const path = require("path");
+  const i18nConfig = {
+    i18n: {
+      defaultLocale: "zh-CN",
+      locales: ["zh-CN", "en-US", "ja-JP"],
+    },
+    localePath: path.resolve(process.cwd(), "public/locales"),
+  };
+
+  const translations = await serverSideTranslations(
+    locale || "zh-CN",
+    ["common", "template", "layout", "login"],
+    i18nConfig
+  );
 
   return {
     props: {