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 { - 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