tj

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

@@ -2,14 +2,31 @@ package com.ruoyi;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 /**
  * 启动程序
  * 
  * @author ruoyi
  */
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class},
+        scanBasePackages = {
+                "com.ruoyi",
+                "com.ruoyi.novel"  // 确保包含 novel 包
+        })
+@EnableJpaRepositories(basePackages = "com.ruoyi.novel.repository.jpa")
+
+@EntityScan("com.ruoyi.novel.domain")
+@ComponentScan(basePackages = {
+        "com.ruoyi.framework",
+        "com.ruoyi.system",
+        "com.ruoyi.common",
+        "com.ruoyi.novel"
+})
 public class RuoYiApplication
 {
     public static void main(String[] args)

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

@@ -61,4 +61,23 @@ spring:
                         multi-statement-allow: true
             remove-abandoned: true
             remove-abandoned-timeout: 300  # 5分钟无操作视为泄露
-            log-abandoned: true
+            log-abandoned: true
+    jpa:
+        hibernate:
+            ddl-auto: update
+        show-sql: true
+        properties:
+            hibernate:
+                dialect: org.hibernate.dialect.MySQL8Dialect
+                format_sql: true
+
+    # Elasticsearch 配置
+    data:
+        elasticsearch:
+            client:
+                reactive:
+                    endpoints: localhost:9200
+            repositories:
+                enabled: true
+            cluster-nodes: localhost:9300  # 如果是集群模式
+            cluster-name: elasticsearch    # 集群名称

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

@@ -93,6 +93,15 @@ spring:
     uris: http://localhost:9200 # ES地址
     connection-timeout: 3000
     socket-timeout: 5000
+  jpa:
+    show-sql: true
+    hibernate:
+      ddl-auto: update
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.MySQL8Dialect
+        format_sql: true
+        use_sql_comments: true
 # PHP系统配置
 php:
   data:
@@ -186,3 +195,8 @@ xss:
 # application.yml（或 application-dev.yml）
 scheduled:
   ad-retry-interval: 30000  # 单位：毫秒，示例值30秒，按需调整
+app:
+  jwt:
+    secret: your-very-strong-secret-key-here # 至少32位随机字符串
+    expiration: 86400000 # 令牌过期时间（毫秒），默认24小时
+    header: Authorization # 请求头名称

RuoYi-Vue/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java

@@ -3,6 +3,7 @@ package com.ruoyi.framework.web.service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -25,14 +26,21 @@ public class UserDetailsServiceImpl implements UserDetailsService
 {
     private static final Logger log = LoggerFactory.getLogger(UserDetailsServiceImpl.class);
 
-    @Autowired
-    private ISysUserService userService;
-    
-    @Autowired
-    private SysPasswordService passwordService;
+    private final ISysUserService userService;
+    private final SysPasswordService passwordService;
+    private final SysPermissionService permissionService;
 
+    // 修复构造函数注入
     @Autowired
-    private SysPermissionService permissionService;
+    public UserDetailsServiceImpl(
+            ISysUserService userService,
+            SysPasswordService passwordService,
+            SysPermissionService permissionService) {
+
+        this.userService = userService;
+        this.passwordService = passwordService;
+        this.permissionService = permissionService;
+    }
 
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
@@ -59,8 +67,12 @@ public class UserDetailsServiceImpl implements UserDetailsService
         return createLoginUser(user);
     }
 
-    public UserDetails createLoginUser(SysUser user)
-    {
-        return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
+    public UserDetails createLoginUser(SysUser user) {
+        return new LoginUser(
+                user.getUserId(),
+                user.getDeptId(),
+                user,
+                permissionService.getMenuPermission(user)
+        );
     }
 }

RuoYi-Vue/ruoyi-system/pom.xml

@@ -74,10 +74,10 @@
             <artifactId>guava</artifactId>
             <version>33.4.0-jre</version> <!-- 使用较新版本 -->
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.projectlombok</groupId>-->
-<!--            <artifactId>lombok</artifactId>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>org.projectlombok</groupId>-->
+        <!--            <artifactId>lombok</artifactId>-->
+        <!--        </dependency>-->
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
@@ -85,11 +85,38 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.hibernate</groupId>-->
+<!--                    <artifactId>hibernate-core</artifactId>-->
+<!--                </exclusion>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.hibernate</groupId>-->
+<!--                    <artifactId>hibernate-entitymanager</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-data-jpa</artifactId>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>org.springframework.boot</groupId>-->
+        <!--            <artifactId>spring-boot-starter-data-jpa</artifactId>-->
+        <!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+<!--            <version>2.7.0</version> &lt;!&ndash; 根据Spring Boot版本调整 &ndash;&gt;-->
+        </dependency>
+        <!-- JPA API -->
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <!-- Spring ORM 支持 -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
@@ -114,6 +141,14 @@
             <version>0.11.5</version>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-actuator</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -0,0 +1,27 @@
+package com.ruoyi.novel.config;
+
+import org.springframework.boot.actuate.health.AbstractHealthIndicator;
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CustomHealthIndicator extends AbstractHealthIndicator implements HealthIndicator {
+    @Override
+    protected void doHealthCheck(Health.Builder builder) throws Exception {
+        // 检查逻辑（如数据库连接）
+//        boolean isHealthy = checkService();
+//        if (isHealthy) {
+//            builder.up()
+//                    .withDetail("service", "available");
+//        } else {
+//            builder.down()
+//                    .withDetail("error", "connection refused");
+//        }
+    }
+
+//    @Override
+//    public Health health() {
+//        return Health.up().withDetail("status", "active").build();
+//    }
+}

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

@@ -0,0 +1,90 @@
+//package com.ruoyi.novel.config;
+//
+//import org.elasticsearch.client.RestHighLevelClient;
+//import org.springframework.beans.factory.annotation.Qualifier;
+//import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
+//import org.springframework.boot.context.properties.ConfigurationProperties;
+//import org.springframework.boot.jdbc.DataSourceBuilder;
+//import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.Primary;
+//import org.springframework.data.elasticsearch.client.ClientConfiguration;
+//import org.springframework.data.elasticsearch.client.RestClients;
+//import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
+//import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
+//import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
+//import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
+//import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
+//import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+//import org.springframework.orm.jpa.JpaTransactionManager;
+//import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+//import org.springframework.transaction.PlatformTransactionManager;
+//
+////import javax.persistence.EntityManagerFactory;
+//import javax.sql.DataSource;
+//
+//// src/main/java/com/ruoyi/novel/config/DataSourceConfig.java
+//@Configuration
+//@EnableJpaRepositories(
+//        basePackages = "com.ruoyi.novel.repository.jpa",
+//        entityManagerFactoryRef = "jpaEntityManagerFactory",
+//        transactionManagerRef = "jpaTransactionManager"
+//)
+//@EnableElasticsearchRepositories(
+//        basePackages = "com.ruoyi.novel.repository.elastic",
+//        elasticsearchTemplateRef = "elasticsearchTemplate"
+//)
+//public class DataSourceConfig {
+//
+//    // JPA 配置
+//    /**
+//     * 主数据源配置（MySQL）
+//     */
+//    @Bean(name = "dataSource")
+//    @Primary
+//    @ConfigurationProperties(prefix = "spring.datasource")
+//    public DataSource dataSource() {
+//        return DataSourceBuilder.create().build();
+//    }
+//
+//    /**
+//     * Elasticsearch 客户端配置
+//     */
+//    @Bean
+//    public RestHighLevelClient elasticsearchClient() {
+//        // 从配置文件读取ES配置
+//        ClientConfiguration clientConfiguration = ClientConfiguration.builder()
+//                .connectedTo("localhost:9200") // ES服务器地址
+//                .withConnectTimeout(5000)       // 连接超时
+//                .withSocketTimeout(10000)        // 套接字超时
+//                .build();
+//
+//        return RestClients.create(clientConfiguration).rest();
+//    }
+//    /**
+//     * Elasticsearch 映射上下文
+//     */
+//    @Bean
+//    public SimpleElasticsearchMappingContext elasticsearchMappingContext() {
+//        return new SimpleElasticsearchMappingContext();
+//    }
+//
+//    /**
+//     * Elasticsearch 转换器
+//     */
+//    @Bean
+//    public ElasticsearchConverter elasticsearchConverter() {
+//        return new MappingElasticsearchConverter(elasticsearchMappingContext());
+//    }
+//
+//    /**
+//     * Elasticsearch 模板
+//     */
+//    @Bean(name = "elasticsearchTemplate")
+//    public ElasticsearchRestTemplate elasticsearchTemplate(
+//            @Qualifier("elasticsearchClient") RestHighLevelClient client,
+//            ElasticsearchConverter converter) {
+//        return new ElasticsearchRestTemplate(client, converter);
+//    }
+//}

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

@@ -0,0 +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);
+                }
+            }
+        };
+    }
+}

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

