tj

RuoYi-Vue/pom.xml

@@ -235,11 +235,12 @@
 
     <modules>
         <module>ruoyi-admin</module>
+        <module>ruoyi-common</module>
         <module>ruoyi-framework</module>
         <module>ruoyi-system</module>
         <module>ruoyi-quartz</module>
         <module>ruoyi-generator</module>
-        <module>ruoyi-common</module>
+
 <!--        <module>ruoyi-novel</module>-->
     </modules>
     <packaging>pom</packaging>

RuoYi-Vue/ruoyi-framework/pom.xml

@@ -58,6 +58,10 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-system</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
 
     </dependencies>
 

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>
@@ -86,20 +86,16 @@
             <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-data-jpa</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <version>RELEASE</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-framework</artifactId>
-        </dependency>
     </dependencies>
 
 </project>

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

@@ -2,6 +2,7 @@ package com.ruoyi.novel.config;
 
 // 新增 JwtFilter.java
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.util.StringUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
@@ -33,5 +34,10 @@ public class JwtFilter extends OncePerRequestFilter {
 
     private String resolveToken(HttpServletRequest request) {
         // 从Header提取Token的逻辑
+        String bearerToken = request.getHeader("Authorization");
+        if (StringUtils.hasText(bearerToken) && bearerToken.startsWith("Bearer ")) {
+            return bearerToken.substring(7); // 去掉 "Bearer " 前缀
+        }
+        return null;
     }
 }

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

@@ -1,87 +1,87 @@
-package com.ruoyi.novel.config;
-
-import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
-import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl;
-import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
-import com.ruoyi.novel.service.CustomUserDetailsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-import org.springframework.web.filter.CorsFilter;
-
-@Configuration
-@EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
-
-    @Autowired
-    private CustomUserDetailsService customUserDetailsService;
-
-    @Autowired
-    private TokenProvider tokenProvider;
-
-    @Autowired
-    private CorsFilter corsFilter;
-
-    @Autowired
-    private AuthenticationEntryPointImpl unauthorizedHandler;
-
-    @Autowired
-    private LogoutSuccessHandlerImpl logoutSuccessHandler;
-
-    @Override
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth.userDetailsService(customUserDetailsService).passwordEncoder(passwordEncoder());
-    }
-
-    @Bean
-    public PasswordEncoder passwordEncoder() {
-        return new BCryptPasswordEncoder();
-    }
-
-    @Bean
-    @Override
-    public AuthenticationManager authenticationManagerBean() throws Exception {
-        return super.authenticationManagerBean();
-    }
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http
-                .cors().and()
-                .csrf().disable()
-                .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                .and()
-                .exceptionHandling().authenticationEntryPoint(unauthorizedHandler)
-                .and()
-                .authorizeRequests()
-                .antMatchers("/api/auth/**").permitAll()
-                //.antrimatchers("/api/novel/**").permitAll()
-                .antMatchers("/admin/**").hasRole("ADMIN")
-                .anyRequest().authenticated()
-                .and()
-                .apply(new JwtConfigurer(tokenProvider));
-
-        http.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class);
-        http.addFilterBefore(authenticationTokenFilter(), UsernamePasswordAuthenticationFilter.class);
-
-        http.logout()
-                .logoutUrl("/api/auth/logout")
-                .logoutSuccessHandler(logoutSuccessHandler);
-    }
-
-    @Bean
-    public JwtAuthenticationTokenFilter authenticationTokenFilter() {
-        return new JwtAuthenticationTokenFilter();
-    }
-}
+//package com.ruoyi.novel.config;
+//
+//import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
+//import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl;
+//import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
+//import com.ruoyi.novel.service.CustomUserDetailsService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.security.authentication.AuthenticationManager;
+//import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+//import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+//import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+//import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+//import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+//import org.springframework.security.config.http.SessionCreationPolicy;
+//import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+//import org.springframework.security.crypto.password.PasswordEncoder;
+//import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+//import org.springframework.web.filter.CorsFilter;
+//
+//@Configuration
+//@EnableWebSecurity
+//@EnableGlobalMethodSecurity(prePostEnabled = true)
+//public class SecurityConfig extends WebSecurityConfigurerAdapter {
+//
+//    @Autowired
+//    private CustomUserDetailsService customUserDetailsService;
+//
+//    @Autowired
+//    private TokenProvider tokenProvider;
+//
+//    @Autowired
+//    private CorsFilter corsFilter;
+//
+//    @Autowired
+//    private AuthenticationEntryPointImpl unauthorizedHandler;
+//
+//    @Autowired
+//    private LogoutSuccessHandlerImpl logoutSuccessHandler;
+//
+//    @Override
+//    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+//        auth.userDetailsService(customUserDetailsService).passwordEncoder(passwordEncoder());
+//    }
+//
+//    @Bean
+//    public PasswordEncoder passwordEncoder() {
+//        return new BCryptPasswordEncoder();
+//    }
+//
+//    @Bean
+//    @Override
+//    public AuthenticationManager authenticationManagerBean() throws Exception {
+//        return super.authenticationManagerBean();
+//    }
+//
+//    @Override
+//    protected void configure(HttpSecurity http) throws Exception {
+//        http
+//                .cors().and()
+//                .csrf().disable()
+//                .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
+//                .and()
+//                .exceptionHandling().authenticationEntryPoint(unauthorizedHandler)
+//                .and()
+//                .authorizeRequests()
+//                .antMatchers("/api/auth/**").permitAll()
+//                //.antrimatchers("/api/novel/**").permitAll()
+//                .antMatchers("/admin/**").hasRole("ADMIN")
+//                .anyRequest().authenticated()
+//                .and()
+//                .apply(new JwtConfigurer(tokenProvider));
+//
+//        http.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class);
+//        http.addFilterBefore(authenticationTokenFilter(), UsernamePasswordAuthenticationFilter.class);
+//
+//        http.logout()
+//                .logoutUrl("/api/auth/logout")
+//                .logoutSuccessHandler(logoutSuccessHandler);
+//    }
+//
+//    @Bean
+//    public JwtAuthenticationTokenFilter authenticationTokenFilter() {
+//        return new JwtAuthenticationTokenFilter();
+//    }
+//}

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

