若依 3.6.5

2 weeks ago · 78d958ec8c
parent 101f7e3cf7
commit 78d958ec8c
26 changed files with 64 additions and 34 deletions
--- a/README.md
+++ b/README.md
@ -1,11 +1,11 @@
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-b99b286755aef70355a7084753f89cdb7c9.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.6.4</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.6.5</h1>
 <h4 align="center">基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构</h4>
 <p align="center">
 	<a href="https://gitee.com/y_project/RuoYi-Cloud/stargazers"><img src="https://gitee.com/y_project/RuoYi-Cloud/badge/star.svg?theme=dark"></a>
-	<a href="https://gitee.com/y_project/RuoYi-Cloud"><img src="https://img.shields.io/badge/RuoYi-v3.6.4-brightgreen.svg"></a>
+	<a href="https://gitee.com/y_project/RuoYi-Cloud"><img src="https://img.shields.io/badge/RuoYi-v3.6.5-brightgreen.svg"></a>
 	<a href="https://gitee.com/y_project/RuoYi-Cloud/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
 </p>

@ -17,12 +17,9 @@
 * 后端采用Spring Boot、Spring Cloud & Alibaba。
 * 注册中心、配置中心选型Nacos，权限认证使用Redis。
 * 流量控制框架选型Sentinel，分布式事务选型Seata。
