更改结构

ibzou-core/src/main/java/cn/ibizlab/core/extensions/aspect/IBZEmp2UserAspect.java → ibzou-core/src/main/java/cn/ibizlab/core/ou/extensions/aspect/IBZEmp2UserAspect.java

-package cn.ibizlab.core.extensions.aspect;
+package cn.ibizlab.core.ou.extensions.aspect;
 
-import cn.ibizlab.core.extensions.mapping.IBZEmp2UserMapping;
-import cn.ibizlab.core.extensions.service.OUModelService;
+import cn.ibizlab.core.ou.extensions.mapping.IBZEmp2UserMapping;
 import cn.ibizlab.core.ou.domain.IBZDepartment;
 import cn.ibizlab.core.ou.domain.IBZEmployee;
-import cn.ibizlab.core.ou.domain.IBZOrganization;
-import cn.ibizlab.core.ou.service.IIBZDepartmentService;
 import cn.ibizlab.core.ou.service.IIBZEmployeeService;
-import cn.ibizlab.core.ou.service.IIBZOrganizationService;
-import cn.ibizlab.util.domain.IBZUSER;
 import cn.ibizlab.util.errors.BadRequestAlertException;
 import cn.ibizlab.util.service.IBZUSERService;
 import org.aspectj.lang.JoinPoint;

ibzou-core/src/main/java/cn/ibizlab/core/extensions/aspect/OUModelRefreshAspect.java → ibzou-core/src/main/java/cn/ibizlab/core/ou/extensions/aspect/OUModelRefreshAspect.java

-package cn.ibizlab.core.extensions.aspect;
+package cn.ibizlab.core.ou.extensions.aspect;
 
-import cn.ibizlab.core.extensions.service.OUModelService;
-import cn.ibizlab.util.annotation.DEField;
-import cn.ibizlab.util.enums.DEFieldDefaultValueType;
-import cn.ibizlab.util.enums.DEPredefinedFieldType;
-import cn.ibizlab.util.helper.DEFieldCacheMap;
-import cn.ibizlab.util.security.AuthenticationUser;
+import cn.ibizlab.core.ou.extensions.service.OUModelService;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cglib.beans.BeanMap;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
-import org.springframework.util.AlternativeJdkIdGenerator;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 实体属性默认值切面，只有新建（Create）时才会填充默认值

ibzou-core/src/main/java/cn/ibizlab/core/extensions/domain/DeptMap.java → ibzou-core/src/main/java/cn/ibizlab/core/ou/extensions/domain/DeptMap.java

-package cn.ibizlab.core.extensions.domain;
+package cn.ibizlab.core.ou.extensions.domain;
 
 import cn.ibizlab.core.ou.domain.IBZDepartment;
-import cn.ibizlab.core.ou.domain.IBZOrganization;
 import lombok.Data;
 import org.springframework.util.StringUtils;
 

ibzou-core/src/main/java/cn/ibizlab/core/extensions/domain/DeptNode.java → ibzou-core/src/main/java/cn/ibizlab/core/ou/extensions/domain/DeptNode.java

-package cn.ibizlab.core.extensions.domain;
+package cn.ibizlab.core.ou.extensions.domain;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;

ibzou-core/src/main/java/cn/ibizlab/core/extensions/domain/EmpNode.java → ibzou-core/src/main/java/cn/ibizlab/core/ou/extensions/domain/EmpNode.java

-package cn.ibizlab.core.extensions.domain;
+package cn.ibizlab.core.ou.extensions.domain;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;

ibzou-core/src/main/java/cn/ibizlab/core/extensions/domain/OrgMap.java → ibzou-core/src/main/java/cn/ibizlab/core/ou/extensions/domain/OrgMap.java

-package cn.ibizlab.core.extensions.domain;
+package cn.ibizlab.core.ou.extensions.domain;
 
 import cn.ibizlab.core.ou.domain.IBZOrganization;
 import lombok.Data;

ibzou-core/src/main/java/cn/ibizlab/core/extensions/domain/OrgNode.java → ibzou-core/src/main/java/cn/ibizlab/core/ou/extensions/domain/OrgNode.java

-package cn.ibizlab.core.extensions.domain;
+package cn.ibizlab.core.ou.extensions.domain;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;

ibzou-core/src/main/java/cn/ibizlab/core/extensions/mapping/IBZDept2NodeMapping.java → ibzou-core/src/main/java/cn/ibizlab/core/ou/extensions/mapping/IBZDept2NodeMapping.java

-package cn.ibizlab.core.extensions.mapping;
+package cn.ibizlab.core.ou.extensions.mapping;
 
-import cn.ibizlab.core.extensions.domain.DeptNode;
+import cn.ibizlab.core.ou.extensions.domain.DeptNode;
 import cn.ibizlab.core.ou.domain.IBZDepartment;
 import cn.ibizlab.util.domain.MappingBase;
 import org.mapstruct.Mapper;

ibzou-core/src/main/java/cn/ibizlab/core/extensions/mapping/IBZEmp2NodeMapping.java → ibzou-core/src/main/java/cn/ibizlab/core/ou/extensions/mapping/IBZEmp2NodeMapping.java

-package cn.ibizlab.core.extensions.mapping;
+package cn.ibizlab.core.ou.extensions.mapping;
 
