疯狂的狮子li
|
d3abd6c96e
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java
ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java
ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.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/SysDictTypeServiceImpl.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/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-ui/src/components/Breadcrumb/index.vue
|
2021-08-17 10:38:07 +08:00 |
|
RuoYi
|
03cf98d3c9
|
优化异常信息
|
2021-08-16 16:25:25 +08:00 |
|
稚屿
|
333e19339c
|
修正方法名单词拼写错误
|
2021-08-15 10:26:05 +00:00 |
|
RuoYi
|
3003bb0f50
|
Excel注解图片导入兼容xls
|
2021-08-13 10:56:35 +08:00 |
|
RuoYi
|
7be17ea89a
|
Excel注解支持Image图片导入
|
2021-08-11 10:13:34 +08:00 |
|
疯狂的狮子li
|
c2de299834
|
update 同步ruoyi
|
2021-08-09 10:05:27 +08:00 |
|
疯狂的狮子li
|
9bfa420a76
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
README.md
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.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/core/controller/BaseController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
ruoyi-ui/package.json
ruoyi-ui/src/views/system/menu/index.vue
|
2021-08-09 09:55:50 +08:00 |
|
RuoYi
|
7736097f6b
|
提取通用方法到基类控制器
|
2021-08-08 19:12:12 +08:00 |
|
疯狂的狮子li
|
79bf332c53
|
remove 移除通用上传下载接口与配置
|
2021-08-04 19:11:39 +08:00 |
|
疯狂的狮子li
|
08db4a5f53
|
update 更改所有业务excel导出
|
2021-08-04 19:03:25 +08:00 |
|
疯狂的狮子li
|
ffed5a09cb
|
remove 移除原生excel工具
|
2021-08-04 19:02:59 +08:00 |
|
疯狂的狮子li
|
9cf4794146
|
update 更新 SysUser 导入导出
|
2021-08-04 18:29:38 +08:00 |
|
疯狂的狮子li
|
0539c2f927
|
update 重写系统部分业务导出
|
2021-08-04 11:46:55 +08:00 |
|
疯狂的狮子li
|
170908ef8d
|
add 增加 easyexcel 工具类
|
2021-08-03 19:28:15 +08:00 |
|
jackytang
|
ad15978ccb
|
Fix 修复DictUtils方法报错
|
2021-08-02 16:10:31 +00:00 |
|
疯狂的狮子li
|
c813046594
|
update 日常校验 统一重构到 StringUtils 便于维护扩展
|
2021-08-02 19:28:41 +08:00 |
|
疯狂的狮子li
|
f8ab5663ef
|
update 日常字符串校验 统一重构到 StringUtils 便于维护扩展
|
2021-08-02 12:15:14 +08:00 |
|
疯狂的狮子li
|
cfdeada3fd
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/src/main/resources/application.yml
ruoyi-admin/src/main/resources/i18n/messages.properties
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
ruoyi-generator/src/main/resources/vm/java/service.java.vm
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-ui/src/api/login.js
ruoyi-ui/src/router/index.js
ruoyi-ui/src/utils/zipdownload.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/login.vue
ruoyi-ui/src/views/system/user/index.vue
|
2021-08-02 11:21:09 +08:00 |
|
RuoYi
|
8ed7916b61
|
定时任务屏蔽http(s)远程调用
|
2021-07-30 11:28:46 +08:00 |
|
RuoYi
|
6b5dd4d2be
|
优化XSS跨站脚本过滤
|
2021-07-28 16:04:59 +08:00 |
|
疯狂的狮子li
|
7cf6064200
|
update 重构 IServicePlus 功能 增加 BeanCopyUtils 深拷贝工具
|
2021-07-27 11:07:33 +08:00 |
|
疯狂的狮子li
|
8ddd71a818
|
update 使用hutool重构 判断是否url
|
2021-07-12 14:29:49 +08:00 |
|
疯狂的狮子li
|
cd34c87afa
|
fix 修复升级合并错误
|
2021-07-12 11:00:12 +08:00 |
|
RuoYi
|
5879c2484a
|
菜单路由配置支持内链访问
|
2021-07-11 16:31:10 +08:00 |
|
疯狂的狮子li
|
d92560b64b
|
fix 修复 hutool StrUtil.containsAny 传入参数后返回结果不一致问题
|
2021-06-29 15:22:45 +08:00 |
|
陆继保
|
200170e5f3
|
update ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java.
|
2021-06-29 07:04:25 +00:00 |
|
疯狂的狮子li
|
1790c81603
|
fix 修复地址ip地址特殊回环问题
|
2021-06-22 14:12:51 +08:00 |
|
疯狂的狮子li
|
44bbe8b307
|
update 同步更新 ruoyi 适配新功能
|
2021-06-17 19:22:49 +08:00 |
|
疯狂的狮子li
|
7bdce848e7
|
update 升级 hutool 5.7.1 适配工具类
|
2021-06-16 15:36:45 +08:00 |
|
疯狂的狮子li
|
2cdc12055d
|
fix 修复 JsonUtils 参数为空报错
|
2021-06-16 13:15:18 +08:00 |
|
RuoYi
|
462862ba65
|
升级commons.io到最新版本v2.10.0
|
2021-06-16 09:52:38 +08:00 |
|
疯狂的狮子li
|
d98faaffee
|
update 移除 fastjson 增加 jackson 工具类 重写相关业务
|
2021-06-13 15:39:35 +08:00 |
|
疯狂的狮子li
|
b3541e9758
|
update 优化 使用 hutool 替换 ruoyi 自带工具类 解决部分方法过期与高版本JDK不兼容问题
|
2021-06-12 20:13:35 +08:00 |
|
疯狂的狮子li
|
00d024ff86
|
fix 修复相对路径上传异常问题
|
2021-06-04 18:11:46 +08:00 |
|
疯狂的狮子li
|
6fc141497a
|
update 优化分页默认值 默认查全部
|
2021-06-04 10:48:35 +08:00 |
|
疯狂的狮子li
|
a961fff69d
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
|
2021-06-02 12:42:18 +08:00 |
|
RuoYi
|
b7f3c68eca
|
优化图片工具类读取文件
|
2021-06-02 11:45:40 +08:00 |
|
疯狂的狮子li
|
d0b2166525
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.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/impl/SysConfigServiceImpl.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/resources/mapper/system/SysDeptMapper.xml
ruoyi-ui/src/api/system/config.js
ruoyi-ui/src/api/system/dict/type.js
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dict/index.vue
|
2021-05-28 10:07:15 +08:00 |
|
RuoYi
|
af9cfb40a4
|
优化参数&字典缓存操作
|
2021-05-27 17:38:44 +08:00 |
|
疯狂的狮子li
|
a42c1e4711
|
remove 删除提交错误文件
|
2021-05-25 14:32:41 +08:00 |
|
疯狂的狮子li
|
6c195af2a3
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
ruoyi-generator/pom.xml
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-quartz/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
ruoyi-system/pom.xml
ruoyi-ui/package.json
ruoyi-ui/public/index.html
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/notice/index.vue
ruoyi-ui/src/views/system/post/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2021-05-25 10:00:36 +08:00 |
|
RuoYi
|
7e79c4f249
|
生成vue模板导出按钮点击后添加遮罩
|
2021-05-24 11:34:03 +08:00 |
|
若依
|
504638eb41
|
!234 【轻量级 PR】：删去两处冗余代码
Merge pull request !234 from xivLi/master
|
2021-05-24 11:30:21 +08:00 |
|
xivLi
|
9651a7d7fc
|
删去utils.uuid下 IdUtils类中 多余的import(同包下的UUID类)
|
2021-05-22 15:52:19 +08:00 |
|
lyqwer
|
b2914cbcb1
|
修正方法名单词拼写错误
|
2021-05-21 17:24:48 +08:00 |
|
疯狂的狮子li
|
31db658929
|
update 增强分页工具兼容性
|
2021-05-15 11:32:05 +08:00 |
|
疯狂的狮子li
|
9f5a03edcd
|
add 增加分页工具
|
2021-05-13 21:22:51 +08:00 |
|
疯狂的狮子li
|
c33c3de43a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
README.md
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-ui/src/assets/styles/element-ui.scss
ruoyi-ui/src/views/index.vue
|
2021-05-11 17:14:53 +08:00 |
|
RuoYi
|
dd384e4a31
|
上传媒体类型添加视频格式
|
2021-05-11 14:25:08 +08:00 |
|
libin
|
14ea071306
|
修复文件上传时java.nio.file.FileAlreadyExistsException
|
2021-05-08 15:31:16 +08:00 |
|