From bb01b94a52a7e089854e7cc9cdfe44eb5a01732f Mon Sep 17 00:00:00 2001 From: WangHao <43278047@qq.com> Date: Sun, 4 Apr 2021 19:50:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysLoginController.java | 8 +- .../yunbookmark/BrowserController.java | 56 +-- .../yunbookmark/SqBookmarkController.java | 32 +- .../yunbookmark/SqMenuController.java | 18 +- .../web/service/SysLoginService.java | 2 +- ruoyi-ui/src/assets/icons/svg/notebook_1.svg | 2 +- ruoyi-ui/src/assets/icons/svg/tool.svg | 2 +- ruoyi-ui/src/layout/components/Navbar.vue | 374 ++++++++-------- ruoyi-ui/src/router/index.js | 1 + ruoyi-ui/src/views/bookmark/ceshi/index.vue | 2 +- ruoyi-ui/src/views/bookmark/common/tool.vue | 132 +++++- ruoyi-ui/src/views/bookmark/index/index.vue | 2 +- ruoyi-ui/src/views/login.vue | 413 +++++++++--------- 13 files changed, 587 insertions(+), 457 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index 4ade9f683..5f8593f8a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -21,7 +21,7 @@ import com.ruoyi.system.service.ISysMenuService; /** * 登录验证 - * + * * @author ruoyi */ @RestController @@ -41,7 +41,7 @@ public class SysLoginController /** * 登录方法 - * + * * @param loginBody 登录信息 * @return 结果 */ @@ -58,7 +58,7 @@ public class SysLoginController /** * 获取用户信息 - * + * * @return 用户信息 */ @GetMapping("getInfo") @@ -79,7 +79,7 @@ public class SysLoginController /** * 获取路由信息 - * + * * @return 路由信息 */ @GetMapping("getRouters") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/BrowserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/BrowserController.java index d05a71338..3a40345df 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/BrowserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/BrowserController.java @@ -52,7 +52,7 @@ public class BrowserController extends BaseController { @RequestMapping("/import") - @PreAuthorize("@ss.hasPermi('bookmark:bookmark:list')") + @PreAuthorize("@ss.hasPermi('bookmark:browser:export')") public AjaxResult importCollect(@RequestParam("htmlFile") MultipartFile htmlFile){ logger.debug("开始上传状态是:"); SysUser sysUser=getAuthUser(); @@ -88,33 +88,33 @@ public class BrowserController extends BaseController { - /** - * 导入收藏文章 - */ - public void importHtml(Map map,Long menuID,Long userId){ - for(Entry entry : map.entrySet()){ - try { - //获取URL后查询最新的URL信息 - Map result = ImportHtml.getCollectFromUrl(entry.getKey()); - SqBookmark sqBookmark =new SqBookmark(); - sqBookmark.setUserid(userId); - sqBookmark.setTitle(entry.getValue()); - sqBookmark.setUrl(entry.getKey()); - sqBookmark.setUrls(ImportHtml.Urlutils(new URL(entry.getKey()))); - if(StringUtils.isBlank(result.get("description"))){ - sqBookmark.setDescription(entry.getValue()); - }else{ - sqBookmark.setDescription(result.get("description")); - } - sqBookmark.setMenuId(menuID); - sqBookmark.setCreateTime(new Date()); - iSqBookmarkService.insertSqBookmark(sqBookmark); - } catch (Exception e) { - logger.error("导入存储异常：",e); - } - } - - } +// /** +// * 导入收藏文章 +// */ +// public void importHtml(Map map,Long menuID,Long userId){ +// for(Entry entry : map.entrySet()){ +// try { +// //获取URL后查询最新的URL信息 +// Map result = ImportHtml.getCollectFromUrl(entry.getKey()); +// SqBookmark sqBookmark =new SqBookmark(); +// sqBookmark.setUserid(userId); +// sqBookmark.setTitle(entry.getValue()); +// sqBookmark.setUrl(entry.getKey()); +// sqBookmark.setUrls(ImportHtml.Urlutils(new URL(entry.getKey()))); +// if(StringUtils.isBlank(result.get("description"))){ +// sqBookmark.setDescription(entry.getValue()); +// }else{ +// sqBookmark.setDescription(result.get("description")); +// } +// sqBookmark.setMenuId(menuID); +// sqBookmark.setCreateTime(new Date()); +// iSqBookmarkService.insertSqBookmark(sqBookmark); +// } catch (Exception e) { +// logger.error("导入存储异常：",e); +// } +// } +// +// } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java index 9147f3334..c9fd7fcf0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java @@ -44,14 +44,14 @@ public class SqBookmarkController extends BaseController private ISqBookmarkService sqBookmarkService; - /** - * 测试通用mapper - */ - @GetMapping("/selectByID") - public TableDataInfo selectByID( Long userID) { - List list = sqBookmarkService.selectByID(userID); - return getDataTable(list); - } +// /** +// * 测试通用mapper +// */ +// @GetMapping("/selectByID") +// public TableDataInfo selectByID( Long userID) { +// List list = sqBookmarkService.selectByID(userID); +// return getDataTable(list); +// } /** * 通过url 查询用户 是否已经添加了此书签 @@ -60,6 +60,7 @@ public class SqBookmarkController extends BaseController * @return */ @GetMapping("/selectByUrlUserID") + @PreAuthorize("@ss.hasPermi('bookmark:bookmark:common:url')") public AjaxResult selectByUrlUserID(String url) { SysUser sysUser=getAuthUser(); startPage(); @@ -76,7 +77,7 @@ public class SqBookmarkController extends BaseController * @return */ @GetMapping("/selectBymenuIdUserID") - @PreAuthorize("@ss.hasPermi('bookmark:bookmark:list')") + @PreAuthorize("@ss.hasPermi('bookmark:bookmark:common:listsousou')") public TableDataInfo selectBymenuIdUserID(Long menuId,Integer sort,String sousuo) { SysUser sysUser=getAuthUser(); startPage(); @@ -88,7 +89,7 @@ public class SqBookmarkController extends BaseController * @return */ @GetMapping("/selectBydelete") - @PreAuthorize("@ss.hasPermi('bookmark:bookmark:list')") + @PreAuthorize("@ss.hasPermi('bookmark:bookmark:common:recycle')") public TableDataInfo selectBydelete() { SysUser sysUser=getAuthUser(); startPage(); @@ -101,7 +102,7 @@ public class SqBookmarkController extends BaseController * @return */ @GetMapping("/selectByUseridList") - @PreAuthorize("@ss.hasPermi('bookmark:bookmark:list')") + @PreAuthorize("@ss.hasPermi('bookmark:bookmark:common:list')") public TableDataInfo selectByUseridList() { SysUser sysUser=getAuthUser(); startPage(); @@ -148,32 +149,33 @@ public class SqBookmarkController extends BaseController /** * 新增书签管理 */ - @PreAuthorize("@ss.hasPermi('bookmark:bookmark:add')") + @PreAuthorize("@ss.hasPermi('bookmark:bookmark:common:add')") @Log(title = "书签管理", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody SqBookmark sqBookmark) { SysUser sysUser=getAuthUser(); sqBookmark.setUserid(sysUser.getUserId()); - return toAjax(sqBookmarkService.insertSqBookmark(sqBookmark)); } /** * 修改书签管理 */ - @PreAuthorize("@ss.hasPermi('bookmark:bookmark:edit')") + @PreAuthorize("@ss.hasPermi('bookmark:bookmark:common:edit')") @Log(title = "书签管理", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody SqBookmark sqBookmark) { + SysUser sysUser=getAuthUser(); + sqBookmark.setUserid(sysUser.getUserId()); return toAjax(sqBookmarkService.updateSqBookmark(sqBookmark)); } /** * 删除书签管理 */ - @PreAuthorize("@ss.hasPermi('bookmark:bookmark:remove')") + @PreAuthorize("@ss.hasPermi('bookmark:bookmark:common:remove')") @Log(title = "书签管理", businessType = BusinessType.DELETE) @DeleteMapping("/{bookmarkIds}") public AjaxResult remove(@PathVariable Long[] bookmarkIds) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqMenuController.java index da63b681a..999536325 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqMenuController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqMenuController.java @@ -43,6 +43,7 @@ public class SqMenuController extends BaseController */ @GetMapping("/selectMenuByUserID") + @PreAuthorize("@ss.hasPermi('bookmark:menu:common:list')") public AjaxResult selecByUserID() { Authentication auth = SecurityContextHolder.getContext().getAuthentication(); @@ -54,6 +55,7 @@ public class SqMenuController extends BaseController * 功能描述:根据MenuId 查询子目录 */ @GetMapping("/listByMenuId/{menuId}") + @PreAuthorize("@ss.hasPermi('bookmark:menu:common:menuidlist')") public AjaxResult listByMenuId(@PathVariable("menuId") Long menuId) { List list = sqMenuService.listByMenuId(getAuthUser().getUserId(),menuId); @@ -63,14 +65,9 @@ public class SqMenuController extends BaseController * 功能描述:根据MenuId 查询子目录 */ @PostMapping("/listByMenuIdP") + @PreAuthorize("@ss.hasPermi('bookmark:menu:common:menuidlist')") public AjaxResult listByMenuIdP(@RequestParam("menuId") Long menuId) { -// try { -// Thread.sleep(50000); -// } catch (InterruptedException e) { -// e.printStackTrace(); -// } - List list = sqMenuService.listByMenuId(getAuthUser().getUserId(),menuId); return AjaxResult.success(list); } @@ -79,6 +76,7 @@ public class SqMenuController extends BaseController * 查询MenuID单个书签信息 */ @GetMapping("/selectByMenuId") + @PreAuthorize("@ss.hasPermi('bookmark:menu:common:menuid')") public AjaxResult list(@RequestParam("menuId") Long menuId) { Authentication auth = SecurityContextHolder.getContext().getAuthentication(); @@ -92,6 +90,8 @@ public class SqMenuController extends BaseController return AjaxResult.success(list); } + + /** * 查询书签菜单列表 */ @@ -129,7 +129,7 @@ public class SqMenuController extends BaseController /** * 新增书签菜单 */ - @PreAuthorize("@ss.hasPermi('bookmark:menu:add')") + @PreAuthorize("@ss.hasPermi('bookmark:menu:common:add')") @Log(title = "书签菜单", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody SqMenu sqMenu) @@ -142,7 +142,7 @@ public class SqMenuController extends BaseController /** * 修改书签菜单 */ - @PreAuthorize("@ss.hasPermi('bookmark:menu:edit')") + @PreAuthorize("@ss.hasPermi('bookmark:menu:common:edit')") @Log(title = "书签菜单", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody SqMenu sqMenu) @@ -184,7 +184,7 @@ public class SqMenuController extends BaseController /** * 删除书签菜单 */ - + @PreAuthorize("@ss.hasPermi('bookmark:menu:common:remove')") @Log(title = "书签菜单", businessType = BusinessType.DELETE) @DeleteMapping("/delete/{menuId}") public AjaxResult remove(@PathVariable Long menuId) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java index 020831036..22a55269a 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -20,7 +20,7 @@ import com.ruoyi.framework.manager.factory.AsyncFactory; /** * 登录校验方法 - * + * * @author ruoyi */ @Component diff --git a/ruoyi-ui/src/assets/icons/svg/notebook_1.svg b/ruoyi-ui/src/assets/icons/svg/notebook_1.svg index a81cddda0..d90c17749 100644 --- a/ruoyi-ui/src/assets/icons/svg/notebook_1.svg +++ b/ruoyi-ui/src/assets/icons/svg/notebook_1.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/ruoyi-ui/src/assets/icons/svg/tool.svg b/ruoyi-ui/src/assets/icons/svg/tool.svg index c813067ef..57a7c1856 100644 --- a/ruoyi-ui/src/assets/icons/svg/tool.svg +++ b/ruoyi-ui/src/assets/icons/svg/tool.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue index db46ec556..42b5e8f12 100644 --- a/ruoyi-ui/src/layout/components/Navbar.vue +++ b/ruoyi-ui/src/layout/components/Navbar.vue @@ -1,187 +1,187 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index a6413308e..9502eddf5 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -149,6 +149,7 @@ export const constantRoutes = [ title: '书签管理',icon:'user', requireAuth: false, }, + hidden: true, children: [ { path: '/content', diff --git a/ruoyi-ui/src/views/bookmark/ceshi/index.vue b/ruoyi-ui/src/views/bookmark/ceshi/index.vue index e2d3c8c20..0d05e7357 100644 --- a/ruoyi-ui/src/views/bookmark/ceshi/index.vue +++ b/ruoyi-ui/src/views/bookmark/ceshi/index.vue @@ -13,7 +13,7 @@

- + diff --git a/ruoyi-ui/src/views/bookmark/common/tool.vue b/ruoyi-ui/src/views/bookmark/common/tool.vue index 98aa7ea35..443bdb323 100644 --- a/ruoyi-ui/src/views/bookmark/common/tool.vue +++ b/ruoyi-ui/src/views/bookmark/common/tool.vue @@ -1,6 +1,89 @@ - diff --git a/ruoyi-ui/src/views/bookmark/index/index.vue b/ruoyi-ui/src/views/bookmark/index/index.vue index 40d0bc92d..468218dae 100644 --- a/ruoyi-ui/src/views/bookmark/index/index.vue +++ b/ruoyi-ui/src/views/bookmark/index/index.vue @@ -32,7 +32,7 @@
垃圾桶
导入书签
意见反馈
-
测试页面
+
工具箱
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 64ecbc47c..4e58e9f65 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -1,206 +1,207 @@ - - - - - + + + + +