为后续OSS服务做足准备

opsli-base-support/opsli-core/src/main/java/org/opsli/plugins/email/enums/EmailType.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.opsli.modulars.tools.email.enums;
+package org.opsli.plugins.email.enums;
 
 /**
  * Email 参数类型

opsli-base-support/opsli-core/src/main/java/org/opsli/plugins/email/service/IEmailService.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.opsli.modulars.tools.email.service;
+package org.opsli.plugins.email.service;
 
 
 import java.util.Collection;

opsli-base-support/opsli-core/src/main/java/org/opsli/plugins/email/service/impl/EmailServiceImpl.java

@@ -1,4 +1,4 @@
-package org.opsli.modulars.tools.email.service.impl;
+package org.opsli.plugins.email.service.impl;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.extra.mail.MailAccount;
@@ -7,9 +7,9 @@ import org.opsli.api.wrapper.system.options.OptionsModel;
 import org.opsli.common.enums.DictType;
 import org.opsli.core.utils.OptionsUtil;
 import org.opsli.core.utils.ValidationUtil;
-import org.opsli.modulars.tools.email.enums.EmailType;
+import org.opsli.plugins.email.enums.EmailType;
-import org.opsli.modulars.tools.email.service.IEmailService;
+import org.opsli.plugins.email.service.IEmailService;
-import org.opsli.modulars.tools.email.wrapper.EmailModel;
+import org.opsli.plugins.email.wrapper.EmailModel;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
@@ -17,7 +17,7 @@ import java.util.Collections;
 
 /**
  * @BelongsProject: opsli-boot
- * @BelongsPackage: org.opsli.modulars.tools.email.service
+ * @BelongsPackage: org.opsli.plugins.email.service
  * @Author: Parker
  * @CreateTime: 2020-09-16 17:34
  * @Description: 邮件 接口实现类

opsli-base-support/opsli-core/src/main/java/org/opsli/plugins/email/wrapper/EmailModel.java

@@ -1,4 +1,4 @@
-package org.opsli.modulars.tools.email.wrapper;
+package org.opsli.plugins.email.wrapper;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

opsli-base-support/opsli-core/src/main/java/org/opsli/plugins/oss/OssMsg.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.opsli.modulars.tools.oss;
+package org.opsli.plugins.oss;
 
 
 import org.opsli.common.base.msg.BaseMsg;

opsli-base-support/opsli-core/src/main/java/org/opsli/plugins/oss/conf/LocalConfig.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.opsli.modulars.tools.oss.conf;
+package org.opsli.plugins.oss.conf;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

opsli-base-support/opsli-core/src/main/java/org/opsli/plugins/oss/enums/LocalStorageType.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.opsli.modulars.tools.oss.enums;
+package org.opsli.plugins.oss.enums;
 
 /**
  * 本地存储 参数类型

opsli-base-support/opsli-core/src/main/java/org/opsli/plugins/oss/enums/OssConfType.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.opsli.modulars.tools.oss.enums;
+package org.opsli.plugins.oss.enums;
 
 /**
  * 存储服务类型

opsli-base-support/opsli-core/src/main/java/org/opsli/plugins/oss/enums/OssStorageType.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.opsli.modulars.tools.oss.enums;
+package org.opsli.plugins.oss.enums;
 
 /**
  * 存储服务类型

opsli-base-support/opsli-core/src/main/java/org/opsli/plugins/oss/factory/OssStorageFactory.java

@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.opsli.modulars.tools.oss.factory;
+package org.opsli.plugins.oss.factory;
 
 import cn.hutool.core.util.ClassUtil;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.opsli.api.wrapper.system.options.OptionsModel;
 import org.opsli.core.utils.OptionsUtil;
-import org.opsli.modulars.tools.oss.enums.OssConfType;
+import org.opsli.plugins.oss.enums.OssConfType;
-import org.opsli.modulars.tools.oss.enums.OssStorageType;
+import org.opsli.plugins.oss.enums.OssStorageType;
-import org.opsli.modulars.tools.oss.service.OssStorageService;
+import org.opsli.plugins.oss.service.OssStorageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;

opsli-base-support/opsli-core/src/main/java/org/opsli/plugins/oss/service/BaseOssStorageService.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.opsli.modulars.tools.oss.service;
+package org.opsli.plugins.oss.service;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.io.FileUtil;

opsli-base-support/opsli-core/src/main/java/org/opsli/plugins/oss/service/OssStorageService.java

@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.opsli.modulars.tools.oss.service;
+package org.opsli.plugins.oss.service;
 
 
-import org.opsli.modulars.tools.oss.enums.OssStorageType;
+import org.opsli.plugins.oss.enums.OssStorageType;
 
 import java.io.File;
 import java.io.InputStream;

opsli-base-support/opsli-core/src/main/java/org/opsli/plugins/oss/service/impl/LocalStorageServiceImpl.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.opsli.modulars.tools.oss.service.impl;
+package org.opsli.plugins.oss.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
@@ -24,10 +24,10 @@ import org.opsli.api.wrapper.system.options.OptionsModel;
 import org.opsli.core.autoconfigure.properties.GlobalProperties;
 import org.opsli.core.utils.OptionsUtil;
 import org.opsli.core.utils.ValidationUtil;
-import org.opsli.modulars.tools.oss.conf.LocalConfig;
+import org.opsli.plugins.oss.conf.LocalConfig;
-import org.opsli.modulars.tools.oss.enums.LocalStorageType;
+import org.opsli.plugins.oss.enums.LocalStorageType;
-import org.opsli.modulars.tools.oss.enums.OssStorageType;
+import org.opsli.plugins.oss.enums.OssStorageType;
-import org.opsli.modulars.tools.oss.service.BaseOssStorageService;
+import org.opsli.plugins.oss.service.BaseOssStorageService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.File;

opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRestController.java

@@ -17,9 +17,6 @@ package org.opsli.modulars.system.user.web;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.util.CollectionUtils;
@@ -29,7 +26,6 @@ import com.google.common.collect.Maps;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.opsli.api.base.result.ResultVo;
@@ -41,7 +37,6 @@ import org.opsli.common.annotation.ApiRestController;
 import org.opsli.common.annotation.EnableLog;
 import org.opsli.common.annotation.RequiresPermissionsCus;
 import org.opsli.common.constants.MyBatisConstants;
-import org.opsli.common.enums.DictType;
 import org.opsli.common.exception.ServiceException;
 import org.opsli.common.exception.TokenException;
 import org.opsli.common.utils.HumpUtil;
@@ -62,17 +57,15 @@ import org.opsli.modulars.system.org.web.SysOrgRestController;
 import org.opsli.modulars.system.user.entity.SysUser;
 import org.opsli.modulars.system.user.entity.SysUserAndOrg;
 import org.opsli.modulars.system.user.service.IUserService;
-import org.opsli.modulars.tools.oss.enums.OssStorageType;
+import org.opsli.plugins.oss.factory.OssStorageFactory;
-import org.opsli.modulars.tools.oss.factory.OssStorageFactory;
+import org.opsli.plugins.oss.service.BaseOssStorageService;
-import org.opsli.modulars.tools.oss.service.BaseOssStorageService;
+import org.opsli.plugins.oss.service.OssStorageService;
-import org.opsli.modulars.tools.oss.service.OssStorageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Iterator;

opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/email/web/EmailRestController.java

@@ -5,8 +5,8 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.opsli.api.base.result.ResultVo;
 import org.opsli.common.annotation.ApiRestController;
-import org.opsli.modulars.tools.email.service.IEmailService;
+import org.opsli.plugins.email.service.IEmailService;
-import org.opsli.modulars.tools.email.wrapper.EmailModel;
+import org.opsli.plugins.email.wrapper.EmailModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * @BelongsProject: opsli-boot
- * @BelongsPackage: org.opsli.modulars.tools.email.web
+ * @BelongsPackage: org.opsli.plugins.email.web
  * @Author: Parker
  * @CreateTime: 2020-09-13 17:40
  * @Description: 邮件 Controller

opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/oss/web/OssRestController.java

@@ -0,0 +1,22 @@
+package org.opsli.modulars.tools.oss.web;
+
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.opsli.common.annotation.ApiRestController;
+
+
+/**
+ * @BelongsProject: opsli-boot
+ * @BelongsPackage: org.opsli.plugins.oss.web
+ * @Author: Parker
+ * @CreateTime: 2020-09-13 17:40
+ * @Description: 文件管理类 Controller
+ */
+@Api(tags = "文件管理类")
+@Slf4j
+@ApiRestController("/tools/oss")
+public class OssRestController {
+
+
+
+}