tj

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

@@ -205,4 +205,7 @@ permit-all:
     - /druid/**
     - /swagger-ui/**
     - /v3/api-docs/**
-    - /webjars/**
+    - /webjars/**
+
+cors:
+  allowed-origins: http://localhost:9090

RuoYi-Vue/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CorsConfig.java

@@ -1,19 +0,0 @@
-package com.ruoyi.framework.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-@Configuration
-public class CorsConfig implements WebMvcConfigurer {
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**")
-                // 使用 allowedOriginPatterns 替代 allowedOrigins
-                .allowedOriginPatterns("http://localhost:9090")
-                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
-                .allowedHeaders("*")
-                .allowCredentials(true)
-                .maxAge(3600);
-    }
-}

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

@@ -1,6 +1,8 @@
 package com.ruoyi.framework.config;
 
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
@@ -24,6 +26,8 @@ import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
 import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl;
 import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
 
+import java.util.List;
+
 /**
  * spring security配置
  *
@@ -60,9 +64,11 @@ public class SecurityConfig
     /**
      * 跨域过滤器
      */
-    @Autowired
-    private CorsFilter corsFilter;
-
+    //@Autowired
+    //private CorsFilter corsFilter;
+// 代码中读取配置
+    @Value("${cors.allowed-origins}")
+    private List<String> allowedOrigins;
     /**
      * 允许匿名访问的地址
      */
@@ -104,7 +110,10 @@ public class SecurityConfig
         permitAllUrl.getUrls().add("/ad/**");
         permitAllUrl.getUrls().add("/swagger-ui/**");
         permitAllUrl.getUrls().add("/v3/api-docs/**");
-
+        // 确保登录相关接口也在白名单
+        permitAllUrl.getUrls().add("/login");
+        permitAllUrl.getUrls().add("/register");
+        permitAllUrl.getUrls().add("/captchaImage");
         http
                 // 禁用CSRF
                 .csrf(csrf -> csrf.disable())
@@ -147,7 +156,8 @@ public class SecurityConfig
                 // 添加JWT过滤器
                 .addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class)
                 // 添加CORS过滤器
-                .addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class);
+                //.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class)
+                ;
 
         return http.build();
     }
@@ -155,7 +165,9 @@ public class SecurityConfig
     // CORS配置
     private CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();
-        configuration.addAllowedOrigin("*"); // 允许所有来源
+        configuration.setAllowedOriginPatterns(allowedOrigins);
+        //configuration.addAllowedOriginPattern("http://localhost:9090"); // 前端地址
+        //configuration.addAllowedOrigin("*"); // 允许所有来源
         configuration.addAllowedMethod("*"); // 允许所有方法
         configuration.addAllowedHeader("*"); // 允许所有头部
         configuration.setAllowCredentials(true); // 允许凭证

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

@@ -27,7 +27,16 @@ public class NovelAdController {
         this.iAdService = iAdService;
         this.redisTemplate = redisTemplate;
     }
-
+    // 修复广告接口
+//    @GetMapping("/position")
+//    public AjaxResult getAdByPosition(@RequestParam String code) {
+//        Ad ad = iAdService.selectAdByPositionCode(code);
+//        if (ad == null) {
+//            // 返回空对象而不是404
+//            return AjaxResult.success(new Ad());
+//        }
+//        return AjaxResult.success(ad);
+//    }
     @PostMapping("/count")
     public ResponseEntity<?> countAdView(
             @RequestBody AdCountRequest request,

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

@@ -52,7 +52,10 @@ public class NovelController extends BaseController {
 
     @GetMapping("/hot")
     public List<Novel> getHotNovels() {
-        return novelService.getHotNovels();
+        List<Novel> hotNovels = novelService.getHotNovels();
+        //return novelService.getHotNovels();
+        // 返回统一格式 { code, msg, data }
+        return (List<Novel>) AjaxResult.success(hotNovels);
     }
 
     // 获取分类列表
@@ -81,6 +84,7 @@ public class NovelController extends BaseController {
     public TableDataInfo list(Novel novel) {
         startPage();
         List<Novel> list = novelService.selectNovelOneList(novel);
+        System.out.println(list.size()+"条");
         // 关联分类名称
         list.forEach(n -> {
             NovelCategory category = (NovelCategory) novelService.getNovelsByCategory(n.getCategoryId());