@gadmin2n/schematics 0.0.63 → 0.0.65

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/user/user.service.ts

@@ -0,0 +1,104 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { Prisma, User } from '@prisma/client';
+import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
+import { PrismaService } from 'nestjs-prisma';
+import { Logger } from 'winston';
+
+import { ConfigService } from '@nestjs/config';
+import * as path from 'path';
+
+@Injectable()
+export class UserService {
+  constructor(
+    private prisma: PrismaService,
+    private readonly config: ConfigService,
+    @Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger,
+  ) {
+    this.logger = this.logger.child({
+      file: path.basename(__filename),
+    });
+  }
+
+  async createOne(userCreateArgs: Prisma.UserCreateArgs) {
+    return await this.prisma.user.create(userCreateArgs);
+  }
+
+  async createMany(data: Prisma.UserCreateManyArgs['data']) {
+    return await this.prisma.user.createMany({
+      data,
+      skipDuplicates: true,
+    });
+  }
+
+  async findMany(
+    userFindManyArgs: Prisma.UserFindManyArgs,
+  ): Promise<{ itemCount: number; entities: User[] }> {
+    const itemCount = await this.prisma.user.count({
+      where: userFindManyArgs.where,
+    });
+    const entities = await this.prisma.user.findMany(userFindManyArgs);
+    return { itemCount, entities };
+  }
+
+  async findUnique(id: number, select: Prisma.UserFindUniqueArgs['select']) {
+    return await this.prisma.user.findUnique({
+      where: { id: id },
+      select,
+    });
+  }
+
+  async updateMany(userUpdateManyArgs: Prisma.UserUpdateManyArgs) {
+    return await this.prisma.user.updateMany(userUpdateManyArgs);
+  }
+
+  async updateUnique(id: number, data: Prisma.UserUpdateManyArgs['data']) {
+    return await this.prisma.user.update({
+      where: { id: id },
+      data,
+    });
+  }
+
+  async deleteMany(userDeleteManyArgs: Prisma.UserDeleteManyArgs) {
+    return await this.prisma.user.deleteMany(userDeleteManyArgs);
+  }
+
+  async deleteUnique(id: number) {
+    await this.prisma.user.delete({
+      where: { id: id },
+    });
+    return { count: 1 };
+  }
+
+  async count(userCountArgs?: Prisma.UserCountArgs) {
+    return await this.prisma.user.count(userCountArgs);
+  }
+
+  async groupBy(userGroupByArgs: Prisma.UserGroupByArgs) {
+    return await this.prisma.user.groupBy(userGroupByArgs as any);
+  }
+
+  async aggregate(userAggregateArgs: Prisma.UserAggregateArgs) {
+    return await this.prisma.user.aggregate(userAggregateArgs);
+  }
+
+  async findByApiKey(key: string): Promise<User | null> {
+    const record = await this.prisma.user.findFirst({
+      where: { apiKey: key, isApiKey: true },
+    });
+    if (record) {
+      // async update lastUsedAt - fire and forget
+      this.prisma.user
+        .update({
+          where: { userid: record.userid },
+          data: { lastUsedAt: new Date() },
+        })
+        .catch(() => {});
+    }
+    return record;
+  }
+
+  static maskApiKey(key: string | null): string {
+    if (!key || key.length <= 8) return key || '';
+    return key.substring(0, 8) + '****';
+  }
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/server/start-prod.sh

@@ -0,0 +1,130 @@
+#!/bin/sh
+set -e  # 任何命令失败时立即退出脚本
+
+# 加载 .env 文件作为默认值（不覆盖已有环境变量）
+if [ -f .env ]; then
+  while IFS='=' read -r key value; do
+    # 跳过空行和注释
+    case "$key" in
+      ''|\#*) continue ;;
+    esac
+    # 只在变量未设置时赋值
+    eval "current_val=\${$key+x}"
+    if [ -z "$current_val" ]; then
+      export "$key=$value"
+    fi
+  done < .env
+fi
+
+# 检查环境变量是否为空
+if [ -z "$DATABASE_URL" ]; then
+    echo "Warning: DATABASE_URL is empty."
+    exit 1
+fi
+
+echo "原始 DATABASE_URL: ${DATABASE_URL}"
+
+# 如果存在DEPLOY_NAME环境变量，且变量值以feature或者bugfix开头，则执行数据库同步
+# 检查 DEPLOY_NAME 是否以 feature/ 或 bugfix/ 或 hotfix/ 开头
+DEPLOY_PREFIX_MATCH=0
+if [ -n "$DEPLOY_NAME" ]; then
+  case "$DEPLOY_NAME" in
+    feature*|bugfix*|hotfix*)
+      DEPLOY_PREFIX_MATCH=1
+      ;;
+  esac
+fi
+
+if [ "$DEPLOY_PREFIX_MATCH" -eq 1 ]; then
+  # 将DATABASE_URL的schema设置为DEPLOY_NAME，需要把DEPLOY_NAME中的- 和 /替换为_
+  SCHEMA_NAME=$(echo "$DEPLOY_NAME" | tr '-' '_' | tr '/' '_')
+  
+  echo "开始配置临时环境 schema: ${SCHEMA_NAME}"
+  
+  # 处理 DATABASE_URL 中的 schema 参数
+  # 先移除可能存在的 schema 参数（包括空值的情况）
+  # 使用 sed 移除 schema=xxx 或 schema= 参数
+  DATABASE_URL=$(echo "$DATABASE_URL" | sed -E 's/[&?]schema=[^&?]*//g')
+  # 清理 URL 末尾的 ? 或 &，以及重复的 & 和 ?& 组合
+  DATABASE_URL=$(echo "$DATABASE_URL" | sed 's/[?&]$//' | sed 's/[?]&/?/g' | sed 's/&&\+/\&/g')
+  
+  # 确保 SCHEMA_NAME 不为空
+  if [ -z "$SCHEMA_NAME" ]; then
+    echo "错误: SCHEMA_NAME 为空"
+    exit 1
+  fi
+  
+  # prisma cli 需要使用这个环境变量来同步db表结构
+  # 如果DATABASE_URL中已经包含了 ? ，则使用 & 拼接schema，否则使用 ? 拼接schema
+  # https://www.prisma.io/docs/orm/more/development-environment/environment-variables
+  case "$DATABASE_URL" in
+    *\?*)
+      DATABASE_URL="${DATABASE_URL}&schema=${SCHEMA_NAME}"
+      ;;
+    *)
+      DATABASE_URL="${DATABASE_URL}?schema=${SCHEMA_NAME}"
+      ;;
+  esac
+
+  echo "更新后的 DATABASE_URL: ${DATABASE_URL}"
+  export DATABASE_URL="${DATABASE_URL}"
+
+  yarn push:db || { echo "同步表结构失败"; exit 1; }
+
+  # 设置迁移脚本的源和目标 schema
+  # 源 schema 为 public（生产数据），目标 schema 为分支 schema
+  export PG_SCHEMA="public"
+  export PG_SCHEMA_TARGET="${SCHEMA_NAME}"
+
+  node migrate-between-pg-schemas.js || { echo "迁移数据库失败"; exit 1; }
+else
+  echo "非临时环境，不需要同步的表结构和数据"
+  # 如果DATABASE_URL中已经包含了schema=xxx，则不添加，如果DATABASE_URL中没有schema=，则添加schema=public，如果DATABASE_URL中已经包含了schema=但没有具体值，则添加public
+  case "$DATABASE_URL" in
+    *"schema="*)
+      # 情况 1 & 3: 已经包含 schema=
+      case "$DATABASE_URL" in
+        *"schema=")
+          # 情况 3-A: 以 schema= 结尾（没有值）
+          # 动作: 追加 public
+          DATABASE_URL="${DATABASE_URL}public"
+          ;;
+        *"schema=&"*)
+          # 情况 3-B: 包含 schema=&（在中间且没有值）
+          # 动作: 使用 sed 替换为空缺的值填入 public
+          DATABASE_URL=$(echo "$DATABASE_URL" | sed 's/schema=&/schema=public\&/')
+          ;;
+        *)
+          # 情况 1: 包含 schema=xxx（已有具体值）
+          # 动作: 不做任何修改
+          ;;
+      esac
+      ;;
+    *)
+      # 情况 2: 完全没有 schema=
+      # 动作: 判断连接符是 ? 还是 &
+      case "$DATABASE_URL" in
+        *"?"*)
+          # URL 中已经有 ? (说明已有其他参数)
+          DATABASE_URL="${DATABASE_URL}&schema=public"
+          ;;
+        *)
+          # URL 中没有 ? (说明这是第一个参数)
+          DATABASE_URL="${DATABASE_URL}?schema=public"
+          ;;
+      esac
+      ;;
+  esac
+
+  echo "更新后的 DATABASE_URL: ${DATABASE_URL}"
+  export DATABASE_URL="${DATABASE_URL}"
+
+  # 如果 NODE_ENV 是 test 则执行数据库同步（迁移）。正式环境手工进行同步
+  #if [ "$NODE_ENV" = "test" ]; then
+  #  yarn migrate:deploy || { echo "同步表结构失败"; exit 1; }
+  #fi
+fi
+
+# 启动应用（在同一个 shell 会话中，确保环境变量可用）
+# 使用 exec 替换当前进程，这样环境变量可以正确传递
+exec node dist/src/main

