疯狂的狮子li
|
f44ff8477f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
README.md
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
|
5 years ago |
RuoYi
|
6cf2a8edeb
|
升级SpringBoot到最新版本2.2.12 提升启动速度
|
5 years ago |
|
疯狂的狮子li
|
7e476b941e
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
ruoyi-ui/package.json
ruoyi-ui/src/main.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
5 years ago |
|
RuoYi
|
8988d0b4ab
|
若依 3.3.0
|
5 years ago |
|
RuoYi
|
89e1f2a53f
|
修改Set可能导致嵌套的问题
|
5 years ago |
BecomeDream
|
e8f63b2994
|
修改Set可能导致嵌套的问题
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
9e387dc447
|
去除用户手机邮箱部门必填验证
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
ef92ad4d8c
|
支持get请求映射params参数
|
5 years ago |
|
RuoYi
|
0e2b97a886
|
升级poi到最新版本4.1.2
|
5 years ago |
|
RuoYi
|
1c7a5faae8
|
Excel支持注解align对齐方式
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
2797c1eb3a
|
修正转换字符串的目标字符集属性
|
5 years ago |
|
RuoYi
|
a69cc94f35
|
三级菜单自动配置组件
|
5 years ago |
|
RuoYi
|
a3b86d6f6d
|
代码生成删除多余的数字float类型
|
5 years ago |
|
RuoYi
|
fd831d5a90
|
Excel支持导入Boolean型数据
|
5 years ago |
|
疯狂的狮子li
|
15c4428b9c
|
修改 ruoyi CharsetKit.java bug
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
8f145bba3a
|
若依 v3.2.1
|
5 years ago |
|
RuoYi
|
6bb166b89f
|
阻止任意文件下载漏洞
|
5 years ago |
|
RuoYi
|
823e95667e
|
代码生成支持上传控件
|
5 years ago |
|
疯狂的狮子li
|
1a15c528a2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
|
5 years ago |
|
RuoYi
|
403f5c5dcf
|
解决代码生成没有bit类型的问题
|
5 years ago |
|
RuoYi
|
69256940df
|
若依 3.2
|
5 years ago |
|
疯狂的狮子li
|
bd39b971cf
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-ui/package.json
ruoyi-ui/src/utils/ruoyi.js
ruoyi-ui/src/views/monitor/job/index.vue
|
5 years ago |
|
疯狂的狮子li
|
aefa2095f0
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
ruoyi-generator/src/main/resources/vm/sql/sql.vm
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.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
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
sql/ry_20200920.sql
|
5 years ago |
|
RuoYi
|
28bceda630
|
修正文字错误
|
5 years ago |
|
RuoYi
|
abeb8d7fd8
|
菜单新增是否缓存keep-alive
|
5 years ago |
|
RuoYi
|
478fae0d28
|
菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
497f98ba90
|
导入excel整形值校验优化
|
5 years ago |
|
疯狂的狮子li
|
b111cbeedd
|
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/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-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
ruoyi-ui/src/views/tool/gen/editTable.vue
|
5 years ago |
|
RuoYi
|
a948affb2d
|
代码生成支持富文本控件
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
33793d8eff
|
Excel导出类型NUMERIC支持精度浮点类型
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
4e32788b36
|
修正数据库字符串类型nvarchar
|
5 years ago |
|
RuoYi
|
be54188ba6
|
导出Excel调整targetAttr获取值方法，防止get方法不规范
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
bf771ae5c8
|
Excel注解支持自动统计数据总和
|
5 years ago |
|
疯狂的狮子li
|
d464d8703c
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
|
5 years ago |
|
RuoYi
|
0446d211df
|
设置默认排序顺序
|
5 years ago |
|
疯狂的狮子li
|
5aeac1a8ae
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/package.json
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
ruoyi-ui/src/utils/ruoyi.js
|
5 years ago |
|
RuoYi
|
da146c2a70
|
Excel注解支持设置BigDecimal精度&舍入规则
|
5 years ago |
|
疯狂的狮子li
|
088bc98a43
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-ui/package.json
|
5 years ago |
|
RuoYi
|
8f9f0c04cc
|
若依 3.1
|
5 years ago |
|
疯狂的狮子li
|
a9f4a4e111
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
.gitignore
ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/utils/ruoyi.js
|
6 years ago |
|
RuoYi
|
3b61ed56b0
|
添加获取当前的环境配置方法
|
6 years ago |
mazh
|
a9695d1756
|
修复BUG: 导出Excel功能, 当attr的cellType为String时, cell的cellType由Numeric修正为String。
|
6 years ago |
