Commit Graph

849 Commits

Author SHA1 Message Date
RuoYi 2797c1eb3a 修正转换字符串的目标字符集属性 2020-11-30 10:31:11 +08:00
若依 1791d7cf40 !126 update pom.xml.
Merge pull request !126 from abbfun/N/A
2020-11-30 10:07:08 +08:00
abbfun 01861f0aae update pom.xml. 2020-11-29 16:16:54 +08:00
RuoYi a69cc94f35 三级菜单自动配置组件 2020-11-28 20:39:03 +08:00
RuoYi c666faed66 修复三级菜单之间切换页面无法缓存的问题 2020-11-28 20:31:45 +08:00
RuoYi 6072239a40 修改缓存监控内存单位 2020-11-28 13:57:19 +08:00
RuoYi a3b86d6f6d 代码生成删除多余的数字float类型 2020-11-28 12:09:24 +08:00
RuoYi fd831d5a90 Excel支持导入Boolean型数据 2020-11-28 12:08:55 +08:00
疯狂的狮子li 6d900dc654 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 2020-11-25 09:30:42 +08:00
RuoYi e83412b9a5 升级oshi到最新版本v5.3.6 2020-11-24 16:17:33 +08:00
疯狂的狮子li 15c4428b9c 修改 ruoyi CharsetKit.java bug 2020-11-24 11:54:38 +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
RuoYi 5b63f0cab9 优化头像样式,鼠标移入悬停遮罩 2020-11-19 09:33:10 +08:00
疯狂的狮子li 3363d7b12d 同步升级 3.2.1 修复重大bug 阻止任意文件下载漏洞 2020-11-18 10:52:33 +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
RuoYi 823e95667e 代码生成支持上传控件 2020-11-16 16:20:17 +08:00
RuoYi 566053da0c 新增图片上传组件 2020-11-16 15:52:58 +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 148d0361e0 增加字段填充配置 2020-11-16 14:03:55 +08:00
疯狂的狮子li d626dd9e90 更新分页插件配置 增加主键插件配置 2020-11-16 13:57:26 +08:00
疯狂的狮子li 1043afcecc 重磅升级 Mybatis-Plus 升级为 3.4.1 2020-11-13 11:39:16 +08:00
疯狂的狮子li 04d1154be0 重磅升级 重写 Mybatis-Plus 配置文件 根据官方文档详细注释 2020-11-13 11:18:37 +08:00
疯狂的狮子li 550f781d6f 重磅升级 Mybatis-Plus 插件 全部升级为最新插件 2020-11-13 11:17:33 +08:00
疯狂的狮子li b114d0a41c 重磅升级 Mybatis-Plus 升级为 3.4.1 Hutool 升级到 5.4.0 2020-11-13 11:16:57 +08:00
疯狂的狮子li 60dda6c7eb Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/src/views/index.vue
2020-11-12 09:24:40 +08:00
RuoYi 0ef007240d 调整默认首页 2020-11-07 10:38:35 +08:00
疯狂的狮子li c57005b4e4 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 2020-11-06 17:18:55 +08:00
RuoYi 0a75dcdd85 升级druid到最新版本v1.2.2 2020-11-05 13:58:36 +08:00
疯狂的狮子li 93093d9f55 更改 MybatisPlus Lambda查询 改为官方推荐写法 2020-11-05 13:56:49 +08:00
疯狂的狮子li e095a9f73f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 2020-11-05 12:58:53 +08:00
RuoYi 4c2626ffec 2020年双十一云服务器优惠,错过又要等一年 2020-11-04 16:58:28 +08:00
疯狂的狮子li 5d748a50ff 删除 MyBatisConfig.java 配置文件 2020-11-03 09:58:01 +08:00
疯狂的狮子li efb938c370 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
	ruoyi-ui/src/views/system/notice/index.vue
	ruoyi-ui/src/views/system/user/index.vue
2020-11-03 09:56:18 +08:00
RuoYi 082b19e33a mapperLocations配置支持分隔符 2020-11-02 17:34:52 +08:00
若依 b779cf053d !112 未选择时,点击“确认”,出现必填验证提示。使用blur的话,选择之后验证消息不会自动消失,使用change会自动消失。
Merge pull request !112 from FlyFive/N/A
2020-11-02 17:30:06 +08:00
FlyFive 212012dc62 未选择时,点击“确认”,出现必填验证提示。使用blur的话,选择之后验证消息不会自动消失,使用change会自动消失。 2020-11-02 11:49:25 +08:00
疯狂的狮子li 616fbc45ae 增加 校验框架配置与全局异常处理 2020-10-28 16:01:26 +08:00
疯狂的狮子li cf44d1f213 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
	ruoyi-ui/src/views/system/dept/index.vue
2020-10-28 11:54:52 +08:00
若依 7de2cf77b4 !111 update ruoyi-ui/src/views/system/dept/index.vue.
Merge pull request !111 from FlyFive/N/A
2020-10-26 16:57:58 +08:00
FlyFive 2b9d46439f update ruoyi-ui/src/views/system/dept/index.vue.
验证的提示信息错了
2020-10-26 16:31:51 +08:00
若依 79265d59b7 !109 误修改,回退
Merge pull request !109 from tucke/master
2020-10-26 10:00:46 +08:00
tucke 093ba5b389 误修改,回退 2020-10-26 09:53:58 +08:00
疯狂的狮子li 30d15afd33 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
	ruoyi-generator/src/main/resources/vm/sql/sql.vm
	ruoyi-ui/src/views/login.vue
	sql/ry_20201021.sql
2020-10-23 17:41:02 +08:00
RuoYi 3807b11290 权限调整 2020-10-23 17:27:20 +08:00
RuoYi c9f25cb34e 调整sql默认时间 2020-10-21 11:30:37 +08:00
疯狂的狮子li 8747d36b2c 更改日志存储路径 使用项目变量 2020-10-20 16:38:39 +08:00