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

212 Commits (426d04ab36519657ce0592eef7169d63a41e7af6)

Author SHA1 Message Date
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 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
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 17b9e4c06c 整理代码 2021-01-17 14:55:47 +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 9e99aac503 【dict】select,checkbox,radio 字典标签 
Signed-off-by: liuhanqing <447067298@qq.com>
 2021-01-16 23:04:50 +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 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 7cd5f47afd 【register.html】新增注册界面 2021-01-15 01:10:51 +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
hansson d209613553 【notice】新增消息模块开发，更新tinymce富文本编辑器。 
问题： 1、全局过滤器会过滤掉富文本的html标签
      2、图片上传功能为实现，后台上传接口是否要统一实现
 2021-01-14 15:37:43 +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
chenjinlong eec2c1eb56 【操作日志】【登录日志】功能新增与完善 2021-01-13 19:46:38 +08:00
huangyao 6d46164a62 Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-dict 2021-01-13 15:24:56 +08:00
huangyao 2f26d01864 优化查询； 
添加字典字段；
 2021-01-13 15:24:50 +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
fengshuonan 16b7f09625 Merge remote-tracking branch 'origin/group2-organization' 2021-01-13 13:14:41 +08:00
chenjinlong df7cd394e7 【user】【organization】BUG修复，删除js控制台log 2021-01-12 23:07:32 +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 9b163bb7e4 Merge remote-tracking branch 'origin/group2-organization' 2021-01-12 22:38:09 +08:00
小庆 aa943e3657 【file】文件管理 预览（未完成） 2021-01-12 22:31:46 +08:00
chenjinlong b12701e9b5 【User】用户管理功能完善 2021-01-12 22:17:11 +08:00
liuhanqing d469603253 【message】首页消息功能完善 
Signed-off-by: liuhanqing <447067298@qq.com>
 2021-01-12 22:11:19 +08:00
fengshuonan dfb121d45a Merge remote-tracking branch 'origin/group2-organization' 2021-01-12 22:04:12 +08:00
chenjinlong 38c23ebfb2 【User】用户管理功能完善 2021-01-12 22:02:02 +08:00
chenjinlong b60f865cb2 【User】用户管理功能完善 2021-01-12 22:00:57 +08:00
fengshuonan e901c50a98 Merge remote-tracking branch 'origin/group5-log' 2021-01-12 22:00:25 +08:00
chenjinlong c8a22f80c4 【User】用户管理功能完善 2021-01-12 22:00:20 +08:00
liuhanqing df79dd9202 【message】我的消息列表开发 
Signed-off-by: liuhanqing <447067298@qq.com>
 2021-01-12 21:55:06 +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
chenjinlong 2f38eea750 【organization】树控件替换 2021-01-12 20:56:58 +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
小庆 e21e67faa4 【file】文件管理上传、下载、搜索、删除 2021-01-11 20:20:12 +08:00
小庆 b6b6953c8a 【file】文件管理列表显示 2021-01-11 17:33:19 +08:00
fengshuonan 08d6bfb0bf 整理控制器格式规范，统一修改以/view开头 2021-01-10 19:58:39 +08:00
chenjinlong c3b48bc809 【sysUser】功能完善 2021-01-10 18:40:15 +08:00
huangyao acc28aa372 字典类型添加编辑； 
字典列表；
字典树；
 2021-01-10 18:36:45 +08:00
liuhanqing cceee80bfd 【message】修改message展示界面 2021-01-10 18:06:10 +08:00
huangyao 04a76c1409 Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-dict 2021-01-10 13:05:32 +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 c8b7aebf01 Merge remote-tracking branch 'origin/group5-log' 2021-01-09 20:39:41 +08:00
fengshuonan 2c4cbe0946 Merge remote-tracking branch 'origin/group3-timer' 2021-01-09 20:38:56 +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
huangyao e27dade3b1 Merge branch 'master' of https://git.stylefeng.cn/guns-technology/guns-standalone-beetl into group1-dict 2021-01-09 20:06:08 +08:00
fengshuonan 193d58bf8c 完善角色修改数据范围的界面 2021-01-09 19:23:34 +08:00
rays 05abaf4209 1.新增角色菜单和按钮授权以及接口授权 
2.新增资源详情
 2021-01-09 19:19:41 +08:00