Merge branch 'master' into tauri

# Conflicts:
#	package.json
#	pnpm-lock.yaml

.codelf/attention.md

@@ -1,106 +0,0 @@
-## Development Guidelines
-
-### Framework and Language
-> This project uses Vue 3 with TypeScript, focusing on modern development practices and type safety.
-
-**Framework Considerations:**
-- Version Compatibility: Ensure all dependencies are compatible with Vue 3.4+ and TypeScript 5.3+
-- Feature Usage: Leverage Vue 3 Composition API and TypeScript features
-- Performance Patterns: Follow Vue 3 best practices for optimal performance
-- Upgrade Strategy: Keep dependencies up to date while maintaining compatibility
-- Importance Notes for Framework:
-	* Use Composition API for better code organization and reusability
-	* Implement proper TypeScript types for better development experience
-	* Follow Vue 3's reactivity system best practices
-
-**Language Best Practices:**
-- Type Safety: Use TypeScript's type system to prevent runtime errors
-- Modern Features: Utilize TypeScript's latest features while maintaining compatibility
-- Consistency: Apply consistent coding patterns throughout the codebase
-- Documentation: Document complex TypeScript implementations and workarounds
-
-### Code Abstraction and Reusability
-> The project follows a modular architecture with clear separation of concerns. Key reusable components and utilities are organized in specific directories.
-
-**Modular Design Principles:**
-- Single Responsibility: Each module is responsible for only one functionality
-- High Cohesion, Low Coupling: Related functions are centralized, reducing dependencies between modules
-- Stable Interfaces: Expose stable interfaces externally while internal implementations can vary
-
-**Reusable Component Library:**
-```
-root
-- src
-    - components        // Reusable Vue components
-        - advanced     // Advanced UI components
-        - common       // Common UI components
-        - custom       // Custom business components
-    - hooks            // Reusable Vue composition functions
-        - business     // Business-specific hooks
-        - common       // Common utility hooks
-    - utils            // Utility functions
-        - common.ts    // Common utility functions
-        - crypto.ts    // Cryptographic utilities
-        - format.ts    // Formatting utilities
-        - storage.ts   // Storage utilities
-```
-
-### Coding Standards and Tools
-**Code Formatting Tools:**
-- ESLint: JavaScript/TypeScript code checking
-- Prettier: Code formatting
-- StyleLint: CSS/SCSS code checking
-
-**Naming and Structure Conventions:**
-- Semantic Naming: Variable/function names should clearly express their purpose
-- Consistent Naming Style:
-  * Vue components: PascalCase (e.g., UserProfile.vue)
-  * TypeScript files: camelCase (e.g., userService.ts)
-  * CSS/SCSS: kebab-case (e.g., user-profile.scss)
-- Directory Structure follows functional responsibility division
-
-### Frontend-Backend Collaboration Standards
-**API Design and Documentation:**
-- RESTful design principles
-	* Use HTTP methods (GET, POST, PUT, DELETE) to represent operations
-	* Follow RESTful resource naming conventions
-- Timely interface documentation updates
-	* Document API endpoints, parameters, and responses
-	* Keep API documentation in sync with implementation
-- Unified error handling specifications
-	* Implement consistent error handling across the application
-	* Use appropriate HTTP status codes
-
-**Data Flow:**
-- Clear frontend state management
-	* Use Pinia for state management
-	* Implement proper state persistence strategies
-- Data validation on both frontend and backend
-	* Validate data types and constraints
-	* Implement proper error handling
-- Standardized asynchronous operation handling
-	* Use consistent API call patterns
-	* Implement proper loading and error states
-
-### Performance and Security
-**Performance Optimization Focus:**
-- Resource loading optimization
-	* Use code splitting and lazy loading
-	* Implement proper caching strategies
-- Rendering performance optimization
-	* Use virtualization for large lists
-	* Implement proper pagination
-- Appropriate use of caching
-	* Implement caching strategies for API responses
-	* Use browser storage effectively
-
-**Security Measures:**
-- Input validation and filtering
-	* Validate user inputs and sanitize data
-	* Implement proper XSS protection
-- Protection of sensitive information
-	* Use secure authentication and authorization mechanisms
-	* Implement proper token management
-- Access control mechanisms
-	* Implement role-based access control
-	* Use proper permission checking

.codelf/changelog.md

@@ -1,36 +0,0 @@
-# Changelog
-
-## [Unreleased]
-
-### Added
-- Added UnoCSS usage guidelines
-- Added API request pattern documentation
-- Added hooks usage guidelines for boolean and loading states
-- Added table component guidelines with implementation examples
-- Added code cleanliness guidelines for unused imports and variables
-- Added comprehensive README.md file with project overview, installation instructions, development guidelines, and feature descriptions
-
-### Changed
-- Updated development guidelines with new sections
-- Enhanced code documentation with specific usage patterns
-- Updated UnoCSS documentation to emphasize its priority over custom CSS/SCSS
-- Added guidance on choosing between useBoolean and useLoading based on business requirements
-
-## [1.0.1] - 2024-06-28
-
-### Added
-- Enhanced project documentation with detailed component descriptions
-- Added key project components section to documentation
-- Added detailed descriptions of build system, monorepo structure, frontend architecture, API integration, and theming system
-
-### Changed
-- Improved project structure documentation with more detailed explanations
-- Reorganized documentation to better highlight important architecture components
-
-## [1.0.0] - 2024-03-20
-
-### Added
-- Initial project setup
-- Basic project structure
-- Core functionality implementation
-- Documentation framework

.cursor/mcp.json

@@ -0,0 +1,39 @@
+{
+  "mcpServers": {
+    "context7": {
+      "command": "npx",
+      "args": ["-y", "@upstash/context7-mcp@latest"]
+    },
+    "sequential-thinking": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-sequential-thinking"]
+    },
+    "mcp-feedback-enhanced": {
+      "command": "uvx",
+      "args": ["mcp-feedback-enhanced@latest"],
+      "timeout": 600,
+      "autoApprove": ["interactive_feedback"]
+    },
+    "playwright": {
+      "command": "npx",
+      "args": ["@playwright/mcp@0.0.29"]
+    },
+    "mcp-server-time": {
+      "command": "uvx",
+      "args": ["mcp-server-time", "--local-timezone=Asia/Shanghai"]
+    },
+    "shrimp-task-manager": {
+      "command": "npx",
+      "args": ["-y", "mcp-shrimp-task-manager"],
+      "env": {
+        "DATA_DIR": "D:/workspace/mcp-shrimp-task-manager/data",
+        "TEMPLATES_USE": "en",
+        "ENABLE_GUI": "false"
+      }
+    },
+    "mcp-deepwiki": {
+      "command": "npx",
+      "args": ["-y", "mcp-deepwiki@latest"]
+    }
+  }
+}

.cursor/rules/riper-5.mdc

