Pre Merge pull request !411 from 死亡诗人/master

README.md

@@ -17,8 +17,8 @@
 * 后端采用Spring Boot、Spring Cloud & Alibaba。
 * 注册中心、配置中心选型Nacos，权限认证使用Redis。
 * 流量控制框架选型Sentinel，分布式事务选型Seata。
-* 提供了技术栈（Vue3 Element Plus Vite）的 [RuoYi-Cloud-Vue3](https://gitcode.com/yangzongzhuan/RuoYi-Cloud-Vue3)版本，以及技术栈（TypeScript）的 [RuoYi-Cloud-Vue3-TypeScript](https://gitcode.com/yangzongzhuan/RuoYi-Cloud-Vue3/tree/typescript)版本，两者保持同步更新。
+* 提供了技术栈（[Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)）版本[RuoYi-Cloud-Vue3](https://gitcode.com/yangzongzhuan/RuoYi-Cloud-Vue3)，保持同步更新。
-* 提供了适配 Spring Boot 3 的版本分支 [RuoYi-Cloud (springboot3)](https://gitee.com/y_project/RuoYi-Cloud/tree/springboot3)，与 Oracle数据库版本 [RuoYi-Cloud-Oracle](https://gitcode.com/yangzongzhuan/RuoYi-Cloud-Oracle)，均保持同步更新。
+* 如需不分离应用，请移步 [RuoYi](https://gitee.com/y_project/RuoYi)，如需分离应用，请移步 [RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue)
 * 阿里云优惠券：[点我进入](http://aly.ruoyi.vip)，腾讯云优惠券：[点我进入](http://txy.ruoyi.vip)  
 
 ## 系统模块
@@ -74,21 +74,6 @@ com.ruoyi
 16. 在线构建器：拖动表单元素生成相应的HTML代码。
 17. 连接池监视：监视当前系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。
 
-# 版本对比
-
-RuoYi-Cloud 前端项目的三个主要演进版本，方便你直观对比其技术栈差异（并行开发维护）。
-
-| 项目名称      | **RuoYi-Cloud** | **RuoYi-Cloud-Vue3** | **RuoYi-Cloud-Vue3-TypeScript**   |
-| :---          | :---            | :---                 | :---                              |
-| **前端框架**  | Vue 2           | Vue 3                | Vue 3                             |
-| **脚本语言**  | JavaScript      | JavaScript           | TypeScript                        |
-| **构建工具**  | Vue CLI         | Vite                 | Vite                              |
-| **UI 组件库** | Element UI      | Element Plus         | Element Plus                      |
-| **状态管理**  | Vuex            | Pinia                | Pinia                             |
-| **路由管理**  | Vue Router 3    | Vue Router 4         | Vue Router 4                      |
-| **核心特点**  | 1. 技术栈经典稳定<br>2. 社区资料丰富<br>3. 当前维护重心已转移 | 1. 现代前端技术栈<br>2. 开发体验与性能更优<br>3. 官方主推的活跃版本 | 1. 类型加持，减少沟通成本<br>2. 开发时有提示，效率更高<br>3. 多人协作企业级开发项目 |
-| **仓库地址**  | [RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud) | [RuoYi-Cloud-Vue3](https://gitcode.com/yangzongzhuan/RuoYi-Cloud-Vue3) | [RuoYi-Cloud-Vue3-TypeScript](https://gitcode.com/yangzongzhuan/RuoYi-Cloud-Vue3/tree/typescript) |
-
 ## 在线体验
 
 - admin/admin123  

docker/docker-compose.yml

@@ -7,10 +7,16 @@ services:
       context: ./nacos
     environment:
       - MODE=standalone
+      # Nacos 2.2+ 需要设置以下启动参数
+      - NACOS_AUTH_TOKEN=U2VjcmV0S2V5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5
+      - NACOS_AUTH_IDENTITY_KEY=serverIdentity
+      - NACOS_AUTH_IDENTITY_VALUE=security
     volumes:
       - ./nacos/logs/:/home/nacos/logs
       - ./nacos/conf/application.properties:/home/nacos/conf/application.properties
     ports:
+      # Nacos  2.0+ 默认管理端口
+      - "8864:8080"
       - "8848:8848"
       - "9848:9848"
       - "9849:9849"

docker/nacos/conf/application.properties

@@ -22,8 +22,8 @@ nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/
 
 nacos.core.auth.system.type=nacos
 nacos.core.auth.enabled=false
-nacos.core.auth.default.token.expire.seconds=18000
+nacos.core.auth.plugin.nacos.token.expire.seconds=18000
-nacos.core.auth.default.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789
+nacos.core.auth.plugin.nacos.token.secret.key=U2VjcmV0S2V5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5
 nacos.core.auth.caching.enabled=true
 nacos.core.auth.enable.userAgentAuthWhite=false
 nacos.core.auth.server.identity.key=serverIdentity

ruoyi-ui/src/api/system/user.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import { parseStrEmpty } from "@/utils/ruoyi"
+import { parseStrEmpty } from "@/utils/ruoyi";
 
 // 查询用户列表
 export function listUser(query) {

ruoyi-ui/src/components/HeaderSearch/index.vue

@@ -118,6 +118,8 @@ export default {
       this.fuse = new Fuse(list, {
         shouldSort: true,
         threshold: 0.4,
+        location: 0,
+        distance: 100,
         minMatchCharLength: 1,
         keys: [{
           name: 'title',

ruoyi-ui/src/views/monitor/job/index.vue

@@ -477,13 +477,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.jobId != undefined) {
-            updateJob(this.form).then(() => {
+            updateJob(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addJob(this.form).then(() => {
+            addJob(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();

ruoyi-ui/src/views/register.vue

@@ -128,7 +128,7 @@ export default {
       this.$refs.registerForm.validate(valid => {
         if (valid) {
           this.loading = true
-          register(this.registerForm).then(() => {
+          register(this.registerForm).then(res => {
             const username = this.registerForm.username
             this.$alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", '系统提示', {
               dangerouslyUseHTMLString: true,

ruoyi-ui/src/views/system/config/index.vue

@@ -301,13 +301,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.configId != undefined) {
-            updateConfig(this.form).then(() => {
+            updateConfig(this.form).then(response => {
               this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
             })
           } else {
-            addConfig(this.form).then(() => {
+            addConfig(this.form).then(response => {
               this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()

ruoyi-ui/src/views/system/dept/index.vue

@@ -311,13 +311,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.deptId != undefined) {
-            updateDept(this.form).then(() => {
+            updateDept(this.form).then(response => {
               this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
             })
           } else {
-            addDept(this.form).then(() => {
+            addDept(this.form).then(response => {
               this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()

ruoyi-ui/src/views/system/dict/data.vue

@@ -363,14 +363,14 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.dictCode != undefined) {
-            updateData(this.form).then(() => {
+            updateData(this.form).then(response => {
               this.$store.dispatch('dict/removeDict', this.queryParams.dictType)
               this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
             })
           } else {
-            addData(this.form).then(() => {
+            addData(this.form).then(response => {
               this.$store.dispatch('dict/removeDict', this.queryParams.dictType)
               this.$modal.msgSuccess("新增成功")
               this.open = false

ruoyi-ui/src/views/system/dict/index.vue

@@ -304,13 +304,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.dictId != undefined) {
-            updateType(this.form).then(() => {
+            updateType(this.form).then(response => {
               this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
             })
           } else {
-            addType(this.form).then(() => {
+            addType(this.form).then(response => {
               this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()

ruoyi-ui/src/views/system/menu/index.vue

@@ -448,13 +448,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.menuId != undefined) {
-            updateMenu(this.form).then(() => {
+            updateMenu(this.form).then(response => {
               this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
             })
           } else {
-            addMenu(this.form).then(() => {
+            addMenu(this.form).then(response => {
               this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()

ruoyi-ui/src/views/system/notice/index.vue

@@ -282,13 +282,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.noticeId != undefined) {
-            updateNotice(this.form).then(() => {
+            updateNotice(this.form).then(response => {
               this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
             })
           } else {
-            addNotice(this.form).then(() => {
+            addNotice(this.form).then(response => {
               this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()

ruoyi-ui/src/views/system/post/index.vue

@@ -273,13 +273,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.postId != undefined) {
-            updatePost(this.form).then(() => {
+            updatePost(this.form).then(response => {
               this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
             })
           } else {
-            addPost(this.form).then(() => {
+            addPost(this.form).then(response => {
               this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()

ruoyi-ui/src/views/system/role/authUser.vue

@@ -184,7 +184,7 @@ export default {
       }).catch(() => {})
     },
     /** 批量取消授权按钮操作 */
-    cancelAuthUserAll() {
+    cancelAuthUserAll(row) {
       const roleId = this.queryParams.roleId
       const userIds = this.userIds.join(",")
       this.$modal.confirm('是否取消选中用户授权数据项？').then(function() {

ruoyi-ui/src/views/system/role/index.vue

@@ -557,14 +557,14 @@ export default {
         if (valid) {
           if (this.form.roleId != undefined) {
             this.form.menuIds = this.getMenuAllCheckedKeys()
-            updateRole(this.form).then(() => {
+            updateRole(this.form).then(response => {
               this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
             })
           } else {
             this.form.menuIds = this.getMenuAllCheckedKeys()
-            addRole(this.form).then(() => {
+            addRole(this.form).then(response => {
               this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()
@@ -577,7 +577,7 @@ export default {
     submitDataScope: function() {
       if (this.form.roleId != undefined) {
         this.form.deptIds = this.getDeptAllCheckedKeys()
-        dataScope(this.form).then(() => {
+        dataScope(this.form).then(response => {
           this.$modal.msgSuccess("修改成功")
           this.openDataScope = false
           this.getList()

ruoyi-ui/src/views/system/user/authRole.vue

@@ -108,7 +108,7 @@ export default {
     submitForm() {
       const userId = this.form.userId
       const roleIds = this.roleIds.join(",")
-      updateAuthRole({ userId: userId, roleIds: roleIds }).then(() => {
+      updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => {
         this.$modal.msgSuccess("授权成功")
         this.close()
       })

ruoyi-ui/src/views/system/user/index.vue

@@ -476,7 +476,7 @@ export default {
           }
         },
       }).then(({ value }) => {
-          resetUserPwd(row.userId, value).then(() => {
+          resetUserPwd(row.userId, value).then(response => {
             this.$modal.msgSuccess("修改成功，新密码是：" + value)
           })
         }).catch(() => {})
@@ -491,13 +491,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.userId != undefined) {
-            updateUser(this.form).then(() => {
+            updateUser(this.form).then(response => {
               this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
             })
           } else {
-            addUser(this.form).then(() => {
+            addUser(this.form).then(response => {
               this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()

ruoyi-ui/src/views/system/user/profile/resetPwd.vue

@@ -55,7 +55,7 @@ export default {
     submit() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(() => {
+          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
             this.$modal.msgSuccess("修改成功")
           })
         }

ruoyi-ui/src/views/system/user/profile/userInfo.vue

@@ -72,7 +72,7 @@ export default {
     submit() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          updateUserProfile(this.form).then(() => {
+          updateUserProfile(this.form).then(response => {
             this.$modal.msgSuccess("修改成功")
             this.user.phonenumber = this.form.phonenumber
             this.user.email = this.form.email

ruoyi-ui/src/views/tool/gen/index.vue

@@ -87,9 +87,9 @@
           <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="表名称" align="center" prop="tableName" :show-overflow-tooltip="true" width="140" />
+      <el-table-column label="表名称" align="center" prop="tableName" :show-overflow-tooltip="true" width="120" />
-      <el-table-column label="表描述" align="center" prop="tableComment" :show-overflow-tooltip="true" width="140" />
+      <el-table-column label="表描述" align="center" prop="tableComment" :show-overflow-tooltip="true" width="120" />
-      <el-table-column label="实体" align="center" prop="className" :show-overflow-tooltip="true" width="140" />
+      <el-table-column label="实体" align="center" prop="className" :show-overflow-tooltip="true" width="120" />
       <el-table-column label="创建时间" align="center" prop="createTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="160" />
       <el-table-column label="更新时间" align="center" prop="updateTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="160" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -249,7 +249,7 @@ export default {
         return
       }
       if(row.genType === "1") {
-        genCode(row.tableName).then(() => {
+        genCode(row.tableName).then(response => {
           this.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath)
         })
       } else {

sql/ry_20250523.sql

@@ -178,7 +178,7 @@ insert into sys_menu values('108',  '日志管理',       '1',   '9', 'log',
 insert into sys_menu values('109',  '在线用户',       '2',   '1', 'online',     'monitor/online/index',              '', '', 1, 0, 'C', '0', '0', 'monitor:online:list',     'online',        'admin', sysdate(), '', null, '在线用户菜单');
 insert into sys_menu values('110',  '定时任务',       '2',   '2', 'job',        'monitor/job/index',                 '', '', 1, 0, 'C', '0', '0', 'monitor:job:list',        'job',           'admin', sysdate(), '', null, '定时任务菜单');
 insert into sys_menu values('111',  'Sentinel控制台', '2',   '3', 'http://localhost:8718',        '',                '', '', 0, 0, 'C', '0', '0', 'monitor:sentinel:list',   'sentinel',      'admin', sysdate(), '', null, '流量控制菜单');
-insert into sys_menu values('112',  'Nacos控制台',    '2',   '4', 'http://localhost:8848/nacos',  '',                '', '', 0, 0, 'C', '0', '0', 'monitor:nacos:list',      'nacos',         'admin', sysdate(), '', null, '服务治理菜单');
+insert into sys_menu values('112',  'Nacos控制台',    '2',   '4', 'http://localhost:8864',  '',                '', '', 0, 0, 'C', '0', '0', 'monitor:nacos:list',      'nacos',         'admin', sysdate(), '', null, '服务治理菜单');
 insert into sys_menu values('113',  'Admin控制台',    '2',   '5', 'http://localhost:9100/login',  '',                '', '', 0, 0, 'C', '0', '0', 'monitor:server:list',     'server',        'admin', sysdate(), '', null, '服务监控菜单');
 insert into sys_menu values('114',  '表单构建',       '3',   '1', 'build',      'tool/build/index',                  '', '', 1, 0, 'C', '0', '0', 'tool:build:list',         'build',         'admin', sysdate(), '', null, '表单构建菜单');
 insert into sys_menu values('115',  '代码生成',       '3',   '2', 'gen',        'tool/gen/index',                    '', '', 1, 0, 'C', '0', '0', 'tool:gen:list',           'code',          'admin', sysdate(), '', null, '代码生成菜单');