Commit Graph

907 Commits

Author SHA1 Message Date
疯狂的狮子li 04e1dc351e update 移除无用依赖 2021-03-15 17:50:24 +08:00
疯狂的狮子li 7ae2df1390 update 使用hutool 重写 UserAgent 2021-03-15 17:49:30 +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
若依 9502203bbe !187 【漏洞修复】升级commons-collections版本,解决3.2.1版本的反序列化漏洞问题
Merge pull request !187 from Delusive/master
2021-03-14 16:32:07 +08:00
疯狂的狮子li 2509815a4f fix 验证码点击不刷新 bug 2021-03-14 00:15:29 +08:00
疯狂的狮子li 2b8ab9cc4d update 使用hutool重写系统监控 2021-03-12 18:02:23 +08:00
hh44h1144 c0f1569ad9 修复commons-collections引起的反序列化漏洞 2021-03-12 16:59:06 +08:00
疯狂的狮子li 57cfad671f update 使用hutool重写验证码生成 2021-03-12 16:52:55 +08:00
疯狂的狮子li 9a94ab573d !6 update ruoyi-admin/src/main/resources/application.yml.
Merge pull request !6 from hechieh/N/A
2021-03-10 13:34:15 +08:00
hechieh 51d942f14c update ruoyi-admin/src/main/resources/application.yml. 2021-03-10 13:27:10 +08:00
疯狂的狮子li 5494ec36e5 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
	ruoyi-ui/src/components/Editor/index.vue
	ruoyi-ui/src/permission.js
	ruoyi-ui/src/store/modules/user.js
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
2021-03-09 09:32:49 +08:00
RuoYi 61432480c8 删除多余的代码 2021-03-07 11:06:47 +08:00
若依 78deee063d !180 富文本编辑组件支持只读
Merge pull request !180 from JOSWAY/master
2021-03-07 10:44:04 +08:00
若依 4ad003649e !182 解决 Byte[] 类型 to string 死循环的问题
Merge pull request !182 from sproutcat/master
2021-03-07 10:39:41 +08:00
若依 616f5a6aca !185 update ruoyi-ui/src/views/monitor/logininfor/index.vue.
Merge pull request !185 from asher/N/A
2021-03-07 10:39:30 +08:00
若依 fea3ff7b2a !184 update ruoyi-ui/src/views/monitor/operlog/index.vue.
Merge pull request !184 from asher/N/A
2021-03-07 10:39:22 +08:00
asher f938a24df0 update ruoyi-ui/src/views/monitor/logininfor/index.vue. 2021-03-04 17:00:07 +08:00
asher 45fa686a64 update ruoyi-ui/src/views/monitor/operlog/index.vue. 2021-03-04 16:58:18 +08:00
疯狂的狮子li 2c2deced02 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 2021-03-03 17:14:21 +08:00
RuoYi 0d8c3b4940 升级oshi到最新版本v5.6.0 2021-03-03 13:53:03 +08:00
疯狂的狮子li 0638f3c1fe Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	README.md
	ruoyi-ui/src/views/index.vue
2021-02-28 14:39:53 +08:00
RuoYi 64e807f27b 添加新群号:186866453 2021-02-24 13:45:24 +08:00
tzg 9a384a2fc2 解决 Byte[] 类型 to string 死循环的问题 2021-02-23 16:30:14 +08:00
Josway 339b932a3d 富文本编辑组件支持只读 2021-02-22 17:49:17 +08:00
疯狂的狮子li 9b136e76bb update 3.4.0 2021-02-22 10:06:18 +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
RuoYi 265e3010aa 升级SpringBoot到最新版本2.2.13 2021-02-21 11:01:56 +08:00
疯狂的狮子li 66899c4c96 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	sql/ry_20210210.sql
2021-02-18 09:12:32 +08:00
RuoYi b7a36bfe8a 修改ip字段长度防止ipv6地址长度不够 2021-02-10 12:48:52 +08:00
疯狂的狮子li 2c40a892f8 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/system/role/index.vue
2021-02-07 09:18:17 +08:00
RuoYi 3a51c53823 角色非自定义权限范围清空选择值 2021-02-06 10:34:12 +08:00
RuoYi df504c5c14 修复四级菜单无法显示问题 2021-02-06 09:29:50 +08:00
疯狂的狮子li 6f0dfa850a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/src/views/system/role/index.vue
2021-02-03 13:38:43 +08:00
RuoYi baeed2e8d3 修复角色管理-编辑角色-功能权限显示异常 2021-02-02 16:25:37 +08:00
疯狂的狮子li 8ba1266b6a 修改 页面生成模板 适配后端时间格式 2021-01-28 09:22:25 +08:00
疯狂的狮子li 118c02144f 集成 Feign 接口化管理 Http请求(如短信,支付,推送等) 2021-01-27 15:15:03 +08:00
疯狂的狮子li a4756004f8 删除过时配置 2021-01-27 13:10:05 +08:00
疯狂的狮子li 6e6933bb25 支持树表生成 增加生成树表说明 2021-01-25 13:35:07 +08:00
疯狂的狮子li 2925f28255 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/package.json
2021-01-25 09:54:49 +08:00
RuoYi 2903de1561 升级element-ui到最新版本2.15.0 2021-01-24 12:06:19 +08:00
疯狂的狮子li b5e8fa2b98 统一校验配置类名称 2021-01-21 09:31:37 +08:00
疯狂的狮子li 09acac4caf 更新readme 2021-01-18 16:13:05 +08:00
疯狂的狮子li 9fdee373af 删除多余注解(@Data已包含) 2021-01-18 14:00:03 +08:00
疯狂的狮子li 3362ce5f33 升级 MybatisPlus 3.4.2 2021-01-15 15:55:24 +08:00
疯狂的狮子li 52325307f4 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	README.md
2021-01-15 15:08:50 +08:00
RuoYi cca2f5c62d update README.md 2021-01-14 13:20:08 +08:00