tj

RuoYi-App/App.vue

@@ -1,19 +1,8 @@
 <template>
   <view class="app-container">
     <router-view />
-    <!-- 若依风格自定义菜单 -->
-    <view v-if="showMenu" class="ruoyi-tabbar">
-      <view 
-        v-for="(item, index) in menuItems" 
-        :key="index"
-        class="tab-item"
-        :class="{ active: activeIndex === index }"
-        @click="switchTab(item, index)"
-      >
-        <image class="icon" :src="activeIndex === index ? item.activeIcon : item.icon" />
-        <text class="text">{{ item.text }}</text>
-      </view>
-    </view>
+    <!-- 使用自定义TabBar组件 -->
+    <CustomTabbar v-if="showTabBar" />
   </view>
 </template>
 
@@ -26,60 +15,39 @@ export default {
   components: { CustomTabbar },
   data() {
     return {
-      activeIndex: 0,
-      showMenu: true,
-      menuItems: [
-        {
-          path: '/pages/index/index',
-          icon: '/static/tabbar/home.png',
-          activeIcon: '/static/tabbar/home_selected.png',
-          text: '首页'
-        },
-        {
-          path: '/pages/novel/list',
-          icon: '/static/tabbar/novel.png',
-          activeIcon: '/static/tabbar/novel_selected.png',
-          text: '小说'
-        },
-        {
-          path: '/pages/bookshelf/index',
-          icon: '/static/tabbar/bookshelf.png',
-          activeIcon: '/static/tabbar/bookshelf_selected.png',
-          text: '书架'
-        },
-        {
-          path: '/pages/me/index',
-          icon: '/static/tabbar/mine.png',
-          activeIcon: '/static/tabbar/mine_selected.png',
-          text: '我的'
-        }
+      showTabBar: false, // 默认不显示
+      tabBarPages: [
+        '/pages/index/index',
+        '/pages/novel/list',
+        '/pages/bookshelf/index',
+        '/pages/me/index'
       ]
     }
   },
   watch: {
     '$route.path': {
       immediate: true,
-      handler(path) {
-        // 确定当前激活的菜单项
-        this.activeIndex = this.menuItems.findIndex(item => 
-          path.startsWith(item.path)
+      handler(newPath) {
+        // 检查当前页面是否需要显示菜单
+        this.showTabBar = this.tabBarPages.some(path => 
+          newPath.includes(path)
         );
         
-        // 决定是否显示菜单
-        this.showMenu = this.activeIndex !== -1;
+        // 特殊处理：在小说阅读页面也显示菜单
+        if (newPath.includes('/pages/novel/read')) {
+          this.showTabBar = true;
+        }
+        
+        // 强制更新CustomTabbar组件
+        this.$nextTick(() => {
+          if (this.$refs.customTabbar) {
+            this.$refs.customTabbar.updateSelectedIndex();
+          }
+        });
       }
     }
   },
-  methods: {
-    switchTab(item, index) {
-      if (this.activeIndex === index) return;
-      
-      this.activeIndex = index;
-      uni.switchTab({
-        url: item.path
-      });
-    }
-  },
+
   onLaunch() {
     // 初始化主题
     this.initTheme()
@@ -89,13 +57,17 @@ export default {
     
     // 初始化 store 状态
     this.initStoreState()
-    // 检查登录状态
-    //this.checkLogin()
-      console.log('App launched, store:', this.$store)
-
-
+    console.log('App launched, store:', this.$store)
   },
   onShow() {
+    // 初始检查路由
+    this.$nextTick(() => {
+      const currentPath = this.$route.path;
+      this.showTabBar = this.tabBarPages.some(path => 
+        currentPath.includes(path)
+      );
+    });
+    
     // 检查云端阅读进度
     if (this.$store.getters.token) {
       this.syncReadingProgress()
@@ -212,49 +184,31 @@ export default {
         })
       }
     }
-  }
+  },
+    mounted() {
+      this.checkInitialRoute();
+    }
 }
 </script>
 
 <style lang="scss">
 /* 确保自定义TabBar有足够的空间 */
 .app-container {
-  padding-bottom: 100rpx;
+  padding-bottom: 120rpx !important; /* 增加底部空间 */
 }
-.ruoyi-tabbar {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  display: flex;
-  height: 100rpx;
-  background-color: #fff;
-  box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1);
-  z-index: 9999;
-  border-top: 1rpx solid #eee;
-  
-  .tab-item {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    
-    .icon {
-      width: 44rpx;
-      height: 44rpx;
-      margin-bottom: 6rpx;
-    }
-    
-    .text {
-      font-size: 22rpx;
-      color: #666;
-    }
-        .active .text {
-          color: #3a8ee6; /* 若依主题蓝色 */
-          font-weight: 500;
-        }  
-	}
+
+/* 确保菜单不被其他元素覆盖 */
+.custom-tabbar {
+  z-index: 99999 !important;
+  position: fixed !important;
+  bottom: 0 !important;
+  left: 0 !important;
+  right: 0 !important;
+}
+
+/* 修复页面内容被遮挡的问题 */
+.page-content {
+  padding-bottom: 140rpx !important;
 }
 /* 确保tabbar显示 */
 uni-tabbar {

RuoYi-App/components/custom-tabbar/index.vue

@@ -49,7 +49,7 @@ export default {
       ]
     }
   },