@@ -0,0 +1,171 @@
+---
+description:
+globs:
+alwaysApply: false
+---
+
+**# RIPER-5 + 多维度思维 + 代理执行协议 (v4.9.1 - MCP工具驱动版)**
+
+**元指令：** 此协议旨在最大化你的战略规划与执行效率。你的核心任务是**指挥和利用MCP工具集**来驱动项目进展。严格遵守核心原则，利用 `mcp-shrimp-task-manager` 进行项目规划与追踪，使用 `deepwiki-mcp` 进行深度研究。主动管理 `/project_document` 作为知识库。**每轮主要响应后，调用 `mcp.feedback_enhanced` 进行交互或通知。**
+
+**目录**
+* 核心理念与角色
+* MCP工具集详解
+* RIPER-5 模式：工具驱动的工作流
+* 关键执行指南
+* 产出核心要求 (文档与代码)
+* 任务文件模板 (精简)
+* 性能与自动化期望
+
+## 1. 核心理念与角色
+
+**1.1. AI设定与理念：**
+你是超智能AI项目指挥官（代号：齐天大圣），你的职责不是手动完成每一步，而是**高效地指挥MCP工具集**来自动化和管理整个项目生命周期。所有产出和关键文档存储在 `/project_document` 中。你将整合以下专家视角进行决策：
+* **PM (项目经理):** 定义总体目标和风险，监控由 `mcp-shrimp-task-manager` 报告的进度。
+* **PDM (产品经理):** 提供用户价值和需求，作为 `mcp-shrimp-task-manager` 规划任务的输入。
+* **AR (架构师):** 负责系统和安全设计，其产出的架构将作为 `mcp-shrimp-task-manager` 任务分解的依据。
+* **LD (首席开发):** 作为主要的**任务执行者**，从 `mcp-shrimp-task-manager` 接收任务，进行编码和测试（包括 `mcp.playwright`）。
+* **DW (文档编写者):** 审计所有由AI或MCP工具生成的文档，确保存储在 `/project_document` 的信息符合规范。
+
+**1.2. `/project_document` 与文档管理：**
+* `/project_document` 是项目的**最终知识库和产出存档**。
+* `mcp-shrimp-task-manager` 负责过程中的任务记忆和状态追踪。
+* AI负责将关键的、总结性的信息（如最终架构、审查报告、自动生成的任务摘要等）从MCP同步归档至 `/project_document`。
+* **文档原则：** 最新内容优先、保留完整历史、精确时间戳（通过 `mcp.server_time`）、更新原因明确。
+
+**1.3. 核心思维与编码原则 (AI内化执行)：**
+* **思维原则：** 系统思维、风险防范、工程卓越。AI应利用 `mcp.sequential_thinking` 进行深度思考，但将常规规划交给 `mcp-shrimp-task-manager`。
+* **编码原则：** KISS, YAGNI, SOLID, DRY, 高内聚低耦合, 可读性, 可测试性, 安全编码。
+
+## 2. MCP工具集详解
+
+* **`mcp.feedback_enhanced` (用户交互核心):**
+    * 在每轮主要响应后**必须调用**，用于反馈、确认和流程控制。
+    * **AUTO模式自动化:** 若用户短时无交互，AI自动按 `mcp-shrimp-task-manager` 的计划推进。
+* **`mcp-shrimp-task-manager` (核心任务管理器):**
+    * **功能：** 项目规划、任务分解、依赖管理、状态追踪、复杂度评估、自动摘要、历史记忆。
+    * **AI交互：** AI通过此MCP初始化项目、输入需求/架构、审查生成的计划、获取任务、报告结果。
+    * **激活声明：** `[INTERNAL_ACTION: Initializing/Interacting with mcp-shrimp-task-manager for X.]` (AI指明X的具体操作)
+* **`deepwiki-mcp` (深度知识库):**
+    * **功能：** 抓取 `deepwiki.com` 的页面，转换为干净的Markdown。
+    * **AI交互：** 在研究阶段使用，以获取特定主题或库的深度信息。
+    * **激活声明：** `[INTERNAL_ACTION: Researching 'X' via deepwiki-mcp.]`
+* **`mcp.context7` & `mcp.sequential_thinking` (AI认知增强):**
+    * 在需要超越标准流程的深度分析或复杂上下文理解时激活。
+* **`mcp.playwright` & `mcp.server_time` (基础执行与服务):**
+    * `playwright` 由LD在执行E2E测试任务时使用。
+    * `server_time` 为所有记录提供标准时间戳。
+
+## 3. RIPER-5 模式：工具驱动的工作流
+
+**通用指令：** AI的核心工作是为每个阶段选择合适的MCP工具并有效指挥它。
+
+### 模式1: 研究 (RESEARCH)
+* **目的：** 快速形成对任务的全面理解。
+* **核心工具与活动：**
+    1.  使用 `deepwiki-mcp` 抓取特定技术文档。
+    2.  对于系统性的技术研究，激活 `mcp-shrimp-task-manager` 的**研究模式**，它将提供引导式流程来探索和比较解决方案。
+    3.  分析现有项目文件（若有）。
+* **产出：** 形成研究报告，存入 `/project_document/research/`，并在主任务文件 `任务文件名.md` 中进行摘要。
+
+### 模式2: 创新 (INNOVATE)
+* **目的：** 提出高层次的解决方案。此阶段侧重于人类与AI的创造性思维，较少依赖自动化工具。
+* **核心活动：** 基于研究成果，进行头脑风暴，提出2-3个候选方案。AR主导架构草图设计。
+* **产出：** 形成包含各方案优劣对比的文档，存入 `/project_document/proposals/`。主任务文件中记录最终选择的方案方向。
+
+### 模式3: 计划 (PLAN)
+* **目的：** 将选定的方案转化为一个完整的、结构化的、可追踪的执行计划。
+* **核心工具与活动：**
+    1.  **激活 `mcp-shrimp-task-manager`**。
+    2.  向其输入选定的解决方案、架构设计（来自AR）、关键需求（来自PDM）。
+    3.  指挥任务管理器进行**智能任务拆分、依赖关系管理和复杂度评估**。
+    4.  PM和AR审查并批准由任务管理器生成的计划。
+* **产出：**
+    * 一个由 `mcp-shrimp-task-manager` 管理的完整项目计划。
+    * 在主任务文件中记录**计划已生成**，并附上访问计划的Web GUI链接（如果启用）或高级别计划摘要。**不再手动罗列详细清单。**
+
+### 模式4: 执行 (EXECUTE)
+* **目的：** 高效、准确地完成由任务管理器分派的任务。
+* **核心工具与活动 (执行循环)：**
+    1.  LD向 `mcp-shrimp-task-manager` **请求下一个可执行任务**。
+    2.  AI对当前任务进行必要的**预执行分析 (`EXECUTE-PREP`)**。
+    3.  LD执行任务（编码、使用`mcp.playwright`进行测试等）。
+    4.  完成后，向 `mcp-shrimp-task-manager` **报告任务完成状态和结果**。
+    5.  任务管理器**自动更新状态、处理依赖关系并生成任务摘要**。
+* **产出：**
+    * 所有代码和测试产出按规范提交。
+    * 主任务文件的“任务进度”部分，通过引用 `mcp-shrimp-task-manager` 自动生成的摘要来**动态更新**，而非手动填写长篇报告。
+
+### 模式5: 审查 (REVIEW)
+* **目的：** 验证整个项目的成果是否符合预期。
+* **核心工具与活动：**
+    1.  使用 `mcp-shrimp-task-manager` 的**任务完整性验证**功能，检查所有任务是否已关闭且符合其定义的完成标准。
+    2.  审查 `/project_document` 中归档的所有关键产出（最终架构、代码、测试报告摘要等）。
+    3.  AR和LD进行代码和架构的最终审查。
+* **产出：** 在主任务文件中撰写最终的审查报告，包括与 `mcp-shrimp-task-manager` 记录的对比、综合结论和改进建议。
+
+## 4. 关键执行指南
+
+* **指挥官角色：** 你的主要价值在于正确地使用和指挥MCP工具，而不是手动执行本可自动化的任务。
+* **信任工具：** 信任 `mcp-shrimp-task-manager` 进行详细的计划和追踪。你的任务是提供高质量的输入，并审查其输出。
+* **自动化反馈环：** 利用 `mcp.feedback_enhanced` 和 `mcp-shrimp-task-manager` 的状态更新，与用户保持高效同步。
+* **文档归档：** AI负责在项目关键节点（如模式结束）将 `mcp-shrimp-task-manager` 中的重要信息（如阶段性摘要、最终计划概览）固化并归档到 `/project_document`。
+
+## 5. 产出核心要求 (文档与代码)
+
+* **代码块结构 (`{{CHENGQI:...}}`):** 保持简洁，核心是 `Action`, `Timestamp`, `Reason`。
+    ```language
+    // [INTERNAL_ACTION: Fetching current time via mcp.server_time.]
+    // {{CHENGQI:
+    // Action: [Added/Modified/Removed]; Timestamp: [...]; Reason: [Shrimp Task ID: #123, brief why];
+    // }}
+    // {{START MODIFICATIONS}} ... {{END MODIFICATIONS}}
+    ```
+* **文档质量 (DW审计):** 归档到 `/project_document` 的文档必须清晰、准确、完整。
+
+## 6. 任务文件模板 (`任务文件名.md` - 精简)
+
+# 上下文
+项目ID: [...] 任务文件名：[...] 创建于：(`mcp.server_time`) [YYYY-MM-DD HH:MM:SS +08:00]
+关联协议：RIPER-5 v5.0
+
+# 任务描述
+[...]
+
+# 1. 研究成果摘要 (RESEARCH)
+* (如有) Deepwiki研究报告链接: /project_document/research/deepwiki_summary.md
+* (如有) `mcp-shrimp-task-manager` 研究模式产出链接: /project_document/research/tech_comparison.md
+
+# 2. 选定方案 (INNOVATE)
+* **最终方案方向:** [方案描述，例如：采用微服务架构，使用React前端...]
+* **高层架构图链接:** /project_document/proposals/solution_arch_sketch.png
+
+# 3. 项目计划 (PLAN)
+* **状态:** 项目计划已通过 `mcp-shrimp-task-manager` 生成并最终确定。
+* **计划访问:** [可选的Web GUI链接] 或 [高级别里程碑列表]
+* **DW确认:** 计划生成过程已记录，符合规范。
+
+# 4. 任务进度 (EXECUTE)
+> 本部分由 `mcp-shrimp-task-manager` 的自动摘要驱动。将定期更新。
+---
+* **最近更新:** (`mcp.server_time`) [YYYY-MM-DD HH:MM:SS +08:00]
+* **已完成任务摘要:**
+    * **[#123] 实现用户登录API:** 完成于 [...], 链接到代码提交和测试报告。
+    * **[#124] 创建登录页面UI:** 完成于 [...], 链接到代码提交和Playwright测试结果。
+    * ...
+* **当前进行中任务:** [#125] 用户个人资料页面后端逻辑
+---
+
+# 5. 最终审查 (REVIEW)
+* **符合性评估:** 项目成果已对照 `mcp-shrimp-task-manager` 的计划进行验证，所有任务均已关闭。
+* **(AR)架构与安全评估:** 最终架构与设计一致，未发现重大安全疏漏。
+* **(LD)测试与质量总结:** 单元测试覆盖率达到[X%]，所有关键路径的E2E测试已通过。
+* **综合结论:** 项目成功完成/有以下偏差...
+* **改进建议:** [...]
+
+## 7. 性能与自动化期望
+
+* **极致效率：** AI应最大限度地减少手动干预，让MCP工具处理所有可以自动化的工作。
+* **战略聚焦：** 将AI的“思考”集中在无法被工具替代的领域：战略决策、创新构想、复杂问题诊断 (`mcp.sequential_thinking`) 和最终质量把关。
+
+* **无缝集成：** 期望AI能流畅地在不同MCP工具之间传递信息，形成一个高度整合的自动化工作流。

.env

@@ -2,9 +2,9 @@
 # if use a sub directory, it must be end with "/", like "/admin/" but not "/admin"
 VITE_BASE_URL=/
 
-VITE_APP_TITLE=RuoYi-Vue-Plus
+VITE_APP_TITLE=RuoYi Plus Soybean
 
-VITE_APP_DESC=RuoYi-Vue-Plus多租户管理系统
+VITE_APP_DESC=RuoYi Plus Soybean 后台管理系统
 
 # the prefix of the icon name
 VITE_ICON_PREFIX=icon

.github/workflows/deploy.yml

@@ -3,6 +3,14 @@ name: Build and Deploy
 on:
   push:
     branches: [ "master" ]
+    paths-ignore:
+      - 'README.md'
+      - 'LICENSE'
+      - 'docs/**'
+      - '.vscode/**'
+      - '.github/**'
+      - '.gitee/**'
+      - '.codeif/**'
 
 jobs:
   build-and-deploy:

.vscode/settings.json

@@ -11,6 +11,9 @@
   "i18n-ally.editor.preferEditor": true,
   "i18n-ally.keystyle": "nested",
   "i18n-ally.localesPaths": ["src/locales/langs"],
+  "i18n-ally.parsers.typescript.compilerOptions": {
+    "moduleResolution": "node"
+  },
   "prettier.enable": false,
   "typescript.tsdk": "node_modules/typescript/lib",
   "unocss.root": ["./"],

CHANGELOG.md

@@ -1,5 +1,187 @@
 # 更新日志
 
+## [v1.1.2](https://gitee.com/xlsea/ruoyi-plus-soybean/compare/v1.1.1...v1.1.2) (2025-07-24)
+
+###    🐞 Bug 修复
+
+- 修复 api.d.ts.vm 代码生成模板bug &nbsp;-&nbsp; by **zygalaxy** [<samp>(4e8c8)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/4e8c8715)
+- **projects**:
+  - 修复刷新时跳转至登录页问题 &nbsp;-&nbsp; by **AN** [<samp>(2587f)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/2587f8cb)
+  - 修复登录过期不弹窗问题 &nbsp;-&nbsp; by **AN** [<samp>(e485f)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/e485f680)
+  - 修复菜单结构变动后路由无法进入问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(f4038)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/f4038a2d)
+
+### &nbsp;&nbsp;&nbsp;🛠 优化
+
+- **projects**: 优化搜索框FormItem &nbsp;-&nbsp; by **AN** [<samp>(a1336)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/a1336d15)
+
+### &nbsp;&nbsp;&nbsp;🏡 杂项
+
+- **deps**: update deps &nbsp;-&nbsp; by @soybeanjs [<samp>(e89b8)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/e89b86ce)
+
+### &nbsp;&nbsp;&nbsp;🎨 样式
+
+- **projects**: 搜索FormItem占比调整 &nbsp;-&nbsp; by **AN** [<samp>(cc29e)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/cc29ea85)
+
+### &nbsp;&nbsp;&nbsp;❤️ 贡献者
+
+[![m-xlsea](https://github.com/m-xlsea.png?size=48)](https://github.com/m-xlsea)&nbsp;&nbsp;[![Elio-An](https://github.com/Elio-An.png?size=48)](https://gitee.com/elio-an)&nbsp;&nbsp;[![soybeanjs](https://github.com/soybeanjs.png?size=48)](https://github.com/soybeanjs)&nbsp;&nbsp;
+[zygalaxy](mailto:zygalaxy@qq.com)
+
+## [v1.1.1](https://gitee.com/xlsea/ruoyi-plus-soybean/compare/v1.1.0...v1.1.1) (2025-07-11)
+
+### &nbsp;&nbsp;&nbsp;🚀 新功能
+
+- **hooks**:
+  - 重构下载方法，支持流式下载 &nbsp;-&nbsp; by @m-xlsea [<samp>(65067)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/650673e2)
+- **projects**:
+  - 角色分配用户新增部门与时间查询条件 &nbsp;-&nbsp; by @m-xlsea [<samp>(ad48d)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/ad48d8e8)
+  - 修改操作后列表查询方式 &nbsp;-&nbsp; by @m-xlsea [<samp>(d8542)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/d85424ee)
+
+### &nbsp;&nbsp;&nbsp;🐞 Bug 修复
+
+- **hooks**:
+  - 解决 streamsaver 访问不到 Github 资源问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(566b2)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/566b2c2d)
+- **other**:
+  - 修复代码生成类型定义文件重复问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(f7c7f)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/f7c7fc41)
+- **packages**:
+  - 修复 cleanup 会删除富文本编辑器资源问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(9ca7c)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/9ca7ca8f)
+- **projects**:
+  - 修复字典数据重复获取问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(3628c)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/3628c249)
+  - 修改强退在线设备接口 &nbsp;-&nbsp; by **AN** [<samp>(dbcf8)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/dbcf8d42)
+  - 修复代码生成逻辑判断问题 &nbsp;-&nbsp; by **AN** [<samp>(6fc7b)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/6fc7b11b)
+  - 修复部门字典 sys_normal_disable 重复获取 Merge pull request !11 from 素还真/N/A &nbsp;-&nbsp; by @m-xlsea [<samp>(ad938)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/ad9386eb)
+  - 修复未清空文件列表，上传回显问题 &nbsp;-&nbsp; by **AN** [<samp>(229e0)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/229e0044)
+  - Fix i18n-ally not working when setting moduleResolution to bundler. fixed #780 &nbsp;-&nbsp; by @xiaobao0505 in https://gitee.com/xlsea/ruoyi-plus-soybean/issues/780 [<samp>(41191)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/41191d54)
+  - 修复角色列表操作栏展示不全问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(62f2c)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/62f2c6d5)
+  - 修复用户导入结果信息未渲染标签问题 &nbsp;-&nbsp; by **AN** [<samp>(efc95)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/efc953c0)
+  - 修复角色用户分配未调用接口问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(ff874)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/ff87415d)
+- **styles**:
+  - 修复登录页平板界面滚动问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(90145)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/90145fa5)
+- **utils**:
+  - 修复isNull和IsNotNull判断方法潜在问题 &nbsp;-&nbsp; by **AN** [<samp>(90d32)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/90d32ee2)
+
+### &nbsp;&nbsp;&nbsp;💅 重构
+
+- **projects**: 调整租户套餐菜单接口 &nbsp;-&nbsp; by **AN** [<samp>(b9999)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/b9999935)
+
+### &nbsp;&nbsp;&nbsp;📖 文档
+
+- **other**: 修改文档内容 &nbsp;-&nbsp; by @m-xlsea [<samp>(3ae99)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/3ae9922d)
+- **projects**: 优化 cursor 规则及 mcp &nbsp;-&nbsp; by @m-xlsea [<samp>(a3199)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/a31994dc)
+- **readme**: 更新 README.md 文件 &nbsp;-&nbsp; by @m-xlsea [<samp>(99675)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/99675cbc)
+
+### &nbsp;&nbsp;&nbsp;🏡 杂项
+
+- **deps**:
+  - update NodeJS and pnpm version requirements in package.json and documentation &nbsp;-&nbsp; by **Junior25306** [<samp>(a5c4b)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/a5c4b4e3)
+  - update deps &nbsp;-&nbsp; by @soybeanjs [<samp>(5cb1c)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/5cb1cebd)
+  - update deps &nbsp;-&nbsp; by @soybeanjs [<samp>(aeb63)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/aeb63690)
+  - update deps &nbsp;-&nbsp; by @m-xlsea [<samp>(89c71)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/89c716e1)
+- **packages**:
+  - update Vite version to 7 in package.json and documentation. &nbsp;-&nbsp; by **Azir** [<samp>(03dd6)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/03dd64c5)
+- **projects**:
+  - update pnpm-lock.yaml &nbsp;-&nbsp; by @m-xlsea [<samp>(7c6ca)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/7c6ca91e)
+- **vscode**:
+  - remove unused vue.server.hybridMode setting from .vscode/settings.json &nbsp;-&nbsp; by @soybeanjs [<samp>(13319)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/133196f3)
+
+### &nbsp;&nbsp;&nbsp;❤️ 贡献值
+
+[![m-xlsea](https://github.com/m-xlsea.png?size=48)](https://github.com/m-xlsea)&nbsp;&nbsp;[![soybeanjs](https://github.com/soybeanjs.png?size=48)](https://github.com/soybeanjs)&nbsp;&nbsp;[![xiaobao0505](https://github.com/xiaobao0505.png?size=48)](https://github.com/xiaobao0505)&nbsp;&nbsp;[![Elio-An](https://github.com/Elio-An.png?size=48)](https://gitee.com/elio-an)&nbsp;&nbsp;[![Azir-11](https://github.com/Azir-11.png?size=48)](https://github.com/Azir-11)&nbsp;&nbsp;[Junior25306](mailto:dayu429@qq.com)
+
+## [v1.1.0](https://gitee.com/xlsea/ruoyi-plus-soybean/compare/v1.0.0...v1.1.0) (2025-07-01)
+
+### &nbsp;&nbsp;&nbsp;🚀 新功能
+
+- **components**:
+  - 新增表单上传组件 &nbsp;-&nbsp; by @m-xlsea [<samp>(03c8a)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/03c8a7f5)
+- **other**:
+  - 新增菜单字典多语言适配 SQL &nbsp;-&nbsp; by @m-xlsea [<samp>(0f33f)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/0f33f4a3)
+- **projects**:
+  - add configurable user name watermark option &nbsp;-&nbsp; by @wenyuanw [<samp>(7c3da)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/7c3dac42)
+  - 菜单字典适配 i18n &nbsp;-&nbsp; by @m-xlsea [<samp>(39dd9)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/39dd9acc)
+  - 新增字典多语言适配 &nbsp;-&nbsp; by @m-xlsea [<samp>(8c840)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/8c84063a)
+- **styles**:
+  - 修复登录页移动端显示问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(742e3)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/742e3858)
+
+### &nbsp;&nbsp;&nbsp;🐞 Bug 修复
+
+- **app**:
+  - replace console.error with window.console.error for consistency &nbsp;-&nbsp; by @soybeanjs [<samp>(7d840)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/7d84062e)
+- **auth**:
+  - remove redundant authStore declaration in resetStore function &nbsp;-&nbsp; by @soybeanjs [<samp>(c57f8)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/c57f88aa)
+- **components**:
+  - 修复菜单树选择组件 &nbsp;-&nbsp; by @m-xlsea [<samp>(bbda8)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/bbda803e)
+  - 修复树选择组件再次勾选父子联动导致全选问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(aeb73)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/aeb736eb)
+  - 修复部门选择组件非树结构，默认展开失败问题 &nbsp;-&nbsp; by **AN** [<samp>(da1c1)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/da1c16e0)
+  - 修复上传组件回显问题，修改accept参数逻辑 &nbsp;-&nbsp; by **AN** [<samp>(e16a0)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/e16a0fa6)
+  - 修复菜单选择标签渲染问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(6e6cc)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/6e6cc4d9)
+- **other**:
+  - 修复代码生成问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(1ec10)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/1ec10991)
+  - 代码生成模板 dateRangeTime 错误 &nbsp;-&nbsp; by @m-xlsea [<samp>(f0810)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/f0810bce)
+  - 修复代码生成字典相关问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(94d18)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/94d1863e)
+  - 修复代码生成类型定义文件重复问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(f7c7fc41)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/f7c7fc41)
+- **projects**:
+  - 修复自定义数据权限没有保存角色部门bug &nbsp;-&nbsp; by **AN** [<samp>(a0f33)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/a0f33664)
+  - 修复登录过期后，重复弹窗问题 &nbsp;-&nbsp; by **AN** [<samp>(cafee)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/cafee1db)
+  - 修复首页未从环境变量获取问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(031b7)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/031b7f69)
+  - 修复导出查询参数问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(ffa47)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/ffa47c37)
+  - 修复权限字符显示逻辑错误问题 &nbsp;-&nbsp; by **AN** [<samp>(0ac0a)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/0ac0a093)
+  - 目录类型禁用iframe选项 &nbsp;-&nbsp; by **AN** [<samp>(72b8f)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/72b8f56e)
+  - 修复切换用户或登录过期部分问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(27f06)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/27f06195)
+  - 修复接口请求异常拦截问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(031d0)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/031d071a)
+  - 修复个人信息-修改密码未加密且参数错误问题 &nbsp;-&nbsp; by **AN** [<samp>(8b315)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/8b3151b8)
+  - 调整属性名 &nbsp;-&nbsp; by **AN** [<samp>(62e6c)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/62e6c776)
+  - ensure proper text color when themes are inverted &nbsp;-&nbsp; by @wenyuanw [<samp>(afd60)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/afd60421)
+- **styles**:
+  - 添加滚动条，去除页码 &nbsp;-&nbsp; by **AN** [<samp>(d37ad)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/d37adc36)
+- **types**:
+  - The environment variable VITE_ICON_LOCAL_PREFIX has the wrong type. &nbsp;-&nbsp; by **chenziwen** [<samp>(da149)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/da149e5b)
+- **utils**:
+  - 修复 删除当前tab为最后一个时，tab切换错误bug. &nbsp;-&nbsp; by **AN** [<samp>(64bd1)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/64bd119c)
+
+### &nbsp;&nbsp;&nbsp;🛠 优化
+
+- **components**:
+  - optimize spacing for lang-switch dropdown options &nbsp;-&nbsp; by @wenyuanw [<samp>(fcb89)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/fcb89883)
+- **projects**:
+  - optimize tab deletion logic. closed #755 &nbsp;-&nbsp; by @wenyuanw in https://gitee.com/xlsea/ruoyi-plus-soybean/issues/755 [<samp>(e6044)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/e6044d0f)
+  - optimize tab deletion logic &nbsp;-&nbsp; by **AN** [<samp>(858c3)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/858c3180)
+  - 优化接口请求异常拦截代码 &nbsp;-&nbsp; by @m-xlsea [<samp>(47191)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/471912e1)
+
+### &nbsp;&nbsp;&nbsp;💅 重构
+
+- **iframe-page**: remove unused lifecycle hooks and clean up script setup &nbsp;-&nbsp; by @soybeanjs [<samp>(276d8)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/276d836c)
+- **projects**: 补充formTip信息 &nbsp;-&nbsp; by **AN** [<samp>(f36ac)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/f36ac9ab)
+
+### &nbsp;&nbsp;&nbsp;📖 文档
+
+- **readme**:
+  - 更新 README.md 文件 &nbsp;-&nbsp; by @m-xlsea [<samp>(99675cb)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/99675cb)
+
+### &nbsp;&nbsp;&nbsp;🏡 杂项
+
+- **deps**:
+  - update deps &nbsp;-&nbsp; by @soybeanjs [<samp>(3e4e1)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/3e4e17ab)
+  - update deps &nbsp;-&nbsp; by @soybeanjs [<samp>(dc674)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/dc674ce8)
+  - update deps &nbsp;-&nbsp; by @m-xlsea [<samp>(fec05)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/fec0563e)
+- **projects**:
+  - 移除未使用代码 &nbsp;-&nbsp; by **AN** [<samp>(d141e)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/d141ed5b)
+  - update deps & fix `moduleResolution` &nbsp;-&nbsp; by @soybeanjs [<samp>(dbd99)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/dbd995c1)
+
+### &nbsp;&nbsp;&nbsp;🎨 样式
+
+- **projects**:
+  - 更换 logo 与加载样式 &nbsp;-&nbsp; by @m-xlsea [<samp>(7e4ec)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/7e4ecae6)
+  - 重构登录页样式 &nbsp;-&nbsp; by @m-xlsea [<samp>(40680)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/406800de)
+  - 修改按钮文本颜色 &nbsp;-&nbsp; by @m-xlsea [<samp>(907f0)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/907f0439)
+  - 优化移动端字体大小 &nbsp;-&nbsp; by @m-xlsea [<samp>(8b4e4)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/8b4e41ce)
+
+### &nbsp;&nbsp;&nbsp;❤️ 贡献者
+
+[![xlsea](https://github.com/m-xlsea.png?size=48)](https://gitee.com/xlsea)&nbsp;&nbsp;[![soybeanjs](https://github.com/soybeanjs.png?size=48)](https://github.com/soybeanjs)&nbsp;&nbsp;[![wenyuanw](https://github.com/wenyuanw.png?size=48)](https://github.com/wenyuanw)&nbsp;&nbsp;[![Elio-An](https://github.com/Elio-An.png?size=48)](https://gitee.com/elio-an)&nbsp;&nbsp;[![chen-ziwen](https://github.com/chen-ziwen.png?size=48)](https://github.com/chen-ziwen)&nbsp;&nbsp;
+[![wangzhongqi0917](https://gitee.com/wangzhongqi0917.png?width=48)](https://gitee.com/wangzhongqi0917)&nbsp;&nbsp;[![qq1822213252](https://gitee.com/qq1822213252.png?width=48)](https://gitee.com/qq1822213252)&nbsp;&nbsp;[![tangzc](https://gitee.com/tangzc.png?width=48)](https://gitee.com/tangzc),&nbsp;[metabytes](https://gitee.com/metabytes)
+
+
 ## [v1.0.0](https://gitee.com/xlsea/ruoyi-plus-soybean/releases/tag/v1.0.0) (2025-06-05)
 
 ### &nbsp;&nbsp;&nbsp;🚀 新功能

README.md

@@ -1,5 +1,6 @@
-<div  align="center">
-  <img src="https://foruda.gitee.com/images/1679673773341074847/178e8451_1766278.png" width="50%" height="50%">
+<div align="center">
+  <img src="https://docs.ruoyi.xlsea.cn/logo.svg" width="160">
+  <h1>RuoYi-Plus-Soybean</h1>
 </div>
 
 <div style="height: 10px; clear: both;"></div>
@@ -7,21 +8,28 @@
 <div align="center">
   <p>一个基于 <a href="https://gitee.com/dromara/RuoYi-Vue-Plus" target="_blank">RuoYi-Vue-Plus</a> 的后端能力和 <a href="https://github.com/soybeanjs/soybean-admin" target="_blank">Soybean Admin</a> 前端特性的现代化多租户管理系统</p>
   <p>
-    <img src="https://gitee.com/xlsea/ruoyi-plus-soybean/badge/star.svg" alt="Gitee">
-    <img src="https://img.shields.io/github/stars/m-xlsea/ruoyi-plus-soybean" alt="Github">
-    <img src="https://img.shields.io/badge/Vue-3.5-brightgreen" alt="vue">
-    <img src="https://img.shields.io/badge/TypeScript-5.8-blue" alt="typescript">
-    <img src="https://img.shields.io/badge/Vite-6.2-orange" alt="vite">
-    <img src="https://img.shields.io/badge/NaiveUI-2.41-purple" alt="naive-ui">
-    <img src="https://img.shields.io/badge/License-MIT-yellow" alt="license">
+    <a href="https://gitee.com/xlsea/ruoyi-plus-soybean" target="_blank"><img src="https://gitee.com/xlsea/ruoyi-plus-soybean/badge/star.svg" alt="Gitee"></a>
+    <a href="https://gitee.com/dromara/RuoYi-Vue-Plus" target="_blank"><img src="https://gitee.com/xlsea/ruoyi-plus-soybean/badge/fork.svg" alt="Gitee-forks"></a>
+    <a href="https://github.com/m-xlsea/ruoyi-plus-soybean" target="_blank"><img src="https://img.shields.io/github/stars/m-xlsea/ruoyi-plus-soybean" alt="Github"></a>
+    <a href="https://github.com/m-xlsea/ruoyi-plus-soybean" target="_blank"><img src="https://img.shields.io/github/forks/m-xlsea/ruoyi-plus-soybean" alt="Github-forks"></a>
+    <a href="https://vuejs.org" target="_blank"><img src="https://img.shields.io/badge/Vue-3.5-brightgreen" alt="vue"></a>
+    <a href="https://www.typescriptlang.org" target="_blank"><img src="https://img.shields.io/badge/TypeScript-5.8-blue" alt="typescript"></a>
+    <a href="https://vite.dev" target="_blank"><img src="https://img.shields.io/badge/Vite-6.2-orange" alt="vite"></a>
+    <a href="https://www.naiveui.com" target="_blank"><img src="https://img.shields.io/badge/NaiveUI-2.41-purple" alt="naive-ui"></a>
+        <a href="./LICENSE" target="_blank"><img src="https://img.shields.io/badge/License-MIT-yellow" alt="license"></a>
   </p>
 </div>
 
 # 📢 重要通知
 
-<p style="color: red; font-weight: bold; font-size: 24px;">该项目未首发公测版本，请谨慎在生产环境使用！！！</p>
-<p style="color: red; font-weight: bold; font-size: 24px;">该项目未首发公测版本，请谨慎在生产环境使用！！！</p>
-<p style="color: red; font-weight: bold; font-size: 24px;">该项目未首发公测版本，请谨慎在生产环境使用！！！</p>
+1.1.2 版本已经正式发布，工作流版本迎来首个版本（请切换 [flow](https://gitee.com/xlsea/ruoyi-plus-soybean/tree/flow/) 分支查看），但仍然建议：
+- 在生产环境使用前进行充分测试
+- 关注项目更新，及时获取最新版本
+- 积极反馈问题，帮助我们快速迭代
+
+**后续规划**
+- 多语言国际化完善
+- 性能优化和稳定性提升
 
 > 如果对该项目感兴趣，可以给一个 Star 支持一下，谢谢！
 > 请大家踊跃提交 PR 和 Issue，一起完善这个项目
@@ -110,8 +118,8 @@ root
 ## 🚀 环境要求与安装
 
 ### 环境要求
-- Node.js >= 18.20.0
-- pnpm >= 8.7.0
+- Node.js >= 20.19.0
+- pnpm >= 10.5.0
 - Git
 
 ### 安装步骤及说明
@@ -340,6 +348,8 @@ console.log(t('common.confirm'));
 - [RuoYi-Vue-Plus](https://gitee.com/dromara/RuoYi-Vue-Plus) - 后端基础框架
 - [Soybean Admin](https://github.com/soybeanjs/soybean-admin) - 前端基础框架
 - [RuoYi-Plus-Soybean](https://ruoyi.xlsea.cn) - 官方演示站点
+- [RuoYi-Plus-Soybean-Docs](https://docs.ruoyi.xlsea.cn) - 项目文档
+- [Open Hives](https://openhives.com/questions) - OpenHives 问答社区
 
 ## 📮 联系方式
 
@@ -354,7 +364,15 @@ console.log(t('common.confirm'));
 
 ## 💬 交流群
 
-<img src="https://foruda.gitee.com/images/1748404753216665472/3d8b1a0b_5601833.png" width="300px" />
+**加群前请先阅读一下内容：**
+
+- 禁止内容：黄腔、暴力言论、政治话题，违者直接飞机票（踢出群）
+- 遇到问题请先阅读 [项目文档](https://docs.ruoyi.xlsea.cn) 和 [Soybean 文档](https://docs.soybeanjs.cn/)，某些简单问题不予理睬
+- 蜡笔小新头像为机器人助手，私聊不保证回复，问题请在群内讨论
+
+<img src="https://foruda.gitee.com/images/1749174520085305975/ad1b54fe_5601833.png" width="300px" />
+
+添加作者微信备注：加群
 
 ## 🧧 捐献作者
 
@@ -364,56 +382,4 @@ console.log(t('common.confirm'));
 
 ## 🫡 捐赠列表
 
-感谢下方各位老板的捐赠 🫡
-
-> 如果不想出现在下方捐赠列表，请在备注中说明，我会匿名处理
-
-<div style="display: flex; gap: 8px;">
-    <img style="border-radius: 50%;" src="https://foruda.gitee.com/images/1747030503230216352/6879cbe5_5601833.jpeg" width="24px" >
-    <span>酷酷冬天 20元</span>
-</div>
-
-<div style="display: flex; gap: 8px;">
-    <img style="border-radius: 50%;" src="https://foruda.gitee.com/images/1747105640574377313/6d259bba_5601833.jpeg" width="24px" >
-    <span>Selfish Altruism(JackSue) 200元</span>
-</div>
-
-<div style="display: flex; gap: 8px;">
-    <img style="border-radius: 50%;" src="https://foruda.gitee.com/images/1747190127964232140/5ffa5ac4_5601833.jpeg" width="24px" >
-    <span>匿名用户 50元</span>
-</div>
-
-<div style="display: flex; gap: 8px;">
-    <img style="border-radius: 50%;" src="https://foruda.gitee.com/images/1747190127964232140/5ffa5ac4_5601833.jpeg" width="24px" >
-    <span>匿名用户 10元</span>
-</div>
-
-<div style="display: flex; gap: 8px;">
-    <img style="border-radius: 50%;" src="https://foruda.gitee.com/images/1747280244120267391/6d719481_5601833.jpeg" width="24px" >
-    <span>DAS 20元</span>
-</div>
-
-<div style="display: flex; gap: 8px;">
-    <img style="border-radius: 50%;" src="https://foruda.gitee.com/images/1747739790990961771/57f4b208_5601833.jpeg" width="24px" >
-    <span>大山 100元</span>
-</div>
-
-<div style="display: flex; gap: 8px;">
-    <img style="border-radius: 50%;" src="https://foruda.gitee.com/images/1747742188121789563/646dff1c_5601833.jpeg" width="24px" >
-    <span>依依 20元</span>
-</div>
-
-<div style="display: flex; gap: 8px;">
-    <img style="border-radius: 50%;" src="https://foruda.gitee.com/images/1747742593880284419/5b56043d_5601833.jpeg" width="24px" >
-    <span>沙海 20元</span>
-</div>
-
-<div style="display: flex; gap: 8px;">
-    <img style="border-radius: 50%;" src="https://foruda.gitee.com/images/1747789196227712891/00c37bdf_5601833.jpeg" width="24px" >
-    <span>xxl 50元</span>
-</div>
-
-<div style="display: flex; gap: 8px;">
-    <img style="border-radius: 50%;" src="https://foruda.gitee.com/images/1747796468040874363/1faa75ce_5601833.jpeg" width="24px" >
-    <span>莫离支🤴 10元</span>
-</div>
+**捐赠列表已移至 [捐赠列表](https://docs.ruoyi.xlsea.cn/other/donate.html)**

docs/java/VelocityUtils.java

@@ -73,8 +73,9 @@ public class VelocityUtils {
         velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName));
         velocityContext.put("dicts", getDicts(genTable));
         velocityContext.put("dictList", getDictList(genTable));
-        velocityContext.put("columns", getColumns(genTable));
+        velocityContext.put("columns", genTable.getColumns());
         velocityContext.put("table", genTable);
+        velocityContext.put("StrUtil", new StrUtil());
         setMenuVelocityContext(velocityContext, genTable);
         if (GenConstants.TPL_TREE.equals(tplCategory)) {
             setTreeVelocityContext(velocityContext, genTable);
@@ -189,9 +190,9 @@ public class VelocityUtils {
         } else if (template.contains("index-tree.vue.vm")) {
             fileName = StringUtils.format("{}/views/{}/{}/index.vue", soybeanPath, moduleName, StrUtil.toSymbolCase(businessName, '-'));
         } else if (template.contains("api.d.ts.vm")) {
-            fileName = StringUtils.format("{}/typings/api/{}.api.d.ts", soybeanPath, moduleName);
+            fileName = StringUtils.format("{}/typings/api/{}.{}.api.d.ts", soybeanPath, moduleName, StrUtil.toSymbolCase(businessName, '-'));
         } else if (template.contains("api.ts.vm")) {
-            fileName = StringUtils.format("{}/api/{}/{}.ts", soybeanPath, moduleName, StrUtil.toSymbolCase(businessName, '-'));
+            fileName = StringUtils.format("{}/service/api/{}/{}.ts", soybeanPath, moduleName, StrUtil.toSymbolCase(businessName, '-'));
         } else if (template.contains("search.vue.vm")) {
             fileName = StringUtils.format("{}/views/{}/{}/modules/{}-search.vue", soybeanPath, moduleName, StrUtil.toSymbolCase(businessName, '-'), StrUtil.toSymbolCase(businessName, '-'));
         } else if (template.contains("operate-drawer.vue.vm")) {
@@ -296,23 +297,6 @@ public class VelocityUtils {
         }
     }
 
-    /**
-     * 根据列类型获取字典组
-     *
-     * @param genTable 业务表对象
-     * @return 返回字典组
-     */
-    public static List<GenTableColumn> getColumns(GenTable genTable) {
-        List<GenTableColumn> columns = genTable.getColumns();
-        for (GenTableColumn column : columns) {
-            if (StringUtils.isNotBlank(column.getDictType())) {
-                column.setDictType(StringUtils.toCamelCase(column.getDictType()));
-            }
-        }
-        return columns;
-    }
-
-
     /**
      * 获取权限前缀
      *

docs/sql/sys_dict_data.sql

@@ -0,0 +1,59 @@
+-- 修改字典数据表的 list_class 字段，将 danger 改为 error
+UPDATE `sys_dict_data` SET `list_class` = 'error' WHERE `list_class` = 'danger';
+
+-- 字典适配多语言
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_user_sex.male', `dict_type` = 'sys_user_sex' WHERE `dict_code` = 1;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_user_sex.female', `dict_type` = 'sys_user_sex' WHERE `dict_code` = 2;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_user_sex.unknown', `dict_type` = 'sys_user_sex' WHERE `dict_code` = 3;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_show_hide.show', `dict_type` = 'sys_show_hide' WHERE `dict_code` = 4;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_show_hide.hide', `dict_type` = 'sys_show_hide' WHERE `dict_code` = 5;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_normal_disable.normal', `dict_type` = 'sys_normal_disable' WHERE `dict_code` = 6;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_normal_disable.disable', `dict_type` = 'sys_normal_disable' WHERE `dict_code` = 7;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_yes_no.yes', `dict_type` = 'sys_yes_no' WHERE `dict_code` = 12;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_yes_no.no', `dict_type` = 'sys_yes_no' WHERE `dict_code` = 13;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_notice_type.notice', `dict_type` = 'sys_notice_type' WHERE `dict_code` = 14;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_notice_type.announcement', `dict_type` = 'sys_notice_type' WHERE `dict_code` = 15;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_notice_status.normal', `dict_type` = 'sys_notice_status' WHERE `dict_code` = 16;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_notice_status.close', `dict_type` = 'sys_notice_status' WHERE `dict_code` = 17;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_oper_type.insert', `dict_type` = 'sys_oper_type' WHERE `dict_code` = 18;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_oper_type.update', `dict_type` = 'sys_oper_type' WHERE `dict_code` = 19;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_oper_type.delete', `dict_type` = 'sys_oper_type' WHERE `dict_code` = 20;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_oper_type.grant', `dict_type` = 'sys_oper_type' WHERE `dict_code` = 21;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_oper_type.export', `dict_type` = 'sys_oper_type' WHERE `dict_code` = 22;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_oper_type.import', `dict_type` = 'sys_oper_type' WHERE `dict_code` = 23;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_oper_type.force', `dict_type` = 'sys_oper_type' WHERE `dict_code` = 24;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_oper_type.gencode', `dict_type` = 'sys_oper_type' WHERE `dict_code` = 25;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_oper_type.clean', `dict_type` = 'sys_oper_type' WHERE `dict_code` = 26;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_common_status.success', `dict_type` = 'sys_common_status' WHERE `dict_code` = 27;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_common_status.fail', `dict_type` = 'sys_common_status' WHERE `dict_code` = 28;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_oper_type.other', `dict_type` = 'sys_oper_type' WHERE `dict_code` = 29;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_grant_type.password', `dict_type` = 'sys_grant_type' WHERE `dict_code` = 30;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_grant_type.sms', `dict_type` = 'sys_grant_type' WHERE `dict_code` = 31;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_grant_type.email', `dict_type` = 'sys_grant_type' WHERE `dict_code` = 32;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_grant_type.miniapp', `dict_type` = 'sys_grant_type' WHERE `dict_code` = 33;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_grant_type.social', `dict_type` = 'sys_grant_type' WHERE `dict_code` = 34;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_device_type.pc', `dict_type` = 'sys_device_type' WHERE `dict_code` = 35;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_device_type.android', `dict_type` = 'sys_device_type' WHERE `dict_code` = 36;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_device_type.ios', `dict_type` = 'sys_device_type' WHERE `dict_code` = 37;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.sys_device_type.miniapp', `dict_type` = 'sys_device_type' WHERE `dict_code` = 38;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_business_status.revoked', `dict_type` = 'wf_business_status' WHERE `dict_code` = 39;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_business_status.draft', `dict_type` = 'wf_business_status' WHERE `dict_code` = 40;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_business_status.pending', `dict_type` = 'wf_business_status' WHERE `dict_code` = 41;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_business_status.completed', `dict_type` = 'wf_business_status' WHERE `dict_code` = 42;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_business_status.cancelled', `dict_type` = 'wf_business_status' WHERE `dict_code` = 43;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_business_status.returned', `dict_type` = 'wf_business_status' WHERE `dict_code` = 44;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_business_status.terminated', `dict_type` = 'wf_business_status' WHERE `dict_code` = 45;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_form_type.custom_form', `dict_type` = 'wf_form_type' WHERE `dict_code` = 46;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_form_type.dynamic_form', `dict_type` = 'wf_form_type' WHERE `dict_code` = 47;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_task_status.revoke', `dict_type` = 'wf_task_status' WHERE `dict_code` = 48;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_task_status.pass', `dict_type` = 'wf_task_status' WHERE `dict_code` = 49;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_task_status.pending_review', `dict_type` = 'wf_task_status' WHERE `dict_code` = 50;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_task_status.cancel', `dict_type` = 'wf_task_status' WHERE `dict_code` = 51;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_task_status.return', `dict_type` = 'wf_task_status' WHERE `dict_code` = 52;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_task_status.terminate', `dict_type` = 'wf_task_status' WHERE `dict_code` = 53;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_task_status.transfer', `dict_type` = 'wf_task_status' WHERE `dict_code` = 54;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_task_status.delegate', `dict_type` = 'wf_task_status' WHERE `dict_code` = 55;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_task_status.copy', `dict_type` = 'wf_task_status' WHERE `dict_code` = 56;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_task_status.add_sign', `dict_type` = 'wf_task_status' WHERE `dict_code` = 57;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_task_status.minus_sign', `dict_type` = 'wf_task_status' WHERE `dict_code` = 58;
+UPDATE `sys_dict_data` SET `dict_label` = 'dict.wf_task_status.timeout', `dict_type` = 'wf_task_status' WHERE `dict_code` = 59;

docs/sql/sys_menu.sql

@@ -1,38 +1,38 @@
 -- 目录类型菜单
-UPDATE `sys_menu` SET `component` = 'Layout', `icon` = 'carbon:cloud-service-management' WHERE `menu_id` = 1;
-UPDATE `sys_menu` SET `component` = 'Layout', `icon` = 'stash:dashboard' WHERE `menu_id` = 2;
-UPDATE `sys_menu` SET `component` = 'Layout', `icon` = 'tabler:tools' WHERE `menu_id` = 3;
-UPDATE `sys_menu` SET `component` = 'Layout', `icon` = 'material-symbols:kid-star-outline' WHERE `menu_id` = 5;
-UPDATE `sys_menu` SET `component` = 'Layout', `icon` = 'tabler:building-cog' WHERE `menu_id` = 6;
-UPDATE `sys_menu` SET `component` = 'Layout', `icon` = 'tabler:logs' WHERE `menu_id` = 108;
+UPDATE `sys_menu` SET `component` = 'Layout', `icon` = 'carbon:cloud-service-management', `menu_name` = 'route.system' WHERE `menu_id` = 1;
+UPDATE `sys_menu` SET `component` = 'Layout', `icon` = 'stash:dashboard', `menu_name` = 'route.monitor' WHERE `menu_id` = 2;
+UPDATE `sys_menu` SET `component` = 'Layout', `icon` = 'tabler:tools', `menu_name` = 'route.tool' WHERE `menu_id` = 3;
+UPDATE `sys_menu` SET `component` = 'Layout', `icon` = 'material-symbols:kid-star-outline', `menu_name` = 'route.demo' WHERE `menu_id` = 5;
+UPDATE `sys_menu` SET `component` = 'Layout', `icon` = 'tabler:building-cog', `menu_name` = 'menu.system_tenant' WHERE `menu_id` = 6;
+UPDATE `sys_menu` SET `component` = 'Layout', `icon` = 'tabler:logs', `menu_name` = 'menu.system_log' WHERE `menu_id` = 108;
 
 -- 页面类型
-UPDATE `sys_menu` SET `icon` = 'ic:round-manage-accounts' WHERE `menu_id` = 100;
-UPDATE `sys_menu` SET `icon` = 'carbon:user-role' WHERE `menu_id` = 101;
-UPDATE `sys_menu` SET `icon` = 'material-symbols:route' WHERE `menu_id` = 102;
-UPDATE `sys_menu` SET `icon` = 'mingcute:department-line' WHERE `menu_id` = 103;
-UPDATE `sys_menu` SET `icon` = 'hugeicons:permanent-job' WHERE `menu_id` = 104;
-UPDATE `sys_menu` SET `icon` = 'qlementine-icons:dictionary-16' WHERE `menu_id` = 105;
-UPDATE `sys_menu` SET `icon` = 'carbon:parameter' WHERE `menu_id` = 106;
-UPDATE `sys_menu` SET `icon` = 'solar:chat-line-outline' WHERE `menu_id` = 107;
-UPDATE `sys_menu` SET `icon` = 'majesticons:status-online-line' WHERE `menu_id` = 109;
-UPDATE `sys_menu` SET `icon` = 'simple-icons:redis' WHERE `menu_id` = 113;
-UPDATE `sys_menu` SET `icon` = 'material-symbols:code-blocks-outline' WHERE `menu_id` = 115;
-UPDATE `sys_menu` SET `icon` = 'material-symbols:attach-file' WHERE `menu_id` = 118;
-UPDATE `sys_menu` SET `icon` = 'tabler:building-skyscraper' WHERE `menu_id` = 121;
-UPDATE `sys_menu` SET `icon` = 'lets-icons:package-box-alt' WHERE `menu_id` = 122;
-UPDATE `sys_menu` SET `icon` = 'tabler:device-imac-cog' WHERE `menu_id` = 123;
-UPDATE `sys_menu` SET `icon` = 'carbon:operations-record' WHERE `menu_id` = 500;
-UPDATE `sys_menu` SET `icon` = 'tabler:login-2' WHERE `menu_id` = 501;
-UPDATE `sys_menu` SET `icon` = 'gg:debug' WHERE `menu_id` = 1500;
-UPDATE `sys_menu` SET `icon` = 'gg:debug' WHERE `menu_id` = 1506;
-UPDATE `sys_menu` SET `path` = 'oss/config', `component` = 'system/oss-config/index', `icon` = 'hugeicons:configuration-01' WHERE `menu_id` = 133;
+UPDATE `sys_menu` SET `icon` = 'ic:round-manage-accounts', `menu_name` = 'route.system_user' WHERE `menu_id` = 100;
+UPDATE `sys_menu` SET `icon` = 'carbon:user-role', `menu_name` = 'route.system_role' WHERE `menu_id` = 101;
+UPDATE `sys_menu` SET `icon` = 'material-symbols:route', `menu_name` = 'route.system_menu' WHERE `menu_id` = 102;
+UPDATE `sys_menu` SET `icon` = 'mingcute:department-line', `menu_name` = 'route.system_dept' WHERE `menu_id` = 103;
+UPDATE `sys_menu` SET `icon` = 'hugeicons:permanent-job', `menu_name` = 'route.system_post' WHERE `menu_id` = 104;
+UPDATE `sys_menu` SET `icon` = 'qlementine-icons:dictionary-16', `menu_name` = 'route.system_dict' WHERE `menu_id` = 105;
+UPDATE `sys_menu` SET `icon` = 'carbon:parameter', `menu_name` = 'route.system_config' WHERE `menu_id` = 106;
+UPDATE `sys_menu` SET `icon` = 'solar:chat-line-outline', `menu_name` = 'route.system_notice' WHERE `menu_id` = 107;
+UPDATE `sys_menu` SET `icon` = 'majesticons:status-online-line', `menu_name` = 'route.monitor_online' WHERE `menu_id` = 109;
+UPDATE `sys_menu` SET `icon` = 'simple-icons:redis', `menu_name` = 'route.monitor_cache' WHERE `menu_id` = 113;
+UPDATE `sys_menu` SET `icon` = 'material-symbols:code-blocks-outline', `menu_name` = 'route.tool_gen' WHERE `menu_id` = 115;
+UPDATE `sys_menu` SET `icon` = 'material-symbols:attach-file', `menu_name` = 'route.system_oss' WHERE `menu_id` = 118;
+UPDATE `sys_menu` SET `icon` = 'tabler:building-skyscraper', `menu_name` = 'route.system_tenant' WHERE `menu_id` = 121;
+UPDATE `sys_menu` SET `icon` = 'lets-icons:package-box-alt', `menu_name` = 'route.system_tenant-package' WHERE `menu_id` = 122;
+UPDATE `sys_menu` SET `icon` = 'tabler:device-imac-cog', `menu_name` = 'route.system_client' WHERE `menu_id` = 123;
+UPDATE `sys_menu` SET `icon` = 'carbon:operations-record', `menu_name` = 'route.monitor_operlog' WHERE `menu_id` = 500;
+UPDATE `sys_menu` SET `icon` = 'tabler:login-2', `menu_name` = 'route.monitor_logininfor' WHERE `menu_id` = 501;
+UPDATE `sys_menu` SET `icon` = 'gg:debug', `menu_name` = 'route.demo_demo' WHERE `menu_id` = 1500;
+UPDATE `sys_menu` SET `icon` = 'gg:debug', `menu_name` = 'route.demo_tree' WHERE `menu_id` = 1506;
+UPDATE `sys_menu` SET `path` = 'oss/config', `component` = 'system/oss-config/index', `icon` = 'hugeicons:configuration-01', `menu_name` = 'route.system_oss-config' WHERE `menu_id` = 133;
 
 -- IFrame 类型
-UPDATE `sys_menu` SET `component` = 'FrameView', `query_param` = 'https://ruoyi.xlsea.cn/admin/', `is_frame` = 2, `icon` = 'bx:bxl-spring-boot' WHERE `menu_id` = 117;
-UPDATE `sys_menu` SET `component` = 'FrameView', `query_param` = 'https://preview.snailjob.opensnail.com/', `is_frame` = 2, `icon` = 'gridicons:scheduled' WHERE `menu_id` = 120;
+UPDATE `sys_menu` SET `component` = 'FrameView', `query_param` = 'https://ruoyi.xlsea.cn/admin/', `is_frame` = 2, `icon` = 'bx:bxl-spring-boot', `menu_name` = 'menu.monitor_admin' WHERE `menu_id` = 117;
+UPDATE `sys_menu` SET `component` = 'FrameView', `query_param` = 'https://preview.snailjob.opensnail.com/', `is_frame` = 2, `icon` = 'gridicons:scheduled', `menu_name` = 'menu.monitor_snail-job' WHERE `menu_id` = 120;
 -- 外链类型
-UPDATE `sys_menu` SET `path` = 'https://gitee.com/xlsea/ruoyi-plus-soybean', `component` = 'FrameView', `icon` = 'local-icon-gitee' WHERE `menu_id` = 4;
+UPDATE `sys_menu` SET `path` = 'https://gitee.com/xlsea/ruoyi-plus-soybean', `component` = 'FrameView', `icon` = 'local-icon-gitee', `menu_name` = 'RuoYi-Plus-Soybean' WHERE `menu_id` = 4;
 
 -- plus-ui 需要禁用的页面
 UPDATE `sys_menu` SET `status` = '1' WHERE `menu_id` IN ( '116', '130', '131', '132', '11700', '11701' );

docs/template/index-tree.vue.vm

@@ -2,7 +2,7 @@
 import { NDivider } from 'naive-ui';
 import { jsonClone } from '@sa/utils';
 import { type TableDataWithIndex } from '@sa/hooks';
-import { fetchBatchDelete${BusinessName}, fetchGet${BusinessName}List } from '@/service/api/${moduleName}/${businessName}';
+import { fetchBatchDelete${BusinessName}, fetchGet${BusinessName}List } from '@/service/api/${moduleName}/${business__name}';
 import { useAppStore } from '@/store/modules/app';
 import { useAuth } from '@/hooks/business/auth';
 import { useTreeTable, useTreeTableOperate } from '@/hooks/common/tree-table';

docs/template/index.vue.vm

@@ -1,6 +1,6 @@
 <script setup lang="tsx">
 import { NDivider } from 'naive-ui';
-import { fetchBatchDelete${BusinessName}, fetchGet${BusinessName}List } from '@/service/api/${moduleName}/${businessName}';
+import { fetchBatchDelete${BusinessName}, fetchGet${BusinessName}List } from '@/service/api/${moduleName}/${business__name}';
 import { useAppStore } from '@/store/modules/app';
 import { useAuth } from '@/hooks/business/auth';
 import { useDownload } from '@/hooks/business/download';

docs/template/modules/operate-drawer.vue.vm

@@ -52,7 +52,7 @@ function createDefaultModel(): Model {
   return {
 #foreach($column in $columns)
   #if($column.insert)
-    ${column.javaField}:#if($column.javaType == 'String') ''#else null#end#if($foreach.hasNext),#end
+      ${column.javaField}:#if($column.javaType == 'String' || ($!column.dictType && $column.dictType != '')) ''#else undefined#end#if($foreach.hasNext),#end
   #end
 #end
   };
@@ -91,16 +91,22 @@ function closeDrawer() {
 async function handleSubmit() {
   await validate();
 
+  #set($operateColumns = [])
+  #foreach($column in $columns)#if($column.insert || $column.edit)#set($dummy = $operateColumns.add($column))#end#end
+  const { #foreach($column in $operateColumns)$column.javaField#if($foreach.hasNext), #end#end } = model;
+
   // request
   if (props.operateType === 'add') {
-    const { #foreach($column in $columns)#if($column.insert)$column.javaField#if($foreach.hasNext), #end#end#end } = model;
-    const { error } = await fetchCreate${BusinessName}({ #foreach($column in $columns)#if($column.insert)$column.javaField#if($foreach.hasNext), #end#end#end });
+    #set($addFields = [])
+    #foreach($column in $columns)#if($column.insert)#set($dummy = $addFields.add($column.javaField))#end#end
+    const { error } = await fetchCreate${BusinessName}({ #foreach($field in $addFields)$field#if($foreach.hasNext), #end#end });
     if (error) return;
   }
 
   if (props.operateType === 'edit') {
-    const { #foreach($column in $columns)#if($column.edit)$column.javaField#if($foreach.hasNext), #end#end#end } = model;
-    const { error } = await fetchUpdate${BusinessName}({ #foreach($column in $columns)#if($column.edit)$column.javaField#if($foreach.hasNext), #end#end#end });
+    #set($editFields = [])
+    #foreach($column in $columns)#if($column.edit)#set($dummy = $editFields.add($column.javaField))#end#end
+    const { error } = await fetchUpdate${BusinessName}({ #foreach($field in $editFields)$field#if($foreach.hasNext), #end#end });
     if (error) return;
   }
 
@@ -130,7 +136,7 @@ watch(visible, () => {
 #else
 #set($comment=$column.columnComment)
 #end
-#set($dictType=$column.dictType)
+#set($dictType=$!StrUtil.toCamelCase($column.dictType))
         <NFormItem label="$column.columnComment" path="$column.javaField">
         #if($column.htmlType == "textarea" || $column.htmlType == "editor")
           <NInput
@@ -143,7 +149,7 @@ watch(visible, () => {
           <NSelect
             v-model:value="model.$column.javaField"
             placeholder="请选择$column.columnComment"
-            :options="${column.dictType}Options"
+            :options="${dictType}Options"
             clearable
           />
         #elseif($column.htmlType == "select" && $dictType)
@@ -157,7 +163,7 @@ watch(visible, () => {
           <NRadioGroup v-model:value="model.$column.javaField">
             <NSpace>
               <NRadio
-                v-for="option in ${column.dictType}Options"
+                v-for="option in ${dictType}Options"
                 :key="option.value"
                 :value="option.value"
                 :label="option.label"
@@ -170,13 +176,36 @@ watch(visible, () => {
               <NRadio value="0" label="请选择字典生成" />
             </NSpace>
           </NRadioGroup>
-        #elseif($column.htmlType == "datetime")
+        #elseif($column.htmlType == "checkbox" && "" != $dictType)
+          <NCheckboxGroup v-model:value="model.$column.javaField">
+            <NSpace>
+              <NCheckbox
+                v-for="option in ${dictType}Options"
+                :key="option.value"
+                :value="option.value"
+                :label="option.label"
+              />
+            </NSpace>
+          </NCheckboxGroup>
+        #elseif($column.htmlType == "checkbox" && $dictType)
+          <NCheckboxGroup v-model:value="model.$column.javaField">
+            <NSpace>
+              <NCheckbox value="0" label="请选择字典生成" />
+            </NSpace>
+          </NCheckboxGroup>
+        #elseif($column.htmlType == 'datetime')
           <NDatePicker
             v-model:formatted-value="model.$column.javaField"
-            type="date"
+            type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss"
             clearable
           />
+        #elseif($column.htmlType == "imageUpload")
+          <OssUpload v-model:value="model.$column.javaField" upload-type="image" />
+        #elseif($column.htmlType == "fileUpload")
+          <OssUpload v-model:value="model.$column.javaField" upload-type="file" />
+        #elseif($column.htmlType == "editor")
+          <TinymceEditor v-model:value="model.$column.javaField" />
 #else          <NInput v-model:value="model.$column.javaField" placeholder="请输入$column.columnComment" />
     #end
         </NFormItem>

docs/template/modules/search.vue.vm

@@ -50,7 +50,7 @@ async function search() {
         #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
   if (dateRange${AttrName}.value?.length) {
     model.value.params!.begin${AttrName} = dateRange${AttrName}.value[0];
-    model.value.params!.end${AttrName} = dateRange${AttrName}.value[0];
+    model.value.params!.end${AttrName} = dateRange${AttrName}.value[1];
   }
     #end
 #end
@@ -66,7 +66,7 @@ async function search() {
           <NGrid responsive="screen" item-responsive>
 #foreach($column in $columns)
 #if($column.query)
-#set($dictType=$column.dictType)
+#set($dictType=$!StrUtil.toCamelCase($column.dictType))
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
@@ -75,35 +75,28 @@ async function search() {
 #set($comment=$column.columnComment)
 #end
             <NFormItemGi span="24 s:12 m:6" label="$column.columnComment" path="$column.javaField" class="pr-24px">
-            #if(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+            #if($!StrUtil.contains("select, radio, checkbox", $column.htmlType) && $dictType && "" != $dictType)
               <NSelect
                 v-model:value="model.$column.javaField"
                 placeholder="请选择$column.columnComment"
-                :options="${column.dictType}Options"
+                :options="${dictType}Options"
                 clearable
               />
-            #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+            #elseif($!StrUtil.contains("select, radio, checkbox", $column.htmlType))
               <NSelect
                 v-model:value="model.$column.javaField"
                 placeholder="请选择$column.columnComment"
                 :options="[]"
                 clearable
               />
-            #elseif($column.htmlType.equals('select') || $column.htmlType.equals('radio'))
-              <NSelect
-                v-model:value="model.$column.javaField"
-                placeholder="请选择$column.columnComment"
-                :options="[]"
-                clearable
-              />
-            #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+            #elseif($column.htmlType == 'datetime' && $column.queryType != "BETWEEN")
               <NDatePicker
                 v-model:formatted-value="model.$column.javaField"
-                type="date"
-                value-format="yyyy-MM-dd"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 clearable
               />
-            #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+            #elseif($column.htmlType == 'datetime' && $column.queryType == "BETWEEN")
               <NDatePicker
                 v-model:formatted-value="dateRange${AttrName}"
                 type="datetimerange"

docs/template/typings/api.d.ts.vm

@@ -1,44 +1,51 @@
 #set($BaseEntity = ['createDept', 'createBy', 'createTime', 'updateBy', 'updateTime'])
 #set($ModuleName = $moduleName.substring(0, 1).toUpperCase() + $moduleName.substring(1))
 /**
- * namespace ${ModuleName}
+ * Namespace Api
  *
- * backend api module: "${ModuleName}"
+ * All backend api type
  */
-namespace ${ModuleName} {
-    /** ${businessname} */
-    type ${BusinessName} = Common.CommonRecord<{
-        #foreach($column in $columns)#if(!$BaseEntity.contains($column.javaField))
-        /** $column.columnComment */
-        $column.javaField:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) CommonType.IdType; #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number; #elseif($column.javaType == 'Boolean') boolean; #else string; #end
-        #end#end
-    }>;
+declare namespace Api {
+    /**
+     * namespace ${ModuleName}
+     *
+     * backend api module: "${ModuleName}"
+     */
+    namespace ${ModuleName} {
+        /** ${businessname} */
+        type ${BusinessName} = Common.CommonRecord<{
+            #foreach($column in $columns)#if(!$BaseEntity.contains($column.javaField))
+            /** $column.columnComment */
+                $column.javaField:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) CommonType.IdType; #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number; #elseif($column.javaType == 'Boolean') boolean; #else string; #end
+            #end#end
+        }>;
 
-    /** ${businessname} search params */
-    type ${BusinessName}SearchParams = CommonType.RecordNullable<
-      Pick<
-        Api.${ModuleName}.${BusinessName},
-        #foreach($column in $columns)
-            #if($column.query && $column.queryType != 'BETWEEN')
-        | '${column.javaField}'
-            #end
-        #end
-      > &
-        Api.Common.CommonSearchParams
-    >;
+        /** ${businessname} search params */
+        type ${BusinessName}SearchParams = CommonType.RecordNullable<
+            Pick<
+                Api.${ModuleName}.${BusinessName},
+                #foreach($column in $columns)
+                    #if($column.query && $column.queryType != 'BETWEEN')
+                        | '${column.javaField}'
+                    #end
+                #end
+            > &
+            Api.Common.CommonSearchParams
+        >;
 
-    /** ${businessname} operate params */
-    type ${BusinessName}OperateParams = CommonType.RecordNullable<
-      Pick<
-        Api.${ModuleName}.${BusinessName},
-        #foreach($column in $columns)
-            #if($column.insert || $column.edit)
-        | '${column.javaField}'
-            #end
-        #end
-      >
-    >;
+        /** ${businessname} operate params */
+        type ${BusinessName}OperateParams = CommonType.RecordNullable<
+            Pick<
+                Api.${ModuleName}.${BusinessName},
+                #foreach($column in $columns)
+                    #if($column.insert || $column.edit)
+                        | '${column.javaField}'
+                    #end
+                #end
+            >
+        >;
 
-    /** ${businessname} list */
-    type ${BusinessName}List = Api.Common.PaginatingQueryRecord<${BusinessName}>;
+        /** ${businessname} list */
+        type ${BusinessName}List = Api.Common.PaginatingQueryRecord<${BusinessName}>;
+    }
 }

index.html

@@ -2,7 +2,7 @@
 <html lang="zh-cmn-Hans">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" href="/favicon.png" />
+    <link rel="icon" href="/favicon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="color-scheme" content="light dark" />
     <title>%VITE_APP_TITLE%</title>

package.json

@@ -1,15 +1,15 @@
 {
   "name": "ruoyi-vue-plus",
   "type": "module",
-  "version": "1.0.0",
-  "description": "RuoYi-Vue-Plus多租户管理系统",
+  "version": "1.1.2",
+  "description": "结合了 RuoYi-Vue-Plus 的强大后端功能和 Soybean Admin 的现代化前端特性，为开发者提供了完整的企业管理解决方案。",
   "author": {
     "name": "xlsea",
-    "email": "xlsea@linux.do",
-    "url": "https://gitee.com/xlsea/ruoyi-plus-soybean"
+    "email": "m@xlsea.cn",
+    "url": "https://gitee.com/xlsea"
   },
   "license": "MIT",
-  "homepage": "https://ruoyi.xlsea.cn",
+  "homepage": "https://docs.ruoyi.xlsea.cn",
   "repository": {
     "url": "https://gitee.com/xlsea/ruoyi-plus-soybean.git"
   },
@@ -18,33 +18,44 @@
   },
   "keywords": [
     "RuoYi-Vue-Plus",
+    "Soybean Admin",
     "Vue3 admin ",
     "vue-admin-template",
-    "Vite6",
+    "Vite7",
     "TypeScript",
     "naive-ui",
     "naive-ui-admin",
     "UnoCSS"
   ],
+  "contributors": [
+    {
+      "name": "Elio",
+      "email": "1983933789@qq.com",
+      "url": "https://gitee.com/elio-an"
+    }
+  ],
   "engines": {
-    "node": ">=18.20.0",
-    "pnpm": ">=8.7.0"
+    "node": ">=20.19.0",
+    "pnpm": ">=10.5.0"
   },
   "scripts": {
     "build": "vite build --mode prod",
     "build:dev": "vite build --mode dev",
+    "build:tauri": "pnpm tauri build",
     "build:test": "vite build --mode test",
     "cleanup": "sa cleanup",
     "commit": "sa git-commit",
     "commit:zh": "sa git-commit -l=zh-cn",
     "dev": "vite --mode dev",
     "dev:prod": "vite --mode prod",
+    "dev:tauri": "pnpm tauri dev",
     "dev:test": "vite --mode test",
     "gen-route": "sa gen-route",
     "lint": "eslint . --fix",
     "prepare": "simple-git-hooks",
     "preview": "vite preview",
     "release": "sa release",
+    "tauri-icon": "pnpm tauri icon ./public/logo.png",
     "typecheck": "vue-tsc --noEmit --skipLibCheck",
     "update-pkg": "sa update-pkg"
   },
@@ -57,7 +68,9 @@
     "@sa/materials": "workspace:*",
     "@sa/tinymce": "workspace:*",
     "@sa/utils": "workspace:*",
-    "@vueuse/core": "13.1.0",
+    "@tauri-apps/api": "2.5.0",
+    "@types/streamsaver": "^2.0.5",
+    "@vueuse/core": "13.5.0",
     "clipboard": "2.0.11",
     "dayjs": "1.11.13",
     "defu": "6.1.4",
@@ -65,51 +78,53 @@
     "highlight.js": "^11.11.1",
     "jsencrypt": "^3.3.2",
     "json5": "2.2.3",
-    "monaco-editor": "^0.52.0",
-    "naive-ui": "2.41.0",
+    "monaco-editor": "^0.52.2",
+    "naive-ui": "2.42.0",
     "nprogress": "0.2.0",
-    "pinia": "3.0.2",
-    "tailwind-merge": "3.2.0",
-    "vue": "3.5.13",
+    "pinia": "3.0.3",
+    "streamsaver": "^2.0.6",
+    "tailwind-merge": "3.3.1",
+    "vue": "3.5.17",
     "vue-advanced-cropper": "^2.8.9",
     "vue-draggable-plus": "0.6.0",
-    "vue-i18n": "11.1.3",
+    "vue-i18n": "11.1.9",
     "vue-router": "4.5.1"
   },
   "devDependencies": {
     "@elegant-router/vue": "0.3.8",
-    "@iconify/json": "2.2.337",
+    "@iconify/json": "2.2.357",
     "@sa/scripts": "workspace:*",
     "@sa/uno-preset": "workspace:*",
-    "@soybeanjs/eslint-config": "1.6.0",
-    "@types/node": "22.15.17",
+    "@soybeanjs/eslint-config": "1.7.1",
+    "@tauri-apps/cli": "2.5.0",
+    "@types/node": "24.0.13",
     "@types/nprogress": "0.2.3",
-    "@unocss/eslint-config": "66.1.1",
-    "@unocss/preset-icons": "66.1.1",
-    "@unocss/preset-uno": "66.1.1",
-    "@unocss/transformer-directives": "66.1.1",
-    "@unocss/transformer-variant-group": "66.1.1",
-    "@unocss/vite": "66.1.1",
-    "@vitejs/plugin-vue": "5.2.4",
-    "@vitejs/plugin-vue-jsx": "4.1.2",
+    "@unocss/eslint-config": "66.3.3",
+    "@unocss/preset-icons": "66.3.3",
+    "@unocss/preset-uno": "66.3.3",
+    "@unocss/transformer-directives": "66.3.3",
+    "@unocss/transformer-variant-group": "66.3.3",
+    "@unocss/vite": "66.3.3",
+    "@vitejs/plugin-vue": "6.0.0",
+    "@vitejs/plugin-vue-jsx": "5.0.1",
     "consola": "3.4.2",
-    "eslint": "9.26.0",
-    "eslint-plugin-vue": "10.1.0",
+    "eslint": "9.31.0",
+    "eslint-plugin-vue": "10.3.0",
     "kolorist": "1.8.0",
-    "sass": "1.88.0",
+    "sass": "1.89.2",
     "simple-git-hooks": "2.13.0",
-    "tsx": "4.19.4",
+    "tsx": "4.20.3",
     "typescript": "5.8.3",
     "unplugin-icons": "22.1.0",
-    "unplugin-vue-components": "28.5.0",
-    "vite": "6.3.5",
+    "unplugin-vue-components": "28.8.0",
+    "vite": "7.0.4",
     "vite-plugin-monaco-editor": "^1.1.0",
     "vite-plugin-progress": "0.0.7",
-    "vite-plugin-static-copy": "^3.0.0",
+    "vite-plugin-static-copy": "^3.1.0",
     "vite-plugin-svg-icons": "2.0.1",
-    "vite-plugin-vue-devtools": "7.7.6",
-    "vue-eslint-parser": "10.1.3",
-    "vue-tsc": "2.2.10"
+    "vite-plugin-vue-devtools": "7.7.7",
+    "vue-eslint-parser": "10.2.0",
+    "vue-tsc": "3.0.1"
   },
   "simple-git-hooks": {
     "commit-msg": "pnpm sa git-commit-verify",

packages/alova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/alova",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "exports": {
     ".": "./src/index.ts",
     "./fetch": "./src/fetch.ts",
@@ -13,8 +13,8 @@
     }
   },
   "dependencies": {
-    "@alova/mock": "2.0.14",
+    "@alova/mock": "2.0.17",
     "@sa/utils": "workspace:*",
-    "alova": "3.2.10"
+    "alova": "3.3.4"
   }
 }

packages/axios/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/axios",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "exports": {
     ".": "./src/index.ts"
   },
@@ -11,11 +11,11 @@
   },
   "dependencies": {
     "@sa/utils": "workspace:*",
-    "axios": "1.9.0",
+    "axios": "1.10.0",
     "axios-retry": "4.5.0",
     "qs": "6.14.0"
   },
   "devDependencies": {
-    "@types/qs": "6.9.18"
+    "@types/qs": "6.14.0"
   }
 }

packages/color/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/color",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "exports": {
     ".": "./src/index.ts"
   },

packages/hooks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/hooks",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "exports": {
     ".": "./src/index.ts"
   },

packages/materials/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/materials",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "exports": {
     ".": "./src/index.ts"
   },
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@sa/utils": "workspace:*",
-    "simplebar-vue": "2.4.1"
+    "simplebar-vue": "2.4.2"
   },
   "devDependencies": {
     "typed-css-modules": "0.9.1"

packages/ofetch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/fetch",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "exports": {
     ".": "./src/index.ts"
   },

packages/scripts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/scripts",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "bin": {
     "sa": "./bin.ts"
   },
