Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
智布道
OneBlog
提交
f8fc8918
O
OneBlog
项目概览
智布道
/
OneBlog
9 个月 前同步成功
通知
11
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
OneBlog
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
f8fc8918
编写于
1月 29, 2019
作者:
Y
yadong.zhang0415@gmail.com
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
🐛
解决issue: #IO4P6
上级
f58c1f29
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
22 addition
and
10 deletion
+22
-10
blog-admin/src/main/java/com/zyd/blog/controller/RenderController.java
...c/main/java/com/zyd/blog/controller/RenderController.java
+11
-4
blog-admin/src/main/resources/static/assets/js/zyd.tool.js
blog-admin/src/main/resources/static/assets/js/zyd.tool.js
+2
-2
blog-admin/src/main/resources/templates/laboratory/notification.ftl
.../src/main/resources/templates/laboratory/notification.ftl
+1
-1
blog-admin/src/main/resources/templates/laboratory/remover.ftl
...admin/src/main/resources/templates/laboratory/remover.ftl
+0
-0
blog-admin/src/main/resources/templates/other/icons.ftl
blog-admin/src/main/resources/templates/other/icons.ftl
+1
-1
blog-admin/src/main/resources/templates/other/shiro.ftl
blog-admin/src/main/resources/templates/other/shiro.ftl
+1
-1
docs/db/init_data.sql
docs/db/init_data.sql
+1
-0
docs/db/update.sql
docs/db/update.sql
+3
-0
update.md
update.md
+2
-1
未找到文件。
blog-admin/src/main/java/com/zyd/blog/controller/RenderController.java
浏览文件 @
f8fc8918
...
...
@@ -168,14 +168,21 @@ public class RenderController {
@BussinessLog
(
value
=
"进入icons页"
)
@GetMapping
(
"/icons"
)
public
ModelAndView
icons
(
Model
model
)
{
return
ResultUtil
.
view
(
"icons"
);
return
ResultUtil
.
view
(
"
other/
icons"
);
}
@RequiresPermissions
(
"shiro"
)
@BussinessLog
(
value
=
"进入shiro示例页"
)
@GetMapping
(
"/shiro"
)
public
ModelAndView
shiro
(
Model
model
)
{
return
ResultUtil
.
view
(
"shiro"
);
return
ResultUtil
.
view
(
"other/shiro"
);
}
@RequiresUser
@BussinessLog
(
"进入编辑器测试用例页面"
)
@GetMapping
(
"/editor"
)
public
ModelAndView
editor
(
Model
model
)
{
return
ResultUtil
.
view
(
"other/editor"
);
}
@RequiresPermissions
(
"notice"
)
...
...
@@ -183,7 +190,7 @@ public class RenderController {
@GetMapping
(
"/notice"
)
public
ModelAndView
notice
(
Model
model
)
{
model
.
addAttribute
(
"online"
,
websocketServer
.
getOnlineUserCount
());
return
ResultUtil
.
view
(
"notification"
);
return
ResultUtil
.
view
(
"
laboratory/
notification"
);
}
@RequiresUser
...
...
@@ -192,6 +199,6 @@ public class RenderController {
public
ModelAndView
remover
(
Model
model
)
{
model
.
addAttribute
(
"exitWayList"
,
ExitWayEnum
.
values
());
model
.
addAttribute
(
"spiderConfig"
,
configService
.
getSpiderConfig
());
return
ResultUtil
.
view
(
"
remover/list
"
);
return
ResultUtil
.
view
(
"
laboratory/remover
"
);
}
}
blog-admin/src/main/resources/static/assets/js/zyd.tool.js
浏览文件 @
f8fc8918
...
...
@@ -233,9 +233,9 @@
* 扩展String方法
*/
$
.
extend
(
String
.
prototype
,
{
trim
:
function
()
{
/*
trim: function () {
return this.replace(/(^\s*)|(\s*$)|\r|\n/g, "");
},
},
*/
startsWith
:
function
(
pattern
)
{
return
this
.
indexOf
(
pattern
)
===
0
;
},
...
...
blog-admin/src/main/resources/templates/notification.ftl
→
blog-admin/src/main/resources/templates/
laboratory/
notification.ftl
浏览文件 @
f8fc8918
<#include "include/macros.ftl">
<#include "
/
include/macros.ftl">
<@header>
<style>
.messanger {
...
...
blog-admin/src/main/resources/templates/
remover/list
.ftl
→
blog-admin/src/main/resources/templates/
laboratory/remover
.ftl
浏览文件 @
f8fc8918
文件已移动
blog-admin/src/main/resources/templates/icons.ftl
→
blog-admin/src/main/resources/templates/
other/
icons.ftl
浏览文件 @
f8fc8918
<#include "include/macros.ftl">
<#include "
/
include/macros.ftl">
<@header></@header>
<div class="clearfix"></div>
...
...
blog-admin/src/main/resources/templates/shiro.ftl
→
blog-admin/src/main/resources/templates/
other/
shiro.ftl
浏览文件 @
f8fc8918
<#include "include/macros.ftl">
<#include "
/
include/macros.ftl">
<@header></@header>
<div class="clearfix"></div>
...
...
docs/db/init_data.sql
浏览文件 @
f8fc8918
...
...
@@ -170,6 +170,7 @@ INSERT INTO `dblog`.`sys_resources` VALUES (70, 'shiro测试', 'menu', '/shiro',
INSERT
INTO
`dblog`
.
`sys_resources`
VALUES
(
71
,
'推送消息'
,
'menu'
,
'/notice'
,
'notice'
,
72
,
NULL
,
0
,
1
,
''
,
now
(),
now
());
INSERT
INTO
`dblog`
.
`sys_resources`
VALUES
(
72
,
'实验室'
,
'menu'
,
''
,
''
,
0
,
5
,
0
,
1
,
'fa fa-flask'
,
now
(),
now
());
INSERT
INTO
`dblog`
.
`sys_resources`
VALUES
(
73
,
'文章搬运工'
,
'menu'
,
'/remover'
,
'remover'
,
72
,
NULL
,
0
,
1
,
''
,
now
(),
now
());
INSERT
INTO
`dblog`
.
`sys_resources`
VALUES
(
74
,
'编辑器'
,
'menu'
,
'/editor'
,
'editor'
,
68
,
NULL
,
0
,
1
,
''
,
now
(),
now
());
#
清空系统角色
TRUNCATE
TABLE
`dblog`
.
`sys_role`
;
...
...
docs/db/update.sql
浏览文件 @
f8fc8918
...
...
@@ -191,3 +191,6 @@ INSERT INTO `dblog`.`sys_config` VALUES (23, 'baiduPushToken', NULL, now(), now(
INSERT
INTO
`dblog`
.
`sys_config`
VALUES
(
24
,
'wxPraiseCode'
,
'qrcode/wx_code.png'
,
now
(),
now
());
INSERT
INTO
`dblog`
.
`sys_config`
VALUES
(
25
,
'zfbPraiseCode'
,
'qrcode/zfb_code.png'
,
now
(),
now
());
INSERT
INTO
`dblog`
.
`sys_config`
VALUES
(
26
,
'baiduApiAk'
,
'NwHaYlGalDEpgxm46xBaC3T9'
,
now
(),
now
());
#
添加新资源
INSERT
INTO
`dblog`
.
`sys_resources`
VALUES
(
74
,
'编辑器'
,
'menu'
,
'/editor'
,
'editor'
,
68
,
NULL
,
0
,
1
,
''
,
now
(),
now
());
update.md
浏览文件 @
f8fc8918
...
...
@@ -4,9 +4,10 @@
### 2019-01-28
-
关闭
issue:
-
处理
issue:
-
Fixed issue :
[
IN4T1
](
https://gitee.com/yadong.zhang/DBlog/issues/IN4T1
)
-
Fixed issue :
[
IN807
](
https://gitee.com/yadong.zhang/DBlog/issues/IN807
)
-
Fixed issue :
[
IO4P6
](
https://gitee.com/yadong.zhang/DBlog/issues/IO4P6
)
-
Fixed issue :
[
IOWDY
](
https://gitee.com/yadong.zhang/DBlog/issues/IOWDY
)
-
Fixed issue :
[
IP2I1
](
https://gitee.com/yadong.zhang/DBlog/issues/IP2I1
)
-
新增:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录