Sfoglia il codice sorgente

web 模块更改为 restful 服务

reghao 3 mesi fa
parent
commit
30d83c322b

+ 3 - 3
web/src/main/java/cn/reghao/bnt/web/blog/controller/AdminArticleController.java

@@ -98,9 +98,9 @@ public class AdminArticleController {
     }
 
     @Operation(summary = "重置文章索引", description = "N")
-    @PostMapping(value = "/reset_indexes", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String resetIndexes() {
-        hibernateLucene.resetIndexes();
+    @PostMapping(value = "/reset_index", produces = MediaType.APPLICATION_JSON_VALUE)
+    public String resetIndex() {
+        hibernateLucene.resetIndex();
         return WebResult.success();
     }
 }

+ 5 - 4
web/src/main/java/cn/reghao/bnt/web/blog/controller/ForegroundController.java

@@ -135,16 +135,17 @@ public class ForegroundController extends BaseController {
     @GetMapping("/archive")
     public String archive() {
         List<ArchiveArticle> results = articleQuery.getArchiveArticles();
-        return WebResult.success(results);
+        List<ArticleLink> articleLinkList = articleQuery.getArticleLinks();
+        return WebResult.success(articleLinkList);
     }
 
     @Operation(summary = "文章搜索结果列表页面", description = "N")
     @GetMapping("/search")
     public String search(@RequestParam("kw") String kw, @RequestParam("pn") int pageNumber) {
         PageRequest pageRequest = PageRequest.of(pageNumber, pageSize, Sort.by(Sort.Direction.ASC, "createTime"));
-        /*Page<UserArticle> page = hibernateQuery.searchArticle(kw, pageRequest);
-        PageList<UserArticle> pageList = getPageList(page);*/
-        return WebResult.success("pageList");
+        Page<UserArticle> page = hibernateQuery.search(kw, pageRequest);
+        PageList<UserArticle> pageList = getPageList(page);
+        return WebResult.success(pageList);
     }
 
     @Operation(summary = "关于页面", description = "N")

+ 3 - 3
web/src/main/java/cn/reghao/bnt/web/blog/hibernate/HibernateLucene.java

@@ -21,12 +21,12 @@ public class HibernateLucene {
         this.searchSession = Search.session(entityManagerFactory.createEntityManager());
     }
 
-    public void createIndexes() {
+    public void createIndex() {
         List<Class<?>> classList = List.of(Article.class, Question.class);
         searchSession.massIndexer(classList).start();
     }
 
-    public void resetIndexes() {
-        createIndexes();
+    public void resetIndex() {
+        createIndex();
     }
 }

+ 5 - 1
web/src/main/java/cn/reghao/bnt/web/blog/service/ArticleQuery.java

@@ -92,7 +92,7 @@ public class ArticleQuery {
         }*/
 
         String content = articleVO.getContent();
-        content += "<br/><p class=\"copyright\">声明:本文归作者所有,未经作者允许,不得转载</p>";
+        //content += "<br/><p class=\"copyright\">声明:本文归作者所有,未经作者允许,不得转载</p>";
         articleVO.setContent(content);
         return articleVO;
     }
@@ -134,6 +134,10 @@ public class ArticleQuery {
         return new ArrayList<>(results.values());
     }
 
+    public List<ArticleLink> getArticleLinks() {
+        return articleRepository.findAll().stream().map(this::getLink).collect(Collectors.toList());
+    }
+
     public List<ArticleLink> getLatest(int size) {
         Sort sort = Sort.by(Sort.Direction.DESC, "createTime");
         Pageable pageable = PageRequest.of(0, size, sort);

+ 1 - 1
web/src/test/java/JpaTest.java

@@ -33,7 +33,7 @@ public class JpaTest {
     HibernateLucene hibernateLucene;
     @Test
     void createIndexTest() {
-        hibernateLucene.createIndexes();
+        hibernateLucene.createIndex();
     }
 
     public void getMaxUserId() {