DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!8 sync 同步ruoyi-vue-plus更新

Browse Source 
fix -- 修复代码生成页面错误bug
fix -- 调整返回类型为R，修正脚本
This commit is contained in:
KonBAI
2022-01-30 15:34:26 +00:00
parent 47539482b4
commit a423f02fad
187 changed files with 2181 additions and 1821 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-oss/src/main/java/com/ruoyi/oss/service/IOssStrategy.java
View File

@@ -1,6 +1,7 @@
package com.ruoyi.oss.service;
import com.ruoyi.oss.entity.UploadResult;
import com.ruoyi.oss.enumd.OssEnumd;
import java.io.InputStream;
@@ -15,8 +16,9 @@ public interface IOssStrategy {
/**
* 获取服务商类型
* @return
*/
String getServiceType();
OssEnumd getServiceType();
/**
* 文件上传

8
ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractOssStrategy.java
View File

@@ -5,6 +5,7 @@ import cn.hutool.core.util.IdUtil;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.oss.entity.UploadResult;
import com.ruoyi.oss.enumd.OssEnumd;
import com.ruoyi.oss.properties.OssProperties;
import com.ruoyi.oss.service.IOssStrategy;
@@ -18,14 +19,17 @@ import java.io.InputStream;
public abstract class AbstractOssStrategy implements IOssStrategy {
protected OssProperties properties;
public boolean isInit = false;
public abstract void init(OssProperties properties);
public void init(OssProperties properties) {
this.properties = properties;
}
@Override
public abstract void createBucket();
@Override
public abstract String getServiceType();
public abstract OssEnumd getServiceType();
public String getPath(String prefix, String suffix) {
// 生成uuid

16
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunOssStrategy.java
View File

@@ -13,6 +13,7 @@ import com.ruoyi.oss.enumd.OssEnumd;
import com.ruoyi.oss.exception.OssException;
import com.ruoyi.oss.properties.OssProperties;
import com.ruoyi.oss.service.abstractd.AbstractOssStrategy;
import org.springframework.stereotype.Component;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -22,13 +23,14 @@ import java.io.InputStream;
*
* @author Lion Li
*/
@Component
public class AliyunOssStrategy extends AbstractOssStrategy {
private OSSClient client;
@Override
public void init(OssProperties cloudStorageProperties) {
properties = cloudStorageProperties;
public void init(OssProperties ossProperties) {
super.init(ossProperties);
try {
ClientConfiguration configuration = new ClientConfiguration();
DefaultCredentialProvider credentialProvider = new DefaultCredentialProvider(
@@ -38,6 +40,7 @@ public class AliyunOssStrategy extends AbstractOssStrategy {
} catch (Exception e) {
throw new OssException("阿里云存储配置错误! 请检查系统配置:[" + e.getMessage() + "]");
}
isInit = true;
}
@Override
@@ -56,8 +59,8 @@ public class AliyunOssStrategy extends AbstractOssStrategy {
}
@Override
public String getServiceType() {
return OssEnumd.ALIYUN.getValue();
public OssEnumd getServiceType() {
return OssEnumd.ALIYUN;
}
@Override
@@ -74,12 +77,11 @@ public class AliyunOssStrategy extends AbstractOssStrategy {
} catch (Exception e) {
throw new OssException("上传文件失败，请检查阿里云配置信息:[" + e.getMessage() + "]");
}
return new UploadResult().setUrl(getEndpointLink() + "/" + path).setFilename(path);
}
return UploadResult.builder().url(getEndpointLink() + "/" + path).filename(path).build(); }
@Override
public void delete(String path) {
path = path.replace(getEndpointLink() + "/" , "");
path = path.replace(getEndpointLink() + "/", "");
try {
client.deleteObject(properties.getBucketName(), path);
} catch (Exception e) {

13
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java
View File

@@ -9,6 +9,7 @@ import com.ruoyi.oss.properties.OssProperties;
import com.ruoyi.oss.service.abstractd.AbstractOssStrategy;
import io.minio.*;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -18,13 +19,14 @@ import java.io.InputStream;
*
* @author Lion Li
*/
@Component
public class MinioOssStrategy extends AbstractOssStrategy {
private MinioClient minioClient;
@Override
public void init(OssProperties cloudStorageProperties) {
properties = cloudStorageProperties;
public void init(OssProperties ossProperties) {
super.init(ossProperties);
try {
minioClient = MinioClient.builder()
.endpoint(properties.getEndpoint())
@@ -34,6 +36,7 @@ public class MinioOssStrategy extends AbstractOssStrategy {
} catch (Exception e) {
throw new OssException("Minio存储配置错误! 请检查系统配置:[" + e.getMessage() + "]");
}
isInit = true;
}
@Override
@@ -56,8 +59,8 @@ public class MinioOssStrategy extends AbstractOssStrategy {
}
@Override
public String getServiceType() {
return OssEnumd.MINIO.getValue();
public OssEnumd getServiceType() {
return OssEnumd.MINIO;
}
@Override
@@ -77,7 +80,7 @@ public class MinioOssStrategy extends AbstractOssStrategy {
} catch (Exception e) {
throw new OssException("上传文件失败，请核对Minio配置信息:[" + e.getMessage() + "]");
}
return new UploadResult().setUrl(getEndpointLink() + "/" + path).setFilename(path);
return UploadResult.builder().url(getEndpointLink() + "/" + path).filename(path).build();
}
@Override

13
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java
View File

@@ -13,6 +13,7 @@ import com.ruoyi.oss.enumd.OssEnumd;
import com.ruoyi.oss.exception.OssException;
import com.ruoyi.oss.properties.OssProperties;
import com.ruoyi.oss.service.abstractd.AbstractOssStrategy;
import org.springframework.stereotype.Component;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -22,13 +23,14 @@ import java.io.InputStream;
*
* @author Lion Li
*/
@Component
public class QcloudOssStrategy extends AbstractOssStrategy {
private COSClient client;
@Override
public void init(OssProperties cloudStorageProperties) {
properties = cloudStorageProperties;
public void init(OssProperties ossProperties) {
super.init(ossProperties);
try {
COSCredentials credentials = new BasicCOSCredentials(
properties.getAccessKey(), properties.getSecretKey());
@@ -46,6 +48,7 @@ public class QcloudOssStrategy extends AbstractOssStrategy {
} catch (Exception e) {
throw new OssException("腾讯云存储配置错误! 请检查系统配置:[" + e.getMessage() + "]");
}
isInit = true;
}
@Override
@@ -64,8 +67,8 @@ public class QcloudOssStrategy extends AbstractOssStrategy {
}
@Override
public String getServiceType() {
return OssEnumd.QCLOUD.getValue();
public OssEnumd getServiceType() {
return OssEnumd.QCLOUD;
}
@Override
@@ -82,7 +85,7 @@ public class QcloudOssStrategy extends AbstractOssStrategy {
} catch (Exception e) {
throw new OssException("上传文件失败，请检查腾讯云配置信息:[" + e.getMessage() + "]");
}
return new UploadResult().setUrl(getEndpointLink() + "/" + path).setFilename(path);
return UploadResult.builder().url(getEndpointLink() + "/" + path).filename(path).build();
}
@Override

20
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuOssStrategy.java
View File

@@ -12,6 +12,7 @@ import com.ruoyi.oss.enumd.OssEnumd;
import com.ruoyi.oss.exception.OssException;
import com.ruoyi.oss.properties.OssProperties;
import com.ruoyi.oss.service.abstractd.AbstractOssStrategy;
import org.springframework.stereotype.Component;
import java.io.InputStream;
@@ -20,15 +21,17 @@ import java.io.InputStream;
*
* @author Lion Li
*/
@Component
public class QiniuOssStrategy extends AbstractOssStrategy {
private UploadManager uploadManager;
private BucketManager bucketManager;
private Auth auth;
@Override
public void init(OssProperties cloudStorageProperties) {
properties = cloudStorageProperties;
public void init(OssProperties ossProperties) {
super.init(ossProperties);
try {
Configuration config = new Configuration(getRegion(properties.getRegion()));
// https设置
@@ -36,15 +39,12 @@ public class QiniuOssStrategy extends AbstractOssStrategy {
config.useHttpsDomains = "Y".equals(properties.getIsHttps());
uploadManager = new UploadManager(config);
auth = Auth.create(properties.getAccessKey(), properties.getSecretKey());
String bucketName = properties.getBucketName();
bucketManager = new BucketManager(auth, config);
if (!ArrayUtil.contains(bucketManager.buckets(), bucketName)) {
bucketManager.createBucket(bucketName, properties.getRegion());
}
createBucket();
} catch (Exception e) {
throw new OssException("七牛云存储配置错误! 请检查系统配置:[" + e.getMessage() + "]");
}
isInit = true;
}
@Override
@@ -61,8 +61,8 @@ public class QiniuOssStrategy extends AbstractOssStrategy {
}
@Override
public String getServiceType() {
return OssEnumd.QINIU.getValue();
public OssEnumd getServiceType() {
return OssEnumd.QINIU;
}
@Override
@@ -76,7 +76,7 @@ public class QiniuOssStrategy extends AbstractOssStrategy {
} catch (Exception e) {
throw new OssException("上传文件失败，请核对七牛配置信息:[" + e.getMessage() + "]");
}
return new UploadResult().setUrl(getEndpointLink() + "/" + path).setFilename(path);
return UploadResult.builder().url(getEndpointLink() + "/" + path).filename(path).build();
}
@Override