-import cn.ibizlab.core.extensions.domain.EmpNode;
+import cn.ibizlab.core.ou.extensions.domain.EmpNode;
 import cn.ibizlab.core.ou.domain.IBZEmployee;
 import cn.ibizlab.util.domain.MappingBase;
 import org.mapstruct.Mapper;

ibzou-core/src/main/java/cn/ibizlab/core/extensions/mapping/IBZEmp2UserMapping.java → ibzou-core/src/main/java/cn/ibizlab/core/ou/extensions/mapping/IBZEmp2UserMapping.java

-package cn.ibizlab.core.extensions.mapping;
+package cn.ibizlab.core.ou.extensions.mapping;
 
 import cn.ibizlab.core.ou.domain.IBZEmployee;
 import cn.ibizlab.util.domain.IBZUSER;
@@ -7,8 +7,6 @@ import org.mapstruct.Mapper;
 import org.mapstruct.NullValueCheckStrategy;
 import org.mapstruct.NullValuePropertyMappingStrategy;
 
-import java.util.List;
-
 @Mapper(componentModel = "spring", uses = {},
     nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
     nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)

ibzou-core/src/main/java/cn/ibizlab/core/extensions/mapping/IBZOrg2NodeMapping.java → ibzou-core/src/main/java/cn/ibizlab/core/ou/extensions/mapping/IBZOrg2NodeMapping.java

-package cn.ibizlab.core.extensions.mapping;
+package cn.ibizlab.core.ou.extensions.mapping;
 
-import cn.ibizlab.core.extensions.domain.OrgNode;
+import cn.ibizlab.core.ou.extensions.domain.OrgNode;
 import cn.ibizlab.core.ou.domain.IBZOrganization;
 import cn.ibizlab.util.domain.MappingBase;
 import org.mapstruct.Mapper;

ibzou-core/src/main/java/cn/ibizlab/core/extensions/service/IBZUSERServiceImpl.java → ibzou-core/src/main/java/cn/ibizlab/core/ou/extensions/service/IBZUSERServiceImpl.java

-package cn.ibizlab.core.extensions.service;
+package cn.ibizlab.core.ou.extensions.service;
 
 import cn.ibizlab.util.domain.IBZUSER;
-import cn.ibizlab.util.errors.BadRequestAlertException;
-import cn.ibizlab.util.helper.CachedBeanCopier;
 import cn.ibizlab.util.mapper.IBZUSERMapper;
-import cn.ibizlab.util.security.AuthenticationUser;
-import cn.ibizlab.util.service.AuthenticationUserService;
 import cn.ibizlab.util.service.IBZUSERService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.context.annotation.Primary;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
-import org.springframework.util.DigestUtils;
-import org.springframework.util.StringUtils;
 
 /**
  * 实体[IBZUSER] 服务对象接口实现

ibzou-core/src/main/java/cn/ibizlab/core/extensions/service/OUCoreService.java → ibzou-core/src/main/java/cn/ibizlab/core/ou/extensions/service/OUCoreService.java

-package cn.ibizlab.core.extensions.service;
+package cn.ibizlab.core.ou.extensions.service;
 
-import cn.ibizlab.core.extensions.domain.*;
-import cn.ibizlab.core.extensions.mapping.IBZDept2NodeMapping;
-import cn.ibizlab.core.extensions.mapping.IBZEmp2NodeMapping;
-import cn.ibizlab.core.extensions.mapping.IBZOrg2NodeMapping;
+import cn.ibizlab.core.ou.extensions.domain.*;
+import cn.ibizlab.core.ou.extensions.mapping.IBZDept2NodeMapping;
+import cn.ibizlab.core.ou.extensions.mapping.IBZEmp2NodeMapping;
+import cn.ibizlab.core.ou.extensions.mapping.IBZOrg2NodeMapping;
 import cn.ibizlab.core.ou.domain.IBZDepartment;
 import cn.ibizlab.core.ou.domain.IBZEmployee;
 import cn.ibizlab.core.ou.domain.IBZOrganization;

ibzou-core/src/main/java/cn/ibizlab/core/extensions/service/OUModelService.java → ibzou-core/src/main/java/cn/ibizlab/core/ou/extensions/service/OUModelService.java

-package cn.ibizlab.core.extensions.service;
+package cn.ibizlab.core.ou.extensions.service;
 
-import cn.ibizlab.core.extensions.domain.DeptMap;
-import cn.ibizlab.core.extensions.domain.OrgMap;
+import cn.ibizlab.core.ou.extensions.domain.DeptMap;
+import cn.ibizlab.core.ou.extensions.domain.OrgMap;
 import cn.ibizlab.core.ou.domain.IBZDepartment;
 import cn.ibizlab.core.ou.domain.IBZOrganization;
 import cn.ibizlab.core.ou.service.IIBZDepartmentService;
 import cn.ibizlab.core.ou.service.IIBZOrganizationService;
-import cn.ibizlab.util.security.AuthenticationUser;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/extensions/OUCoreResource.java

 package cn.ibizlab.api.rest.extensions;
 
-import cn.ibizlab.core.extensions.domain.*;
-import cn.ibizlab.core.extensions.service.OUCoreService;
+import cn.ibizlab.core.ou.extensions.domain.*;
+import cn.ibizlab.core.ou.extensions.service.OUCoreService;
 import cn.ibizlab.core.ou.domain.IBZEmployee;
 import cn.ibizlab.core.ou.service.IIBZEmployeeService;
 import org.springframework.beans.factory.annotation.Autowired;