@@ -12,6 +12,7 @@ import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
@@ -126,4 +127,12 @@ public class TokenProvider {
     private String getTokenKey(String uuid) {
         return CacheConstants.LOGIN_TOKEN_KEY + uuid;
     }
+
+    public boolean validateToken(String token) {
+        return true;
+    }
+
+    public Authentication getAuthentication(String token) {
+        return null;
+    }
 }

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

@@ -71,7 +71,7 @@ public class NovelController extends BaseController {
 // 按分类获取小说
 @GetMapping("/list")
 public TableDataInfo getNovelsByCategory(@RequestParam(required = false) Long categoryId) {
-    return novelService.getNovelsByCategory(categoryId);
+    return (TableDataInfo) novelService.getNovelsByCategory(categoryId);
 }
 //    @GetMapping("/list")
 //    public ResponseEntity<?> getNovelsByCategory(@RequestParam(required = false) Long categoryId) {

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

@@ -0,0 +1,4 @@
+package com.ruoyi.novel.domain;
+
+public class ChapterUploadDTO {
+}

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

@@ -0,0 +1,4 @@
+package com.ruoyi.novel.domain;
+
+public class NovelUploadDTO {
+}

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

@@ -8,5 +8,5 @@ import java.util.List;
 // CategoryMapper.java
 @Mapper
 public interface CategoryMapper {
-    List<Category> selectCategoryList(Category category);
+    List<Category> selectCategoryList();
 }

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

@@ -1,48 +1,48 @@
-package com.ruoyi.novel.service;
-
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.enums.UserStatus;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.service.SysPermissionService;
-import com.ruoyi.system.service.ISysUserService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-
-@Service
-public class CustomUserDetailsService implements UserDetailsService {
-    private static final Logger log = LoggerFactory.getLogger(CustomUserDetailsService.class);
-
-    @Autowired
-    private ISysUserService userService;
-
-    @Autowired
-    private SysPermissionService permissionService;
-
-    @Override
-    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        SysUser user = userService.selectUserByUserName(username);
-        if (StringUtils.isNull(user)) {
-            log.info("登录用户：{} 不存在.", username);
-            throw new ServiceException("登录用户：" + username + " 不存在");
-        } else if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
-            log.info("登录用户：{} 已被删除.", username);
-            throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
-        } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
-            log.info("登录用户：{} 已被停用.", username);
-            throw new ServiceException("对不起，您的账号：" + username + " 已停用");
-        }
-
-        return createLoginUser(user);
-    }
-
-    public UserDetails createLoginUser(SysUser user) {
-        return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
-    }
-}
+//package com.ruoyi.novel.service;
+//
+//import com.ruoyi.common.core.domain.entity.SysUser;
+//import com.ruoyi.common.core.domain.model.LoginUser;
+//import com.ruoyi.common.enums.UserStatus;
+//import com.ruoyi.common.exception.ServiceException;
+//import com.ruoyi.common.utils.StringUtils;
+//import com.ruoyi.framework.web.service.SysPermissionService;
+//import com.ruoyi.system.service.ISysUserService;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.core.userdetails.UserDetails;
+//import org.springframework.security.core.userdetails.UserDetailsService;
+//import org.springframework.security.core.userdetails.UsernameNotFoundException;
+//import org.springframework.stereotype.Service;
+//
+//@Service
+//public class CustomUserDetailsService implements UserDetailsService {
+//    private static final Logger log = LoggerFactory.getLogger(CustomUserDetailsService.class);
+//
+//    @Autowired
+//    private ISysUserService userService;
+//
+////    @Autowired
+////    private SysPermissionService permissionService;
+//
+//    @Override
+//    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+//        SysUser user = userService.selectUserByUserName(username);
+//        if (StringUtils.isNull(user)) {
+//            log.info("登录用户：{} 不存在.", username);
+//            throw new ServiceException("登录用户：" + username + " 不存在");
+//        } else if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
+//            log.info("登录用户：{} 已被删除.", username);
+//            throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
+//        } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
+//            log.info("登录用户：{} 已被停用.", username);
+//            throw new ServiceException("对不起，您的账号：" + username + " 已停用");
+//        }
+//
+//        return createLoginUser(user);
+//    }
+//
+////    public UserDetails createLoginUser(SysUser user) {
+////        return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
+////    }
+//}

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

