wyt-cli 1.0.11 → 1.0.13

package/bin/commands/create.js

@@ -12,6 +12,8 @@ import ora from 'ora';
 import inquirer from 'inquirer';
 import ejs from 'ejs';
 
+import { checkTargetDir } from '../lib/dir.js';
+
 const spinner = ora();
 // 命令配置
 export default function () {
@@ -117,21 +119,6 @@ function createAction(projectName, options) {
   }
 }
 
-// 检查目标目录是否存在
-function checkTargetDir(currentPath) {
-  const monoDirs = ['apps', 'packages'];
-  const conflictDirs = monoDirs
-    .map((dir) => ({
-      name: dir,
-      path: path.join(currentPath, dir),
-      exists: fs.existsSync(path.join(currentPath, dir)),
-    }))
-    .filter((item) => item.exists)
-    .map((item) => item.name);
-
-  return conflictDirs.join(',') == monoDirs.join(',');
-}
-
 // 创建项目
 async function createProject(projectName, options) {
   const files = await glob('./wyt-cli/bin/templates/**/*', {

package/bin/commands/deploy.js

@@ -0,0 +1,135 @@
+import path from 'path';
+import { execa } from 'execa';
+import { Command } from 'commander';
+import fs from 'fs-extra';
+import ora from 'ora';
+import inquirer from 'inquirer';
+import {
+  log_info,
+  log_error,
+  log_success,
+  getFormatTimeText,
+  getUnderlineText,
+  getInquirerOperationText,
+} from '../lib/logger.js';
+import { checkTargetDir, getProjects } from '../lib/dir.js';
+
+const SYSTEM_DEPLOY_DIR = path.resolve('/', '.hrp3_deploy'); // 系统级部署目录
+const startTime = Date.now(); // 计时器
+
+export default function () {
+  const command = new Command('deploy');
+
+  command.description('项目部署命令').action(async () => {
+    try {
+      // 校验项目目录
+      if (!checkTargetDir(process.cwd())) {
+        log_error('请在 HRP3.0 项目根目录运行此命令！');
+        return;
+      }
+
+      // 项目根目录
+      const appsDir = path.resolve(process.cwd(), 'apps');
+
+      // 获取项目列表
+      const projects = await getProjects(appsDir);
+
+      // 交互选择项目
+      const answer = await inquirer.prompt([
+        {
+          type: 'rawlist',
+          name: 'deploystyle',
+          message: `请选择部署项目的方式：` + getInquirerOperationText('list'),
+          default: 0,
+          choices: [
+            { name: '方式1：部署所有项目', value: 0 },
+            { name: '方式2：部署指定项目', value: 1 },
+          ],
+        },
+        {
+          type: 'checkbox',
+          name: 'project',
+          message: '请选择要部署的项目：' + getInquirerOperationText('checkbox'),
+          when: (answers) => answers.deploystyle == 1,
+          choices: projects.map((p) => ({
+            name: p.name,
+          })),
+        },
+      ]);
+
+      // 准备部署目录
+      await initDeployDir();
+
+      // 构建并部署
+      if (answer.deploystyle === 0) {
+        await buildAndDeploy(projects.map((p) => p.name));
+      }
+
+      if (answer.deploystyle === 1 && answer.project) {
+        await buildAndDeploy(answer.project);
+      }
+    } catch (error) {
+      log_error(`部署失败: ${error.message}`);
+      process.exit(1);
+    }
+  });
+
+  return command;
+}
+
+// 初始化部署目录
+async function initDeployDir() {
+  const spinner = ora('正在初始化部署环境').start();
+  try {
+    if (!fs.existsSync(SYSTEM_DEPLOY_DIR)) {
+      spinner.text = '正在读取项目配置';
+      const { deployRepo } = await fs.readJSON(path.join(process.cwd(), 'project.json'));
+
+      spinner.text = '首次部署，正在克隆远程仓库，请耐心等待...';
+      await execa('git', ['clone', deployRepo, SYSTEM_DEPLOY_DIR]);
+
+      spinner.succeed(`仓库初始化完成（耗时：${getFormatTimeText(Date.now() - startTime)}）`);
+      log_info(`📁 系统部署目录已创建于：${getUnderlineText(SYSTEM_DEPLOY_DIR)}`);
+    } else {
+      spinner.text = '正在更新已有仓库';
+      await execa('git', ['-C', SYSTEM_DEPLOY_DIR, 'pull']);
+      spinner.succeed(`代码更新完成（耗时：${getFormatTimeText(Date.now() - startTime)}）`);
+      log_info(`📁 系统部署目录更新于：：${getUnderlineText(SYSTEM_DEPLOY_DIR)}`);
+    }
+  } catch (error) {
+    spinner.fail('初始化失败');
+    throw new Error(`初始化失败: ${error.stderr}`);
+  }
+}
+
+// 构建部署流程
+async function buildAndDeploy(deployProjects) {
+  try {
+    // 批量部署执行器
+    const total_timer = Date.now();
+    for (const project of deployProjects) {
+      const timer = Date.now();
+      log_info(`🚀 开始部署项目 ${project}`);
+      // 动态构建命令
+      await execa('npm', ['run', 'build'], {
+        stdio: 'inherit',
+        cwd: path.resolve(process.cwd(), 'apps', project),
+      });
+      // 文件同步
+      const distPath = path.resolve(process.cwd(), 'dist', project);
+      const targetPath = path.resolve(SYSTEM_DEPLOY_DIR, 'dist', project);
+      fs.emptyDirSync(targetPath);
+      fs.copySync(distPath, targetPath);
+      log_info(`⏱  构建${project}耗时: ${getFormatTimeText(Date.now() - timer)}`);
+    }
+    log_info(`⏱  构建总耗时: ${getFormatTimeText(Date.now() - total_timer)}`);
+    await execa('git', ['-C', SYSTEM_DEPLOY_DIR, 'add', '.']);
+    await execa('git', ['-C', SYSTEM_DEPLOY_DIR, 'commit', '-m', 'chore: auto deploy']);
+    await execa('git', ['-C', SYSTEM_DEPLOY_DIR, 'push']);
+
+    const { apiUrl } = await fs.readJSON(path.join(process.cwd(), 'project.json'));
+    log_success(`✅ 成功部署 ${deployProjects.length} 个项目！请移步 ${apiUrl} 自行检测。`);
+  } catch (error) {
+    throw new Error(`部署流程异常: ${error.message}`);
+  }
+}

package/bin/commands/run.js

@@ -0,0 +1,89 @@
+import path from 'path';
+import { execa } from 'execa';
+import { Command } from 'commander';
+import fs from 'fs-extra';
+import inquirer from 'inquirer';
+
+import { log_info, log_error, getInquirerOperationText } from '../lib/logger.js';
+import { checkTargetDir, getProjects } from '../lib/dir.js';
+
+export default function () {
+  const command = new Command('run');
+
+  command.description('运行指定项目').action(async () => {
+    try {
+      // 校验项目根目录是否合法
+      if (!checkTargetDir(process.cwd())) {
+        log_error('请在 HRP3.0 项目根目录下运行此命令！');
+        return;
+      }
+
+      // 项目根目录
+      const appsDir = path.resolve(process.cwd(), 'apps');
+
+      // 获取项目列表
+      const projects = await getProjects(appsDir);
+
+      // 交互选择项目
+      const answer = await inquirer.prompt([
+        {
+          type: 'rawlist',
+          name: 'runstyle',
+          message: `请选择项目运行方式：` + getInquirerOperationText('list'),
+          default: 1,
+          choices: [
+            { name: '方式1：运行所有项目', value: 0 },
+            { name: '方式2：运行指定项目', value: 1 },
+          ],
+        },
+        {
+          type: 'checkbox',
+          name: 'project',
+          message: '请选择要运行的项目：' + getInquirerOperationText('checkbox'),
+          when: (answers) => answers.runstyle == 1,
+          choices: projects.map((p) => ({
+            checked: p.name === 'core' || p.name === 'mw',
+            name: `${p.name} (端口号: ${p.port || '未配置'})`,
+            value: p,
+          })),
+        },
+      ]);
+
+      // 运行项目
+      if (answer.runstyle === 0) runProject(projects, appsDir);
+      if (answer.runstyle === 1 && answer.project) runProject(answer.project, appsDir);
+    } catch (error) {
+      log_error(error.message);
+      process.exit(1);
+    }
+  });
+
+  return command;
+}
+
+// 运行项目
+function runProject(projects = [], appsDir) {
+  projects.forEach((project) => {
+    const projectName = project.name;
+    if (projectName) {
+      const projectPath = path.join(appsDir, projectName);
+      if (!fs.existsSync(projectPath)) {
+        throw new Error(`项目 ${projectName} 不存在`);
+      }
+      // 准备运行命令
+      const command = 'npm run dev';
+      // 执行命令
+      log_info(`🚀 启动项目 ${projectName}...`);
+      const subprocess = execa(command, {
+        cwd: projectPath,
+        stdio: 'inherit',
+        env: {
+          NODE_ENV: 'development',
+        },
+      });
+      subprocess.on('exit', (code) => {
+        if (code !== 0) log_error(`项目 ${projectName} 异常退出 (CODE: ${code})`);
+      });
+    }
+  });
+}

package/bin/lib/const.js

@@ -1 +1,13 @@
 export const LOWEST_NODE_VERSION = '18.0.0'; // 最低的 node 版本
+
+// inquirer 操作信息提示文本
+export const INQUIRER_OPERATION_TEXT = {
+  list: {
+    prefix: '操作：',
+    actions: ['↑↓ 导航', '回车键 ↩ 确认'],
+  },
+  checkbox: {
+    prefix: '操作：',
+    actions: ['↑↓ 导航', '空格键 -> 选择', 'a 全选', 'i 反选', '回车键 ↩ 确认'],
+  },
+};

package/bin/lib/dir.js

@@ -0,0 +1,36 @@
+import fs from 'fs-extra';
+import path from 'path';
+
+// 获取 apps 目录下，所有有效项目
+export async function getProjects(appsDir) {
+  return fs
+    .readdirSync(appsDir)
+    .filter((name) => {
+      const projectPath = path.join(appsDir, name);
+      return fs.existsSync(path.join(projectPath, 'package.json'));
+    })
+    .map((name) => {
+      const pkgPath = path.join(appsDir, name, 'package.json');
+      const pkg = fs.readJSONSync(pkgPath);
+      return {
+        name,
+        port: pkg.devServer?.port || 3000,
+        scripts: pkg.scripts || {},
+      };
+    });
+}
+
+// 检查 root 根目录是否存在
+export function checkTargetDir(currentPath) {
+  const monoDirs = ['apps', 'packages'];
+  const conflictDirs = monoDirs
+    .map((dir) => ({
+      name: dir,
+      path: path.join(currentPath, dir),
+      exists: fs.existsSync(path.join(currentPath, dir)),
+    }))
+    .filter((item) => item.exists)
+    .map((item) => item.name);
+
+  return conflictDirs.join(',') == monoDirs.join(',');
+}

package/bin/lib/logger.js

@@ -1,4 +1,6 @@
 import chalk from 'chalk';
+import { INQUIRER_OPERATION_TEXT } from './const.js';
+
 const LOG_TYPES = {
   success: {
     label: '成功',
@@ -35,3 +37,22 @@ export const log_info = (msg, label) => log('info', msg, label); // 保持向后
 export function printError(err, label) {
   log_error(err instanceof Error ? err.message : err, label);
 }
+
+// 获取 inquirer 操作信息提示文本
+export const getInquirerOperationText = (type) =>
+  chalk.hex('#2ed573')(
+    [INQUIRER_OPERATION_TEXT[type].prefix].concat(INQUIRER_OPERATION_TEXT[type].actions).join(' | ')
+  );
+
+// 获取分钟信息文本
+export function getFormatTimeText(time) {
+  const totalSeconds = Math.floor(time / 1000);
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return [minutes > 0 && `${minutes}分钟`, seconds > 0 && `${seconds}秒`].filter(Boolean).join(' ');
+}
+
+// 获取下划线信息文本
+export function getUnderlineText(text) {
+  return chalk.cyan.underline(text);
+}

package/bin/lib/utils.js

@@ -13,17 +13,3 @@ export const projectRoot = path.resolve(__dirname, '../../');
 // ES6 自定义 require 函数，用于读取 .json 文件信息
 // import.meta.url 的路径基准点是 当前文件所在目录（即 bin/lib/index.js）
 export const require = createRequire(projectRoot + '/');
-
-// 初始化 TS 编译器
-// require('ts-node').register({
-//   transpileOnly: true, // 禁用类型检查（提升性能）
-//   files: ['**/*.config.ts'], // 只编译配置文件
-//   compilerOptions: {
-//     moduleResolution: 'NodeNext',
-//     module: 'NodeNext',
-//   },
-// });
-// // 支持 .ts 扩展名注册 (针对旧版 Node)
-// require.extensions['ts'] = function (module, filePath) {
-//   module._compile(require('fs').readFileSync(filePath, 'utf8'), filePath);
-// };

package/bin/main.js

@@ -1,8 +1,10 @@
 #!/usr/bin/env node
-import configureCreateCommand from './commands/create.js';
 import { require } from './lib/utils.js';
 import { LOWEST_NODE_VERSION } from './lib/const.js';
 import { log_error, log_warning } from './lib/logger.js';
+import configureCreateCommand from './commands/create.js';
+import configureRunCommand from './commands/run.js';
+import configureDeployCommand from './commands/deploy.js';
 
 // 外部依赖
 import semver from 'semver';
@@ -36,6 +38,8 @@ function handleProgramCommand() {
 
   // 注册子命令
   program.addCommand(configureCreateCommand());
+  program.addCommand(configureRunCommand());
+  program.addCommand(configureDeployCommand());
 
   // 解析命令行参数
   program.parse(program.argv);

package/bin/templates/default/src/App.vue

@@ -1,12 +1,34 @@
 <template>
   <div class="app-container">
-    <Home />
-    <router-view></router-view>
+    <router-view v-slot="{ Component, route }">
+      <keep-alive>
+        <component :is="Component" v-if="route.meta.keepAlive" :key="route.path" />
+      </keep-alive>
+      <component :is="Component" v-if="!route.meta.keepAlive" :key="route.path" />
+    </router-view>
   </div>
 </template>
 
-<script setup scoped>
-import Home from './views/Home.vue';
+<script setup>
+import { onMounted, onUnmounted } from 'vue';
+import { useRouter } from 'vue-router';
+
+const router = useRouter();
+
+// 事件处理器保持引用便于卸载
+const handleRouterChange = (path) => {
+  router.push(path);
+};
+onMounted(() => {
+  const { props, bus } = window.$wujie;
+  // 第一次进入页面，主应用路由信息发送给子应用
+  if (props.routeName) handleRouterChange(props.routeName);
+
+  // 持续监听子应用路由信息变化
+
+  if (bus) bus.$on('<%= projectName %>-router-change', handleRouterChange);
+});
+onUnmounted(() => window.$wujie?.bus.$off('<%= projectName %>-router-change', handleRouterChange));
 </script>
 
 <style scoped>

package/bin/templates/default/src/router/index.js

@@ -1,5 +1,5 @@
 import { createRouter, createWebHashHistory } from 'vue-router';
-const basename = process.env.NODE_ENV === 'production' ? '/mw/' : '';
+const basename = process.env.NODE_ENV === 'production' ? '/<%= projectName %>/' : '';
 
 const routes = [
   // {

package/bin/templates/default/vite.config.js

@@ -1,6 +1,9 @@
 import { defineConfig } from 'vite';
 import vue from '@vitejs/plugin-vue';
-const ProxyURL = process.env.VITE_API_BASE_URL;
+import path from 'path';
+import fs from 'fs';
+const projectConfig = JSON.parse(fs.readFileSync(path.resolve(process.cwd(), '../../', 'project.json'), 'utf-8'));
+const ProxyURL = projectConfig.apiUrl || 'https://hrp3.wytdev.com';
 
 export default defineConfig({
   base: './',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wyt-cli",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "HRP3.0 项目命令行工具",
   "main": "index.js",
   "bin": {
@@ -12,7 +12,9 @@
   },
   "type": "module",
   "scripts": {
-    "publish": "npm version patch && npm publish"
+    "login": "npm login",
+    "patch": "npm version patch",
+    "publish": "npm publish"
   },
   "keywords": [],
   "author": "",
@@ -22,6 +24,7 @@
     "chalk": "^5.6.2",
     "commander": "^14.0.2",
     "ejs": "^4.0.1",
+    "execa": "^9.6.1",
     "fs-extra": "^11.3.3",
     "glob": "^13.0.0",
     "inquirer": "^13.2.0",

package/bin/dist/default/index.html

@@ -1,13 +0,0 @@
-<!doctype html>
-<html lang="zh-CN">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>test</title>
-  </head>
-
-  <body>
-    <div id="app"></div>
-    <script type="module" src="./src/main.js"></script>
-  </body>
-</html>

package/bin/dist/default/package.json

@@ -1,28 +0,0 @@
-{
-  "name": "test",
-  "private": true,
-  "version": "1.0.0",
-  "type": "module",
-  "description": "个人工作台",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "preview": "vite preview"
-  },
-  "dependencies": {
-    "@element-plus/icons-vue": "^2.3.1",
-    "@wyt/components": "workspace:^",
-    "@wyt/utils": "workspace:^",
-    "element-plus": "^2.10.2",
-    "pinia": "^2.0.28",
-    "sass": "^1.89.2",
-    "vue": "^3.5.13",
-    "vue-router": "^4.5.0",
-    "wujie-polyfill": "^1.1.3",
-    "wujie-vue3": "^1.0.24"
-  },
-  "devDependencies": {
-    "@vitejs/plugin-vue": "^5.2.1",
-    "vite": "^6.0.5"
-  }
-}

package/bin/dist/default/src/App.vue

@@ -1,20 +0,0 @@
-<template>
-  <div class="app-container">
-    <Home />
-    <router-view></router-view>
-  </div>
-</template>
-
-<script setup scoped>
-import Home from './views/Home.vue';
-</script>
-
-<style scoped>
-.app-container {
-  width: 100%;
-  height: calc(100vh - 70px);
-  background-color: #fff;
-  overflow: auto;
-  scrollbar-width: thin;
-}
-</style>

package/bin/dist/default/src/api/index.js

@@ -1,15 +0,0 @@
-/**
- * API 接口定义文件
- *
- */
-import { http } from '@wyt/utils';
-
-export const api_test = (data) => {
-  return http({
-    // method: 'POST',
-    // url: '/finweb/?svr=FWS_20002',
-    data,
-  });
-};
-
-export default {};

package/bin/dist/default/src/component/TestComponent.vue

@@ -1,5 +0,0 @@
-<template>
-  <p>这是一个测试组件</p>
-</template>
-
-<script name="TestComponent" setup></script>

package/bin/dist/default/src/main.js

@@ -1,20 +0,0 @@
-import { createApp } from 'vue';
-import { createPinia } from 'pinia';
-import App from './App.vue';
-import router from './router';
-import './style.css';
-import ElementPlus from 'element-plus';
-import zhCn from 'element-plus/dist/locale/zh-cn.mjs';
-import 'element-plus/dist/index.css';
-import wytComponents from '@wyt/components';
-import '@wyt/components/dist/themes/index.css';
-import '@wyt/components/dist/index.css';
-import '@wyt/components/dist/assets/iconfont/iconfont.css';
-import '@wyt/form-designer/dist/style.css';
-import { initAndListenTheme } from '@wyt/utils';
-
-initAndListenTheme();
-
-const app = createApp(App);
-
-app.use(createPinia()).use(wytComponents).use(router).use(ElementPlus, { locale: zhCn }).mount('#app');

package/bin/dist/default/src/router/index.js

@@ -1,23 +0,0 @@
-import { createRouter, createWebHashHistory } from 'vue-router';
-const basename = process.env.NODE_ENV === 'production' ? '/mw/' : '';
-
-const routes = [
-  // {
-  //   path: '*****',
-  //   name: '*****',
-  // },
-
-  // 404 路由配置
-  {
-    path: '/:pathMatch(.*)*',
-    name: 'NotFound',
-    component: () => import('../views/NotFound.vue'),
-  },
-];
-
-const router = createRouter({
-  history: createWebHashHistory(basename),
-  routes,
-});
-
-export default router;

package/bin/dist/default/src/style.css

@@ -1,20 +0,0 @@
-* {
-  margin: 0;
-  padding: 0;
-  box-sizing: border-box;
-}
-
-ul {
-  list-style: none;
-}
-
-/* 重置公共样式部分 */
-.drawer-header-box {
-  padding: 0 !important;
-  margin: 0 !important;
-}
-
-.drawer-body-box {
-  padding: 0 !important;
-  margin: 0 !important;
-}

package/bin/dist/default/src/views/Home.vue

@@ -1,8 +0,0 @@
-<template>
-  <h1>这是一个测试页面</h1>
-  <TestComponent />
-</template>
-
-<script setup scoped>
-import TestComponent from './components/TestComponent.vue';
-</script>

package/bin/dist/default/src/views/NotFound.vue

@@ -1,13 +0,0 @@
-<template>
-  <div class="not-found">
-    <h1>404</h1>
-    <h2>您访问的页面不存在</h2>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.not-found {
-  text-align: center;
-  padding: 50px;
-}
-</style>

package/bin/dist/default/vite.config.js

@@ -1,51 +0,0 @@
-import { defineConfig } from 'vite';
-import vue from '@vitejs/plugin-vue';
-const ProxyURL = process.env.VITE_API_BASE_URL;
-
-export default defineConfig({
-  base: './',
-  build: {
-    outDir: '../../dist/test',
-    emptyOutDir: true, // 清空输出目录
-  },
-  server: {
-    port: '6003',
-    open: false,
-    proxy: {
-      // 设置代理
-      '/finweb': {
-        target: ProxyURL,
-        changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/finweb/, '/finweb'),
-        // 添加 CORS 头
-        configure: (proxy) => {
-          proxy.on('proxyRes', (proxyRes, req, res) => {
-            res.setHeader('Access-Control-Allow-Origin', req.headers.origin || '*');
-            res.setHeader('Access-Control-Allow-Credentials', 'true');
-          });
-        },
-      },
-    },
-    cors: true,
-  },
-  resolve: {
-    dedupe: ['vue', 'pinia', 'element-plus'],
-    alias: {
-      '@': '/src',
-      '@hooks': '/src/hooks/index.js',
-    },
-  },
-  plugins: [
-    vue({
-      script: {
-        defineModel: true,
-        propsDestructure: true,
-      },
-    }),
-  ],
-  css: {
-    preprocessorOptions: {
-      scss: {},
-    },
-  },
-});