diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkBackupDao.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkBackupDao.java index 42848df..abbbc50 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkBackupDao.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkBackupDao.java @@ -1,6 +1,7 @@ package com.fanxb.bookmark.business.bookmark.dao; import com.fanxb.bookmark.common.entity.Bookmark; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -12,6 +13,7 @@ import java.util.List; * Date: 2019/11/12 * Time: 0:24 */ +@Mapper public interface BookmarkBackupDao { /** diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/BookmarkBackupService.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/BookmarkBackupService.java index 163d342..6a53d74 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/BookmarkBackupService.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/BookmarkBackupService.java @@ -23,8 +23,6 @@ import java.util.List; @Service public class BookmarkBackupService { - @Autowired - private BookmarkDao bookmarkDao; @Autowired private BookmarkBackupDao bookmarkBackupDao; 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 b09f0f2..6e8f133 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 @@ -64,7 +64,7 @@ public class BookmarkService { Document doc = Jsoup.parse(stream, "utf-8", ""); Elements elements = doc.select("html>body>dl>dt"); //获取当前层sort最大值 - Integer sortBase = bookmarkDao.selectMaxSort(1, path); + Integer sortBase = bookmarkDao.selectMaxSort(userId, path); if (sortBase == null) { sortBase = 0; } diff --git a/bookMarkService/web/src/main/resources/db/migration/V3__bookmark表删除唯一索引,修改name长度.sql b/bookMarkService/web/src/main/resources/db/migration/V3__bookmark表删除唯一索引,修改name长度.sql new file mode 100644 index 0000000..7697722 --- /dev/null +++ b/bookMarkService/web/src/main/resources/db/migration/V3__bookmark表删除唯一索引,修改name长度.sql @@ -0,0 +1,3 @@ +ALTER TABLE `bookmark`.`bookmark` +MODIFY COLUMN `name` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL AFTER `type`, +DROP INDEX `userId_path_name_unique_index`; \ No newline at end of file