From 6bd68544c6e1d7e06a60eeb8119f767947ab458f Mon Sep 17 00:00:00 2001 From: fanxb Date: Sun, 10 May 2020 21:43:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?deploy:=E4=BF=AE=E5=A4=8Dinit=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bookMarkDocker/README.md | 2 +- bookMarkDocker/init.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bookMarkDocker/README.md b/bookMarkDocker/README.md index bf7d013..ca618da 100644 --- a/bookMarkDocker/README.md +++ b/bookMarkDocker/README.md @@ -20,7 +20,7 @@ docker 镜像 构建文件为本目录下的`Dockerfile`,已经生产推送到 export SMTP_PORT=465 # 文件存储路径 export BOOKMARK_FILE_SAVE_PATH=./fileSave - # 服务部署地址 + # 服务部署地址(需要改为真实前端访问地址) export BOOKMARK_HOST=http://localhost:8080 ``` diff --git a/bookMarkDocker/init.sh b/bookMarkDocker/init.sh index 40b8c3e..7c7bdd9 100755 --- a/bookMarkDocker/init.sh +++ b/bookMarkDocker/init.sh @@ -4,9 +4,9 @@ base=$(cd "$(dirname "$0")";pwd) # 创建es存放数据文件夹并设置读写权限 # mkdir $base/es/data>/dev/null 2>&1 -chmod 777 $base/es/data +#chmod 777 $base/es/data -sysctl -w vm.max_map_count=262144>/dev/null 2>&1 +#sysctl -w vm.max_map_count=262144>/dev/null 2>&1 # 用于前后端打包 From 4e7861b5b1fc9fcfe5722faec571f92586136787 Mon Sep 17 00:00:00 2001 From: fanxb Date: Tue, 12 May 2020 11:44:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0bookmark=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E6=AC=A1=E6=95=B0=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/BookmarkInsertEsConsumer.java | 1 + .../BookmarkVisitNumPlusConsumer.java | 38 +++++++++++++++++++ .../controller/BookmarkController.java | 14 +++++++ .../business/bookmark/dao/BookmarkDao.java | 12 +++++- .../bookmark/service/BookmarkService.java | 10 +++++ .../service/impl/BookmarkServiceImpl.java | 5 +++ .../common/configuration/MqConfiguration.java | 4 +- .../common/constant/RedisConstant.java | 4 ++ .../bookmark/common/entity/Bookmark.java | 4 ++ .../V11__bookmark表增加字段记录访问次数.sql | 1 + 10 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/consumer/BookmarkVisitNumPlusConsumer.java create mode 100644 bookMarkService/web/src/main/resources/db/migration/V11__bookmark表增加字段记录访问次数.sql diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/consumer/BookmarkInsertEsConsumer.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/consumer/BookmarkInsertEsConsumer.java index 16d6cac..6d40f0f 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/consumer/BookmarkInsertEsConsumer.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/consumer/BookmarkInsertEsConsumer.java @@ -21,6 +21,7 @@ import java.util.stream.Collectors; * Created By Fxb * Date: 2020/3/29 * Time: 11:34 + * @author fanxb */ @MqConsumer(RedisConstant.BOOKMARK_INSERT_ES) public class BookmarkInsertEsConsumer implements RedisConsumer { diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/consumer/BookmarkVisitNumPlusConsumer.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/consumer/BookmarkVisitNumPlusConsumer.java new file mode 100644 index 0000000..c97d622 --- /dev/null +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/consumer/BookmarkVisitNumPlusConsumer.java @@ -0,0 +1,38 @@ +package com.fanxb.bookmark.business.bookmark.consumer; + +import com.fanxb.bookmark.business.bookmark.dao.BookmarkDao; +import com.fanxb.bookmark.common.annotation.MqConsumer; +import com.fanxb.bookmark.common.constant.RedisConstant; +import com.fanxb.bookmark.common.entity.redis.RedisConsumer; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * 更新书签时间 + * Created with IntelliJ IDEA + * Created By Fxb + * Date: 2020/5/12 + * Time: 10:33 + * + * @author fanxb + */ +@MqConsumer(RedisConstant.BOOKMARK_VISIT_NUM_PLUS) +@Slf4j +public class BookmarkVisitNumPlusConsumer implements RedisConsumer { + + private final BookmarkDao bookmarkDao; + + @Autowired + public BookmarkVisitNumPlusConsumer(BookmarkDao bookmarkDao) { + this.bookmarkDao = bookmarkDao; + } + + @Override + public void deal(String message) { + try { + bookmarkDao.updateVisitNum(Integer.parseInt(message)); + } catch (Exception e) { + log.error("书签访问次数增加失败：{}", e.getMessage()); + } + } +} diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/controller/BookmarkController.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/controller/BookmarkController.java index 1d5eed4..b48aa8e 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/controller/BookmarkController.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/controller/BookmarkController.java @@ -161,4 +161,18 @@ public class BookmarkController { return Result.success(null); } + /** + * 功能描述: 书签增加1 + * + * @param id id + * @return com.fanxb.bookmark.common.entity.Result + * @author fanxb + * @date 2020/5/12 10:44 + */ + @PostMapping("/visitNum") + public Result visitNum(int id) { + bookmarkService.visitNumPlus(id); + return Result.success(null); + } + } diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkDao.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkDao.java index 9e3ccec..45ca967 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkDao.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkDao.java @@ -177,7 +177,7 @@ public interface BookmarkDao extends BaseMapper { * 功能描述: 更新一个bookmark的key * * @param bookmarkId id - * @param searchKey searchKey + * @param searchKey searchKey * @author fanxb * @date 2020/3/22 22:08 */ @@ -194,4 +194,14 @@ public interface BookmarkDao extends BaseMapper { @Select("select * from bookmark order by bookmarkId limit ${startIndex},${size}") List getBookmarkListPage(@Param("size") int size, @Param("startIndex") int startIndex); + /** + * 功能描述: 书签访问次数+1 + * + * @param id 书签id + * @author fanxb + * @date 2020/5/12 10:40 + */ + @Update("update bookmark set visitNum=visitNum+1 where bookmarkId=#{id}") + void updateVisitNum(int id); + } diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/BookmarkService.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/BookmarkService.java index 02908b8..93aa385 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/BookmarkService.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/BookmarkService.java @@ -98,8 +98,18 @@ public interface BookmarkService { * * @param userId userId * @param context context + * @return es搜索结果 * @author fanxb * @date 2019/7/25 10:45 */ List searchUserBookmark(int userId, String context); + + /** + * 功能描述: 当前用户书签访问次数+1 + * + * @param id 书签id + * @author fanxb + * @date 2020/5/12 10:21 + */ + void visitNumPlus(int id); } diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java index ca99c96..d7c4ea3 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java @@ -239,6 +239,11 @@ public class BookmarkServiceImpl implements BookmarkService { return esUtil.search(EsConstant.BOOKMARK_INDEX, builder, BookmarkEs.class); } + @Override + public void visitNumPlus(int id) { + RedisUtil.addToMq(RedisConstant.BOOKMARK_VISIT_NUM_PLUS, id); + } + /** * 功能描述: 向mq发送消息通知，数据更新 * diff --git a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/configuration/MqConfiguration.java b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/configuration/MqConfiguration.java index ddfb3d1..01cecf6 100644 --- a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/configuration/MqConfiguration.java +++ b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/configuration/MqConfiguration.java @@ -75,9 +75,9 @@ public class MqConfiguration implements ApplicationRunner { } }); if (count.get() == topicMap.keySet().size()) { - //当所有的队列都为空时休眠1s + //当所有的队列都为空时休眠3s try { - TimeUnit.SECONDS.sleep(1); + TimeUnit.SECONDS.sleep(3); } catch (Exception e) { log.error("休眠出错", e); } diff --git a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/constant/RedisConstant.java b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/constant/RedisConstant.java index 8dea283..488dbf5 100644 --- a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/constant/RedisConstant.java +++ b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/constant/RedisConstant.java @@ -27,4 +27,8 @@ public class RedisConstant { * 从es中删除数据 */ public static final String BOOKMARK_DELETE_ES = "bookmark_DELETE_es"; + /** + * 书签访问次数+1 + */ + public static final String BOOKMARK_VISIT_NUM_PLUS = "bookmark_visit_num_plus"; } diff --git a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/Bookmark.java b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/Bookmark.java index 7358501..73645af 100644 --- a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/Bookmark.java +++ b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/Bookmark.java @@ -40,6 +40,10 @@ public class Bookmark { private String searchKey = ""; private Long addTime; private Long createTime; + /** + * 访问次数 + */ + private int visitNum; private List children; public Bookmark() { diff --git a/bookMarkService/web/src/main/resources/db/migration/V11__bookmark表增加字段记录访问次数.sql b/bookMarkService/web/src/main/resources/db/migration/V11__bookmark表增加字段记录访问次数.sql new file mode 100644 index 0000000..f114b2c --- /dev/null +++ b/bookMarkService/web/src/main/resources/db/migration/V11__bookmark表增加字段记录访问次数.sql @@ -0,0 +1 @@ +ALTER TABLE `bookmark`.`bookmark` ADD COLUMN `visitNum` int(0) UNSIGNED NOT NULL DEFAULT 0 COMMENT '访问次数' AFTER `createTime`; \ No newline at end of file From cf960d4210d81fa8c8c0442b6ad018ddaff99ebf Mon Sep 17 00:00:00 2001 From: fanxb Date: Tue, 12 May 2020 11:57:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=E7=94=A8=E6=88=B7=E5=8F=AA=E8=83=BD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=B7=B1=E7=9A=84=E4=B9=A6=E7=AD=BE?= =?UTF-8?q?=E8=AE=BF=E9=97=AE=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BookmarkVisitNumPlusConsumer.java | 5 +- .../business/bookmark/dao/BookmarkDao.java | 5 +- .../bookmark/entity/redis/VisitNumPlus.java | 23 ++++++ .../service/impl/BookmarkServiceImpl.java | 5 +- ...V12__bookmark增加userId,bookmarkId索引.sql | 2 + front/src/components/Search/index.jsx | 73 ++++++------------- front/src/pages/manage/OverView/index.jsx | 1 + 7 files changed, 61 insertions(+), 53 deletions(-) create mode 100644 bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/entity/redis/VisitNumPlus.java create mode 100644 bookMarkService/web/src/main/resources/db/migration/V12__bookmark增加userId,bookmarkId索引.sql diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/consumer/BookmarkVisitNumPlusConsumer.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/consumer/BookmarkVisitNumPlusConsumer.java index c97d622..ef5cf6d 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/consumer/BookmarkVisitNumPlusConsumer.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/consumer/BookmarkVisitNumPlusConsumer.java @@ -1,6 +1,8 @@ package com.fanxb.bookmark.business.bookmark.consumer; +import com.alibaba.fastjson.JSON; import com.fanxb.bookmark.business.bookmark.dao.BookmarkDao; +import com.fanxb.bookmark.business.bookmark.entity.redis.VisitNumPlus; import com.fanxb.bookmark.common.annotation.MqConsumer; import com.fanxb.bookmark.common.constant.RedisConstant; import com.fanxb.bookmark.common.entity.redis.RedisConsumer; @@ -29,8 +31,9 @@ public class BookmarkVisitNumPlusConsumer implements RedisConsumer { @Override public void deal(String message) { + VisitNumPlus item = JSON.parseObject(message, VisitNumPlus.class); try { - bookmarkDao.updateVisitNum(Integer.parseInt(message)); + bookmarkDao.updateVisitNum(item); } catch (Exception e) { log.error("书签访问次数增加失败：{}", e.getMessage()); } diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkDao.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkDao.java index 45ca967..a9c0e4e 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkDao.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkDao.java @@ -2,6 +2,7 @@ package com.fanxb.bookmark.business.bookmark.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fanxb.bookmark.business.bookmark.entity.BookmarkEs; +import com.fanxb.bookmark.business.bookmark.entity.redis.VisitNumPlus; import com.fanxb.bookmark.common.entity.Bookmark; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -201,7 +202,7 @@ public interface BookmarkDao extends BaseMapper { * @author fanxb * @date 2020/5/12 10:40 */ - @Update("update bookmark set visitNum=visitNum+1 where bookmarkId=#{id}") - void updateVisitNum(int id); + @Update("update bookmark set visitNum=visitNum+1 where userId=#{userId} and bookmarkId=#{bookmarkId}") + void updateVisitNum(VisitNumPlus item); } diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/entity/redis/VisitNumPlus.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/entity/redis/VisitNumPlus.java new file mode 100644 index 0000000..c3d27d0 --- /dev/null +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/entity/redis/VisitNumPlus.java @@ -0,0 +1,23 @@ +package com.fanxb.bookmark.business.bookmark.entity.redis; + +import lombok.AllArgsConstructor; +import lombok.Data; + +/** + * Created with IntelliJ IDEA + * + * @author fanxb + * Date: 2020/5/12 11:47 + */ +@Data +@AllArgsConstructor +public class VisitNumPlus { + /** + * 用户id + */ + private int userId; + /** + * 书签id + */ + private int bookmarkId; +} diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java index d7c4ea3..b685b8a 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java @@ -1,8 +1,10 @@ package com.fanxb.bookmark.business.bookmark.service.impl; +import com.alibaba.fastjson.JSON; import com.fanxb.bookmark.business.bookmark.dao.BookmarkDao; import com.fanxb.bookmark.business.bookmark.entity.BookmarkEs; import com.fanxb.bookmark.business.bookmark.entity.MoveNodeBody; +import com.fanxb.bookmark.business.bookmark.entity.redis.VisitNumPlus; import com.fanxb.bookmark.business.bookmark.service.BookmarkService; import com.fanxb.bookmark.business.bookmark.service.PinYinService; import com.fanxb.bookmark.common.constant.EsConstant; @@ -241,7 +243,8 @@ public class BookmarkServiceImpl implements BookmarkService { @Override public void visitNumPlus(int id) { - RedisUtil.addToMq(RedisConstant.BOOKMARK_VISIT_NUM_PLUS, id); + VisitNumPlus item = new VisitNumPlus(UserContextHolder.get().getUserId(), id); + RedisUtil.addToMq(RedisConstant.BOOKMARK_VISIT_NUM_PLUS, JSON.toJSONString(item)); } /** diff --git a/bookMarkService/web/src/main/resources/db/migration/V12__bookmark增加userId,bookmarkId索引.sql b/bookMarkService/web/src/main/resources/db/migration/V12__bookmark增加userId,bookmarkId索引.sql new file mode 100644 index 0000000..ec31d8a --- /dev/null +++ b/bookMarkService/web/src/main/resources/db/migration/V12__bookmark增加userId,bookmarkId索引.sql @@ -0,0 +1,2 @@ +ALTER TABLE `bookmark`.`bookmark` +ADD INDEX `userId_bookmarkId_index`(`userId`, `bookmarkId`) USING BTREE; \ No newline at end of file diff --git a/front/src/components/Search/index.jsx b/front/src/components/Search/index.jsx index 2338b5a..0eada7c 100644 --- a/front/src/components/Search/index.jsx +++ b/front/src/components/Search/index.jsx @@ -1,17 +1,18 @@ -import React from "react"; -import { Input, Select, Empty } from "antd"; -import styles from "./index.module.less"; -import { keySearch } from "../../util/cacheUtil"; +import React from 'react'; +import { Input, Select, Empty } from 'antd'; +import styles from './index.module.less'; +import { keySearch } from '../../util/cacheUtil'; +import httpUtil from '../../util/httpUtil'; class Search extends React.Component { constructor(props) { super(props); this.state = { - content: "", + content: '', currentIndex: 0, isFocus: false, resultList: [], - options: ["书签", "百度", "谷歌"], + options: ['书签', '百度', '谷歌'], currentOptionIndex: 0 }; } @@ -63,28 +64,25 @@ class Search extends React.Component { this.setState({ resultList, currentIndex: 0 }); } + goTo(item) { + window.open(item.url.startsWith('http') ? item.url : 'http://' + item.url); + httpUtil.post('/bookmark/visitNum?id=' + item.bookmarkId); + } + /** * 处理跳转到搜索引擎或者对应的书签 */ enter() { - const { - currentIndex, - currentOptionIndex, - resultList, - content - } = this.state; + const { currentIndex, currentOptionIndex, resultList, content } = this.state; if (currentOptionIndex === 0 && resultList.length > 0) { let url = resultList[currentIndex].url; - window.open(url.startsWith("http") ? url : "http://" + url); + window.open(url.startsWith('http') ? url : 'http://' + url); + httpUtil.post('/bookmark/visitNum?id=' + resultList[currentIndex].bookmarkId); } if (currentOptionIndex === 1) { - window.open( - "https://www.baidu.com/s?ie=UTF-8&wd=" + encodeURIComponent(content) - ); + window.open('https://www.baidu.com/s?ie=UTF-8&wd=' + encodeURIComponent(content)); } else if (currentOptionIndex === 2) { - window.open( - "https://www.google.com/search?q=" + encodeURIComponent(content) - ); + window.open('https://www.google.com/search?q=' + encodeURIComponent(content)); } } @@ -130,12 +128,7 @@ class Search extends React.Component { * 渲染结果列表 */ renderResults() { - const { - resultList, - currentIndex, - currentOptionIndex, - isFocus - } = this.state; + const { resultList, currentIndex, currentOptionIndex, isFocus } = this.state; if (currentOptionIndex !== 0 || !isFocus) { return; } @@ -143,38 +136,22 @@ class Search extends React.Component { return (
{resultList.map((item, index) => ( -
window.open(item.url)} - > +
this.goTo(item)}> {item.name}  - - {item.url} - + {item.url}
))}
); } else { - return ( - - ); + return ; } } render() { const { content, options, currentOptionIndex } = this.state; const prefix = ( - {options.map((item, index) => ( {item} @@ -188,15 +165,13 @@ class Search extends React.Component { addonBefore={prefix} ref="searchInput" value={content} - placeholder={currentOptionIndex === 0 ? "检索我的书签" : "搜索"} + placeholder={currentOptionIndex === 0 ? '检索我的书签' : '搜索'} enterButton onSearch={this.enter.bind(this)} onChange={this.contentChange.bind(this)} onKeyDown={this.keyUp.bind(this)} onFocus={() => this.setState({ isFocus: true })} - onBlur={() => - setTimeout(() => this.setState({ isFocus: false }), 600) - } + onBlur={() => setTimeout(() => this.setState({ isFocus: false }), 600)} /> {this.renderResults()}
diff --git a/front/src/pages/manage/OverView/index.jsx b/front/src/pages/manage/OverView/index.jsx index d2e09b1..7047fcf 100644 --- a/front/src/pages/manage/OverView/index.jsx +++ b/front/src/pages/manage/OverView/index.jsx @@ -105,6 +105,7 @@ class OverView extends React.Component { const item = e.node.props.dataRef; if (item.type === 0) { window.open(item.url.startsWith('http') ? item.url : 'http://' + item.url); + httpUtil.post('/bookmark/visitNum?id=' + item.bookmarkId); } else { const id = item.bookmarkId.toString(); const index = expandedKeys.indexOf(id); From 03add0d05ae8abcd0e350ceb2e687f53787a31e6 Mon Sep 17 00:00:00 2001 From: fanxb Date: Tue, 12 May 2020 13:48:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?refactor:=E4=BB=A3=E7=A0=81=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fanxb/bookmark/business/bookmark/dao/BookmarkDao.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkDao.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkDao.java index a9c0e4e..bab2ba6 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkDao.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkDao.java @@ -25,7 +25,6 @@ public interface BookmarkDao extends BaseMapper { * Description: 插入一条书签记录 * * @param node node - * @return void * @author fanxb * @date 2019/7/8 16:49 */ @@ -190,7 +189,8 @@ public interface BookmarkDao extends BaseMapper { * * @param size 大小 * @param startIndex 开始下标 - * @return + * @return bookmark List + * @author fanxb */ @Select("select * from bookmark order by bookmarkId limit ${startIndex},${size}") List getBookmarkListPage(@Param("size") int size, @Param("startIndex") int startIndex); @@ -198,7 +198,7 @@ public interface BookmarkDao extends BaseMapper { /** * 功能描述: 书签访问次数+1 * - * @param id 书签id + * @param item 信息 * @author fanxb * @date 2020/5/12 10:40 */