diff --git a/pigx-app-server/pigx-app-server-api/pom.xml b/pigx-app-server/pigx-app-server-api/pom.xml index 3a97b552d..43601277f 100644 --- a/pigx-app-server/pigx-app-server-api/pom.xml +++ b/pigx-app-server/pigx-app-server-api/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx-app-server - 5.7.0 + 5.8.0 pigx-app-server-api diff --git a/pigx-app-server/pigx-app-server-biz/pom.xml b/pigx-app-server/pigx-app-server-biz/pom.xml index 57f125bb9..74a642423 100644 --- a/pigx-app-server/pigx-app-server-biz/pom.xml +++ b/pigx-app-server/pigx-app-server-biz/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx-app-server - 5.7.0 + 5.8.0 pigx-app-server-biz diff --git a/pigx-app-server/pom.xml b/pigx-app-server/pom.xml index baffac7d7..1276b1764 100644 --- a/pigx-app-server/pom.xml +++ b/pigx-app-server/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx - 5.7.0 + 5.8.0 pigx-app-server diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml index 2dc08bd9e..5785da6d7 100644 --- a/pigx-auth/pom.xml +++ b/pigx-auth/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.7.0 + 5.8.0 pigx-auth diff --git a/pigx-boot/pom.xml b/pigx-boot/pom.xml index 6d5d300fc..c12c392a3 100755 --- a/pigx-boot/pom.xml +++ b/pigx-boot/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pigx - 5.7.0 + 5.8.0 pigx-boot diff --git a/pigx-boot/src/main/java/com/pig4cloud/pigx/bootstrap/PigxBootSecurityServerConfiguration.java b/pigx-boot/src/main/java/com/pig4cloud/pigx/bootstrap/PigxBootSecurityServerConfiguration.java index 4d49b283f..d8464d91f 100644 --- a/pigx-boot/src/main/java/com/pig4cloud/pigx/bootstrap/PigxBootSecurityServerConfiguration.java +++ b/pigx-boot/src/main/java/com/pig4cloud/pigx/bootstrap/PigxBootSecurityServerConfiguration.java @@ -36,7 +36,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer; diff --git a/pigx-common/pigx-common-audit/pom.xml b/pigx-common/pigx-common-audit/pom.xml index 2c82d8939..af62e53ca 100644 --- a/pigx-common/pigx-common-audit/pom.xml +++ b/pigx-common/pigx-common-audit/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 pigx-common-audit diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index ee2548121..699c5554a 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -17,7 +17,7 @@ pigx 公共版本控制，在此pom定义的依赖，全局业务微服务不需要指定版本。 - 5.7.0 + 5.8.0 3.5.10.1 1.5.2 4.3.1 diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml index b70a834bc..b3eee5482 100644 --- a/pigx-common/pigx-common-core/pom.xml +++ b/pigx-common/pigx-common-core/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 pigx-common-core diff --git a/pigx-common/pigx-common-data/pom.xml b/pigx-common/pigx-common-data/pom.xml index 2e4ac2b2b..9d003bd53 100644 --- a/pigx-common/pigx-common-data/pom.xml +++ b/pigx-common/pigx-common-data/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 pigx-common-data diff --git a/pigx-common/pigx-common-datasource/pom.xml b/pigx-common/pigx-common-datasource/pom.xml index a0e6b91a4..5dda5eeb2 100644 --- a/pigx-common/pigx-common-datasource/pom.xml +++ b/pigx-common/pigx-common-datasource/pom.xml @@ -5,7 +5,7 @@ pigx-common com.pig4cloud - 5.7.0 + 5.8.0 4.0.0 diff --git a/pigx-common/pigx-common-encrypt-api/pom.xml b/pigx-common/pigx-common-encrypt-api/pom.xml index 64269748c..1dd196e25 100644 --- a/pigx-common/pigx-common-encrypt-api/pom.xml +++ b/pigx-common/pigx-common-encrypt-api/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 pigx-common-encrypt-api diff --git a/pigx-common/pigx-common-encrypt-api/src/main/java/com/pig4cloud/pigx/common/api/encrypt/util/ApiCryptoUtil.java b/pigx-common/pigx-common-encrypt-api/src/main/java/com/pig4cloud/pigx/common/api/encrypt/util/ApiCryptoUtil.java index a0883ee7b..59ecf3750 100644 --- a/pigx-common/pigx-common-encrypt-api/src/main/java/com/pig4cloud/pigx/common/api/encrypt/util/ApiCryptoUtil.java +++ b/pigx-common/pigx-common-encrypt-api/src/main/java/com/pig4cloud/pigx/common/api/encrypt/util/ApiCryptoUtil.java @@ -23,6 +23,7 @@ import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import java.util.HashMap; import java.util.Map; import java.util.function.Function; @@ -38,15 +39,16 @@ import java.util.function.Function; @UtilityClass public class ApiCryptoUtil { - /** - * 密钥提取器 - */ - public static final Map> KEY_EXTRACTORS = Map.of( - EncryptType.AES, ApiEncryptProperties::getAesKey, - EncryptType.RSA, ApiEncryptProperties::getRsaPrivateKey, - EncryptType.DES, ApiEncryptProperties::getDesKey, - EncryptType.SM4, ApiEncryptProperties::getSm4Key - ); + public static final Map> KEY_EXTRACTORS; + + static { + Map> map = new HashMap<>(); + map.put(EncryptType.AES, ApiEncryptProperties::getAesKey); + map.put(EncryptType.RSA, ApiEncryptProperties::getRsaPrivateKey); + map.put(EncryptType.DES, ApiEncryptProperties::getDesKey); + map.put(EncryptType.SM4, ApiEncryptProperties::getSm4Key); + KEY_EXTRACTORS = map; + } /** diff --git a/pigx-common/pigx-common-excel/pom.xml b/pigx-common/pigx-common-excel/pom.xml index 518a263d8..59d6ca84c 100644 --- a/pigx-common/pigx-common-excel/pom.xml +++ b/pigx-common/pigx-common-excel/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 pigx-common-excel diff --git a/pigx-common/pigx-common-feign/pom.xml b/pigx-common/pigx-common-feign/pom.xml index 0d5c76eb4..6631f67bb 100755 --- a/pigx-common/pigx-common-feign/pom.xml +++ b/pigx-common/pigx-common-feign/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 4.0.0 diff --git a/pigx-common/pigx-common-gateway/pom.xml b/pigx-common/pigx-common-gateway/pom.xml index 430d4ee5e..e267a1240 100644 --- a/pigx-common/pigx-common-gateway/pom.xml +++ b/pigx-common/pigx-common-gateway/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 pigx-common-gateway diff --git a/pigx-common/pigx-common-gray/pom.xml b/pigx-common/pigx-common-gray/pom.xml index 551e59213..18391cc5f 100644 --- a/pigx-common/pigx-common-gray/pom.xml +++ b/pigx-common/pigx-common-gray/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 pigx-common-gray diff --git a/pigx-common/pigx-common-idempotent/pom.xml b/pigx-common/pigx-common-idempotent/pom.xml index 7a6f62262..926aa56fb 100644 --- a/pigx-common/pigx-common-idempotent/pom.xml +++ b/pigx-common/pigx-common-idempotent/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 pigx-common-idempotent diff --git a/pigx-common/pigx-common-job/pom.xml b/pigx-common/pigx-common-job/pom.xml index f532e44f7..001cf3de4 100644 --- a/pigx-common/pigx-common-job/pom.xml +++ b/pigx-common/pigx-common-job/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 pigx-common-job diff --git a/pigx-common/pigx-common-log/pom.xml b/pigx-common/pigx-common-log/pom.xml index 7288c6537..24152a5ce 100644 --- a/pigx-common/pigx-common-log/pom.xml +++ b/pigx-common/pigx-common-log/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 pigx-common-log diff --git a/pigx-common/pigx-common-oss/pom.xml b/pigx-common/pigx-common-oss/pom.xml index 7cd069d30..68b347250 100755 --- a/pigx-common/pigx-common-oss/pom.xml +++ b/pigx-common/pigx-common-oss/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 pigx-common-oss diff --git a/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/OssProperties.java b/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/OssProperties.java index 6539304ab..3e2682c0f 100755 --- a/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/OssProperties.java +++ b/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/OssProperties.java @@ -35,46 +35,51 @@ import org.springframework.boot.context.properties.ConfigurationProperties; @ConfigurationProperties(prefix = "oss") public class OssProperties { - /** - * 对象存储服务的URL - */ - private String endpoint; + /** + * 对象存储服务的URL + */ + private String endpoint; - /** - * 自定义域名 - */ - private String customDomain; + /** + * 自定义域名 + */ + private String customDomain; - /** - * true path-style nginx 反向代理和S3默认支持 pathStyle {http://endpoint/bucketname} false - * supports virtual-hosted-style 阿里云等需要配置为 virtual-hosted-style - * 模式{http://bucketname.endpoint} - */ - private Boolean pathStyleAccess = true; + /** + * true path-style nginx 反向代理和S3默认支持 pathStyle {http://endpoint/bucketname} false + * supports virtual-hosted-style 阿里云等需要配置为 virtual-hosted-style + * 模式{http://bucketname.endpoint} + */ + private Boolean pathStyleAccess = true; - /** - * 应用ID - */ - private String appId; + /** + * 应用ID + */ + private String appId; - /** - * 区域 - */ - private String region; + /** + * 区域 + */ + private String region; - /** - * Access key就像用户ID，可以唯一标识你的账户 - */ - private String accessKey; + /** + * Access key就像用户ID，可以唯一标识你的账户 + */ + private String accessKey; - /** - * Secret key是你账户的密码 - */ - private String secretKey; + /** + * Secret key是你账户的密码 + */ + private String secretKey; - /** - * 最大线程数，默认： 100 - */ - private Integer maxConnections = 100; + /** + * 最大线程数，默认： 100 + */ + private Integer maxConnections = 100; + + /** + * 跳过 MD5 检查 + */ + private boolean skipMd5Check; } diff --git a/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/service/OssTemplate.java b/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/service/OssTemplate.java index 724950b6a..63bfab419 100755 --- a/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/service/OssTemplate.java +++ b/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/service/OssTemplate.java @@ -52,222 +52,236 @@ import java.util.*; @RequiredArgsConstructor public class OssTemplate implements InitializingBean, FileTemplate { - private final FileProperties properties; + private final FileProperties properties; - private AmazonS3 amazonS3; + private AmazonS3 amazonS3; - /** - * 创建bucket - * @param bucketName bucket名称 - */ - @SneakyThrows - public void createBucket(String bucketName) { - if (!amazonS3.doesBucketExistV2(bucketName)) { - amazonS3.createBucket((bucketName)); - } - } + /** + * 创建bucket + * + * @param bucketName bucket名称 + */ + @SneakyThrows + public void createBucket(String bucketName) { + if (!amazonS3.doesBucketExistV2(bucketName)) { + amazonS3.createBucket((bucketName)); + } + } - /** - * 获取全部bucket - *

- * - * @see AWS - * API Documentation - */ - @SneakyThrows - public List getAllBuckets() { - return amazonS3.listBuckets(); - } + /** + * 获取全部bucket + *

+ * + * @see AWS + * API Documentation + */ + @SneakyThrows + public List getAllBuckets() { + return amazonS3.listBuckets(); + } - /** - * @param bucketName bucket名称 - * @see AWS - * API Documentation - */ - @SneakyThrows - public Optional getBucket(String bucketName) { - return amazonS3.listBuckets().stream().filter(b -> b.getName().equals(bucketName)).findFirst(); - } + /** + * @param bucketName bucket名称 + * @see AWS + * API Documentation + */ + @SneakyThrows + public Optional getBucket(String bucketName) { + return amazonS3.listBuckets().stream().filter(b -> b.getName().equals(bucketName)).findFirst(); + } - /** - * @param bucketName bucket名称 - * @see AWS API - * Documentation - */ - @SneakyThrows - public void removeBucket(String bucketName) { - amazonS3.deleteBucket(bucketName); - } + /** + * @param bucketName bucket名称 + * @see AWS API + * Documentation + */ + @SneakyThrows + public void removeBucket(String bucketName) { + amazonS3.deleteBucket(bucketName); + } - /** - * 根据文件前置查询文件 - * @param bucketName bucket名称 - * @param prefix 前缀 - * @param recursive 是否递归查询 - * @return S3ObjectSummary 列表 - * @see AWS - * API Documentation - */ - @SneakyThrows - public List getAllObjectsByPrefix(String bucketName, String prefix, boolean recursive) { - ObjectListing objectListing = amazonS3.listObjects(bucketName, prefix); - return new ArrayList<>(objectListing.getObjectSummaries()); - } + /** + * 根据文件前置查询文件 + * + * @param bucketName bucket名称 + * @param prefix 前缀 + * @param recursive 是否递归查询 + * @return S3ObjectSummary 列表 + * @see AWS + * API Documentation + */ + @SneakyThrows + public List getAllObjectsByPrefix(String bucketName, String prefix, boolean recursive) { + ObjectListing objectListing = amazonS3.listObjects(bucketName, prefix); + return new ArrayList<>(objectListing.getObjectSummaries()); + } - /** - * 获取文件外链 - * @param bucketName bucket名称 - * @param objectName 文件名称 - * @param expires 过期时间 <=7 - * @return url - * @see AmazonS3#generatePresignedUrl(String bucketName, String key, Date expiration) - */ - @SneakyThrows - public String getObjectURL(String bucketName, String objectName, Integer expires) { - Date date = new Date(); - Calendar calendar = new GregorianCalendar(); - calendar.setTime(date); - calendar.add(Calendar.DAY_OF_MONTH, expires); - URL url = amazonS3.generatePresignedUrl(bucketName, objectName, calendar.getTime()); - return url.toString(); - } + /** + * 获取文件外链 + * + * @param bucketName bucket名称 + * @param objectName 文件名称 + * @param expires 过期时间 <=7 + * @return url + * @see AmazonS3#generatePresignedUrl(String bucketName, String key, Date expiration) + */ + @SneakyThrows + public String getObjectURL(String bucketName, String objectName, Integer expires) { + Date date = new Date(); + Calendar calendar = new GregorianCalendar(); + calendar.setTime(date); + calendar.add(Calendar.DAY_OF_MONTH, expires); + URL url = amazonS3.generatePresignedUrl(bucketName, objectName, calendar.getTime()); + return url.toString(); + } - /** - * 获取文件 - * @param bucketName bucket名称 - * @param objectName 文件名称 - * @return 二进制流 - * @see AWS - * API Documentation - */ - @SneakyThrows - public S3Object getObject(String bucketName, String objectName) { - return amazonS3.getObject(bucketName, objectName); - } + /** + * 获取文件 + * + * @param bucketName bucket名称 + * @param objectName 文件名称 + * @return 二进制流 + * @see AWS + * API Documentation + */ + @SneakyThrows + public S3Object getObject(String bucketName, String objectName) { + if (properties.getOss().isSkipMd5Check()) { + System.setProperty("com.amazonaws.services.s3.disableGetObjectMD5Validation", "false"); + } + return amazonS3.getObject(bucketName, objectName); + } - /** - * 获取文件 - * @param bucketName bucket名称 - * @param dir 文件夹名称 - * @param objectName 文件名称 - * @return 二进制流 API Documentation - */ - @Override - public S3Object getObject(String bucketName, String dir, String objectName) { - if (StrUtil.isNotBlank(dir)) { - objectName = dir + FileUtil.FILE_SEPARATOR + objectName; - } - return getObject(bucketName, objectName); - } + /** + * 获取文件 + * + * @param bucketName bucket名称 + * @param dir 文件夹名称 + * @param objectName 文件名称 + * @return 二进制流 API Documentation + */ + @Override + public S3Object getObject(String bucketName, String dir, String objectName) { + if (StrUtil.isNotBlank(dir)) { + objectName = dir + FileUtil.FILE_SEPARATOR + objectName; + } + return getObject(bucketName, objectName); + } - /** - * 上传文件 - * @param bucketName bucket名称 - * @param objectName 文件名称 - * @param stream 文件流 - * @throws Exception - */ - public void putObject(String bucketName, String objectName, InputStream stream) throws Exception { - putObject(bucketName, objectName, stream, stream.available(), "application/octet-stream"); - } + /** + * 上传文件 + * + * @param bucketName bucket名称 + * @param objectName 文件名称 + * @param stream 文件流 + * @throws Exception + */ + public void putObject(String bucketName, String objectName, InputStream stream) throws Exception { + putObject(bucketName, objectName, stream, stream.available(), "application/octet-stream"); + } - /** - * 上传文件 - * @param bucketName bucket名称 - * @param objectName 文件名称 - * @param stream 文件流 - * @param contextType 文件类型 - * @throws Exception - */ - public void putObject(String bucketName, String objectName, InputStream stream, String contextType) - throws Exception { - putObject(bucketName, objectName, stream, stream.available(), contextType); - } + /** + * 上传文件 + * + * @param bucketName bucket名称 + * @param objectName 文件名称 + * @param stream 文件流 + * @param contextType 文件类型 + * @throws Exception + */ + public void putObject(String bucketName, String objectName, InputStream stream, String contextType) + throws Exception { + putObject(bucketName, objectName, stream, stream.available(), contextType); + } - /** - * 上传文件 - * @param bucketName bucket名称 - * @param dir 文件夹名称 - * @param objectName 文件名称 - * @param stream 文件流 - * @param contextType 文件类型 - * @throws Exception - */ - @Override - public void putObject(String bucketName, String dir, String objectName, InputStream stream, String contextType) - throws Exception { - if (StrUtil.isNotBlank(dir)) { - // dir 路径为 a/b - objectName = dir + FileUtil.FILE_SEPARATOR + objectName; - } + /** + * 上传文件 + * + * @param bucketName bucket名称 + * @param dir 文件夹名称 + * @param objectName 文件名称 + * @param stream 文件流 + * @param contextType 文件类型 + * @throws Exception + */ + @Override + public void putObject(String bucketName, String dir, String objectName, InputStream stream, String contextType) + throws Exception { + if (StrUtil.isNotBlank(dir)) { + // dir 路径为 a/b + objectName = dir + FileUtil.FILE_SEPARATOR + objectName; + } - putObject(bucketName, objectName, stream, stream.available(), contextType); - } + putObject(bucketName, objectName, stream, stream.available(), contextType); + } - /** - * 上传文件 - * @param bucketName bucket名称 - * @param objectName 文件名称 - * @param stream 文件流 - * @param size 大小 - * @param contextType 类型 - * @throws Exception - * @see AWS - * API Documentation - */ - public PutObjectResult putObject(String bucketName, String objectName, InputStream stream, long size, - String contextType) throws Exception { - // String fileName = getFileName(objectName); - byte[] bytes = IOUtils.toByteArray(stream); - ObjectMetadata objectMetadata = new ObjectMetadata(); - objectMetadata.setContentLength(size); - objectMetadata.setContentType(contextType); - ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bytes); - // 上传 - return amazonS3.putObject(bucketName, objectName, byteArrayInputStream, objectMetadata); + /** + * 上传文件 + * + * @param bucketName bucket名称 + * @param objectName 文件名称 + * @param stream 文件流 + * @param size 大小 + * @param contextType 类型 + * @throws Exception + * @see AWS + * API Documentation + */ + public PutObjectResult putObject(String bucketName, String objectName, InputStream stream, long size, + String contextType) throws Exception { + // String fileName = getFileName(objectName); + byte[] bytes = IOUtils.toByteArray(stream); + ObjectMetadata objectMetadata = new ObjectMetadata(); + objectMetadata.setContentLength(size); + objectMetadata.setContentType(contextType); + ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bytes); + // 上传 + return amazonS3.putObject(bucketName, objectName, byteArrayInputStream, objectMetadata); - } + } - /** - * 获取文件信息 - * @param bucketName bucket名称 - * @param objectName 文件名称 - * @see AWS - * API Documentation - */ - public S3Object getObjectInfo(String bucketName, String objectName) throws Exception { - @Cleanup - S3Object object = amazonS3.getObject(bucketName, objectName); - return object; - } + /** + * 获取文件信息 + * + * @param bucketName bucket名称 + * @param objectName 文件名称 + * @see AWS + * API Documentation + */ + public S3Object getObjectInfo(String bucketName, String objectName) throws Exception { + @Cleanup + S3Object object = amazonS3.getObject(bucketName, objectName); + return object; + } - /** - * 删除文件 - * @param bucketName bucket名称 - * @param objectName 文件名称 - * @throws Exception - * @see AWS API - * Documentation - */ - public void removeObject(String bucketName, String objectName) throws Exception { - amazonS3.deleteObject(bucketName, objectName); - } + /** + * 删除文件 + * + * @param bucketName bucket名称 + * @param objectName 文件名称 + * @throws Exception + * @see AWS API + * Documentation + */ + public void removeObject(String bucketName, String objectName) throws Exception { + amazonS3.deleteObject(bucketName, objectName); + } - @Override - public void afterPropertiesSet() { - ClientConfiguration clientConfiguration = new ClientConfiguration(); - clientConfiguration.setMaxConnections(properties.getOss().getMaxConnections()); + @Override + public void afterPropertiesSet() { + ClientConfiguration clientConfiguration = new ClientConfiguration(); + clientConfiguration.setMaxConnections(properties.getOss().getMaxConnections()); - AwsClientBuilder.EndpointConfiguration endpointConfiguration = new AwsClientBuilder.EndpointConfiguration( - properties.getOss().getEndpoint(), properties.getOss().getRegion()); - AWSCredentials awsCredentials = new BasicAWSCredentials(properties.getOss().getAccessKey(), - properties.getOss().getSecretKey()); - AWSCredentialsProvider awsCredentialsProvider = new AWSStaticCredentialsProvider(awsCredentials); - this.amazonS3 = AmazonS3Client.builder().withEndpointConfiguration(endpointConfiguration) - .withClientConfiguration(clientConfiguration).withCredentials(awsCredentialsProvider) - .disableChunkedEncoding().withPathStyleAccessEnabled(properties.getOss().getPathStyleAccess()).build(); - } + AwsClientBuilder.EndpointConfiguration endpointConfiguration = new AwsClientBuilder.EndpointConfiguration( + properties.getOss().getEndpoint(), properties.getOss().getRegion()); + AWSCredentials awsCredentials = new BasicAWSCredentials(properties.getOss().getAccessKey(), + properties.getOss().getSecretKey()); + AWSCredentialsProvider awsCredentialsProvider = new AWSStaticCredentialsProvider(awsCredentials); + this.amazonS3 = AmazonS3Client.builder().withEndpointConfiguration(endpointConfiguration) + .withClientConfiguration(clientConfiguration).withCredentials(awsCredentialsProvider) + .disableChunkedEncoding().withPathStyleAccessEnabled(properties.getOss().getPathStyleAccess()).build(); + } } diff --git a/pigx-common/pigx-common-seata/pom.xml b/pigx-common/pigx-common-seata/pom.xml index 869016f36..dd431a157 100644 --- a/pigx-common/pigx-common-seata/pom.xml +++ b/pigx-common/pigx-common-seata/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 pigx-common-seata diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml index b0277bdab..4bc4a6781 100644 --- a/pigx-common/pigx-common-security/pom.xml +++ b/pigx-common/pigx-common-security/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 pigx-common-security diff --git a/pigx-common/pigx-common-sensitive/pom.xml b/pigx-common/pigx-common-sensitive/pom.xml index 8ce6a7070..08ecf9f92 100644 --- a/pigx-common/pigx-common-sensitive/pom.xml +++ b/pigx-common/pigx-common-sensitive/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 pigx-common-sensitive diff --git a/pigx-common/pigx-common-sentinel/pom.xml b/pigx-common/pigx-common-sentinel/pom.xml index a452e3b8c..af660726c 100755 --- a/pigx-common/pigx-common-sentinel/pom.xml +++ b/pigx-common/pigx-common-sentinel/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 4.0.0 diff --git a/pigx-common/pigx-common-sequence/pom.xml b/pigx-common/pigx-common-sequence/pom.xml index 49312fdc1..a61784296 100755 --- a/pigx-common/pigx-common-sequence/pom.xml +++ b/pigx-common/pigx-common-sequence/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 pigx-common-sequence diff --git a/pigx-common/pigx-common-sse/pom.xml b/pigx-common/pigx-common-sse/pom.xml index ddf5667fc..3ef3b9d16 100755 --- a/pigx-common/pigx-common-sse/pom.xml +++ b/pigx-common/pigx-common-sse/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 pigx-common-sse diff --git a/pigx-common/pigx-common-swagger/pom.xml b/pigx-common/pigx-common-swagger/pom.xml index 392f687d8..cc4e22e31 100644 --- a/pigx-common/pigx-common-swagger/pom.xml +++ b/pigx-common/pigx-common-swagger/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 pigx-common-swagger diff --git a/pigx-common/pigx-common-websocket/pom.xml b/pigx-common/pigx-common-websocket/pom.xml index 4048cb9d0..9d5650634 100755 --- a/pigx-common/pigx-common-websocket/pom.xml +++ b/pigx-common/pigx-common-websocket/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 pigx-common-websocket diff --git a/pigx-common/pigx-common-xss/pom.xml b/pigx-common/pigx-common-xss/pom.xml index 462aed2b3..edd0c48a8 100755 --- a/pigx-common/pigx-common-xss/pom.xml +++ b/pigx-common/pigx-common-xss/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 5.7.0 + 5.8.0 pigx-common-xss diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml index 9a0301a6f..32cb2c822 100644 --- a/pigx-common/pom.xml +++ b/pigx-common/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.7.0 + 5.8.0 pigx-common diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-api/pom.xml b/pigx-flow/pigx-flow-engine/pigx-flow-engine-api/pom.xml index bc70fd41b..107d11bcf 100644 --- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-api/pom.xml +++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-api/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx-flow-engine - 5.7.0 + 5.8.0 pigx-flow-engine-api diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml index f473cf8bc..1923ec732 100644 --- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml +++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx-flow-engine - 5.7.0 + 5.8.0 pigx-flow-engine-biz diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/node/impl/AssignUserFormStrategyImpl.java b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/node/impl/AssignUserFormStrategyImpl.java index 5be14b2de..d2ca8f12d 100644 --- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/node/impl/AssignUserFormStrategyImpl.java +++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/com/pig4cloud/pigx/flow/engine/node/impl/AssignUserFormStrategyImpl.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 来自表单 @@ -37,7 +38,7 @@ public class AssignUserFormStrategyImpl implements AssignUserStrategy { if (variable != null && !StrUtil.isBlankIfStr(variable)) { String jsonString = objectMapper.writeValueAsString(variable); List nodeUserDtoList = JSONUtil.toList(jsonString, NodeUser.class); - assignList.addAll(nodeUserDtoList.stream().map(NodeUser::getId).toList()); + assignList.addAll(nodeUserDtoList.stream().map(NodeUser::getId).collect(Collectors.toList())); } return assignList; diff --git a/pigx-flow/pigx-flow-engine/pom.xml b/pigx-flow/pigx-flow-engine/pom.xml index 1c67b0cac..d456436a2 100644 --- a/pigx-flow/pigx-flow-engine/pom.xml +++ b/pigx-flow/pigx-flow-engine/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx-flow - 5.7.0 + 5.8.0 pigx-flow-engine diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/pom.xml b/pigx-flow/pigx-flow-task/pigx-flow-task-api/pom.xml index 41723504c..f533721b1 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/pom.xml +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx-flow-task - 5.7.0 + 5.8.0 pigx-flow-task-api diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml index 4f5f5bbe2..1805d2212 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx-flow-task - 5.7.0 + 5.8.0 pigx-flow-task-biz diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/RemoteServiceImpl.java b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/RemoteServiceImpl.java index ec019d2aa..c5d853200 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/RemoteServiceImpl.java +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/RemoteServiceImpl.java @@ -134,7 +134,7 @@ public class RemoteServiceImpl implements IRemoteService { .getData() .stream() .map(SysUser::getUserId) - .toList(); + .collect(Collectors.toList()); return R.ok(list); } diff --git a/pigx-flow/pigx-flow-task/pom.xml b/pigx-flow/pigx-flow-task/pom.xml index 1c7a513ae..d093e0a39 100644 --- a/pigx-flow/pigx-flow-task/pom.xml +++ b/pigx-flow/pigx-flow-task/pom.xml @@ -7,7 +7,7 @@ com.pig4cloud pigx-flow - 5.7.0 + 5.8.0 pigx-flow-task diff --git a/pigx-flow/pom.xml b/pigx-flow/pom.xml index eb09940a0..8c07c21e6 100644 --- a/pigx-flow/pom.xml +++ b/pigx-flow/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.7.0 + 5.8.0 pigx-flow diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index 65949b803..edc569232 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.7.0 + 5.8.0 pigx-gateway diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml index b85e940c2..220290c0b 100644 --- a/pigx-register/pom.xml +++ b/pigx-register/pom.xml @@ -18,7 +18,7 @@ com.pig4cloud pigx - 5.7.0 + 5.8.0 pigx-register diff --git a/pigx-upms/pigx-upms-api/pom.xml b/pigx-upms/pigx-upms-api/pom.xml index ba54b255d..c1c3809c2 100644 --- a/pigx-upms/pigx-upms-api/pom.xml +++ b/pigx-upms/pigx-upms-api/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-upms - 5.7.0 + 5.8.0 pigx-upms-api diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index 9c762f508..7def1cce9 100644 --- a/pigx-upms/pigx-upms-biz/pom.xml +++ b/pigx-upms/pigx-upms-biz/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-upms - 5.7.0 + 5.8.0 pigx-upms-biz diff --git a/pigx-upms/pom.xml b/pigx-upms/pom.xml index f8c15f1ad..637419ff3 100644 --- a/pigx-upms/pom.xml +++ b/pigx-upms/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.7.0 + 5.8.0 pigx-upms diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml index 8a6c2b817..a47d8a771 100755 --- a/pigx-visual/pigx-codegen/pom.xml +++ b/pigx-visual/pigx-codegen/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 5.7.0 + 5.8.0 pigx-codegen diff --git a/pigx-visual/pigx-daemon-elastic-job/pom.xml b/pigx-visual/pigx-daemon-elastic-job/pom.xml index 9e7bbea44..a6463dc57 100644 --- a/pigx-visual/pigx-daemon-elastic-job/pom.xml +++ b/pigx-visual/pigx-daemon-elastic-job/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-visual - 5.7.0 + 5.8.0 pigx-daemon-elastic-job diff --git a/pigx-visual/pigx-daemon-quartz/pom.xml b/pigx-visual/pigx-daemon-quartz/pom.xml index f325e8a91..5f986e65c 100644 --- a/pigx-visual/pigx-daemon-quartz/pom.xml +++ b/pigx-visual/pigx-daemon-quartz/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 5.7.0 + 5.8.0 4.0.0 diff --git a/pigx-visual/pigx-jimu-platform/pom.xml b/pigx-visual/pigx-jimu-platform/pom.xml index f76e91cb2..c009344c8 100755 --- a/pigx-visual/pigx-jimu-platform/pom.xml +++ b/pigx-visual/pigx-jimu-platform/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 5.7.0 + 5.8.0 pigx-jimu-platform diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml index 9de5f2bf7..a55f1a314 100644 --- a/pigx-visual/pigx-monitor/pom.xml +++ b/pigx-visual/pigx-monitor/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-visual - 5.7.0 + 5.8.0 pigx-monitor diff --git a/pigx-visual/pigx-mp-platform/pom.xml b/pigx-visual/pigx-mp-platform/pom.xml index 9d1a45985..3868bec8c 100755 --- a/pigx-visual/pigx-mp-platform/pom.xml +++ b/pigx-visual/pigx-mp-platform/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 5.7.0 + 5.8.0 pigx-mp-platform diff --git a/pigx-visual/pigx-pay-platform/pom.xml b/pigx-visual/pigx-pay-platform/pom.xml index 7a1e3d4e9..dde50d63d 100755 --- a/pigx-visual/pigx-pay-platform/pom.xml +++ b/pigx-visual/pigx-pay-platform/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 5.7.0 + 5.8.0 pigx-pay-platform diff --git a/pigx-visual/pigx-report-platform/pom.xml b/pigx-visual/pigx-report-platform/pom.xml index 0a43937b3..f0aba782c 100644 --- a/pigx-visual/pigx-report-platform/pom.xml +++ b/pigx-visual/pigx-report-platform/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 5.7.0 + 5.8.0 pigx-report-platform diff --git a/pigx-visual/pigx-seata-server/pom.xml b/pigx-visual/pigx-seata-server/pom.xml index ade4c6884..309107156 100644 --- a/pigx-visual/pigx-seata-server/pom.xml +++ b/pigx-visual/pigx-seata-server/pom.xml @@ -20,7 +20,7 @@ com.pig4cloud pigx-visual - 5.7.0 + 5.8.0 4.0.0 pigx-seata-server diff --git a/pigx-visual/pigx-sentinel-dashboard/pom.xml b/pigx-visual/pigx-sentinel-dashboard/pom.xml index a74c8a7dc..9b9392f12 100755 --- a/pigx-visual/pigx-sentinel-dashboard/pom.xml +++ b/pigx-visual/pigx-sentinel-dashboard/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 5.7.0 + 5.8.0 pigx-sentinel-dashboard diff --git a/pigx-visual/pigx-xxl-job-admin/pom.xml b/pigx-visual/pigx-xxl-job-admin/pom.xml index 36836da8a..94d75242a 100644 --- a/pigx-visual/pigx-xxl-job-admin/pom.xml +++ b/pigx-visual/pigx-xxl-job-admin/pom.xml @@ -4,7 +4,7 @@ com.pig4cloud pigx-visual - 5.7.0 + 5.8.0 pigx-xxl-job-admin diff --git a/pigx-visual/pom.xml b/pigx-visual/pom.xml index 0620cfa74..954a13c44 100644 --- a/pigx-visual/pom.xml +++ b/pigx-visual/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.7.0 + 5.8.0 pigx-visual diff --git a/pom.xml b/pom.xml index 2af1ea972..1cb0a16a1 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 5.7.0 + 5.8.0 ${project.artifactId} pom