diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/FileInfoApi.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/FileInfoApi.java
similarity index 89%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/FileInfoApi.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/FileInfoApi.java
index a3436ca7a..351ca3bb4 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/FileInfoApi.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/FileInfoApi.java
@@ -1,6 +1,6 @@
-package cn.stylefeng.roses.kernel.file;
+package cn.stylefeng.roses.kernel.file.api;
 
-import cn.stylefeng.roses.kernel.file.pojo.response.SysFileInfoResponse;
+import cn.stylefeng.roses.kernel.file.api.pojo.response.SysFileInfoResponse;
 
 /**
  * 获取文件信息的api
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/FileOperatorApi.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/FileOperatorApi.java
similarity index 97%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/FileOperatorApi.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/FileOperatorApi.java
index 5d08e549e..e128b3759 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/FileOperatorApi.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/FileOperatorApi.java
@@ -1,6 +1,6 @@
-package cn.stylefeng.roses.kernel.file;
+package cn.stylefeng.roses.kernel.file.api;
 
-import cn.stylefeng.roses.kernel.file.enums.BucketAuthEnum;
+import cn.stylefeng.roses.kernel.file.api.enums.BucketAuthEnum;
 
 import java.io.InputStream;
 
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/constants/FileConstants.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/constants/FileConstants.java
similarity index 99%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/constants/FileConstants.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/constants/FileConstants.java
index 59337fd86..12a4a1eaf 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/constants/FileConstants.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/constants/FileConstants.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.file.constants;
+package cn.stylefeng.roses.kernel.file.api.constants;
 
 /**
  * 文件模块的常量
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/context/FileContext.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/context/FileContext.java
similarity index 77%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/context/FileContext.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/context/FileContext.java
index b48f0f212..db097a060 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/context/FileContext.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/context/FileContext.java
@@ -1,7 +1,7 @@
-package cn.stylefeng.roses.kernel.file.context;
+package cn.stylefeng.roses.kernel.file.api.context;
 
 import cn.hutool.extra.spring.SpringUtil;
-import cn.stylefeng.roses.kernel.file.FileOperatorApi;
+import cn.stylefeng.roses.kernel.file.api.FileOperatorApi;
 
 /**
  * 文件操作api的上下文
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/enums/BucketAuthEnum.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/enums/BucketAuthEnum.java
similarity index 92%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/enums/BucketAuthEnum.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/enums/BucketAuthEnum.java
index 5880bdefa..7b04d98dc 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/enums/BucketAuthEnum.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/enums/BucketAuthEnum.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.file.enums;
+package cn.stylefeng.roses.kernel.file.api.enums;
 
 /**
  * 桶的权限策略枚举
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/enums/FileLocationEnum.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/enums/FileLocationEnum.java
similarity index 89%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/enums/FileLocationEnum.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/enums/FileLocationEnum.java
index 76a68790e..82b809368 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/enums/FileLocationEnum.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/enums/FileLocationEnum.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.file.enums;
+package cn.stylefeng.roses.kernel.file.api.enums;
 
 import lombok.Getter;
 
@@ -37,4 +37,4 @@ public enum FileLocationEnum {
         this.code = code;
     }
 
-}
\ No newline at end of file
+}
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/enums/FileStatusEnum.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/enums/FileStatusEnum.java
similarity index 89%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/enums/FileStatusEnum.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/enums/FileStatusEnum.java
index e3e4c41ff..91e78a084 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/enums/FileStatusEnum.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/enums/FileStatusEnum.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.file.enums;
+package cn.stylefeng.roses.kernel.file.api.enums;
 
 import lombok.Getter;
 
@@ -29,4 +29,4 @@ public enum FileStatusEnum {
         this.code = code;
     }
 
-}
\ No newline at end of file
+}
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/exception/FileException.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/exception/FileException.java
similarity index 84%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/exception/FileException.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/exception/FileException.java
index aabcaf17a..735bd4030 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/exception/FileException.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/exception/FileException.java
@@ -1,7 +1,7 @@
-package cn.stylefeng.roses.kernel.file.exception;
+package cn.stylefeng.roses.kernel.file.api.exception;
 
 import cn.hutool.core.util.StrUtil;
-import cn.stylefeng.roses.kernel.file.constants.FileConstants;
+import cn.stylefeng.roses.kernel.file.api.constants.FileConstants;
 import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum;
 import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
 
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/exception/enums/FileExceptionEnum.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/exception/enums/FileExceptionEnum.java
similarity index 96%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/exception/enums/FileExceptionEnum.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/exception/enums/FileExceptionEnum.java
index 8c3b85edd..40eee2df2 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/exception/enums/FileExceptionEnum.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/exception/enums/FileExceptionEnum.java
@@ -1,6 +1,6 @@
-package cn.stylefeng.roses.kernel.file.exception.enums;
+package cn.stylefeng.roses.kernel.file.api.exception.enums;
 
-import cn.stylefeng.roses.kernel.file.constants.FileConstants;
+import cn.stylefeng.roses.kernel.file.api.constants.FileConstants;
 import cn.stylefeng.roses.kernel.rule.constants.RuleConstants;
 import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum;
 import lombok.Getter;
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/expander/FileConfigExpander.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/expander/FileConfigExpander.java
similarity index 93%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/expander/FileConfigExpander.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/expander/FileConfigExpander.java
index 2d5953585..2ca1e4e99 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/expander/FileConfigExpander.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/expander/FileConfigExpander.java
@@ -1,9 +1,9 @@
-package cn.stylefeng.roses.kernel.file.expander;
+package cn.stylefeng.roses.kernel.file.api.expander;
 
 import cn.hutool.core.util.RandomUtil;
 import cn.stylefeng.roses.kernel.config.api.context.ConfigContext;
-import cn.stylefeng.roses.kernel.file.constants.FileConstants;
-import cn.stylefeng.roses.kernel.file.pojo.props.LocalFileProperties;
+import cn.stylefeng.roses.kernel.file.api.constants.FileConstants;
+import cn.stylefeng.roses.kernel.file.api.pojo.props.LocalFileProperties;
 
 /**
  * 文件相关的配置获取
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/props/AliyunOssProperties.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/props/AliyunOssProperties.java
similarity index 90%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/props/AliyunOssProperties.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/props/AliyunOssProperties.java
index 2af60e555..6726b3d7d 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/props/AliyunOssProperties.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/props/AliyunOssProperties.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.file.pojo.props;
+package cn.stylefeng.roses.kernel.file.api.pojo.props;
 
 import lombok.Data;
 
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/props/LocalFileProperties.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/props/LocalFileProperties.java
similarity index 87%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/props/LocalFileProperties.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/props/LocalFileProperties.java
index 410ea28d3..3db4789d7 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/props/LocalFileProperties.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/props/LocalFileProperties.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.file.pojo.props;
+package cn.stylefeng.roses.kernel.file.api.pojo.props;
 
 import lombok.Data;
 
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/props/MinIoProperties.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/props/MinIoProperties.java
similarity index 88%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/props/MinIoProperties.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/props/MinIoProperties.java
index 28627ece0..f22372739 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/props/MinIoProperties.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/props/MinIoProperties.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.file.pojo.props;
+package cn.stylefeng.roses.kernel.file.api.pojo.props;
 
 import lombok.Data;
 
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/props/TenCosProperties.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/props/TenCosProperties.java
similarity index 87%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/props/TenCosProperties.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/props/TenCosProperties.java
index 6e8a87f14..0fac8ee72 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/props/TenCosProperties.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/props/TenCosProperties.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.file.pojo.props;
+package cn.stylefeng.roses.kernel.file.api.pojo.props;
 
 import lombok.Data;
 
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/request/SysFileInfoRequest.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/request/SysFileInfoRequest.java
similarity index 97%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/request/SysFileInfoRequest.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/request/SysFileInfoRequest.java
index 5114eeb7b..368890a0f 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/request/SysFileInfoRequest.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/request/SysFileInfoRequest.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.file.pojo.request;
+package cn.stylefeng.roses.kernel.file.api.pojo.request;
 
 import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
 import lombok.Data;
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoListResponse.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/response/SysFileInfoListResponse.java
similarity index 96%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoListResponse.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/response/SysFileInfoListResponse.java
index fd41ce075..d22d12f38 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoListResponse.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/response/SysFileInfoListResponse.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.file.pojo.response;
+package cn.stylefeng.roses.kernel.file.api.pojo.response;
 
 import lombok.Data;
 
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoResponse.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/response/SysFileInfoResponse.java
similarity index 96%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoResponse.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/response/SysFileInfoResponse.java
index adcafd292..b0c827934 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/pojo/response/SysFileInfoResponse.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/response/SysFileInfoResponse.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.file.pojo.response;
+package cn.stylefeng.roses.kernel.file.api.pojo.response;
 
 import lombok.Data;
 
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/util/DownloadUtil.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/util/DownloadUtil.java
similarity index 93%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/util/DownloadUtil.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/util/DownloadUtil.java
index 58151eb13..0914777c7 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/util/DownloadUtil.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/util/DownloadUtil.java
@@ -1,11 +1,11 @@
-package cn.stylefeng.roses.kernel.file.util;
+package cn.stylefeng.roses.kernel.file.api.util;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.URLUtil;
-import cn.stylefeng.roses.kernel.file.exception.FileException;
-import cn.stylefeng.roses.kernel.file.exception.enums.FileExceptionEnum;
+import cn.stylefeng.roses.kernel.file.api.exception.FileException;
+import cn.stylefeng.roses.kernel.file.api.exception.enums.FileExceptionEnum;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.servlet.ServletOutputStream;
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/util/PdfFileTypeUtil.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/util/PdfFileTypeUtil.java
similarity index 94%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/util/PdfFileTypeUtil.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/util/PdfFileTypeUtil.java
index e8b7e8f9d..d32e9ceda 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/util/PdfFileTypeUtil.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/util/PdfFileTypeUtil.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.file.util;
+package cn.stylefeng.roses.kernel.file.api.util;
 
 import cn.hutool.core.util.StrUtil;
 
@@ -7,7 +7,7 @@ import java.util.List;
 
 /**
  * pdf文件类型识别工具
- *      
+ *
  * @author majianguo
  * @date 2020/12/27 13:06
  */
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/util/PicFileTypeUtil.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/util/PicFileTypeUtil.java
similarity index 95%
rename from kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/util/PicFileTypeUtil.java
rename to kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/util/PicFileTypeUtil.java
index fad8a0535..a844cd7d4 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/util/PicFileTypeUtil.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/util/PicFileTypeUtil.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.file.util;
+package cn.stylefeng.roses.kernel.file.api.util;
 
 import cn.hutool.core.util.StrUtil;
 
diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/controller/SysFileInfoController.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/controller/SysFileInfoController.java
index 269cf2215..3370c9e47 100644
--- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/controller/SysFileInfoController.java
+++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/controller/SysFileInfoController.java
@@ -1,9 +1,9 @@
 package cn.stylefeng.roses.kernel.file.modular.controller;
 
-import cn.stylefeng.roses.kernel.file.constants.FileConstants;
+import cn.stylefeng.roses.kernel.file.api.constants.FileConstants;
+import cn.stylefeng.roses.kernel.file.api.pojo.request.SysFileInfoRequest;
+import cn.stylefeng.roses.kernel.file.api.pojo.response.SysFileInfoResponse;
 import cn.stylefeng.roses.kernel.file.modular.service.SysFileInfoService;
-import cn.stylefeng.roses.kernel.file.pojo.request.SysFileInfoRequest;
-import cn.stylefeng.roses.kernel.file.pojo.response.SysFileInfoResponse;
 import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
 import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
@@ -24,8 +24,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static cn.stylefeng.roses.kernel.file.constants.FileConstants.*;
-
 /**
  * 文件信息管理
  * <p>
diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/factory/FileInfoFactory.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/factory/FileInfoFactory.java
index e60211f69..ac37e38dd 100644
--- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/factory/FileInfoFactory.java
+++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/factory/FileInfoFactory.java
@@ -6,21 +6,21 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import cn.stylefeng.roses.kernel.file.FileOperatorApi;
-import cn.stylefeng.roses.kernel.file.enums.FileLocationEnum;
-import cn.stylefeng.roses.kernel.file.enums.FileStatusEnum;
-import cn.stylefeng.roses.kernel.file.exception.FileException;
-import cn.stylefeng.roses.kernel.file.exception.enums.FileExceptionEnum;
+import cn.stylefeng.roses.kernel.file.api.FileOperatorApi;
+import cn.stylefeng.roses.kernel.file.api.enums.FileLocationEnum;
+import cn.stylefeng.roses.kernel.file.api.enums.FileStatusEnum;
+import cn.stylefeng.roses.kernel.file.api.exception.FileException;
+import cn.stylefeng.roses.kernel.file.api.exception.enums.FileExceptionEnum;
+import cn.stylefeng.roses.kernel.file.api.pojo.request.SysFileInfoRequest;
 import cn.stylefeng.roses.kernel.file.modular.entity.SysFileInfo;
-import cn.stylefeng.roses.kernel.file.pojo.request.SysFileInfoRequest;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.math.BigDecimal;
 
-import static cn.stylefeng.roses.kernel.file.constants.FileConstants.DEFAULT_BUCKET_NAME;
-import static cn.stylefeng.roses.kernel.file.constants.FileConstants.FILE_POSTFIX_SEPARATOR;
+import static cn.stylefeng.roses.kernel.file.api.constants.FileConstants.DEFAULT_BUCKET_NAME;
+import static cn.stylefeng.roses.kernel.file.api.constants.FileConstants.FILE_POSTFIX_SEPARATOR;
 
 /**
  * 文件信息组装工厂
diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/SysFileInfoMapper.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/SysFileInfoMapper.java
index bf1451962..02f7ac0f7 100644
--- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/SysFileInfoMapper.java
+++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/SysFileInfoMapper.java
@@ -1,9 +1,9 @@
 package cn.stylefeng.roses.kernel.file.modular.mapper;
 
+import cn.stylefeng.roses.kernel.file.api.pojo.request.SysFileInfoRequest;
+import cn.stylefeng.roses.kernel.file.api.pojo.response.SysFileInfoListResponse;
+import cn.stylefeng.roses.kernel.file.api.pojo.response.SysFileInfoResponse;
 import cn.stylefeng.roses.kernel.file.modular.entity.SysFileInfo;
-import cn.stylefeng.roses.kernel.file.pojo.request.SysFileInfoRequest;
-import cn.stylefeng.roses.kernel.file.pojo.response.SysFileInfoListResponse;
-import cn.stylefeng.roses.kernel.file.pojo.response.SysFileInfoResponse;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml
index da6590bdf..fbeaed328 100644
--- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml
+++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/mapper/mapping/SysFileInfoMapper.xml
@@ -4,7 +4,7 @@
 
     <!--  根据附件IDS查询附件信息  -->
     <select id="getFileInfoListByFileIds"
-            resultType="cn.stylefeng.roses.kernel.file.pojo.response.SysFileInfoResponse">
+            resultType="cn.stylefeng.roses.kernel.file.api.pojo.response.SysFileInfoResponse">
         SELECT file.file_id          AS fileId,
                file.file_code        AS fileCode,
                file.file_version     AS fileVersion,
@@ -25,7 +25,7 @@
     </select>
 
     <!--  附件列表  -->
-    <select id="fileInfoList" resultType="cn.stylefeng.roses.kernel.file.pojo.response.SysFileInfoListResponse">
+    <select id="fileInfoList" resultType="cn.stylefeng.roses.kernel.file.api.pojo.response.SysFileInfoListResponse">
         SELECT file.file_id        AS fileId,
             file.file_code         AS fileCode,
             file.secret_flag       AS secretFlag,
diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/SysFileInfoService.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/SysFileInfoService.java
index 5ed860e47..5bdf616ee 100644
--- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/SysFileInfoService.java
+++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/SysFileInfoService.java
@@ -1,10 +1,10 @@
 package cn.stylefeng.roses.kernel.file.modular.service;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
+import cn.stylefeng.roses.kernel.file.api.pojo.request.SysFileInfoRequest;
+import cn.stylefeng.roses.kernel.file.api.pojo.response.SysFileInfoListResponse;
+import cn.stylefeng.roses.kernel.file.api.pojo.response.SysFileInfoResponse;
 import cn.stylefeng.roses.kernel.file.modular.entity.SysFileInfo;
-import cn.stylefeng.roses.kernel.file.pojo.request.SysFileInfoRequest;
-import cn.stylefeng.roses.kernel.file.pojo.response.SysFileInfoListResponse;
-import cn.stylefeng.roses.kernel.file.pojo.response.SysFileInfoResponse;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
 
diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java
index be71d7f13..a1caf01f6 100644
--- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java
+++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java
@@ -11,23 +11,23 @@ import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
 import cn.stylefeng.roses.kernel.db.api.factory.PageFactory;
 import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory;
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
-import cn.stylefeng.roses.kernel.file.FileInfoApi;
-import cn.stylefeng.roses.kernel.file.FileOperatorApi;
-import cn.stylefeng.roses.kernel.file.constants.FileConstants;
-import cn.stylefeng.roses.kernel.file.enums.FileStatusEnum;
-import cn.stylefeng.roses.kernel.file.exception.FileException;
-import cn.stylefeng.roses.kernel.file.exception.enums.FileExceptionEnum;
-import cn.stylefeng.roses.kernel.file.expander.FileConfigExpander;
+import cn.stylefeng.roses.kernel.file.api.FileInfoApi;
+import cn.stylefeng.roses.kernel.file.api.FileOperatorApi;
+import cn.stylefeng.roses.kernel.file.api.constants.FileConstants;
+import cn.stylefeng.roses.kernel.file.api.enums.FileStatusEnum;
+import cn.stylefeng.roses.kernel.file.api.exception.FileException;
+import cn.stylefeng.roses.kernel.file.api.exception.enums.FileExceptionEnum;
+import cn.stylefeng.roses.kernel.file.api.expander.FileConfigExpander;
+import cn.stylefeng.roses.kernel.file.api.pojo.request.SysFileInfoRequest;
+import cn.stylefeng.roses.kernel.file.api.pojo.response.SysFileInfoListResponse;
+import cn.stylefeng.roses.kernel.file.api.pojo.response.SysFileInfoResponse;
+import cn.stylefeng.roses.kernel.file.api.util.DownloadUtil;
+import cn.stylefeng.roses.kernel.file.api.util.PdfFileTypeUtil;
+import cn.stylefeng.roses.kernel.file.api.util.PicFileTypeUtil;
 import cn.stylefeng.roses.kernel.file.modular.entity.SysFileInfo;
 import cn.stylefeng.roses.kernel.file.modular.factory.FileInfoFactory;
 import cn.stylefeng.roses.kernel.file.modular.mapper.SysFileInfoMapper;
 import cn.stylefeng.roses.kernel.file.modular.service.SysFileInfoService;
-import cn.stylefeng.roses.kernel.file.pojo.request.SysFileInfoRequest;
-import cn.stylefeng.roses.kernel.file.pojo.response.SysFileInfoListResponse;
-import cn.stylefeng.roses.kernel.file.pojo.response.SysFileInfoResponse;
-import cn.stylefeng.roses.kernel.file.util.DownloadUtil;
-import cn.stylefeng.roses.kernel.file.util.PdfFileTypeUtil;
-import cn.stylefeng.roses.kernel.file.util.PicFileTypeUtil;
 import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
 import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -52,9 +52,9 @@ import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import static cn.stylefeng.roses.kernel.file.constants.FileConstants.DEFAULT_BUCKET_NAME;
-import static cn.stylefeng.roses.kernel.file.constants.FileConstants.FILE_POSTFIX_SEPARATOR;
-import static cn.stylefeng.roses.kernel.file.exception.enums.FileExceptionEnum.FILE_NOT_FOUND;
+import static cn.stylefeng.roses.kernel.file.api.constants.FileConstants.DEFAULT_BUCKET_NAME;
+import static cn.stylefeng.roses.kernel.file.api.constants.FileConstants.FILE_POSTFIX_SEPARATOR;
+import static cn.stylefeng.roses.kernel.file.api.exception.enums.FileExceptionEnum.FILE_NOT_FOUND;
 
 /**
  * 文件信息表 服务实现类
diff --git a/kernel-d-file/file-sdk-aliyun/src/main/java/cn/stylefeng/roses/kernel/file/aliyun/AliyunFileOperator.java b/kernel-d-file/file-sdk-aliyun/src/main/java/cn/stylefeng/roses/kernel/file/aliyun/AliyunFileOperator.java
index 697425bce..601178721 100644
--- a/kernel-d-file/file-sdk-aliyun/src/main/java/cn/stylefeng/roses/kernel/file/aliyun/AliyunFileOperator.java
+++ b/kernel-d-file/file-sdk-aliyun/src/main/java/cn/stylefeng/roses/kernel/file/aliyun/AliyunFileOperator.java
@@ -1,11 +1,11 @@
 package cn.stylefeng.roses.kernel.file.aliyun;
 
 import cn.hutool.core.io.IoUtil;
-import cn.stylefeng.roses.kernel.file.FileOperatorApi;
-import cn.stylefeng.roses.kernel.file.enums.BucketAuthEnum;
-import cn.stylefeng.roses.kernel.file.exception.FileException;
-import cn.stylefeng.roses.kernel.file.exception.enums.FileExceptionEnum;
-import cn.stylefeng.roses.kernel.file.pojo.props.AliyunOssProperties;
+import cn.stylefeng.roses.kernel.file.api.FileOperatorApi;
+import cn.stylefeng.roses.kernel.file.api.enums.BucketAuthEnum;
+import cn.stylefeng.roses.kernel.file.api.exception.FileException;
+import cn.stylefeng.roses.kernel.file.api.exception.enums.FileExceptionEnum;
+import cn.stylefeng.roses.kernel.file.api.pojo.props.AliyunOssProperties;
 import com.aliyun.oss.ClientException;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
diff --git a/kernel-d-file/file-sdk-local/src/main/java/cn/stylefeng/roses/kernel/file/local/LocalFileOperator.java b/kernel-d-file/file-sdk-local/src/main/java/cn/stylefeng/roses/kernel/file/local/LocalFileOperator.java
index 8d7b8f70a..86ec630c3 100644
--- a/kernel-d-file/file-sdk-local/src/main/java/cn/stylefeng/roses/kernel/file/local/LocalFileOperator.java
+++ b/kernel-d-file/file-sdk-local/src/main/java/cn/stylefeng/roses/kernel/file/local/LocalFileOperator.java
@@ -4,13 +4,13 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.system.SystemUtil;
 import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
-import cn.stylefeng.roses.kernel.file.FileOperatorApi;
-import cn.stylefeng.roses.kernel.file.constants.FileConstants;
-import cn.stylefeng.roses.kernel.file.enums.BucketAuthEnum;
-import cn.stylefeng.roses.kernel.file.exception.FileException;
-import cn.stylefeng.roses.kernel.file.exception.enums.FileExceptionEnum;
-import cn.stylefeng.roses.kernel.file.expander.FileConfigExpander;
-import cn.stylefeng.roses.kernel.file.pojo.props.LocalFileProperties;
+import cn.stylefeng.roses.kernel.file.api.FileOperatorApi;
+import cn.stylefeng.roses.kernel.file.api.constants.FileConstants;
+import cn.stylefeng.roses.kernel.file.api.enums.BucketAuthEnum;
+import cn.stylefeng.roses.kernel.file.api.exception.FileException;
+import cn.stylefeng.roses.kernel.file.api.exception.enums.FileExceptionEnum;
+import cn.stylefeng.roses.kernel.file.api.expander.FileConfigExpander;
+import cn.stylefeng.roses.kernel.file.api.pojo.props.LocalFileProperties;
 import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil;
 
 import java.io.File;
diff --git a/kernel-d-file/file-sdk-minio/src/main/java/cn/stylefeng/roses/kernel/file/minio/MinIoFileOperator.java b/kernel-d-file/file-sdk-minio/src/main/java/cn/stylefeng/roses/kernel/file/minio/MinIoFileOperator.java
index 768540bc5..2c319d513 100644
--- a/kernel-d-file/file-sdk-minio/src/main/java/cn/stylefeng/roses/kernel/file/minio/MinIoFileOperator.java
+++ b/kernel-d-file/file-sdk-minio/src/main/java/cn/stylefeng/roses/kernel/file/minio/MinIoFileOperator.java
@@ -4,13 +4,13 @@ import cn.hutool.core.io.FileTypeUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
-import cn.stylefeng.roses.kernel.file.FileOperatorApi;
-import cn.stylefeng.roses.kernel.file.constants.FileConstants;
-import cn.stylefeng.roses.kernel.file.enums.BucketAuthEnum;
-import cn.stylefeng.roses.kernel.file.exception.FileException;
-import cn.stylefeng.roses.kernel.file.exception.enums.FileExceptionEnum;
-import cn.stylefeng.roses.kernel.file.expander.FileConfigExpander;
-import cn.stylefeng.roses.kernel.file.pojo.props.MinIoProperties;
+import cn.stylefeng.roses.kernel.file.api.FileOperatorApi;
+import cn.stylefeng.roses.kernel.file.api.constants.FileConstants;
+import cn.stylefeng.roses.kernel.file.api.enums.BucketAuthEnum;
+import cn.stylefeng.roses.kernel.file.api.exception.FileException;
+import cn.stylefeng.roses.kernel.file.api.exception.enums.FileExceptionEnum;
+import cn.stylefeng.roses.kernel.file.api.expander.FileConfigExpander;
+import cn.stylefeng.roses.kernel.file.api.pojo.props.MinIoProperties;
 import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil;
 import io.minio.MinioClient;
 import io.minio.errors.InvalidEndpointException;
diff --git a/kernel-d-file/file-sdk-tencent/src/main/java/cn/stylefeng/roses/kernel/file/tencent/TenFileOperator.java b/kernel-d-file/file-sdk-tencent/src/main/java/cn/stylefeng/roses/kernel/file/tencent/TenFileOperator.java
index 9712226e5..801bc97b3 100644
--- a/kernel-d-file/file-sdk-tencent/src/main/java/cn/stylefeng/roses/kernel/file/tencent/TenFileOperator.java
+++ b/kernel-d-file/file-sdk-tencent/src/main/java/cn/stylefeng/roses/kernel/file/tencent/TenFileOperator.java
@@ -2,11 +2,11 @@ package cn.stylefeng.roses.kernel.file.tencent;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.thread.ExecutorBuilder;
-import cn.stylefeng.roses.kernel.file.FileOperatorApi;
-import cn.stylefeng.roses.kernel.file.enums.BucketAuthEnum;
-import cn.stylefeng.roses.kernel.file.exception.FileException;
-import cn.stylefeng.roses.kernel.file.exception.enums.FileExceptionEnum;
-import cn.stylefeng.roses.kernel.file.pojo.props.TenCosProperties;
+import cn.stylefeng.roses.kernel.file.api.FileOperatorApi;
+import cn.stylefeng.roses.kernel.file.api.enums.BucketAuthEnum;
+import cn.stylefeng.roses.kernel.file.api.exception.FileException;
+import cn.stylefeng.roses.kernel.file.api.exception.enums.FileExceptionEnum;
+import cn.stylefeng.roses.kernel.file.api.pojo.props.TenCosProperties;
 import com.qcloud.cos.COSClient;
 import com.qcloud.cos.ClientConfig;
 import com.qcloud.cos.auth.BasicCOSCredentials;
diff --git a/kernel-d-file/file-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/file/starter/GunsFileAutoConfiguration.java b/kernel-d-file/file-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/file/starter/GunsFileAutoConfiguration.java
index c290d14a5..2591aa025 100644
--- a/kernel-d-file/file-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/file/starter/GunsFileAutoConfiguration.java
+++ b/kernel-d-file/file-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/file/starter/GunsFileAutoConfiguration.java
@@ -1,9 +1,9 @@
 package cn.stylefeng.roses.kernel.file.starter;
 
-import cn.stylefeng.roses.kernel.file.FileOperatorApi;
-import cn.stylefeng.roses.kernel.file.expander.FileConfigExpander;
+import cn.stylefeng.roses.kernel.file.api.FileOperatorApi;
+import cn.stylefeng.roses.kernel.file.api.expander.FileConfigExpander;
+import cn.stylefeng.roses.kernel.file.api.pojo.props.LocalFileProperties;
 import cn.stylefeng.roses.kernel.file.local.LocalFileOperator;
-import cn.stylefeng.roses.kernel.file.pojo.props.LocalFileProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java
index 9f90a8f74..f848c12d8 100644
--- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java
+++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java
@@ -14,8 +14,8 @@ import cn.stylefeng.roses.kernel.auth.api.pojo.login.basic.SimpleUserInfo;
 import cn.stylefeng.roses.kernel.db.api.factory.PageFactory;
 import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory;
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
-import cn.stylefeng.roses.kernel.file.FileInfoApi;
-import cn.stylefeng.roses.kernel.file.constants.FileConstants;
+import cn.stylefeng.roses.kernel.file.api.FileInfoApi;
+import cn.stylefeng.roses.kernel.file.api.constants.FileConstants;
 import cn.stylefeng.roses.kernel.office.api.OfficeExcelApi;
 import cn.stylefeng.roses.kernel.office.api.pojo.report.ExcelExportParam;
 import cn.stylefeng.roses.kernel.rule.enums.TreeNodeEnum;
@@ -30,7 +30,13 @@ import cn.stylefeng.roses.kernel.system.api.enums.UserStatusEnum;
 import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException;
 import cn.stylefeng.roses.kernel.system.api.exception.enums.user.SysUserExceptionEnum;
 import cn.stylefeng.roses.kernel.system.api.expander.SystemConfigExpander;
+import cn.stylefeng.roses.kernel.system.api.pojo.organization.DataScopeDTO;
+import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationDTO;
+import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleDTO;
 import cn.stylefeng.roses.kernel.system.api.pojo.user.*;
+import cn.stylefeng.roses.kernel.system.api.pojo.user.request.OnlineUserRequest;
+import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest;
+import cn.stylefeng.roses.kernel.system.api.util.DataScopeUtil;
 import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser;
 import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserDataScope;
 import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserRole;
@@ -42,12 +48,6 @@ import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserDataScopeSer
 import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserOrgService;
 import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserRoleService;
 import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserService;
-import cn.stylefeng.roses.kernel.system.api.pojo.organization.DataScopeDTO;
-import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationDTO;
-import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleDTO;
-import cn.stylefeng.roses.kernel.system.api.pojo.user.request.OnlineUserRequest;
-import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest;
-import cn.stylefeng.roses.kernel.system.api.util.DataScopeUtil;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;