crabatool 1.0.860 → 1.0.862

package/lib/utils.js

@@ -882,38 +882,57 @@ class Utils {
     }
   }
 
-  // 获取 Git 用户信息（优先读取项目目录下的本地配置）
-  getGitUser(cwd) {
-    let name = '',
-      email = '';
-    try {
-      name = String(execSync('git config user.name', { cwd: cwd || process.cwd() })).trim();
-    } catch (e) { }
+  runGitCommand(args, cwd) {
     try {
-      email = String(execSync('git config user.email', { cwd: cwd || process.cwd() })).trim();
-    } catch (e) { }
+      return execFileSync('git', args, {
+        cwd: cwd || process.cwd(),
+        encoding: 'utf8',
+        stdio: ['ignore', 'pipe', 'pipe'],
+      }).trim();
+    } catch (e) {
+      return '';
+    }
+  }
+
+  isGitWorkTree(cwd) {
+    return this.runGitCommand(['rev-parse', '--is-inside-work-tree'], cwd) === 'true';
+  }
+
+  readGitConfig(key, cwd, globalOnly) {
+    const args = ['config', '--get'];
+    if (globalOnly) {
+      args.push('--global');
+    }
+
+    args.push(key);
+    return this.runGitCommand(args, cwd);
+  }
+
+  // 获取 Git 用户信息（仓库内优先读取项目配置；非仓库目录读取全局配置）
+  getGitUser(cwd) {
+    const gitCwd = cwd || process.cwd();
+    const globalOnly = !this.isGitWorkTree(gitCwd);
+    const name = this.readGitConfig('user.name', gitCwd, globalOnly);
+    const email = this.readGitConfig('user.email', gitCwd, globalOnly);
     return { name, email };
   }
 
   // 获取当前 Git 分支名（优先使用 git 命令，失败则返回空）
   getCurrentBranch(cwd) {
-    try {
-
-      const out = execSync('git rev-parse --abbrev-ref HEAD', { cwd: cwd || process.cwd() });
-      return String(out).trim();
-    } catch (e) {
+    if (!this.isGitWorkTree(cwd)) {
       return '';
     }
+
+    return this.runGitCommand(['rev-parse', '--abbrev-ref', 'HEAD'], cwd);
   }
 
   // 获取远程仓库 URL（origin）
   getRemoteUrl(cwd) {
-    try {
-      const out = execSync('git config --get remote.origin.url', { cwd: cwd || process.cwd() });
-      return String(out).trim();
-    } catch (e) {
+    if (!this.isGitWorkTree(cwd)) {
       return '';
     }
+
+    return this.readGitConfig('remote.origin.url', cwd, false);
   }
 
   // 根据远程仓库 URL 和分支名，推导分支的网页地址（支持 GitHub/GitLab/Gitee 等常见平台）
@@ -986,7 +1005,7 @@ class Utils {
 
     console.log('git commit -m "' + msg + '"'); // 提交日志
     //execSync('git commit -m "' + msg + '"', { cwd: webPath }); // 提交日志
-    execFileSync('git', ['commit', '-m', msg]);
+    execFileSync('git', ['commit', '-m', msg], { cwd: webPath });
 
 
     //console.log('git pull --rebase origin ' + branchName); // 拉取分支

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.860",
+  "version": "1.0.862",
   "description": "crabatool",
   "main": "index.js",
   "bin": {

package/tool/merge/mergeTool.js

@@ -101,6 +101,9 @@ function buildFolder(options) {
         var value;
         if (key == '$versionDate$') {
           value = new Date().toString('yyyyMMddhh');
+          if (arr[1]) {
+            value = arr[1] + value;
+          }
         } else if (arr.length > 1 && arr[1] != null) {
           value = arr[1].trim();
         } else {