Commit Graph

111 Commits (155e84c3b7294a1c7f5ef2e718762de22b39b40a)

Author SHA1 Message Date
fengshuonan f2ab96bcb8 增加更新user org表的sql 2021-03-25 21:27:09 +08:00
fengshuonan 24f1260473 【7.0.2】更新登录日志菜单sql 2021-03-25 11:37:34 +08:00
fengshuonan bc624e8d85 【7.0.2】更新menu的记录 2021-03-25 11:22:39 +08:00
fengshuonan dd66424a34 【7.0.2】移除SYS_SESSION_ADD_TO_COOKIE系统配置 2021-03-23 22:53:05 +08:00
fengshuonan 32eae33736 【7.0.2】菜单表增加一个字段 2021-03-23 22:24:10 +08:00
Andrew Feng 099f3368e6 提交sys_config中修改config_code字段大小 2021-03-15 16:35:43 +08:00
fengshuonan 15cd3273be Revert "prometheus监控" 2021-03-06 10:28:25 +08:00
陈立 2f31a40722 Merge remote-tracking branch 'origin/v7.0.1-develop' into v7.0.1-develop 2021-03-05 21:56:59 +08:00
陈立 392179ed31 prometheus监控 2021-03-05 17:47:41 +08:00
fengshuonan fc032eefbd 增加xss过滤sql 2021-03-04 22:31:41 +08:00
fengshuonan d348d0e8da 增加邮件的配置 2021-03-03 22:30:11 +08:00
fengshuonan de6b6e472c 更新两个字典 2021-02-27 22:23:08 +08:00
fengshuonan a38d3126b6 更新角色绑定菜单和接口sql 2021-02-22 21:57:28 +08:00
fengshuonan 3efa3433f5 更新头像和昵称 2021-02-21 11:37:22 +08:00
fengshuonan 64f80b6410 整理sql 2021-02-19 22:33:18 +08:00
fengshuonan e4c23901c7 移除监控模块,移入kernel 2021-02-19 20:34:26 +08:00
fengshuonan 594bef55b3 更新jdbc连接配置 2021-02-14 10:45:29 +08:00
fengshuonan 506c70f56c 更新sql脚本的初始化配置 2021-02-14 10:19:05 +08:00
liuhanqing 1826a11499 sys_config增加wsurl的 sql脚本
Signed-off-by: liuhanqing <447067298@qq.com>
2021-02-01 22:33:00 +08:00
fengshuonan d148730a2d 【monitor】更新系统信息监控 2021-02-01 20:55:05 +08:00
fengshuonan f6f9b78761 【monitor】新增刷新状态的定时任务 2021-01-31 22:08:43 +08:00
fengshuonan 21afccd2f8 整理多语言的翻译值 2021-01-30 14:13:17 +08:00
fengshuonan c532f019ba 修改多语言删除语种接口 2021-01-30 10:37:13 +08:00
fengshuonan 343016494b 更新websocket配置 2021-01-27 21:45:08 +08:00
fengshuonan bef8c98ad6 Merge remote-tracking branch 'origin/dev-websocket' 2021-01-27 21:26:55 +08:00
chenjinlong 011aa29d7f 【V1.0_20210126_0003__alter_role.sql】role基础数据,字段 2021-01-26 23:52:44 +08:00
chenjinlong 28854e7f57 【flyWay】增加角色类型字典 2021-01-26 20:22:20 +08:00
fengshuonan 14a7393252 更新sql 2021-01-26 19:41:31 +08:00
chenjinlong cc15723acb 【dict】【config】【organization】修改查询标题 调整系统配置新增字典目录 2021-01-26 17:36:21 +08:00
liuhanqing cadd5fe182 【message】websocket
Signed-off-by: liuhanqing <447067298@qq.com>
2021-01-25 23:47:59 +08:00
fengshuonan eed539290f 整理多租户界面 2021-01-25 22:25:10 +08:00
fengshuonan 7334fca531 更新dict表 2021-01-25 21:26:12 +08:00
liuhanqing 3ebac41843 【message】websocket 2021-01-25 15:07:41 +08:00
fengshuonan ac3d27cbf4 集成多语言 2021-01-24 22:25:12 +08:00
fengshuonan 0f58f0aea4 【datasource】更新多数据源功能,以及一些测试接口 2021-01-23 23:49:56 +08:00
fengshuonan 4bdc3282a2 【sql】更新两个menu的sql 2021-01-23 21:30:52 +08:00
fengshuonan ae1ab28473 【pom】删除默认redis依赖
【sql】更新两个菜单的路径
2021-01-21 22:40:34 +08:00
fengshuonan 761190ec61 【sql】默认关闭sql打印 2021-01-21 22:27:45 +08:00
fengshuonan 522a132750 整理监控代码 2021-01-21 22:18:11 +08:00
fengshuonan 77e3694add Merge branch 'group7-monitor'
# Conflicts:
#	pom.xml
#	src/main/java/cn/stylefeng/guns/GunsApplication.java
#	src/main/java/cn/stylefeng/guns/modular/system/controller/MonitorController.java
2021-01-21 21:48:09 +08:00
陈立 4c745437c5 【monitor】新增prometheus监控tomcat、jvm 2021-01-20 18:20:37 +08:00
fengshuonan bb75785706 更新数据库脚本 2021-01-18 23:24:22 +08:00
liuhanqing 9568c1e7b2 新增flyway模块的脚本和配置 2021-01-18 23:23:10 +08:00
fengshuonan 9ef03a4cb7 更新beetl配置 2021-01-17 14:50:42 +08:00
fengshuonan 236670e72a Merge remote-tracking branch 'origin/group5-dictTag' 2021-01-17 14:46:56 +08:00
liuhanqing 711cc5ac15 【dict】修改beetl HTML_TAG_FLAG默认为'tag:'用来区别是否是beetl的html tag
Signed-off-by: liuhanqing <447067298@qq.com>
2021-01-16 23:03:52 +08:00
fengshuonan 8fb5b620f3 更新prod的配置 2021-01-16 21:14:46 +08:00
fengshuonan eedbeb109e 修复一个提示错误,增加日志打印sql的开关 2021-01-13 21:47:23 +08:00
fengshuonan cd0890d032 更新数据库密码 2021-01-13 18:10:01 +08:00
fengshuonan 08d6bfb0bf 整理控制器格式规范,统一修改以/view开头 2021-01-10 19:58:39 +08:00
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