From 2db39c0b77aeadcc366b88167cca9cde0ed88e17 Mon Sep 17 00:00:00 2001
From: fanxb <fleyx20@outlook.com>
Date: Thu, 25 Mar 2021 17:22:10 +0800
Subject: [PATCH 1/3] =?UTF-8?q?refactor:=E6=B3=A8=E5=86=8C=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bookmark/business/user/controller/UserController.java | 4 +++-
 .../com/fanxb/bookmark/business/user/vo/RegisterBody.java | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/controller/UserController.java b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/controller/UserController.java
index f3456ca..26e3458 100644
--- a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/controller/UserController.java
+++ b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/controller/UserController.java
@@ -14,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
+
 /**
  * 类功能简述：
  * 类功能详述：
@@ -59,7 +61,7 @@ public class UserController {
      * @date 2019/7/6 16:34
      */
     @PutMapping("")
-    public Result register(@RequestBody RegisterBody body) {
+    public Result register(@Valid @RequestBody RegisterBody body) {
         return Result.success(userServiceImpl.register(body));
     }
 
diff --git a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/vo/RegisterBody.java b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/vo/RegisterBody.java
index c0e37dc..42a348f 100644
--- a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/vo/RegisterBody.java
+++ b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/vo/RegisterBody.java
@@ -2,6 +2,9 @@ package com.fanxb.bookmark.business.user.vo;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+
 /**
  * 类功能简述： 注册表单
  * 类功能详述：
@@ -11,8 +14,13 @@ import lombok.Data;
  */
 @Data
 public class RegisterBody {
+    @NotBlank(message = "用户名不能为空")
+    @Pattern(regexp = "^\\w{1,50}$", message = "用户名长度为1-50")
     private String username;
+    @NotBlank(message = "密码不能为空")
+    @Pattern(regexp = "^\\w{6,18}$", message = "密码为6-18位组合")
     private String password;
+    @NotBlank(message = "邮箱不能为空")
     private String email;
     private String authCode;
 }

From c8c004e75b07307a6ea758f0c62735611687988b Mon Sep 17 00:00:00 2001
From: fanxb <fleyx20@outlook.com>
Date: Wed, 31 Mar 2021 11:21:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bookmark_front/src/components/main/Search.vue | 53 ++++++++++---------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/bookmark_front/src/components/main/Search.vue b/bookmark_front/src/components/main/Search.vue
index 1f10956..6cdeec0 100644
--- a/bookmark_front/src/components/main/Search.vue
+++ b/bookmark_front/src/components/main/Search.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="search">
     <a-input-search id="searchInput" ref="searchInput" size="large" style="width: 100%" v-model="value" @change="search" @search="searchClick" allowClear @blur.prevent="inputBlur" @focus="inputFocus" @keydown="keyPress">
-      <a-tooltip :title="searchBookmark?'搜索书签':'全网搜索'" slot="enterButton">
-        <a-button :icon="searchBookmark?'book':'search'" type="primary" />
+      <a-tooltip title="全网搜索" slot="enterButton">
+        <a-button icon="search" type="primary" />
       </a-tooltip>
     </a-input-search>
     <div v-if="focused && searchBookmark" class="searchContent">
       <a-empty v-if="list.length == 0" />
-      <div class="listItem" :class="{ itemActive: index == hoverIndex || index == selectIndex }" v-for="(item, index) in list" :key="item.bookmarkId" @mouseenter="mouseEnterOut(index, 'enter')" @mouseleave="mouseEnterOut(index, 'leave')" @mouseup="onMouse" @click="itemClick(item)">
-        <a class="listItemUrl" style="padding-right: 1em; max-width: calc(100% - 2em)" :id="'bookmark:' + item.bookmarkId" :href="item.url" @click="itemClick($event,item.bookmarkId)" target="_blank">
+      <div class="listItem" :class="{ itemActive: index == hoverIndex || index == selectIndex }" v-for="(item, index) in list" :key="item.bookmarkId" @mouseenter="mouseEnterOut(index, 'enter')" @mouseleave="mouseEnterOut(index, 'leave')" @mouseup="onMouse">
+        <a class="listItemUrl" style="padding-right: 1em;min-width:3em; max-width: calc(100% - 2em)" :id="'bookmark:' + item.bookmarkId" :href="item.url" @click="itemClick($event,index)" target="_blank">
           {{ item.name }}
         </a>
         <a-tooltip v-if="showActions && hoverIndex === index" title="定位到书签树中">
@@ -75,34 +75,28 @@ export default {
       if (this.timer != null) {
         clearTimeout(this.timer);
       }
-      if (!this.searchBookmark) {
-        switch (this.userInfo.defaultSearchEngine) {
-          case "bing":
-            window.open("https://www.bing.com/search?q=" + encodeURIComponent(this.value));
-            break;
-          case "google":
-            window.open("https://www.google.com/search?q=" + encodeURIComponent(this.value));
-            break;
-          default:
-            window.open("https://www.baidu.com/s?ie=UTF-8&wd=" + encodeURIComponent(this.value));
-        }
+      switch (this.userInfo.defaultSearchEngine) {
+        case "bing":
+          window.open("https://www.bing.com/search?q=" + encodeURIComponent(this.value));
+          break;
+        case "google":
+          window.open("https://www.google.com/search?q=" + encodeURIComponent(this.value));
+          break;
+        default:
+          window.open("https://www.baidu.com/s?ie=UTF-8&wd=" + encodeURIComponent(this.value));
       }
     },
-    itemClick(e, id) {
+    itemClick(e, index) {
       if (e) {
         this.stopDefault(e);
       }
-      if (!id) {
+      if (!index) {
         return;
       }
-      HttpUtil.post("/bookmark/visitNum", { id });
-      if (this.selectIndex == null) {
-        this.targetUrl = "https://www.baidu.com/s?ie=UTF-8&wd=" + encodeURIComponent(this.value);
-      } else {
-        this.targetUrl = this.list[this.selectIndex].url;
-      }
+      let bookmark = this.list[index];
+      HttpUtil.post("/bookmark/visitNum", { id: bookmark.bookmarkId });
       let a = this.$refs["targetA"];
-      a.href = this.targetUrl;
+      a.href = bookmark.url;
       a.click();
       return false;
     },
@@ -144,10 +138,19 @@ export default {
           this.stopDefault();
           break;
         case "Enter":
-          this.itemClick(e, this.list[this.selectIndex].bookmarkId);
+          if (this.searchBookmark) {
+            this.itemClick(e, this.selectIndex);
+          } else {
+            this.searchClick();
+          }
           break;
         case "Tab":
           this.searchBookmark = !this.searchBookmark;
+          if (this.searchBookmark) {
+            this.$message.info("书签搜索");
+          } else {
+            this.$message.info("全网搜索");
+          }
           this.stopDefault();
           break;
         case "Escape":

From decea5cf86d828760d8a1da39d46b7c3142323fc Mon Sep 17 00:00:00 2001
From: fanxb <fleyx20@outlook.com>
Date: Wed, 31 Mar 2021 11:31:55 +0800
Subject: [PATCH 3/3] =?UTF-8?q?docs:=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 9f3388c..b7e6da1 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 部署教程：[docker-compose部署](https://github.com/FleyX/bookmark/blob/master/DEPLOY.md)
 
-自用地址（你们也可以用，长期提供服务）:[bm.tapme.top](http://bm.tapme.top)
+自用地址（你们也可以用，长期提供服务）:[bm.tapme.top](https://bm.tapme.top)
 
 
 # 缘由
@@ -15,15 +15,24 @@
 
 所以有了这样这样一个项目，建立一个和平台无关的书签管理器，可在任意平台使用。
 
-计划开发顺序如下：web 端->chrome 插件->firfox 插件。
-
-最终目的就是所有浏览器(不包含 ie10 及以下等远古浏览器)中都能便捷的使用书签。
-
 # 主要功能
 
+1. 基础的书签增删改查功能。支持chrome、firefox等浏览器书签文件导入，导出。
+
+   按需加载书签节点，即使上万条书签也不会卡
+
+   支持鼠标拖拽排序、移动位置、层级（移动端不支持）
+
+   支持书签文件双向导入导出（从浏览器导入到系统、从系统导出到浏览器）
+
+2. 强大的书签检索功能，毫秒级的关键字检索。
+
+   支持使用 书签名搜索、url搜索、书签名拼音搜索、书签名拼音首字母搜索。（注意不支持组合使用）
+4. 移动端支持，web页面可在浏览器中正常使用
+
 ## TODO
 
-- 浏览器插件
+- 主页功能 
 - 拼音检索 Ok!
 - 书签导出 OK！
 - 侧边栏显示