Merge branch 'dev' of https://github.com/wll8/mockm into dev

wll8 · wll8 · commit ee55f7370719 · 2025-07-23T11:11:22.000+08:00
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -15,53 +15,6 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  # 构建文档 - 使用现有 docker-compose.yml
-  build-docs:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Build documentation using docker-compose
-        run: |
-          # 检查并使用合适的 docker compose 命令
-          if command -v docker-compose &> /dev/null; then
-            DOCKER_COMPOSE="docker-compose"
-          else
-            DOCKER_COMPOSE="docker compose"
-          fi
-          
-          # 使用现有的 docker-compose.yml 构建 mockm-dev 服务
-          $DOCKER_COMPOSE build mockm-dev
-          
-          # 运行文档构建命令
-          $DOCKER_COMPOSE run --rm mockm-dev \
-            sh -c "git config --global --add safe.directory /workspace && cd doc && rm -rf .vuepress/dist && GITHUB_ACTIONS=true pnpm run build"
-
-      - name: Copy test resources
-        run: |
-          mkdir -p doc/.vuepress/dist/case
-          cp -r test/res/* doc/.vuepress/dist/case/ || true
-
-      - name: Upload Pages artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: doc/.vuepress/dist
-
-  # 部署到 GitHub Pages
-  deploy-pages:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    needs: build-docs
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
-
   # 构建和发布包 - 使用现有 docker-compose.yml
   build-and-release:
     runs-on: ubuntu-latest
@@ -87,9 +40,15 @@ jobs:
           $DOCKER_COMPOSE run --rm mockm-client \
             sh -c "cd client && yarn build"
           
-          # 构建服务端包
+          # 运行测试并生成报告
           $DOCKER_COMPOSE run --rm mockm-dev \
-            sh -c "git config --global --add safe.directory /workspace && cd release && pnpm run build"
+            sh -c "npm run test:dev"
+
+          # 构建生产内容：包、文档、复制测试报告
+          $DOCKER_COMPOSE run --rm \
+            -e GITHUB_ACTIONS=true \
+            mockm-dev \
+            sh -c "git config --global --add safe.directory /workspace && npm run build:serve"
 
       - name: Get package info
         run: |
@@ -98,9 +57,10 @@ jobs:
           echo "PACKAGE_NAME=mockm" >> $GITHUB_ENV
 
       - name: Create Release
-        uses: softprops/action-gh-release@v1
+        uses: mini-bomba/create-github-release@v1.2.0
         with:
-          tag_name: v${{ env.VERSION }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag: v${{ env.VERSION }}
           name: Release v${{ env.VERSION }}
           body: |
             ## Changes in v${{ env.VERSION }}
@@ -115,12 +75,11 @@ jobs:
             
             ### Download
             - [mockm-${{ env.VERSION }}.tgz](https://github.com/${{ github.repository }}/releases/download/v${{ env.VERSION }}/mockm-${{ env.VERSION }}.tgz)
-          draft: false
           prerelease: false
+          draft: false
           files: |
             dist/*.tgz
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          clear_attachments: true
 
       - name: Cleanup Docker resources
         if: always()
@@ -134,3 +93,20 @@ jobs:
           
           $DOCKER_COMPOSE down --volumes --remove-orphans || true
           docker system prune -f || true
+
+      - name: Upload Pages artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: doc/.vuepress/dist
+
+  # 部署到 GitHub Pages
+  deploy-pages:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build-and-release
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/README.md b/README.md
@@ -3,7 +3,8 @@
 
 <p align="center">
   <a href="https://github.com/wll8/mockm/blob/dev/README.md">中文</a> |
-  <a href="https://github.com/wll8/mockm/blob/dev/README.en.md">English</a>
+  <a href="https://github.com/wll8/mockm/blob/dev/README.en.md">English</a> |
+  <a href="https://wll8.github.io/mockm/">文档</a>
 </p>
 <p align="center">
   <a href="https://www.npmjs.com/package/mockm"><img src="https://img.shields.io/npm/dt/mockm" alt="Downloads"></a>
diff --git a/doc/.vuepress/config.js b/doc/.vuepress/config.js
@@ -1,12 +1,17 @@
 const path = require('path')
 
 // 检测是否为GitHub Pages环境
-const isGitHubPages = process.env.GITHUB_ACTIONS === 'true' || process.env.NODE_ENV === 'github'
+const isGitHubPages = process.env.GITHUB_ACTIONS === 'true'
+
+console.log('VuePress Build Environment:', {
+  GITHUB_ACTIONS: process.env.GITHUB_ACTIONS,
+  isGitHubPages: isGitHubPages
+})
 
 // 统一的链接替换函数
 function replaceHongqiyeLinks(url) {
   if (!url || typeof url !== 'string') return url
-  return url.replace(/https?:\/\/(www\.)?hongqiye\.com\/doc\/mockm/g, '/mockm')
+  return url.replace(/https?:\/\/(www\.)?hongqiye\.com\/doc\/mockm/g, '')
 }
 
 // 基础配置
@@ -97,7 +102,7 @@ const baseConfig = {
     nav: [
       { text: '版本 v1.1.26', link: '/' },
       { text: '配置项', link: '/config/option.md' },
-      { text: '更多示例', link: isGitHubPages ? '/mockm/case/' : 'https://www.hongqiye.com/doc/mockm/case/' },
+      { text: '更多示例', link: isGitHubPages ? '/case/' : 'https://www.hongqiye.com/doc/mockm/case/' },
       { text: 'mockjs', link: 'https://wll8.github.io/mockjs-examples/' },
       // { text: 'QQ答疑群', link: 'https://qm.qq.com/cgi-bin/qm/qr?k=4rvOknpHyqs5wd3c2kEt34Eysx83djEZ&jump_from=webapi' },
       { text: 'github', link: 'https://github.com/wll8/mockm' },
diff --git a/doc/dev/change_log.md b/doc/dev/change_log.md
@@ -9,6 +9,30 @@
 
 :::
 
+## 2025 年 07 月
+- 🔧更新辅助工具: 
+  - 添加 Docker 支持和容器化部署
+  - 添加 GitHub Actions 自动化部署和发布
+  - 切换到 pnpm 包管理器，提升安装和构建速度
+  - 优化 VuePress 配置，修复 GitHub Pages 部署问题
+- 🐛修复缺陷: 
+  - 修复跨盘符数据存储兼容性问题
+  - 优化代理功能内存使用
+- ✨添加功能: 
+  - 支持使用 Docker Compose 进行开发和部署
+  - 自动化版本发布和文档部署流程
+- 📝更新文档: 
+  - 添加项目实现原理文档
+
+## 2025 年 06 月
+- 🔧更新辅助工具: 
+  - 更新项目依赖版本
+
+## 2025 年 04 月
+- 🧪测试优化: 
+  - 修复测试用例中的 DNS 解析问题
+  - 优化测试用例的稳定性
+
 ## 2025 年 03 月
 - 🔧更新辅助工具: 
   - 使用 httpolyglot@2.2.2
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   mockm-client:
     build:
diff --git a/release/gulpfile.js b/release/gulpfile.js
@@ -42,7 +42,7 @@ gulp.task(`pushDoc`, (cb) => { // 发布文档
   const cmdList = `
     cd ../ && npm run doc:build
     cd ../ && npx shx cp -r test/res/ ./doc/.vuepress/dist/case
-    cd ../doc/.vuepress/ && scp -r dist/** root@hongqiye.com:/app/mockm/mm/www/doc/mockm/
+    echo cd ../doc/.vuepress/ && scp -r dist/** root@hongqiye.com:/app/mockm/mm/www/doc/mockm/
   `.split(`\n`).map(item => item.trim()).filter(item => item)
   cmdList.forEach(cmd => {
     console.log(`run: ${cmd}`)
@@ -143,6 +143,7 @@ gulp.task(
   gulp.series(
     `clear`,
     gulp.parallel(`copyServer`),
+    `pushDoc`,
     gulp.series(`uglify`, `setBuildInfo`, `tar`, done => done())
   ),
 )
diff --git a/release/package.json b/release/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "mockm 发布脚本",
   "scripts": {
-    "build": "gulp"
+    "build": "npx gulp"
   },
   "keywords": [],
   "author": "",

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-version: '3.8'`
`2`		`-`
`3`	`1`	`services:`
`4`	`2`	`mockm-client:`
`5`	`3`	`build:`