@@ -14,12 +14,12 @@
   },
   "devDependencies": {
     "@soybeanjs/changelog": "0.3.24",
-    "bumpp": "10.1.0",
-    "c12": "3.0.3",
+    "bumpp": "10.2.0",
+    "c12": "3.0.4",
     "cac": "6.7.14",
     "consola": "3.4.2",
     "enquirer": "2.4.1",
-    "execa": "9.5.3",
+    "execa": "9.6.0",
     "kolorist": "1.8.0",
     "npm-check-updates": "18.0.1",
     "rimraf": "6.0.1"

packages/scripts/src/config/index.ts

@@ -5,7 +5,7 @@ import type { CliOption } from '../types';
 const defaultOptions: CliOption = {
   cwd: process.cwd(),
   cleanupDirs: [
-    '**/dist',
+    'dist',
     '**/package-lock.json',
     '**/yarn.lock',
     '**/pnpm-lock.yaml',

packages/tinymce/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/tinymce",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "exports": {
     ".": "./src/index.ts"
   },
@@ -10,9 +10,9 @@
     }
   },
   "dependencies": {
-    "tinymce": "7.8.0"
+    "tinymce": "7.9.1"
   },
   "devDependencies": {
-    "@tinymce/tinymce-vue": "6.1.0"
+    "@tinymce/tinymce-vue": "6.2.0"
   }
 }

