xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-11-04 16:23:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,293 Commits 2 Branches 36 Tags
81ab86103655d3272c08bdd7ca335305407fc0e5
Commit Graph

652 Commits

Author SHA1 Message Date
疯狂的狮子li
6751b97db9 fix 修复一些小问题 2022-02-25 18:34:37 +08:00
疯狂的狮子li
568e2a9337 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/src/components/Pagination/index.vue
	ruoyi-ui/src/permission.js
	ruoyi-ui/src/utils/request.js
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/server/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
 2022-02-24 15:30:20 +08:00
RuoYi
bb65cd1976 代码生成子表支持日期/字典配置 2022-02-24 09:28:51 +08:00
“lumingsyc”
9aaa9ce8aa 优化部门管理页面email字段的表单验证多余的单引号 2022-02-23 20:00:47 +08:00
RuoYi
cb5a6d29e2 页面若未匹配到字典标签则返回原字典值 2022-02-23 16:55:09 +08:00
RuoYi
4d8bd8805b 优化个人中心页面email字段的表单验证多余的单引号 2022-02-23 16:54:59 +08:00
RuoYi
aa9ed2e863 修复分页组件请求两次问题 2022-02-21 15:21:16 +08:00
疯狂的狮子li
075f7fc19e update 增加 用户注册 用户类型默认值 2022-02-21 10:53:59 +08:00
RuoYi
54c6c4e547 服务监控新增运行参数信息显示 2022-02-20 16:06:33 +08:00
疯狂的狮子li
587fb27484 add 增加页面更新说明 2022-02-18 10:38:03 +08:00
疯狂的狮子li
7f305962f2 发布 4.0.0 2022-02-18 10:31:13 +08:00
疯狂的狮子li
f6edb48df9 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-ui/src/components/Pagination/index.vue
 2022-02-18 09:57:51 +08:00
积硅步，至千里
e793138031 修改登录超时刷新页面跳转登录页面还提示重新登录问题 2022-02-17 17:16:11 +08:00
RuoYi
d734bfc34f 修复分页组件请求两次问题(I4SQOR) 2022-02-17 11:56:11 +08:00
疯狂的狮子li
ee2f74dc5e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	.gitignore
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/src/components/FileUpload/index.vue
	ruoyi-ui/src/views/tool/build/index.vue
 2022-02-14 14:27:13 +08:00
RuoYi
b7b4364db2 代码生成编辑修改打开新页签 2022-02-12 13:14:09 +08:00
若依
5e6fd0d1e1 !429 修复自定义组件file-upload无法显示第一个文件，列表显示的文件比实际文件少一个的问题 
Merge pull request !429 from hjk2008/master
 2022-02-12 03:56:02 +00:00
sam
c491257359 修复自定义组件file-upload无法显示第一个文件，列表显示的文件比实际文件少一个的问题 2022-02-12 08:46:12 +08:00
疯狂的狮子li
d99dd4b875 update 调整oss预览开关 使用前端直接调用更改配置参数 2022-02-09 14:52:33 +08:00
稚屿
a29201a248 修正单词拼写错误 2022-02-09 08:46:54 +08:00
疯狂的狮子li
0b852faf00 Merge remote-tracking branch 'ruoyi-vue/master' into dev 
# Conflicts:
#	pom.xml
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
#	ruoyi-ui/src/assets/styles/ruoyi.scss
#	ry.bat
 2022-01-29 09:23:11 +08:00
wind
48b007543a fix css class name 2022-01-22 14:05:44 +00:00
疯狂的狮子li
c636e6909b Merge remote-tracking branch 'ruoyi-vue/master' into dev 
# Conflicts:
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
 2022-01-21 18:29:44 +08:00
