diff --git a/login-app/src/main/java/ink/wgink/login/app/service/appsign/impl/AppSignServiceImpl.java b/login-app/src/main/java/ink/wgink/login/app/service/appsign/impl/AppSignServiceImpl.java index 12f2246e..e9ea8c9d 100644 --- a/login-app/src/main/java/ink/wgink/login/app/service/appsign/impl/AppSignServiceImpl.java +++ b/login-app/src/main/java/ink/wgink/login/app/service/appsign/impl/AppSignServiceImpl.java @@ -21,6 +21,7 @@ import ink.wgink.util.request.RequestUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; @@ -47,6 +48,7 @@ public class AppSignServiceImpl extends BaseAppSignService implements IAppSignSe private IAppVersionService appVersionService; @Autowired private PasswordEncoder passwordEncoder; + @Lazy @Autowired private IUserService userService; @Autowired(required = false) diff --git a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/config/OAuth2AuthorizationServerConfig.java b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/config/OAuth2AuthorizationServerConfig.java index 828faaa7..2084bc06 100644 --- a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/config/OAuth2AuthorizationServerConfig.java +++ b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/config/OAuth2AuthorizationServerConfig.java @@ -9,6 +9,7 @@ import ink.wgink.service.user.service.IUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; @@ -55,12 +56,11 @@ public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigur private IUserService userService; @Autowired private OAuth2ClientDetailsServiceImpl oAuth2ClientDetailsService; + @Lazy @Autowired private OAuth2ClientTokenServiceImpl oAuth2ClientTokenService; @Autowired private AuthenticationManager authenticationManager; - @Autowired - private PasswordEncoder passwordEncoder; @Override diff --git a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentAdjustmentServiceImpl.java b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentAdjustmentServiceImpl.java index 56985f3c..a6dc3c57 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentAdjustmentServiceImpl.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentAdjustmentServiceImpl.java @@ -14,6 +14,7 @@ import ink.wgink.service.department.service.IDepartmentAdjustmentService; import ink.wgink.service.department.service.IDepartmentUserAdjustmentService; import ink.wgink.service.user.service.IUserService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.util.HashMap; @@ -35,6 +36,7 @@ public class DepartmentAdjustmentServiceImpl extends DefaultBaseService implemen @Autowired private IDepartmentAdjustmentDao departmentAdjustmentDao; + @Lazy @Autowired private IUserService userService; @Autowired diff --git a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java index 883469f4..a78a246a 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java @@ -36,6 +36,7 @@ import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.string.WStringUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -58,6 +59,7 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart @Autowired private IDepartmentDao departmentDao; @Autowired + @Lazy private IDepartmentUserService departmentUserService; @Autowired private IDepartmentAdjustmentService departmentAdjustmentService; diff --git a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java index e6895dfb..bd9e4a8c 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java @@ -27,6 +27,7 @@ import ink.wgink.util.thread.CachedThreadPoolUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.util.*; @@ -50,6 +51,7 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe private IDepartmentService departmentService; @Autowired private IDepartmentAdjustmentService departmentAdjustmentService; + @Lazy @Autowired private IUserBaseService userBaseService; @Autowired(required = false) diff --git a/service-group/src/main/java/ink/wgink/service/group/service/impl/GroupUserServiceImpl.java b/service-group/src/main/java/ink/wgink/service/group/service/impl/GroupUserServiceImpl.java index 52489caa..23038883 100644 --- a/service-group/src/main/java/ink/wgink/service/group/service/impl/GroupUserServiceImpl.java +++ b/service-group/src/main/java/ink/wgink/service/group/service/impl/GroupUserServiceImpl.java @@ -18,6 +18,7 @@ import ink.wgink.service.group.service.IGroupUserService; import ink.wgink.util.thread.CachedThreadPoolUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -40,8 +41,10 @@ public class GroupUserServiceImpl extends DefaultBaseService implements IGroupUs @Autowired private IGroupUserDao groupUserDao; + @Lazy @Autowired private IUserBaseService userBaseService; + @Lazy @Autowired private IGroupService groupService; @Autowired(required = false) diff --git a/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionUserServiceImpl.java b/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionUserServiceImpl.java index fc4999d8..1663963f 100644 --- a/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionUserServiceImpl.java +++ b/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionUserServiceImpl.java @@ -18,6 +18,7 @@ import ink.wgink.service.position.service.IPositionUserService; import ink.wgink.util.thread.CachedThreadPoolUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -40,8 +41,10 @@ public class PositionUserServiceImpl extends DefaultBaseService implements IPosi @Autowired private IPositionUserDao positionUserDao; + @Lazy @Autowired private IUserBaseService userBaseService; + @Lazy @Autowired private IPositionService positionService; @Autowired(required = false) diff --git a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleDepartmentUserServiceImpl.java b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleDepartmentUserServiceImpl.java index 8aed30ad..da5e1350 100644 --- a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleDepartmentUserServiceImpl.java +++ b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleDepartmentUserServiceImpl.java @@ -12,7 +12,6 @@ import ink.wgink.service.department.service.IDepartmentService; import ink.wgink.service.department.service.IDepartmentUserService; import ink.wgink.service.role.service.IRoleDepartmentUserService; import ink.wgink.service.role.service.IRoleUserService; -import ink.wgink.service.user.service.IUserService; import ink.wgink.util.ArrayListUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -35,8 +34,6 @@ public class RoleDepartmentUserServiceImpl extends DefaultBaseService implements @Autowired private IRoleUserService roleUserService; @Autowired - private IUserService userService; - @Autowired private IDepartmentService departmentService; @Autowired private IDepartmentUserService departmentUserService; diff --git a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleUserServiceImpl.java b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleUserServiceImpl.java index dea9082f..b3ec3a6c 100644 --- a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleUserServiceImpl.java +++ b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleUserServiceImpl.java @@ -15,7 +15,6 @@ import ink.wgink.pojo.dtos.role.RoleUserDTO; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.pos.RolePO; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.service.department.service.IDepartmentUserService; import ink.wgink.service.role.dao.IRoleUserDao; import ink.wgink.service.role.service.IRoleService; import ink.wgink.service.role.service.IRoleUserService; @@ -23,6 +22,7 @@ import ink.wgink.service.user.pojo.pos.UserPO; import ink.wgink.util.thread.CachedThreadPoolUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.util.*; @@ -42,12 +42,12 @@ public class RoleUserServiceImpl extends DefaultBaseService implements IRoleUser @Autowired private IRoleUserDao roleUserDao; + @Lazy @Autowired private IRoleService roleService; + @Lazy @Autowired private IUserBaseService userBaseService; - @Autowired - private IDepartmentUserService departmentUserService; @Autowired(required = false) private IRoleUserSaveAfterHandler roleUserSaveAfterHandler; @Autowired(required = false)