@gadmin2n/schematics 0.0.63 → 0.0.65

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

@@ -1,15 +1,15 @@
 .DS_Store
+web/
 **/node_modules
 **/dist
 **/generated
 **/bin
 **/build
-
+**/upload
 .git
 npm-debug.log
 .coverage
 .coverage.*
-.env
 .aws
 # local env files
 .env.local

package/dist/lib/application/files/gadmin2-game-angle-demo/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-# ─── Stage 1: Builder ────────────────────────────────────────
+# ─── 阶段 1：构建 ────────────────────────────────────────────
 FROM node:20-alpine AS builder
 
 WORKDIR /app
@@ -8,42 +8,56 @@ WORKDIR /app
 # 禁止 husky 在无 .git 环境下报错
 ENV HUSKY=0
 
-# 安装 gadmin2 CLI（单独一层，利用缓存）
+# 安装 gadmin2 CLI（建议锁定版本号以保证构建可复现）
 RUN yarn global add @gadmin2n/cli@0.0.80
 
-# 先复制 package.json，利用 Docker 层缓存：依赖未变则跳过 yarn install
-COPY server/package.json server/yarn.lock* ./server/
-COPY web/package.json web/yarn.lock* ./web/
+# 先复制依赖描述文件，源码未变时此层可复用缓存
+COPY server/package.json server/yarn.lock ./server/
 
-RUN cd server && yarn install --frozen-lockfile && \
-    cd ../web && yarn install --frozen-lockfile
+# 安装全量依赖（含 devDependencies，用于代码生成和 TypeScript 编译）
+RUN --mount=type=cache,target=/root/.yarn \
+    cd server && yarn install --frozen-lockfile
 
-# 再复制其余源码
-COPY . .
+# 复制 Prisma schema 配置和所有源码
+COPY config/ ./config/
+COPY server/ ./server/
 
-# 生成代码、构建 web、构建 server
-RUN gadmin2 g prisma && \
-    cd web && yarn build && yarn cache clean --all && \
-    cd ../server && yarn build
+# 代码生成 + 编译
+RUN gadmin2 g prisma:server && cd server && yarn build
 
-# 切换为仅生产依赖，减小体积
-RUN cd server && NODE_ENV=production yarn install --production --frozen-lockfile && \
-    yarn cache clean --all
+# ─── 阶段 2：运行 ────────────────────────────────────────────
+FROM node:20-alpine AS runner
 
-# 将 web 构建产物放入 server 静态目录
-RUN cp -R web/build server/dist/www
+WORKDIR /app/server
 
+STOPSIGNAL SIGQUIT
 
-# ─── Stage 2: Runtime ────────────────────────────────────────
-FROM node:20-alpine AS runtime
+# 禁止 husky 在无 .git 环境下报错
+ENV HUSKY=0
 
-WORKDIR /app/server
+# 先复制依赖描述文件
+COPY server/package.json server/yarn.lock ./
 
-STOPSIGNAL SIGQUIT
+# 只安装 production 依赖，大幅减少镜像体积
+RUN --mount=type=cache,target=/root/.yarn \
+    yarn install --production --frozen-lockfile
+
+# 从构建阶段复制 Prisma 生成的 Client（含平台原生二进制）
+COPY --from=builder /app/server/node_modules/.prisma ./node_modules/.prisma
+
+# 从构建阶段复制编译产物
+COPY --from=builder /app/server/dist ./dist
+
+# 复制 Prisma schema（feature 分支部署时 prisma db push 需要）
+COPY --from=builder /app/server/prisma ./prisma
+
+# 复制启动脚本和数据库迁移脚本
+COPY server/start-prod.sh server/migrate-between-pg-schemas.js ./
+RUN chmod +x start-prod.sh
+
+# 复制环境变量配置（作为默认值，K8s 注入的同名变量优先级更高）
+COPY server/.env ./.env
 
-COPY --from=builder /app/server/dist       ./dist
-COPY --from=builder /app/server/node_modules ./node_modules
-COPY --from=builder /app/server/package.json ./package.json
-COPY --from=builder /app/server/prisma     ./prisma
+EXPOSE 8000
 
 CMD ["yarn", "start:prod"]

