From ff7b4da8a6244d22616c1baff476d53a979a0161 Mon Sep 17 00:00:00 2001 From: WangHao <43278047@qq.com> Date: Mon, 17 Aug 2020 22:00:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4Head=E5=A4=B4=E9=83=A8?= =?UTF-8?q?=E5=B8=83=E5=B1=80,=E5=8A=A8=E6=80=81=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E4=B9=A6=E7=AD=BE=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yunbookmark/SqBookmarkController.java | 6 +- .../core/controller/BaseController.java | 33 +++- ruoyi-ui/package.json | 2 + ruoyi-ui/src/api/bookmark/bookmark.js | 13 +- ruoyi-ui/src/assets/styles/base.css | 3 + ruoyi-ui/src/views/bookmark/content/index.vue | 68 +++++-- ruoyi-ui/src/views/bookmark/index/index.vue | 166 +++++------------- 7 files changed, 156 insertions(+), 135 deletions(-) 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 e1261af23..2451ccb53 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 @@ -4,6 +4,7 @@ import java.util.List; import com.ruoyi.bookmark.domain.SqBookmark; import com.ruoyi.bookmark.service.ISqBookmarkService; +import com.ruoyi.common.core.domain.entity.SysUser; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -52,9 +53,10 @@ public class SqBookmarkController extends BaseController */ @GetMapping("/selectBymenuIdUserID") @PreAuthorize("@ss.hasPermi('bookmark:bookmark:list')") - public TableDataInfo selectBymenuIdUserID(Long menuID, Long userID) { + public TableDataInfo selectBymenuIdUserID(Long menuId) { + SysUser sysUser=getAuthUser(); startPage(); - List list = sqBookmarkService.selectBymenuIdUserID(menuID,userID); + List list = sqBookmarkService.selectBymenuIdUserID(menuId,sysUser.getUserId()); return getDataTable(list); } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java index ab78abdad..1dcdb1a36 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java @@ -3,8 +3,14 @@ package com.ruoyi.common.core.controller; import java.beans.PropertyEditorSupport; import java.util.Date; import java.util.List; + +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.domain.model.LoginUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.User; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import com.github.pagehelper.PageHelper; @@ -20,12 +26,35 @@ import com.ruoyi.common.utils.sql.SqlUtil; /** * web层通用数据处理 - * + * * @author ruoyi */ public class BaseController { protected final Logger logger = LoggerFactory.getLogger(BaseController.class); + /** + * @auther: Wang + * @date: 2020/08/17 20:19 + * 功能描述:获取当前用户的信息 + */ + protected SysUser getAuthUser() + { + Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + LoginUser user = (LoginUser) auth.getPrincipal(); + return user.getUser(); + } + +// /** +// * @auther: Wang +// * @date: 2020/08/17 20:19 +// * 功能描述:获取当前用户UserID +// */ +// protected Long getAuthUserId() +// { +// Authentication auth = SecurityContextHolder.getContext().getAuthentication(); +// LoginUser user = (LoginUser) auth.getPrincipal(); +// return user.getUser().getUserId(); +// } /** * 将前台传递过来的日期格式的字符串，自动转化为Date类型 @@ -75,7 +104,7 @@ public class BaseController /** * 响应返回结果 - * + * * @param rows 影响行数 * @return 操作结果 */ diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index a186e4e09..cc1db8c73 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -55,12 +55,14 @@ "path-to-regexp": "2.4.0", "screenfull": "4.2.0", "sortablejs": "1.8.4", + "timeago.js": "^4.0.2", "vue": "2.6.10", "vue-count-to": "1.0.13", "vue-cropper": "0.4.9", "vue-quill-editor": "3.0.6", "vue-router": "3.0.2", "vue-splitpane": "1.0.4", + "vue-timeago": "^5.1.2", "vuedraggable": "2.20.0", "vuex": "3.1.0" }, diff --git a/ruoyi-ui/src/api/bookmark/bookmark.js b/ruoyi-ui/src/api/bookmark/bookmark.js index d13346ffb..c58ea4b26 100644 --- a/ruoyi-ui/src/api/bookmark/bookmark.js +++ b/ruoyi-ui/src/api/bookmark/bookmark.js @@ -1,5 +1,16 @@ import request from '@/utils/request' + +export function selectBymenuIdUserID(query) { + return request({ + url: '/bookmark/bookmark/selectBymenuIdUserID', + method: 'get', + params: query + }) +} + + + // 查询书签管理列表 export function listBookmark(query) { return request({ @@ -50,4 +61,4 @@ export function exportBookmark(query) { method: 'get', params: query }) -} \ No newline at end of file +} diff --git a/ruoyi-ui/src/assets/styles/base.css b/ruoyi-ui/src/assets/styles/base.css index f9fb82c4e..dfdde3dd5 100644 --- a/ruoyi-ui/src/assets/styles/base.css +++ b/ruoyi-ui/src/assets/styles/base.css @@ -14,6 +14,9 @@ .transition-box{ width: 250px!important; } + .sousouright-icon{ + margin-right: 18px; + } } diff --git a/ruoyi-ui/src/views/bookmark/content/index.vue b/ruoyi-ui/src/views/bookmark/content/index.vue index a9466b9bb..27b9a0160 100644 --- a/ruoyi-ui/src/views/bookmark/content/index.vue +++ b/ruoyi-ui/src/views/bookmark/content/index.vue @@ -3,13 +3,13 @@ - - diff --git a/ruoyi-ui/src/views/bookmark/index/index.vue b/ruoyi-ui/src/views/bookmark/index/index.vue index 620a1c226..c7d968325 100644 --- a/ruoyi-ui/src/views/bookmark/index/index.vue +++ b/ruoyi-ui/src/views/bookmark/index/index.vue @@ -12,8 +12,8 @@ -
所有书签
-
发现书签
+
全部书签
+
发现
任意门
收件箱
我的收藏
@@ -44,9 +44,6 @@ - - - @@ -54,7 +51,6 @@
-
@@ -62,30 +58,40 @@ -
-
- - - - - - 按时间排序(正序) - 按时间排序(到序) - 按字母A-Z排序 - 按网站A-Z排序 - 按网站A-Z排序 - 按网站A-Z排序 - - - - 开启渲染 - - 关闭 +
+ +
+ + + + + + 添加连接 + 添加文本 + 导入书签 + + + + +
+ + + + + +
+ + + + + + 外观显示 + 用户中心 + 建议反馈 + 退出登录 + @@ -95,95 +101,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Footer @@ -229,7 +148,6 @@ drawerS:false, drawer: false, direction: 'ltr', - swictxuanran:true, sousou:'',//搜索书签 enterable:false, @@ -629,14 +547,17 @@ .sousou-input{ - float: left; - width: 100%; + + width: 82.5%; + margin-right: 15px; } .header-list{ - line-height: 50px; - margin-top: 3px; + /*line-height: 50px;*/ + margin-top: 10px; + /*align-content: center;*/ + /*justify-content: center;*/ } .header-list:hover{ color: #7a6df0; @@ -782,6 +703,11 @@ /*background-color: #fff;*/ float: left } + .sousouright-icon{ + margin-right: 24px; + margin-top: 10px; + } +