ai-project-manage-cli 6.0.70 → 6.0.72

package/dist/index.js

@@ -520,7 +520,7 @@ async function tryReadGitOriginUrl(cwd) {
 }
 
 // src/deployment-config-sync.ts
-var TEMPLATE_HINT = "\u4FDD\u7559\u6A21\u677F .apm/apm.config.json \u4E0E .apm/deploy/README.md";
+var TEMPLATE_HINT = "\u4FDD\u7559\u6A21\u677F .apm/apm.config.json";
 var SYNC_HINT = "\u767B\u8BB0\u5DE5\u4F5C\u7A7A\u95F4\u8DEF\u5F84\u3001\u7ED1\u5B9A\u4ED3\u5E93\u540E\uFF0C\u53EF\u6267\u884C: apm sync-deploy-config";
 async function resolveRepositoryIdForSync(api, workdirPath) {
   const baseline = await api.cli.workspaceBaseline({ workdirPath });
@@ -583,15 +583,8 @@ ${diagnostic ?? ""}
   const apmConfigPath = toFsPath(join3(targetApmDir, "apm.config.json"));
   writeFileSync3(apmConfigPath, `${JSON.stringify(parsed, null, 2)}
 `, "utf8");
-  const deployDir = join3(targetApmDir, "deploy");
-  await ensureDirExists(deployDir);
-  writeFileSync3(
-    toFsPath(join3(deployDir, "README.md")),
-    config.deploymentDoc ?? "",
-    "utf8"
-  );
   console.log(`[apm] \u5DF2\u540C\u6B65\u5E73\u53F0\u90E8\u7F72\u914D\u7F6E: ${config.name}`);
-  console.log("[apm] \u5DF2\u5199\u5165 .apm/apm.config.json \u4E0E .apm/deploy/README.md");
+  console.log("[apm] \u5DF2\u5199\u5165 .apm/apm.config.json");
   return { synced: true, repositoryId, configName: config.name };
 }
 
@@ -915,7 +908,7 @@ async function runInit(name) {
   console.log(`[apm] \u5DE5\u4F5C\u76EE\u5F55\u8DEF\u5F84\uFF1A${workdir}`);
   if (syncResult && !syncResult.synced) {
     console.log(
-      "[apm] \u5F53\u524D .apm/apm.config.json \u4E0E .apm/deploy/README.md \u4E3A\u6A21\u677F\u9ED8\u8BA4\u503C\uFF1B\u5B8C\u6210\u5E73\u53F0\u767B\u8BB0\u540E\u6267\u884C apm sync-deploy-config"
+      "[apm] \u5F53\u524D .apm/apm.config.json \u4E3A\u6A21\u677F\u9ED8\u8BA4\u503C\uFF1B\u5B8C\u6210\u5E73\u53F0\u767B\u8BB0\u540E\u6267\u884C apm sync-deploy-config"
     );
   }
   console.log("[apm] \u8BF7\u5728\u5E73\u53F0\u300C\u63A5\u5165\u7BA1\u7406 \u2192 \u5DE5\u4F5C\u7A7A\u95F4\u300D\u767B\u8BB0\u4E0A\u8FF0\u76EE\u5F55\u8DEF\u5F84");
@@ -2376,9 +2369,23 @@ function reqWb(v, field) {
   }
   return v;
 }
+function readEnvVar(env, name) {
+  if (env[name] !== void 0) {
+    return env[name];
+  }
+  if (process.platform === "win32") {
+    const target = name.toUpperCase();
+    for (const [key, value] of Object.entries(env)) {
+      if (key.toUpperCase() === target) {
+        return value;
+      }
+    }
+  }
+  return void 0;
+}
 function expandWindowsEnvVars(pathStr, env = process.env) {
   return pathStr.replace(/%([^%]+)%/g, (_, name) => {
-    const value = env[name];
+    const value = readEnvVar(env, name);
     return value ?? `%${name}%`;
   });
 }