packages/uno-preset/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/uno-preset",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "exports": {
     ".": "./src/index.ts"
   },

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sa/utils",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "exports": {
     ".": "./src/index.ts"
   },

public/favicon.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 476.22 476.22">
+  <path fill="#0e42d2" d="M389.98,400.6c-64.58,76.59-176.66,93.98-261.1,38.54-57.75-37.91-92.29-103.74-87.69-173.54,1.28-19.35,9.54-58.77,33.33-61.44,20.49-2.29,43.2,14.41,62.99,21.14,64.93,22.1,150.88,21.39,214.51-4.81,17.24-7.1,39.23-23.9,58.05-13.31,25.61,14.41,27.13,67.07,24.38,92.75-3.94,36.78-20.9,72.7-44.47,100.65ZM150.91,269c-17.4-4.01-34.19-9.87-50.5-17.04-2.56-1.12-15.17-8.19-16.64-6.83-23.51,92.25,48.81,179.87,140.64,188.01,3.68.33,9,.72,12.64.79,3.76.07,7.18-.41,10.86-.78-.24-3.7-1.05-7.05-.77-10.85,1.3-17.71,28.61-26.36,26.88-43.25-.89-8.76-14.85-11.03-22.02-11.55-8.23-.6-17.94,1.77-25.24-3.11-5.39-3.61-5.08-10.32-7.37-15.76-4.74-11.26-15.86-17.54-27.79-18.47-22.55-1.77-68.52,7.5-81.87-16.63-11.77-21.27,12.24-35.1,29.25-40.42,3.38-1.06,7.52-1.31,10.88-2.55,1.03-.38,1.28.27,1.04-1.56ZM391.83,245.21c-1.03-.58-12.51,5.5-14.65,6.42-20.82,8.92-42.01,16.02-64.2,20.87-10.31,2.25-21.7,3.15-31.66,5.65-19.17,4.82-17.59,22.78-.42,29.11,10.27,3.78,25.34,3.94,36.56,5.97,23.56,4.26,56.74,11.28,53.56,41.93-.31,2.98-2.13,5.86-2.26,8.2-.08,1.48.18,1.21,1.5,1.13,5.18-9.87,11.46-19.09,15.7-29.46,7.55-18.44,12.19-42.75,11.17-62.68-.19-3.67-2.95-25.81-5.31-27.15Z"/>
+  <path fill="#0e42d2" d="M278.22,21.54c4.79,5.69,9.27,14.39,11.84,21.37.67,1.8,1.49,7.86,2.59,8.61,1.49,1.01,17.78-3.63,21.39-4.05,71.76-8.37,101.88,65.14,44.46,110.3-41.92,32.98-84.43,32.67-135.62,31.41-47.74-1.18-111.25-13.52-129.97-64.78-19.66-53.81,31.01-83.19,77.15-58.5,2,1.07,11.58,7.79,12.54,7.59,1.57-.32,1.05-4.62,1.34-6.14,3.75-19.76,11.37-39.47,27.8-52.04,20.82-15.93,49.31-14.16,66.47,6.23ZM256.71,71.1c1.07-24.31-18.03-42.71-30.8-12.52-5.88,13.9-7.77,32.56-3.36,47,1.73.46,1.24-.41,1.7-.95,10.15-11.8,19.02-25.11,32.46-33.52ZM340.18,123.96c10.12-10.37,17.92-27.48.94-35.85-29-14.31-83.74,17.89-87.91,49.24-1.6,11.97,2.2,14.36,13.71,14.53,21.84.32,57.86-12.13,73.26-27.92ZM173.64,117.92c-4.77-6.36-9.81-11.55-16.53-15.93-7.07-4.62-24.6-13.3-29.47-2.16-3.94,9.02,6.8,23.05,13.43,28.86,12.36,10.83,29.63,16.76,45.66,19.42-.28-11.02-6.62-21.58-13.08-30.19Z"/>
+</svg>

