Просмотр исходного кода

fix(security): 更新安全配置和异常处理

- 修复应用配置中的安全路径设置
- 添加默认环境激活配置
- 移除测试环境的默认激活设置
- 改进用户赛事信息获取的异常处理机制
- 优化项目列表排序逻辑以处理空值情况
zhou 3 месяцев назад
Родитель
Сommit
5c5cb89b79

+ 5 - 5
pom.xml

@@ -80,7 +80,10 @@
                 <monitor.username>ruoyi</monitor.username>
                 <monitor.password>123456</monitor.password>
             </properties>
-
+            <activation>
+                <!-- 默认环境 -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
         <profile>
             <id>test</id>
@@ -101,10 +104,7 @@
                 <monitor.username>ruoyi</monitor.username>
                 <monitor.password>123456</monitor.password>
             </properties>
-            <activation>
-                <!-- 默认环境 -->
-                <activeByDefault>true</activeByDefault>
-            </activation>
+
 
         </profile>
     </profiles>

+ 3 - 1
ruoyi-admin/src/main/resources/application.yml

@@ -113,8 +113,10 @@ security:
     - /*/api-docs
     - /*/api-docs/**
     - /warm-flow-ui/config
-    - /system/**
+#    - /system/**
     - /system/number/public/downloadTask/**
+    - /app/**
+    - /api/**
 
 # 多租户配置
 tenant:

+ 2 - 1
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/controller/app/UserEventController.java

@@ -48,7 +48,8 @@ public class UserEventController {
             UserEventInfoVo result = userEventService.getUserEventInfo(userId, phone);
             return R.ok(result);
         } catch (Exception e) {
-            return R.fail("获取用户赛事信息失败:" + e.getMessage());
+            throw new RuntimeException("获取用户赛事信息失败:"+e);
+//            return R.fail("获取用户赛事信息失败:" + e.getMessage());
         }
     }
 }

+ 2 - 2
ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/app/UserEventServiceImpl.java

@@ -282,8 +282,8 @@ public class UserEventServiceImpl implements IUserEventService {
             projectList.add(projectInfo);
         }
 
-        // 按项目开始时间排序
-        projectList.sort(Comparator.comparing(GameEventProjectVo::getStartTime));
+        // 按项目开始时间排序(处理null值)
+        projectList.sort(Comparator.comparing(GameEventProjectVo::getStartTime, Comparator.nullsLast(Comparator.naturalOrder())));
         result.setProjectList(projectList);
 
         return result;