next-admin-svr 1.0.1 → 1.0.2

package/lib/index.js

@@ -8,6 +8,7 @@ var mongodb = require('mongodb');
 var shared = require('@plugin-light/shared');
 var Fontmin = require('fontmin');
 var multer = require('multer');
+var minimatch = require('minimatch');
 var crypto = require('@wecom/crypto');
 var agentSdk = require('@tencent-ai/agent-sdk');
 var croner = require('croner');
@@ -18,6 +19,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var express__default = /*#__PURE__*/_interopDefaultLegacy(express);
 var Fontmin__default = /*#__PURE__*/_interopDefaultLegacy(Fontmin);
 var multer__default = /*#__PURE__*/_interopDefaultLegacy(multer);
+var minimatch__default = /*#__PURE__*/_interopDefaultLegacy(minimatch);
 var crypto__default = /*#__PURE__*/_interopDefaultLegacy(crypto$1);
 
 const defaultModule = {
@@ -33,7 +35,9 @@ const defaultModule = {
         aggregate: () => Promise.resolve([]),
     },
     landun: {
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         startPipeline: () => Promise.resolve({}),
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         startPipelineByRawApi: () => Promise.resolve({}),
     },
     auth: {
@@ -1429,9 +1433,17 @@ router$6.post('/start-publish', async (req, res) => {
     const staffName = (req.header('rid') || 'developer');
     const toolName = (req.header('x-mcp-tool-name') || '');
     const { mcpName, mcpVersion, repo, branch, publishReason, subProjectName, } = req.body;
+    if (!repo || !branch) {
+        res.json({
+            r: -1,
+            code: -1,
+            msg: '缺少必要参数: repo 和 branch 是必填项',
+        });
+        return;
+    }
     const result = await shared.startMpCIPipeline({
         repo,
-        subProject: subProjectName,
+        subProject: subProjectName || '',
         branch,
         staffName,
         isWeixin: true,
@@ -1443,7 +1455,43 @@ router$6.post('/start-publish', async (req, res) => {
         mcpDB: coreModule.get().mcpDB,
         toolName,
     });
-    res.send(result);
+    // 获取审批人信息
+    let auditorInfo = { auditor: '', shouldAudit: false };
+    try {
+        auditorInfo = await tComm.getAuditor({
+            type: 'rainbow',
+            configSource: async () => {
+                const res = await tComm.fetchRainbowConfig('h5_publish_auditor', {
+                    appId: process.env.RAINBOW_APP_ID,
+                    userId: process.env.RAINBOW_USER_ID,
+                    secretKey: process.env.RAINBOW_SECRET_KEY,
+                    envName: 'Default',
+                    groupName: 'devops_open',
+                }, {
+                    sdk: shared.getRainbowNodeSdk(),
+                    tryJsonParse: true,
+                });
+                console.log('auditor', res);
+                return res;
+            },
+            rainbowOptions: {
+                projectName: shared.extractRepoPath(repo),
+                subProjectName: subProjectName || '',
+                // @ts-ignore
+                minimatch: minimatch__default["default"],
+            },
+            skipAudit: branch !== 'release',
+        });
+    }
+    catch (e) {
+        console.error('[MP Publish MCP] 获取审批人失败:', e);
+    }
+    // 在返回结果中追加审批人信息
+    if (result.result && typeof result.result === 'object') {
+        result.result.auditor = auditorInfo.auditor;
+        result.result.shouldAudit = auditorInfo.shouldAudit;
+    }
+    res.json(result);
 });
 
 const router$5 = express__default["default"].Router();
@@ -1511,6 +1559,40 @@ router$4.post('/mcp-start', async (req, res) => {
         operationTool: coreModule.get().operation,
         toolName,
     });
+    // 获取审批人信息
+    let auditorInfo = { auditor: '', shouldAudit: false };
+    try {
+        auditorInfo = await tComm.getAuditor({
+            type: 'json',
+            configSource: async () => {
+                const res = await tComm.fetchRainbowConfig('library_publish_auditor', {
+                    appId: process.env.RAINBOW_APP_ID,
+                    userId: process.env.RAINBOW_USER_ID,
+                    secretKey: process.env.RAINBOW_SECRET_KEY,
+                    envName: 'Default',
+                    groupName: 'devops_open',
+                }, {
+                    sdk: shared.getRainbowNodeSdk(),
+                    tryJsonParse: true,
+                });
+                console.log('auditor', res);
+                return res;
+            },
+            jsonOptions: {
+                projectName: shared.extractRepoPath(component.git),
+                key: versionType,
+            },
+        });
+    }
+    catch (e) {
+        console.error('[Pipeline Open] 获取审批人失败:', e);
+    }
+    console.log('[auditorInfo]', auditorInfo, component, versionType);
+    // 在返回结果中追加审批人信息
+    if (result?.result?.data && typeof result?.result?.data === 'object') {
+        (result?.result?.data).auditor = auditorInfo.auditor;
+        (result?.result?.data).shouldAudit = auditorInfo.shouldAudit;
+    }
     res.send(result);
 });
 

package/lib/index.mjs

@@ -1,9 +1,10 @@
 import express from 'express';
-import { timeStampFormat, batchSendWxRobotMarkdown, uploadCOSStreamFile, purgeUrlCache, uploadCOSStreamFileV2, uploadCOSFile, createIwikiDoc, saveJsonToLog } from 't-comm';
+import { timeStampFormat, batchSendWxRobotMarkdown, uploadCOSStreamFile, purgeUrlCache, uploadCOSStreamFileV2, uploadCOSFile, getAuditor, fetchRainbowConfig, createIwikiDoc, saveJsonToLog } from 't-comm';
 import { ObjectId } from 'mongodb';
-import { getUploadCosConfig, createFontProjectOrUpdate, cosSyncToGit, FONT_PROJECT_WEBHOOK_URL, getOneCdnUrl, getPushUrlCacheArea, createIconProjectOrUpdate, ICON_PROJECT_PIPELINE_CONFIG, ICON_PROJECT_WEBHOOK_URL, parseImage, getUploadImageFilePath, uploadFilesCore, compressFileUseTinypng, startMpCIPipeline, startNPMPublishPipelineCore, getComponentByRepo, getWhiteRainbowConfig, WHITE_USER_PIPELINE_ID, WHITE_USER_STATUS_MAP, getWhiteTypeDesc, updateWhiteUserCosByDb, watchEmails, toCdnUrl } from '@plugin-light/shared';
+import { getUploadCosConfig, createFontProjectOrUpdate, cosSyncToGit, FONT_PROJECT_WEBHOOK_URL, getOneCdnUrl, getPushUrlCacheArea, createIconProjectOrUpdate, ICON_PROJECT_PIPELINE_CONFIG, ICON_PROJECT_WEBHOOK_URL, parseImage, getUploadImageFilePath, uploadFilesCore, compressFileUseTinypng, startMpCIPipeline, getRainbowNodeSdk, extractRepoPath, startNPMPublishPipelineCore, getComponentByRepo, getWhiteRainbowConfig, WHITE_USER_PIPELINE_ID, WHITE_USER_STATUS_MAP, getWhiteTypeDesc, updateWhiteUserCosByDb, watchEmails, toCdnUrl } from '@plugin-light/shared';
 import Fontmin from 'fontmin';
 import multer from 'multer';
+import minimatch from 'minimatch';
 import { decrypt } from '@wecom/crypto';
 import { query } from '@tencent-ai/agent-sdk';
 import { Cron } from 'croner';
@@ -22,7 +23,9 @@ const defaultModule = {
         aggregate: () => Promise.resolve([]),
     },
     landun: {
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         startPipeline: () => Promise.resolve({}),
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         startPipelineByRawApi: () => Promise.resolve({}),
     },
     auth: {
@@ -1418,9 +1421,17 @@ router$6.post('/start-publish', async (req, res) => {
     const staffName = (req.header('rid') || 'developer');
     const toolName = (req.header('x-mcp-tool-name') || '');
     const { mcpName, mcpVersion, repo, branch, publishReason, subProjectName, } = req.body;
+    if (!repo || !branch) {
+        res.json({
+            r: -1,
+            code: -1,
+            msg: '缺少必要参数: repo 和 branch 是必填项',
+        });
+        return;
+    }
     const result = await startMpCIPipeline({
         repo,
-        subProject: subProjectName,
+        subProject: subProjectName || '',
         branch,
         staffName,
         isWeixin: true,
@@ -1432,7 +1443,43 @@ router$6.post('/start-publish', async (req, res) => {
         mcpDB: coreModule.get().mcpDB,
         toolName,
     });
-    res.send(result);
+    // 获取审批人信息
+    let auditorInfo = { auditor: '', shouldAudit: false };
+    try {
+        auditorInfo = await getAuditor({
+            type: 'rainbow',
+            configSource: async () => {
+                const res = await fetchRainbowConfig('h5_publish_auditor', {
+                    appId: process.env.RAINBOW_APP_ID,
+                    userId: process.env.RAINBOW_USER_ID,
+                    secretKey: process.env.RAINBOW_SECRET_KEY,
+                    envName: 'Default',
+                    groupName: 'devops_open',
+                }, {
+                    sdk: getRainbowNodeSdk(),
+                    tryJsonParse: true,
+                });
+                console.log('auditor', res);
+                return res;
+            },
+            rainbowOptions: {
+                projectName: extractRepoPath(repo),
+                subProjectName: subProjectName || '',
+                // @ts-ignore
+                minimatch,
+            },
+            skipAudit: branch !== 'release',
+        });
+    }
+    catch (e) {
+        console.error('[MP Publish MCP] 获取审批人失败:', e);
+    }
+    // 在返回结果中追加审批人信息
+    if (result.result && typeof result.result === 'object') {
+        result.result.auditor = auditorInfo.auditor;
+        result.result.shouldAudit = auditorInfo.shouldAudit;
+    }
+    res.json(result);
 });
 
 const router$5 = express.Router();
@@ -1500,6 +1547,40 @@ router$4.post('/mcp-start', async (req, res) => {
         operationTool: coreModule.get().operation,
         toolName,
     });
+    // 获取审批人信息
+    let auditorInfo = { auditor: '', shouldAudit: false };
+    try {
+        auditorInfo = await getAuditor({
+            type: 'json',
+            configSource: async () => {
+                const res = await fetchRainbowConfig('library_publish_auditor', {
+                    appId: process.env.RAINBOW_APP_ID,
+                    userId: process.env.RAINBOW_USER_ID,
+                    secretKey: process.env.RAINBOW_SECRET_KEY,
+                    envName: 'Default',
+                    groupName: 'devops_open',
+                }, {
+                    sdk: getRainbowNodeSdk(),
+                    tryJsonParse: true,
+                });
+                console.log('auditor', res);
+                return res;
+            },
+            jsonOptions: {
+                projectName: extractRepoPath(component.git),
+                key: versionType,
+            },
+        });
+    }
+    catch (e) {
+        console.error('[Pipeline Open] 获取审批人失败:', e);
+    }
+    console.log('[auditorInfo]', auditorInfo, component, versionType);
+    // 在返回结果中追加审批人信息
+    if (result?.result?.data && typeof result?.result?.data === 'object') {
+        (result?.result?.data).auditor = auditorInfo.auditor;
+        (result?.result?.data).shouldAudit = auditorInfo.shouldAudit;
+    }
     res.send(result);
 });
 

package/lib/utils/init.d.ts

@@ -1,3 +1,4 @@
+import { type StartPipelineResult } from '@plugin-light/shared';
 import { Request, Response } from 'express';
 interface MongoDb {
     connect(): Promise<any>;
@@ -32,12 +33,12 @@ interface OperationTool {
     updateRecord(where: any, record: any): Promise<void>;
 }
 interface Landun {
-    startPipeline(pipelineId: string, data: any): Promise<any>;
+    startPipeline(pipelineId: string, data: any): Promise<StartPipelineResult>;
     startPipelineByRawApi(options: {
         data: any;
         pipelineId: string;
         userName: string;
-    }): Promise<any>;
+    }): Promise<StartPipelineResult>;
 }
 interface CoreModuleData {
     mongodb: MongoDb;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-admin-svr",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Next Admin 服务端",
   "keywords": [
     "vue3",
@@ -35,6 +35,7 @@
     "croner": "^9.1.0",
     "express": "^5.2.1",
     "fontmin": "latest",
+    "minimatch": "^10.0.1",
     "mongodb": "^7.0.0",
     "multer": "^2.0.2",
     "t-comm": "latest",