lbqms.git - Gitblit

疯狂的狮子li

2021-07-28 973471c63b1f889c16b12ba89f9102faa17ffd98

发布 v2.6.0

已修改15个文件

	README.md	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	docker/docker-compose.yml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pom.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/pom.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-common/pom.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-demo/pom.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-extend/pom.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-extend/ruoyi-monitor-admin/pom.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-framework/pom.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-generator/pom.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-oss/pom.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-quartz/pom.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/pom.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-ui/package.json	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-ui/src/views/index.vue	33 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 README.md

@@ -4,7 +4,7 @@
[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE)
[![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
<br>
[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-2.5.2-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-2.6.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.4-blue.svg)]()
[![JDK-8+](https://img.shields.io/badge/JDK-8+-green.svg)]()
[![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]()

 docker/docker-compose.yml

@@ -107,7 +107,7 @@
        ipv4_address: 172.30.0.54

  ruoyi-server1:
    image: "ruoyi/ruoyi-server:2.5.2"
    image: "ruoyi/ruoyi-server:2.6.0"
    environment:
      - TZ=Asia/Shanghai
    volumes:
@@ -121,7 +121,7 @@
        ipv4_address: 172.30.0.60

  ruoyi-server2:
    image: "ruoyi/ruoyi-server:2.5.2"
    image: "ruoyi/ruoyi-server:2.6.0"
    environment:
      - TZ=Asia/Shanghai
    volumes:
@@ -135,7 +135,7 @@
        ipv4_address: 172.30.0.61

  ruoyi-monitor-admin:
    image: "ruoyi/ruoyi-monitor-admin:2.5.2"
    image: "ruoyi/ruoyi-monitor-admin:2.6.0"
    environment:
      - TZ=Asia/Shanghai
    privileged: true

 pom.xml

@@ -6,14 +6,14 @@

    <groupId>com.ruoyi</groupId>
    <artifactId>ruoyi-vue-plus</artifactId>
    <version>2.5.2</version>
    <version>2.6.0</version>

    <name>RuoYi-Vue-Plus</name>
    <url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
    <description>RuoYi-Vue-Plus后台管理系统</description>

    <properties>
        <ruoyi-vue-plus.version>2.5.2</ruoyi-vue-plus.version>
        <ruoyi-vue-plus.version>2.6.0</ruoyi-vue-plus.version>
        <spring-boot.version>2.5.3</spring-boot.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

 ruoyi-admin/pom.xml

@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
        <version>2.5.2</version>
        <version>2.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>jar</packaging>

 ruoyi-common/pom.xml

@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
        <version>2.5.2</version>
        <version>2.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>


 ruoyi-demo/pom.xml

@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
        <version>2.5.2</version>
        <version>2.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>


 ruoyi-extend/pom.xml

@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
        <version>2.5.2</version>
        <version>2.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>ruoyi-extend</artifactId>

 ruoyi-extend/ruoyi-monitor-admin/pom.xml

@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-extend</artifactId>
        <groupId>com.ruoyi</groupId>
        <version>2.5.2</version>
        <version>2.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>jar</packaging>

 ruoyi-framework/pom.xml

@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
        <version>2.5.2</version>
        <version>2.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>


 ruoyi-generator/pom.xml

@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
        <version>2.5.2</version>
        <version>2.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>


 ruoyi-oss/pom.xml

@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
        <version>2.5.2</version>
        <version>2.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>


 ruoyi-quartz/pom.xml

@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
        <version>2.5.2</version>
        <version>2.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>


 ruoyi-system/pom.xml

@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
        <version>2.5.2</version>
        <version>2.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>


 ruoyi-ui/package.json

@@ -1,6 +1,6 @@
{
  "name": "ruoyi-vue-plus",
  "version": "2.5.2",
  "version": "2.6.0",
  "description": "RuoYi-Vue-Plus后台管理系统",
  "author": "LionLi",
  "license": "MIT",

 ruoyi-ui/src/views/index.vue

@@ -22,6 +22,8 @@
          * 多数据源框架 dynamic-datasource 支持主从与多种类数据库异构<br/>
          * Redis客户端 采用 Redisson 性能更强<br/>
          * 分布式锁 Lock4j 注解锁、工具锁 多种多样<br/>
          * 部署方式 Docker 容器编排 一键部署业务集群<br/>
          * 文件存储 OSS 对象存储模块 支持(Minio、七牛、阿里、腾讯)<br/>
        </p>
        <p>
          <b>当前版本:</b> <span>v{{ version }}</span>
@@ -91,6 +93,37 @@
            <span>更新日志</span>
          </div>
          <el-collapse accordion>
            <el-collapse-item title="v2.6.0 - 2021-7-28">
              <ol>
                <li>add [重大新增] 增加 OSS 对象存储模块</li>
                <li>remove [重大改动] 删除 自带通用上传 接口 使用OSS模块替换<li>
                <li>update [重大改动] 重写VO转换 支持深拷贝 将VO类抽象到 ServicePlus 泛型处理<li>
                <li>update [重大改动] 多BO合并 使用分组校验 生成BO代码<li>
                <li>update [重大改动] 重构 IServicePlus 功能 增加 BeanCopyUtils 深拷贝工具<li>
                <li>update springboot 2.4.9 => 2.5.3<li>
                <li>update hutool 5.7.4 => 5.7.6<li>
                <li>update minio 8.2.2 => 8.3.0<li>
                <li>update docker plugin 1.2.0 => 1.2.2<li>
                <li>update redisson 3.16.0 => 3.16.1<li>
                <li>update datasource 3.4.0 => 3.4.1<li>
                <li>update element-ui 2.15.2 => 2.15.3<li>
                <li>add 演示Demo增加自定义分页接口案例</li>
                <li>add 角色&菜单新增字段属性提示信息</li>
                <li>update 更新druid配置 独立配置更明显</li>
                <li>update 顶部菜单排除隐藏的默认路由</li>
                <li>update 富文本新增上传文件大小限制</li>
                <li>update 导入用户样式调整</li>
                <li>update 顶部菜单样式调整</li>
                <li>update 密码框新增显示切换密码图标</li>
                <li>update 内链设置meta信息</li>
                <li>update 跳转路由高亮相对应的菜单栏</li>
                <li>fix 修复多数据源druid全局配置缩进错误 引起无效配置问题</li>
                <li>fix 修复定时任务日志执行状态显示</li>
                <li>fix 修复 授权角色空数据问题</li>
                <li>fix 修复 DictData 删除逻辑问题</li>
                <li>fix 修复任意账户越权漏洞</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v2.5.2 - 2021-7-19">
              <ol>
                <li>update 优化代码生成器注释格式</li>

			@@ -4,7 +4,7 @@
			[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE)
			[![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
			<br>
			[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-2.5.2-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
			[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-2.6.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
			[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.4-blue.svg)]()
			[![JDK-8+](https://img.shields.io/badge/JDK-8+-green.svg)]()
			[![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]()

			@@ -107,7 +107,7 @@
			ipv4_address: 172.30.0.54

			ruoyi-server1:
			image: "ruoyi/ruoyi-server:2.5.2"
			image: "ruoyi/ruoyi-server:2.6.0"
			environment:
			- TZ=Asia/Shanghai
			volumes:
			@@ -121,7 +121,7 @@
			ipv4_address: 172.30.0.60

			ruoyi-server2:
			image: "ruoyi/ruoyi-server:2.5.2"
			image: "ruoyi/ruoyi-server:2.6.0"
			environment:
			- TZ=Asia/Shanghai
			volumes:
			@@ -135,7 +135,7 @@
			ipv4_address: 172.30.0.61

			ruoyi-monitor-admin:
			image: "ruoyi/ruoyi-monitor-admin:2.5.2"
			image: "ruoyi/ruoyi-monitor-admin:2.6.0"
			environment:
			- TZ=Asia/Shanghai
			privileged: true

			@@ -6,14 +6,14 @@

			<groupId>com.ruoyi</groupId>
			<artifactId>ruoyi-vue-plus</artifactId>
			<version>2.5.2</version>
			<version>2.6.0</version>

			<name>RuoYi-Vue-Plus</name>
			<url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
			<description>RuoYi-Vue-Plus后台管理系统</description>

			<properties>
			<ruoyi-vue-plus.version>2.5.2</ruoyi-vue-plus.version>
			<ruoyi-vue-plus.version>2.6.0</ruoyi-vue-plus.version>
			<spring-boot.version>2.5.3</spring-boot.version>
			<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
			<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

			@@ -5,7 +5,7 @@
			<parent>
			<artifactId>ruoyi-vue-plus</artifactId>
			<groupId>com.ruoyi</groupId>
			<version>2.5.2</version>
			<version>2.6.0</version>
			</parent>
			<modelVersion>4.0.0</modelVersion>
			<packaging>jar</packaging>

			@@ -5,7 +5,7 @@
			<parent>
			<artifactId>ruoyi-extend</artifactId>
			<groupId>com.ruoyi</groupId>
			<version>2.5.2</version>
			<version>2.6.0</version>
			</parent>
			<modelVersion>4.0.0</modelVersion>
			<packaging>jar</packaging>

			@@ -1,6 +1,6 @@
			{
			"name": "ruoyi-vue-plus",
			"version": "2.5.2",
			"version": "2.6.0",
			"description": "RuoYi-Vue-Plus后台管理系统",
			"author": "LionLi",
			"license": "MIT",

			@@ -22,6 +22,8 @@
			* 多数据源框架 dynamic-datasource 支持主从与多种类数据库异构<br/>
			* Redis客户端采用 Redisson 性能更强<br/>
			* 分布式锁 Lock4j 注解锁、工具锁多种多样<br/>
			* 部署方式 Docker 容器编排一键部署业务集群<br/>
			* 文件存储 OSS 对象存储模块支持(Minio、七牛、阿里、腾讯)<br/>
			</p>
			<p>
			<b>当前版本:</b> <span>v{{ version }}</span>
			@@ -91,6 +93,37 @@
			<span>更新日志</span>
			</div>
			<el-collapse accordion>
			<el-collapse-item title="v2.6.0 - 2021-7-28">
			<ol>
			<li>add [重大新增] 增加 OSS 对象存储模块</li>
			<li>remove [重大改动] 删除自带通用上传接口使用OSS模块替换<li>
			<li>update [重大改动] 重写VO转换支持深拷贝将VO类抽象到 ServicePlus 泛型处理<li>
			<li>update [重大改动] 多BO合并使用分组校验生成BO代码<li>
			<li>update [重大改动] 重构 IServicePlus 功能增加 BeanCopyUtils 深拷贝工具<li>
			<li>update springboot 2.4.9 => 2.5.3<li>
			<li>update hutool 5.7.4 => 5.7.6<li>
			<li>update minio 8.2.2 => 8.3.0<li>
			<li>update docker plugin 1.2.0 => 1.2.2<li>
			<li>update redisson 3.16.0 => 3.16.1<li>
			<li>update datasource 3.4.0 => 3.4.1<li>
			<li>update element-ui 2.15.2 => 2.15.3<li>
			<li>add 演示Demo增加自定义分页接口案例</li>
			<li>add 角色&菜单新增字段属性提示信息</li>
			<li>update 更新druid配置独立配置更明显</li>
			<li>update 顶部菜单排除隐藏的默认路由</li>
			<li>update 富文本新增上传文件大小限制</li>
			<li>update 导入用户样式调整</li>
			<li>update 顶部菜单样式调整</li>
			<li>update 密码框新增显示切换密码图标</li>
			<li>update 内链设置meta信息</li>
			<li>update 跳转路由高亮相对应的菜单栏</li>
			<li>fix 修复多数据源druid全局配置缩进错误引起无效配置问题</li>
			<li>fix 修复定时任务日志执行状态显示</li>
			<li>fix 修复授权角色空数据问题</li>
			<li>fix 修复 DictData 删除逻辑问题</li>
			<li>fix 修复任意账户越权漏洞</li>
			</ol>
			</el-collapse-item>
			<el-collapse-item title="v2.5.2 - 2021-7-19">
			<ol>
			<li>update 优化代码生成器注释格式</li>