From 99e08554d3d16f10f1295c6be43e9a0658d30b2b Mon Sep 17 00:00:00 2001
From: jieyuu <645634619@qq.com>
Date: Sun, 29 Dec 2024 22:18:15 +0800
Subject: [PATCH] =?UTF-8?q?bugfix(server):=20=E4=BC=98=E5=8C=96=E7=A2=B3?=
 =?UTF-8?q?=E6=8E=92=E6=94=BE=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3=E5=92=8C?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 更新 InterceptorConfig 中的拦截路径
- 在 CarbonEmissionServiceImpl 中增加空值检查
---
 common/src/main/java/net/carbon/utils/JWTUtil.java          | 2 +-
 .../src/main/java/net/carbon/config/InterceptorConfig.java  | 2 +-
 .../main/java/net/carbon/service/CarbonEmissionService.java | 3 ++-
 .../net/carbon/service/impl/CarbonEmissionServiceImpl.java  | 6 ++++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/net/carbon/utils/JWTUtil.java b/common/src/main/java/net/carbon/utils/JWTUtil.java
index ac3bb15..0965adf 100644
--- a/common/src/main/java/net/carbon/utils/JWTUtil.java
+++ b/common/src/main/java/net/carbon/utils/JWTUtil.java
@@ -22,7 +22,7 @@ public class JWTUtil {
     /**
      * 加密密钥
      */
-    private static final String SECRET = "net.carbon.xyz";
+    private static final String SECRET = "net.carbon";
     /**
      * 令牌前缀
      */
diff --git a/server/src/main/java/net/carbon/config/InterceptorConfig.java b/server/src/main/java/net/carbon/config/InterceptorConfig.java
index 2c25a01..808e23a 100644
--- a/server/src/main/java/net/carbon/config/InterceptorConfig.java
+++ b/server/src/main/java/net/carbon/config/InterceptorConfig.java
@@ -15,7 +15,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
         registry
                 .addInterceptor(new LoginInterceptor())
                 //拦截的路径
-//                .addPathPatterns("/api/user/*/**", "/api/**/*/**")
+                .addPathPatterns("/api/user/*/**", "/api/carbon/*/**")
                 //放行的路径
                 .excludePathPatterns("/api/user/*/register", "/api/user/*/login");
 
diff --git a/server/src/main/java/net/carbon/service/CarbonEmissionService.java b/server/src/main/java/net/carbon/service/CarbonEmissionService.java
index 18cbf14..de251c5 100644
--- a/server/src/main/java/net/carbon/service/CarbonEmissionService.java
+++ b/server/src/main/java/net/carbon/service/CarbonEmissionService.java
@@ -2,6 +2,7 @@ package net.carbon.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import net.carbon.model.CarbonEmissionDO;
+import net.carbon.vo.CarbonTimelyAlertVO;
 import net.carbon.vo.CarbonVO;
 
 
@@ -15,7 +16,7 @@ import net.carbon.vo.CarbonVO;
  */
 public interface CarbonEmissionService extends IService<CarbonEmissionDO> {
 
-    public Object timelyAlert(String city);
+    public CarbonTimelyAlertVO timelyAlert(String city);
 
 
     CarbonVO getCarbonEmissionData(String city);
diff --git a/server/src/main/java/net/carbon/service/impl/CarbonEmissionServiceImpl.java b/server/src/main/java/net/carbon/service/impl/CarbonEmissionServiceImpl.java
index 9a76b8c..79959b0 100644
--- a/server/src/main/java/net/carbon/service/impl/CarbonEmissionServiceImpl.java
+++ b/server/src/main/java/net/carbon/service/impl/CarbonEmissionServiceImpl.java
@@ -40,6 +40,9 @@ public class CarbonEmissionServiceImpl extends ServiceImpl<CarbonEmissionMapper,
         CarbonEmissionDO carbonEmissionDO = carbonEmissionMapper.selectOne(queryWrapper);
 
         CarbonTimelyAlertVO result = new CarbonTimelyAlertVO();
+        if (carbonEmissionDO == null) {
+            return null;
+        }
         BeanUtils.copyProperties(carbonEmissionDO, result);
 
         return result;
@@ -56,6 +59,9 @@ public class CarbonEmissionServiceImpl extends ServiceImpl<CarbonEmissionMapper,
         CarbonEmissionDO carbonEmissionDO = carbonEmissionMapper.selectOne(queryWrapper);
 
         CarbonVO result = new CarbonVO();
+        if (carbonEmissionDO == null) {
+            return null;
+        }
         BeanUtils.copyProperties(carbonEmissionDO, result);
 
         return result;