From 663f1b321278240225cc6b4a533bb8fb7c32e4e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Sun, 4 Aug 2019 12:11:14 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20fix=20#429=20?= =?UTF-8?q?=E3=80=90=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E3=80=91=20pigx-c?= =?UTF-8?q?ommon-minio=20=E9=A1=B9=E7=9B=AE=E5=8C=85=E5=90=8D=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E7=BC=BA=E5=B0=91=E4=B8=80=E5=B1=82=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => pigx}/common/minio/MinioAutoConfiguration.java | 4 ++-- .../{ => pigx}/common/minio/MinioProperties.java | 2 +- .../{ => pigx}/common/minio/http/MinioEndpoint.java | 8 ++++---- .../{ => pigx}/common/minio/service/MinioTemplate.java | 4 ++-- .../pig4cloud/{ => pigx}/common/minio/vo/MinioItem.java | 2 +- .../pig4cloud/{ => pigx}/common/minio/vo/MinioObject.java | 2 +- .../src/main/resources/META-INF/spring.factories | 2 +- .../pigx/admin/service/impl/SysFileServiceImpl.java | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) rename pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/{ => pigx}/common/minio/MinioAutoConfiguration.java (93%) rename pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/{ => pigx}/common/minio/MinioProperties.java (96%) rename pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/{ => pigx}/common/minio/http/MinioEndpoint.java (95%) rename pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/{ => pigx}/common/minio/service/MinioTemplate.java (98%) rename pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/{ => pigx}/common/minio/vo/MinioItem.java (97%) rename pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/{ => pigx}/common/minio/vo/MinioObject.java (97%) diff --git a/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/MinioAutoConfiguration.java b/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/MinioAutoConfiguration.java similarity index 93% rename from pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/MinioAutoConfiguration.java rename to pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/MinioAutoConfiguration.java index 2ba6233b4..3518a463b 100755 --- a/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/MinioAutoConfiguration.java +++ b/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/MinioAutoConfiguration.java @@ -15,9 +15,9 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.common.minio; +package com.pig4cloud.pigx.common.minio; -import com.pig4cloud.common.minio.service.MinioTemplate; +import com.pig4cloud.pigx.common.minio.service.MinioTemplate; import lombok.AllArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/MinioProperties.java b/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/MinioProperties.java similarity index 96% rename from pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/MinioProperties.java rename to pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/MinioProperties.java index 664cd813c..93c91d323 100755 --- a/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/MinioProperties.java +++ b/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/MinioProperties.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.common.minio; +package com.pig4cloud.pigx.common.minio; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/http/MinioEndpoint.java b/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/http/MinioEndpoint.java similarity index 95% rename from pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/http/MinioEndpoint.java rename to pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/http/MinioEndpoint.java index 8345085ae..1513c8730 100755 --- a/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/http/MinioEndpoint.java +++ b/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/http/MinioEndpoint.java @@ -15,11 +15,11 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.common.minio.http; +package com.pig4cloud.pigx.common.minio.http; -import com.pig4cloud.common.minio.service.MinioTemplate; -import com.pig4cloud.common.minio.vo.MinioItem; -import com.pig4cloud.common.minio.vo.MinioObject; +import com.pig4cloud.pigx.common.minio.service.MinioTemplate; +import com.pig4cloud.pigx.common.minio.vo.MinioItem; +import com.pig4cloud.pigx.common.minio.vo.MinioObject; import io.minio.messages.Bucket; import lombok.AllArgsConstructor; import lombok.SneakyThrows; diff --git a/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/service/MinioTemplate.java b/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/service/MinioTemplate.java similarity index 98% rename from pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/service/MinioTemplate.java rename to pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/service/MinioTemplate.java index 7a1a38f64..474e9cc08 100755 --- a/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/service/MinioTemplate.java +++ b/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/service/MinioTemplate.java @@ -15,9 +15,9 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.common.minio.service; +package com.pig4cloud.pigx.common.minio.service; -import com.pig4cloud.common.minio.vo.MinioItem; +import com.pig4cloud.pigx.common.minio.vo.MinioItem; import io.minio.MinioClient; import io.minio.ObjectStat; import io.minio.Result; diff --git a/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/vo/MinioItem.java b/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/vo/MinioItem.java similarity index 97% rename from pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/vo/MinioItem.java rename to pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/vo/MinioItem.java index fcb9b0644..e8cfd7a9c 100755 --- a/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/vo/MinioItem.java +++ b/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/vo/MinioItem.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.common.minio.vo; +package com.pig4cloud.pigx.common.minio.vo; import io.minio.messages.Item; import io.minio.messages.Owner; diff --git a/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/vo/MinioObject.java b/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/vo/MinioObject.java similarity index 97% rename from pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/vo/MinioObject.java rename to pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/vo/MinioObject.java index 4e34ec7c4..f44fad595 100755 --- a/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/vo/MinioObject.java +++ b/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/vo/MinioObject.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.common.minio.vo; +package com.pig4cloud.pigx.common.minio.vo; import io.minio.ObjectStat; import lombok.AllArgsConstructor; diff --git a/pigx-common/pigx-common-minio/src/main/resources/META-INF/spring.factories b/pigx-common/pigx-common-minio/src/main/resources/META-INF/spring.factories index b67a03493..454c5f082 100755 --- a/pigx-common/pigx-common-minio/src/main/resources/META-INF/spring.factories +++ b/pigx-common/pigx-common-minio/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.pig4cloud.common.minio.MinioAutoConfiguration \ No newline at end of file + com.pig4cloud.pigx.common.minio.MinioAutoConfiguration \ No newline at end of file diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysFileServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysFileServiceImpl.java index c43f80663..f9d712eb3 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysFileServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysFileServiceImpl.java @@ -21,7 +21,7 @@ import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.common.minio.service.MinioTemplate; +import com.pig4cloud.pigx.common.minio.service.MinioTemplate; import com.pig4cloud.pigx.admin.api.entity.SysFile; import com.pig4cloud.pigx.admin.mapper.SysFileMapper; import com.pig4cloud.pigx.admin.service.SysFileService;