疯狂的狮子li
|
896939ce4e
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
|
4 years ago |
RuoYi
|
5c155f5f11
|
支持自定义注解实现接口限流
|
4 years ago |
|
疯狂的狮子li
|
d3abd6c96e
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java
ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java
ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.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-ui/src/components/Breadcrumb/index.vue
|
4 years ago |
|
RuoYi
|
03cf98d3c9
|
优化异常信息
|
4 years ago |
稚屿
|
333e19339c
|
修正方法名单词拼写错误
|
4 years ago |
|
RuoYi
|
3003bb0f50
|
Excel注解图片导入兼容xls
|
4 years ago |
|
疯狂的狮子li
|
c9a9da7f49
|
remove 移除无用配置
|
4 years ago |
|
疯狂的狮子li
|
8adbdee9d9
|
remove 移除无用配置
|
4 years ago |
|
疯狂的狮子li
|
a48154a2ee
|
update 补全基础实体 文档注解
|
5 years ago |
|
RuoYi
|
7be17ea89a
|
Excel注解支持Image图片导入
|
5 years ago |
|
疯狂的狮子li
|
c2de299834
|
update 同步ruoyi
|
5 years ago |
|
疯狂的狮子li
|
9bfa420a76
|
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/system/SysConfigController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.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-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.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-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
ruoyi-ui/package.json
ruoyi-ui/src/views/system/menu/index.vue
|
5 years ago |
|
RuoYi
|
7736097f6b
|
提取通用方法到基类控制器
|
5 years ago |
|
疯狂的狮子li
|
79bf332c53
|
remove 移除通用上传下载接口与配置
|
5 years ago |
|
疯狂的狮子li
|
08db4a5f53
|
update 更改所有业务excel导出
|
5 years ago |
|
疯狂的狮子li
|
ffed5a09cb
|
remove 移除原生excel工具
|
5 years ago |
|
疯狂的狮子li
|
9cf4794146
|
update 更新 SysUser 导入导出
|
5 years ago |
|
疯狂的狮子li
|
0539c2f927
|
update 重写系统部分业务导出
|
5 years ago |
|
疯狂的狮子li
|
170908ef8d
|
add 增加 easyexcel 工具类
|
5 years ago |
jackytang
|
ad15978ccb
|
Fix 修复DictUtils方法报错
|
5 years ago |
|
疯狂的狮子li
|
c813046594
|
update 日常校验 统一重构到 StringUtils 便于维护扩展
|
5 years ago |
|
疯狂的狮子li
|
f8ab5663ef
|
update 日常字符串校验 统一重构到 StringUtils 便于维护扩展
|
5 years ago |
|
疯狂的狮子li
|
cfdeada3fd
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/src/main/resources/application.yml
ruoyi-admin/src/main/resources/i18n/messages.properties
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
ruoyi-generator/src/main/resources/vm/java/service.java.vm
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.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/SysUserServiceImpl.java
ruoyi-ui/src/api/login.js
ruoyi-ui/src/router/index.js
ruoyi-ui/src/utils/zipdownload.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/login.vue
ruoyi-ui/src/views/system/user/index.vue
|
5 years ago |
|
RuoYi
|
5397e345ca
|
新增是否开启用户注册功能
|
5 years ago |
|
疯狂的狮子li
|
c65acd6a28
|
update 重写 防重提交拦截器 支持全局与注解自定义 拦截时间配置配置 优化逻辑
|
5 years ago |
|
RuoYi
|
8ed7916b61
|
定时任务屏蔽http(s)远程调用
|
5 years ago |
|
疯狂的狮子li
|
0bfc4b433b
|
update 优化 InsertAll 写法
|
5 years ago |
|
RuoYi
|
6b5dd4d2be
|
优化XSS跨站脚本过滤
|
5 years ago |
|
疯狂的狮子li
|
7cf6064200
|
update 重构 IServicePlus 功能 增加 BeanCopyUtils 深拷贝工具
|
5 years ago |
|
疯狂的狮子li
|
11c73d8877
|
udpate 补全缺失类
|
5 years ago |
|
疯狂的狮子li
|
da5a1293b3
|
update 更新自定义vo转化接口
|
5 years ago |
|
疯狂的狮子li
|
90d4fd8cf1
|
update [重大改动] 重写VO转换 支持深拷贝 将VO类抽象到 ServicePlus 泛型处理
|
5 years ago |
|
疯狂的狮子li
|
3aaf4e2384
|
fix 回滚代码生成器 批处理优化(字段内容不一致, 不适合批处理)
|
5 years ago |
|
疯狂的狮子li
|
8ddd71a818
|
update 使用hutool重构 判断是否url
|
5 years ago |
|
疯狂的狮子li
|
cd34c87afa
|
fix 修复升级合并错误
|
5 years ago |
|
疯狂的狮子li
|
8231953e29
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi-generator/pom.xml
ruoyi-quartz/pom.xml
ruoyi-system/pom.xml
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-ui/package.json
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/layout/components/AppMain.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/index.vue
|
5 years ago |
|
RuoYi
|
5879c2484a
|
菜单路由配置支持内链访问
|
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 |
|
疯狂的狮子li
|
54688ce7c7
|
update 优化批量插入执行器 增加主键类型枚举对应生成策略
|
5 years ago |
|
RuoYi
|
90c41d498c
|
角色管理新增分配用户功能
|
5 years ago |
|
疯狂的狮子li
|
de194880ae
|
update 关闭默认二级缓存 推荐使用 spring-cache 注解手动缓存
|
5 years ago |
sxq
|
945b6c1e59
|
redis获取map属性bug修复。
|
5 years ago |
|
疯狂的狮子li
|
d92560b64b
|
fix 修复 hutool StrUtil.containsAny 传入参数后返回结果不一致问题
|
5 years ago |
陆继保
|
200170e5f3
|
update ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java.
|
5 years ago |
|
RuoYi
|
04f5a93aa8
|
升级pagehelper到最新版1.3.1
|
5 years ago |
|
稚屿
|
1dfeae6a03
|
修复日志列表取消字段排序时的报错问题
|
5 years ago |
|
sxq
|
715abe1140
|
删除redislockmanager
|
5 years ago |
|
sxq
|
645c926bbd
|
集成lock4j框架，删除redisson锁，使用lock4j的锁。
|
5 years ago |
|
疯狂的狮子li
|
1790c81603
|
fix 修复地址ip地址特殊回环问题
|
5 years ago |
|
疯狂的狮子li
|
40bba563d6
|
update 优化多数据源aop顺序问题
|
5 years ago |