-* 提供了技术栈（[Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)）版本[RuoYi-Cloud-Vue3](https://github.com/yangzongzhuan/RuoYi-Cloud-Vue3)，保持同步更新。
+* 提供了技术栈（[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)，保持同步更新。
 * 如需不分离应用，请移步 [RuoYi](https://gitee.com/y_project/RuoYi)，如需分离应用，请移步 [RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue)
-* 阿里云折扣场：[点我进入](http://aly.ruoyi.vip)，腾讯云秒杀场：[点我进入](http://txy.ruoyi.vip)&nbsp;&nbsp;
-* 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)&nbsp;&nbsp;
-
-#### 友情链接 [若依/RuoYi-Cloud](https://gitee.com/zhangmrit/ruoyi-cloud) Ant Design版本。
+* 阿里云优惠券：[点我进入](http://aly.ruoyi.vip)，腾讯云优惠券：[点我进入](http://txy.ruoyi.vip)&nbsp;&nbsp;

 ## 系统模块

@ -41,6 +38,7 @@ com.ruoyi
 │       └── ruoyi-common-redis                        // 缓存服务
 │       └── ruoyi-common-seata                        // 分布式事务
 │       └── ruoyi-common-security                     // 安全模块
+│       └── ruoyi-common-sensitive                    // 数据脱敏
 │       └── ruoyi-common-swagger                      // 系统接口
 ├── ruoyi-modules         // 业务模块
 │       └── ruoyi-system                              // 系统模块 [9201]
--- a/docker/copy.sh
+++ b/docker/copy.sh
@ -10,7 +10,7 @@ usage() {
 # copy sql
 echo "begin copy sql "
 cp ../sql/ry_20240629.sql ./mysql/db
-cp ../sql/ry_config_20240902.sql ./mysql/db
+cp ../sql/ry_config_20240914.sql ./mysql/db

 # copy html
 echo "begin copy html "
--- a/pom.xml
+++ b/pom.xml
@ -6,14 +6,14 @@

    <groupId>com.ruoyi</groupId>
    <artifactId>ruoyi</artifactId>
-    <version>3.6.4</version>
+    <version>3.6.5</version>

    <name>ruoyi</name>
    <url>http://www.ruoyi.vip</url>
    <description>若依微服务系统</description>

    <properties>
-        <ruoyi.version>3.6.4</ruoyi.version>
+        <ruoyi.version>3.6.5</ruoyi.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>17</java.version>
@ -28,7 +28,7 @@
        <dynamic-ds.version>4.3.1</dynamic-ds.version>
        <commons.io.version>2.13.0</commons.io.version>
        <velocity.version>2.3</velocity.version>
-        <fastjson.version>2.0.43</fastjson.version>
+        <fastjson.version>2.0.53</fastjson.version>
        <jjwt.version>0.9.1</jjwt.version>
        <minio.version>8.2.2</minio.version>
        <poi.version>4.1.2</poi.version>
--- a/ruoyi-api/pom.xml
+++ b/ruoyi-api/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-api/ruoyi-api-system/pom.xml
+++ b/ruoyi-api/ruoyi-api-system/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-api</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-auth/pom.xml
+++ b/ruoyi-auth/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-core/pom.xml
+++ b/ruoyi-common/ruoyi-common-core/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-datascope/pom.xml
+++ b/ruoyi-common/ruoyi-common-datascope/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-common/ruoyi-common-datasource/pom.xml
+++ b/ruoyi-common/ruoyi-common-datasource/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-common/ruoyi-common-log/pom.xml
+++ b/ruoyi-common/ruoyi-common-log/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-common/ruoyi-common-redis/pom.xml
+++ b/ruoyi-common/ruoyi-common-redis/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-common/ruoyi-common-seata/pom.xml
+++ b/ruoyi-common/ruoyi-common-seata/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-security/pom.xml
+++ b/ruoyi-common/ruoyi-common-security/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-common/ruoyi-common-sensitive/pom.xml
+++ b/ruoyi-common/ruoyi-common-sensitive/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-common/ruoyi-common-swagger/pom.xml
+++ b/ruoyi-common/ruoyi-common-swagger/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-gateway/pom.xml
+++ b/ruoyi-gateway/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-modules/ruoyi-file/pom.xml
+++ b/ruoyi-modules/ruoyi-file/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-modules/ruoyi-gen/pom.xml
+++ b/ruoyi-modules/ruoyi-gen/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-modules/ruoyi-job/pom.xml
+++ b/ruoyi-modules/ruoyi-job/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-modules/ruoyi-system/pom.xml
+++ b/ruoyi-modules/ruoyi-system/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
 	
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@ -1,6 +1,6 @@
 {
  "name": "ruoyi",
-  "version": "3.6.4",
+  "version": "3.6.5",
  "description": "若依管理系统",
  "author": "若依",
  "license": "MIT",
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@ -145,6 +145,38 @@
            <span>更新日志</span>
          </div>
          <el-collapse accordion>
+            <el-collapse-item title="v3.6.5 - 2024-11-13">
+              <ol>
+                <li>使用SpringDoc代替Swagger</li>
+                <li>菜单管理新增路由名称</li>
+                <li>新增数据脱敏过滤注解</li>
+                <li>限制用户操作数据权限范围</li>
+                <li>支持自定义显示Excel属性列</li>
+                <li>操作日志记录DELETE请求参数</li>
+                <li>用户登录后记录最后登录IP&时间</li>
+                <li>升级druid到最新版本1.2.23</li>
+                <li>升级fastjson到最新版2.0.53</li>
+                <li>升级dynamic-ds到最新版本4.3.1</li>
+                <li>升级spring-cloud到最新版2021.0.9</li>
+                <li>升级spring-boot-admin到最新版2.7.16</li>
+                <li>升级spring-cloud-alibaba到最新版2021.0.6.1</li>
+                <li>升级quill到最新版本2.0.2</li>
+                <li>升级axios到最新版本0.28.1</li>
+                <li>升级core-js到最新版本3.37.1</li>
+                <li>升级其他依赖到安全版本，防止漏洞风险</li>
+                <li>修复角色禁用权限不失效问题</li>
+                <li>优化身份证脱敏正则</li>
+                <li>优化权限更新后同步缓存</li>
+                <li>优化查询时间范围日期格式</li>
+                <li>优化代码生成上级菜单字段类型</li>
+                <li>优化无用户编号不校验数据权限</li>
+                <li>优化代码生成主子表关联查询方式</li>
+                <li>优化校检文件名是否包含特殊字符</li>
+                <li>优化查表特殊字符使用反斜杠进行转义</li>
+                <li>优化多个自定数据权限使用in查询,避免多次拼接</li>
+                <li>其他细节优化</li>
+              </ol>
+            </el-collapse-item>
            <el-collapse-item title="v3.6.4 - 2024-04-01">
              <ol>
                <li>全局数据存储用户编号</li>
@ -914,7 +946,7 @@ export default {
  data() {
    return {
      // 版本号
-      version: "3.6.4",
+      version: "3.6.5",
    };
  },
  methods: {
--- a/ruoyi-visual/pom.xml
+++ b/ruoyi-visual/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-visual/ruoyi-monitor/pom.xml
+++ b/ruoyi-visual/ruoyi-monitor/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-visual</artifactId>
-        <version>3.6.4</version>
+        <version>3.6.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>