@@ -0,0 +1,33 @@
+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);
+        }
+    }
+}

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

@@ -0,0 +1,41 @@
+package com.ruoyi.novel.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
+
+import javax.persistence.EntityManagerFactory;
+import javax.sql.DataSource;
+import java.util.Properties;
+
+// 在 com.ruoyi.framework.config 包下
+@Configuration
+public class JpaConfig {
+
+    @Bean
+    public LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSource) {
+        LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+        em.setDataSource(dataSource);
+        em.setPackagesToScan("com.ruoyi.novel.domain"); // 实体类所在包
+
+        HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+        em.setJpaVendorAdapter(vendorAdapter);
+
+        Properties properties = new Properties();
+        properties.setProperty("hibernate.dialect", "org.hibernate.dialect.MySQL8Dialect");
+        properties.setProperty("hibernate.hbm2ddl.auto", "update");
+        em.setJpaProperties(properties);
+
+        return em;
+    }
+
+    @Bean
+    public PlatformTransactionManager transactionManager(EntityManagerFactory entityManagerFactory) {
+        JpaTransactionManager transactionManager = new JpaTransactionManager();
+        transactionManager.setEntityManagerFactory(entityManagerFactory);
+        return transactionManager;
+    }
+}

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/config/JwtAuthenticationTokenFilter.java → RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/config/NovelJwtAuthenticationTokenFilter.java

