From 70a5e47b668298bfcf9265289e71052534cf8ad5 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 10 Jun 2021 09:19:42 +0800
Subject: [PATCH] 若依 3.0.0
---
docker/ruoyi/modules/system/jar/readme.txt | 1
docker/mysql/db/readme.txt | 1
ruoyi-modules/ruoyi-job/pom.xml | 2
ruoyi-ui/src/views/index.vue | 58 ++++++++++++++++++++++++++++
ruoyi-visual/pom.xml | 2
docker/ruoyi/modules/file/jar/readme.txt | 1
pom.xml | 4 +-
ruoyi-modules/pom.xml | 2
ruoyi-common/ruoyi-common-datascope/pom.xml | 2
docker/docker-compose.yml | 4 +
ruoyi-common/ruoyi-common-security/pom.xml | 2
ruoyi-modules/ruoyi-gen/pom.xml | 2
ruoyi-ui/package.json | 4 +-
ruoyi-common/ruoyi-common-log/pom.xml | 2
ruoyi-modules/ruoyi-system/pom.xml | 2
ruoyi-common/ruoyi-common-swagger/pom.xml | 2
ruoyi-modules/ruoyi-file/pom.xml | 2
docker/ruoyi/modules/job/jar/readme.txt | 1
docker/ruoyi/modules/gen/jar/readme.txt | 1
ruoyi-auth/pom.xml | 2
ruoyi-common/pom.xml | 2
docker/nginx/html/dist/readme.txt | 1
docker/ruoyi/auth/jar/readme.txt | 1
docker/ruoyi/gateway/jar/readme.txt | 1
docker/ruoyi/visual/monitor/jar/readme.txt | 1
ruoyi-gateway/pom.xml | 2
ruoyi-visual/ruoyi-monitor/pom.xml | 2
ruoyi-api/pom.xml | 2
ruoyi-common/ruoyi-common-datasource/pom.xml | 2
ruoyi-api/ruoyi-api-system/pom.xml | 2
ruoyi-common/ruoyi-common-core/pom.xml | 2
ruoyi-common/ruoyi-common-redis/pom.xml | 2
32 files changed, 92 insertions(+), 25 deletions(-)
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index babe485..5fb8da1 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,4 +1,4 @@
-version : '3'
+version : '3.8'
services:
ruoyi-nacos:
container_name: ruoyi-nacos
@@ -12,6 +12,8 @@
- ./nacos/conf/application.properties:/home/nacos/conf/application.properties
ports:
- "8848:8848"
+ - "9848:9848"
+ - "9849:9849"
depends_on:
- ruoyi-mysql
ruoyi-mysql:
diff --git a/docker/mysql/db/readme.txt b/docker/mysql/db/readme.txt
new file mode 100644
index 0000000..0b22f3f
--- /dev/null
+++ b/docker/mysql/db/readme.txt
@@ -0,0 +1 @@
+���sqlĿ¼�µ����нű�������docker�Զ�ִ�С�
\ No newline at end of file
diff --git a/docker/nginx/html/dist/readme.txt b/docker/nginx/html/dist/readme.txt
new file mode 100644
index 0000000..eea3a32
--- /dev/null
+++ b/docker/nginx/html/dist/readme.txt
@@ -0,0 +1 @@
+���ǰ��ruoyi-ui�����õľ�̬�ļ�������nginx������ʡ�
\ No newline at end of file
diff --git a/docker/ruoyi/auth/jar/readme.txt b/docker/ruoyi/auth/jar/readme.txt
new file mode 100644
index 0000000..c35ba27
--- /dev/null
+++ b/docker/ruoyi/auth/jar/readme.txt
@@ -0,0 +1 @@
+�����֤���Ĵ���õ�jar�ļ�������docker����Ӧ�á�
\ No newline at end of file
diff --git a/docker/ruoyi/gateway/jar/readme.txt b/docker/ruoyi/gateway/jar/readme.txt
new file mode 100644
index 0000000..5dfbec7
--- /dev/null
+++ b/docker/ruoyi/gateway/jar/readme.txt
@@ -0,0 +1 @@
+�������ģ�����õ�jar�ļ�������docker����Ӧ�á�
\ No newline at end of file
diff --git a/docker/ruoyi/modules/file/jar/readme.txt b/docker/ruoyi/modules/file/jar/readme.txt
new file mode 100644
index 0000000..bf2b2a7
--- /dev/null
+++ b/docker/ruoyi/modules/file/jar/readme.txt
@@ -0,0 +1 @@
+����ļ��������õ�jar�ļ�������docker����Ӧ�á�
\ No newline at end of file
diff --git a/docker/ruoyi/modules/gen/jar/readme.txt b/docker/ruoyi/modules/gen/jar/readme.txt
new file mode 100644
index 0000000..2f25c0a
--- /dev/null
+++ b/docker/ruoyi/modules/gen/jar/readme.txt
@@ -0,0 +1 @@
+��Ŵ������ɴ���õ�jar�ļ�������docker����Ӧ�á�
\ No newline at end of file
diff --git a/docker/ruoyi/modules/job/jar/readme.txt b/docker/ruoyi/modules/job/jar/readme.txt
new file mode 100644
index 0000000..58aea0b
--- /dev/null
+++ b/docker/ruoyi/modules/job/jar/readme.txt
@@ -0,0 +1 @@
+��Ŷ�ʱ�������õ�jar�ļ�������docker����Ӧ�á�
\ No newline at end of file
diff --git a/docker/ruoyi/modules/system/jar/readme.txt b/docker/ruoyi/modules/system/jar/readme.txt
new file mode 100644
index 0000000..cfc2a92
--- /dev/null
+++ b/docker/ruoyi/modules/system/jar/readme.txt
@@ -0,0 +1 @@
+���ϵͳģ�����õ�jar�ļ�������docker����Ӧ�á�
\ No newline at end of file
diff --git a/docker/ruoyi/visual/monitor/jar/readme.txt b/docker/ruoyi/visual/monitor/jar/readme.txt
new file mode 100644
index 0000000..62b2841
--- /dev/null
+++ b/docker/ruoyi/visual/monitor/jar/readme.txt
@@ -0,0 +1 @@
+��ż�����Ĵ���õ�jar�ļ�������docker����Ӧ�á�
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5b53886..f45f733 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>2.5.0</version>
+ <version>3.0.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依微服务系统</description>
<properties>
- <ruoyi.version>2.5.0</ruoyi.version>
+ <ruoyi.version>3.0.0</ruoyi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml
index 1c24fbc..6ab7161 100644
--- a/ruoyi-api/pom.xml
+++ b/ruoyi-api/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>2.5.0</version>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml
index 5c8b3af..19afb30 100644
--- 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>2.5.0</version>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml
index 41652aa..638660e 100644
--- a/ruoyi-auth/pom.xml
+++ b/ruoyi-auth/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>2.5.0</version>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index df16e1d..050f9b5 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>2.5.0</version>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml
index ff8ed86..0426a88 100644
--- 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>2.5.0</version>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml
index 2fbc8f6..d1ac37c 100644
--- 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>2.5.0</version>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml
index 36d29da..8fde205 100644
--- 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>2.5.0</version>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml
index fe322d1..91c1490 100644
--- 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>2.5.0</version>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml
index e498f15..a68652e 100644
--- 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>2.5.0</version>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml
index 3ee61b1..99b7b8a 100644
--- 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>2.5.0</version>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml
index debba5b..50e97bd 100644
--- 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>2.5.0</version>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml
index d4432b4..5af57ea 100644
--- a/ruoyi-gateway/pom.xml
+++ b/ruoyi-gateway/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>2.5.0</version>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml
index 0a4eb86..01c9fac 100644
--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>2.5.0</version>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml
index 947a5bf..0c8015e 100644
--- 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>2.5.0</version>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml
index c22e9cc..8e18387 100644
--- 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>2.5.0</version>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml
index 7fd1bed..9e1ca55 100644
--- 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>2.5.0</version>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml
index 532260e..66a3c0f 100644
--- 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>2.5.0</version>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index ad60e4e..6b13e0f 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi",
- "version": "2.5.0",
+ "version": "3.0.0",
"description": "若依管理系统",
"author": "若依",
"license": "MIT",
@@ -33,7 +33,7 @@
],
"repository": {
"type": "git",
- "url": "https://gitee.com/y_project/RuoYi-Vue.git"
+ "url": "https://gitee.com/y_project/RuoYi-Cloud.git"
},
"dependencies": {
"@riophae/vue-treeselect": "0.4.0",
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 05b218f..69d144d 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -146,6 +146,62 @@
<span>更新日志</span>
</div>
<el-collapse accordion>
+ <el-collapse-item title="v3.0.0 - 2021-06-10">
+ <ol>
+ <li>新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单）</li>
+ <li>布局设置支持保存&重置配置</li>
+ <li>富文本编辑器支持自定义上传地址</li>
+ <li>富文本编辑组件新增readOnly属性</li>
+ <li>优化参数&字典缓存操作</li>
+ <li>新增IE浏览器版本过低提示页面</li>
+ <li>页签TagsView新增关闭右侧功能</li>
+ <li>显隐列组件加载初始默认隐藏列</li>
+ <li>关闭头像上传窗口还原默认图片</li>
+ <li>个人信息添加手机&邮箱重复验证</li>
+ <li>代码生成模板树表操作列添加新增按钮</li>
+ <li>代码生成模板修复主子表字段重名问题</li>
+ <li>支持docker部署项目</li>
+ <li>升级springcloud到最新版2020.0.3</li>
+ <li>升级spring-boot-alibaba到最新版2021.1</li>
+ <li>升级nacos到最新版2.0.1 性能提升</li>
+ <li>升级spring-boot到最新版本2.5.0</li>
+ <li>升级spring-boot-admin到最新版2.4.1</li>
+ <li>升级swagger到最新版本3.0.0</li>
+ <li>升级mybatis到最新版3.5.6</li>
+ <li>升级dynamic-ds到最新版本3.3.2</li>
+ <li>升级minio到最新版本8.2.1</li>
+ <li>升级fastjson到最新版1.2.76</li>
+ <li>升级druid到最新版本v1.2.6</li>
+ <li>修复四级菜单无法显示问题</li>
+ <li>修复树表数据显示不全&加载慢问题</li>
+ <li>修复关闭confirm提示框控制台报错问题</li>
+ <li>上传媒体类型添加视频格式</li>
+ <li>增加feign客户端IP头部信息</li>
+ <li>修复两处存在SQL注入漏洞问题</li>
+ <li>优化图片工具类读取文件，防止异常</li>
+ <li>修复导出角色数据范围翻译缺少仅本人</li>
+ <li>修复表单构建选择下拉选择控制台报错问题</li>
+ <li>修复请求形参未传值记录日志异常问题</li>
+ <li>调整sql默认为当前时间</li>
+ <li>修改ip字段长度防止ipv6地址长度不够</li>
+ <li>删除操作日志记录信息</li>
+ <li>修复firefox下表单构建拖拽会新打卡一个选项卡</li>
+ <li>用户&角色单条删除时使其逻辑删除</li>
+ <li>优化树表代码生成模板</li>
+ <li>修正通知公告日志记录类型</li>
+ <li>修正后端导入表权限标识</li>
+ <li>过滤BindingResult对象，防止异常</li>
+ <li>Redis设置HashKey序列化</li>
+ <li>优化Excel导入增加空行判断</li>
+ <li>树级结构更新子节点使用replaceFirst</li>
+ <li>富文本工具栏配置视频</li>
+ <li>修正模板字符编码</li>
+ <li>优化通用下载完成后删除节点</li>
+ <li>角色非自定义权限范围清空选择值</li>
+ <li>修改主题后mini类型按钮无效问题</li>
+ <li>其他细节优化</li>
+ </ol>
+ </el-collapse-item>
<el-collapse-item title="v2.5.0 - 2021-02-02">
<ol>
<li>增加分布式事务seata支持</li>
@@ -449,7 +505,7 @@
data() {
return {
// 版本号
- version: "2.5.0",
+ version: "3.0.0",
};
},
methods: {
diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml
index 53cf218..bf2817c 100644
--- a/ruoyi-visual/pom.xml
+++ b/ruoyi-visual/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>2.5.0</version>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml
index c8c1066..a15ef9b 100644
--- 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>2.5.0</version>
+ <version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
--
Gitblit v1.9.3