@gadmin2n/schematics 0.0.150 → 0.0.151

package/dist/lib/application/files/gadmin2-game-angle-demo/server/seed/workflow-node-types.ts

@@ -297,6 +297,25 @@ const NODE_DEFINITIONS: BaseNodeTypeSeed[] = [
           default: 20,
           description: '顺序调度器最多同时处理的业务对象数量',
         },
+        failureCallback: {
+          type: 'object',
+          description: 'Workflow 最终失败后通知业务系统',
+          properties: {
+            connectionRef: {
+              type: 'string',
+              minLength: 1,
+              description: '业务系统连接编码',
+            },
+            path: {
+              type: 'string',
+              minLength: 1,
+              pattern: '^/',
+              description: '业务失败处理 API 的相对路径',
+            },
+          },
+          required: ['connectionRef', 'path'],
+          additionalProperties: false,
+        },
       },
       required: ['registrationCode', 'operationRules', 'processingMode'],
       allOf: [
@@ -433,25 +452,26 @@ const NODE_DEFINITIONS: BaseNodeTypeSeed[] = [
   {
     type: 'db_execute',
     category: 'ACTION',
-    label: '数据库操作',
+    label: '数据库 Function',
     icon: 'ConsoleSqlOutlined',
-    description: '使用 SQL 查询或修改当前服务注册的数据库',
+    description: '调用当前 GAdmin 数据库 workflow_api 中的 Function',
     configSchema: {
       type: 'object',
       properties: {
-        allowWrite: {
-          type: 'boolean',
-          description: '是否允许新增、更新或删除数据',
-        },
-        sql: {
-          type: 'string',
-          minLength: 1,
-          description: '要执行的单条 SQL',
+        functionRef: {
+          type: 'object',
+          properties: {
+            schema: { type: 'string', enum: ['workflow_api'] },
+            name: { type: 'string', minLength: 1 },
+            identityArguments: { type: 'string' },
+          },
+          required: ['schema', 'name', 'identityArguments'],
+          additionalProperties: false,
         },
-        parameters: {
+        argumentBindings: {
           type: 'array',
           items: PARAMETER_BINDING_SCHEMA,
-          description: 'SQL 中参数占位符对应的值',
+          description: '按 Function 参数顺序提供的值',
         },
         timeoutSeconds: {
           type: 'integer',
@@ -460,17 +480,14 @@ const NODE_DEFINITIONS: BaseNodeTypeSeed[] = [
           description: '执行超时时间（秒）',
         },
       },
-      required: ['allowWrite', 'sql'],
+      required: ['functionRef', 'argumentBindings'],
       additionalProperties: false,
     },
     inputSchema: { description: '上一个节点的完整结果' },
     outputSchema: {
       type: 'object',
       properties: {
-        rows: { type: 'array' },
-        rowCount: { type: 'number' },
-        affectedRows: { type: 'number' },
-        insertedId: { type: 'string' },
+        result: { description: 'Function 返回值' },
       },
     },
     outputs: [],
@@ -794,58 +811,12 @@ const NODE_DEFINITIONS: BaseNodeTypeSeed[] = [
 ];
 
 // ─── APPROVAL ──────────────────────────────────────────────────────────────
-const approvalDefinition: BaseNodeTypeSeed = {
+const approvalDefinition: Omit<BaseNodeTypeSeed, 'configSchema' | 'outputs'> = {
   type: 'approval',
   category: 'APPROVAL',
   label: '人工审批',
   icon: 'CheckCircleOutlined',
   description: '创建审批请求并等待审批人通过、拒绝或超时',
-  configSchema: {
-    type: 'object',
-    properties: {
-      approvers: {
-        type: 'array',
-        items: {
-          type: 'object',
-          properties: {
-            type: { type: 'string', enum: ['user', 'group'] },
-            id: { type: 'string' },
-          },
-          required: ['type', 'id'],
-        },
-        description: '可以处理本次审批的用户或可复用用户组',
-      },
-      approvalMode: {
-        type: 'string',
-        enum: ['any', 'all', 'percentage'],
-        description: '任意一人、全部通过或达到指定比例',
-      },
-      minApprovalCount: {
-        type: 'number',
-        description: '达到通过条件所需的最少人数',
-      },
-      timeout: { type: 'number', description: '审批超时时间（秒）' },
-      timeoutAction: {
-        type: 'string',
-        enum: ['auto_approve', 'auto_reject', 'escalate'],
-        description: '审批超时后的处理动作',
-      },
-      escalateTo: {
-        type: 'array',
-        items: { type: 'string' },
-        description: '审批超时后的升级处理人',
-      },
-      reminderInterval: {
-        type: 'number',
-        description: '提醒间隔（小时），0 表示不提醒',
-      },
-      allowDelegate: {
-        type: 'boolean',
-        description: '是否允许审批人转交给其他人',
-      },
-    },
-    required: ['approvers'],
-  },
   inputSchema: { description: '上一个节点的完整结果' },
   outputSchema: {
     type: 'object',
@@ -869,7 +840,6 @@ const approvalDefinition: BaseNodeTypeSeed = {
     },
     required: ['previous', 'result'],
   },
-  outputs: [],
 };
 
 // ─── SUB WORKFLOW ──────────────────────────────────────────────────────────
@@ -1344,9 +1314,9 @@ const dedicatedEditorNodes: NodeTypeSeed[] = [
   ),
   schemaVersion:
     type === 'event_trigger'
-      ? 5
+      ? 6
       : type === 'db_execute'
-      ? 4
+      ? 5
       : type === 'parallel'
       ? 6
       : ['if_else', 'switch'].includes(type)

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/config/index.ts

@@ -8,23 +8,6 @@ const config: Record<string, any> = {
   logger: {
     level: 'debug',
   },
-  roles: {
-    codytang: ['GUEST'],
-
-    v_bmzmzhao: ['SYSTEM_ADMIN'],
-    miamgao: ['SYSTEM_ADMIN'],
-    benzemazhu: ['PRODUCT'],
-    asherzhou: ['PRODUCT'],
-    ivyyfchen: ['PRODUCT'],
-    haonanli: ['PRODUCT'],
-    libearxiong: ['PRODUCT'],
-    jasonzxyin: ['PRODUCT'],
-    masonqliu: ['PRODUCT'],
-
-    admin: ['SYSTEM_ADMIN'],
-    kavenma: ['SYSTEM_ADMIN'],
-    clzhu: ['SYSTEM_ADMIN'],
-  },
   prisma: {
     log: ['info', 'query', 'warn', 'error'],
     DATABASE_URL: process.env.TASK_DATABASE_URL,

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

@@ -10,6 +10,7 @@ import {
   UseGuards,
 } from '@nestjs/common';
 import { ApiOkResponse, ApiTags } from '@nestjs/swagger';
+import { UseRoles } from 'nest-access-control';
 import { AgendaService } from './agenda.service';
 
 class JobIdsDto {
@@ -43,12 +44,22 @@ export class AgendaController {
   constructor(private readonly agendaService: AgendaService) {}
 
   @Get('overview')
+  @UseRoles({
+    resource: 'agenda',
+    action: 'read',
+    possession: 'any',
+  })
   @ApiOkResponse({ description: 'Get execution metrics overview (24h/total)' })
   async getOverview() {
     return this.agendaService.getMetricsOverview();
   }
 
   @Get('jobs')
+  @UseRoles({
+    resource: 'agenda',
+    action: 'read',
+    possession: 'any',
+  })
   @ApiOkResponse({ description: 'List jobs with overview stats' })
   async getJobs(@Query() query: JobsQueryDto) {
     return this.agendaService.getJobs({
@@ -65,36 +76,66 @@ export class AgendaController {
   }
 
   @Post('requeue')
+  @UseRoles({
+    resource: 'agenda',
+    action: 'update',
+    possession: 'any',
+  })
   @ApiOkResponse({ description: 'Requeue jobs by IDs' })
   async requeue(@Body() body: JobIdsDto) {
     return this.agendaService.requeueByIds(body.jobIds);
   }
 
   @Post('retry')
+  @UseRoles({
+    resource: 'agenda',
+    action: 'update',
+    possession: 'any',
+  })
   @ApiOkResponse({ description: 'Retry failed jobs by IDs' })
   async retry(@Body() body: JobIdsDto) {
     return this.agendaService.retryByIds(body.jobIds);
   }
 
   @Post('delete')
+  @UseRoles({
+    resource: 'agenda',
+    action: 'delete',
+    possession: 'any',
+  })
   @ApiOkResponse({ description: 'Delete jobs by IDs' })
   async delete(@Body() body: JobIdsDto) {
     return this.agendaService.deleteByIds(body.jobIds);
   }
 
   @Post('disable')
+  @UseRoles({
+    resource: 'agenda',
+    action: 'update',
+    possession: 'any',
+  })
   @ApiOkResponse({ description: 'Disable (pause) jobs by IDs' })
   async disable(@Body() body: JobIdsDto) {
     return this.agendaService.disableByIds(body.jobIds);
   }
 
   @Post('enable')
+  @UseRoles({
+    resource: 'agenda',
+    action: 'update',
+    possession: 'any',
+  })
   @ApiOkResponse({ description: 'Enable (resume) jobs by IDs' })
   async enable(@Body() body: JobIdsDto) {
     return this.agendaService.enableByIds(body.jobIds);
   }
 
   @Get('job/:jobName')
+  @UseRoles({
+    resource: 'agenda',
+    action: 'read',
+    possession: 'any',
+  })
   @ApiOkResponse({ description: 'Get single job detail with run statistics' })
   async getJobDetail(@Param('jobName') jobName: string) {
     const detail = await this.agendaService.getJobDetail(jobName);
@@ -103,6 +144,11 @@ export class AgendaController {
   }
 
   @Get('logs')
+  @UseRoles({
+    resource: 'agenda',
+    action: 'read',
+    possession: 'any',
+  })
   @ApiOkResponse({ description: 'Get execution history logs for a job' })
   async getLogs(@Query() query: JobLogsQueryDto) {
     return this.agendaService.getJobLogs({

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

@@ -1,3 +1,4 @@
+import { ACGuard } from '@gadmin2n/nest-common';
 import {
   Body,
   Controller,
@@ -11,8 +12,10 @@ import {
   Query,
   Req,
   UnauthorizedException,
+  UseGuards,
 } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
+import { UseRoles } from 'nest-access-control';
 import { PrismaService } from 'nestjs-prisma';
 import { AllowUnauthorizedRequest } from '../../lib/auth.guard';
 import { ImportPayloadDto } from './canvas-export.dto';
@@ -25,8 +28,9 @@ import {
 } from './canvas.dto';
 import { CanvasService } from './canvas.service';
 
-@ApiTags('canvas')
+@UseGuards(ACGuard)
 @Controller('canvas')
+@ApiTags('canvas')
 export class CanvasController {
   constructor(
     private readonly canvasService: CanvasService,
@@ -35,11 +39,21 @@ export class CanvasController {
   ) {}
 
   @Get()
+  @UseRoles({
+    resource: 'canvas',
+    action: 'read',
+    possession: 'any',
+  })
   findAll(@Req() req) {
     return this.canvasService.findAllByUser(req.user.userid);
   }
 
   @Get('all')
+  @UseRoles({
+    resource: 'canvas',
+    action: 'read',
+    possession: 'any',
+  })
   async findAllForAdmin(@Req() req) {
     const record = await this.prisma.user.findFirst({
       where: { userid: req.user.userid },
@@ -53,6 +67,11 @@ export class CanvasController {
   }
 
   @Post()
+  @UseRoles({
+    resource: 'canvas',
+    action: 'create',
+    possession: 'any',
+  })
   create(@Req() req, @Body() dto: CreateCanvasDto) {
     return this.canvasService.create(req.user.userid, dto);
   }
@@ -76,6 +95,11 @@ export class CanvasController {
   }
 
   @Get(':id')
+  @UseRoles({
+    resource: 'canvas',
+    action: 'read',
+    possession: 'any',
+  })
   findOne(@Req() req, @Param('id') id: string) {
     const roles: string[] = req.user?.configPerms?.roles ?? [];
     const isAdmin = roles.includes('SYSTEM_ADMIN');
@@ -86,6 +110,11 @@ export class CanvasController {
   }
 
   @Put(':id')
+  @UseRoles({
+    resource: 'canvas',
+    action: 'update',
+    possession: 'any',
+  })
   update(@Req() req, @Param('id') id: string, @Body() dto: UpdateCanvasDto) {
     const roles: string[] = req.user?.configPerms?.roles ?? [];
     const isAdmin = roles.includes('SYSTEM_ADMIN');
@@ -97,6 +126,11 @@ export class CanvasController {
   }
 
   @Delete(':id')
+  @UseRoles({
+    resource: 'canvas',
+    action: 'delete',
+    possession: 'any',
+  })
   remove(@Req() req, @Param('id') id: string) {
     return this.canvasService.remove(id, req.user.userid);
   }
@@ -104,6 +138,11 @@ export class CanvasController {
   // ─── Export/Import Endpoints ──────────────────────────────────────────────────
 
   @Post(':id/export-token')
+  @UseRoles({
+    resource: 'canvas',
+    action: 'read',
+    possession: 'any',
+  })
   async generateExportToken(@Param('id') id: string, @Req() req) {
     const baseUrl = `${req.protocol}://${req.get('host')}/api`;
     return this.canvasExportService.generateExportToken(id, baseUrl);
@@ -122,21 +161,41 @@ export class CanvasController {
   }
 
   @Post('import-preview')
+  @UseRoles({
+    resource: 'canvas',
+    action: 'update',
+    possession: 'any',
+  })
   async importPreview(@Body() dto: ImportPayloadDto) {
     return this.canvasExportService.importPreview(dto.payload);
   }
 
   @Post('import-confirm')
+  @UseRoles({
+    resource: 'canvas',
+    action: 'update',
+    possession: 'any',
+  })
   async importConfirm(@Body() dto: ImportPayloadDto, @Req() req) {
     return this.canvasExportService.importConfirm(dto.payload, req.user.userid);
   }
 
   @Post(':id/publish')
+  @UseRoles({
+    resource: 'canvas',
+    action: 'update',
+    possession: 'any',
+  })
   publish(@Req() req, @Param('id') id: string, @Body() dto: PublishCanvasDto) {
     return this.canvasService.publish(id, req.user.userid, dto);
   }
 
   @Delete(':id/unpublish')
+  @UseRoles({
+    resource: 'canvas',
+    action: 'update',
+    possession: 'any',
+  })
   unpublish(@Req() req, @Param('id') id: string) {
     return this.canvasService.unpublish(id, req.user.userid);
   }

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/externalInteraction/external-callback.controller.ts

@@ -1,15 +1,18 @@
+import { ACGuard } from '@gadmin2n/nest-common';
 import {
   BadRequestException,
   Body,
   Controller,
   Headers,
   Post,
+  UseGuards,
 } from '@nestjs/common';
 import { createHash } from 'node:crypto';
 import { AllowUnauthorizedRequest } from '../../lib/auth.guard';
 import { WorkflowRuntimeConfigService } from '../workflowRuntimeConfig/workflow-runtime-config.service';
 import { ExternalInteractionService } from './external-interaction.service';
 
+@UseGuards(ACGuard)
 @Controller('workflow/external-callback')
 export class ExternalCallbackController {
   constructor(

package/dist/lib/application/files/gadmin2-game-angle-demo/server/src/modules/externalInteraction/workflow-callback-url.controller.ts

@@ -1,11 +1,19 @@
-import { Controller, Get, Query } from '@nestjs/common';
+import { ACGuard } from '@gadmin2n/nest-common';
+import { Controller, Get, Query, UseGuards } from '@nestjs/common';
+import { UseRoles } from 'nest-access-control';
 import { WorkflowCallbackUrlService } from './workflow-callback-url.service';
 
+@UseGuards(ACGuard)
 @Controller('workflow-webhook')
 export class WorkflowCallbackUrlController {
   constructor(private readonly callbackUrls: WorkflowCallbackUrlService) {}
 
   @Get('endpoint')
+  @UseRoles({
+    resource: 'workflow',
+    action: 'read',
+    possession: 'any',
+  })
   async resolveEndpoint(@Query('path') path = '') {
     return { endpoint: await this.callbackUrls.resolvePath(path) };
   }

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

@@ -13,13 +13,16 @@ import {
   Body,
   Controller,
   Delete,
+  Get,
   Inject,
   NotFoundException,
   Param,
   ParseIntPipe,
   Patch,
   Post,
+  Query,
   Req,
+  UnauthorizedException,
   UploadedFile,
   UseGuards,
   UseInterceptors,
@@ -43,6 +46,9 @@ import {
 } from '../../generated/page/dto/page-types.dto';
 import { UpdatePageDto } from '../../generated/page/dto/update-page.dto';
 import { PageEntity } from '../../generated/page/entities/page.entity';
+import { AllowUnauthorizedRequest } from '../../lib/auth.guard';
+import { PageTransferService } from '../permTransfer/page-transfer.service';
+import { ImportPayloadDto } from '../permTransfer/perm-transfer.dto';
 import { PageService } from './page.service';
 
 import { ConfigService } from '@nestjs/config';
@@ -81,6 +87,7 @@ export class CreatePageWithResourcesDto extends CreatePageDto {
 export class PageController {
   constructor(
     private readonly pageService: PageService,
+    private readonly pageTransferService: PageTransferService,
     private readonly config: ConfigService,
     @Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger,
   ) {}
@@ -227,6 +234,54 @@ export class PageController {
     return res;
   }
 
+  // ─── Export/Import (cross-environment transfer) ────────────────────────────
+
+  @Post(':code/export-token')
+  @UseRoles({
+    resource: 'page',
+    action: 'read',
+    possession: 'any',
+  })
+  async generateExportToken(@Param('code') code: string, @Req() req) {
+    const baseUrl = `${req.protocol}://${req.get('host')}/api`;
+    return this.pageTransferService.generateExportToken(code, baseUrl);
+  }
+
+  @Get('export/:code')
+  @AllowUnauthorizedRequest()
+  async getExportPayload(
+    @Param('code') code: string,
+    @Query('token') token: string,
+  ) {
+    if (!token) {
+      throw new UnauthorizedException('Export token is required');
+    }
+    return this.pageTransferService.getExportPayload(code, token);
+  }
+
+  @Post('import-preview')
+  @UseRoles({
+    resource: 'page',
+    action: 'update',
+    possession: 'any',
+  })
+  async importPreview(@Body() dto: ImportPayloadDto) {
+    return this.pageTransferService.importPreview(dto.payload);
+  }
+
+  @Post('import-confirm')
+  @UseRoles({
+    resource: 'page',
+    action: 'update',
+    possession: 'any',
+  })
+  async importConfirm(@Body() dto: ImportPayloadDto, @Req() req) {
+    return this.pageTransferService.importConfirm(
+      dto.payload,
+      req.user.username ?? req.user.userid,
+    );
+  }
+
   @Post('upload')
   @UseRoles({
     resource: 'page',

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

@@ -1,8 +1,10 @@
 import { Module } from '@nestjs/common';
+import { PermTransferModule } from '../permTransfer/perm-transfer.module';
 import { PageController } from './page.controller';
 import { PageService } from './page.service';
 
 @Module({
+  imports: [PermTransferModule],
   controllers: [PageController],
   providers: [PageService],
   exports: [PageService],