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

273 Commits (6e08dd417e8b130fb8a9add93137cef562078aee)

Author SHA1 Message Date
chenjinlong 1921d44b7b 【user】调整user样式 2021-01-22 16:20:51 +08:00
chenjinlong 8cc435d112 【user.js】修改新版js 2021-01-22 16:20:15 +08:00
chenjinlong b117523caf 【ORG】修改视图静态地址 2021-01-22 16:17:24 +08:00
chenjinlong 9c87f0cc9d 【DictType】修改视图映射 静态资源路径 2021-01-22 16:16:51 +08:00
chenjinlong e59adda5a0 【Dict】优化代码 2021-01-22 16:16:09 +08:00
chenjinlong f84113b4aa 【字典控制器】优化方法，删除不必要的查询和引用 2021-01-22 16:14:30 +08:00
chenjinlong 9ff9f10345 【role】修改列表页操作列 2021-01-22 15:32:11 +08:00
chenjinlong a89493bcfa 删除多余页面 2021-01-22 14:12:42 +08:00
chenjinlong f482a14cc9 【org】修改组织架构样式 2021-01-22 00:37:46 +08:00
chenjinlong 2a64e32d2a 【dictionary.js】字典类型修改 删除 功能维护 2021-01-21 23:36:22 +08:00
chenjinlong c3294d518b 【form.css】更新form样式 2021-01-21 23:29:10 +08:00
chenjinlong 4220446826 【dictionary.html】 去掉类型code查询条件禁止换行 2021-01-21 23:28:42 +08:00
chenjinlong 3de825e330 【form.html】由于form单独样式，增加form模板，前端优化后可与container合并 2021-01-21 23:27:47 +08:00
chenjinlong 7e2b80a4ab 【container.html】去掉多余样式引用 2021-01-21 23:26:27 +08:00
fengshuonan ae1ab28473 【pom】删除默认redis依赖 
【sql】更新两个菜单的路径
 2021-01-21 22:40:34 +08:00
fengshuonan 761190ec61 【sql】默认关闭sql打印 2021-01-21 22:27:45 +08:00
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
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 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
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 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
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