提交uaa相关

ibizlab-boot-starter-data/src/main/java/cn/ibizlab/util/service/IBZUSERServiceImpl.java

@@ -24,7 +24,7 @@ import org.springframework.util.StringUtils;
  * 实体[IBZUSER] 服务对象接口实现
  */
 @Service("IBZUSERService")
-@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:IBZUAAUserService}'.equals('IBZUSERService')")
+@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:IBZUSERService}'.equals('IBZUSERService')")
 public class IBZUSERServiceImpl extends ServiceImpl<IBZUSERMapper, IBZUSER> implements IBZUSERService, AuthenticationUserService {
 
 	@Value("${ibiz.auth.pwencrymode:0}")

ibizlab-boot-starter/src/main/java/cn/ibizlab/util/service/CloudUserService.java

@@ -36,7 +36,7 @@ import java.util.*;
 
 @Slf4j
 @Service("CloudUserService")
-@ConditionalOnExpression("${ibiz.enablePermissionValid:false}||'${ibiz.auth.service:IBZUAAUserService}'.equals('CloudUserService')")
+@ConditionalOnExpression("${ibiz.enablePermissionValid:false}&&'${ibiz.auth.service:IBZUAAUserService}'.equals('CloudUserService')")
 public class CloudUserService extends IBZUAAUserService {
 
     @Autowired

ibizlab-boot-starter/src/main/java/cn/ibizlab/util/service/IBZUAAUserService.java

@@ -10,13 +10,14 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
 /**
  * 实体[IBZUSER] 服务对象接口实现
  */
 @Service("IBZUAAUserService")
-@ConditionalOnExpression("${ibiz.enablePermissionValid:false}||'${ibiz.auth.service:IBZUAAUserService}'.equals('IBZUAAUserService')")
+@ConditionalOnExpression("${ibiz.enablePermissionValid:false}&&'${ibiz.auth.service:IBZUAAUserService}'.equals('IBZUAAUserService')")
 public class IBZUAAUserService implements AuthenticationUserService{
 
 	@Autowired

ibizlab-boot-starter/src/main/java/cn/ibizlab/util/service/SimpleUserService.java

@@ -18,7 +18,7 @@ import org.springframework.stereotype.Service;
  */
 @Primary
 @Service("SimpleUserService")
-@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:IBZUAAUserService}'.equals('SimpleUserService')")
+@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:IBZUSERService}'.equals('SimpleUserService')")
 public class SimpleUserService implements AuthenticationUserService {