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

683 Commits (v8.3.0)

Author SHA1 Message Date
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
chenjinlong 65b77ef65d 【userViewController】新增用户注册 找回密码 视图 2021-01-15 01:11:31 +08:00
chenjinlong 7cd5f47afd 【register.html】新增注册界面 2021-01-15 01:10:51 +08:00
chenjinlong 58ecbedd05 【postion】去掉日志注解 2021-01-15 01:10:07 +08:00
chenjinlong 109a115076 【pom】整合EasyCaptcha 2021-01-15 01:09:23 +08:00
chenjinlong 4799843790 【login.html】增加记住我与用户注册 2021-01-15 01:08:16 +08:00
chenjinlong f8d5db215a Merge remote-tracking branch 'origin/master' 2021-01-15 01:07:11 +08:00
chenjinlong e57b8cf79e 【forget.html】新增找回密码 2021-01-15 01:06:41 +08:00
fengshuonan 266b728d14 新增API文档管理界面 2021-01-14 23:26:07 +08:00
fengshuonan a98bb1a6b1 Merge remote-tracking branch 'origin/group2-captcha' 2021-01-14 22:49:56 +08:00
chenjinlong 293780539c 【login.html】优化登录体验 2021-01-14 22:39:22 +08:00
chenjinlong 46cb72bd4d 【login.html】优化登录体验 2021-01-14 22:33:54 +08:00
chenjinlong 3d07a1e97c 【Kaptcha】修改文本输入长度 2021-01-14 22:25:25 +08:00
小庆 182353c607 【file】文件管理图片预览 2021-01-14 22:09:59 +08:00
chenjinlong b58268aa12 【Kaptcha】增加登录验证码 2021-01-14 22:05:41 +08:00
liuhanqing d7d3d64f57 【notice】人员选择开发 
Signed-off-by: liuhanqing <447067298@qq.com>
 2021-01-14 21:49:57 +08:00
小庆 0fb4a9e24c 【file】文件管理 文件详情 2021-01-14 21:49:02 +08:00
fengshuonan cee819554f 更新树组件的插件名 2021-01-14 21:45:37 +08:00
fengshuonan 3ef27a03c7 Merge remote-tracking branch 'origin/group2' 2021-01-14 20:25:34 +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
chenjinlong 402a4d58a7 【log_detail.html】form名称修改 2021-01-13 21:08:03 +08:00
chenjinlong 39e5d3ca2f 【resource_detail.html】样式修改 2021-01-13 21:07:28 +08:00
chenjinlong 1dce44a9f6 【func.js】修改弹框方法，ifream内弹出遮罩层 2021-01-13 21:06:58 +08:00
fengshuonan d8e482bc7d Merge remote-tracking branch 'origin/group1-dict' 2021-01-13 20:07:55 +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