feat[search]:添加ElasticSearch和RabbitMq，实现搜索功能

Author: llldddbbb

dbblog-backend/dbblog-core/pom.xml

@@ -92,6 +92,14 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

dbblog-backend/dbblog-core/src/main/java/cn/dblearn/blog/common/constants/RabbitMqConstants.java

@@ -0,0 +1,13 @@
+package cn.dblearn.blog.common.constants;
+
+/**
+ * RabbitMqConstants
+ *
+ * @author bobbi
+ * @date 2019/03/16 22:12
+ * @email [email protected]
+ * @description
+ */
+public class RabbitMqConstants {
+    public static final String REFRESH_ES_INDEX_QUEUE ="dbblog-queue";
+}

dbblog-backend/dbblog-core/src/main/java/cn/dblearn/blog/common/mq/annotation/RefreshEsMqSender.java

@@ -0,0 +1,12 @@
+package cn.dblearn.blog.common.mq.annotation;
+
+/**
+ * RefreshEsMqSender
+ *
+ * @author bobbi
+ * @date 2019/03/16 22:52
+ * @email [email protected]
+ * @description
+ */
+public @interface RefreshEsMqSender {
+}

dbblog-backend/dbblog-core/src/main/java/cn/dblearn/blog/common/mq/aspect/RefreshEsMqAspect.java

@@ -0,0 +1,41 @@
+package cn.dblearn.blog.common.mq.aspect;
+
+import cn.dblearn.blog.common.constants.RabbitMqConstants;
+import cn.dblearn.blog.common.util.RabbitMqUtils;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * RefreshEsMqAspect
+ *
+ * @author bobbi
+ * @date 2019/03/16 22:53
+ * @email [email protected]
+ * @description
+ */
+@Aspect
+@Component
+public class RefreshEsMqAspect {
+
+    @Resource
+    private RabbitMqUtils rabbitMqUtils;
+
+    @Pointcut("@annotation(cn.dblearn.blog.common.mq.annotation.RefreshEsMqSender)")
+    public void pointCut() {
+
+    }
+
+    @Around("pointCut()")
+    public Object around(ProceedingJoinPoint point) throws Throwable {
+        //执行方法
+        Object result = point.proceed();
+        // 发送刷新信息
+        rabbitMqUtils.send(RabbitMqConstants.REFRESH_ES_INDEX_QUEUE,"send refresh Es");
+        return result;
+    }
+}

dbblog-backend/dbblog-core/src/main/java/cn/dblearn/blog/common/util/RabbitMqUtils.java

@@ -0,0 +1,29 @@
+package cn.dblearn.blog.common.util;
+
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * RabbitMqUtils
+ *
+ * @author bobbi
+ * @date 2019/03/16 22:08
+ * @email [email protected]
+ * @description
+ */
+@Component
+public class RabbitMqUtils {
+
+    @Autowired
+    private AmqpTemplate rabbitTemplate;
+
+    /**
+     * 发送到指定Queue
+     * @param queueName
+     * @param obj
+     */
+    public void send(String queueName, Object obj){
+        this.rabbitTemplate.convertAndSend(queueName, obj);
+    }
+}

dbblog-backend/dbblog-core/src/main/java/cn/dblearn/blog/config/RabbitMqConfig.java

@@ -0,0 +1,24 @@
+package cn.dblearn.blog.config;
+
+import cn.dblearn.blog.common.constants.RabbitMqConstants;
+import org.springframework.amqp.core.Queue;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+
+/**
+ * RabbitMQConfig
+ *
+ * @author bobbi
+ * @date 2019/03/16 21:59
+ * @email [email protected]
+ * @description
+ */
+@Configuration
+public class RabbitMqConfig {
+
+    @Bean
+    public Queue queue() {
+        return new Queue(RabbitMqConstants.REFRESH_ES_INDEX_QUEUE);
+    }
+}

dbblog-backend/dbblog-core/src/main/java/cn/dblearn/blog/entity/article/Article.java

@@ -4,14 +4,18 @@
 import cn.dblearn.blog.common.validator.group.UpdateGroup;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -23,12 +27,14 @@
  */
 @Data
 @ApiModel(value="BlogArticle对象", description="文章")
+@Document(indexName = "dbblog",type = "article")
 public class Article implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键")
     @TableId(value = "id", type = IdType.AUTO)
+    @Id
     private Integer id;
 
     @ApiModelProperty(value = "文章标题")
@@ -61,11 +67,12 @@ public class Article implements Serializable {
     private Integer coverType;
 
     @ApiModelProperty(value = "创建时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
+    @Field(type = FieldType.Date, format = DateFormat.none)
+    private Date createTime;
 
     @ApiModelProperty(value = "更新时间")
-    private LocalDateTime updateTime;
+    @Field(type = FieldType.Date, format = DateFormat.none)
+    private Date updateTime;
 
     @ApiModelProperty(value = "是否推荐文章")
     private Boolean recommend;

dbblog-backend/dbblog-core/src/main/java/cn/dblearn/blog/entity/book/Book.java

@@ -7,8 +7,7 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -44,7 +43,7 @@ public class Book implements Serializable {
 
     @ApiModelProperty(value = "出版日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate publishDate;
+    private Date publishDate;
 
     @ApiModelProperty(value = "页数")
     private int pageNum;
@@ -75,11 +74,11 @@ public class Book implements Serializable {
 
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty(value = "更新时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     @ApiModelProperty(value = "读书进度")
     private Integer progress;

dbblog-backend/dbblog-core/src/main/java/cn/dblearn/blog/entity/book/BookNote.java

@@ -6,11 +6,9 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -21,8 +19,6 @@
  * @since 2019-02-13
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
 @ApiModel(value = "BookNote对象", description = "笔记")
 public class BookNote implements Serializable {
 
@@ -64,11 +60,11 @@ public class BookNote implements Serializable {
 
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty(value = "更新时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     @ApiModelProperty(value = "是否推荐笔记")
     private Boolean recommend;

dbblog-backend/dbblog-core/src/main/java/cn/dblearn/blog/entity/book/BookSense.java

@@ -8,7 +8,7 @@
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -40,11 +40,11 @@ public class BookSense implements Serializable {
 
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty(value = "更新时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
 
 }