RuoYi
dccb3ac6c6 修复选项卡点击右键刷新丢失参数问题 2022-01-18 11:29:31 +08:00
疯狂的狮子li
911867d5a5 update 数据库更改 对接多用户体系 2022-01-17 17:09:27 +08:00
疯狂的狮子li
8052d75957 Merge remote-tracking branch 'ruoyi-vue/master' into dev 
# Conflicts:
#	ruoyi-admin/src/main/resources/application.yml
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
#	ruoyi-ui/src/views/login.vue
#	ruoyi-ui/src/views/register.vue
 2022-01-17 15:48:09 +08:00
RuoYi
d7ca248bc8 update copyright 2022 2022-01-14 11:47:25 +08:00
疯狂的狮子li
a0bed51d96 update 格式化代码 统一间隔符 
update 格式化代码 统一间隔符
 2022-01-13 09:58:16 +08:00
疯狂的狮子li
5413b37d71 Merge remote-tracking branch 'ruoyi-vue/master' into dev 
# Conflicts:
#	README.md
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
#	ruoyi-ui/src/views/index.vue
 2022-01-12 20:53:03 +08:00
RuoYi
9bd7509e87 添加新群号：264312783 2022-01-11 09:02:16 +08:00
RuoYi
9f7acd4cf9 优化部门修改缩放后出现的错位问题 2022-01-08 09:23:45 +08:00
疯狂的狮子li
1c7d840ff6 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-admin/pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/pom.xml
	ruoyi-framework/pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
	ruoyi-generator/pom.xml
	ruoyi-job/pom.xml
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
	ruoyi-system/pom.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/api/system/user.js
	ruoyi-ui/src/utils/request.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/system/user/index.vue
 2022-01-04 09:45:33 +08:00
RuoYi
c8d9b3f8fc 前端支持设置是否需要防止数据重复提交 2022-01-02 10:37:09 +08:00
RuoYi
c9d19cbe56 空值不进行回显数据字典 2022-01-02 10:29:15 +08:00
RuoYi
7bc15245aa 预览组件支持多图显示 2022-01-01 09:46:18 +08:00
RuoYi
cb6228800b 代码生成新增Java类型Boolean 2022-01-01 09:28:52 +08:00
RuoYi
6ef899d000 修复登录失效后多次请求提示多次弹窗问题 2021-12-31 10:03:54 +08:00
RuoYi
6353f4ff09 若依 3.8.1 2021-12-31 00:00:06 +08:00
RuoYi
530b2a51d5 修改单词拼写错误 2021-12-30 14:13:38 +08:00
RuoYi
d51e7cbb51 用户管理部门查询选择节点后分页参数初始 2021-12-29 11:04:09 +08:00
疯狂的狮子li
ed659da488 发布 v3.5.0-release 正式版 2021-12-28 10:35:52 +08:00
马小法
1294f68265 fix https://gitee.com/y_project/RuoYi-Vue/issues/I4O5WD 2021-12-27 15:33:22 +08:00
RuoYi
0e771a6c1b 升级spring-boot到最新版本2.5.8 2021-12-27 12:38:59 +08:00
疯狂的狮子li
673b225da2 Merge remote-tracking branch 'ruoyi-vue/master' into dev 
# Conflicts:
#	ruoyi-ui/vue.config.js
 2021-12-20 14:34:05 +08:00
RuoYi
c28aa299bd 新增使用Gzip解压缩静态文件地址 2021-12-20 14:25:52 +08:00
RuoYi
b2189ae965 集成compression-webpack-plugin插件实现打包Gzip压缩 2021-12-20 10:00:26 +08:00
疯狂的狮子li
a3504dac6e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
	ruoyi-ui/package.json
	ruoyi-ui/src/main.js
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/vue.config.js
 2021-12-20 09:47:56 +08:00
RuoYi
a028b566ed 集成compression-webpack-plugin插件实现打包Gzip压缩 2021-12-20 09:46:17 +08:00
RuoYi
e5647793ce 路由支持单独配置菜单或角色权限 2021-12-18 16:48:31 +08:00
RuoYi
903b5aebca 新增图片预览组件 2021-12-18 12:23:59 +08:00