package/dist/lib/application/files/gadmin2-game-angle-demo/server/tsconfig.json

@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
+    "moduleResolution": "node",
     "declaration": true,
     "removeComments": true,
     "emitDecoratorMetadata": true,
@@ -16,6 +17,20 @@
     "noImplicitAny": false,
     "strictBindCallApply": false,
     "forceConsistentCasingInFileNames": false,
-    "noFallthroughCasesInSwitch": false
-  }
-}
+    "noFallthroughCasesInSwitch": false,
+    "paths": {
+      "@/*": [
+        "src/*"
+      ]
+    },
+    "types": [
+      "node",
+      "nest-access-control"
+    ]
+  },
+  "exclude": [
+    "node_modules", // 忽略第三方依赖
+    "**/*.js", // 忽略所有JS文件
+    "**/*.d.ts", // 忽略所有D.ts文件
+  ]
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/index.html

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta name="description" content="Gadmin2 demo" />
+    <title>Gadmin2 demo</title>
+    <script>
+      var global = globalThis;
+    </script>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <script type="module" src="/src/index.tsx"></script>
+  </body>
+</html>

package/dist/lib/application/files/gadmin2-game-angle-demo/web/package.json

@@ -5,85 +5,77 @@
   "author": "",
   "private": true,
   "dependencies": {
-    "@ant-design/icons": "^5.0.1",
-    "@gadmin2n/react-common": "^0.0.53",
-    "@refinedev/antd": "5.22.0",
-    "@refinedev/cli": "2.5.5",
-    "@refinedev/core": "4.20.0",
-    "@refinedev/inferencer": "4.1.0",
-    "@refinedev/kbar": "^1.1.0",
-    "@refinedev/react-router-v6": "4.3.2",
-    "@tanstack/react-query": "^4.10.1",
+    "@ant-design/icons": "^5.6.1",
+    "@dnd-kit/core": "^6.0.8",
+    "@dnd-kit/modifiers": "^9.0.0",
+    "@dnd-kit/sortable": "^7.0.2",
+    "@dnd-kit/utilities": "^3.2.2",
+    "@gadmin2n/react-common": "^0.0.55",
+    "@refinedev/antd": "^5.47.0",
+    "@refinedev/cli": "^2.16.51",
+    "@refinedev/core": "^4.58.0",
+    "@refinedev/inferencer": "^4.7.1",
+    "@refinedev/kbar": "^1.3.17",
+    "@refinedev/react-router-v6": "^4.6.0",
+    "@tanstack/react-query": "^4.36.1",
     "@uiw/react-md-editor": "^3.19.5",
-    "antd": "^5.5.1",
+    "antd": "^5.24.6",
     "class-validator": "^0.14.0",
-    "i18next": "^22.4.7",
-    "i18next-browser-languagedetector": "^7.0.1",
-    "i18next-xhr-backend": "^3.2.2",
+    "dayjs": "^1.11.19",
+    "i18next": "^24.2.3",
+    "i18next-browser-languagedetector": "^8.0.4",
+    "i18next-http-backend": "^3.0.2",
     "js-cookie": "^3.0.5",
     "json-stable-stringify": "^1.0.1",
+    "lodash": "^4.17.23",
     "lodash.foreach": "^4.5.0",
     "lodash.groupby": "^4.6.0",
     "lodash.memoize": "^4.1.2",
     "react": "^18.2.0",
     "react-diff-viewer": "^3.1.1",
     "react-dom": "^18.2.0",
-    "react-i18next": "^11.8.11",
+    "react-i18next": "^15.4.1",
     "react-router-dom": "^6.8.1",
     "reflect-metadata": "^0.1.13",
     "vanilla-jsoneditor": "^0.23.7"
   },
   "devDependencies": {
-    "@craco/craco": "^7.0.0",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.1.1",
     "@testing-library/user-event": "^14.1.1",
     "@types/jest": "^29.2.4",
     "@types/js-cookie": "^3.0.3",
     "@types/json-stable-stringify": "^1.0.34",
+    "@types/lodash": "^4.17.23",
     "@types/lodash.foreach": "^4.5.7",
     "@types/lodash.groupby": "^4.6.7",
     "@types/lodash.memoize": "^4.1.7",
     "@types/node": "^12.20.10",
     "@types/react": "^18.0.15",
     "@types/react-dom": "^18.0.6",
-    "craco-less": "^2.0.0",
+    "@vitejs/plugin-react": "^4.3.4",
+    "autoprefixer": "^10.4.24",
+    "postcss": "^8.5.6",
+    "postcss-nesting": "^14.0.0",
+    "typescript": "^5.4.2",
     "husky": "^8.0.0",
     "lint-staged": "^13.0.0",
     "prettier": "^3.0.0",
-    "process": "^0.11.10",
-    "react-scripts": "^5.0.0",
-    "typescript": "^5.0.0",
-    "web-vitals": "^1.1.1"
+    "vite": "^6.2.0",
+    "vite-tsconfig-paths": "^5.1.4"
   },
   "scripts": {
-    "dev": "refine start",
-    "build": "refine build",
+    "dev": "vite --port 3000",
+    "build": "tsc && vite build",
+    "preview": "vite preview",
     "format": "prettier --write \"src/**/*.{ts,tsx}\"",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject",
-    "refine": "refine",
     "prepare": "cd .. && husky install"
   },
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest"
-    ]
-  },
   "lint-staged": {
     "**/*.{ts,tsx,js,jsx}": "prettier --write"
   },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
+  "type": "module",
+  "resolutions": {
+    "rc-util": "^5.44.4"
   }
 }

package/dist/lib/application/files/gadmin2-game-angle-demo/web/postcss.config.cjs

@@ -0,0 +1,6 @@
+module.exports = {
+  plugins: {
+    autoprefixer: {},
+    "postcss-nesting": {},
+  },
+};