Commit Graph

10 Commits

Author SHA1 Message Date
Wenchao Gong
9e701879a2 Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into develop
 Conflicts:
	pom.xml
	ruoyi-admin/src/main/resources/application-dev.yml
	ruoyi-admin/src/main/resources/application-prod.yml
	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
	ruoyi-extend/pom.xml
	ruoyi-generator/src/main/resources/vm/java/vo.java.vm
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.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
2021-10-31 00:19:37 +08:00
疯狂的狮子li
cbb0c98f98 add [重磅更新] 增加分布式日志框架 TLog 2021-10-11 17:59:27 +08:00
wenchaogong
04a1571dc8 1、jar 包冲突处理
2、暂时去掉 oss
2021-08-16 00:02:43 +08:00
疯狂的狮子li
89fa1dff09 update admin 实时监控日志 改为保留一天 2021-05-16 10:42:47 +08:00
疯狂的狮子li
5fcef39a2e add 集成 spring-boot-admin 全方位监控 2021-04-22 15:04:35 +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
8747d36b2c 更改日志存储路径 使用项目变量 2020-10-20 16:38:39 +08:00
疯狂的狮子li
1e79d6f56f 同步升级3.0 2020-07-20 10:41:32 +08:00
RuoYi
cee572f237 若依 3.0 2020-07-19 10:25:40 +08:00