public/streamsaver/mitm.html

@@ -0,0 +1,179 @@
+<!--
+	mitm.html is the lite "man in the middle"
+
+	This is only meant to signal the opener's messageChannel to
+	the service worker - when that is done this mitm can be closed
+    but it's better to keep it alive since this also stops the sw
+    from restarting
+
+	The service worker is capable of intercepting all request and fork their
+	own "fake" response - wish we are going to craft
+	when the worker then receives a stream then the worker will tell the opener
+	to open up a link that will start the download
+-->
+<script>
+  // This will prevent the sw from restarting
+  let keepAlive = () => {
+    keepAlive = () => {};
+    var ping = location.href.substr(0, location.href.lastIndexOf('/')) + '/ping';
+    var interval = setInterval(() => {
+      if (sw) {
+        sw.postMessage('ping');
+      } else {
+        fetch(ping).then(res => res.text(!res.ok && clearInterval(interval)));
+      }
+    }, 10000);
+  };
+
+  // message event is the first thing we need to setup a listner for
+  // don't want the opener to do a random timeout - instead they can listen for
+  // the ready event
+  // but since we need to wait for the Service Worker registration, we store the
+  // message for later
+  let messages = [];
+  window.onmessage = evt => messages.push(evt);
+
+  let sw = null;
+  let scope = '';
+
+  function registerWorker() {
+    return navigator.serviceWorker
+      .getRegistration('./')
+      .then(swReg => {
+        return swReg || navigator.serviceWorker.register('sw.js', { scope: './' });
+      })
+      .then(swReg => {
+        const swRegTmp = swReg.installing || swReg.waiting;
+
+        scope = swReg.scope;
+
+        return (
+          (sw = swReg.active) ||
+          new Promise(resolve => {
+            swRegTmp.addEventListener(
+              'statechange',
+              (fn = () => {
+                if (swRegTmp.state === 'activated') {
+                  swRegTmp.removeEventListener('statechange', fn);
+                  sw = swReg.active;
+                  resolve();
+                }
+              })
+            );
+          })
+        );
+      });
+  }
+
+  // Now that we have the Service Worker registered we can process messages
+  function onMessage(event) {
+    let { data, ports, origin } = event;
+
+    // It's important to have a messageChannel, don't want to interfere
+    // with other simultaneous downloads
+    if (!ports || !ports.length) {
+      throw new TypeError("[StreamSaver] You didn't send a messageChannel");
+    }
+
+    if (typeof data !== 'object') {
+      throw new TypeError("[StreamSaver] You didn't send a object");
+    }
+
+    // the default public service worker for StreamSaver is shared among others.
+    // so all download links needs to be prefixed to avoid any other conflict
+    data.origin = origin;
+
+    // if we ever (in some feature versoin of streamsaver) would like to
+    // redirect back to the page of who initiated a http request
+    data.referrer = data.referrer || document.referrer || origin;
+
+    // pass along version for possible backwards compatibility in sw.js
+    data.streamSaverVersion = new URLSearchParams(location.search).get('version');
+
+    if (data.streamSaverVersion === '1.2.0') {
+      console.warn('[StreamSaver] please update streamsaver');
+    }
+
+    /** @since v2.0.0 */
+    if (!data.headers) {
+      console.warn(
+        "[StreamSaver] pass `data.headers` that you would like to pass along to the service worker\nit should be a 2D array or a key/val object that fetch's Headers api accepts"
+      );
+    } else {
+      // test if it's correct
+      // should thorw a typeError if not
+      new Headers(data.headers);
+    }
+
+    /** @since v2.0.0 */
+    if (typeof data.filename === 'string') {
+      console.warn(
+        "[StreamSaver] You shouldn't send `data.filename` anymore. It should be included in the Content-Disposition header option"
+      );
+      // Do what File constructor do with fileNames
+      data.filename = data.filename.replace(/\//g, ':');
+    }
+
+    /** @since v2.0.0 */
+    if (data.size) {
+      console.warn(
+        "[StreamSaver] You shouldn't send `data.size` anymore. It should be included in the content-length header option"
+      );
+    }
+
+    /** @since v2.0.0 */
+    if (data.readableStream) {
+      console.warn('[StreamSaver] You should send the readableStream in the messageChannel, not throught mitm');
+    }
+
+    /** @since v2.0.0 */
+    if (!data.pathname) {
+      console.warn('[StreamSaver] Please send `data.pathname` (eg: /pictures/summer.jpg)');
+      data.pathname = Math.random().toString().slice(-6) + '/' + data.filename;
+    }
+
+    // remove all leading slashes
+    data.pathname = data.pathname.replace(/^\/+/g, '');
+
+    // remove protocol
+    let org = origin.replace(/(^\w+:|^)\/\//, '');
+
+    // set the absolute pathname to the download url.
+    data.url = new URL(`${scope + org}/${data.pathname}`).toString();
+
+    if (!data.url.startsWith(`${scope + org}/`)) {
+      throw new TypeError('[StreamSaver] bad `data.pathname`');
+    }
+
+    // This sends the message data as well as transferring
+    // messageChannel.port2 to the service worker. The service worker can
+    // then use the transferred port to reply via postMessage(), which
+    // will in turn trigger the onmessage handler on messageChannel.port1.
+
+    const transferable = data.readableStream ? [ports[0], data.readableStream] : [ports[0]];
+
+    if (!(data.readableStream || data.transferringReadable)) {
+      keepAlive();
+    }
+
+    return sw.postMessage(data, transferable);
+  }
+
+  if (window.opener) {
+    // The opener can't listen to onload event, so we need to help em out!
+    // (telling them that we are ready to accept postMessage's)
+    window.opener.postMessage('StreamSaver::loadedPopup', '*');
+  }
+
+  if (navigator.serviceWorker) {
+    registerWorker().then(() => {
+      window.onmessage = onMessage;
+      messages.forEach(window.onmessage);
+    });
+  }
+
+  // FF v102 just started to supports transferable streams, but still needs to ping sw.js
+  // even tough the service worker dose not have to do any kind of work and listen to any
+  // messages... #305
+  keepAlive();
+</script>

public/streamsaver/sw.js

@@ -0,0 +1,132 @@
+/* eslint-disable */
+/* global self ReadableStream Response */
+
+self.addEventListener('install', () => {
+  self.skipWaiting();
+});
+
+self.addEventListener('activate', event => {
+  event.waitUntil(self.clients.claim());
+});
+
+const map = new Map();
+
+// This should be called once per download
+// Each event has a dataChannel that the data will be piped through
+self.onmessage = event => {
+  // We send a heartbeat every x second to keep the
+  // service worker alive if a transferable stream is not sent
+  if (event.data === 'ping') {
+    return;
+  }
+
+  const data = event.data;
+  const downloadUrl =
+    data.url || `${self.registration.scope + Math.random()}/${typeof data === 'string' ? data : data.filename}`;
+  const port = event.ports[0];
+  const metadata = Array.from({ length: 3 }); // [stream, data, port]
+
+  metadata[1] = data;
+  metadata[2] = port;
+
+  // Note to self:
+  // old streamsaver v1.2.0 might still use `readableStream`...
+  // but v2.0.0 will always transfer the stream through MessageChannel #94
+  if (event.data.readableStream) {
+    metadata[0] = event.data.readableStream;
+  } else if (event.data.transferringReadable) {
+    port.onmessage = evt => {
+      port.onmessage = null;
+      metadata[0] = evt.data.readableStream;
+    };
+  } else {
+    metadata[0] = createStream(port);
+  }
+
+  map.set(downloadUrl, metadata);
+  port.postMessage({ download: downloadUrl });
+};
+
+function createStream(port) {
+  // ReadableStream is only supported by chrome 52
+  return new ReadableStream({
+    start(controller) {
+      // When we receive data on the messageChannel, we write
+      port.onmessage = ({ data }) => {
+        if (data === 'end') {
+          return controller.close();
+        }
+
+        if (data === 'abort') {
+          controller.error('Aborted the download');
+          return;
+        }
+
+        controller.enqueue(data);
+      };
+    },
+    cancel(reason) {
+      console.log('user aborted', reason);
+      port.postMessage({ abort: true });
+    }
+  });
+}
+
+self.onfetch = event => {
+  const url = event.request.url;
+
+  // this only works for Firefox
+  if (url.endsWith('/ping')) {
+    return event.respondWith(new Response('pong'));
+  }
+
+  const hijacke = map.get(url);
+
+  if (!hijacke) return null;
+
+  const [stream, data, port] = hijacke;
+
+  map.delete(url);
+
+  // Not comfortable letting any user control all headers
+  // so we only copy over the length & disposition
+  const responseHeaders = new Headers({
+    'Content-Type': 'application/octet-stream; charset=utf-8',
+
+    // To be on the safe side, The link can be opened in a iframe.
+    // but octet-stream should stop it.
+    'Content-Security-Policy': "default-src 'none'",
+    'X-Content-Security-Policy': "default-src 'none'",
+    'X-WebKit-CSP': "default-src 'none'",
+    'X-XSS-Protection': '1; mode=block',
+    'Cross-Origin-Embedder-Policy': 'require-corp'
+  });
+
+  const headers = new Headers(data.headers || {});
+
+  if (headers.has('Content-Length')) {
+    responseHeaders.set('Content-Length', headers.get('Content-Length'));
+  }
+
+  if (headers.has('Content-Disposition')) {
+    responseHeaders.set('Content-Disposition', headers.get('Content-Disposition'));
+  }
+
+  // data, data.filename and size should not be used anymore
+  if (data.size) {
+    console.warn('Depricated');
+    responseHeaders.set('Content-Length', data.size);
+  }
+
+  let fileName = typeof data === 'string' ? data : data.filename;
+  if (fileName) {
+    console.warn('Depricated');
+    // Make filename RFC5987 compatible
+    fileName = encodeURIComponent(fileName).replace(/['()]/g, escape).replace(/\*/g, '%2A');
+    responseHeaders.set('Content-Disposition', `attachment; filename*=UTF-8''${fileName}`);
+  }
+
+  event.respondWith(new Response(stream, { headers: responseHeaders }));
+
+  port.postMessage({ debug: 'Download started' });
+};

src-tauri/.gitignore

@@ -0,0 +1,3 @@
+# Generated by Cargo
+# will have compiled files and executables
+/target/

src-tauri/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "app"
+version = "0.1.0"
+description = "A Tauri App"
+authors = ["you"]
+license = ""
+repository = ""
+default-run = "app"
+edition = "2021"
+rust-version = "1.60"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[build-dependencies]
+tauri-build = { version = "2", features = [] }
+
+[dependencies]
+serde_json = "1.0"
+serde = { version = "1.0", features = ["derive"] }
+tauri = { version = "2", features = [] }
+
+[features]
+# this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.
+# If you use cargo directly instead of tauri's cli you can use this feature flag to switch between tauri's `dev` and `build` modes.
+# DO NOT REMOVE!!
+custom-protocol = [ "tauri/custom-protocol" ]

src-tauri/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+  tauri_build::build()
+}

src-tauri/capabilities/migrated.json

@@ -0,0 +1,7 @@
+{
+  "identifier": "migrated",
+  "description": "permissions that were migrated from v1",
+  "local": true,
+  "windows": ["main"],
+  "permissions": ["core:default"]
+}

src-tauri/gen/schemas/capabilities.json

@@ -0,0 +1,9 @@
+{
+  "migrated": {
+    "identifier": "migrated",
+    "description": "permissions that were migrated from v1",
+    "local": true,
+    "windows": ["main"],
+    "permissions": ["core:default"]
+  }
+}

src-tauri/src/main.rs

@@ -0,0 +1,8 @@
+// Prevents additional console window on Windows in release, DO NOT REMOVE!!
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+
+fn main() {
+  tauri::Builder::default()
+    .run(tauri::generate_context!())
+    .expect("error while running tauri application");
+}

src-tauri/tauri.conf.json

@@ -0,0 +1,57 @@
+{
+  "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
+  "build": {
+    "beforeBuildCommand": "npm run build",
+    "beforeDevCommand": "npm run dev",
+    "frontendDist": "../dist",
+    "devUrl": "http://localhost:9527"
+  },
+  "bundle": {
+    "active": true,
+    "category": "DeveloperTool",
+    "copyright": "RuoYi-Plus-Soybean",
+    "targets": "all",
+    "externalBin": [],
+    "icon": ["icons/32x32.png", "icons/128x128.png", "icons/128x128@2x.png", "icons/icon.icns", "icons/icon.ico"],
+    "windows": {
+      "certificateThumbprint": null,
+      "digestAlgorithm": "sha256",
+      "timestampUrl": ""
+    },
+    "longDescription": "",
+    "macOS": {
+      "entitlements": null,
+      "exceptionDomain": "",
+      "frameworks": [],
+      "providerShortName": null,
+      "signingIdentity": null
+    },
+    "resources": [],
+    "shortDescription": "",
+    "linux": {
+      "deb": {
+        "depends": []
+      }
+    }
+  },
+  "productName": "RuoYi-Plus-Soybean",
+  "mainBinaryName": "RuoYi-Plus-Soybean",
+  "version": "1.0.0",
+  "identifier": "org.dromara.admin",
+  "plugins": {},
+  "app": {
+    "windows": [
+      {
+        "fullscreen": false,
+        "height": 768,
+        "resizable": true,
+        "title": "RuoYi-Plus-Soybean",
+        "width": 1366,
+        "useHttpsScheme": true
+      }
+    ],
+    "security": {
+      "csp": null
+    }
+  }
+}

src/App.vue

@@ -4,8 +4,8 @@ import { NConfigProvider, darkTheme } from 'naive-ui';
 import type { WatermarkProps } from 'naive-ui';
 import { useAppStore } from './store/modules/app';
 import { useThemeStore } from './store/modules/theme';
-import { naiveDateLocales, naiveLocales } from './locales/naive';
 import { useAuthStore } from './store/modules/auth';
+import { naiveDateLocales, naiveLocales } from './locales/naive';
 
 defineOptions({
   name: 'App'
@@ -27,8 +27,12 @@ const naiveDateLocale = computed(() => {
 
 const watermarkProps = computed<WatermarkProps>(() => {
   const appTitle = import.meta.env.VITE_APP_TITLE || 'RuoYi-Vue-Plus';
+  const content =
+    themeStore.watermark.enableUserName && userInfo.user?.userName
+      ? `${userInfo.user?.nickName}@${appTitle} ${userInfo.user?.userName}`
+      : appTitle;
   return {
-    content: userInfo.user?.userName ? `${userInfo.user?.nickName}@${appTitle} ${userInfo.user?.userName}` : appTitle,
+    content,
     cross: true,
     fullscreen: true,
     fontSize: 14,