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

308 Commits (dde9bb78b28d434c7f89f0bcad4091d8196b294d)

Author SHA1 Message Date
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
chenjinlong d4c2ced31f 【Dict】完善新的字典功能 2021-01-21 21:01:13 +08:00
chenjinlong 504245a5e9 【Dict】使用原有的弹框form 2021-01-21 21:00:49 +08:00
chenjinlong 820fdc3ea1 【Dict】移除列表页面，统一使用新版 2021-01-21 21:00:21 +08:00
chenjinlong 0fac815491 【DictType】临时使用视图 2021-01-21 20:59:28 +08:00
chenjinlong 2345f6cbd7 【修改代码块模板】 2021-01-21 18:46:34 +08:00
chenjinlong 6482faecea 【dictType】修改form中的提示字段样式 2021-01-21 18:45:27 +08:00
chenjinlong 5e4827a6cd 【func.js】修改弹窗esc关闭 2021-01-21 18:44:45 +08:00
chenjinlong 430506239a 【loading.html】加载动画 2021-01-21 18:44:12 +08:00
chenjinlong 427d2188b9 【form.css】删除影响文本框样式 2021-01-21 18:43:14 +08:00
chenjinlong 1a36b6f884 【_sidebar】升级easyweb 侧边栏 2021-01-21 18:42:16 +08:00
chenjinlong 5c9e4b9f1f 【_header】升级easyweb header 2021-01-21 18:41:52 +08:00
chenjinlong f7103a9b20 【_footer】升级easyweb 2021-01-21 18:40:58 +08:00
chenjinlong e1175fd5db 【_container】合并原有的form,tree_container 2021-01-21 18:40:28 +08:00
chenjinlong 3e167273c5 【README】easyweb 升级说明 2021-01-21 18:37:54 +08:00
chenjinlong 9b4cebba08 【_body.html】更新easyweb版本，删除原有body，新版代码块已经更新至admin.js中 2021-01-21 18:36:33 +08:00
chenjinlong c31cba54b8 【common.js】去掉格式化当前时间方法 2021-01-20 23:34:28 +08:00
chenjinlong e96e97c9ae 【FileInfo】优化 2021-01-20 21:47:48 +08:00
陈立 4c745437c5 【monitor】新增prometheus监控tomcat、jvm 2021-01-20 18:20:37 +08:00
chenjinlong e475f3bf18 【config】【file】样式调整 2021-01-20 15:52:31 +08:00
chenjinlong fe5134c791 【LogViewController】修改操作日志详情页面文件路径 2021-01-20 15:21:21 +08:00
fengshuonan 08291b1d1c 增加wrapper功能 2021-01-19 22:58:17 +08:00
fengshuonan ca7c6c94ef 更新登录页面背景 2021-01-19 21:56:47 +08:00
chenjinlong 562a6e3f93 【register】注册功能完善 2021-01-19 16:34:26 +08:00
chenjinlong 7fc1410a64 【file_info.html】操作样式调整 2021-01-19 11:29:49 +08:00
fengshuonan bb75785706 更新数据库脚本 2021-01-18 23:24:22 +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 0ad6ded8af 【notice】富文本编辑器tinymce 文件上传 
Signed-off-by: liuhanqing <447067298@qq.com>
 2021-01-17 14:12:22 +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
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 34c0e511b7 新增资源映射 2021-01-16 21:49:14 +08:00
fengshuonan 8fb5b620f3 更新prod的配置 2021-01-16 21:14:46 +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
fengshuonan 0a1e0025f6 修复layui不分页的显示条数问题 2021-01-16 18:57:07 +08:00
fengshuonan 0fbc1f43a4 完善api接口详情 2021-01-16 18:13:38 +08:00
liuhanqing 9434445769 【notice/message】通知和消息模块完成 
Signed-off-by: liuhanqing <447067298@qq.com>
 2021-01-15 22:52:49 +08:00
liuhanqing d70adcff59 Merge branch 'master' into group5-notice 
# Conflicts:
#	pom.xml
 2021-01-15 21:20:04 +08:00
chenjinlong bbd9f1855b 【register】增加短信发送功能 2021-01-15 18:57:08 +08:00
liuhanqing c884c2af98 【notice】通知管理用户选择 2021-01-15 14:25:59 +08:00
chenjinlong 155cd8dc4d 【login.html】图形验证码优化 2021-01-15 13:51:11 +08:00
chenjinlong 8c8f350408 【login】 登录js调整 2021-01-15 01:35:42 +08:00