Commit Graph

111 Commits (155e84c3b7294a1c7f5ef2e718762de22b39b40a)

Author SHA1 Message Date
fengshuonan 591e0b2345 更新本地库的配置 2021-01-10 09:54:08 +08:00
fengshuonan 1c61eb8417 Merge remote-tracking branch 'origin/group7-monitor'
# Conflicts:
#	src/main/resources/application-dev.yml
#	src/main/resources/application-local.yml
2021-01-09 20:41:58 +08:00
fengshuonan dd1f2fea3a Merge remote-tracking branch 'origin/group1-role'
# Conflicts:
#	src/main/java/cn/stylefeng/guns/modular/role/RoleViewController.java
2021-01-09 20:37:32 +08:00
rays 05abaf4209 1.新增角色菜单和按钮授权以及接口授权
2.新增资源详情
2021-01-09 19:19:41 +08:00
chenjinlong 6bdc0abcb1 【application-dev.yml】修改beetl版本dev数据库 2021-01-09 12:35:43 +08:00
陈立 48b90d2b75 修改配置并将druid配置放到bean里 2021-01-09 10:28:47 +08:00
陈立 37658803c8 修改配置并将druid配置放到bean里 2021-01-08 18:49:38 +08:00
fengshuonan 4ca1437f66 更新json日期返回前端的格式化 2021-01-06 16:38:10 +08:00
陈立 8893b0fb0d group7-陈立 性能监控——服务器信息、SQL监控两个模块,合并的时候注意一下application.yml里面druid的配置不能删 2021-01-05 16:08:56 +08:00
fengshuonan 31f9a6ef0f 初步调通登录和首页的界面 2020-12-27 20:00:09 +08:00
fengshuonan 37d23b2830 初始化提交 2020-12-27 16:15:37 +08:00