疯狂的狮子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 |
|
phper08
|
7d0f5e94ef
|
update ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java.
|
2021-05-03 13:18:33 +08:00 |
|
疯狂的狮子li
|
c0e5e9cb24
|
update 同步ruoyi
|
2021-04-25 09:45:45 +08:00 |
|
疯狂的狮子li
|
4e723f4936
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
|
2021-04-25 09:27:07 +08:00 |
|
Ricky
|
2c94587263
|
优化ExcelUtil空值处理
|
2021-04-21 09:53:14 +08:00 |
|
疯狂的狮子li
|
fdacc04582
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
|
2021-03-30 17:21:22 +08:00 |
|
RuoYi
|
6ca7870393
|
修正注释
|
2021-03-30 15:30:18 +08:00 |
|
yuhong0206@sina.cn
|
9b9c1b999f
|
读取excel增加
if(row == null)
{
continue;
}
判断。防止有时候Excel表中有空数据行，导致读取时出现空指针异常。
|
2021-03-29 09:00:44 +08:00 |
|
yuhong0206@sina.cn
|
ec627704b2
|
取消
|
2021-03-29 08:58:46 +08:00 |
|
yuhong0206@sina.cn
|
9e6b2a1265
|
读取excel增加
if(row == null)
{
continue;
}
判断。防止有时候Excel表中有空数据行，导致读取时出现空指针异常。
|
2021-03-29 08:56:51 +08:00 |
|
疯狂的狮子li
|
62464cfe45
|
fix Collection 验证失效问题
|
2021-03-22 13:31:43 +08:00 |
|
疯狂的狮子li
|
9b4b9e0c74
|
update 删除通用工具 改为使用hutool
|
2021-03-15 16:38:43 +08:00 |
|
疯狂的狮子li
|
2b8ab9cc4d
|
update 使用hutool重写系统监控
|
2021-03-12 18:02:23 +08:00 |
|
疯狂的狮子li
|
57cfad671f
|
update 使用hutool重写验证码生成
|
2021-03-12 16:52:55 +08:00 |
|
疯狂的狮子li
|
684eadbcc6
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/java/domain.java.vm
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
ruoyi-ui/src/views/tool/gen/index.vue
sql/ry_20210108.sql
|
2021-01-11 09:58:41 +08:00 |
|
X.B-H
|
b7cdd10f9f
|
修复导入数据为负浮点数时丢失精度问题
|
2021-01-06 11:11:11 +08:00 |
|
疯狂的狮子li
|
93e7f53cf8
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2020-12-28 10:40:13 +08:00 |
|
RuoYi
|
0187344798
|
Excel注解支持Image图片导出
|
2020-12-27 10:04:45 +08:00 |
|
疯狂的狮子li
|
f56f57a236
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.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-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
ruoyi-ui/package.json
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/assets/styles/sidebar.scss
ruoyi-ui/src/assets/styles/variables.scss
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/components/Screenfull/index.vue
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/layout/components/Sidebar/Logo.vue
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
ruoyi-ui/src/layout/components/Sidebar/index.vue
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
ruoyi-ui/src/layout/index.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/settings.js
ruoyi-ui/src/store/modules/settings.js
ruoyi-ui/src/store/modules/user.js
ruoyi-ui/src/views/login.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/profile/resetPwd.vue
ruoyi-ui/src/views/system/user/profile/userInfo.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi-ui/vue.config.js
|
2020-12-11 14:27:54 +08:00 |
|
RuoYi
|
9e387dc447
|
去除用户手机邮箱部门必填验证
|
2020-12-11 13:26:14 +08:00 |
|
疯狂的狮子li
|
e80349c343
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/utils/request.js
|
2020-12-04 11:46:29 +08:00 |
|
RuoYi
|
0e2b97a886
|
升级poi到最新版本4.1.2
|
2020-12-03 13:28:04 +08:00 |
|
RuoYi
|
1c7a5faae8
|
Excel支持注解align对齐方式
|
2020-12-03 13:26:46 +08:00 |
|
疯狂的狮子li
|
ce438f182a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-ui/package.json
ruoyi-ui/src/layout/components/AppMain.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
sql/ry_20201128.sql
|
2020-11-30 12:41:39 +08:00 |
|
RuoYi
|
fd831d5a90
|
Excel支持导入Boolean型数据
|
2020-11-28 12:08:55 +08:00 |
|
疯狂的狮子li
|
ff563c44e2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/package.json
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
|
2020-11-18 10:41:13 +08:00 |
|
RuoYi
|
6bb166b89f
|
阻止任意文件下载漏洞
|
2020-11-17 10:29:52 +08:00 |
|
疯狂的狮子li
|
298fabfdec
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/api/tool/gen.js
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
2020-09-18 17:38:23 +08:00 |
|
RuoYi
|
497f98ba90
|
导入excel整形值校验优化
|
2020-09-17 18:22:50 +08:00 |
|
疯狂的狮子li
|
06c4d4d01b
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
pom.xml
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
ruoyi-ui/package.json
ruoyi-ui/src/components/Editor/index.vue
ruoyi-ui/src/router/index.js
|
2020-09-11 09:17:43 +08:00 |
|
RuoYi
|
33793d8eff
|
Excel导出类型NUMERIC支持精度浮点类型
|
2020-09-09 11:30:34 +08:00 |
|
疯狂的狮子li
|
1ef17bb582
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
|
2020-08-31 09:12:13 +08:00 |
|
RuoYi
|
be54188ba6
|
导出Excel调整targetAttr获取值方法，防止get方法不规范
|
2020-08-26 15:39:46 +08:00 |
|
疯狂的狮子li
|
fdbe943053
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
|
2020-08-26 15:30:25 +08:00 |
|