package/dist/lib/application/files/gadmin2-game-angle-demo/Jenkinsfile

@@ -4,18 +4,30 @@ pipeline {
   environment {
     CODING_DOCKER_REG_HOST = "${CCI_CURRENT_TEAM}-${CCI_DOCKER_REGISTRY_DOMAIN}"
     IMAGE_VERSION = "build-${env.CI_BUILD_NUMBER}"
-    CODING_DOCKER_IMAGE_NAME = "${PROJECT_NAME.toLowerCase()}/production/${CCI_JOB_NAME}"
+    CODING_DOCKER_IMAGE_NAME = "${PROJECT_NAME.toLowerCase()}/${env.BRANCH_NAME == 'test'? 'test' : 'prod'}/${CCI_JOB_NAME}"
     IMAGE_FULL_NAME = "${CODING_DOCKER_REG_HOST}/${env.CODING_DOCKER_IMAGE_NAME}:${IMAGE_VERSION}"
   }
 
   stages {
     stage('检出Git') {
+      when {
+        anyOf {
+          branch 'test';
+          branch 'master'
+        }
+      }
       steps {
         checkout([$class: 'GitSCM', branches: [[name: env.GIT_BUILD_REF]], userRemoteConfigs: [[url: env.GIT_REPO_URL, credentialsId: env.CREDENTIALS_ID]]])
       }
     }
 
     stage('构建推送镜像') {
+      when {
+        anyOf {
+          branch 'test';
+          branch 'master'
+        }
+      }
       steps {
         script {
           docker.withRegistry(
@@ -29,13 +41,27 @@ pipeline {
       }
     }
 
-    stage('自动部署') {
+    stage('测试环境部署') {
+      when {
+        anyOf {
+          branch 'test'
+        }
+      }
+      steps {
+        sh 'curl https://api-spinnaker.devops.intlgame.com/webhooks/webhook/oit-erp-backend-test -X POST -H "content-type: application/json" -d \'{"parameters": {"image_tag": "\'"${IMAGE_VERSION}"\'"}}\''
+        echo '部署已经触发，可以在Spinnaker查看状态: https://api-spinnaker.devops.intlgame.com'
+      }
+    }
+
+    stage('正式环境自动部署') {
       when {
-        anyOf { branch 'master' }
+        anyOf {
+          branch 'master'
+        }
       }
       steps {
         script {
-          sh 'curl https://api-spinnaker.devops.intlgame.com/webhooks/webhook/${not-exist-depolyment-name} -X POST -H "content-type: application/json" -d \'{"parameters": {"image_tag": "\'"${IMAGE_VERSION}"\'"}}\''
+          sh 'curl https://api-spinnaker.devops.intlgame.com/webhooks/webhook/oit-erp-backend-prod -X POST -H "content-type: application/json" -d \'{"parameters": {"image_tag": "\'"${IMAGE_VERSION}"\'"}}\''
           echo '部署已经触发，可以在Spinnaker查看状态: https://api-spinnaker.devops.intlgame.com'
         }
       }

package/dist/lib/application/files/gadmin2-game-angle-demo/config/prisma/example.prisma

@@ -0,0 +1,33 @@
+/// @IgnoreAutoField
+model Event {
+  id                BigInt      @id @default(autoincrement())
+  region            String
+  country           String
+  city              String
+  eventType         String //GDC Summit, Gamescom Summit, All Hands, Open Space Event, Others
+  additionalInfo    String?  @default("")
+  startDate         DateTime?
+  endDate           DateTime?
+  businessRequester String?  @default("")
+  oitOwner          String?  @default("")
+  creator           String?  @default("")
+  snSysId           String?  @default("") // servicenow sys id
+  createdAt         DateTime @default(now()) // 创建时间
+  updatedAt         DateTime @default(now()) @updatedAt // 修改时间
+  number            String?  @db.Text
+
+  @@unique([number])
+  @@map("t_event")
+}
+
+/// @IgnoreAutoField
+model ITActivityDay {
+  id                   BigInt @id @default(autoincrement())
+  dateKey              DateTime @db.Date
+  title                String @default("") @db.VarChar(255)  //
+  key                  String @default("") @db.VarChar(255)
+  tags                 String @default("") @db.VarChar(255)
+  created_at           DateTime
+  
+  @@map("t_it_activity_day")
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/config/prisma/system.prisma

@@ -0,0 +1,163 @@
+model Game {
+  unified_editionid String @db.VarChar(128)
+  name              String @db.VarChar(64)
+
+  @@unique([unified_editionid])
+  @@map("t_admin_game")
+}
+
+/// @IgnoreAutoField
+model User {
+  id          Int   @id @default(autoincrement())
+  userid      String    @db.VarChar
+  username    String?   @db.VarChar
+  /// @FormItem(Select, GUEST|PRODUCT|SYSTEM_ADMIN, multiple)
+  roles       String    @default("[]") @db.VarChar
+  creator     String     @default("")
+  /// @FormItem(Boolean)
+  isApiKey    Boolean   @default(false)
+  apiKey      String?   @db.VarChar
+  description String?   @db.VarChar
+  /// @FormItem(Boolean)
+  isActive    Boolean   @default(true) 
+  lastUsedAt  DateTime?
+  createdAt   DateTime @default(now())
+  updatedAt   DateTime @default(now())
+
+  @@unique([userid])
+  @@unique([apiKey])
+  @@map("t_admin_user_role")
+}
+
+/// @IgnoreAutoField
+model Audit {
+  id           BigInt   @id @default(autoincrement())
+  creator      String   @default("") @db.VarChar(128)
+  authorId     String   @default("") @db.VarChar(255)
+  authorName   String   @default("") @db.VarChar(255)
+  action       String   @default("") @db.VarChar(255)
+  resource     String   @default("") @db.VarChar(255)
+  resourceId   String   @default("") @db.VarChar(255)
+  data         String?  @db.Text
+  previousData String?  @db.Text
+  timestamp    DateTime @default(now()) @db.Timestamp(0)
+
+  @@map("t_admin_audit_log")
+}
+
+/// @IgnoreAutoField
+model Resource {
+  id          Int      @id @default(autoincrement())
+  code     String   @unique       // e.g. "user", "hwasset"
+  name     String   @unique
+  description    String?      @db.VarChar
+  isCommonResource Boolean @default(false) @map("is_common_resource")  // 通用资源不受页面变更影响
+
+  creator     String?   @db.VarChar
+  createdAt   DateTime @default(now())   // 映射到数据库的 create_at
+  updatedAt   DateTime @default(now())
+
+  pageResources PageResource[]
+  roleResources RoleResource[]
+  @@map("t_resource")
+}
+
+/// @IgnoreAutoField
+model Role {
+  id          Int      @id @default(autoincrement())
+  name           String       @db.VarChar
+  description    String?      @db.VarChar
+
+  creator     String?   @db.VarChar
+  createdAt   DateTime @default(now())   // 映射到数据库的 create_at
+  updatedAt   DateTime @default(now()) @updatedAt 
+
+  rolePages      RolePages[]
+
+  roleResources  RoleResource[]  
+
+
+  @@unique([name])
+  @@map("t_role")
+}
+
+/// @IgnoreAutoField
+model Page {
+  id          Int      @id @default(autoincrement())
+  code        String   @unique
+  name        String
+  path        String?
+  iframeUrl   String?   @map("iframe_url") @db.Text
+  externalRedirectUrl String?   @map("external_redirect_url") @db.Text
+  description String?   @db.VarChar
+  zhName      String?   @map("zh_name") @db.Text
+  enName      String?   @map("en_name") @db.Text
+  i18nKey     String?   @db.VarChar
+  parentId    Int?      @map("parent_id")
+  sortOrder    Int?     @map("sort_order")
+  isVirtual   Boolean   @default(false)
+
+  pageResources PageResource[]   
+  rolePages     RolePages[] 
+
+  creator     String?   @db.VarChar
+  createdAt   DateTime @default(now()) @map("created_at")  // 映射到数据库的 create_at
+  updatedAt   DateTime @updatedAt @map("updated_at")     
+ 
+
+  @@map("t_page")
+}
+
+/// @IgnoreAutoField
+model RoleResource {
+  id          Int      @id @default(autoincrement())
+  roleId      Int     @map("role_id")
+  resourceId  Int     @map("resource_id")
+  actions     Json     
+  
+  role        Role     @relation(fields: [roleId], references: [id])
+  resource    Resource @relation(fields: [resourceId], references: [id])
+
+  creator     String?   @db.VarChar
+  createdAt   DateTime @default(now()) @map("created_at")  // 映射到数据库的 create_at
+  updatedAt   DateTime @updatedAt @map("updated_at")      
+  
+
+  @@unique([roleId, resourceId])
+  @@map("t_role_resource")
+}
+
+/// @IgnoreAutoField
+model PageResource {
+  id      Int   @id @default(autoincrement())
+  pageId      Int       @map("page_id")
+  resourceId  Int       @map("resource_id")
+  actions     Json      
+
+  page        Page      @relation(fields: [pageId], references: [id])
+  resource    Resource  @relation(fields: [resourceId], references: [id])
+
+  creator     String?   @db.VarChar
+  createdAt   DateTime @default(now()) @map("created_at")  // 映射到数据库的 create_at
+  updatedAt   DateTime @updatedAt @map("updated_at")    
+
+  @@unique([pageId, resourceId])
+  @@map("t_page_resource")
+}
+
+/// @IgnoreAutoField
+model RolePages {
+  id      Int   @id @default(autoincrement())
+  roleId  Int   @map("role_id")
+  pageId  Int   @map("page_id")
+
+  role    Role  @relation(fields: [roleId], references: [id])
+  page    Page  @relation(fields: [pageId], references: [id])
+
+  creator     String?   @db.VarChar
+  createdAt   DateTime @default(now()) @map("created_at")  // 映射到数据库的 create_at
+  updatedAt   DateTime @updatedAt @map("updated_at")     
+
+  @@unique([roleId, pageId])
+  @@map("t_role_pages")
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/config/ui/Event.ts

@@ -0,0 +1,70 @@
+import { ModelConfig } from "../.types";
+import { pageActions, PAGE_SIZE } from "./_common";
+
+export const Event: ModelConfig = 
+{ 
+  metadata: {
+    nameKeys: ["id"],
+    pageActions,
+  },
+  table: {
+    toolbar: {
+      searchBar: {
+        fields: ["id"],
+        containsFields: [],
+        placeholder: "id",
+      },
+      actions: [
+        {action: 'REFRESH', desc: 'Refresh'},
+        {action: 'SETTING', desc: 'Setting'},
+        {
+          action: "EXPORT",
+          desc: 'export',
+          fields: ["*","!created_at"]
+        },
+      ],
+    },
+    header: {
+      filter: [],
+      sorter: ["id"],
+    },
+    fields: ["*","!created_at"],
+    rowSelection: {
+      actions: [
+        {action: 'INSERT', desc: 'Insert'},
+        
+        {action: 'DELETE', desc: 'Delete'},
+        {action: 'EXPORT', desc: 'Export'},
+      ],
+    },
+    rowActions: {
+      visibleNum: 2,
+      actions: [
+        {
+          action: "EDIT",
+          desc: "Edit",
+        },
+        
+        {action: "DELETE", desc: 'Delete'}
+      ],
+    },
+    params: {
+      pageSize: PAGE_SIZE,
+    },
+  },
+  form: {
+    fields: ["*","!creator","!created_at","!updated_at"],
+    reaction: {
+      id: {
+        toggle: [],
+        defaultProps: {
+          hidden: true,
+        },
+      },
+    },
+  },
+  show: {
+    fields: ["*","!created_at"],
+  },
+}
+;

package/dist/lib/application/files/gadmin2-game-angle-demo/config/ui/Game.ts

@@ -1,7 +1,7 @@
-import { IModelConfig } from "../.types";
+import { ModelConfig } from "../.types";
 import { pageActions, PAGE_SIZE } from "./_common";
 
-export const Game: IModelConfig = {
+export const Game: ModelConfig = {
   metadata: {
     nameKeys: ["id"],
     pageActions,
@@ -19,7 +19,7 @@ export const Game: IModelConfig = {
         {
           action: "EXPORT",
           desc: "export",
-          fields: ["*", "!create_time"],
+          fields: ["*", "!createdAt"],
         },
       ],
     },
@@ -27,7 +27,7 @@ export const Game: IModelConfig = {
       filter: [],
       sorter: ["id"],
     },
-    fields: ["*", "!create_time"],
+    fields: ["*", "!createdAt"],
     rowSelection: {
       actions: [
         { action: "INSERT", desc: "Insert" },
@@ -50,9 +50,9 @@ export const Game: IModelConfig = {
     },
   },
   form: {
-    fields: ["*", "!id", "!create_time", "!update_time", "!creator"],
+    fields: ["*", "!id", "!createdAt", "!updatedAt", "!creator"],
   },
   show: {
-    fields: ["*", "!create_time"],
+    fields: ["*"],
   },
 };

package/dist/lib/application/files/gadmin2-game-angle-demo/config/ui/ITActivityDay.ts

@@ -0,0 +1,70 @@
+import { ModelConfig } from "../.types";
+import { pageActions, PAGE_SIZE } from "./_common";
+
+export const ITActivityDay: ModelConfig = 
+{ 
+  metadata: {
+    nameKeys: ["title"],
+    pageActions,
+  },
+  table: {
+    toolbar: {
+      searchBar: {
+        fields: ["id","title"],
+        containsFields: ["title"],
+        placeholder: "id,title",
+      },
+      actions: [
+        {action: 'REFRESH', desc: 'Refresh'},
+        {action: 'SETTING', desc: 'Setting'},
+        {
+          action: "EXPORT",
+          desc: 'export',
+          fields: ["*","!created_at"]
+        },
+      ],
+    },
+    header: {
+      filter: [],
+      sorter: ["id"],
+    },
+    fields: ["*","!created_at"],
+    rowSelection: {
+      actions: [
+        {action: 'INSERT', desc: 'Insert'},
+        
+        {action: 'DELETE', desc: 'Delete'},
+        {action: 'EXPORT', desc: 'Export'},
+      ],
+    },
+    rowActions: {
+      visibleNum: 2,
+      actions: [
+        {
+          action: "EDIT",
+          desc: "Edit",
+        },
+        
+        {action: "DELETE", desc: 'Delete'}
+      ],
+    },
+    params: {
+      pageSize: PAGE_SIZE,
+    },
+  },
+  form: {
+    fields: ["*","!creator","!created_at","!updated_at"],
+    reaction: {
+      id: {
+        toggle: [],
+        defaultProps: {
+          hidden: true,
+        },
+      },
+    },
+  },
+  show: {
+    fields: ["*","!created_at"],
+  },
+}
+;

package/dist/lib/application/files/gadmin2-game-angle-demo/config/ui/Log.ts

@@ -1,7 +1,7 @@
-import { IModelConfig } from "../.types";
+import { ModelConfig } from "../.types";
 import { pageActions, PAGE_SIZE } from "./_common";
 
-export const Log: IModelConfig = {
+export const Log: ModelConfig = {
   metadata: {
     nameKeys: ["id"],
     pageActions,

package/dist/lib/application/files/gadmin2-game-angle-demo/config/ui/Role.ts

@@ -1,7 +1,7 @@
-import { IModelConfig } from "../.types";
+import { ModelConfig } from "../.types";
 import { pageActions, PAGE_SIZE } from "./_common";
 
-export const Role: IModelConfig = {
+export const Role: ModelConfig = {
   metadata: {
     nameKeys: ["userid"],
     pageActions,

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

@@ -6,15 +6,26 @@
 
 #DATABASE_URL="file:./dev.db"
 
-DATABASE_URL=mysql://root:meiyou@127.0.0.1:3306/db_gadmin2_demo0
+# release environment
+NODE_ENV=development
 
-#DATABASE_URL=mysql://root:Gadmin@20201%25@9.135.249.79:3306/db_databrain_config
+VITE_URL_BASENAME=
 
-NODE_ENV=development
+# 太湖登录
+TAIHU_CALLBACK=http://localhost:8000/api/login-callback
+TAIHU_LOGOUT=https://tai.it.tencent.com/logout
+TAIHU_BASE=https://tai.it.tencent.com/api/auth-center/oauth2
+
+#https://tai.it.woa.com/odc/app/list?currentPage=0&pageSize=10
+TAIHU_ODC_CLIENT_ID=oit-erp-app
+TAIHU_ODC_APP_TOKEN=N2LYRDRONRRJXNLLHZ4W3XPQTKG6ZJTN
+
+#https://tai.it.woa.com/apps?currentPage=0&pageSize=10
+TAIHU_APP_TOKEN=BLSHJOB21XV4MBDFTEZNET3E7GKDO8M6
+
+EXTERNAL_PAGE_SECRET=004eb3f3444ec6f321c1f49c9ec5c28c98aec2c825587a6af093d8ab1266d4a9
 
-# 玉符登录
-YUFU_CALLBACK=http://localhost:8000/login-callback
-YUFU_LOGOUT=https://login.iam.intlgame.com/logout
-YUFU_BASE=https://login.iam.intlgame.com/sso/tn-869bbe512bb54c14921d85c69ae839dc/ai-0bd3c66d5a24463eb7b855a3621a67cc/oidc
-YUFU_CLIENT_ID=ai-0bd3c66d5a24463eb7b855a3621a67cc
-YUFU_CLIENT_SECRET=iklIG46GnNutHFKPV6wEgj53
+OTEL_TRACES_EXPORTER=otlp
+OTEL_RESOURCE_ATTRIBUTES_TOKEN=xxxx
+OTEL_EXPORTER_OTLP_PROTOCOL=http
+OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://pl.ap-singapore.apm.tencentcs.com:4319

package/dist/lib/application/files/gadmin2-game-angle-demo/server/.env.local

@@ -0,0 +1 @@
+DATABASE_URL=postgresql://kavenma:kavenma@127.0.0.1:5432/gadmin_demo?schema=public

package/dist/lib/application/files/gadmin2-game-angle-demo/server/.eslintrc.js

@@ -22,4 +22,5 @@ module.exports = {
     '@typescript-eslint/explicit-module-boundary-types': 'off',
     '@typescript-eslint/no-explicit-any': 'off',
   },
+  "quote": "single"   
 };

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

@@ -0,0 +1 @@
+src/**/*.enum.ts

package/dist/lib/application/files/gadmin2-game-angle-demo/server/README.md

@@ -6,7 +6,7 @@
 ```bash
 $ yarn start:dev
 ```
-Then you can browse [http://127.0.0.1:3000/api/](http://127.0.0.1:3000/api/)
+Then you can browse [http://127.0.0.1:8000/api/](http://127.0.0.1:8000/api/)
 
 ### Running the production server.
 
@@ -17,7 +17,6 @@ $ yarn start
 ```
 ├── README.md
 ├── config
-│   ├── ac.config.ts   #access controll config
 │   └── index.ts       #project config
 ├── dist
 ├── gadmin-cli.json
@@ -52,20 +51,5 @@ config/index.ts
 - [swagger](https://docs.nestjs.com/openapi/introduction)
 
 ## Access control
-config/ac.config.ts, [read more](https://github.com/nestjsx/nest-access-control)
+DataBase
 
-## Test
-
-```bash
-# unit tests
-$ yarn run test
-
-# e2e tests
-$ yarn run test:e2e
-
-# test coverage
-$ yarn run test:cov
-```
-
-## License
-Nest is [MIT licensed](LICENSE).

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

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/nest-cli",
-  "collection": "@gadmin2n/schematics",
+  "collection": "@gadmin2/schematics",
   "sourceRoot": "src",
   "compilerOptions": {
     "plugins": [