ai-project-manage-cli 6.0.67 → 6.0.69

package/dist/index.js

@@ -2588,7 +2588,7 @@ async function runWisdomSftpDeploy(params) {
 }
 
 // src/commands/deploy/internal/wisdom-backend-deploy.ts
-var SPRINGBOOT_SCRIPT = "springboot.sh";
+var SPRINGBOOT_JAVA_OPTS = "-XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -Xms512M -Xmx1G";
 var MAVEN_MODULE = "jeecg-module-system/jeecg-system-start";
 var MAVEN_PROFILE = "dev";
 function log(message) {
@@ -2603,7 +2603,20 @@ function fail(message) {
   process.exit(1);
 }
 function expandPath(pathStr) {
-  return path2.resolve(pathStr.replace(/^~(?=\/|$)/, process.env.HOME ?? ""));
+  const home = process.env.HOME ?? process.env.USERPROFILE ?? "";
+  return path2.resolve(pathStr.replace(/^~(?=\/|\\|$)/, home));
+}
+function quoteForShell(value) {
+  if (process.platform === "win32") {
+    return `"${value.replace(/"/g, '""')}"`;
+  }
+  return shellSingleQuote(value);
+}
+function formatMavenLocalRepoArg(repoPath) {
+  if (process.platform === "win32") {
+    return `-Dmaven.repo.local=${quoteForShell(repoPath)}`;
+  }
+  return `-Dmaven.repo.local=${repoPath}`;
 }
 function deployCacheDir() {
   return path2.join(workspaceApmDir(), "deploy", ".deploy_cache");
@@ -2708,33 +2721,40 @@ function getMvnExecutable() {
   const isWin = process.platform === "win32";
   const candidates = isWin ? ["mvn.cmd", "mvn.bat", "mvn"] : ["mvn"];
   for (const name of candidates) {
-    const result = spawnSync2(isWin ? "where" : "which", [name], {
-      encoding: "utf8"
+    const result = spawnSync2(isWin ? `where ${name}` : `which ${name}`, {
+      encoding: "utf8",
+      shell: true
     });
     if (result.status === 0 && result.stdout.trim()) {
-      return result.stdout.trim().split(/\r?\n/)[0];
+      return result.stdout.trim().split(/\r?\n/)[0].trim();
     }
   }
   fail("\u672A\u627E\u5230 mvn \u547D\u4EE4\uFF0C\u8BF7\u786E\u8BA4 Maven \u5DF2\u5B89\u88C5\u5E76\u52A0\u5165 PATH");
 }
 function runMavenBuild(projectRoot, mavenLocalRepo) {
   const mavenRepo = expandPath(mavenLocalRepo);
-  const cmd = [
-    getMvnExecutable(),
+  const mvn = getMvnExecutable();
+  const command = [
+    quoteForShell(mvn),
     "clean",
     "package",
     `-P${MAVEN_PROFILE}`,
-    `-Dmaven.repo.local=${mavenRepo}`,
+    formatMavenLocalRepoArg(mavenRepo),
     "-DskipTests"
-  ];
-  log(`\u5F00\u59CB Maven \u6784\u5EFA: ${cmd.join(" ")}`);
+  ].join(" ");
+  log(`\u5F00\u59CB Maven \u6784\u5EFA: ${command}`);
   log(`Maven \u672C\u5730\u4ED3\u5E93: ${mavenRepo}`);
-  const result = spawnSync2(cmd[0], cmd.slice(1), {
+  log(`\u6784\u5EFA\u76EE\u5F55: ${projectRoot}`);
+  const result = spawnSync2(command, {
     cwd: projectRoot,
-    stdio: "inherit"
+    stdio: "inherit",
+    shell: true,
+    env: process.env
   });
   if (result.status !== 0) {
-    fail(`Maven \u6784\u5EFA\u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${result.status ?? 1}`);
+    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}`
+    );
   }
 }
 function locateLibDir(projectRoot) {
@@ -2904,22 +2924,106 @@ function springbootOutputIndicatesSuccess(action, combined) {
   }
   return true;
 }
-async function runSpringbootAction(client, config, action, ...args) {
-  if (action === "start" || action === "restart") {
-    if (args.length === 0) {
-      fail(`\u8FDC\u7A0B ${action} \u7F3A\u5C11 jar \u53C2\u6570`);
-    }
-    const jar = args[0].trim().split(/\r?\n/)[0].trim();
-    if (!jar) {
-      fail(`\u65E0\u6548\u7684 jar \u540D\u79F0: ${JSON.stringify(args[0])}`);
-    }
+function buildRemoteStatusScript(remoteAppDir, appName) {
+  const dir = shellSingleQuote(remoteAppDir);
+  const jar = shellSingleQuote(appName);
+  return `
+set -e
+cd ${dir}
+appName=${jar}
+appIds=$(ps -ef | grep java | grep "$appName" | awk '{print $2}')
+if [ -z "$appIds" ]; then
+  echo -e "\\033[31m Not running \\033[0m"
+else
+  echo -e "\\033[32m Running [$appIds] \\033[0m"
+fi
+`.trim();
+}
+function buildRemoteRestartScript(remoteAppDir) {
+  const dir = shellSingleQuote(remoteAppDir);
+  const javaOpts = shellSingleQuote(SPRINGBOOT_JAVA_OPTS);
+  return `
+set -e
+cd ${dir}
+releaseApp=$(ls -t | grep '.jar$' | head -n1)
+lastVersionApp=$(ls -t | grep '.jar$' | head -n2 | tail -n1)
+appName=$lastVersionApp
+appIds=$(ps -ef | grep java | grep "$appName" | awk '{print $2}')
+if [ -z "$appIds" ]; then
+  echo "Maybe $appName not running, please check it..."
+else
+  echo "The $appName is stopping..."
+  echo "$appIds" | xargs kill
+fi
+for i in $(seq 15 -1 1); do
+  echo -n "$i "
+  sleep 1
+done
+echo 0
+if [ ! -d "backup" ]; then
+  mkdir backup
+fi
+for i in $(ls | grep '.jar$' | grep -vFx "$releaseApp"); do
+  echo "backup $i"
+  mv "$i" backup/
+done
+appName=$releaseApp
+count=$(ps -ef | grep java | grep "$appName" | wc -l)
+if [ "$count" != "0" ]; then
+  echo "Maybe $appName is running, please check it..."
+else
+  echo "The $appName is starting..."
+  nohup java -jar "./$appName" ${javaOpts} > nohup.out 2>&1 &
+fi
+`.trim();
+}
+function normalizeHealthContext(context) {
+  let normalized = context.trim() || "/";
+  if (!normalized.startsWith("/")) {
+    normalized = `/${normalized}`;
   }
-  const quotedArgs = [action, ...args].map((arg) => shellSingleQuote(arg));
-  const command = [
-    `cd ${shellSingleQuote(config.remoteAppDir)}`,
-    `./${SPRINGBOOT_SCRIPT} ${quotedArgs.join(" ")}`
-  ].join(" && ");
-  const { exitCode, out, err } = await runRemoteCommand(client, command, {
+  if (!normalized.endsWith("/")) {
+    normalized = `${normalized}/`;
+  }
+  return normalized;
+}
+function buildRemoteHealthScript(port, context, timeoutSecs) {
+  const normalizedContext = normalizeHealthContext(context);
+  const portStr = String(port);
+  const timeoutStr = String(timeoutSecs);
+  return `
+set -e
+port=${shellSingleQuote(portStr)}
+context=${shellSingleQuote(normalizedContext)}
+timeout=${shellSingleQuote(timeoutStr)}
+check_url="http://127.0.0.1:${portStr}${normalizedContext}"
+echo "\u5065\u5EB7\u68C0\u67E5: \${check_url} (\u8D85\u65F6 \${timeout}s)"
+deadline=$(($(date +%s) + timeout))
+attempt=0
+while [ $(date +%s) -lt $deadline ]; do
+  attempt=$((attempt + 1))
+  code=$(curl -s -o /dev/null -w "%{http_code}" "$check_url" 2>/dev/null || echo "000")
+  code=$(echo "$code" | tail -n1 | tr -d '[:space:]')
+  if [ \${#code} -ge 3 ]; then
+    status=\${code:0:3}
+    if echo "$status" | grep -qE '^[0-9]+$' && [ "$status" -ge 200 ] && [ "$status" -lt 500 ]; then
+      echo -e "\\033[32m\u5065\u5EB7\u68C0\u67E5\u901A\u8FC7 (HTTP \${status})\\033[0m"
+      exit 0
+    fi
+  fi
+  remaining=$((deadline - $(date +%s)))
+  if [ $remaining -lt 0 ]; then
+    remaining=0
+  fi
+  echo "\u7B49\u5F85\u670D\u52A1\u542F\u52A8... \u7B2C \${attempt} \u6B21\uFF0C\u5269\u4F59 \${remaining}s"
+  sleep 5
+done
+echo -e "\\033[31m\u5065\u5EB7\u68C0\u67E5\u8D85\u65F6 (\${timeout}s): \${check_url}\\033[0m"
+exit 1
+`.trim();
+}
+async function runRemoteServiceScript(client, script, action) {
+  const { exitCode, out, err } = await runRemoteCommand(client, script, {
     check: false
   });
   const combined = `${out}
@@ -2928,21 +3032,17 @@ ${err}`.trim();
   if (action === "health") {
     if (exitCode !== 0 || !outputOk) {
       fail(`\u5065\u5EB7\u68C0\u67E5\u5931\u8D25
-\u547D\u4EE4: ${command}
 \u8F93\u51FA: ${combined || "(\u7A7A)"}`);
     }
     return combined;
   }
   if (exitCode !== 0 && !outputOk) {
-    fail(`\u8FDC\u7A0B ${action} \u5931\u8D25: ${args.join(" ")}
+    fail(`\u8FDC\u7A0B ${action} \u5931\u8D25
 ${combined}`);
   }
-  if ((action === "start" || action === "restart") && !outputOk) {
-    fail(
-      `\u8FDC\u7A0B ${action} \u672A\u6210\u529F: ${args.join(" ")}
-\u547D\u4EE4: ${command}
-\u8F93\u51FA: ${combined || "(\u7A7A)"}`
-    );
+  if (action === "restart" && !outputOk) {
+    fail(`\u8FDC\u7A0B restart \u672A\u6210\u529F
+\u8F93\u51FA: ${combined || "(\u7A7A)"}`);
   }
   return combined;
 }
@@ -2950,12 +3050,11 @@ function stripAnsi(text) {
   return text.replace(/\x1b\[[0-?]*[ -/]*[@-~]/g, "");
 }
 async function getRunningJar(client, config) {
-  const combined = await runSpringbootAction(
-    client,
-    config,
-    "status",
+  const script = buildRemoteStatusScript(
+    config.remoteAppDir,
     config.startupJar
   );
+  const combined = await runRemoteServiceScript(client, script, "status");
   const text = stripAnsi(combined).trim().toLowerCase();
   if (text.includes("not running")) {
     return null;
@@ -2966,11 +3065,19 @@ async function getRunningJar(client, config) {
   return null;
 }
 async function healthCheckService(client, config) {
-  const port = String(config.healthCheckPort);
-  const context = config.healthCheckContext;
-  const timeout = String(config.healthCheckTimeout);
-  log(`\u5065\u5EB7\u68C0\u67E5: springboot.sh health ${port} ${context} ${timeout}`);
-  await runSpringbootAction(client, config, "health", port, context, timeout);
+  log(
+    `\u5065\u5EB7\u68C0\u67E5: http://127.0.0.1:${config.healthCheckPort}${normalizeHealthContext(config.healthCheckContext)} (\u8D85\u65F6 ${config.healthCheckTimeout}s)`
+  );
+  const script = buildRemoteHealthScript(
+    config.healthCheckPort,
+    config.healthCheckContext,
+    config.healthCheckTimeout
+  );
+  await runRemoteServiceScript(client, script, "health");
+}
+async function restartRemoteService(client, config) {
+  const script = buildRemoteRestartScript(config.remoteAppDir);
+  await runRemoteServiceScript(client, script, "restart");
 }
 async function runWisdomBackendDeploy(options) {
   const projectRoot = path2.resolve(options.projectRoot ?? process.cwd());
@@ -2978,9 +3085,7 @@ 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}`);
-  if (!options.skipMaven) {
-    runMavenBuild(projectRoot, config.mavenLocalRepo);
-  }
+  runMavenBuild(projectRoot, config.mavenLocalRepo);
   const libDir = locateLibDir(projectRoot);
   let manifest = loadManifest3();
   const conn = await connectSsh(config);
@@ -3026,12 +3131,7 @@ async function runWisdomBackendDeploy(options) {
     }
     if (needRestart) {
       log("\u91CD\u542F\u670D\u52A1...");
-      await runSpringbootAction(
-        conn.client,
-        config,
-        "restart",
-        config.startupJar
-      );
+      await restartRemoteService(conn.client, config);
     }
     await healthCheckService(conn.client, config);
     if (libUploadEntries.length > 0) {
@@ -3115,8 +3215,7 @@ async function runWisdomAutoDeploy(options) {
   );
   await runWisdomBackendDeploy({
     config: settings,
-    projectRoot: cwd,
-    skipMaven: Boolean(options.skipMaven)
+    projectRoot: cwd
   });
   return { projectType };
 }
@@ -4505,33 +4604,30 @@ function registerDeployMainCommand(program) {
   ).argument("<env>", "\u90E8\u7F72\u73AF\u5883\u540D\uFF08\u5982 test\u3001online\uFF09").option(
     "--config <path>",
     "apm.config.json \u8DEF\u5F84\uFF08\u9ED8\u8BA4 .apm/apm.config.json\uFF09"
-  ).option("--skip-maven", "\u8DF3\u8FC7 Maven \u6784\u5EFA\uFF08\u4EC5\u533B\u52A1\u540E\u7AEF\uFF09").action(
-    async (env, opts) => {
-      const cwd = process.cwd();
-      const cfg = loadApmConfig({ configPath: opts.config });
-      if (isWisdomLegacyDeploy(cfg)) {
-        await runWisdomAutoDeploy({
-          env,
-          cwd,
-          configPath: opts.config,
-          skipMaven: opts.skipMaven
-        });
-        return;
-      }
-      const deployCommands = cfg.deploy ?? {};
-      const command = deployCommands[env]?.trim();
-      if (!command) {
-        const keys = Object.keys(deployCommands);
-        console.error(
-          keys.length > 0 ? `apm.config.json \u4E2D\u672A\u914D\u7F6E deploy.${env}\uFF0C\u53EF\u7528\u73AF\u5883: ${keys.join(
-            ", "
-          )}` : `apm.config.json \u4E2D\u672A\u914D\u7F6E deploy \u6BB5`
-        );
-        process.exit(1);
-      }
-      runShellCommand3(command, cwd);
+  ).action(async (env, opts) => {
+    const cwd = process.cwd();
+    const cfg = loadApmConfig({ configPath: opts.config });
+    if (isWisdomLegacyDeploy(cfg)) {
+      await runWisdomAutoDeploy({
+        env,
+        cwd,
+        configPath: opts.config
+      });
+      return;
     }
-  );
+    const deployCommands = cfg.deploy ?? {};
+    const command = deployCommands[env]?.trim();
+    if (!command) {
+      const keys = Object.keys(deployCommands);
+      console.error(
+        keys.length > 0 ? `apm.config.json \u4E2D\u672A\u914D\u7F6E deploy.${env}\uFF0C\u53EF\u7528\u73AF\u5883: ${keys.join(
+          ", "
+        )}` : `apm.config.json \u4E2D\u672A\u914D\u7F6E deploy \u6BB5`
+      );
+      process.exit(1);
+    }
+    runShellCommand3(command, cwd);
+  });
 }
 
 // src/commands/deploy/backend.ts
@@ -5431,12 +5527,11 @@ function registerDeployWisdomBackendCommands(program) {
   ).option(
     "--config <path>",
     "apm.config.json \u8DEF\u5F84\uFF08\u9ED8\u8BA4 .apm/apm.config.json\uFF09"
-  ).option("--skip-maven", "\u8DF3\u8FC7 Maven \u6784\u5EFA\uFF0C\u4EC5\u4E0A\u4F20\u5E76\u91CD\u542F").action(async (opts) => {
+  ).action(async (opts) => {
     const cfg = loadApmConfig({ configPath: opts.config });
     const settings = resolveWisdomBackendDeployFromApmConfig(cfg);
     await runWisdomBackendDeploy({
-      config: settings,
-      skipMaven: Boolean(opts.skipMaven)
+      config: settings
     });
   });
 }

package/package.json

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