From c686c9562327ad83ff33fe270b8b20553e6cc4a4 Mon Sep 17 00:00:00 2001 From: qqkj Date: Thu, 25 Mar 2021 11:28:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E5=9D=97=E6=97=B6?= =?UTF-8?q?=E5=BF=85=E9=A1=BB=E9=80=89=E4=B8=AD=E9=98=B6=E6=AE=B5=E8=AE=A1?= =?UTF-8?q?=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xm/WebSecurityConfig.java | 12 ++++-------- .../main/java/com/xm/core/service/XmTaskService.java | 9 ++++++++- xm-core/src/test/java/com/xm/WebSecurityConfig.java | 9 ++++----- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/xm-bootstrap/src/main/java/com/xm/WebSecurityConfig.java b/xm-bootstrap/src/main/java/com/xm/WebSecurityConfig.java index d6245595..95cbc651 100644 --- a/xm-bootstrap/src/main/java/com/xm/WebSecurityConfig.java +++ b/xm-bootstrap/src/main/java/com/xm/WebSecurityConfig.java @@ -2,13 +2,11 @@ package com.xm; import com.mdp.oauth2.client.resource.MdpJwtAuthenticationConverter; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.oauth2.jwt.NimbusJwtDecoder; -import org.springframework.web.client.RestOperations; +import org.springframework.security.oauth2.jwt.JwtDecoder; /** * com.qqkj.WebSecurityConfig @@ -23,11 +21,9 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { @Autowired MdpJwtAuthenticationConverter jwtConverter; - @Autowired - RestOperations restOperations; - @Value("${spring.security.oauth2.resourceserver.jwt.jwk-set-uri:}") - String jwkSetUri=""; + @Autowired + JwtDecoder jwtDecoder; @Override public void configure(WebSecurity web) throws Exception { @@ -45,7 +41,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { http.oauth2Client().and().logout().disable(); http.formLogin().usernameParameter("userloginid"); http.oauth2Login(); - http.oauth2ResourceServer().jwt().decoder(NimbusJwtDecoder.withJwkSetUri(jwkSetUri).restOperations(restOperations).build()).jwtAuthenticationConverter(jwtConverter); + http.oauth2ResourceServer().jwt().decoder(jwtDecoder).jwtAuthenticationConverter(jwtConverter); http.csrf().disable(); } diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java index 55c1c097..4643078a 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java @@ -63,8 +63,15 @@ public class XmTaskService extends BaseService { */ public Tips judgetBudget(String projectPhaseId,BigDecimal addTaskBudgetCost,BigDecimal addTaskBudgetInnerUserAt,BigDecimal addTaskBudgetOutUserAt,BigDecimal addTaskBudgetNouserAt,List excludeTaskIds){ Tips tips=new Tips("检查预算成功"); + if(!StringUtils.hasText(projectPhaseId)){ + tips.setFailureMsg("projectPhaseId参数不能为空"); + return tips; + } Map g=this.selectTotalPhaseAndTaskBudgetCost(projectPhaseId,excludeTaskIds); - BigDecimal phaseBudgetCost=BigDecimal.ZERO; + if(g==null || g.isEmpty()){ + return tips; + } + BigDecimal phaseBudgetCost=BigDecimal.ZERO; BigDecimal zero=BigDecimal.ZERO; if(addTaskBudgetCost==null) { diff --git a/xm-core/src/test/java/com/xm/WebSecurityConfig.java b/xm-core/src/test/java/com/xm/WebSecurityConfig.java index d6245595..301efcb1 100644 --- a/xm-core/src/test/java/com/xm/WebSecurityConfig.java +++ b/xm-core/src/test/java/com/xm/WebSecurityConfig.java @@ -7,6 +7,7 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.security.oauth2.jwt.NimbusJwtDecoder; import org.springframework.web.client.RestOperations; @@ -23,11 +24,9 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { @Autowired MdpJwtAuthenticationConverter jwtConverter; - @Autowired - RestOperations restOperations; - @Value("${spring.security.oauth2.resourceserver.jwt.jwk-set-uri:}") - String jwkSetUri=""; + @Autowired + JwtDecoder jwtDecoder; @Override public void configure(WebSecurity web) throws Exception { @@ -45,7 +44,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { http.oauth2Client().and().logout().disable(); http.formLogin().usernameParameter("userloginid"); http.oauth2Login(); - http.oauth2ResourceServer().jwt().decoder(NimbusJwtDecoder.withJwkSetUri(jwkSetUri).restOperations(restOperations).build()).jwtAuthenticationConverter(jwtConverter); + http.oauth2ResourceServer().jwt().decoder(jwtDecoder).jwtAuthenticationConverter(jwtConverter); http.csrf().disable(); }