🐛 解决issue: #IO4P6

上级 f58c1f29
...@@ -168,14 +168,21 @@ public class RenderController { ...@@ -168,14 +168,21 @@ public class RenderController {
@BussinessLog(value = "进入icons页") @BussinessLog(value = "进入icons页")
@GetMapping("/icons") @GetMapping("/icons")
public ModelAndView icons(Model model) { public ModelAndView icons(Model model) {
return ResultUtil.view("icons"); return ResultUtil.view("other/icons");
} }
@RequiresPermissions("shiro") @RequiresPermissions("shiro")
@BussinessLog(value = "进入shiro示例页") @BussinessLog(value = "进入shiro示例页")
@GetMapping("/shiro") @GetMapping("/shiro")
public ModelAndView shiro(Model model) { 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") @RequiresPermissions("notice")
...@@ -183,7 +190,7 @@ public class RenderController { ...@@ -183,7 +190,7 @@ public class RenderController {
@GetMapping("/notice") @GetMapping("/notice")
public ModelAndView notice(Model model) { public ModelAndView notice(Model model) {
model.addAttribute("online", websocketServer.getOnlineUserCount()); model.addAttribute("online", websocketServer.getOnlineUserCount());
return ResultUtil.view("notification"); return ResultUtil.view("laboratory/notification");
} }
@RequiresUser @RequiresUser
...@@ -192,6 +199,6 @@ public class RenderController { ...@@ -192,6 +199,6 @@ public class RenderController {
public ModelAndView remover(Model model) { public ModelAndView remover(Model model) {
model.addAttribute("exitWayList", ExitWayEnum.values()); model.addAttribute("exitWayList", ExitWayEnum.values());
model.addAttribute("spiderConfig", configService.getSpiderConfig()); model.addAttribute("spiderConfig", configService.getSpiderConfig());
return ResultUtil.view("remover/list"); return ResultUtil.view("laboratory/remover");
} }
} }
...@@ -233,9 +233,9 @@ ...@@ -233,9 +233,9 @@
* 扩展String方法 * 扩展String方法
*/ */
$.extend(String.prototype, { $.extend(String.prototype, {
trim: function () { /*trim: function () {
return this.replace(/(^\s*)|(\s*$)|\r|\n/g, ""); return this.replace(/(^\s*)|(\s*$)|\r|\n/g, "");
}, },*/
startsWith: function (pattern) { startsWith: function (pattern) {
return this.indexOf(pattern) === 0; return this.indexOf(pattern) === 0;
}, },
......
<#include "include/macros.ftl"> <#include "/include/macros.ftl">
<@header> <@header>
<style> <style>
.messanger { .messanger {
......
<#include "include/macros.ftl"> <#include "/include/macros.ftl">
<@header></@header> <@header></@header>
<div class="clearfix"></div> <div class="clearfix"></div>
......
<#include "include/macros.ftl"> <#include "/include/macros.ftl">
<@header></@header> <@header></@header>
<div class="clearfix"></div> <div class="clearfix"></div>
......
...@@ -170,6 +170,7 @@ INSERT INTO `dblog`.`sys_resources` VALUES (70, 'shiro测试', 'menu', '/shiro', ...@@ -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 (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 (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 (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`; TRUNCATE TABLE `dblog`.`sys_role`;
......
...@@ -191,3 +191,6 @@ INSERT INTO `dblog`.`sys_config` VALUES (23, 'baiduPushToken', NULL, now(), now( ...@@ -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 (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 (25, 'zfbPraiseCode', 'qrcode/zfb_code.png', now(), now());
INSERT INTO `dblog`.`sys_config` VALUES (26, 'baiduApiAk', 'NwHaYlGalDEpgxm46xBaC3T9', 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());
...@@ -4,9 +4,10 @@ ...@@ -4,9 +4,10 @@
### 2019-01-28 ### 2019-01-28
- 关闭issue: - 处理issue:
- Fixed issue : [IN4T1](https://gitee.com/yadong.zhang/DBlog/issues/IN4T1) - Fixed issue : [IN4T1](https://gitee.com/yadong.zhang/DBlog/issues/IN4T1)
- Fixed issue : [IN807](https://gitee.com/yadong.zhang/DBlog/issues/IN807) - 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 : [IOWDY](https://gitee.com/yadong.zhang/DBlog/issues/IOWDY)
- Fixed issue : [IP2I1](https://gitee.com/yadong.zhang/DBlog/issues/IP2I1) - 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.
先完成此消息的编辑!
想要评论请 注册