99 Commits (dcad0cdf92558caf3920b27f2c6cd5df2d146d23)

Author SHA1 Message Date
疯狂的狮子li 61e2a60438 update 同步 ruoyi 对新业务进行修正 3 years ago
疯狂的狮子li 59114a14ff update 同步 ruoyi 对新业务进行修正 3 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
3 years ago
RuoYi 90c41d498c 角色管理新增分配用户功能 3 years ago
RuoYi 9c7901f526 用户管理新增分配角色功能 3 years ago
疯狂的狮子li 5647cf7a7e update 规范maven写法 3 years ago
疯狂的狮子li 85ae3a9420 update 对相关代码改动 进行调整 3 years ago
疯狂的狮子li 44bbe8b307 update 同步更新 ruoyi 适配新功能 3 years ago
疯狂的狮子li a8c1d02ee1 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-ui/.env.development
	ruoyi-ui/.env.production
	ruoyi-ui/.env.staging
	ruoyi-ui/package.json
	ruoyi-ui/src/App.vue
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/components/Pagination/index.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Logo.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/permission.js
	ruoyi-ui/src/settings.js
	ruoyi-ui/src/store/modules/settings.js
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/vue.config.js
3 years ago
RuoYi 7ab14ff293 定时任务屏蔽rmi远程调用 3 years ago
RuoYi a3116cd27d 优化部门父级启用状态 3 years ago
朱杰 90063ad03c update 修改框架中批量接口,改为原生mybatis执行foreach,改善性能 4 years ago
疯狂的狮子li 079dc12fe1 update 优化 system 模块 删除性能 4 years ago
疯狂的狮子li 6d5a0d8a7e update 完美修复 数据权限功能(支持单表多表过滤) 4 years ago
疯狂的狮子li 0860934888 update 优化数据权限sql 解决MP apply注入附带 AND 语法问题 4 years ago
疯狂的狮子li 06513446a0 update 还原数据权限修改 4 years ago
疯狂的狮子li 8d761fa60c update 优化数据权限sql 解决MP apply注入附带 AND 语法问题 4 years ago
疯狂的狮子li b7bd67b4cb update 优化数据权限sql 解决MP apply注入附带 AND 语法问题 4 years ago
疯狂的狮子li 7779cbca4d update 优化参数&字典缓存操作 4 years ago
疯狂的狮子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
4 years ago
RuoYi af9cfb40a4 优化参数&字典缓存操作 4 years ago
RuoYi 6fa3bfe051 修复两处存在SQL注入漏洞问题 4 years ago
疯狂的狮子li d2f0ea6fa0 fix 修复sql符号错误 4 years ago
疯狂的狮子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
4 years ago
RuoYi 5e64a93d11 若依 3.5.0 4 years ago
疯狂的狮子li 6067cb1797 add 增加增强Mapper 重写业务适配 4 years ago
疯狂的狮子li 9c95c93630 fix 修复系统配置表 sql符号错误问题 4 years ago
疯狂的狮子li f01bb5966a update 使用 MP 分页工具 重构业务 4 years ago
疯狂的狮子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
4 years ago
RuoYi be5c19b764 树级结构更新子节点使用replaceFirst 4 years ago
疯狂的狮子li 98624e66e5 正式发布 1.0.0 4 years ago
疯狂的狮子li a181c09786 fix 修复数据权限问题 4 years ago
疯狂的狮子li 0b6952d0fe fix 日志时间sql符号转换问题 4 years ago
疯狂的狮子li 6ce4c93b3c fix 日志时间sql符号转换问题 4 years ago
疯狂的狮子li 73db99398f fix 部门权限问题 4 years ago
疯狂的狮子li bc182f1392 fix 日志时间问题 4 years ago
疯狂的狮子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
4 years ago
疯狂的狮子li 1bef814c51 update 补全实体类 注入注解 4 years ago
RuoYi 3f07632cd4 修复一级菜单包屑显示重复问题 4 years ago
疯狂的狮子li a1c44b4987 fix 表名上传错误 4 years ago
疯狂的狮子li adeaa77864 update mp化 4 years ago
疯狂的狮子li 48d61a3cdf update mp化 4 years ago
疯狂的狮子li 876a06a9cd update mp化 4 years ago
疯狂的狮子li 20d40ea691 update mp化 4 years ago
疯狂的狮子li 938ca5c451 fix 补全缺包 4 years ago
疯狂的狮子li 4500db395f update ruoyi原生改为 MP lombok 格式
update SysConfig 模块代码
4 years ago
疯狂的狮子li 8b37eca241 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/utils/zipdownload.js
4 years ago
若依 9fa5c79713 !200 update ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java.
Merge pull request !200 from yvan7123/N/A
4 years ago
yvan7123 6fe9a358b7 update ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java. 4 years ago
wangze 9f6bc13e64 🔥 去除多余代码 4 years ago