疯狂的狮子li
|
2ee2e4505a
|
fix 修复配置文件书写错误
|
2021-06-02 14:28:40 +08:00 |
RuoYi
|
edd2981076
|
调整用户测试接口swagger注解
|
2021-06-02 11:45:30 +08:00 |
疯狂的狮子li
|
99c4692a0d
|
update 升级 luttuce 为 redisson 性能更强 工具更全
|
2021-05-31 23:21:14 +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
|
af9cfb40a4
|
优化参数&字典缓存操作
|
2021-05-27 17:38:44 +08:00 |
疯狂的狮子li
|
380b4e5f3a
|
配置文件错误
|
2021-05-25 14:28:38 +08:00 |
疯狂的狮子li
|
2885ced2c7
|
add 增加验证码开关
|
2021-05-25 14:02:50 +08:00 |
朱杰
|
5dc873209e
|
add 增加验证码开关
|
2021-05-25 14:02:34 +08:00 |
疯狂的狮子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
|
2021-05-25 10:00:36 +08:00 |
RuoYi
|
5e64a93d11
|
若依 3.5.0
|
2021-05-25 09:37:55 +08:00 |
疯狂的狮子li
|
3d25dfbebe
|
update 增加请求前缀
|
2021-05-20 17:00:18 +08:00 |
疯狂的狮子li
|
7076deb2b6
|
update 请求响应对象 与 分页对象 结构修改 适配接口文档配置
|
2021-05-20 13:23:12 +08:00 |
疯狂的狮子li
|
db18050b86
|
update 验证码生成更新为无符号整数计算
|
2021-05-19 22:57:34 +08:00 |
疯狂的狮子li
|
c4eb641d9c
|
fix 修复swagger开关无法控制关闭问题
|
2021-05-17 16:36:07 +08:00 |
疯狂的狮子li
|
2ebcffb22e
|
update 配置统一提取为 properties 配置类
|
2021-05-17 13:39:59 +08:00 |
疯狂的狮子li
|
89fa1dff09
|
update admin 实时监控日志 改为保留一天
|
2021-05-16 10:42:47 +08:00 |
疯狂的狮子li
|
ee064fa84c
|
update swagger升级3.0.2
|
2021-05-15 14:25:48 +08:00 |
疯狂的狮子li
|
b5064021e6
|
remove 移除ruoyi自带服务监控(Admin已全部包含)
|
2021-05-15 14:23:43 +08:00 |
疯狂的狮子li
|
488cce767f
|
update 打包插件更新 2.3.10
|
2021-05-14 21:43:28 +08:00 |
疯狂的狮子li
|
d459bb61dc
|
update 打包插件更新 2.3.10
|
2021-05-14 21:38:41 +08:00 |
疯狂的狮子li
|
e071b4315a
|
正式发布 v2.0.0
|
2021-05-14 21:07:20 +08:00 |
疯狂的狮子li
|
869e975ed1
|
update springboot 升级 2.3.10 依赖全面升级适配
|
2021-05-14 17:03:19 +08:00 |
疯狂的狮子li
|
dab99405c5
|
update springboot 升级 2.3.10 依赖全面升级适配
|
2021-05-14 16:58:09 +08:00 |
疯狂的狮子li
|
f01bb5966a
|
update 使用 MP 分页工具 重构业务
|
2021-05-13 21:25:51 +08:00 |
疯狂的狮子li
|
9159e2ed22
|
fix vue与boot整合打包与admin页面路由冲突
|
2021-05-13 09:16:28 +08:00 |
疯狂的狮子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
|
2021-05-11 17:14:53 +08:00 |
RuoYi
|
32f333a00e
|
删除操作日志记录日志
|
2021-05-11 14:25:39 +08:00 |
疯狂的狮子li
|
dafdb43c84
|
update 配置转移到 yml 文件 统一管理
|
2021-05-11 10:02:32 +08:00 |
疯狂的狮子li
|
961c60dd1a
|
update 更新banner
|
2021-05-10 23:53:15 +08:00 |
疯狂的狮子li
|
98624e66e5
|
正式发布 1.0.0
|
2021-05-10 15:34:17 +08:00 |
疯狂的狮子li
|
e3ea16d020
|
update 修改MP验证策略 NOT_NULL -> NOT_EMPTY
|
2021-04-25 10:38:20 +08:00 |
疯狂的狮子li
|
5fcef39a2e
|
add 集成 spring-boot-admin 全方位监控
|
2021-04-22 15:04:35 +08:00 |
疯狂的狮子li
|
f8633f8c4e
|
fix Feign 熔断不生效 bug
|
2021-04-19 17:38:47 +08:00 |
疯狂的狮子li
|
f093da99ec
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/resources/application-prod.yml
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/assets/styles/sidebar.scss
ruoyi-ui/src/layout/components/Navbar.vue
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/settings.js
ruoyi-ui/src/store/getters.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/store/modules/settings.js
ruoyi-ui/src/store/modules/tagsView.js
ruoyi-ui/src/views/monitor/druid/index.vue
|
2021-04-14 13:22:31 +08:00 |
RuoYi
|
c8df1f5e1f
|
布局设置支持保存&重置配置
|
2021-04-13 09:47:28 +08:00 |
疯狂的狮子li
|
5d1e977442
|
个人信息添加手机&邮箱重复验证
|
2021-03-22 09:30:12 +08:00 |
疯狂的狮子li
|
8434511e39
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
|
2021-03-22 09:29:25 +08:00 |
RuoYi
|
67371a9028
|
个人信息添加手机&邮箱重复验证
|
2021-03-21 08:53:11 +08:00 |
wugh
|
1270b056d5
|
[bug修复] 解决调整验证码干扰的类型无效,只用circle的bug
[优化] 调整使用那种验证码的逻辑判断,使用switch优化,并减少重复代码
|
2021-03-19 19:28:43 +08:00 |
疯狂的狮子li
|
31ddb2aee3
|
update swagger 升级为 knife4j
|
2021-03-16 12:52:09 +08:00 |
疯狂的狮子li
|
63a582404b
|
update swagger 模板修改为 swagger-bootstrap-ui
|
2021-03-15 17:51:00 +08:00 |
疯狂的狮子li
|
9b4b9e0c74
|
update 删除通用工具 改为使用hutool
|
2021-03-15 16:38:43 +08:00 |
疯狂的狮子li
|
46aa17db9c
|
Merge remote-tracking branch 'origin/master'
|
2021-03-15 10:00:49 +08:00 |
疯狂的狮子li
|
71325b540a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application-prod.yml
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
|
2021-03-15 10:00:14 +08:00 |
RuoYi
|
c2e9200626
|
数据监控默认账户密码防止越权访问
|
2021-03-14 16:37:34 +08:00 |
疯狂的狮子li
|
2509815a4f
|
fix 验证码点击不刷新 bug
|
2021-03-14 00:15:29 +08:00 |
疯狂的狮子li
|
57cfad671f
|
update 使用hutool重写验证码生成
|
2021-03-12 16:52:55 +08:00 |
hechieh
|
51d942f14c
|
update ruoyi-admin/src/main/resources/application.yml.
|
2021-03-10 13:27:10 +08:00 |
疯狂的狮子li
|
ac99fddfe6
|
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/views/index.vue
|
2021-02-22 10:04:43 +08:00 |
RuoYi
|
0b5c7f4c96
|
若依 3.4.0
|
2021-02-22 09:40:28 +08:00 |
疯狂的狮子li
|
118c02144f
|
集成 Feign 接口化管理 Http请求(如短信,支付,推送等)
|
2021-01-27 15:15:03 +08:00 |
疯狂的狮子li
|
3362ce5f33
|
升级 MybatisPlus 3.4.2
|
2021-01-15 15:55:24 +08:00 |
疯狂的狮子li
|
d73994f05d
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/views/login.vue
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dept/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/menu/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
ruoyi-ui/src/views/tool/gen/index.vue
|
2021-01-05 09:22:36 +08:00 |
RuoYi
|
2116ee1822
|
Update copyright
|
2021-01-04 17:49:52 +08:00 |
疯狂的狮子li
|
b8f6731584
|
增加 demo模块 方便参考扩展
|
2020-12-29 10:17:44 +08:00 |
疯狂的狮子li
|
1000a577d0
|
配置文件新增redis数据库索引属性
|
2020-12-21 11:58:49 +08:00 |
RuoYi
|
fd7e88a518
|
配置文件新增redis数据库索引属性
|
2020-12-21 10:26:54 +08:00 |
li_oxen
|
1caec85f46
|
redis 增加 database配置项,设置不同的库
|
2020-12-19 10:08:09 +08:00 |
疯狂的狮子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
|
2020-12-14 09:27:27 +08:00 |
RuoYi
|
8988d0b4ab
|
若依 3.3.0
|
2020-12-14 09:02:10 +08:00 |
疯狂的狮子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
|
2020-12-11 14:27:54 +08:00 |
RuoYi
|
9e387dc447
|
去除用户手机邮箱部门必填验证
|
2020-12-11 13:26:14 +08:00 |
疯狂的狮子li
|
5109eb0e7e
|
日志输出改回相对路径 解决新版idea 编译user.dir会指定到idea配置目录下
|
2020-12-09 13:37:04 +08:00 |
疯狂的狮子li
|
583738fa65
|
日志输出改回相对路径 解决新版idea 编译user.dir会指定到idea配置目录下
|
2020-12-09 13:33:41 +08:00 |
疯狂的狮子li
|
5a62019cdd
|
更新 如何修改为Tomcat相关注释配置与说明
|
2020-12-08 16:21:30 +08:00 |
RuoYi
|
474cca921e
|
回显数据字典防止空值报错
|
2020-12-08 16:12:00 +08:00 |
abbfun
|
c01eeb8521
|
update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java.
|
2020-12-08 11:11:34 +08:00 |
疯狂的狮子li
|
f7f7557d4d
|
项目修改为 maven多环境配置
|
2020-12-01 11:44:29 +08:00 |
疯狂的狮子li
|
20d7c90515
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
sql/ry_20201123.sql
|
2020-11-24 10:03:59 +08:00 |
RuoYi
|
90ac416e02
|
新增缓存监控功能
|
2020-11-23 10:02:50 +08:00 |
疯狂的狮子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
|
2020-11-18 10:41:13 +08:00 |
RuoYi
|
8f145bba3a
|
若依 v3.2.1
|
2020-11-18 09:32:15 +08:00 |
RuoYi
|
6bb166b89f
|
阻止任意文件下载漏洞
|
2020-11-17 10:29:52 +08:00 |
疯狂的狮子li
|
527decb7fa
|
更新 undertow 配置
|
2020-11-16 14:50:05 +08:00 |
疯狂的狮子li
|
03f0e3a137
|
为所有MP插件和配置增加官方链接
|
2020-11-16 14:12:14 +08:00 |
疯狂的狮子li
|
04d1154be0
|
重磅升级 重写 Mybatis-Plus 配置文件 根据官方文档详细注释
|
2020-11-13 11:18:37 +08:00 |
疯狂的狮子li
|
8747d36b2c
|
更改日志存储路径 使用项目变量
|
2020-10-20 16:38:39 +08:00 |
疯狂的狮子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
|
2020-10-16 10:27:13 +08:00 |
abbfun
|
c6d0b9a9ae
|
update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java.
权限字符串修正
|
2020-10-14 16:21:43 +08:00 |
RuoYi
|
69256940df
|
若依 3.2
|
2020-10-10 09:38:21 +08:00 |
疯狂的狮子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
|
2020-10-10 09:19:20 +08:00 |
疯狂的狮子li
|
cc59e5ad89
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
|
2020-10-03 11:57:41 +08:00 |
RuoYi
|
d3595cd930
|
修正菜单提示信息错误
|
2020-10-03 11:15:18 +08:00 |
疯狂的狮子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
|
2020-09-22 13:22:30 +08:00 |
RuoYi
|
28bceda630
|
修正文字错误
|
2020-09-22 11:09:18 +08:00 |
疯狂的狮子li
|
a41bc230a1
|
修改上传文件路径
|
2020-09-08 14:49:37 +08:00 |
疯狂的狮子li
|
25afde4796
|
同步升级3.1
|
2020-08-13 11:28:11 +08:00 |
疯狂的狮子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
|
2020-08-13 11:24:04 +08:00 |
RuoYi
|
8f9f0c04cc
|
若依 3.1
|
2020-08-13 10:27:56 +08:00 |
疯狂的狮子li
|
3aaff7b776
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/main.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dept/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/menu/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
ruoyi-ui/src/views/tool/gen/index.vue
|
2020-08-12 10:16:29 +08:00 |
RuoYi
|
71ec44a545
|
修正在线用户日志记录类型
|
2020-08-10 17:26:11 +08:00 |
RuoYi
|
a78211ca00
|
优化上级菜单不能选择自己
|
2020-08-10 12:20:52 +08:00 |
疯狂的狮子li
|
c7785d1dbc
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
README.md
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi-ui/src/utils/request.js
|
2020-08-05 09:42:03 +08:00 |
疯狂的狮子li
|
5b1ed429ae
|
文件路径,使用jvm系统变量,兼容windows和linux;
|
2020-08-05 09:35:41 +08:00 |
疯狂的狮子li
|
c8613ac9a7
|
错误修正
|
2020-08-04 14:34:05 +08:00 |
疯狂的狮子li
|
d9aa681a0d
|
错误修正
|
2020-08-04 14:31:51 +08:00 |
RuoYi
|
21d07c1d71
|
修复角色的权限分配后,未实时生效问题
|
2020-08-04 11:51:25 +08:00 |
疯狂的狮子li
|
c966d9bada
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.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/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-ui/babel.config.js
ruoyi-ui/package.json
ruoyi-ui/src/api/tool/gen.js
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/utils/ruoyi.js
ruoyi-ui/src/views/login.vue
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dept/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/menu/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
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi-ui/vue.config.js
sql/ry_20200724.sql
|
2020-08-02 18:31:47 +08:00 |
RuoYi
|
92c6301285
|
Excel支持分割字符串组内容
|
2020-07-23 18:58:45 +08:00 |
RuoYi
|
df3ef54b41
|
验证码类型支持(数组计算、字符验证)
|
2020-07-23 11:17:04 +08:00 |