From d5520817bddc6ffb5e8fff1262c710a8d9eb2427 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
<15040126243@163.com>
Date: Sun, 24 Apr 2022 14:09:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=204.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitee/ISSUE_TEMPLATE.zh-CN.md | 2 +-
README.md | 7 +-
pom.xml | 54 +-
ruoyi-extend/pom.xml | 2 +-
ruoyi-extend/ruoyi-monitor-admin/pom.xml | 2 +-
ruoyi-extend/ruoyi-xxl-job-admin/pom.xml | 7 +-
ruoyi-ui/README.md | 2 +-
ruoyi-ui/bin/package.bat | 6 +-
ruoyi-ui/package.json | 6 +-
ruoyi-ui/src/api/tool/gen.js | 10 +
ruoyi-ui/src/assets/styles/sidebar.scss | 4 +
ruoyi-ui/src/components/FileUpload/index.vue | 25 +-
ruoyi-ui/src/components/ImageUpload/index.vue | 23 +-
ruoyi-ui/src/components/TopNav/index.vue | 48 +-
.../src/layout/components/Settings/index.vue | 3 +-
.../src/layout/components/Sidebar/Item.vue | 6 +-
ruoyi-ui/src/layout/index.vue | 8 +-
ruoyi-ui/src/plugins/download.js | 5 +-
ruoyi-ui/src/plugins/tab.js | 4 +-
ruoyi-ui/src/router/index.js | 7 +
ruoyi-ui/src/store/modules/app.js | 12 +-
ruoyi-ui/src/store/modules/permission.js | 7 +-
ruoyi-ui/src/store/modules/user.js | 2 +-
ruoyi-ui/src/views/demo/tree/index.vue | 28 +-
ruoyi-ui/src/views/index.vue | 651 +----
.../src/views/monitor/logininfor/index.vue | 6 +-
ruoyi-ui/src/views/monitor/online/index.vue | 4 +-
ruoyi-ui/src/views/monitor/operlog/index.vue | 7 +-
ruoyi-ui/src/views/system/config/index.vue | 7 +-
ruoyi-ui/src/views/system/dept/index.vue | 5 +-
ruoyi-ui/src/views/system/dict/data.vue | 7 +-
ruoyi-ui/src/views/system/dict/index.vue | 6 +-
ruoyi-ui/src/views/system/menu/index.vue | 7 +-
ruoyi-ui/src/views/system/notice/index.vue | 6 +-
ruoyi-ui/src/views/system/post/index.vue | 6 +-
ruoyi-ui/src/views/system/role/authUser.vue | 4 +-
ruoyi-ui/src/views/system/role/index.vue | 6 +-
ruoyi-ui/src/views/system/role/selectUser.vue | 4 +-
ruoyi-ui/src/views/system/user/index.vue | 6 +-
ruoyi-ui/src/views/tool/gen/importTable.vue | 4 +-
ruoyi-ui/src/views/tool/gen/index.vue | 22 +-
ruoyi/pom.xml | 26 +-
.../ruoyi/common/annotation/RepeatSubmit.java | 4 +-
.../com/ruoyi/common/constant/Constants.java | 4 +-
.../ruoyi/common/constant/UserConstants.java | 20 +
.../ruoyi/common/core/domain/TreeEntity.java | 4 +-
.../common/core/domain/entity/SysDept.java | 4 +-
.../core/domain/entity/SysDictData.java | 2 +-
.../core/domain/entity/SysDictType.java | 2 +
.../common/core/domain/entity/SysMenu.java | 10 +-
.../common/core/domain/entity/SysRole.java | 10 +-
.../core/domain/model/SmsLoginBody.java | 33 +
.../core/domain/model/XcxLoginUser.java | 24 +
.../com/ruoyi/common/enums/DataBaseType.java | 49 +
.../com/ruoyi/common/enums/DeviceType.java | 7 +-
.../com/ruoyi/common/enums/LoginType.java | 39 +
.../enums/ThreadPoolRejectedPolicy.java | 26 -
.../ruoyi/common/helper/DataBaseHelper.java | 72 +
.../com/ruoyi/common/utils/BeanCopyUtils.java | 75 +-
.../com/ruoyi/common/utils/DateUtils.java | 33 +-
.../demo/controller/TestBatchController.java | 4 +-
.../demo/controller/TestDemoController.java | 2 +-
.../java/com/ruoyi/demo/domain/TestDemo.java | 2 +-
.../java/com/ruoyi/demo/domain/TestTree.java | 2 +-
.../com/ruoyi/demo/domain/bo/TestTreeBo.java | 2 +-
.../framework/aspectj/RateLimiterAspect.java | 3 +-
.../framework/aspectj/RepeatSubmitAspect.java | 47 +-
.../ruoyi/framework/config/CaptchaConfig.java | 26 +-
.../ruoyi/framework/config/RedisConfig.java | 16 +-
.../ruoyi/framework/config/SaTokenConfig.java | 20 +-
.../framework/config/ThreadPoolConfig.java | 16 +-
.../config/properties/RedissonProperties.java | 31 -
.../properties/RepeatSubmitProperties.java | 22 -
.../properties/ThreadPoolProperties.java | 16 -
.../listener/UserActionListener.java | 8 +-
...terfaceImpl.java => SaPermissionImpl.java} | 17 +-
.../web/exception/GlobalExceptionHandler.java | 27 +
.../generator/controller/GenController.java | 16 +-
.../com/ruoyi/generator/domain/GenTable.java | 6 +
.../generator/domain/GenTableColumn.java | 18 +-
.../generator/mapper/GenTableMapper.java | 17 +-
.../service/GenTableColumnServiceImpl.java | 68 -
.../service/GenTableServiceImpl.java | 77 +-
.../service/IGenTableColumnService.java | 44 -
.../generator/service/IGenTableService.java | 17 +-
.../com/ruoyi/generator/util/GenUtils.java | 3 +
.../generator/util/VelocityInitializer.java | 3 +
.../ruoyi/generator/util/VelocityUtils.java | 14 +-
.../com/ruoyi/oss/service/IOssStrategy.java | 9 +-
.../abstractd/AbstractOssStrategy.java | 5 +
.../oss/service/impl/MinioOssStrategy.java | 2 +
.../java/com/ruoyi/system/domain/SysOss.java | 3 +-
.../java/com/ruoyi/system/domain/SysPost.java | 5 +-
.../ruoyi/system/mapper/SysDeptMapper.java | 16 +-
.../ruoyi/system/mapper/SysMenuMapper.java | 17 +-
.../ruoyi/system/mapper/SysRoleMapper.java | 8 +-
.../ruoyi/system/mapper/SysUserMapper.java | 24 +-
.../system/mapper/SysUserRoleMapper.java | 4 +
.../system/service/ISysOssConfigService.java | 2 +-
.../ruoyi/system/service/ISysUserService.java | 8 +
.../ruoyi/system/service/SysLoginService.java | 150 +-
.../service/impl/SysDataScopeServiceImpl.java | 18 +-
.../service/impl/SysDeptServiceImpl.java | 31 +-
.../service/impl/SysMenuServiceImpl.java | 22 +-
.../service/impl/SysOssConfigServiceImpl.java | 2 +-
.../service/impl/SysRoleServiceImpl.java | 27 +-
.../service/impl/SysUserServiceImpl.java | 63 +-
.../controller/system/SysLoginController.java | 34 +
.../system/SysOssConfigController.java | 2 +-
.../controller/system/SysOssController.java | 5 +-
ruoyi/src/main/resources/application-dev.yml | 136 +-
ruoyi/src/main/resources/application-prod.yml | 144 +-
ruoyi/src/main/resources/application.yml | 48 +-
.../main/resources/i18n/messages.properties | 7 +
.../resources/i18n/messages_en_US.properties | 7 +
.../resources/i18n/messages_zh_CN.properties | 7 +
ruoyi/src/main/resources/logback.xml | 24 +-
.../mapper/generator/GenTableColumnMapper.xml | 82 +-
.../mapper/generator/GenTableMapper.xml | 231 +-
.../resources/mapper/system/SysDeptMapper.xml | 36 +-
.../resources/mapper/system/SysMenuMapper.xml | 48 +-
.../resources/mapper/system/SysPostMapper.xml | 12 -
.../resources/mapper/system/SysRoleMapper.xml | 46 +-
.../resources/mapper/system/SysUserMapper.xml | 80 +-
.../mapper/system/SysUserRoleMapper.xml | 5 +
ruoyi/src/main/resources/vm/java/bo.java.vm | 2 +-
.../src/main/resources/vm/java/domain.java.vm | 2 +-
ruoyi/src/main/resources/vm/sql/oracle/sql.vm | 19 +
.../src/main/resources/vm/sql/postgres/sql.vm | 20 +
ruoyi/src/main/resources/vm/sql/sql.vm | 27 +-
.../main/resources/vm/sql/sqlserver/sql.vm | 19 +
.../main/resources/vm/vue/index-tree.vue.vm | 36 +-
ruoyi/src/main/resources/vm/vue/index.vue.vm | 12 +-
.../resources/vm/vue/v3/index-tree.vue.vm | 22 +-
script/bin/ry.bat | 81 +-
script/docker/database.yml | 61 +
script/docker/docker-compose.yml | 14 +-
script/sql/oracle/oracle_ry_vue_4.X.sql | 952 +++++++
script/sql/oracle/oracle_test.sql | 196 ++
script/sql/postgres/postgres_ry_vue_4.X.sql | 953 +++++++
script/sql/postgres/postgres_test.sql | 196 ++
script/sql/ry_vue_4.X.sql | 686 +++++
script/sql/sqlserver/sqlserver_ry_vue_4.X.sql | 2321 +++++++++++++++++
script/sql/sqlserver/sqlserver_test.sql | 478 ++++
script/sql/test.sql | 122 +-
script/sql/update/update-4.0-4.1.sql | 3 +
146 files changed, 7725 insertions(+), 1893 deletions(-)
create mode 100644 ruoyi/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java
create mode 100644 ruoyi/src/main/java/com/ruoyi/common/core/domain/model/XcxLoginUser.java
create mode 100644 ruoyi/src/main/java/com/ruoyi/common/enums/DataBaseType.java
create mode 100644 ruoyi/src/main/java/com/ruoyi/common/enums/LoginType.java
delete mode 100644 ruoyi/src/main/java/com/ruoyi/common/enums/ThreadPoolRejectedPolicy.java
create mode 100644 ruoyi/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java
delete mode 100644 ruoyi/src/main/java/com/ruoyi/framework/config/properties/RepeatSubmitProperties.java
rename ruoyi/src/main/java/com/ruoyi/framework/satoken/service/{SaInterfaceImpl.java => SaPermissionImpl.java} (79%)
delete mode 100644 ruoyi/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java
delete mode 100644 ruoyi/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java
create mode 100644 ruoyi/src/main/resources/vm/sql/oracle/sql.vm
create mode 100644 ruoyi/src/main/resources/vm/sql/postgres/sql.vm
create mode 100644 ruoyi/src/main/resources/vm/sql/sqlserver/sql.vm
create mode 100644 script/docker/database.yml
create mode 100644 script/sql/oracle/oracle_ry_vue_4.X.sql
create mode 100644 script/sql/oracle/oracle_test.sql
create mode 100644 script/sql/postgres/postgres_ry_vue_4.X.sql
create mode 100644 script/sql/postgres/postgres_test.sql
create mode 100644 script/sql/ry_vue_4.X.sql
create mode 100644 script/sql/sqlserver/sqlserver_ry_vue_4.X.sql
create mode 100644 script/sql/sqlserver/sqlserver_test.sql
create mode 100644 script/sql/update/update-4.0-4.1.sql
diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md
index 22cb51d52..b6fcbea86 100644
--- a/.gitee/ISSUE_TEMPLATE.zh-CN.md
+++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md
@@ -1,4 +1,4 @@
-### 使用版本
+### 使用版本(未按照模板填写直接删除)
### 问题描述
diff --git a/README.md b/README.md
index d6a2409a5..203a03dbc 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@
[](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE)
[](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
-[](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
-[]()
+[](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
+[]()
[]()
[]()
@@ -25,6 +25,9 @@
| 容器框架 | Undertow | [Undertow官网](https://undertow.io/) | 基于 XNIO 的高性能容器 |
| 权限认证框架 | Sa-Token、Jwt | [Sa-Token官网](https://sa-token.dev33.cn/) | 强解耦、强扩展 |
| 关系数据库 | MySQL | [MySQL官网](https://dev.mysql.com/) | 适配 8.X 最低 5.7 |
+| 关系数据库 | Oracle | [Oracle官网](https://www.oracle.com/cn/database/) | 适配 11g 12c |
+| 关系数据库 | PostgreSQL | [PostgreSQL官网](https://www.postgresql.org/) | 适配 13 14 |
+| 关系数据库 | SQLServer | [SQLServer官网](https://docs.microsoft.com/zh-cn/sql/sql-server) | 适配 2017 2019 |
| 缓存数据库 | Redis | [Redis官网](https://redis.io/) | 适配 6.X 最低 4.X |
| 数据库框架 | Mybatis-Plus | [Mybatis-Plus文档](https://baomidou.com/guide/) | 快速 CRUD 增加开发效率 |
| 数据库框架 | p6spy | [p6spy官网](https://p6spy.readthedocs.io/) | 更强劲的 SQL 分析 |
diff --git a/pom.xml b/pom.xml
index c1f33b1ae..0ea4c098d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,46 +6,49 @@
com.ruoyi
ruoyi-vue-plus
- 4.0.1
+ 4.1.0
RuoYi-Vue-Plus
https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
RuoYi-Vue-Plus后台管理系统
- 4.0.1
- 2.6.4
+ 4.1.0
+ 2.6.7
UTF-8
UTF-8
1.8
3.2.2
+ 2.2.0
1.2.8
3.0.3
1.5.22
4.1.2
+ 1.21
3.0.5
- 3.3.0
2.3
1.29.0
3.5.1
3.9.1
- 5.7.21
- 4.9.2
- 2.6.2
- 3.16.8
+ 5.7.22
+ 4.9.3
+ 2.6.6
+ 3.17.0
2.2.1
- 3.5.0
+ 3.5.1
1.3.6
2.3.0
3.0.1
+
+ 30.0-jre
- 7.9.3
+ 7.9.5
3.14.0
- 5.6.68
- 8.3.7
+ 5.6.72
+ 8.3.8
localhost
@@ -109,6 +112,13 @@
${poi.version}
+
+
+ org.apache.commons
+ commons-compress
+ ${commons-compress.version}
+
+
com.alibaba
easyexcel
@@ -125,12 +135,6 @@
-
- cglib
- cglib
- ${cglib.version}
-
-
org.apache.velocity
@@ -222,6 +226,20 @@
com.yomahub
tlog-web-spring-boot-starter
${tlog.version}
+
+
+ log4j
+ log4j
+
+
+ dom4j
+ dom4j
+
+
+ commons-beanutils
+ commons-beanutils
+
+
diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml
index 3b80b15ca..5e3725e57 100644
--- a/ruoyi-extend/pom.xml
+++ b/ruoyi-extend/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 4.0.1
+ 4.1.0
4.0.0
ruoyi-extend
diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
index e811fd3be..8fed38aad 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
@@ -5,7 +5,7 @@
ruoyi-extend
com.ruoyi
- 4.0.1
+ 4.1.0
4.0.0
jar
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
index 65125b905..d61f79dc5 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
@@ -4,14 +4,12 @@
ruoyi-extend
com.ruoyi
- 4.0.1
+ 4.1.0
ruoyi-xxl-job-admin
jar
- 2.1.4
- 8.0.23
@@ -62,13 +60,12 @@
org.mybatis.spring.boot
mybatis-spring-boot-starter
- ${mybatis-spring-boot-starter.version}
+ ${spring-boot.mybatis}
mysql
mysql-connector-java
- ${mysql-connector-java.version}
diff --git a/ruoyi-ui/README.md b/ruoyi-ui/README.md
index a857617b6..00c0ab84f 100644
--- a/ruoyi-ui/README.md
+++ b/ruoyi-ui/README.md
@@ -11,7 +11,7 @@ cd ruoyi-ui
npm install
# 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题
-npm install --registry=https://registry.npm.taobao.org
+npm install --registry=https://registry.npmmirror.com
# 启动服务
npm run dev
diff --git a/ruoyi-ui/bin/package.bat b/ruoyi-ui/bin/package.bat
index 82817497e..9f6e5f4db 100644
--- a/ruoyi-ui/bin/package.bat
+++ b/ruoyi-ui/bin/package.bat
@@ -1,12 +1,12 @@
@echo off
echo.
-echo [Ϣ] װWeḅnode_modulesļ
+echo [��Ϣ] ��װWeb���̣�����node_modules�ļ���
echo.
%~d0
cd %~dp0
cd ..
-npm install --registry=https://registry.npm.taobao.org
+npm install --registry=https://registry.npmmirror.com
-pause
\ No newline at end of file
+pause
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 8b36c0255..c7f0b7334 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi-vue-plus",
- "version": "4.0.1",
+ "version": "4.1.0",
"description": "RuoYi-Vue-Plus后台管理系统",
"author": "LionLi",
"license": "MIT",
@@ -41,13 +41,13 @@
"clipboard": "2.0.8",
"core-js": "3.19.1",
"echarts": "4.9.0",
- "element-ui": "2.15.6",
+ "element-ui": "2.15.8",
"file-saver": "2.0.5",
"fuse.js": "6.4.3",
"highlight.js": "9.18.5",
"js-beautify": "1.13.0",
"js-cookie": "3.0.1",
- "jsencrypt": "3.2.1",
+ "jsencrypt": "3.0.0-rc.1",
"nprogress": "0.2.0",
"quill": "1.3.7",
"screenfull": "5.0.2",
diff --git a/ruoyi-ui/src/api/tool/gen.js b/ruoyi-ui/src/api/tool/gen.js
index 45069278f..65ddfea4d 100644
--- a/ruoyi-ui/src/api/tool/gen.js
+++ b/ruoyi-ui/src/api/tool/gen.js
@@ -3,14 +3,17 @@ import request from '@/utils/request'
// 查询生成表数据
export function listTable(query) {
return request({
+ headers: { 'datasource': localStorage.getItem("dataName") },
url: '/tool/gen/list',
method: 'get',
params: query
})
}
+
// 查询db数据库列表
export function listDbTable(query) {
return request({
+ headers: { 'datasource': localStorage.getItem("dataName") },
url: '/tool/gen/db/list',
method: 'get',
params: query
@@ -20,6 +23,7 @@ export function listDbTable(query) {
// 查询表详细信息
export function getGenTable(tableId) {
return request({
+ headers: { 'datasource': localStorage.getItem("dataName") },
url: '/tool/gen/' + tableId,
method: 'get'
})
@@ -28,6 +32,7 @@ export function getGenTable(tableId) {
// 修改代码生成信息
export function updateGenTable(data) {
return request({
+ headers: { 'datasource': localStorage.getItem("dataName") },
url: '/tool/gen',
method: 'put',
data: data
@@ -37,6 +42,7 @@ export function updateGenTable(data) {
// 导入表
export function importTable(data) {
return request({
+ headers: { 'datasource': localStorage.getItem("dataName") },
url: '/tool/gen/importTable',
method: 'post',
params: data
@@ -46,6 +52,7 @@ export function importTable(data) {
// 预览生成代码
export function previewTable(tableId) {
return request({
+ headers: { 'datasource': localStorage.getItem("dataName") },
url: '/tool/gen/preview/' + tableId,
method: 'get'
})
@@ -54,6 +61,7 @@ export function previewTable(tableId) {
// 删除表数据
export function delTable(tableId) {
return request({
+ headers: { 'datasource': localStorage.getItem("dataName") },
url: '/tool/gen/' + tableId,
method: 'delete'
})
@@ -62,6 +70,7 @@ export function delTable(tableId) {
// 生成代码（自定义路径）
export function genCode(tableName) {
return request({
+ headers: { 'datasource': localStorage.getItem("dataName") },
url: '/tool/gen/genCode/' + tableName,
method: 'get'
})
@@ -70,6 +79,7 @@ export function genCode(tableName) {
// 同步数据库
export function synchDb(tableName) {
return request({
+ headers: { 'datasource': localStorage.getItem("dataName") },
url: '/tool/gen/synchDb/' + tableName,
method: 'get'
})
diff --git a/ruoyi-ui/src/assets/styles/sidebar.scss b/ruoyi-ui/src/assets/styles/sidebar.scss
index d2a7453f3..ed308b8dc 100644
--- a/ruoyi-ui/src/assets/styles/sidebar.scss
+++ b/ruoyi-ui/src/assets/styles/sidebar.scss
@@ -7,6 +7,10 @@
position: relative;
}
+ .sidebarHide {
+ margin-left: 0!important;
+ }
+
.sidebar-container {
-webkit-transition: width .28s;
transition: width 0.28s;
diff --git a/ruoyi-ui/src/components/FileUpload/index.vue b/ruoyi-ui/src/components/FileUpload/index.vue
index 5f1e23652..78baf48dd 100644
--- a/ruoyi-ui/src/components/FileUpload/index.vue
+++ b/ruoyi-ui/src/components/FileUpload/index.vue
@@ -41,6 +41,7 @@
diff --git a/ruoyi-ui/src/components/ImageUpload/index.vue b/ruoyi-ui/src/components/ImageUpload/index.vue
index 11573dd88..acd467011 100644
--- a/ruoyi-ui/src/components/ImageUpload/index.vue
+++ b/ruoyi-ui/src/components/ImageUpload/index.vue
@@ -44,6 +44,7 @@
diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue
index dec1f7452..0cc24dba8 100644
--- a/ruoyi-ui/src/components/TopNav/index.vue
+++ b/ruoyi-ui/src/components/TopNav/index.vue
@@ -30,13 +30,14 @@