yg-team-cli 2.3.10 → 2.3.12

package/dist/cli.js

@@ -903,7 +903,6 @@ var init_template_version = __esm({
 
 // src/lib/module-registry.ts
 import path5 from "path";
-import fs3 from "fs-extra";
 var ModuleManager;
 var init_module_registry = __esm({
   "src/lib/module-registry.ts"() {
@@ -912,6 +911,111 @@ var init_module_registry = __esm({
     init_utils();
     ModuleManager = class {
       static MODULES = [
+        // ========== 云谷公共模块 (新增) ==========
+        {
+          id: "yungu-user-context",
+          name: "\u7528\u6237\u4E0A\u4E0B\u6587 (UserContext)",
+          description: "RequestScope\u7EA7\u522B\u7684\u7528\u6237\u4FE1\u606F\u83B7\u53D6\uFF0C\u652F\u6301\u591A\u8EAB\u4EFD\u548CMock",
+          type: "local",
+          specs: ["yungu-user-context/spec.md"],
+          backendFragments: [
+            {
+              source: "yungu/UserContext.java",
+              target: "common/yungu/UserContext.java"
+            },
+            {
+              source: "yungu/domain/UserBaseInfo.java",
+              target: "common/yungu/domain/UserBaseInfo.java"
+            },
+            {
+              source: "yungu/domain/UserAccount.java",
+              target: "common/yungu/domain/UserAccount.java"
+            }
+          ],
+          dependencies: ["org.yungu:login-client"]
+        },
+        {
+          id: "yungu-auth",
+          name: "\u7528\u6237\u8BA4\u8BC1\u4E0E\u9274\u6743",
+          description: "CAS\u5355\u70B9\u767B\u5F55\u96C6\u6210\u3001\u7528\u6237\u4E0A\u4E0B\u6587\u62E6\u622A\u5668",
+          type: "local",
+          specs: ["yungu-auth/spec.md"],
+          requires: ["yungu-user-context"],
+          backendFragments: [
+            {
+              source: "yungu/intercepter/UserContextInterceptor.java",
+              target: "common/yungu/intercepter/UserContextInterceptor.java"
+            },
+            {
+              source: "yungu/config/InterceptorConfiguration.java",
+              target: "config/yungu/InterceptorConfiguration.java"
+            }
+          ],
+          dependencies: ["org.yungu:login-client", "org.yungu:acl-api"]
+        },
+        {
+          id: "yungu-managers",
+          name: "\u901A\u7528\u670D\u52A1\u5C01\u88C5",
+          description: "\u7528\u6237\u670D\u52A1\u3001\u5B66\u6821\u670D\u52A1\u7B49Dubbo\u670D\u52A1\u8C03\u7528\u5C01\u88C5",
+          type: "local",
+          specs: ["yungu-managers/spec.md"],
+          backendFragments: [
+            {
+              source: "yungu/managers/UserServiceManager.java",
+              target: "common/yungu/managers/UserServiceManager.java"
+            },
+            {
+              source: "yungu/managers/SchoolManager.java",
+              target: "common/yungu/managers/SchoolManager.java"
+            }
+          ],
+          dependencies: ["org.yungu:user-service-api"]
+        },
+        {
+          id: "yungu-utils",
+          name: "\u5DE5\u5177\u7C7B\u6A21\u5757",
+          description: "\u901A\u7528\u5DE5\u5177\u7C7B (CommonUtils\u7B49)",
+          type: "local",
+          specs: ["yungu-utils/spec.md"],
+          backendFragments: [
+            {
+              source: "yungu/utils/CommonUtils.java",
+              target: "common/yungu/utils/CommonUtils.java"
+            }
+          ]
+        },
+        {
+          id: "yungu-logging",
+          name: "\u65E5\u5FD7\u4E0E\u76D1\u63A7",
+          description: "\u65B9\u6CD5\u8017\u65F6\u65E5\u5FD7\u8BB0\u5F55 (LogAspect)",
+          type: "local",
+          specs: ["yungu-logging/spec.md"],
+          backendFragments: [
+            {
+              source: "yungu/config/LogAspect.java",
+              target: "config/yungu/LogAspect.java"
+            }
+          ]
+        },
+        {
+          id: "yungu-i18n",
+          name: "\u56FD\u9645\u5316\u652F\u6301",
+          description: "\u4E2D\u82F1\u6587\u5207\u6362\u3001\u591A\u8BED\u8A00\u679A\u4E3E",
+          type: "local",
+          specs: ["yungu-i18n/spec.md"],
+          requires: ["yungu-user-context"],
+          backendFragments: [
+            {
+              source: "yungu/enums/LanguageEnum.java",
+              target: "common/yungu/enums/LanguageEnum.java"
+            },
+            {
+              source: "yungu/constant/LanguageConstant.java",
+              target: "common/yungu/constant/LanguageConstant.java"
+            }
+          ]
+        },
+        // ========== 原有模块 ==========
         {
           id: "acl",
           name: "ACL (Access Control List)",
@@ -976,17 +1080,18 @@ var init_module_registry = __esm({
           }
         }
         if (module.type === "local" && module.backendFragments) {
-          const backendBase = path5.join(projectPath, "backend/src/main/java");
-          const basePackagePath = await this.findBasePackage(backendBase);
-          if (basePackagePath) {
-            for (const fragment of module.backendFragments) {
-              const sourcePath = path5.join(templatesDir, "modules", fragment.source);
-              const targetPath = path5.join(basePackagePath, fragment.target);
-              if (await FileUtils.exists(sourcePath)) {
-                await FileUtils.ensureDir(path5.dirname(targetPath));
-                await FileUtils.copy(sourcePath, targetPath);
-                addedFiles.push(path5.relative(projectPath, targetPath));
-              }
+          const backendJavaDir = path5.join(projectPath, "backend/src/main/java");
+          const commonBasePath = path5.join(backendJavaDir, "org/yungu/common");
+          for (const fragment of module.backendFragments) {
+            const sourcePath = path5.join(templatesDir, "modules", fragment.source);
+            const targetPath = path5.join(commonBasePath, fragment.target);
+            if (await FileUtils.exists(sourcePath)) {
+              await FileUtils.ensureDir(path5.dirname(targetPath));
+              let content = await FileUtils.read(sourcePath);
+              const targetPackage = "org.yungu.common." + path5.dirname(fragment.target).replace(/\//g, ".");
+              content = content.replace(/^package\s+[^;]+;/m, `package ${targetPackage};`);
+              await FileUtils.write(targetPath, content);
+              addedFiles.push(path5.relative(projectPath, targetPath));
             }
           }
         } else if (module.type === "remote") {
@@ -1009,27 +1114,6 @@ var init_module_registry = __esm({
 `;
         await FileUtils.write(targetPath, content);
       }
-      /**
-       * 自动探测项目的 Base Package
-       */
-      static async findBasePackage(searchDir) {
-        if (!await FileUtils.exists(searchDir)) return null;
-        const files = await FileUtils.findFiles("**/Application.java", searchDir);
-        if (files.length > 0) {
-          return path5.dirname(path5.join(searchDir, files[0]));
-        }
-        let current = searchDir;
-        while (true) {
-          const items = await fs3.readdir(current);
-          const dirs = items.filter((c) => fs3.statSync(path5.join(current, c)).isDirectory());
-          if (dirs.length === 1 && !["model", "controller", "service", "mapper", "config", "common"].includes(dirs[0])) {
-            current = path5.join(current, dirs[0]);
-          } else {
-            break;
-          }
-        }
-        return current;
-      }
     };
   }
 });
@@ -1472,7 +1556,7 @@ var init_gitlab_api = __esm({
 import { Command } from "commander";
 import inquirer from "inquirer";
 import path7 from "path";
-import fs4 from "fs-extra";
+import fs3 from "fs-extra";
 import os3 from "os";
 import { Listr } from "listr2";
 async function generateTechStack(projectPath) {
@@ -2051,10 +2135,10 @@ async function cloneBackendTemplate(projectPath, versionOptions) {
       stdio: "pipe"
     });
     const latestTag = tags.split("\n")[0] || void 0;
-    await fs4.copy(tempDir, backendPath, {
+    await fs3.copy(tempDir, backendPath, {
       filter: (src) => !src.includes(".git")
     });
-    await fs4.remove(tempDir);
+    await fs3.remove(tempDir);
     const gitDir = path7.join(backendPath, ".git");
     if (await FileUtils.exists(gitDir)) {
       await FileUtils.remove(gitDir);
@@ -2092,10 +2176,10 @@ async function cloneFrontendTemplate(projectPath, versionOptions = {}) {
     cloneArgs.push(repository, tempDir);
     await e("git", cloneArgs);
     const { stdout: commit } = await e("git", ["rev-parse", "HEAD"], { cwd: tempDir });
-    await fs4.copy(tempDir, frontendPath, {
+    await fs3.copy(tempDir, frontendPath, {
       filter: (src) => !src.includes(".git")
     });
-    await fs4.remove(tempDir);
+    await fs3.remove(tempDir);
     await updateTemplateVersion(projectPath, "frontend", commit.trim(), {
       tag: versionOptions.tag || latestTag,
       branch: versionOptions.branch
@@ -2146,9 +2230,9 @@ docker push \${REGISTRY}/\${PROJECT_NAME}:latest
 
 echo "\u2705 \u90E8\u7F72\u5B8C\u6210! \u955C\u50CF\u5730\u5740: \${REGISTRY}/\${IMAGE_TAG}"
 `;
-  await fs4.writeFile(path7.join(backendPath, "Dockerfile"), dockerfile);
-  await fs4.writeFile(path7.join(backendPath, "deploy.sh"), deploySh);
-  await fs4.chmod(path7.join(backendPath, "deploy.sh"), 493);
+  await fs3.writeFile(path7.join(backendPath, "Dockerfile"), dockerfile);
+  await fs3.writeFile(path7.join(backendPath, "deploy.sh"), deploySh);
+  await fs3.chmod(path7.join(backendPath, "deploy.sh"), 493);
 }
 async function initGit(projectPath, projectName) {
   try {
@@ -5444,7 +5528,7 @@ import { Command as Command13 } from "commander";
 import path18 from "path";
 import { execa as execa4 } from "execa";
 import inquirer9 from "inquirer";
-import fs5 from "fs-extra";
+import fs4 from "fs-extra";
 async function performUpdate(projectPath, updates) {
   logger.newLine();
   logger.info("\u5F00\u59CB\u66F4\u65B0\u6A21\u677F...");
@@ -5483,7 +5567,7 @@ async function performUpdate(projectPath, updates) {
     }
     const ref = updateOptions?.tag || updateOptions?.branch || "HEAD";
     const backupDir = path18.join(projectPath, `.backup-${Date.now()}`);
-    await fs5.copy(targetPath, path18.join(backupDir, targetDir));
+    await fs4.copy(targetPath, path18.join(backupDir, targetDir));
     logger.info(`\u5DF2\u521B\u5EFA\u5907\u4EFD: ${backupDir}`);
     if (updateOptions?.dryRun) {
       logger.info("[Dry Run] \u5C06\u4F1A\u66F4\u65B0\u5230\u4EE5\u4E0B\u7248\u672C:");
@@ -5512,15 +5596,15 @@ async function performUpdate(projectPath, updates) {
         if (!keepFiles.includes(file)) {
           const filePath = path18.join(targetPath, file);
           try {
-            await fs5.remove(filePath);
+            await fs4.remove(filePath);
           } catch {
           }
         }
       }
-      await fs5.copy(tempDir, targetPath, {
+      await fs4.copy(tempDir, targetPath, {
         filter: (src) => !src.includes(".git")
       });
-      await fs5.remove(tempDir);
+      await fs4.remove(tempDir);
       await updateTemplateVersion(projectPath, type, commit.trim(), {
         tag: updateOptions?.tag || latestTag,
         branch: updateOptions?.branch
@@ -5531,9 +5615,9 @@ async function performUpdate(projectPath, updates) {
     } catch (error) {
       logger.error(`\u66F4\u65B0\u5931\u8D25: ${error.message}`);
       logger.info("\u6B63\u5728\u6062\u590D\u5907\u4EFD...");
-      await fs5.remove(targetPath);
-      await fs5.copy(path18.join(backupDir, targetDir), targetPath);
-      await fs5.remove(backupDir);
+      await fs4.remove(targetPath);
+      await fs4.copy(path18.join(backupDir, targetDir), targetPath);
+      await fs4.remove(backupDir);
       logger.info("\u5DF2\u6062\u590D\u5230\u66F4\u65B0\u524D\u7684\u72B6\u6001");
     }
   }
@@ -6137,7 +6221,7 @@ var init_diff = __esm({
 var index_exports = {};
 import { Command as Command16 } from "commander";
 import chalk4 from "chalk";
-import fs6 from "fs-extra";
+import fs5 from "fs-extra";
 import path19 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function showHelp() {
@@ -6217,7 +6301,7 @@ var init_index = __esm({
     init_config();
     init_diff();
     __dirname2 = path19.dirname(fileURLToPath2(import.meta.url));
-    pkg = fs6.readJsonSync(path19.join(__dirname2, "../package.json"));
+    pkg = fs5.readJsonSync(path19.join(__dirname2, "../package.json"));
     program = new Command16();
     program.name("team-cli").description("AI-Native \u56E2\u961F\u7814\u53D1\u811A\u624B\u67B6").version(pkg.version);
     program.option("-v, --verbose", "\u8BE6\u7EC6\u8F93\u51FA\u6A21\u5F0F").option("--debug", "\u8C03\u8BD5\u6A21\u5F0F");