@@ -17,8 +17,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-@Component
-public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
+
+@Component("novelJwtTokenFilter") // 修改Bean名称
+public class NovelJwtAuthenticationTokenFilter  extends OncePerRequestFilter {
 
     @Autowired
     private TokenProvider tokenService;

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

@@ -23,7 +23,9 @@
 //@EnableWebSecurity
 //@EnableGlobalMethodSecurity(prePostEnabled = true)
 //public class SecurityConfig extends WebSecurityConfigurerAdapter {
-//
+//@Autowired
+//@Qualifier("novelJwtTokenFilter") // 使用新名称
+//private NovelJwtAuthenticationTokenFilter novelJwtTokenFilter;
 //    @Autowired
 //    private CustomUserDetailsService customUserDetailsService;
 //

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

@@ -43,10 +43,7 @@ public class NovelController extends BaseController {
         this.authService = authService;
     }
     // 添加所有缺失方法
-    @GetMapping("/categories")
-    public List<Category> getAllCategories() {
-        return novelService.getAllCategories();
-    }
+
     @GetMapping("/hot")
     public List<Novel> getHotNovels() {
         return novelService.getHotNovels();
@@ -73,11 +70,7 @@ public class NovelController extends BaseController {
 public TableDataInfo getNovelsByCategory(@RequestParam(required = false) Long categoryId) {
     return (TableDataInfo) novelService.getNovelsByCategory(categoryId);
 }
-//    @GetMapping("/list")
-//    public ResponseEntity<?> getNovelsByCategory(@RequestParam(required = false) Long categoryId) {
-//        return ResponseEntity.ok(novelService.getNovelsByCategory(categoryId));
-//    }
-    // 获取小说章节列表
+
 // 获取小说章节列表
 @GetMapping("/{novelId}/chapters")
 public AjaxResult getChapters(@PathVariable Long novelId) {
@@ -121,12 +114,12 @@ public AjaxResult getChapterContent(@PathVariable Long chapterId) {
         novelService.submitAuthorApplication(dto, userId);
         return ResponseEntity.ok().build();
     }
-    @GetMapping("/list")
-    public TableDataInfo list(Novel novel) {
-        startPage();
-        List<Novel> list = novelService.selectNovelList(novel);
-        return getDataTable(list);
-    }
+//    @GetMapping("/list")
+//    public TableDataInfo list(Novel novel) {
+//        startPage();
+//        List<Novel> list = novelService.selectNovelList(novel);
+//        return getDataTable(list);
+//    }
     @PostMapping("/add")
     public AjaxResult add(@RequestBody Novel novel) {
         return toAjax(novelService.insertNovel(novel));

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

@@ -10,15 +10,21 @@ import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import java.util.Date;
 
 // Novel.java
-@Data
+
+@Entity
 @TableName("novel")
 @Document(indexName = "novels")
+@Data
 public class Novel {
+    @javax.persistence.Id
     @Id
-    //@GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @TableId(type = IdType.AUTO)
     private Long id;
     @Field(type = FieldType.Text, analyzer = "ik_max_word")
@@ -42,4 +48,6 @@ public class Novel {
     private Date createTime = new Date();
     @Column(name = "update_time")
     private Date updateTime = new Date();
+
+
 }

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

@@ -0,0 +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 特定查询方法
+}

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

@@ -1,19 +1,28 @@
-package com.ruoyi.novel.service;
+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.jpa.repository.JpaRepository;
+import org.springframework.data.repository.NoRepositoryBean;
+import org.springframework.stereotype.Repository;
 
 import java.awt.print.Pageable;
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 
+@Repository
 // NovelRepository.java
+@NoRepositoryBean  // 防止被实例化
 public interface NovelRepository extends JpaRepository<Novel, Long> {
 
     @Query("SELECT n FROM Novel n WHERE n.updateTime > :since ORDER BY n.readCount DESC")
     List<Novel> findHotNovels(@Param("since") Date since, Pageable pageable);
 
     List<Novel> findByCategoryId(Integer categoryId, Pageable pageable);
+
+    Novel save(Novel novel);
+    Optional<Novel> findById(Long id);
+    List<Novel> findAll();
 }

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

@@ -0,0 +1,180 @@
+package com.ruoyi.novel.repository.jpa;
+
+import com.ruoyi.novel.domain.Novel;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Repository;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.criteria.CriteriaQuery;
+import java.awt.print.Pageable;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+@Repository
+public class NovelRepositoryImpl implements NovelRepository {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Override
+    public List<Novel> findHotNovels(Date since, Pageable pageable) {
+        return null;
+    }
+
+    @Override
+    public List<Novel> findByCategoryId(Integer categoryId, Pageable pageable) {
+        return null;
+    }
+
+    @Override
+    public Novel save(Novel novel) {
+        if (novel.getId() == null) {
+            entityManager.persist(novel);
+            return novel;
+        } else {
+            return entityManager.merge(novel);
+        }
+    }
+
+    @Override
+    public Optional<Novel> findById(Long id) {
+        return Optional.ofNullable(entityManager.find(Novel.class, id));
+    }
+
+    @Override
+    public boolean existsById(Long aLong) {
+        return false;
+    }
+
+    @Override
+    public List<Novel> findAll() {
+        CriteriaQuery<Novel> query = entityManager.getCriteriaBuilder().createQuery(Novel.class);
+        query.select(query.from(Novel.class));
+        return entityManager.createQuery(query).getResultList();
+    }
+
+    @Override
+    public List<Novel> findAll(Sort sort) {
+        return null;
+    }
+
+    @Override
+    public Page<Novel> findAll(org.springframework.data.domain.Pageable pageable) {
+        return null;
+    }
+
+    @Override
+    public List<Novel> findAllById(Iterable<Long> longs) {
+        return null;
+    }
+
+    @Override
+    public long count() {
+        return 0;
+    }
+
+    @Override
+    public void deleteById(Long aLong) {
+
+    }
+
+    @Override
+    public void delete(Novel entity) {
+
+    }
+
+    @Override
+    public void deleteAllById(Iterable<? extends Long> longs) {
+
+    }
+
+    @Override
+    public void deleteAll(Iterable<? extends Novel> entities) {
+
+    }
+
+    @Override
+    public void deleteAll() {
+
+    }
+
+    @Override
+    public <S extends Novel> List<S> saveAll(Iterable<S> entities) {
+        return null;
+    }
+
+    @Override
+    public void flush() {
+
+    }
+
+    @Override
+    public <S extends Novel> S saveAndFlush(S entity) {
+        return null;
+    }
+
+    @Override
+    public <S extends Novel> List<S> saveAllAndFlush(Iterable<S> entities) {
+        return null;
+    }
+
+    @Override
+    public void deleteAllInBatch(Iterable<Novel> entities) {
+
+    }
+
+    @Override
+    public void deleteAllByIdInBatch(Iterable<Long> longs) {
+
+    }
+
+    @Override
+    public void deleteAllInBatch() {
+
+    }
+
+    @Override
+    public Novel getOne(Long aLong) {
+        return null;
+    }
+
+    @Override
+    public Novel getById(Long aLong) {
+        return null;
+    }
+
+    @Override
+    public <S extends Novel> Optional<S> findOne(Example<S> example) {
+        return Optional.empty();
+    }
+
+    @Override
+    public <S extends Novel> List<S> findAll(Example<S> example) {
+        return null;
+    }
+
+    @Override
+    public <S extends Novel> List<S> findAll(Example<S> example, Sort sort) {
+        return null;
+    }
+
+    @Override
+    public <S extends Novel> Page<S> findAll(Example<S> example, org.springframework.data.domain.Pageable pageable) {
+        return null;
+    }
+
+    @Override
+    public <S extends Novel> long count(Example<S> example) {
+        return 0;
+    }
+
+    @Override
+    public <S extends Novel> boolean exists(Example<S> example) {
+        return false;
+    }
+
+}

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

@@ -1,9 +1,14 @@
 package com.ruoyi.novel.service;
 
 import com.ruoyi.common.core.domain.model.LoginUser;
+import org.springframework.stereotype.Service;
 
+@Service
 // IAuthService.java
 public interface IAuthService {
     LoginUser getLoginUser(String token);
     Long getUserIdFromToken(String token);
+
+    boolean authenticate(String token);
+    String generateToken(String userId);
 }

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

@@ -4,12 +4,20 @@ 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.jpa.NovelRepository;
 import jdk.jfr.Category;
+import org.elasticsearch.client.tasks.ElasticsearchException;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.PostConstruct;
 import java.util.List;
-
+@Service
+@Transactional
 public interface NovelService {
     List<Novel> selectNovelList(Novel novel);
 
@@ -33,6 +41,8 @@ public interface NovelService {
     Chapter getChapterContent(Long chapterId);
     void submitAuthorApplication(AuthorApplicationDTO dto, Long userId);
 
+    List<Novel> getAllNovels();
+
     Novel processNovelUpload(MultipartFile file, String title, Long authorId);
 
     Chapter processChapterUpload(MultipartFile file, Long novelId, Integer chapterOrder);
@@ -46,4 +56,25 @@ public interface NovelService {
 //    List<Chapter> getChaptersByNovelId(Long novelId);
 //    String getChapterContent(Long chapterId);
 //    void submitAuthorApplication(AuthorApplicationDTO dto, Long userId);
+public NovelRepository novelRepository = null; // JPA
+    public NovelSearchRepository novelSearchRepository = null; // ES
+    @Transactional(propagation = Propagation.REQUIRED)
+    public default void syncNovelToEs(Long novelId) {
+        Novel novel = novelRepository.findById(novelId).orElseThrow();
+        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);
+//    }
+    @PostConstruct
+    public default void checkRepositories() {
+        assert novelRepository != null : "JPA Repository未注入";
+        assert novelSearchRepository != null : "ES Repository未注入";
+    }
 }

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

@@ -2,11 +2,17 @@ package com.ruoyi.novel.service;
 
 import org.elasticsearch.client.security.user.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);
+    //Optional<User> findByUsername(String username);
+    // 自定义查询方法
+    User findByUsername(String username);
+    User findByEmail(String email);
+
+    User findByToken(String token);
 }

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

@@ -1,31 +1,43 @@
-//package com.ruoyi.novel.service.impl;
-//
-//import com.ruoyi.common.core.domain.model.LoginUser;
-//import com.ruoyi.novel.service.IAuthService;
-//import com.ruoyi.novel.service.TokenService;
-//import com.ruoyi.novel.service.UserRepository;
-//import com.ruoyi.novel.utils.JwtTokenProvider;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Service;
-//
-//@Service
-//public class AuthServiceImpl implements IAuthService {
-//
-//    @Autowired
-//    private JwtTokenProvider tokenProvider;
-//
-//    @Autowired
-//    private UserRepository userRepository;
+package com.ruoyi.novel.service.impl;
+
+import com.ruoyi.common.core.domain.model.LoginUser;
+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;
+
+@Service
+public class AuthServiceImpl implements IAuthService {
+
+    @Autowired
+    private JwtTokenProvider tokenProvider;
+
+    @Autowired
+    private UserRepository userRepository;
 //    @Autowired
 //    private final TokenService tokenService;
-//
-//
-//
+
+    @Autowired
+    public AuthServiceImpl(UserRepository userRepository) {
+        this.userRepository = userRepository;
+    }
+
 //    @Autowired
 //    public AuthServiceImpl(TokenService tokenService) {
 //        this.tokenService = tokenService;
 //    }
-//
+
+    @Override
+    public LoginUser getLoginUser(String token) {
+        return null;
+    }
+
+    @Override
+    public Long getUserIdFromToken(String token) {
+        return null;
+    }
+
 //    @Override
 //    public LoginUser getLoginUser(String token) {
 //        return tokenService.getLoginUser(token);
@@ -35,4 +47,16 @@
 //    public Long getUserIdFromToken(String token) {
 //        return tokenService.parseUserId(token);
 //    }
-//}
+    @Override
+    public boolean authenticate(String token) {
+        // 实际实现：验证JWT令牌
+        //return token != null && token.startsWith("valid-");
+        return userRepository.findByToken(token) != null;
+    }
+
+    @Override
+    public String generateToken(String userId) {
+        // 实际实现：生成JWT令牌
+        return "generated-token-for-" + userId;
+    }
+}

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

@@ -13,6 +13,9 @@ import com.ruoyi.novel.mapper.AuthorApplicationMapper;
 import com.ruoyi.novel.mapper.CategoryMapper;
 import com.ruoyi.novel.mapper.ChapterMapper;
 import com.ruoyi.novel.mapper.NovelMapper;
+//import com.ruoyi.novel.repository.elastic.NovelSearchRepository;
+
+import com.ruoyi.novel.repository.jpa.NovelRepository;
 import com.ruoyi.novel.service.*;
 import com.ruoyi.system.mapper.SysUserMapper;
 import jdk.jfr.Category;
@@ -32,20 +35,12 @@ import java.util.*;
 @Service
 public class NovelServiceImpl implements NovelService {
     private static final Logger logger = LoggerFactory.getLogger(NovelServiceImpl.class);
-    @Autowired
-    private NovelRepository novelRepository;
+    private final NovelRepository novelRepository; // JPA
 
-    @Autowired
-    private ChapterRepository chapterRepository;
-    @Autowired
-    private AuthorApplicationRepository authorApplicationRepository;
 
-    @Autowired
-    private CategoryRepository categoryRepository;
+    //private final NovelSearchRepository novelSearchRepository; // ES
 
     @Autowired
-    private UserRepository userRepository;
-    @Autowired
     private NovelMapper novelMapper;
     @Autowired
     private ChapterMapper chapterMapper;
@@ -58,6 +53,40 @@ public class NovelServiceImpl implements NovelService {
 
     @Autowired
     private SysUserMapper userMapper;
+
+//    @Autowired
+//    public NovelServiceImpl(
+//            NovelRepository novelRepository,
+//            NovelSearchRepository novelSearchRepository) {
+//        this.novelRepository = novelRepository;
+//        this.novelSearchRepository = novelSearchRepository;
+//    }
+    @Autowired
+    public NovelServiceImpl(
+            NovelRepository novelRepository
+            //,
+            //@Autowired(required = false) NovelSearchRepository novelSearchRepository
+    ) {
+        this.novelRepository = novelRepository;
+        //this.novelSearchRepository = novelSearchRepository;
+        //logger.info("Elasticsearch repository available: {}", novelSearchRepository != null);
+    }
+    @Override
+    public List<Novel> getAllNovels() {
+        return novelRepository.findAll();
+    }
+    public void saveNovel(Novel novel) {
+        // 保存到数据库
+        novelRepository.save(novel);
+        // 如果 Elasticsearch 可用，同步到搜索索引
+//        if (novelSearchRepository != null) {
+//            try {
+//                novelSearchRepository.save(novel);
+//            } catch (Exception e) {
+//                logger.error("Failed to index novel in Elasticsearch", e);
+//            }
+//        }
+    }
     @Override
     @Transactional
     public Novel processNovelUpload(MultipartFile file, String title, Long authorId) {

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

@@ -44,7 +44,7 @@ public interface SysUserMapper
      * @param userName 用户名
      * @return 用户对象信息
      */
-    public SysUser selectUserByUserName(String userName);
+    //public SysUser selectUserByUserName(String userName);
 
     /**
      * 通过用户ID查询用户
@@ -52,7 +52,7 @@ public interface SysUserMapper
      * @param userId 用户ID
      * @return 用户对象信息
      */
-    public SysUser selectUserById(Long userId);
+//    public SysUser selectUserById(Long userId);
 
     /**
      * 新增用户信息
@@ -130,4 +130,6 @@ public interface SysUserMapper
 
 //    SysUser selectUserById(Long userId);
 //    int updateUser(SysUser user);
+SysUser selectUserByUserName(@Param("username") String username);
+    SysUser selectUserById(@Param("userId") Long userId);
 }

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

@@ -2,12 +2,14 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.stereotype.Service;
 
 /**
  * 用户 业务层
  * 
  * @author ruoyi
  */
+@Service
 public interface ISysUserService
 {
     /**

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

@@ -554,4 +554,12 @@ public class SysUserServiceImpl implements ISysUserService
         SysUser user = userMapper.selectUserById(userId);
         return user != null && "1".equals(user.getVipStatus());
     }
+
+    @Autowired
+    public SysUserServiceImpl(SysUserMapper userMapper) {
+        this.userMapper = userMapper;
+    }
+
+
+
 }