tj

RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -2,7 +2,9 @@ package com.ruoyi;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
@@ -13,7 +15,8 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
  * 
  * @author ruoyi
  */
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class},
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, ElasticsearchDataAutoConfiguration.class,
+        ElasticsearchRestClientAutoConfiguration.class},
         scanBasePackages = {
                 "com.ruoyi",
                 "com.ruoyi.novel"  // 确保包含 novel 包

RuoYi-Vue/ruoyi-admin/src/main/resources/application.yml

@@ -89,10 +89,10 @@ spring:
         max-active: 8
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
-  elasticsearch:
-    uris: http://localhost:9200 # ES地址
-    connection-timeout: 3000
-    socket-timeout: 5000
+#  elasticsearch:
+#    uris: http://localhost:9200 # ES地址
+#    connection-timeout: 3000
+#    socket-timeout: 5000
   jpa:
     show-sql: true
     hibernate:

RuoYi-Vue/ruoyi-system/pom.xml

@@ -47,10 +47,10 @@
             <artifactId>spring-web</artifactId>
         </dependency>
         <!-- Elasticsearch -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>-->
+<!--        </dependency>-->
         <!-- MyBatis-Plus 核心依赖 -->
         <dependency>
             <groupId>com.baomidou</groupId>

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/config/ElasticsearchConfig.java

@@ -1,42 +1,42 @@
-package com.ruoyi.novel.config;
-
-import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.client.RestHighLevelClient;
-import org.springframework.boot.actuate.health.AbstractHealthIndicator;
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.boot.actuate.health.HealthIndicator;
-import org.springframework.boot.actuate.health.Status;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.elasticsearch.client.ClientConfiguration;
-import org.springframework.data.elasticsearch.client.RestClients;
-import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
-
-@Configuration
-public class ElasticsearchConfig {
-
-    @Bean
-    public ElasticsearchRestTemplate elasticsearchRestTemplate(RestHighLevelClient client) {
-        return new ElasticsearchRestTemplate(client);
-    }
-
-    @Bean
-    public RestHighLevelClient elasticsearchClient() {
-        return RestClients.create(ClientConfiguration.localhost()).rest();
-    }
-
-    @Bean
-    public HealthIndicator elasticsearchHealthIndicator(RestHighLevelClient client) {
-        return new AbstractHealthIndicator() {
-            @Override
-            protected void doHealthCheck(Health.Builder builder) throws Exception {
-                try {
-                    boolean available = client.ping(RequestOptions.DEFAULT);
-                    builder.status(available ? Status.UP : Status.DOWN);
-                } catch (Exception e) {
-                    builder.down(e);
-                }
-            }
-        };
-    }
-}
+//package com.ruoyi.novel.config;
+//
+//import org.elasticsearch.client.RequestOptions;
+//import org.elasticsearch.client.RestHighLevelClient;
+//import org.springframework.boot.actuate.health.AbstractHealthIndicator;
+//import org.springframework.boot.actuate.health.Health;
+//import org.springframework.boot.actuate.health.HealthIndicator;
+//import org.springframework.boot.actuate.health.Status;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.data.elasticsearch.client.ClientConfiguration;
+//import org.springframework.data.elasticsearch.client.RestClients;
+//import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
+//
+//@Configuration
+//public class ElasticsearchConfig {
+//
+////    @Bean
+////    public ElasticsearchRestTemplate elasticsearchRestTemplate(RestHighLevelClient client) {
+////        return new ElasticsearchRestTemplate(client);
+////    }
+////
+////    @Bean
+////    public RestHighLevelClient elasticsearchClient() {
+////        return RestClients.create(ClientConfiguration.localhost()).rest();
+////    }
+//
+////    @Bean
+////    public HealthIndicator elasticsearchHealthIndicator(RestHighLevelClient client) {
+////        return new AbstractHealthIndicator() {
+////            @Override
+////            protected void doHealthCheck(Health.Builder builder) throws Exception {
+////                try {
+////                    boolean available = client.ping(RequestOptions.DEFAULT);
+////                    builder.status(available ? Status.UP : Status.DOWN);
+////                } catch (Exception e) {
+////                    builder.down(e);
+////                }
+////            }
+////        };
+////    }
+//}

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/config/ElasticsearchInitializer.java

@@ -1,33 +1,34 @@
-package com.ruoyi.novel.config;
-
-import com.ruoyi.novel.domain.Novel;
-import com.ruoyi.novel.service.impl.NovelServiceImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ElasticsearchInitializer implements ApplicationRunner {
-    private static final Logger logger = LoggerFactory.getLogger(ElasticsearchInitializer.class);
-    private final ElasticsearchRestTemplate elasticsearchTemplate;
-
-    public ElasticsearchInitializer(ElasticsearchRestTemplate elasticsearchTemplate) {
-        this.elasticsearchTemplate = elasticsearchTemplate;
-    }
-
-    @Override
-    public void run(ApplicationArguments args) {
-        try {
-            if (!elasticsearchTemplate.indexOps(Novel.class).exists()) {
-                elasticsearchTemplate.indexOps(Novel.class).create();
-                elasticsearchTemplate.indexOps(Novel.class).putMapping();
-                logger.info("Created Elasticsearch index for Novel");
-            }
-        } catch (Exception e) {
-            logger.warn("Failed to create Elasticsearch index", e);
-        }
-    }
-}
+//package com.ruoyi.novel.config;
+//
+//import com.ruoyi.novel.domain.Novel;
+//import com.ruoyi.novel.service.impl.NovelServiceImpl;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.boot.ApplicationArguments;
+//import org.springframework.boot.ApplicationRunner;
+//import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
+//import org.springframework.stereotype.Component;
+//
+//@Component
+//public class ElasticsearchInitializer implements ApplicationRunner {
+//    private static final Logger logger = LoggerFactory.getLogger(ElasticsearchInitializer.class);
+////    private final ElasticsearchRestTemplate elasticsearchTemplate;
+////
+////    public ElasticsearchInitializer(ElasticsearchRestTemplate elasticsearchTemplate) {
+////        this.elasticsearchTemplate = elasticsearchTemplate;
+////    }
+//
+//    @Override
+//    public void run(ApplicationArguments args) {
+//        logger.info("Created Elasticsearch index for Novel");
+////        try {
+////            if (!elasticsearchTemplate.indexOps(Novel.class).exists()) {
+////                elasticsearchTemplate.indexOps(Novel.class).create();
+////                elasticsearchTemplate.indexOps(Novel.class).putMapping();
+////                logger.info("Created Elasticsearch index for Novel");
+////            }
+////        } catch (Exception e) {
+////            logger.warn("Failed to create Elasticsearch index", e);
+////        }
+//    }
+//}

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/controller/NovelController.java

@@ -16,11 +16,15 @@ import com.ruoyi.novel.service.NovelSearchService;
 import com.ruoyi.novel.service.NovelService;
 import jdk.jfr.Category;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.http.ResponseEntity;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 // NovelController.java
 @RestController
@@ -31,6 +35,7 @@ public class NovelController extends BaseController {
     @Autowired
     private final NovelService novelService;
 
+    @Qualifier("authServiceImpl")
     @Autowired
     private final IAuthService authService;
     @Autowired
@@ -38,7 +43,7 @@ public class NovelController extends BaseController {
     @Autowired
     private NovelMapper novelMapper;
     // 构造函数注入
-    public NovelController(NovelService novelService, IAuthService authService) {
+    public NovelController(NovelService novelService, @Qualifier("authServiceImpl") IAuthService authService) {
         this.novelService = novelService;
         this.authService = authService;
     }
@@ -150,30 +155,40 @@ public AjaxResult getChapterContent(@PathVariable Long chapterId) {
     }
     // 其他接口...
     @GetMapping("/search")
-    public AjaxResult searchNovels(@RequestParam String keyword) {
-        List<Novel> novels = searchService.searchNovels(keyword);
+    @Cacheable(value = "novelSearch", key = "#keyword + '-' + #categoryId")
+    public AjaxResult searchNovels(@RequestParam String keyword, @RequestParam  Long categoryId) {
+        List<Novel> novels = searchService.searchNovels(keyword, categoryId);
         return AjaxResult.success(novels);
     }
+    @Async
+    public CompletableFuture<List<Novel>> searchNovelsAsync(String keyword, Long categoryId) {
+        return CompletableFuture.completedFuture((List<Novel>) searchNovels(keyword, categoryId));
+    }
+    @GetMapping("/suggest")
+    public List<String> suggestKeywords(@RequestParam String prefix) {
+        return novelMapper.suggestKeywords(prefix + "%", 10);
+    }
 
+    // Mapper中
 
     @PostMapping("/create")
     public AjaxResult addNovel(@RequestBody Novel novel) {
         novelMapper.insert(novel);
-        searchService.indexNovel(novel); // 创建索引
+        //searchService.indexNovel(novel); // 创建索引
         return AjaxResult.success();
     }
 
     @PutMapping
     public AjaxResult updateNovel(@RequestBody Novel novel) {
         novelMapper.updateById(novel);
-        searchService.updateNovelIndex(novel); // 更新索引
+        //searchService.updateNovelIndex(novel); // 更新索引
         return AjaxResult.success();
     }
 
     @DeleteMapping("/{id}")
     public AjaxResult deleteNovel(@PathVariable Long id) {
         novelMapper.deleteById(id);
-        searchService.deleteNovelIndex(id); // 删除索引
+        //searchService.deleteNovelIndex(id); // 删除索引
         return AjaxResult.success();
     }
 }

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/domain/Novel.java

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldType;
+//import org.springframework.data.elasticsearch.annotations.Document;
+//import org.springframework.data.elasticsearch.annotations.Field;
+//import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -19,7 +19,7 @@ import java.util.Date;
 
 @Entity
 @TableName("novel")
-@Document(indexName = "novels")
+//@Document(indexName = "novels")
 @Data
 public class Novel {
     @javax.persistence.Id
@@ -27,23 +27,23 @@ public class Novel {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @TableId(type = IdType.AUTO)
     private Long id;
-    @Field(type = FieldType.Text, analyzer = "ik_max_word")
+    //@Field(type = FieldType.Text, analyzer = "ik_max_word")
     private String title;
-    @Field(type = FieldType.Keyword)
+    //@Field(type = FieldType.Keyword)
     private String author;
     private Long authorId;
     private String cover;
     private String coverImg;
-    @Field(type = FieldType.Long)
+    //@Field(type = FieldType.Long)
     private Long categoryId;
-    @Field(type = FieldType.Keyword)
+    //@Field(type = FieldType.Keyword)
     private Integer status = 0; // 0: 连载中, 1: 已完结// 连载/完本
-    @Field(type = FieldType.Text, analyzer = "ik_smart")
+    //@Field(type = FieldType.Text, analyzer = "ik_smart")
     private String description;
     private Long wordCount;
-    @Field(type = FieldType.Long)
+    //@Field(type = FieldType.Long)
     private Long readCount;
-    @Field(type = FieldType.Date)
+    //@Field(type = FieldType.Date)
     @Column(name = "create_time")
     private Date createTime = new Date();
     @Column(name = "update_time")

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/domain/User.java

@@ -0,0 +1,23 @@
+package com.ruoyi.novel.domain;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "sys_user")
+public class User {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String username;
+    private String password;
+    private String email;
+    private String token;
+
+    // Getters and setters
+    // 构造函数
+}

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/mapper/NovelMapper.java

@@ -12,7 +12,7 @@ import java.util.Map;
 @Mapper
 // NovelMapper.java
 public interface NovelMapper extends BaseMapper<Novel> {
-    List<Novel> selectNovelList(Novel novel);
+    List<Novel> selectNovelList(@Param("novel") Novel novel,@Param("keyword") String keyword);
     Novel selectNovelById(Long id);
     int insertNovel(Novel novel);
     int updateNovel(Novel novel);
@@ -37,6 +37,7 @@ public interface NovelMapper extends BaseMapper<Novel> {
   //  List<Novel> selectNovelList(Novel novel);
     List<Novel> selectHotNovels(Map<String, Object> params);
 
-
+    @Select("SELECT DISTINCT title FROM novel WHERE title LIKE #{prefix} LIMIT #{limit}")
+    List<String> suggestKeywords(@Param("prefix") String prefix, @Param("limit") int limit);
 }
 

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/repository/elastic/NovelSearchRepository.java

@@ -1,8 +1,8 @@
-package com.ruoyi.novel.repository.elastic;
-
-import com.ruoyi.novel.domain.Novel;
-import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
-
-public interface NovelSearchRepository extends ElasticsearchRepository<Novel, Long> {
-    // Elasticsearch 特定查询方法
-}
+//package com.ruoyi.novel.repository.elastic;
+//
+//import com.ruoyi.novel.domain.Novel;
+//import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+//
+//public interface NovelSearchRepository extends ElasticsearchRepository<Novel, Long> {
+//    // Elasticsearch 特定查询方法
+//}

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/repository/jpa/NovelRepository.java

@@ -2,8 +2,9 @@ package com.ruoyi.novel.repository.jpa;
 
 import com.ruoyi.novel.domain.Novel;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.data.elasticsearch.annotations.Query;
+//import org.springframework.data.elasticsearch.annotations.Query;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.NoRepositoryBean;
 import org.springframework.stereotype.Repository;
 

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/service/UserRepository.java → RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/repository/jpa/UserRepository.java

@@ -1,15 +1,12 @@
-package com.ruoyi.novel.service;
+package com.ruoyi.novel.repository.jpa;
 
-import org.elasticsearch.client.security.user.User;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.novel.domain.User;  // 确保导入正确
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import java.util.Optional;
 @Repository
-// UserRepository.java
 public interface UserRepository extends JpaRepository<User, Long> {
-
-    //Optional<User> findByUsername(String username);
     // 自定义查询方法
     User findByUsername(String username);
     User findByEmail(String email);

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/service/ChapterRepository.java

@@ -2,8 +2,9 @@ package com.ruoyi.novel.service;
 
 import com.ruoyi.novel.domain.Chapter;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.data.elasticsearch.annotations.Query;
+//import org.springframework.data.elasticsearch.annotations.Query;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/service/NovelSearchService.java

@@ -6,8 +6,8 @@ import java.util.List;
 
 // NovelSearchService.java
 public interface NovelSearchService {
-    List<Novel> searchNovels(String keyword);
-    void indexNovel(Novel novel);
-    void updateNovelIndex(Novel novel);
-    void deleteNovelIndex(Long id);
+    List<Novel> searchNovels(String keyword, Long categoryId);
+//    void indexNovel(Novel novel);
+//    void updateNovelIndex(Novel novel);
+//    void deleteNovelIndex(Long id);
 }

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/service/NovelService.java

@@ -4,10 +4,10 @@ import com.ruoyi.novel.domain.AuthorApplication;
 import com.ruoyi.novel.domain.AuthorApplicationDTO;
 import com.ruoyi.novel.domain.Chapter;
 import com.ruoyi.novel.domain.Novel;
-import com.ruoyi.novel.repository.elastic.NovelSearchRepository;
+//import com.ruoyi.novel.repository.elastic.NovelSearchRepository;
 import com.ruoyi.novel.repository.jpa.NovelRepository;
 import jdk.jfr.Category;
-import org.elasticsearch.client.tasks.ElasticsearchException;
+//import org.elasticsearch.client.tasks.ElasticsearchException;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -57,17 +57,17 @@ public interface NovelService {
 //    String getChapterContent(Long chapterId);
 //    void submitAuthorApplication(AuthorApplicationDTO dto, Long userId);
 public NovelRepository novelRepository = null; // JPA
-    public NovelSearchRepository novelSearchRepository = null; // ES
+    //public NovelSearchRepository novelSearchRepository = null; // ES
     @Transactional(propagation = Propagation.REQUIRED)
     public default void syncNovelToEs(Long novelId) {
         Novel novel = novelRepository.findById(novelId).orElseThrow();
-        novelSearchRepository.save(novel);
+        //novelSearchRepository.save(novel);
     }
 
-    @Async
-    public default void asyncIndexToEs(Novel novel) {
-        novelSearchRepository.save(novel);
-    }
+//    @Async
+//    public default void asyncIndexToEs(Novel novel) {
+//        novelSearchRepository.save(novel);
+//    }
 //    @Retryable(value = { ElasticsearchException.class }, maxAttempts = 3, backoff = @Backoff(delay = 1000))
 //    public void saveToEsWithRetry(Novel novel) {
 //        novelSearchRepository.save(novel);
@@ -75,6 +75,6 @@ public NovelRepository novelRepository = null; // JPA
     @PostConstruct
     public default void checkRepositories() {
         assert novelRepository != null : "JPA Repository未注入";
-        assert novelSearchRepository != null : "ES Repository未注入";
+        //assert novelSearchRepository != null : "ES Repository未注入";
     }
 }

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/service/impl/AuthServiceImpl.java

@@ -1,8 +1,8 @@
 package com.ruoyi.novel.service.impl;
 
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.novel.repository.jpa.UserRepository;
 import com.ruoyi.novel.service.IAuthService;
-import com.ruoyi.novel.service.UserRepository;
 import com.ruoyi.novel.utils.JwtTokenProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/service/impl/NovelSearchServiceImpl.java

@@ -1,19 +1,26 @@
 package com.ruoyi.novel.service.impl;
 
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.core.page.PageDomain;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.novel.config.TableSupport;
 import com.ruoyi.novel.domain.Novel;
 import com.ruoyi.novel.mapper.NovelMapper;
 import com.ruoyi.novel.service.NovelSearchService;
-import org.elasticsearch.index.query.QueryBuilders;
+//import org.elasticsearch.index.query.QueryBuilders;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
-import org.springframework.data.elasticsearch.core.IndexOperations;
-import org.springframework.data.elasticsearch.core.SearchHit;
-import org.springframework.data.elasticsearch.core.SearchHits;
-import org.springframework.data.elasticsearch.core.document.Document;
-import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
-import org.springframework.data.elasticsearch.core.query.*;
+import org.springframework.cache.annotation.Cacheable;
+//import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
+//import org.springframework.data.elasticsearch.core.IndexOperations;
+//import org.springframework.data.elasticsearch.core.SearchHit;
+//import org.springframework.data.elasticsearch.core.SearchHits;
+//import org.springframework.data.elasticsearch.core.document.Document;
+//import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
+//import org.springframework.data.elasticsearch.core.query.*;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
@@ -28,58 +35,93 @@ import java.util.stream.Collectors;
 public class NovelSearchServiceImpl implements NovelSearchService {
     private static final Logger logger = LoggerFactory.getLogger(NovelSearchServiceImpl.class);
 
-    @Autowired
-    private ElasticsearchRestTemplate elasticTemplate;
+//    @Autowired
+//    private ElasticsearchRestTemplate elasticTemplate;
     @Autowired
     private NovelMapper novelMapper;
 
     private static final String INDEX_NAME = "novels";
 
 //    @PostConstruct
-    public void createIndexIfNotExists() {
-        IndexOperations indexOps = elasticTemplate.indexOps(IndexCoordinates.of(INDEX_NAME));
-        if (!indexOps.exists()) {
-            // 创建索引
-            indexOps.create();
-
-            // 创建映射
-            Document mapping = indexOps.createMapping(Novel.class);
-            indexOps.putMapping(mapping);
-        }
-//        if (!elasticTemplate.indexExists(INDEX_NAME)) {
-//            elasticTemplate.createIndex(INDEX_NAME);
-//            elasticTemplate.putMapping(Novel.class);
+//    public void createIndexIfNotExists() {
+//        IndexOperations indexOps = elasticTemplate.indexOps(IndexCoordinates.of(INDEX_NAME));
+//        if (!indexOps.exists()) {
+//            // 创建索引
+//            indexOps.create();
+//
+//            // 创建映射
+//            Document mapping = indexOps.createMapping(Novel.class);
+//            indexOps.putMapping(mapping);
 //        }
+////        if (!elasticTemplate.indexExists(INDEX_NAME)) {
+////            elasticTemplate.createIndex(INDEX_NAME);
+////            elasticTemplate.putMapping(Novel.class);
+////        }
+//    }
+//    public List<Novel> searchNovels(String keyword) {
+//        // 构建查询条件
+//        NativeSearchQuery query = new NativeSearchQueryBuilder()
+//                .withQuery(QueryBuilders.multiMatchQuery(keyword, "title", "author", "description"))
+//                .build();
+//        // 执行搜索
+//        SearchHits<Novel> hits = elasticTemplate.search(query, Novel.class);
+//        return hits.stream()
+//                .map(SearchHit::getContent)
+//                .collect(Collectors.toList());
+//
+//        //return elasticTemplate.search(query, Novel.class).getContent();
+//    }
+@Cacheable(value = "novelSearch", key = "#keyword + '-' + #categoryId")
+public List<Novel> searchNovels(String keyword, Long categoryId) {
+    startPage();
+    PageDomain pageDomain = TableSupport.buildPageRequest();
+    if (pageDomain.getPageSize() > 100) {
+        pageDomain.setPageSize(100); // 限制最大分页大小
     }
-    public List<Novel> searchNovels(String keyword) {
-        // 构建查询条件
-        NativeSearchQuery query = new NativeSearchQueryBuilder()
-                .withQuery(QueryBuilders.multiMatchQuery(keyword, "title", "author", "description"))
-                .build();
-        // 执行搜索
-        SearchHits<Novel> hits = elasticTemplate.search(query, Novel.class);
-        return hits.stream()
-                .map(SearchHit::getContent)
-                .collect(Collectors.toList());
+    Novel novel = new Novel();
 
-        //return elasticTemplate.search(query, Novel.class).getContent();
+    // 设置分类过滤
+    if (categoryId != null && categoryId > 0) {
+        novel.setCategoryId(categoryId);
     }
+    // 执行搜索
+    List<Novel> list = novelMapper.selectNovelList(novel, keyword);
+    return (List<Novel>) getDataTable(list);
+
+}
 
-    @Override
-    public void indexNovel(Novel novel) {
-        IndexQuery indexQuery = new IndexQueryBuilder()
-                .withId(novel.getId().toString())
-                .withObject(novel)
-                .build();
-        elasticTemplate.index(indexQuery, IndexCoordinates.of(INDEX_NAME));
+    protected void startPage() {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
+            String orderBy = pageDomain.getOrderBy();
+            PageUtils.startPage(pageNum, pageSize, orderBy);
+        }
     }
-    @Override
-    public void updateNovelIndex(Novel novel) {
-        UpdateQuery updateQuery = UpdateQuery.builder(novel.getId().toString())
-                .withDocument(Document.from(convertNovelToMap(novel)))
-                .build();
-        elasticTemplate.update(updateQuery, IndexCoordinates.of(INDEX_NAME));
+    protected TableDataInfo getDataTable(List<?> list) {
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setMsg("查询成功");
+        rspData.setRows(list);
+        rspData.setTotal(PageUtils.getLocalPage().getTotal());
+        return rspData;
     }
+//    @Override
+//    public void indexNovel(Novel novel) {
+//        IndexQuery indexQuery = new IndexQueryBuilder()
+//                .withId(novel.getId().toString())
+//                .withObject(novel)
+//                .build();
+//        elasticTemplate.index(indexQuery, IndexCoordinates.of(INDEX_NAME));
+//    }
+//    @Override
+//    public void updateNovelIndex(Novel novel) {
+//        UpdateQuery updateQuery = UpdateQuery.builder(novel.getId().toString())
+//                .withDocument(Document.from(convertNovelToMap(novel)))
+//                .build();
+//        elasticTemplate.update(updateQuery, IndexCoordinates.of(INDEX_NAME));
+//    }
     private Map<String, Object> convertNovelToMap(Novel novel) {
         Map<String, Object> map = new HashMap<>();
         map.put("title", novel.getTitle());
@@ -89,15 +131,16 @@ public class NovelSearchServiceImpl implements NovelSearchService {
         map.put("status", novel.getStatus());
         return map;
     }
-    @Override
-    public void deleteNovelIndex(Long id) {
-        elasticTemplate.delete(id.toString(), IndexCoordinates.of(INDEX_NAME));
-    }
+
+//    @Override
+//    public void deleteNovelIndex(Long id) {
+//        elasticTemplate.delete(id.toString(), IndexCoordinates.of(INDEX_NAME));
+//    }
     // 定时同步数据库数据到ES
-    @Scheduled(fixedRate = 3600000) // 每小时同步一次
-    public void syncDataToEs() {
-        List<Novel> novels = novelMapper.selectList(null);
-        novels.forEach(this::indexNovel);
-        logger.info("同步 {} 条小说数据到ES", novels.size());
-    }
+//    @Scheduled(fixedRate = 3600000) // 每小时同步一次
+//    public void syncDataToEs() {
+//        List<Novel> novels = novelMapper.selectList(null);
+//        novels.forEach(this::indexNovel);
+//        logger.info("同步 {} 条小说数据到ES", novels.size());
+//    }
 }

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/service/impl/NovelServiceImpl.java

@@ -275,7 +275,7 @@ public class NovelServiceImpl implements NovelService {
             novel.setCategoryId(categoryId);
         }
 
-        List<Novel> list = novelMapper.selectNovelList(novel);
+        List<Novel> list = novelMapper.selectNovelList(novel,null);
         return (List<Novel>) getDataTable(list);
     }
 
@@ -341,7 +341,7 @@ public class NovelServiceImpl implements NovelService {
     }
     @Override
     public List<Novel> selectNovelList(Novel novel) {
-        return novelMapper.selectNovelList(novel);
+        return novelMapper.selectNovelList(novel,null);
     }
 
     @Override

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/utils/JwtTokenProvider.java

@@ -1,9 +1,10 @@
 package com.ruoyi.novel.utils;
 
+import com.ruoyi.common.core.domain.entity.SysUser;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
-import org.elasticsearch.client.security.user.User;
+//import org.elasticsearch.client.security.user.User;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -19,12 +20,12 @@ public class JwtTokenProvider {
     @Value("${app.jwt.expiration}")
     private int jwtExpirationInMs;
 
-    public String generateToken(User user) {
+    public String generateToken(SysUser user) {
         Date now = new Date();
         Date expiryDate = new Date(now.getTime() + jwtExpirationInMs);
 
         return Jwts.builder()
-                .setSubject(user.getUsername())
+                .setSubject(user.getUserName())
                 .setIssuedAt(now)
                 .setExpiration(expiryDate)
                 .signWith(SignatureAlgorithm.HS512, jwtSecret)

RuoYi-Vue/ruoyi-system/src/main/resources/mapper/novel/NovelMapper.xml

@@ -32,8 +32,21 @@
         <include refid="selectNovelVo"/>
         <where>
             <if test="title != null and title != ''"> AND title LIKE CONCAT('%', #{title}, '%')</if>
-            <if test="authorName != null and authorName != ''"> AND author_name LIKE CONCAT('%', #{authorName}, '%')</if>
             <if test="categoryId != null"> AND category_id = #{categoryId}</if>
+            <if test="keyword != null and keyword != ''">
+                <!-- 普通模式 -->
+                <!-- AND (
+                    title LIKE CONCAT('%', #{keyword}, '%')
+                    OR author LIKE CONCAT('%', #{keyword}, '%')
+                    OR description LIKE CONCAT('%', #{keyword}, '%')
+                ) -->
+
+                <!-- 全文索引模式 -->
+                AND MATCH(title, author, description) AGAINST (#{keyword} IN BOOLEAN MODE)
+            </if>
+            <if test="authorName != null and authorName != ''"> AND author_name LIKE CONCAT('%', #{authorName}, '%')</if>
+            <if test="description != null and description != ''"> AND description LIKE CONCAT('%', #{description}, '%')</if>
+
             <if test="status != null and status != ''"> AND status = #{status}</if>
         </where>
         ORDER BY update_time DESC