admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,402 Commits 3 Branches 0 Tags
Commit Graph

83 Commits

Author SHA1 Message Date
疯狂的狮子Li
8cad83a9dc fix 修复 用户绑定角色 与 角色绑定用户 异常 编写错误 2022-03-23 22:18:56 +08:00
疯狂的狮子Li
4a353896e3 add 增加 短信登录 与 小程序登录 示例 2022-03-23 00:33:28 +08:00
hewenqiang
4770b0d3e3 fix 修复根据用户ID查询菜单信息SQL报错。status字段为char类型，应该传字符类型，此处存在隐式转换问题。（MySQL能自动转换，PostgreSQL转换报错）。 2022-03-16 16:53:17 +08:00
疯狂的狮子li
333a38978e update 重命名 菜单字段 query -> query_param 解决系统关键字问题 2022-03-11 13:29:04 +08:00
疯狂的狮子li
46fa404d83 update 增加 mysql 字段格式化处理 防止关键字问题 2022-03-04 20:32:12 +08:00
疯狂的狮子li
2d813b2191 update 删除多余 参数类型 2022-03-04 13:42:08 +08:00
疯狂的狮子li
d3a3ad5cbd update 简化查询用户功能 2022-03-04 11:45:38 +08:00
疯狂的狮子li
8091a46005 update 简化查询菜单功能 2022-03-04 10:48:12 +08:00
疯狂的狮子li
18cffc4678 update 简化查询角色功能 2022-03-04 10:20:06 +08:00
疯狂的狮子li
c1d01fb1e1 update 优化 部门修改子元素关系 使用批量更新 2022-03-04 09:26:26 +08:00
疯狂的狮子li
b2d3abd9d6 update 优化去除sql差异化 时间范围统一使用 between 处理 2022-03-03 11:18:10 +08:00
疯狂的狮子li
a54cb7d3e4 update 简化查询菜单功能 2022-03-03 11:18:10 +08:00
疯狂的狮子li
00549c267f update 简化查询部门功能 2022-03-03 11:18:10 +08:00
疯狂的狮子li
911867d5a5 update 数据库更改 对接多用户体系 2022-01-17 17:09:27 +08:00
疯狂的狮子li
a0bed51d96 update 格式化代码 统一间隔符 
update 格式化代码 统一间隔符
 2022-01-13 09:58:16 +08:00
疯狂的狮子li
4e04f5e967 remove 移除过期代码 数据权限 2021-12-28 14:32:53 +08:00
疯狂的狮子li
6c4882b907 update 注释遗漏 老版本数据权限 2021-12-28 14:27:59 +08:00
疯狂的狮子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
 2021-12-13 12:37:36 +08:00
疯狂的狮子Li
aae3fe5305 update [重大更新] 重写数据权限实现 2021-12-13 03:49:05 +00:00
疯狂的狮子li
37def02ee1 fix 修复sql关键字处理 防止解析器报错 2021-12-07 15:16:37 +08:00
疯狂的狮子li
965ebd0f03 fix 修复主键溢出问题 将查询返回类型改为 Long 2021-12-03 11:11:43 +08:00
疯狂的狮子li
c5dc08e082 update 调整 角色查询部门 返回值类型 2021-12-03 10:45:04 +08:00
zendwang
209654fdff fix selectPostListByUserId方法出参调整为Long 2021-12-02 20:13:47 +08:00
疯狂的狮子li
a8a4f2101d add 增加 mapper 目录下 package-info 防止建错目录 2021-11-29 09:59:53 +08:00
phanes
984098abce fix: 修复返回参数的数据类型错误的问题 2021-11-16 20:47:26 +08:00
疯狂的狮子li
c7c9bd6b08 fix 修复 用户逻辑删除 差异问题 2021-11-04 18:49:46 +08:00
疯狂的狮子Li
d254340b9b fix 修正错别字 2021-10-25 18:33:26 +08:00
RuoYi
e66d0e4f74 角色列表返回类型保持一致 2021-10-15 17:56:57 +08:00
疯狂的狮子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
 2021-09-13 13:03:58 +08:00
RuoYi
a5e38f6f99 菜单管理支持配置路由参数 2021-09-08 09:28:23 +08:00
疯狂的狮子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
 2021-08-31 09:42:55 +08:00
Gold_Fish
b036e78d85 修改根据userId获取菜单sql 2021-08-30 02:42:49 +00:00
疯狂的狮子li
0c438ad8e9 update 修改时检查用户数据权限范围 2021-08-26 11:15:07 +08:00
疯狂的狮子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
 2021-08-26 11:10:42 +08:00
RuoYi
e52092c6d4 修改时检查用户数据权限范围 2021-08-24 16:00:39 +08:00
孤舟烟雨
c9f7314cd0 !77 update 对象存储配置 重构到数据库 动态配置 
* 增加对象存储配置sql
* 修改对象存储配置
* Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev
* 增加对象存储配置
* 增加对象存储配置
 2021-08-13 02:03:46 +00:00
疯狂的狮子li
0e8a8fca31 update 移动文件存储业务到 system 模块 2021-08-04 17:26:14 +08:00
疯狂的狮子li
59114a14ff update 同步 ruoyi 对新业务进行修正 2021-07-06 13:05:47 +08:00
疯狂的狮子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
 2021-07-06 12:01:05 +08:00
RuoYi
90c41d498c 角色管理新增分配用户功能 2021-07-05 14:54:09 +08:00
疯狂的狮子li
85ae3a9420 update 对相关代码改动 进行调整 2021-06-18 15:31:38 +08:00
RuoYi
7ab14ff293 定时任务屏蔽rmi远程调用 2021-06-15 10:26:02 +08:00
RuoYi
a3116cd27d 优化部门父级启用状态 2021-06-10 15:34:38 +08:00
朱杰
90063ad03c update 修改框架中批量接口，改为原生mybatis执行foreach，改善性能 2021-05-31 17:37:34 +08:00
疯狂的狮子li
0860934888 update 优化数据权限sql 解决MP apply注入附带 AND 语法问题 2021-05-29 21:52:15 +08:00
疯狂的狮子li
06513446a0 update 还原数据权限修改 2021-05-29 19:44:33 +08:00
疯狂的狮子li
8d761fa60c update 优化数据权限sql 解决MP apply注入附带 AND 语法问题 2021-05-29 18:54:35 +08:00
疯狂的狮子li
b7bd67b4cb update 优化数据权限sql 解决MP apply注入附带 AND 语法问题 2021-05-29 18:41:32 +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
6fa3bfe051 修复两处存在SQL注入漏洞问题 2021-05-27 17:38:27 +08:00