-  created() {
+  mounted() {
     this.updateSelectedIndex();
   },
   methods: {
@@ -61,6 +61,7 @@ export default {
         url: item.pagePath
       });
     },
+    // 添加 ref 引用以便外部调用
     updateSelectedIndex() {
       const pages = getCurrentPages();
       if (!pages.length) return;
@@ -69,7 +70,7 @@ export default {
       const currentRoute = currentPage.route;
       
       const index = this.list.findIndex(item => 
-        item.pagePath.includes(currentRoute)
+        currentRoute.includes(item.pagePath.replace('/pages/', '').replace('/index', ''))
       );
       
       if (index !== -1) {
@@ -87,10 +88,10 @@ export default {
   left: 0;
   right: 0;
   display: flex;
-  height: 100rpx;
+  height: 120rpx; /* 增加高度 */
   background-color: #ffffff;
-  box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1);
-  z-index: 9999;
+  box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.1); /* 增强阴影 */
+  z-index: 99999;
 }
 
 .custom-tabbar-item {
@@ -99,21 +100,23 @@ export default {
   flex-direction: column;
   align-items: center;
   justify-content: center;
+  padding: 10rpx 0;
 }
 
 .custom-tabbar-icon {
-  width: 48rpx;
-  height: 48rpx;
-  margin-bottom: 6rpx;
+  width: 52rpx;
+  height: 52rpx;
+  margin-bottom: 8rpx;
 }
 
 .custom-tabbar-text {
-  font-size: 24rpx;
+  font-size: 26rpx;
   color: #7a7e83;
 }
 
 .custom-tabbar-item-active .custom-tabbar-text {
-  color: #3cc51f;
+  color: #3a8ee6; /* 使用若依主题蓝色 */
   font-weight: bold;
+  font-size: 28rpx;
 }
 </style>

RuoYi-Vue/ruoyi-system/pom.xml

@@ -96,6 +96,10 @@
             <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/JwtAuthenticationTokenFilter.java

@@ -0,0 +1,38 @@
+package com.ruoyi.novel.config;
+
+
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@Component
+public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
+
+    @Autowired
+    private TokenProvider tokenService;
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
+            throws ServletException, IOException {
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication())) {
+            tokenService.verifyToken(loginUser);
+            UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities());
+            authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+            SecurityContextHolder.getContext().setAuthentication(authenticationToken);
+        }
+        chain.doFilter(request, response);
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.ruoyi.novel.config;
+
+
+import org.springframework.security.config.annotation.SecurityConfigurerAdapter;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.web.DefaultSecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+
+public class JwtConfigurer extends SecurityConfigurerAdapter<DefaultSecurityFilterChain, HttpSecurity> {
+
+    private final TokenProvider tokenProvider;
+
+    public JwtConfigurer(TokenProvider tokenProvider) {
+        this.tokenProvider = tokenProvider;
+    }
+
+    @Override
+    public void configure(HttpSecurity http) {
+        JwtFilter customFilter = new JwtFilter(tokenProvider);
+        http.addFilterBefore(customFilter, UsernamePasswordAuthenticationFilter.class);
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.ruoyi.novel.config;
+
+// 新增 JwtFilter.java
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.filter.OncePerRequestFilter;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class JwtFilter extends OncePerRequestFilter {
+    private final TokenProvider tokenProvider;
+
+    public JwtFilter(TokenProvider tokenProvider) {
+        this.tokenProvider = tokenProvider;
+    }
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request,
+                                    HttpServletResponse response,
+                                    FilterChain filterChain)
+            throws ServletException, IOException {
+
+        String token = resolveToken(request);
+        if (token != null && tokenProvider.validateToken(token)) {
+            SecurityContextHolder.getContext().setAuthentication(
+                    tokenProvider.getAuthentication(token)
+            );
+        }
+        filterChain.doFilter(request, response);
+    }
+
+    private String resolveToken(HttpServletRequest request) {
+        // 从Header提取Token的逻辑
+    }
+}

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

@@ -1,6 +1,9 @@
 package com.ruoyi.novel.config;
 
-import com.ruoyi.novel.utils.JwtTokenProvider;
+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;
@@ -13,8 +16,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.web.filter.CorsFilter;
 
 @Configuration
@@ -23,14 +25,23 @@ import org.springframework.web.filter.CorsFilter;
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Autowired
-    private JwtTokenProvider tokenProvider;
+    private CustomUserDetailsService customUserDetailsService;
 
     @Autowired
-    private CustomUserDetailsService userDetailsService;
+    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(userDetailsService).passwordEncoder(passwordEncoder());
+        auth.userDetailsService(customUserDetailsService).passwordEncoder(passwordEncoder());
     }
 
     @Bean
