ibizdev提交

config.xml

@@ -38,6 +38,11 @@
 	  git clone -b master $para2 ibzwf/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzwf/
+      mvn clean package -Papi
+      cd ibzwf-provider/ibzwf-provider-api
+      mvn -Papi docker:build
+      mvn -Papi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzwf-provider-api.yaml dev --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzwf-app/ibzwf-app-web/src/main/java/cn/ibizlab/web/config/webSecurityConfig.java

@@ -20,6 +20,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.context.annotation.Profile;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 @Profile("web-prod")
 @Configuration
@@ -30,6 +31,7 @@ public class webSecurityConfig extends WebSecurityConfigurerAdapter {
     private AuthenticationEntryPoint unauthorizedHandler;
 
     @Autowired
+    @Qualifier("IBZUAAUserService")
     private AuthenticationUserService userDetailsService;
 
     /**

ibzwf-boot/src/main/java/cn/ibizlab/config/DevBootSecurityConfig.java

@@ -19,6 +19,7 @@ import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 @Configuration
 @EnableWebSecurity
@@ -29,6 +30,7 @@ public class DevBootSecurityConfig extends WebSecurityConfigurerAdapter {
     private AuthenticationEntryPoint unauthorizedHandler;
 
     @Autowired
+    @Qualifier("IBZUAAUserService")
     private AuthenticationUserService userDetailsService;
 
     /**

ibzwf-boot/src/main/resources/application-dev.yml

 server:
-  port: 8080
+  port: 40003
 

ibzwf-provider/ibzwf-provider-api/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzwf-provider-api.jar
 
-EXPOSE 8081
+EXPOSE 40003
 
 ADD ibzwf-provider-api.jar /ibzwf-provider-api.jar

ibzwf-provider/ibzwf-provider-api/src/main/docker/ibzwf-provider-api.yaml

@@ -3,9 +3,11 @@ services:
   ibzwf-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-provider-api:latest
     ports:
-      - "8081:8081"
+      - "40003:40003"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/config/apiSecurityConfig.java

@@ -20,6 +20,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.context.annotation.Profile;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 @Profile("api-prod")
 @Configuration
@@ -30,6 +31,7 @@ public class apiSecurityConfig extends WebSecurityConfigurerAdapter {
     private AuthenticationEntryPoint unauthorizedHandler;
 
     @Autowired
+    @Qualifier("IBZUAAUserService")
     private AuthenticationUserService userDetailsService;
 
     /**

ibzwf-provider/ibzwf-provider-api/src/main/resources/application-api-dev.yml

 server:
-  port: 8081
\ No newline at end of file
+  port: 40003
\ No newline at end of file

ibzwf-provider/ibzwf-provider-api/src/main/resources/application-api-prod.yml

 server:
-  port: 8081
+  port: 40003

ibzwf-util/src/main/java/cn/ibizlab/util/rest/AuthenticationController.java

@@ -14,6 +14,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 @RestController
 @RequestMapping("/")
@@ -27,6 +28,7 @@ public class AuthenticationController
     private AuthTokenUtil jwtTokenUtil;
 
     @Autowired
+    @Qualifier("IBZUAAUserService")
     private AuthenticationUserService userDetailsService;
 
     @PostMapping(value = "${ibiz.auth.path:v7/login}")

ibzwf-util/src/main/java/cn/ibizlab/util/security/AuthorizationTokenFilter.java

@@ -11,6 +11,7 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
@@ -26,7 +27,7 @@ public class AuthorizationTokenFilter extends OncePerRequestFilter {
     private final AuthTokenUtil authTokenUtil;
     private final String tokenHeader;
 
-    public AuthorizationTokenFilter(AuthenticationUserService userDetailsService, AuthTokenUtil authTokenUtil, @Value("${ibiz.jwt.header:Authorization}") String tokenHeader) {
+    public AuthorizationTokenFilter(@Qualifier("IBZUAAUserService") AuthenticationUserService userDetailsService, AuthTokenUtil authTokenUtil, @Value("${ibiz.jwt.header:Authorization}") String tokenHeader) {
         this.userDetailsService = userDetailsService;
         this.authTokenUtil = authTokenUtil;
         this.tokenHeader = tokenHeader;