gitee
/
guns
mirror of https://gitee.com/stylefeng/guns
1
0
Fork 0
Code Issues Releases Wiki Activity
194 Commits
4 Branches
41 Tags
52 MiB
Commit Graph

107 Commits (522a1327508f2bb853613c626c3c5357e4544eb6)

Author SHA1 Message Date
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
chenjinlong fe5134c791 【LogViewController】修改操作日志详情页面文件路径 2021-01-20 15:21:21 +08:00
liuhanqing 9568c1e7b2 新增flyway模块的脚本和配置 2021-01-18 23:23:10 +08:00
fengshuonan 17b9e4c06c 整理代码 2021-01-17 14:55:47 +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 7c22e6cd82 【dict】整理代码 
Signed-off-by: liuhanqing <447067298@qq.com>
 2021-01-16 23:49:30 +08:00
liuhanqing f7a1c55e72 【dict】增加删除标识查询条件 
Signed-off-by: liuhanqing <447067298@qq.com>
 2021-01-16 23:43:45 +08:00
liuhanqing 9e99aac503 【dict】select,checkbox,radio 字典标签 
Signed-off-by: liuhanqing <447067298@qq.com>
 2021-01-16 23:04:50 +08:00
fengshuonan 34c0e511b7 新增资源映射 2021-01-16 21:49:14 +08:00
fengshuonan 5d1ad9b9a8 整理控制器类 2021-01-16 19:19:43 +08:00
fengshuonan 985f47571e 整理控制器类 2021-01-16 19:18:59 +08:00
fengshuonan d010744f10 Merge remote-tracking branch 'origin/group5-notice' 2021-01-16 19:15:46 +08:00
fengshuonan b3006272bc Merge remote-tracking branch 'origin/group7-file' 
# Conflicts:
#	src/main/java/cn/stylefeng/guns/modular/file/FileViewController.java
 2021-01-16 19:13:56 +08:00
fengshuonan cad52a9e88 整理控制器类 2021-01-16 19:13:30 +08:00
liuhanqing d70adcff59 Merge branch 'master' into group5-notice 
# Conflicts:
#	pom.xml
 2021-01-15 21:20:04 +08:00
chenjinlong 155cd8dc4d 【login.html】图形验证码优化 2021-01-15 13:51:11 +08:00
chenjinlong 65b77ef65d 【userViewController】新增用户注册 找回密码 视图 2021-01-15 01:11:31 +08:00
chenjinlong 58ecbedd05 【postion】去掉日志注解 2021-01-15 01:10:07 +08:00
fengshuonan 266b728d14 新增API文档管理界面 2021-01-14 23:26:07 +08:00
chenjinlong b58268aa12 【Kaptcha】增加登录验证码 2021-01-14 22:05:41 +08:00
小庆 0fb4a9e24c 【file】文件管理 文件详情 2021-01-14 21:49:02 +08:00
hansson d209613553 【notice】新增消息模块开发，更新tinymce富文本编辑器。 
问题： 1、全局过滤器会过滤掉富文本的html标签
      2、图片上传功能为实现，后台上传接口是否要统一实现
 2021-01-14 15:37:43 +08:00
fengshuonan eedbeb109e 修复一个提示错误，增加日志打印sql的开关 2021-01-13 21:47:23 +08:00
fengshuonan ca192ef935 Merge remote-tracking branch 'origin/group2-log-loginlog' 
# Conflicts:
#	src/main/java/cn/stylefeng/guns/modular/log/LogViewController.java
#	src/main/java/cn/stylefeng/guns/modular/log/LoginLogViewController.java
#	src/main/webapp/assets/modular/system/log/log.js
#	src/main/webapp/pages/modular/system/log/log_detail.html
 2021-01-13 20:06:48 +08:00
chenjinlong eec2c1eb56 【操作日志】【登录日志】功能新增与完善 2021-01-13 19:46:38 +08:00
fengshuonan 44e42fa764 更新代码 2021-01-13 13:17:59 +08:00
fengshuonan 19ef41a385 Merge remote-tracking branch 'origin/group1-dict' 2021-01-13 13:16:53 +08:00
fengshuonan f8a6db2d3e Merge remote-tracking branch 'origin/group7-file' 2021-01-13 13:15:38 +08:00
fengshuonan da7750591c Merge remote-tracking branch 'origin/group5-notice' 2021-01-13 13:15:11 +08:00
huangyao 4e15a3279f Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-dict 2021-01-12 22:53:07 +08:00
huangyao d1d8c9c9f4 将字典树移到底层； 2021-01-12 22:52:58 +08:00
fengshuonan e901c50a98 Merge remote-tracking branch 'origin/group5-log' 2021-01-12 22:00:25 +08:00
liuhanqing df79dd9202 【message】我的消息列表开发 
Signed-off-by: liuhanqing <447067298@qq.com>
 2021-01-12 21:55:06 +08:00
fengshuonan 90ed39e6df 更新url地址 2021-01-12 21:40:43 +08:00
fengshuonan 638c236aed Merge remote-tracking branch 'origin/group2-sysUser' 
# Conflicts:
#	src/main/java/cn/stylefeng/guns/modular/user/UserViewController.java
 2021-01-12 21:20:29 +08:00
liuhanqing 3f30c0593a Merge branch 'master' into group5-notice 
# Conflicts:
#	src/main/webapp/assets/modular/frame/message.js
 2021-01-12 20:18:27 +08:00
chenjinlong 057f88699c 【sysUser】分配角色，职务选择功能完善 2021-01-12 19:56:05 +08:00
TSQ e7230f2541 Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl 2021-01-12 13:47:24 +08:00
TSQ 329afc5f45 完善日志管理列表功能，完善查看详情，删除日志功能 2021-01-12 13:47:07 +08:00
huangyao c366cc45ad Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-dict 2021-01-12 12:52:57 +08:00
fengshuonan 9090c42346 更新在线用户逻辑 2021-01-11 23:11:44 +08:00
huangyao 09e48f3d6e Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-dict 2021-01-11 21:46:02 +08:00
huangyao ad90aeb696 字典树； 
添加字典；
 2021-01-11 21:45:31 +08:00
liuhanqing 88cfc71b7e 【message】首页消息功能开发 2021-01-11 20:51:45 +08:00
小庆 b6b6953c8a 【file】文件管理列表显示 2021-01-11 17:33:19 +08:00
fengshuonan 08d6bfb0bf 整理控制器格式规范，统一修改以/view开头 2021-01-10 19:58:39 +08:00
huangyao 904837f28b Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-dict 2021-01-10 18:37:28 +08:00