ai-project-manage-cli 6.0.68 → 6.0.70

package/dist/index.js

@@ -2227,7 +2227,7 @@ function validateAgentWsMessage(value, kind) {
 // src/commands/connect/deploy-run.ts
 import { spawn } from "node:child_process";
 import { existsSync as existsSync14, readFileSync as readFileSync12 } from "node:fs";
-import { join as join13 } from "node:path";
+import { join as join14 } from "node:path";
 
 // src/commands/deploy/internal/wisdom-auto-deploy.ts
 import { existsSync as existsSync13, readFileSync as readFileSync11 } from "node:fs";
@@ -2236,7 +2236,8 @@ import { spawnSync as spawnSync3 } from "node:child_process";
 
 // src/commands/deploy/internal/apm-config.ts
 import { existsSync as existsSync11, readFileSync as readFileSync9 } from "node:fs";
-import { resolve as resolve3 } from "node:path";
+import { homedir as homedir2 } from "node:os";
+import { join as join13, resolve as resolve3 } from "node:path";
 function loadApmConfig(options) {
   const p = resolve3(
     process.cwd(),
@@ -2375,6 +2376,70 @@ function reqWb(v, field) {
   }
   return v;
 }
+function expandWindowsEnvVars(pathStr, env = process.env) {
+  return pathStr.replace(/%([^%]+)%/g, (_, name) => {
+    const value = env[name];
+    return value ?? `%${name}%`;
+  });
+}
+function expandUserPath(pathStr, env = process.env) {
+  const home = env.HOME ?? env.USERPROFILE ?? homedir2();
+  const withEnv = expandWindowsEnvVars(pathStr, env);
+  const expanded = withEnv.replace(/^~(?=\/|\\|$)/, home);
+  if (/^[a-zA-Z]:[/\\]/.test(expanded)) {
+    return expanded;
+  }
+  return resolve3(expanded);
+}
+var MAVEN_REPO_ENV_KEYS = [
+  "MAVEN_LOCAL_REPO",
+  "M2_REPO",
+  "MAVEN_REPOSITORY"
+];
+function readMavenLocalRepoFromMavenOpts(mavenOpts, env = process.env) {
+  const match = mavenOpts.match(/-Dmaven\.repo\.local=(?:"([^"]+)"|(\S+))/);
+  const raw = match?.[1]?.trim() || match?.[2]?.trim();
+  return raw ? expandUserPath(raw, env) : null;
+}
+function readMavenLocalRepoFromEnv(env = process.env) {
+  for (const key of MAVEN_REPO_ENV_KEYS) {
+    const raw = env[key]?.trim();
+    if (raw) {
+      return expandUserPath(raw, env);
+    }
+  }
+  const mavenOpts = env.MAVEN_OPTS?.trim();
+  if (mavenOpts) {
+    return readMavenLocalRepoFromMavenOpts(mavenOpts, env);
+  }
+  return null;
+}
+function readMavenLocalRepoFromSettings() {
+  const settingsPath = join13(homedir2(), ".m2", "settings.xml");
+  if (!existsSync11(settingsPath)) {
+    return null;
+  }
+  try {
+    const xml = readFileSync9(settingsPath, "utf8");
+    const match = xml.match(
+      /<localRepository>\s*([^<]+?)\s*<\/localRepository>/
+    );
+    const raw = match?.[1]?.trim();
+    if (!raw) {
+      return null;
+    }
+    return expandUserPath(raw);
+  } catch {
+    return null;
+  }
+}
+function resolveMavenLocalRepo(configured) {
+  const trimmed = configured?.trim();
+  if (trimmed) {
+    return expandUserPath(trimmed);
+  }
+  return readMavenLocalRepoFromEnv() ?? readMavenLocalRepoFromSettings() ?? join13(homedir2(), ".m2", "repository");
+}
 function resolveWisdomBackendDeployFromApmConfig(cfg) {
   const projectName = reqTopLevelName(cfg);
   const w = cfg.wisdomDeploy ?? {};
@@ -2402,7 +2467,7 @@ function resolveWisdomBackendDeployFromApmConfig(cfg) {
     remoteLibDir: `${remoteAppDir}/lib`,
     startupJar: posixBasename(jarPath),
     packageName: `${projectName}.jar.zip`,
-    mavenLocalRepo: reqWb(w.mavenLocalRepo, "mavenLocalRepo").trim(),
+    mavenLocalRepo: resolveMavenLocalRepo(w.mavenLocalRepo),
     healthCheckPort: healthPort,
     healthCheckContext: reqHc(h.context, "context").trim(),
     healthCheckTimeout: healthTimeout
@@ -2588,7 +2653,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) {
@@ -2924,22 +2989,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}
@@ -2948,21 +3097,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;
 }
@@ -2970,12 +3115,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;
@@ -2986,11 +3130,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());
@@ -3044,12 +3196,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) {
@@ -3141,7 +3288,7 @@ async function runWisdomAutoDeploy(options) {
 // src/commands/connect/deploy-run.ts
 var DEPLOY_LOG_SYNC_INTERVAL_MS = 3e4;
 function readApmConfig(workdir) {
-  const configPath = join13(workspaceApmDir(workdir), "apm.config.json");
+  const configPath = join14(workspaceApmDir(workdir), "apm.config.json");
   if (!existsSync14(configPath)) {
     return void 0;
   }
@@ -4051,10 +4198,10 @@ async function runCursorAgent(cfg, ctx, options) {
 
 // src/commands/connect/cli-version-sync.ts
 import { existsSync as existsSync16, readFileSync as readFileSync14, writeFileSync as writeFileSync12 } from "fs";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 var CLI_VERSION_FILE = ".cli-version.json";
 function manifestPath(apmDir) {
-  return join14(apmDir, CLI_VERSION_FILE);
+  return join15(apmDir, CLI_VERSION_FILE);
 }
 function loadManifest4(apmDir) {
   const path12 = toFsPath(manifestPath(apmDir));

package/package.json

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