疯狂的狮子li
|
4af334f2ad
|
update 同步 ruoyi 新功能
|
3 years ago |
|
疯狂的狮子li
|
da0c86dd54
|
update mybatis-plus 3.5.1 => 3.5.2 解决新版本兼容性问题 关键字冲突修改
|
4 years ago |
|
疯狂的狮子Li
|
5ced7e05f5
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
README.md
pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
ruoyi-common/pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.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-common/src/main/java/com/ruoyi/common/core/text/Convert.java
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/views/index.vue
|
4 years ago |
RuoYi
|
9639c096ba
|
用户列表查询不显示密码字段
|
4 years ago |
也曾为你、像超人
|
b5b8d941f3
|
update ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml.
问题：查业务类型为其他（businessType = 0）的数据时，会查到所有数据
原因：当参数为 Integer 类型 0 时，MyBatis 会把 0 当做空字符串处理
|
4 years ago |
|
RuoYi
|
6f14087a16
|
修改显示顺序orderNum类型为整型
|
4 years ago |
|
疯狂的狮子Li
|
d637f03067
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
README.md
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/core/controller/BaseController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-generator/pom.xml
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-job/pom.xml
ruoyi-system/pom.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/README.md
ruoyi-ui/bin/package.bat
ruoyi-ui/package.json
ruoyi-ui/src/views/index.vue
|
4 years ago |
|
RuoYi
|
db2dfee6ae
|
用户缓存信息添加部门ancestors祖级列表
|
4 years ago |
|
疯狂的狮子Li
|
8cad83a9dc
|
fix 修复 用户绑定角色 与 角色绑定用户 异常 编写错误
|
4 years ago |
|
疯狂的狮子Li
|
4a353896e3
|
add 增加 短信登录 与 小程序登录 示例
|
4 years ago |
hewenqiang
|
4770b0d3e3
|
fix 修复根据用户ID查询菜单信息SQL报错。`status`字段为char类型，应该传字符类型，此处存在隐式转换问题。（MySQL能自动转换，PostgreSQL转换报错）。
|
4 years ago |
|
疯狂的狮子li
|
333a38978e
|
update 重命名 菜单字段 query -> query_param 解决系统关键字问题
|
4 years ago |
|
疯狂的狮子li
|
46fa404d83
|
update 增加 mysql 字段格式化处理 防止关键字问题
|
4 years ago |
|
疯狂的狮子li
|
2d813b2191
|
update 删除多余 参数类型
|
4 years ago |
|
疯狂的狮子li
|
d3a3ad5cbd
|
update 简化查询用户功能
|
4 years ago |
|
疯狂的狮子li
|
8091a46005
|
update 简化查询菜单功能
|
4 years ago |
|
疯狂的狮子li
|
18cffc4678
|
update 简化查询角色功能
|
4 years ago |
|
疯狂的狮子li
|
c1d01fb1e1
|
update 优化 部门修改子元素关系 使用批量更新
|
4 years ago |
|
疯狂的狮子li
|
b2d3abd9d6
|
update 优化去除sql差异化 时间范围统一使用 between 处理
|
4 years ago |
|
疯狂的狮子li
|
a54cb7d3e4
|
update 简化查询菜单功能
|
4 years ago |
|
疯狂的狮子li
|
00549c267f
|
update 简化查询部门功能
|
4 years ago |
|
RuoYi
|
c8c57b545a
|
优化菜单关键字导致的插件报错问题
|
4 years ago |
|
RuoYi
|
21780d8106
|
优化代码
|
4 years ago |
|
疯狂的狮子li
|
911867d5a5
|
update 数据库更改 对接多用户体系
|
4 years ago |
|
疯狂的狮子li
|
a0bed51d96
|
update 格式化代码 统一间隔符
update 格式化代码 统一间隔符
|
4 years ago |
|
疯狂的狮子li
|
4e04f5e967
|
remove 移除过期代码 数据权限
|
4 years ago |
|
疯狂的狮子li
|
6c4882b907
|
update 注释遗漏 老版本数据权限
|
4 years ago |
|
疯狂的狮子li
|
29c46a15f9
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
README.md
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-framework/pom.xml
ruoyi-generator/pom.xml
ruoyi-job/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
ruoyi-system/pom.xml
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/mapper/SysPostMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.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/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.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/SysPostMapper.xml
ruoyi-ui/package.json
ruoyi-ui/src/directive/index.js
ruoyi-ui/src/plugins/download.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/system/user/authRole.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/basicInfoForm.vue
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
|
4 years ago |
|
疯狂的狮子Li
|
aae3fe5305
|
update [重大更新] 重写数据权限实现
|
4 years ago |
|
疯狂的狮子li
|
37def02ee1
|
fix 修复sql关键字处理 防止解析器报错
|
4 years ago |
|
疯狂的狮子li
|
965ebd0f03
|
fix 修复主键溢出问题 将查询返回类型改为 Long
|
4 years ago |
|
疯狂的狮子li
|
c5dc08e082
|
update 调整 角色查询部门 返回值类型
|
4 years ago |
zendwang
|
209654fdff
|
fix selectPostListByUserId方法出参调整为Long
|
4 years ago |
phanes
|
984098abce
|
fix: 修复返回参数的数据类型错误的问题
|
4 years ago |
|
疯狂的狮子li
|
c7c9bd6b08
|
fix 修复 用户逻辑删除 差异问题
|
4 years ago |
|
疯狂的狮子Li
|
d254340b9b
|
fix 修正错别字
|
4 years ago |
|
RuoYi
|
e66d0e4f74
|
角色列表返回类型保持一致
|
4 years ago |
|
疯狂的狮子li
|
2af534eea4
|
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/core/domain/entity/SysMenu.java
ruoyi-framework/pom.xml
ruoyi-generator/pom.xml
ruoyi-quartz/pom.xml
ruoyi-system/pom.xml
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-ui/package.json
ruoyi-ui/src/components/ImageUpload/index.vue
ruoyi-ui/src/components/ThemePicker/index.vue
ruoyi-ui/src/layout/components/Sidebar/Link.vue
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/index.vue
sql/ry_20210908.sql
|
4 years ago |
|
RuoYi
|
a5e38f6f99
|
菜单管理支持配置路由参数
|
4 years ago |
|
疯狂的狮子li
|
52ca1e7d06
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
|
4 years ago |
Gold_Fish
|
b036e78d85
|
修改根据userId获取菜单sql
|
4 years ago |
|
疯狂的狮子li
|
0c438ad8e9
|
update 修改时检查用户数据权限范围
|
4 years ago |
|
疯狂的狮子li
|
31c2cfa53c
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
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-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.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/SysRoleServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
|
4 years ago |
|
RuoYi
|
e52092c6d4
|
修改时检查用户数据权限范围
|
4 years ago |
孤舟烟雨
|
c9f7314cd0
|
!77 update 对象存储配置 重构到数据库 动态配置
* 增加对象存储配置sql
* 修改对象存储配置
* Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev
* 增加对象存储配置
* 增加对象存储配置
|
5 years ago |
|
疯狂的狮子li
|
0e8a8fca31
|
update 移动文件存储业务到 system 模块
|
5 years ago |
|
疯狂的狮子li
|
59114a14ff
|
update 同步 ruoyi 对新业务进行修正
|
5 years ago |
|
疯狂的狮子li
|
aa14085746
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
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/domain/entity/SysUser.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.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/SysUserMapper.xml
ruoyi-ui/src/api/system/role.js
ruoyi-ui/src/api/system/user.js
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
5 years ago |
|
RuoYi
|
90c41d498c
|
角色管理新增分配用户功能
|
5 years ago |
|
疯狂的狮子li
|
85ae3a9420
|
update 对相关代码改动 进行调整
|
5 years ago |