@@ -51,24 +62,26 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 .csrf().disable()
                 .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
                 .and()
+                .exceptionHandling().authenticationEntryPoint(unauthorizedHandler)
+                .and()
                 .authorizeRequests()
                 .antMatchers("/api/auth/**").permitAll()
-                .antMatchers("/api/novel/**").permitAll() // 公开访问小说数据
-                .antMatchers("/admin/**").hasRole("ADMIN") // 管理员权限
+                //.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 CorsFilter corsFilter() {
-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        CorsConfiguration config = new CorsConfiguration();
-        config.setAllowCredentials(true);
-        config.addAllowedOrigin("*");
-        config.addAllowedHeader("*");
-        config.addAllowedMethod("*");
-        source.registerCorsConfiguration("/**", config);
-        return new CorsFilter(source);
+    public JwtAuthenticationTokenFilter authenticationTokenFilter() {
+        return new JwtAuthenticationTokenFilter();
     }
 }

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

@@ -0,0 +1,129 @@
+package com.ruoyi.novel.config;
+
+import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import io.jsonwebtoken.Claims;
+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.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+@Component
+public class TokenProvider {
+    // 令牌秘钥
+    @Value("${token.secret}")
+    private String secret;
+
+    // 令牌有效期（默认30分钟）
+    @Value("${token.expireTime}")
+    private int expireTime;
+    // 令牌自定义标识
+    @Value("${token.header}")
+    private String header;
+    protected static final long MILLIS_SECOND = 1000;
+    protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND;
+    private static final Long MILLIS_MINUTE_TEN = 20 * 60 * 1000L;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    /**
+     * 获取用户身份信息
+     */
+    public LoginUser getLoginUser(HttpServletRequest request) {
+        // 获取请求携带的令牌
+        String token = getToken(request);
+        if (StringUtils.isNotEmpty(token)) {
+            Claims claims = parseToken(token);
+            // 解析对应的权限以及用户信息
+            String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
+            String userKey = getTokenKey(uuid);
+            return redisCache.getCacheObject(userKey);
+        }
+        return null;
+    }
+    private String getToken(HttpServletRequest request)
+    {
+        String token = request.getHeader(header);
+        if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX))
+        {
+            token = token.replace(Constants.TOKEN_PREFIX, "");
+        }
+        return token;
+    }
+    /**
+     * 创建令牌
+     */
+    public String createToken(LoginUser loginUser) {
+        String token = loginUser.getToken();
+        if (StringUtils.isEmpty(token)) {
+            token = IdUtils.fastUUID();
+            loginUser.setToken(token);
+
+//            token = StringUtils.uuid();
+//            loginUser.setToken(token);
+            refreshToken(loginUser);
+        }
+
+        Map<String, Object> claims = new HashMap<>();
+        claims.put(Constants.LOGIN_USER_KEY, token);
+        return createToken(claims);
+    }
+
+    /**
+     * 验证令牌有效期，相差不足20分钟，自动刷新缓存
+     */
+    public void verifyToken(LoginUser loginUser) {
+        long expireTime = loginUser.getExpireTime();
+        long currentTime = System.currentTimeMillis();
+        if (expireTime - currentTime <= MILLIS_MINUTE_TEN) {
+            refreshToken(loginUser);
+        }
+    }
+
+    /**
+     * 刷新令牌有效期
+     */
+    public void refreshToken(LoginUser loginUser) {
+        loginUser.setLoginTime(System.currentTimeMillis());
+        loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
+        // 根据uuid将loginUser缓存
+        String userKey = getTokenKey(loginUser.getToken());
+        redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
+    }
+
+    /**
+     * 从数据声明生成令牌
+     */
+    private String createToken(Map<String, Object> claims) {
+        return Jwts.builder()
+                .setClaims(claims)
+                .signWith(SignatureAlgorithm.HS512, secret)
+                .compact();
+    }
+
+    /**
+     * 从令牌中获取数据声明
+     */
+    private Claims parseToken(String token) {
+        return Jwts.parser()
+                .setSigningKey(secret)
+                .parseClaimsJws(token)
+                .getBody();
+    }
+
+    private String getTokenKey(String uuid) {
+        return CacheConstants.LOGIN_TOKEN_KEY + uuid;
+    }
+}

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

