@taole/deploy-helper 1.2.6 → 1.2.8

package/index.mjs

@@ -154,7 +154,7 @@ function doRegisterCommands() {
     registerCommand("create", cmdProjectCreate, "创建项目");
     registerCommand("publish", cmdProjectPublish, "更新项目到H5平台");
     registerCommand("pull", cmdProjectPull, "拉取已有项目到本地");
-    registerCommand("mr", cmdProjectMr, "创建合并请求到 master（可选参数为 MR 标题）");
+    registerCommand("mr", cmdProjectMr, "创建合并请求到 master（可选 [title] [--verbose]）");
     registerCommand("commit", cmdCommit, "按任务号提交（参数为说明，如 feat: xxx）");
     registerCommand("whoami", cmdWhoami, "查看当前登录用户信息");
     registerCommand("logout", cmdLogout, "退出登录");
@@ -227,6 +227,7 @@ async function main() {
         console.log(`command: test [-c {configFileName}] 测试环境部署`);
         console.log(`command: scp {file} 复制文件{file}到OfficialSite测试服务器{file}`);
         console.log(`command: scp {file} {dest} 复制文件{file}到OfficialSite测试服务器{dest}`);
+        console.log(`command: scp {subdir/file} OfficialSite目录下仅放开admin子目录, 如scp admin/xxx.htm`);
         console.log(`command: scpevt {file} 复制文件{file}到events测试服务器{file}`);
         console.log(`command: scpevt {file} {dest} 复制文件{file}到events测试服务器{dest}`);
         console.log(`command: pipeline {pipelineName|pipelineId} [branch] 触发流水线{pipelineName|pipelineId}， 指定分支(可省略)`);
@@ -258,8 +259,9 @@ async function main() {
             process.exit(1);
         }
         const workDir = process.cwd(); // 当前项目根目录
+        const isOfficialSite = workDir.replace(/\\/g, '/').split('/').includes('OfficialSite');
 
-        const srcFilePath = join(workDir, file);
+        const srcFilePath = path.resolve(workDir, file);
         if (!fs.existsSync(srcFilePath)) {
             log(`${srcFilePath}不存在`);
             process.exit(1);
@@ -268,20 +270,46 @@ async function main() {
             log(`${srcFilePath}是目录, 不支持scp目录`);
             process.exit(1);
         }
-        // 获取srcFilePath的目录
-        const fileDir = dirname(srcFilePath);
-        const fileName = basename(srcFilePath);
-        const dest = process.argv[4] || fileName;
-        if (dest.includes("/") || dest.includes("\\")) {
-            log(`dest不能包含/或\\`);
+
+        // 相对 workDir 的路径，用于判断是否在 admin/ 下
+        const relPath = path.relative(workDir, srcFilePath).replace(/\\/g, '/');
+        if (!relPath || relPath.startsWith('..') || path.isAbsolute(relPath)) {
+            log(`仅支持scp当前目录下的文件`);
             process.exit(1);
         }
+        // OfficialSite 仅放开 admin/ 这一级子目录
+        const isAdminSubFile = isOfficialSite && /^admin\/[^/]+$/.test(relPath);
+        const fileName = basename(srcFilePath);
+        const hasSubPath = relPath.includes('/');
 
-        if (workDir !== fileDir) {
-            log(`仅支持scp当前目录下的文件(不带子目录)`);
+        // OfficialSite 下 admin/xxx 时，默认保留相对路径到远端 play/admin/
+        let dest = process.argv[4] || (isAdminSubFile ? relPath : fileName);
+        dest = dest.replace(/\\/g, '/');
+        if (dest.includes('..')) {
+            log(`dest不能包含..`);
             process.exit(1);
         }
 
+        if (isAdminSubFile) {
+            // dest 只能是文件名，或 admin/文件名
+            if (dest.includes('/') && !/^admin\/[^/]+$/.test(dest)) {
+                log(`OfficialSite下仅支持admin子目录, dest须为文件名或admin/文件名`);
+                process.exit(1);
+            }
+            if (!dest.includes('/')) {
+                dest = `admin/${dest}`;
+            }
+        } else {
+            if (dest.includes("/")) {
+                log(`dest不能包含/或\\`);
+                process.exit(1);
+            }
+            if (hasSubPath) {
+                log(`仅支持scp当前目录下的文件(不带子目录); OfficialSite下可使用admin/文件名`);
+                process.exit(1);
+            }
+        }
+
         const destPath = "/home/web/website/tuwan_www/templets/static/play/" + (command === 'scp' ? '' : 'events/') + dest;
 
         const scpClient = await getScpClient();

package/lib/project.mjs

@@ -450,8 +450,16 @@ const MR_FORBIDDEN_BRANCHES = new Set(["master", "test"]);
 /**
  * 创建合并请求：当前分支 → master
  * 前置：工作区干净、非 master/test、无未推送 commit
+ * 用法: dh mr [title] [--verbose]
  */
 export const cmdProjectMr = async () => {
+  const rawArgs = process.argv.slice(3);
+  const verbose = rawArgs.some((arg) => arg === "--verbose" || arg === "-V");
+  const titleArg = rawArgs
+    .filter((arg) => arg !== "--verbose" && arg !== "-V")
+    .join(" ")
+    .trim();
+
   const git = simpleGit(process.cwd());
   const gitStatus = await git.status();
 
@@ -491,7 +499,6 @@ export const cmdProjectMr = async () => {
   }
   await checkPackageNameWithGitRemote(git, packageJson.name);
 
-  const titleArg = process.argv.slice(3).join(" ").trim();
   log(`开始创建 MR: ${sourceBranch} → master（项目 ${packageJson.name}）`);
   const result = await apiCreateMergeRequest(packageJson.name, sourceBranch, userCache, {
     title: titleArg || undefined,
@@ -501,5 +508,8 @@ export const cmdProjectMr = async () => {
   if (mrUrl) {
     log(`MR 地址: ${mrUrl}`);
   }
+  if (verbose) {
+    log(`MR 接口返回:\n${JSON.stringify(result, null, 2)}`);
+  }
   process.exit(0);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taole/deploy-helper",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "description": "脚本部署工具，用于将项目部署到测试环境或生产环境",
   "main": "index.mjs",
   "type": "module",