@@ -2403,14 +2410,17 @@ function readMavenLocalRepoFromMavenOpts(mavenOpts, env = process.env) {
 }
 function readMavenLocalRepoFromEnv(env = process.env) {
   for (const key of MAVEN_REPO_ENV_KEYS) {
-    const raw = env[key]?.trim();
+    const raw = readEnvVar(env, key)?.trim();
     if (raw) {
-      return expandUserPath(raw, env);
+      return { path: expandUserPath(raw, env), key };
     }
   }
-  const mavenOpts = env.MAVEN_OPTS?.trim();
+  const mavenOpts = readEnvVar(env, "MAVEN_OPTS")?.trim();
   if (mavenOpts) {
-    return readMavenLocalRepoFromMavenOpts(mavenOpts, env);
+    const path12 = readMavenLocalRepoFromMavenOpts(mavenOpts, env);
+    if (path12) {
+      return { path: path12, key: "MAVEN_OPTS" };
+    }
   }
   return null;
 }
@@ -2433,12 +2443,28 @@ function readMavenLocalRepoFromSettings() {
     return null;
   }
 }
-function resolveMavenLocalRepo(configured) {
-  const trimmed = configured?.trim();
-  if (trimmed) {
-    return expandUserPath(trimmed);
+function resolveMavenLocalRepoWithSource() {
+  const fromEnv = readMavenLocalRepoFromEnv();
+  if (fromEnv) {
+    return {
+      path: fromEnv.path,
+      source: "env",
+      sourceDetail: fromEnv.key
+    };
+  }
+  const fromSettings = readMavenLocalRepoFromSettings();
+  if (fromSettings) {
+    return {
+      path: fromSettings,
+      source: "settings",
+      sourceDetail: "~/.m2/settings.xml"
+    };
   }
-  return readMavenLocalRepoFromEnv() ?? readMavenLocalRepoFromSettings() ?? join13(homedir2(), ".m2", "repository");
+  return {
+    path: join13(homedir2(), ".m2", "repository"),
+    source: "default",
+    sourceDetail: "~/.m2/repository"
+  };
 }
 function resolveWisdomBackendDeployFromApmConfig(cfg) {
   const projectName = reqTopLevelName(cfg);
@@ -2456,6 +2482,7 @@ function resolveWisdomBackendDeployFromApmConfig(cfg) {
     console.error("apm.config.json \u4E2D healthCheck.timeout \u987B\u4E3A\u6B63\u6574\u6570");
     process.exit(1);
   }
+  const mavenLocalRepo = resolveMavenLocalRepoWithSource();
   return {
     projectName,
     host: reqWd(w.host, "host").trim(),
@@ -2467,7 +2494,9 @@ function resolveWisdomBackendDeployFromApmConfig(cfg) {
     remoteLibDir: `${remoteAppDir}/lib`,
     startupJar: posixBasename(jarPath),
     packageName: `${projectName}.jar.zip`,
-    mavenLocalRepo: resolveMavenLocalRepo(w.mavenLocalRepo),
+    mavenLocalRepo: mavenLocalRepo.path,
+    mavenLocalRepoSource: mavenLocalRepo.source,
+    mavenLocalRepoSourceDetail: mavenLocalRepo.sourceDetail,
     healthCheckPort: healthPort,
     healthCheckContext: reqHc(h.context, "context").trim(),
     healthCheckTimeout: healthTimeout
@@ -2796,7 +2825,7 @@ function getMvnExecutable() {
   }
   fail("\u672A\u627E\u5230 mvn \u547D\u4EE4\uFF0C\u8BF7\u786E\u8BA4 Maven \u5DF2\u5B89\u88C5\u5E76\u52A0\u5165 PATH");
 }
-function runMavenBuild(projectRoot, mavenLocalRepo) {
+function runMavenBuild(projectRoot, mavenLocalRepo, repoSource) {
   const mavenRepo = expandPath(mavenLocalRepo);
   const mvn = getMvnExecutable();
   const command = [
@@ -2807,8 +2836,14 @@ function runMavenBuild(projectRoot, mavenLocalRepo) {
     formatMavenLocalRepoArg(mavenRepo),
     "-DskipTests"
   ].join(" ");
-  log(`\u5F00\u59CB Maven \u6784\u5EFA: ${command}`);
-  log(`Maven \u672C\u5730\u4ED3\u5E93: ${mavenRepo}`);
+  log("\u5F00\u59CB Maven \u6784\u5EFA...");
+  if (repoSource) {
+    log(
+      `Maven \u672C\u5730\u4ED3\u5E93: ${mavenRepo} (\u6765\u6E90: ${repoSource.source}/${repoSource.sourceDetail})`
+    );
+  } else {
+    log(`Maven \u672C\u5730\u4ED3\u5E93: ${mavenRepo}`);
+  }
   log(`\u6784\u5EFA\u76EE\u5F55: ${projectRoot}`);
   const result = spawnSync2(command, {
     cwd: projectRoot,
@@ -2817,9 +2852,7 @@ function runMavenBuild(projectRoot, mavenLocalRepo) {
     env: process.env
   });
   if (result.status !== 0) {
-    fail(
-      `Maven \u6784\u5EFA\u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${result.status ?? 1}\u3002\u8BF7\u5728\u9879\u76EE\u6839\u76EE\u5F55\u624B\u52A8\u6267\u884C\u4EE5\u67E5\u770B\u8BE6\u7EC6\u9519\u8BEF: ${command}`
-    );
+    fail(`Maven \u6784\u5EFA\u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${result.status ?? 1}`);
   }
 }
 function locateLibDir(projectRoot) {
@@ -2897,7 +2930,7 @@ async function uploadUpdatePackage(sftp, zipPath, config) {
 async function runRemoteCommand(client, command, options) {
   const check = options?.check ?? true;
   const stream = options?.stream ?? false;
-  log(`\u8FDC\u7A0B\u6267\u884C: ${command}`);
+  const label = options?.label ?? "\u8FDC\u7A0B\u547D\u4EE4";
   return new Promise((resolve5, reject) => {
     client.exec(command, (err, execStream) => {
       if (err) {
@@ -2917,18 +2950,16 @@ async function runRemoteCommand(client, command, options) {
         errText += data.toString();
       });
       execStream.on("close", (code) => {
-        if (!stream) {
-          if (out) {
-            console.log(out.trimEnd());
-          }
-          if (errText) {
-            console.error(errText.trimEnd());
-          }
-        } else if (out && !out.endsWith("\n")) {
+        if (stream && out && !out.endsWith("\n")) {
           process.stdout.write("\n");
         }
         if (check && code !== 0) {
-          fail(`\u8FDC\u7A0B\u547D\u4EE4\u5931\u8D25 (exit ${code}): ${command}`);
+          const combined = `${out}
+${errText}`.trim();
+          fail(
+            `${label}\u5931\u8D25 (exit ${code})` + (combined ? `
+\u8F93\u51FA: ${combined}` : "")
+          );
         }
         resolve5({ exitCode: code, out: out.trim(), err: errText.trim() });
       });
@@ -2963,7 +2994,9 @@ async function extractUpdatePackageOnRemote(client, config, remoteZipPath) {
     remoteZipPath,
     config.remoteLibDir
   );
-  const { out } = await runRemoteCommand(client, script);
+  const { out } = await runRemoteCommand(client, script, {
+    label: "\u8FDC\u7A0B\u89E3\u538B"
+  });
   const match = out.match(/UPDATED_COUNT=(\d+)/);
   if (!match) {
     fail(`\u8FDC\u7A0B\u89E3\u538B\u5931\u8D25\uFF0C\u672A\u83B7\u53D6\u66F4\u65B0\u6570\u91CF
@@ -3089,7 +3122,8 @@ exit 1
 }
 async function runRemoteServiceScript(client, script, action) {
   const { exitCode, out, err } = await runRemoteCommand(client, script, {
-    check: false
+    check: false,
+    label: action === "status" ? "\u8FDC\u7A0B status" : action === "restart" ? "\u8FDC\u7A0B restart" : "\u5065\u5EB7\u68C0\u67E5"
   });
   const combined = `${out}
 ${err}`.trim();
@@ -3130,9 +3164,7 @@ async function getRunningJar(client, config) {
   return null;
 }
 async function healthCheckService(client, config) {
-  log(
-    `\u5065\u5EB7\u68C0\u67E5: http://127.0.0.1:${config.healthCheckPort}${normalizeHealthContext(config.healthCheckContext)} (\u8D85\u65F6 ${config.healthCheckTimeout}s)`
-  );
+  log("\u5065\u5EB7\u68C0\u67E5...");
   const script = buildRemoteHealthScript(
     config.healthCheckPort,
     config.healthCheckContext,
@@ -3150,7 +3182,10 @@ async function runWisdomBackendDeploy(options) {
   log(`=== \u81EA\u52A8\u90E8\u7F72: ${config.projectName} ===`);
   log(`\u914D\u7F6E\u6587\u4EF6: ${path2.join(workspaceApmDir(), "apm.config.json")}`);
   log(`\u9879\u76EE\u6839\u76EE\u5F55: ${projectRoot}`);
-  runMavenBuild(projectRoot, config.mavenLocalRepo);
+  runMavenBuild(projectRoot, config.mavenLocalRepo, {
+    source: config.mavenLocalRepoSource,
+    sourceDetail: config.mavenLocalRepoSourceDetail
+  });
   const libDir = locateLibDir(projectRoot);
   let manifest = loadManifest3();
   const conn = await connectSsh(config);
@@ -3244,7 +3279,6 @@ function resolveFrontendDeployCommand(env, cwd) {
   return null;
 }
 function runShellCommand(command, cwd) {
-  console.error(`==> ${command}`);
   const result = spawnSync3(command, {
     cwd,
     stdio: "inherit",
@@ -4652,7 +4686,6 @@ async function runCreatePr(options) {
 // src/commands/deploy/deploy.ts
 import { spawnSync as spawnSync5 } from "node:child_process";
 function runShellCommand3(command, cwd) {
-  console.error(`==> ${command}`);
   const result = spawnSync5(command, {
     cwd,
     stdio: "inherit",
@@ -5623,7 +5656,7 @@ function buildProgram() {
     await runLogin(opts);
   });
   program.command("init").description(
-    "\u5728\u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55\u521D\u59CB\u5316 .apm \u6A21\u677F\uFF08\u82E5 .apm \u5DF2\u5B58\u5728\u4E14\u975E\u7A7A\u5219\u62A5\u9519\uFF09\uFF1B\u5DF2\u767B\u5F55\u4E14\u5E73\u53F0\u6709\u5339\u914D\u90E8\u7F72\u914D\u7F6E\u65F6\u4F1A\u540C\u6B65 apm.config.json \u4E0E deploy/README.md"
+    "\u5728\u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55\u521D\u59CB\u5316 .apm \u6A21\u677F\uFF08\u82E5 .apm \u5DF2\u5B58\u5728\u4E14\u975E\u7A7A\u5219\u62A5\u9519\uFF09\uFF1B\u5DF2\u767B\u5F55\u4E14\u5E73\u53F0\u6709\u5339\u914D\u90E8\u7F72\u914D\u7F6E\u65F6\u4F1A\u540C\u6B65 apm.config.json"
   ).option("--name <name>", "\u5DE5\u4F5C\u76EE\u5F55\u540D\u79F0").action(async (opts) => {
     await runInit(opts.name);
   });
@@ -5643,7 +5676,7 @@ function buildProgram() {
     await runUpdateSkills();
   });
   program.command("sync-deploy-config").description(
-    "\u4ECE\u5E73\u53F0\u62C9\u53D6\u90E8\u7F72\u914D\u7F6E\uFF0C\u8986\u76D6 .apm/apm.config.json \u4E0E .apm/deploy/README.md\uFF08\u9700\u5DF2 login \u4E14\u5DE5\u4F5C\u7A7A\u95F4\u5DF2\u767B\u8BB0\u5E76\u7ED1\u5B9A\u4ED3\u5E93\uFF09"
+    "\u4ECE\u5E73\u53F0\u62C9\u53D6\u90E8\u7F72\u914D\u7F6E\uFF0C\u8986\u76D6 .apm/apm.config.json\uFF08\u9700\u5DF2 login \u4E14\u5DE5\u4F5C\u7A7A\u95F4\u5DF2\u767B\u8BB0\u5E76\u7ED1\u5B9A\u4ED3\u5E93\uFF09"
   ).action(async () => {
     await runSyncDeployConfig();
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-project-manage-cli",
-  "version": "6.0.70",
+  "version": "6.0.72",
   "description": "命令行工具：后续用于调用平台后端 API 完成运维与自动化操作",
   "type": "module",
   "private": false,

package/template/deploy/README.md

@@ -1,14 +0,0 @@
-## 部署
-
-部署测试环境：`apm deploy test`
-部署线上环境：`apm deploy online`
-
-
-## 前端产物下载地址
-
-http://<服务器地址>/dist.zip
-http://<服务器地址>/{name}.jar.zip
-
-## 测试地址
-
-http://<服务器地址>