@@ -11,8 +11,10 @@ import com.ruoyi.common.core.page.TableSupport;
 import com.ruoyi.novel.domain.AuthorApplicationDTO;
 import com.ruoyi.novel.domain.Novel;
 import com.ruoyi.novel.mapper.NovelMapper;
+import com.ruoyi.novel.service.IAuthService;
 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.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -25,21 +27,31 @@ import java.util.Map;
 @RequestMapping("/api/novel")
 public class NovelController extends BaseController {
 
+
     @Autowired
-    private NovelService novelService;
+    private final NovelService novelService;
 
     @Autowired
-    private IAuthService authService;
+    private final IAuthService authService;
     @Autowired
     private NovelSearchService searchService;
     @Autowired
     private NovelMapper novelMapper;
+    // 构造函数注入
+    public NovelController(NovelService novelService, IAuthService authService) {
+        this.novelService = novelService;
+        this.authService = authService;
+    }
+    // 添加所有缺失方法
+    @GetMapping("/categories")
+    public List<Category> getAllCategories() {
+        return novelService.getAllCategories();
+    }
+    @GetMapping("/hot")
+    public List<Novel> getHotNovels() {
+        return novelService.getHotNovels();
+    }
 
-    // 获取小说分类
-//    @GetMapping("/novel/categories")
-//    public ResponseEntity<?> getCategories() {
-//        return ResponseEntity.ok(novelService.getAllCategories());
-//    }
     // 获取分类列表
     @GetMapping("/categories")
     public AjaxResult getCategories() {
@@ -51,11 +63,6 @@ public class NovelController extends BaseController {
 //    }
     // 获取热门小说
 // 获取热门小说
-@GetMapping("/hot")
-public TableDataInfo getHotNovels() {
-    List<Novel> list = novelService.getHotNovels();
-    return getDataTable(list);
-}
 //    @GetMapping("/novel/hot")
 //    public ResponseEntity<?> getHotNovels() {
 //        return ResponseEntity.ok(novelService.getHotNovels());
@@ -66,8 +73,8 @@ public TableDataInfo getHotNovels() {
 public TableDataInfo getNovelsByCategory(@RequestParam(required = false) Long categoryId) {
     return novelService.getNovelsByCategory(categoryId);
 }
-//    @GetMapping("/novel/list")
-//    public ResponseEntity<?> getNovelsByCategory(@RequestParam(required = false) Integer categoryId) {
+//    @GetMapping("/list")
+//    public ResponseEntity<?> getNovelsByCategory(@RequestParam(required = false) Long categoryId) {
 //        return ResponseEntity.ok(novelService.getNovelsByCategory(categoryId));
 //    }
     // 获取小说章节列表
@@ -102,16 +109,17 @@ public AjaxResult getChapterContent(@PathVariable Long chapterId) {
 
 
     // 提交作家申请
-    @PostMapping("/author/apply")
-    public AjaxResult applyAuthor(@RequestBody AuthorApplicationDTO dto,
-                                  @RequestHeader("Authorization") String token) {
-        try {
-            Long userId = authService.getUserIdFromToken(token);
-            novelService.submitAuthorApplication(dto, userId);
-            return AjaxResult.success("申请已提交");
-        } catch (Exception e) {
-            return AjaxResult.error(e.getMessage());
-        }
+    @PostMapping("/apply-author")
+    public ResponseEntity<?> submitAuthorApplication(
+            @RequestBody AuthorApplicationDTO dto,
+            @RequestHeader("Authorization") String token) {
+
+        // 修复token处理
+        String cleanToken = token.replace("Bearer ", "");
+        Long userId = authService.getUserIdFromToken(cleanToken);
+
+        novelService.submitAuthorApplication(dto, userId);
+        return ResponseEntity.ok().build();
     }
     @GetMapping("/list")
     public TableDataInfo list(Novel novel) {

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

@@ -1,10 +1,12 @@
 package com.ruoyi.novel.mapper;
 
 import com.ruoyi.novel.domain.AuthorApplication;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
-// AuthorApplicationMapper.java
+// AuthorApplicationMapper.java\
+@Mapper
 public interface AuthorApplicationMapper {
     AuthorApplication selectAuthorApplicationById(Long id);
     AuthorApplication selectPendingApplication(Long userId);

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

@@ -1,10 +1,12 @@
 package com.ruoyi.novel.mapper;
 
 import jdk.jfr.Category;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
 // CategoryMapper.java
+@Mapper
 public interface CategoryMapper {
     List<Category> selectCategoryList(Category category);
 }

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

@@ -1,9 +1,10 @@
 package com.ruoyi.novel.mapper;
 
 import com.ruoyi.novel.domain.Chapter;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
-
+@Mapper
 public interface ChapterMapper {
     Chapter selectChapterById(Long id);
     int insertChapter(Chapter chapter);

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

@@ -2,13 +2,14 @@ package com.ruoyi.novel.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.novel.domain.Novel;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 import java.util.Map;
-
+@Mapper
 // NovelMapper.java
 public interface NovelMapper extends BaseMapper<Novel> {
     List<Novel> selectNovelList(Novel novel);

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

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

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

@@ -0,0 +1,9 @@
+package com.ruoyi.novel.service;
+
+import com.ruoyi.common.core.domain.model.LoginUser;
+
+// IAuthService.java
+public interface IAuthService {
+    LoginUser getLoginUser(String token);
+    Long getUserIdFromToken(String token);
+}

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

@@ -1,6 +1,10 @@
 package com.ruoyi.novel.service;
 
+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 jdk.jfr.Category;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -13,4 +17,18 @@ public interface NovelService {
     int updateNovel(Novel novel);
     int deleteNovelByIds(Long[] ids);
     Novel selectNovelById(Long id);
+
+    void processNovelUpload(NovelUploadDTO dto);
+    void processChapterUpload(ChapterUploadDTO dto);
+    List<AuthorApplication> getAuthorApplications();
+    void approveAuthorApplication(Long applicationId);
+    void rejectAuthorApplication(Long applicationId);
+
+    // 添加所有缺失方法声明
+    List<Category> getAllCategories();
+    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

@@ -0,0 +1,17 @@
+package com.ruoyi.novel.service;
+
+import com.ruoyi.common.core.domain.model.LoginUser;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TokenService {
+    // 添加缺失方法
+    public LoginUser getLoginUser(String token) {
+        // 实际解析逻辑
+        return new LoginUser(parseUserId(token), parseUserDetails(token));
+    }
+
+    public Long parseUserId(String token) {
+        // 解析用户ID的实现
+    }
+}

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

@@ -1,6 +1,7 @@
 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;
@@ -8,7 +9,7 @@ import org.springframework.security.core.token.TokenService;
 import org.springframework.stereotype.Service;
 
 @Service
-public class AuthServiceImpl implements IAuthService  {
+public class AuthServiceImpl implements IAuthService {
 
     @Autowired
     private JwtTokenProvider tokenProvider;
@@ -19,24 +20,12 @@ public class AuthServiceImpl implements IAuthService  {
     private TokenService tokenService;
 
     @Override
-    public Long getUserIdFromToken(String token) {
-        // 若依标准方式获取用户ID
-        LoginUser loginUser = tokenService.getLoginUser(token);
-        if (loginUser != null && loginUser.getUser() != null) {
-            return loginUser.getUser().getUserId();
-        }
-        throw new RuntimeException("无效的Token或用户不存在");
+    public LoginUser getLoginUser(String token) {
+        return tokenService.getLoginUser(token);
     }
-    @Autowired
-    private TokenService tokenService;
 
     @Override
     public Long getUserIdFromToken(String token) {
-        // 若依标准方式获取用户ID
-        LoginUser loginUser = tokenService.getLoginUser(token);
-        if (loginUser != null && loginUser.getUser() != null) {
-            return loginUser.getUser().getUserId();
-        }
-        throw new RuntimeException("无效的Token或用户不存在");
+        return tokenService.parseUserId(token);
     }
 }

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

@@ -4,6 +4,7 @@ import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.PageDomain;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.novel.config.TableSupport;
@@ -342,5 +343,20 @@ public class NovelServiceImpl implements NovelService {
         return novelMapper.selectById(id);
     }
 
+    @Override
+    public void processNovelUpload(NovelUploadDTO dto) {
+
+    }
+
+    @Override
+    public void processChapterUpload(ChapterUploadDTO dto) {
+
+    }
+
+    @Override
+    public List<AuthorApplication> getAuthorApplications() {
+        return null;
+    }
+
     // 其他CRUD方法...
 }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.ruoyi.common.core.domain.entity.SysUser;
 
@@ -9,6 +11,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
  * 
  * @author ruoyi
  */
+@Mapper
 public interface SysUserMapper
 {
     /**