导入模块时必须选中阶段计划

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();
     }
 

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<String> excludeTaskIds){
 		Tips tips=new Tips("检查预算成功");
+		if(!StringUtils.hasText(projectPhaseId)){
+			tips.setFailureMsg("projectPhaseId参数不能为空");
+			return tips;
+		}
 		Map<String,Object> 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) {

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();
     }