pushcode

src/main/java/top/lvzhiqiang/controller/BookmarkInfoController.java

@@ -40,7 +40,7 @@ public class BookmarkInfoController {
      */
     @RequestMapping("/insertOrUpdate")
     @ResponseBody
-    public R insertOrUpdate(String id, String title, String url, String tags, String remark, String level1Category, String level2Category, String level3Category, String crudType, String userName) {
+    public R insertOrUpdate(String id, String title, String url, String sourceUrl, String tags, String remark, String level1Category, String level2Category, String level3Category, String crudType, String userName) {
         if (StringUtils.isEmpty(crudType)) {
             throw new ParameterException("crudType为空!");
         }
@@ -67,6 +67,7 @@ public class BookmarkInfoController {
             bookmarkInfo.setUrl(url.trim());
             bookmarkInfo.setTags(tags);
             bookmarkInfo.setRemark(remark);
+            bookmarkInfo.setSourceUrl(sourceUrl);
             bookmarkInfo.setAccountId(String.valueOf(userId));
 
             String categoryId;
@@ -99,6 +100,9 @@ public class BookmarkInfoController {
             if (StringUtils.isNotEmpty(url)) {
                 bookmarkInfo.setUrl(url);
             }
+            if (StringUtils.isNotEmpty(sourceUrl)) {
+                bookmarkInfo.setSourceUrl(sourceUrl);
+            }
             if (StringUtils.isNotEmpty(tags)) {
                 bookmarkInfo.setTags(tags);
             }

src/main/java/top/lvzhiqiang/entity/BookmarkInfo.java

@@ -30,6 +30,8 @@ public class BookmarkInfo implements Serializable {
      */
     private String url;
 
+    private String sourceUrl;
+
     /**
      * 标签字段，用于标记书签，方便分类和检索（可选）
      */

src/main/java/top/lvzhiqiang/mapper/BookmarkMapper.java

@@ -102,7 +102,6 @@ public interface BookmarkMapper {
             "#{categoryId}",
             "</foreach>",
             "</if>",
-
             "<if test=\"accountId != null and accountId != ''\">" +
             "   and bi.account_id = #{accountId}" +
             "</if>" +
@@ -119,14 +118,14 @@ public interface BookmarkMapper {
             "</script>"})
     List<BookmarkInfo> findBookmarkList(Map<String, Object> params);
 
-    @Insert("INSERT INTO bookmark_info(title, url, tags, remark, account_id, category_id) " +
-            "VALUES (#{title}, #{url}, #{tags}, #{remark}, #{accountId}, #{categoryId})")
+    @Insert("INSERT INTO bookmark_info(title, url, source_url, tags, remark, account_id, category_id) " +
+            "VALUES (#{title}, #{url}, #{sourceUrl}, #{tags}, #{remark}, #{accountId}, #{categoryId})")
     void insertBookmark(BookmarkInfo bookmarkInfo);
 
     @Select("select * from bookmark_info where id = #{id}")
     BookmarkInfo findBookmarkById(Long id);
 
-    @Update("update bookmark_info set title=#{title},url=#{url},tags=#{tags},remark=#{remark},account_id=#{accountId}," +
+    @Update("update bookmark_info set title=#{title},url=#{url},source_url=#{sourceUrl},tags=#{tags},remark=#{remark},account_id=#{accountId}," +
             "category_id=#{categoryId} where id = #{id}")
     void updateBookmark(BookmarkInfo bookmarkInfo);
 

src/main/java/top/lvzhiqiang/service/impl/CoinServiceImpl.java

@@ -1998,9 +1998,26 @@ public class CoinServiceImpl implements CoinService {
             bookmarkInfo.setIsFavoriteStr(bookmarkInfo.getIsFavorite() == 1 ? "是" : "否");
             // 状态
             bookmarkInfo.setStatusStr(bookmarkInfo.getStatus() == 1 ? "正常" : "失效");
+            // tags
+            bookmarkInfo.setTags(StringUtils.isEmpty(bookmarkInfo.getTags()) ? "--" : bookmarkInfo.getTags());
+            // sourceUrl
+            if (StringUtils.isNotEmpty(bookmarkInfo.getSourceUrl())) {
+                bookmarkInfo.setSourceUrl("<a target=\"_blank\" href=\" " + bookmarkInfo.getSourceUrl() + "\">" + "goGO" + "</a>");
+            } else {
+                bookmarkInfo.setSourceUrl("--");
+            }
             // 备注
-            String remark = StringUtils.isNotEmpty(bookmarkInfo.getRemark()) ? (bookmarkInfo.getRemark().length() > 20 ? (bookmarkInfo.getRemark().substring(0, 20) + "...") : bookmarkInfo.getRemark()) : "--";
-            bookmarkInfo.setRemark("<span class=\"primary\" avid=\"" + bookmarkInfo.getId() + " \" >" + remark + " </span>");
+            String remark;
+            if (StringUtils.isNotEmpty(bookmarkInfo.getRemark())) {
+                if (bookmarkInfo.getRemark().length() > 20) {
+                    remark = bookmarkInfo.getRemark().substring(0, 20) + "...";
+                } else {
+                    remark = bookmarkInfo.getRemark();
+                }
+            } else {
+                remark = "--";
+            }
+            bookmarkInfo.setRemark("<span class=\"primary\" title=\"" + bookmarkInfo.getRemark() + "\" avid=\"" + bookmarkInfo.getId() + " \" >" + remark + " </span>");
         }
     }
 

src/main/resources/static/js/my-coin.js

@@ -1798,8 +1798,9 @@ function quietPop(url, nameEn, slideDiv, typetype) {
     } else if (nameEn === 'bookmark') {
         let formContent = "";
         formContent += '<div class="form-item"><label for="id">Id：</label><input type="text" name="id" placeholder="可为空"></div>';
-        formContent += '<div class="form-item"><label for="title">title：</label><input type="text" name="title" placeholder="不可为空"></div>';
-        formContent += '<div class="form-item"><label for="url">url：</label><input type="text" name="url" placeholder="不可为空"></div>';
+        formContent += '<div class="form-item"><label for="title">title：</label><input type="text" name="title" placeholder="新增时不可为空"></div>';
+        formContent += '<div class="form-item"><label for="url">url：</label><input type="text" name="url" placeholder="新增时不可为空"></div>';
+        formContent += '<div class="form-item"><label for="sourceUrl">source：</label><input type="text" name="sourceUrl" placeholder="可为空"></div>';
         formContent += '<div class="form-item"><label for="tags">tags：</label><input type="text" name="tags" placeholder="可为空"></div>';
         formContent += '<div class="form-item"><label for="remark">remark：</label><input type="text" name="remark" placeholder="可为空"></div>';
         formContent += '<div class="form-item"><label for="crudType">crudType：</label><select id="apis-quiet-div-bookmark-crudType" name="crudType"><option value="1">insert</option><option value="2">update</option></select></div>';