@@ -6,6 +6,7 @@ import com.ruoyi.novel.domain.Chapter;
 import com.ruoyi.novel.domain.Novel;
 import jdk.jfr.Category;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -18,9 +19,9 @@ public interface NovelService {
     int deleteNovelByIds(Long[] ids);
     Novel selectNovelById(Long id);
 
-    void processNovelUpload(NovelUploadDTO dto);
-    void processChapterUpload(ChapterUploadDTO dto);
-    List<AuthorApplication> getAuthorApplications();
+//    void processNovelUpload(NovelUploadDTO dto);
+//    void processChapterUpload(ChapterUploadDTO dto);
+    List<AuthorApplication> getAuthorApplications(Integer status);
     void approveAuthorApplication(Long applicationId);
     void rejectAuthorApplication(Long applicationId);
 
@@ -29,6 +30,20 @@ public interface NovelService {
     List<Novel> getHotNovels();
     List<Novel> getNovelsByCategory(Long categoryId);
     List<Chapter> getChaptersByNovelId(Long novelId);
-    String getChapterContent(Long chapterId);
+    Chapter getChapterContent(Long chapterId);
     void submitAuthorApplication(AuthorApplicationDTO dto, Long userId);
+
+    Novel processNovelUpload(MultipartFile file, String title, Long authorId);
+
+    Chapter processChapterUpload(MultipartFile file, Long novelId, Integer chapterOrder);
+
+//    void processNovelUpload(NovelUploadDTO dto);
+//
+//    void processChapterUpload(ChapterUploadDTO dto);
+
+//    List<Novel> getHotNovels();
+//    List<Novel> getNovelsByCategory(Long categoryId);
+//    List<Chapter> getChaptersByNovelId(Long novelId);
+//    String getChapterContent(Long chapterId);
+//    void submitAuthorApplication(AuthorApplicationDTO dto, Long userId);
 }

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

@@ -1,17 +1,89 @@
 package com.ruoyi.novel.service;
 
 import com.ruoyi.common.core.domain.model.LoginUser;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.io.Decoders;
+import io.jsonwebtoken.security.Keys;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.stereotype.Service;
 
+import javax.crypto.SecretKey;
+import java.util.*;
+import java.util.stream.Collectors;
+
 @Service
 public class TokenService {
-    // 添加缺失方法
+
+    @Value("${jwt.secret}") // 从配置文件中读取密钥
+    private String secret;
+
+    @Value("${jwt.expiration}") // JWT有效期
+    private long expiration;
+
+    // 获取登录用户信息
     public LoginUser getLoginUser(String token) {
-        // 实际解析逻辑
-        return new LoginUser(parseUserId(token), parseUserDetails(token));
+        Claims claims = parseToken(token);
+        Long userId = claims.get("user_id", Long.class);
+        String username = claims.getSubject();
+
+        // 获取权限列表
+        List<String> authorities = claims.get("authorities", List.class);
+        Set<GrantedAuthority> grantedAuthorities = authorities.stream()
+                .map(SimpleGrantedAuthority::new)
+                .collect(Collectors.toSet());
+
+        return new LoginUser(userId, username, "", grantedAuthorities);
     }
 
+    // 解析用户ID
     public Long parseUserId(String token) {
-        // 解析用户ID的实现
+        Claims claims = parseToken(token);
+        return claims.get("user_id", Long.class);
+    }
+
+    // 解析JWT令牌
+    private Claims parseToken(String token) {
+        byte[] keyBytes = Decoders.BASE64.decode(secret);
+        SecretKey key = Keys.hmacShaKeyFor(keyBytes);
+
+        return Jwts.parserBuilder()
+                .setSigningKey(key)
+                .build()
+                .parseClaimsJws(token)
+                .getBody();
+    }
+
+    // 验证令牌有效期
+    public boolean validateToken(String token) {
+        try {
+            Claims claims = parseToken(token);
+            Date expirationDate = claims.getExpiration();
+            return expirationDate.after(new Date());
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    // 创建JWT令牌（如果需要）
+    public String createToken(Authentication authentication) {
+        LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+
+        byte[] keyBytes = Decoders.BASE64.decode(secret);
+        SecretKey key = Keys.hmacShaKeyFor(keyBytes);
+
+        return Jwts.builder()
+                .setSubject(loginUser.getUsername())
+                .claim("user_id", loginUser.getUserId())
+                .claim("authorities", loginUser.getAuthorities().stream()
+                        .map(GrantedAuthority::getAuthority)
+                        .collect(Collectors.toList()))
+                .setIssuedAt(new Date())
+                .setExpiration(new Date(System.currentTimeMillis() + expiration))
+                .signWith(key)
+                .compact();
     }
 }

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

@@ -16,8 +16,15 @@ public class AuthServiceImpl implements IAuthService {
 
     @Autowired
     private UserRepository userRepository;
+    //@Autowired
+    //private TokenService tokenService;
+
+    private final TokenService tokenService;
+
     @Autowired
-    private TokenService tokenService;
+    public AuthServiceImpl(TokenService tokenService) {
+        this.tokenService = tokenService;
+    }
 
     @Override
     public LoginUser getLoginUser(String token) {

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

@@ -8,10 +8,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.novel.config.TableSupport;
-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.domain.*;
 import com.ruoyi.novel.mapper.AuthorApplicationMapper;
 import com.ruoyi.novel.mapper.CategoryMapper;
 import com.ruoyi.novel.mapper.ChapterMapper;
@@ -19,11 +16,9 @@ import com.ruoyi.novel.mapper.NovelMapper;
 import com.ruoyi.novel.service.*;
 import com.ruoyi.system.mapper.SysUserMapper;
 import jdk.jfr.Category;
-import org.elasticsearch.client.security.user.User;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -31,7 +26,6 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 // NovelServiceImpl.java
@@ -230,7 +224,8 @@ public class NovelServiceImpl implements NovelService {
 
     @Override
     public List<Category> getAllCategories() {
-        return categoryMapper.selectCategoryList(new Category());
+
+        return categoryMapper.selectCategoryList();
     }
 
     @Override
@@ -242,7 +237,7 @@ public class NovelServiceImpl implements NovelService {
     }
 
     @Override
-    public TableDataInfo getNovelsByCategory(Long categoryId) {
+    public List<Novel> getNovelsByCategory(Long categoryId) {
         // 使用若依分页工具
         startPage();
 
@@ -252,7 +247,7 @@ public class NovelServiceImpl implements NovelService {
         }
 
         List<Novel> list = novelMapper.selectNovelList(novel);
-        return getDataTable(list);
+        return (List<Novel>) getDataTable(list);
     }
 
     @Override
@@ -343,20 +338,17 @@ public class NovelServiceImpl implements NovelService {
         return novelMapper.selectById(id);
     }
 
-    @Override
-    public void processNovelUpload(NovelUploadDTO dto) {
-
-    }
+//    @Override
+//    public void processNovelUpload(NovelUploadDTO dto) {
+//
+//    }
 
-    @Override
-    public void processChapterUpload(ChapterUploadDTO dto) {
+//    @Override
+//    public void processChapterUpload(ChapterUploadDTO dto) {
+//
+//    }
 
-    }
 
-    @Override
-    public List<AuthorApplication> getAuthorApplications() {
-        return null;
-    }
 
     // 其他CRUD方法...
 }