bpmn

SLN/%PUBPRJ%-app/%PUBPRJ%-app-%APP_PKGPATH%/src/main/java/%SYS_PKGPATH%/%APP_PKGPATH%/config/%APP%SecurityConfig.java.ftl

@@ -23,6 +23,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("${app.getPKGCodeName()?lower_case}-prod")
 @Configuration
@@ -33,6 +34,9 @@ public class ${app.getPKGCodeName()}SecurityConfig extends WebSecurityConfigurer
     private AuthenticationEntryPoint unauthorizedHandler;
 
     @Autowired
+    <#if sys.getPSSystemSetting()?? && sys.getPSSystemSetting().getDataAccCtrlArch()?? && sys.getPSSystemSetting().getDataAccCtrlArch()==1>
+    @Qualifier("IBZUAAUserService")
+    </#if>
     private AuthenticationUserService userDetailsService;
 
     /**

SLN/%PUBPRJ%-boot/src/main/java/%SYS_PKGPATH%/config/DevBootSecurityConfig.java.ftl

@@ -22,6 +22,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
@@ -32,6 +33,9 @@ public class DevBootSecurityConfig extends WebSecurityConfigurerAdapter {
     private AuthenticationEntryPoint unauthorizedHandler;
 
     @Autowired
+    <#if sys.getPSSystemSetting()?? && sys.getPSSystemSetting().getDataAccCtrlArch()?? && sys.getPSSystemSetting().getDataAccCtrlArch()==1>
+    @Qualifier("IBZUAAUserService")
+    </#if>
     private AuthenticationUserService userDetailsService;
 
     /**

SLN/%PUBPRJ%-provider/%PUBPRJ%-provider-%SYSAPI_PKGPATH%/src/main/java/%SYS_PKGPATH%/%SYSAPI_PKGPATH%/config/%API%SecurityConfig.java.ftl

@@ -23,6 +23,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("${item.getCodeName()?lower_case}-prod")
 @Configuration
@@ -33,6 +34,9 @@ public class ${item.codeName}SecurityConfig extends WebSecurityConfigurerAdapter
     private AuthenticationEntryPoint unauthorizedHandler;
 
     @Autowired
+    <#if sys.getPSSystemSetting()?? && sys.getPSSystemSetting().getDataAccCtrlArch()?? && sys.getPSSystemSetting().getDataAccCtrlArch()==1>
+    @Qualifier("IBZUAAUserService")
+    </#if>
     private AuthenticationUserService userDetailsService;
 
     /**

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/rest/AuthenticationController.java.ftl

@@ -17,6 +17,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("/")
@@ -30,6 +31,9 @@ public class AuthenticationController
     private AuthTokenUtil jwtTokenUtil;
 
     @Autowired
+    <#if sys.getPSSystemSetting()?? && sys.getPSSystemSetting().getDataAccCtrlArch()?? && sys.getPSSystemSetting().getDataAccCtrlArch()==1>
+    @Qualifier("IBZUAAUserService")
+    </#if>
     private AuthenticationUserService userDetailsService;
 
     @PostMapping(value = ${r'"${ibiz.auth.path:v7/login}"'})

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/security/AuthorizationTokenFilter.java.ftl

@@ -14,6 +14,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;
@@ -29,7 +30,7 @@ public class AuthorizationTokenFilter extends OncePerRequestFilter {
     private final AuthTokenUtil authTokenUtil;
     private final String tokenHeader;
 
-    public AuthorizationTokenFilter(AuthenticationUserService userDetailsService, AuthTokenUtil authTokenUtil, @Value(${r'"${ibiz.jwt.header:Authorization}"'}) String tokenHeader) {
+    public AuthorizationTokenFilter(<#if sys.getPSSystemSetting()?? && sys.getPSSystemSetting().getDataAccCtrlArch()?? && sys.getPSSystemSetting().getDataAccCtrlArch()==1>@Qualifier("IBZUAAUserService")</#if> AuthenticationUserService userDetailsService, AuthTokenUtil authTokenUtil, @Value(${r'"${ibiz.jwt.header:Authorization}"'}) String tokenHeader) {
         this.userDetailsService = userDetailsService;
         this.authTokenUtil = authTokenUtil;
         this.tokenHeader = tokenHeader;