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

248 Commits (eed539290f4df82df05522ef606e0e601e4c86bd)

Author SHA1 Message Date
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
chenjinlong eec2c1eb56 【操作日志】【登录日志】功能新增与完善 2021-01-13 19:46:38 +08:00
fengshuonan cd0890d032 更新数据库密码 2021-01-13 18:10:01 +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 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
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 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
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