@yangrunchi/a_6 1.1.0 → 1.1.1

package/AutoNetMsg/A5_generate-funcdata.js

@@ -78,7 +78,8 @@ try {
 }
 
 // 自动获取 SVN 账户名（覆盖 config.author）
-config.author = getSVNAuthor(projectRoot, config.author);
+const projectRootForAuthor = path.resolve(__dirname, '../../..');
+config.author = getSVNAuthor(projectRootForAuthor, config.author);
 console.log('✅ 已加载配置, 作者:', config.author);
 
 console.log('🚀 开始生成 funcData 类...');
@@ -132,12 +133,10 @@ function commitToSvn(filePath, action, responseCount = 0, requestCount = 0) {
 
     try {
         const fileName = path.basename(filePath);
-        // 使用模块级 projectRoot 而非 __dirname 推算（npm 全局安装时 __dirname 在 node_modules 下）
-        const projectRootForSvn = projectRoot;
 
         let isVersioned = false;
         try {
-            execSync(`svn info "${filePath}"`, { stdio: 'ignore', cwd: projectRootForSvn });
+            execSync(`svn info "${filePath}"`, { stdio: 'ignore' });
             isVersioned = true;
         } catch (err) {
             isVersioned = false;
@@ -145,17 +144,17 @@ function commitToSvn(filePath, action, responseCount = 0, requestCount = 0) {
 
         if (!isVersioned) {
             console.log(`   📝 添加新文件: ${fileName}`);
-            execSync(`svn add "${filePath}"`, { stdio: 'ignore', cwd: projectRootForSvn });
+            execSync(`svn add "${filePath}"`, { stdio: 'ignore' });
         }
 
-        const statusOutput = execSync(`svn status "${filePath}"`, { encoding: 'utf8', cwd: projectRootForSvn });
+        const statusOutput = execSync(`svn status "${filePath}"`, { encoding: 'utf8' });
         const needCommit = statusOutput.trim().length > 0 &&
             (statusOutput.trim().startsWith('M') || statusOutput.trim().startsWith('A'));
 
         if (needCommit) {
             const commitMsg = getCommitMessage(action, fileName, responseCount, requestCount);
             console.log(`   📤 提交: ${fileName} - ${commitMsg}`);
-            execSync(`svn commit "${filePath}" -m "${commitMsg}"`, { stdio: 'ignore', cwd: projectRootForSvn });
+            execSync(`svn commit "${filePath}" -m "${commitMsg}"`, { stdio: 'ignore' });
             return true;
         }
         return false;

package/Tools/svn-utils.js

@@ -4,7 +4,6 @@
 // -- 描述: SVN 工具函数集
 
 const fs = require('fs');
-const path = require('path');
 const { execSync, spawnSync } = require('child_process');
 
 // 详细检测 SVN 是否可用
@@ -37,20 +36,6 @@ function isSvnAvailable() {
     return checkSvnEnvironment();
 }
 
-// 从给定路径向上查找包含 .svn 的目录（包含自身）
-function findSvnRoot(startPath) {
-    let dir = startPath;
-    while (dir) {
-        if (fs.existsSync(path.join(dir, '.svn'))) {
-            return dir;
-        }
-        const parent = path.dirname(dir);
-        if (parent === dir) break;
-        dir = parent;
-    }
-    return null;
-}
-
 function runCommand(svnPath, description) {
     if (!isSvnAvailable()) {
         console.log(`⚠️  ${description}跳过: SVN环境问题`);
@@ -58,16 +43,9 @@ function runCommand(svnPath, description) {
     }
 
     try {
-        // 从 svnPath 向上查找 .svn，找不到则从 M2_PROJECT_ROOT 查找
-        let projectRoot = findSvnRoot(svnPath);
-        if (!projectRoot && process.env.M2_PROJECT_ROOT) {
-            projectRoot = findSvnRoot(process.env.M2_PROJECT_ROOT);
-        }
-
         const result = spawnSync('svn', ['update', svnPath], {
             encoding: 'utf8',
-            stdio: 'inherit',
-            cwd: projectRoot || process.cwd()
+            stdio: 'inherit'
         });
 
         if (result.status === 0) {
@@ -92,20 +70,12 @@ function runCommit(filePaths, description) {
     try {
         // 如果传入的是数组，转换为多个参数
         const paths = Array.isArray(filePaths) ? filePaths : [filePaths];
-        
-        // 从文件路径向上查找 .svn，找不到则从 M2_PROJECT_ROOT 查找
-        let projectRoot = findSvnRoot(paths[0]);
-        if (!projectRoot && process.env.M2_PROJECT_ROOT) {
-            projectRoot = findSvnRoot(process.env.M2_PROJECT_ROOT);
-        }
-        
         const args = ['commit', ...paths, '-m', description];
 
         const result = spawnSync('svn', args, {
             encoding: 'buffer',
             env: { ...process.env, LANG: 'zh_CN.UTF-8' },
-            stdio: 'inherit',
-            cwd: projectRoot || process.cwd()
+            stdio: 'inherit'
         });
 
         if (result.status === 0) {
@@ -153,13 +123,9 @@ function cleanDirectory(targetPath) {
  */
 function getSVNAuthor(projectRoot, fallbackAuthor) {
     try {
-        // 找到 SVN 工作目录作为 cwd
-        const svnCwd = findSvnRoot(projectRoot) || process.env.M2_PROJECT_ROOT || projectRoot;
-
         // 获取当前仓库的地址（用于匹配 svn auth 中的 realm）
         const reposUrl = execSync(`svn info --show-item=repos-root-url "${projectRoot}"`, {
-            encoding: 'utf-8',
-            cwd: svnCwd
+            encoding: 'utf-8'
         }).trim();
 
         // 提取仓库主机地址（如 "192.168.13.64"），兼容有无端口号、不同协议
@@ -167,8 +133,7 @@ function getSVNAuthor(projectRoot, fallbackAuthor) {
 
         // 解析 svn auth 输出，匹配当前仓库的用户名
         const authOutput = execSync('svn auth --non-interactive', {
-            encoding: 'utf-8',
-            cwd: svnCwd
+            encoding: 'utf-8'
         });
 
         // 按分隔线分割每个认证条目

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yangrunchi/a_6",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "996M2 客户端 Node.js 工具集 — 协议同步、自动生成代码、CSV配置、SVN管理、BAT脚本管理器",
   "main": "index.js",
   "bin": {