diff --git a/kernel-a-rule/pom.xml b/kernel-a-rule/pom.xml index 896f146e4..c17a59b11 100644 --- a/kernel-a-rule/pom.xml +++ b/kernel-a-rule/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-auth/auth-api/pom.xml b/kernel-d-auth/auth-api/pom.xml index 6a522f6b4..b1157e077 100644 --- a/kernel-d-auth/auth-api/pom.xml +++ b/kernel-d-auth/auth-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-auth - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-auth/auth-sdk/pom.xml b/kernel-d-auth/auth-sdk/pom.xml index 2a9d12fd2..d52cf45ae 100644 --- a/kernel-d-auth/auth-sdk/pom.xml +++ b/kernel-d-auth/auth-sdk/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-auth - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/LoginService.java b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/LoginService.java index 1a1646ac6..decd20764 100644 --- a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/LoginService.java +++ b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/LoginService.java @@ -100,7 +100,9 @@ public class LoginService { Integer loginErrorCount = validatePasswordRetryTimes(loginRequest); // 2. 如果开启了验证码校验，则验证当前请求的验证码是否正确 - validateCaptcha(loginRequest); + if (validatePassword) { + validateCaptcha(loginRequest); + } // 3. 解密密码的密文，需要sys_config相关配置打开 decryptRequestPassword(loginRequest); diff --git a/kernel-d-auth/auth-spring-boot-starter/pom.xml b/kernel-d-auth/auth-spring-boot-starter/pom.xml index 3f0a7c1b9..d6b546256 100644 --- a/kernel-d-auth/auth-spring-boot-starter/pom.xml +++ b/kernel-d-auth/auth-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-auth - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-auth/pom.xml b/kernel-d-auth/pom.xml index dbb3a2d03..8cfc94cef 100644 --- a/kernel-d-auth/pom.xml +++ b/kernel-d-auth/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-cache/cache-api/pom.xml b/kernel-d-cache/cache-api/pom.xml index c20bd3f36..706f1d489 100644 --- a/kernel-d-cache/cache-api/pom.xml +++ b/kernel-d-cache/cache-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-cache - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-cache/cache-sdk-memory/pom.xml b/kernel-d-cache/cache-sdk-memory/pom.xml index 2bc0921dd..cd058f9f1 100644 --- a/kernel-d-cache/cache-sdk-memory/pom.xml +++ b/kernel-d-cache/cache-sdk-memory/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-cache - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-cache/cache-sdk-redis/pom.xml b/kernel-d-cache/cache-sdk-redis/pom.xml index 7679cef0a..71488c010 100644 --- a/kernel-d-cache/cache-sdk-redis/pom.xml +++ b/kernel-d-cache/cache-sdk-redis/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-cache - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-cache/cache-spring-boot-starter-memory/pom.xml b/kernel-d-cache/cache-spring-boot-starter-memory/pom.xml index b30fea627..9cfd82f57 100644 --- a/kernel-d-cache/cache-spring-boot-starter-memory/pom.xml +++ b/kernel-d-cache/cache-spring-boot-starter-memory/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-cache - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-cache/cache-spring-boot-starter-redis/pom.xml b/kernel-d-cache/cache-spring-boot-starter-redis/pom.xml index 1bb0020d9..9ca937cde 100644 --- a/kernel-d-cache/cache-spring-boot-starter-redis/pom.xml +++ b/kernel-d-cache/cache-spring-boot-starter-redis/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-cache - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-cache/pom.xml b/kernel-d-cache/pom.xml index 5479f5586..f55bf0191 100644 --- a/kernel-d-cache/pom.xml +++ b/kernel-d-cache/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-config/config-api/pom.xml b/kernel-d-config/config-api/pom.xml index 72bf357d0..294a7d8ef 100644 --- a/kernel-d-config/config-api/pom.xml +++ b/kernel-d-config/config-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-config - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-config/config-business/pom.xml b/kernel-d-config/config-business/pom.xml index f808e8020..aaf7d0320 100644 --- a/kernel-d-config/config-business/pom.xml +++ b/kernel-d-config/config-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-config - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-config/config-sdk-map/pom.xml b/kernel-d-config/config-sdk-map/pom.xml index bee842889..bfbd9af6d 100644 --- a/kernel-d-config/config-sdk-map/pom.xml +++ b/kernel-d-config/config-sdk-map/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-config - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-config/config-sdk-redis/pom.xml b/kernel-d-config/config-sdk-redis/pom.xml index 36a1530ad..dc54a155e 100644 --- a/kernel-d-config/config-sdk-redis/pom.xml +++ b/kernel-d-config/config-sdk-redis/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-config - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-config/config-spring-boot-starter/pom.xml b/kernel-d-config/config-spring-boot-starter/pom.xml index 8f43fb32c..3e92a8978 100644 --- a/kernel-d-config/config-spring-boot-starter/pom.xml +++ b/kernel-d-config/config-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-config - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-config/pom.xml b/kernel-d-config/pom.xml index 546910d15..df23324d6 100644 --- a/kernel-d-config/pom.xml +++ b/kernel-d-config/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-db/db-api/pom.xml b/kernel-d-db/db-api/pom.xml index 31383fce1..12df1433d 100644 --- a/kernel-d-db/db-api/pom.xml +++ b/kernel-d-db/db-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-db - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-db/db-sdk-flyway/pom.xml b/kernel-d-db/db-sdk-flyway/pom.xml index 45f8079df..d183398ca 100644 --- a/kernel-d-db/db-sdk-flyway/pom.xml +++ b/kernel-d-db/db-sdk-flyway/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-db - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-db/db-sdk-mp/pom.xml b/kernel-d-db/db-sdk-mp/pom.xml index 79d5a5c2c..a31bee4d7 100644 --- a/kernel-d-db/db-sdk-mp/pom.xml +++ b/kernel-d-db/db-sdk-mp/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-db - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-db/db-spring-boot-starter/pom.xml b/kernel-d-db/db-spring-boot-starter/pom.xml index edfad986e..fadb66b7c 100644 --- a/kernel-d-db/db-spring-boot-starter/pom.xml +++ b/kernel-d-db/db-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-db - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-db/pom.xml b/kernel-d-db/pom.xml index 9c10af60c..0bf532c74 100644 --- a/kernel-d-db/pom.xml +++ b/kernel-d-db/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-ds-container/ds-container-api/pom.xml b/kernel-d-ds-container/ds-container-api/pom.xml index 4bda2012f..9b9dce7a4 100644 --- a/kernel-d-ds-container/ds-container-api/pom.xml +++ b/kernel-d-ds-container/ds-container-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-ds-container - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-ds-container/ds-container-business/pom.xml b/kernel-d-ds-container/ds-container-business/pom.xml index 3b1597bcf..a258afd2b 100644 --- a/kernel-d-ds-container/ds-container-business/pom.xml +++ b/kernel-d-ds-container/ds-container-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-ds-container - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-ds-container/ds-container-sdk/pom.xml b/kernel-d-ds-container/ds-container-sdk/pom.xml index fa301f53d..b6972fe58 100644 --- a/kernel-d-ds-container/ds-container-sdk/pom.xml +++ b/kernel-d-ds-container/ds-container-sdk/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-ds-container - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-ds-container/ds-container-spring-boot-starter/pom.xml b/kernel-d-ds-container/ds-container-spring-boot-starter/pom.xml index dfdb100b8..ceeca5be5 100644 --- a/kernel-d-ds-container/ds-container-spring-boot-starter/pom.xml +++ b/kernel-d-ds-container/ds-container-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-ds-container - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-ds-container/pom.xml b/kernel-d-ds-container/pom.xml index 997338da7..440305342 100644 --- a/kernel-d-ds-container/pom.xml +++ b/kernel-d-ds-container/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-email/email-api/pom.xml b/kernel-d-email/email-api/pom.xml index f6ac1c17c..5652c1a02 100644 --- a/kernel-d-email/email-api/pom.xml +++ b/kernel-d-email/email-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-email - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-email/email-sdk-aliyun/pom.xml b/kernel-d-email/email-sdk-aliyun/pom.xml index ab6d69fb4..fb0e33c3c 100644 --- a/kernel-d-email/email-sdk-aliyun/pom.xml +++ b/kernel-d-email/email-sdk-aliyun/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-email - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-email/email-sdk-java/pom.xml b/kernel-d-email/email-sdk-java/pom.xml index 67f38d987..f91817ac1 100644 --- a/kernel-d-email/email-sdk-java/pom.xml +++ b/kernel-d-email/email-sdk-java/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-email - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-email/email-spring-boot-starter/pom.xml b/kernel-d-email/email-spring-boot-starter/pom.xml index 2dcb13d69..75c38955f 100644 --- a/kernel-d-email/email-spring-boot-starter/pom.xml +++ b/kernel-d-email/email-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-email - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-email/pom.xml b/kernel-d-email/pom.xml index 8efea63b4..db50ec963 100644 --- a/kernel-d-email/pom.xml +++ b/kernel-d-email/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-event/event-api/pom.xml b/kernel-d-event/event-api/pom.xml index d82c4d03e..4a4c3f653 100644 --- a/kernel-d-event/event-api/pom.xml +++ b/kernel-d-event/event-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-event - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-event/event-sdk/pom.xml b/kernel-d-event/event-sdk/pom.xml index b6ec2f30e..2d97ae6bb 100644 --- a/kernel-d-event/event-sdk/pom.xml +++ b/kernel-d-event/event-sdk/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-event - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-event/event-spring-boot-starter/pom.xml b/kernel-d-event/event-spring-boot-starter/pom.xml index b87357921..3973da283 100644 --- a/kernel-d-event/event-spring-boot-starter/pom.xml +++ b/kernel-d-event/event-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-event - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-event/pom.xml b/kernel-d-event/pom.xml index da525fad2..29c9d40c0 100644 --- a/kernel-d-event/pom.xml +++ b/kernel-d-event/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-file/file-api/pom.xml b/kernel-d-file/file-api/pom.xml index 33ebae0c7..359ada5d9 100644 --- a/kernel-d-file/file-api/pom.xml +++ b/kernel-d-file/file-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-file - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/FileInfoApi.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/FileInfoApi.java index 838f31b26..83b602403 100644 --- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/FileInfoApi.java +++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/FileInfoApi.java @@ -80,6 +80,16 @@ public interface FileInfoApi { */ String getFileUnAuthUrl(Long fileId); + /** + * 获取文件的下载地址（不带鉴权的），生成外网地址 + * + * @param fileIdList 文件id集合 + * @return 外部系统可以直接访问的url + * @author fengshuonan + * @since 2024/3/26 22:38 + */ + List batchGetFileUnAuthUrl(List fileIdList); + /** * 获取AntdV组件格式对应的文件信息封装 * diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/props/AliyunOssProperties.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/props/AliyunOssProperties.java index ff00462a1..f42663256 100644 --- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/props/AliyunOssProperties.java +++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/pojo/props/AliyunOssProperties.java @@ -52,4 +52,9 @@ public class AliyunOssProperties { */ private String accessKeySecret; + /** + * 获取资源前缀是否为https + */ + private Boolean httpsFlag = false; + } diff --git a/kernel-d-file/file-business/pom.xml b/kernel-d-file/file-business/pom.xml index 422b3d004..0daedfd8b 100644 --- a/kernel-d-file/file-business/pom.xml +++ b/kernel-d-file/file-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-file - 8.1.2 + 8.1.3 ../pom.xml 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 85e5c43a7..e38efc58b 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 @@ -514,6 +514,33 @@ public class SysFileInfoServiceImpl extends ServiceImpl batchGetFileUnAuthUrl(List fileIdList) { + if (ObjectUtil.isEmpty(fileIdList)) { + return new ArrayList<>(); + } + LambdaQueryWrapper sysFileInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); + sysFileInfoLambdaQueryWrapper.in(SysFileInfo::getFileId, fileIdList); + sysFileInfoLambdaQueryWrapper.select(SysFileInfo::getFileId, SysFileInfo::getFileLocation, SysFileInfo::getFileBucket, SysFileInfo::getFileObjectName); + List list = this.list(sysFileInfoLambdaQueryWrapper); + if (ObjectUtil.isEmpty(list)) { + return new ArrayList<>(); + } + + ArrayList urlList = new ArrayList<>(); + for (SysFileInfo sysFileInfo : list) { + String url; + if (sysFileInfo.getFileLocation().equals(FileLocationEnum.DB.getCode())) { + url = this.sysFileStorageService.getFileUnAuthUrl(String.valueOf(sysFileInfo.getFileId())); + } else { + // 返回第三方存储文件url + url = fileOperatorApi.getFileUnAuthUrl(sysFileInfo.getFileBucket(), sysFileInfo.getFileObjectName()); + } + urlList.add(url); + } + return urlList; + } + @Override public AntdvFileInfo buildAntdvFileInfo(Long fileId) { AntdvFileInfo antdvFileInfo = new AntdvFileInfo(); diff --git a/kernel-d-file/file-sdk-aliyun/pom.xml b/kernel-d-file/file-sdk-aliyun/pom.xml index 02af3f9ca..fc0ca7d52 100644 --- a/kernel-d-file/file-sdk-aliyun/pom.xml +++ b/kernel-d-file/file-sdk-aliyun/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-file - 8.1.2 + 8.1.3 ../pom.xml 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 ad9a410b6..47baa0367 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 @@ -32,10 +32,8 @@ 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.AliyunOssProperties; -import com.aliyun.oss.ClientException; -import com.aliyun.oss.OSS; -import com.aliyun.oss.OSSClientBuilder; -import com.aliyun.oss.OSSException; +import com.aliyun.oss.*; +import com.aliyun.oss.common.comm.Protocol; import com.aliyun.oss.model.CannedAccessControlList; import com.aliyun.oss.model.OSSObject; import com.aliyun.oss.model.PutObjectRequest; @@ -74,8 +72,13 @@ public class AliyunFileOperator implements FileOperatorApi { String accessKeyId = aliyunOssProperties.getAccessKeyId(); String accessKeySecret = aliyunOssProperties.getAccessKeySecret(); + // 根据https开关，配置协议类型 + Boolean httpsFlag = aliyunOssProperties.getHttpsFlag(); + ClientBuilderConfiguration clientBuilderConfiguration = new ClientBuilderConfiguration(); + clientBuilderConfiguration.setProtocol(httpsFlag ? Protocol.HTTPS : Protocol.HTTP); + // 创建OSSClient实例。 - ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); + ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret, clientBuilderConfiguration); } @Override diff --git a/kernel-d-file/file-sdk-local/pom.xml b/kernel-d-file/file-sdk-local/pom.xml index 03781fc6a..38ae45845 100644 --- a/kernel-d-file/file-sdk-local/pom.xml +++ b/kernel-d-file/file-sdk-local/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-file - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-file/file-sdk-minio/pom.xml b/kernel-d-file/file-sdk-minio/pom.xml index 0088f298f..86a6d3093 100644 --- a/kernel-d-file/file-sdk-minio/pom.xml +++ b/kernel-d-file/file-sdk-minio/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-file - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-file/file-sdk-qingyun/pom.xml b/kernel-d-file/file-sdk-qingyun/pom.xml index 87e587406..359c4929e 100644 --- a/kernel-d-file/file-sdk-qingyun/pom.xml +++ b/kernel-d-file/file-sdk-qingyun/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-file - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-file/file-sdk-tencent/pom.xml b/kernel-d-file/file-sdk-tencent/pom.xml index 6e3460cb1..d0dd76228 100644 --- a/kernel-d-file/file-sdk-tencent/pom.xml +++ b/kernel-d-file/file-sdk-tencent/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-file - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-file/file-spring-boot-starter/pom.xml b/kernel-d-file/file-spring-boot-starter/pom.xml index 57fd299b8..188de4831 100644 --- a/kernel-d-file/file-spring-boot-starter/pom.xml +++ b/kernel-d-file/file-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-file - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-file/pom.xml b/kernel-d-file/pom.xml index 41c29c7e4..418c38ba2 100644 --- a/kernel-d-file/pom.xml +++ b/kernel-d-file/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-groovy/groovy-api/pom.xml b/kernel-d-groovy/groovy-api/pom.xml index 5a4829d5e..1c8652332 100644 --- a/kernel-d-groovy/groovy-api/pom.xml +++ b/kernel-d-groovy/groovy-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-groovy - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-groovy/groovy-sdk/pom.xml b/kernel-d-groovy/groovy-sdk/pom.xml index b39c8d172..10b5d1648 100644 --- a/kernel-d-groovy/groovy-sdk/pom.xml +++ b/kernel-d-groovy/groovy-sdk/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-groovy - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-groovy/groovy-spring-boot-starter/pom.xml b/kernel-d-groovy/groovy-spring-boot-starter/pom.xml index 9d749f56c..58cb530cf 100644 --- a/kernel-d-groovy/groovy-spring-boot-starter/pom.xml +++ b/kernel-d-groovy/groovy-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-groovy - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-groovy/pom.xml b/kernel-d-groovy/pom.xml index c3432548e..f33769e1d 100644 --- a/kernel-d-groovy/pom.xml +++ b/kernel-d-groovy/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-i18n/i18n-api/pom.xml b/kernel-d-i18n/i18n-api/pom.xml index e1de8fbc0..7c336e8f8 100644 --- a/kernel-d-i18n/i18n-api/pom.xml +++ b/kernel-d-i18n/i18n-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-i18n - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-i18n/i18n-business/pom.xml b/kernel-d-i18n/i18n-business/pom.xml index 6560623f2..123271683 100644 --- a/kernel-d-i18n/i18n-business/pom.xml +++ b/kernel-d-i18n/i18n-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-i18n - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-i18n/i18n-sdk/pom.xml b/kernel-d-i18n/i18n-sdk/pom.xml index d08b00eba..ccad93db2 100644 --- a/kernel-d-i18n/i18n-sdk/pom.xml +++ b/kernel-d-i18n/i18n-sdk/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-i18n - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-i18n/i18n-spring-boot-starter/pom.xml b/kernel-d-i18n/i18n-spring-boot-starter/pom.xml index d933e58d9..f51f01066 100644 --- a/kernel-d-i18n/i18n-spring-boot-starter/pom.xml +++ b/kernel-d-i18n/i18n-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-i18n - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-i18n/pom.xml b/kernel-d-i18n/pom.xml index eda1f6a2a..2bc12a812 100644 --- a/kernel-d-i18n/pom.xml +++ b/kernel-d-i18n/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-jwt/jwt-api/pom.xml b/kernel-d-jwt/jwt-api/pom.xml index a88999af0..a3c1d69dd 100644 --- a/kernel-d-jwt/jwt-api/pom.xml +++ b/kernel-d-jwt/jwt-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-jwt - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-jwt/jwt-sdk/pom.xml b/kernel-d-jwt/jwt-sdk/pom.xml index fc469cd6f..3b2972f8c 100644 --- a/kernel-d-jwt/jwt-sdk/pom.xml +++ b/kernel-d-jwt/jwt-sdk/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-jwt - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-jwt/pom.xml b/kernel-d-jwt/pom.xml index 3cb6c3484..47f06e093 100644 --- a/kernel-d-jwt/pom.xml +++ b/kernel-d-jwt/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-log/log-api/pom.xml b/kernel-d-log/log-api/pom.xml index 668fc6d7f..8b2fa59a5 100644 --- a/kernel-d-log/log-api/pom.xml +++ b/kernel-d-log/log-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-log - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-log/log-business-login-log/pom.xml b/kernel-d-log/log-business-login-log/pom.xml index a49c8d198..640ef2ed8 100644 --- a/kernel-d-log/log-business-login-log/pom.xml +++ b/kernel-d-log/log-business-login-log/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-log - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-log/log-business-requestapi/pom.xml b/kernel-d-log/log-business-requestapi/pom.xml index 7aa827190..d31f91ead 100644 --- a/kernel-d-log/log-business-requestapi/pom.xml +++ b/kernel-d-log/log-business-requestapi/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-log - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-log/log-business/pom.xml b/kernel-d-log/log-business/pom.xml index 06911cb91..c80874b44 100644 --- a/kernel-d-log/log-business/pom.xml +++ b/kernel-d-log/log-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-log - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-log/log-spring-boot-starter/pom.xml b/kernel-d-log/log-spring-boot-starter/pom.xml index b4bfe2853..a332142e0 100644 --- a/kernel-d-log/log-spring-boot-starter/pom.xml +++ b/kernel-d-log/log-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-log - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-log/pom.xml b/kernel-d-log/pom.xml index 8cd50103b..cd3ec4c44 100644 --- a/kernel-d-log/pom.xml +++ b/kernel-d-log/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-office/office-api/pom.xml b/kernel-d-office/office-api/pom.xml index 99454da4d..d0441602d 100644 --- a/kernel-d-office/office-api/pom.xml +++ b/kernel-d-office/office-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-office - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-office/office-sdk-excel/pom.xml b/kernel-d-office/office-sdk-excel/pom.xml index e45bcd2a7..e19ebc5e5 100644 --- a/kernel-d-office/office-sdk-excel/pom.xml +++ b/kernel-d-office/office-sdk-excel/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-office - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-office/pom.xml b/kernel-d-office/pom.xml index 25b5dbd15..6a5711282 100644 --- a/kernel-d-office/pom.xml +++ b/kernel-d-office/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-pinyin/pinyin-api/pom.xml b/kernel-d-pinyin/pinyin-api/pom.xml index f87d619df..10ba0a3ad 100644 --- a/kernel-d-pinyin/pinyin-api/pom.xml +++ b/kernel-d-pinyin/pinyin-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-pinyin - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-pinyin/pinyin-sdk-pinyin4j/pom.xml b/kernel-d-pinyin/pinyin-sdk-pinyin4j/pom.xml index 4f9d09c3c..0bd66349d 100644 --- a/kernel-d-pinyin/pinyin-sdk-pinyin4j/pom.xml +++ b/kernel-d-pinyin/pinyin-sdk-pinyin4j/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-pinyin - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-pinyin/pinyin-spring-boot-starter/pom.xml b/kernel-d-pinyin/pinyin-spring-boot-starter/pom.xml index 47bd6e531..7bfd887e2 100644 --- a/kernel-d-pinyin/pinyin-spring-boot-starter/pom.xml +++ b/kernel-d-pinyin/pinyin-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-pinyin - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-pinyin/pom.xml b/kernel-d-pinyin/pom.xml index 778dde0f1..a6ced7eb5 100644 --- a/kernel-d-pinyin/pom.xml +++ b/kernel-d-pinyin/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-scanner/pom.xml b/kernel-d-scanner/pom.xml index de0236e66..31e973c60 100644 --- a/kernel-d-scanner/pom.xml +++ b/kernel-d-scanner/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-scanner/scanner-api/pom.xml b/kernel-d-scanner/scanner-api/pom.xml index e4ec33eae..ad7241c55 100644 --- a/kernel-d-scanner/scanner-api/pom.xml +++ b/kernel-d-scanner/scanner-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-scanner - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-scanner/scanner-sdk-scanner/pom.xml b/kernel-d-scanner/scanner-sdk-scanner/pom.xml index 83390e800..b30429573 100644 --- a/kernel-d-scanner/scanner-sdk-scanner/pom.xml +++ b/kernel-d-scanner/scanner-sdk-scanner/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-scanner - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-scanner/scanner-spring-boot-starter/pom.xml b/kernel-d-scanner/scanner-spring-boot-starter/pom.xml index e3b3cd58a..bbfa8fc9d 100644 --- a/kernel-d-scanner/scanner-spring-boot-starter/pom.xml +++ b/kernel-d-scanner/scanner-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-scanner - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-security/pom.xml b/kernel-d-security/pom.xml index 3e9c469d7..38f1867e8 100644 --- a/kernel-d-security/pom.xml +++ b/kernel-d-security/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-security/security-api/pom.xml b/kernel-d-security/security-api/pom.xml index ab818501a..0af038bdf 100644 --- a/kernel-d-security/security-api/pom.xml +++ b/kernel-d-security/security-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-security - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-security/security-sdk-allow-cors/pom.xml b/kernel-d-security/security-sdk-allow-cors/pom.xml index 90799ac11..7de31c88a 100644 --- a/kernel-d-security/security-sdk-allow-cors/pom.xml +++ b/kernel-d-security/security-sdk-allow-cors/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-security - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-security/security-sdk-captcha/pom.xml b/kernel-d-security/security-sdk-captcha/pom.xml index b423a6af8..f884d62f6 100644 --- a/kernel-d-security/security-sdk-captcha/pom.xml +++ b/kernel-d-security/security-sdk-captcha/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-security - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-security/security-sdk-clear-threadlocal/pom.xml b/kernel-d-security/security-sdk-clear-threadlocal/pom.xml index 4aba28b9e..b46a41f9a 100644 --- a/kernel-d-security/security-sdk-clear-threadlocal/pom.xml +++ b/kernel-d-security/security-sdk-clear-threadlocal/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-security - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-security/security-sdk-count/pom.xml b/kernel-d-security/security-sdk-count/pom.xml index 861cc6ab4..15c3a28b4 100644 --- a/kernel-d-security/security-sdk-count/pom.xml +++ b/kernel-d-security/security-sdk-count/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-security - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-security/security-sdk-database-field/pom.xml b/kernel-d-security/security-sdk-database-field/pom.xml index 7df551777..8633b8d34 100644 --- a/kernel-d-security/security-sdk-database-field/pom.xml +++ b/kernel-d-security/security-sdk-database-field/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-security - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-security/security-sdk-request-encrypt-and-decode/pom.xml b/kernel-d-security/security-sdk-request-encrypt-and-decode/pom.xml index aa629ab7d..e8ac464d1 100644 --- a/kernel-d-security/security-sdk-request-encrypt-and-decode/pom.xml +++ b/kernel-d-security/security-sdk-request-encrypt-and-decode/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-security - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-security/security-sdk-xss/pom.xml b/kernel-d-security/security-sdk-xss/pom.xml index d154b843d..6c0d8181b 100644 --- a/kernel-d-security/security-sdk-xss/pom.xml +++ b/kernel-d-security/security-sdk-xss/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-security - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-security/security-spring-boot-starter/pom.xml b/kernel-d-security/security-spring-boot-starter/pom.xml index 46624d5a5..ad25024ac 100644 --- a/kernel-d-security/security-spring-boot-starter/pom.xml +++ b/kernel-d-security/security-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-security - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-sms/pom.xml b/kernel-d-sms/pom.xml index 7be544dab..07018c569 100644 --- a/kernel-d-sms/pom.xml +++ b/kernel-d-sms/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-sms/sms-api/pom.xml b/kernel-d-sms/sms-api/pom.xml index 3c97b6020..bad76b1e3 100644 --- a/kernel-d-sms/sms-api/pom.xml +++ b/kernel-d-sms/sms-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-sms - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-sms/sms-business-validation/pom.xml b/kernel-d-sms/sms-business-validation/pom.xml index 1b711064f..0ef9d7181 100644 --- a/kernel-d-sms/sms-business-validation/pom.xml +++ b/kernel-d-sms/sms-business-validation/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-sms - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-sms/sms-sdk-aliyun/pom.xml b/kernel-d-sms/sms-sdk-aliyun/pom.xml index d60ceabed..505f10ca3 100644 --- a/kernel-d-sms/sms-sdk-aliyun/pom.xml +++ b/kernel-d-sms/sms-sdk-aliyun/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-sms - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-sms/sms-sdk-tencent/pom.xml b/kernel-d-sms/sms-sdk-tencent/pom.xml index e0c1eee91..aa09b19e4 100644 --- a/kernel-d-sms/sms-sdk-tencent/pom.xml +++ b/kernel-d-sms/sms-sdk-tencent/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-sms - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-sms/sms-spring-boot-starter/pom.xml b/kernel-d-sms/sms-spring-boot-starter/pom.xml index cbe337dd8..172373bd2 100644 --- a/kernel-d-sms/sms-spring-boot-starter/pom.xml +++ b/kernel-d-sms/sms-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-sms - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-timer/pom.xml b/kernel-d-timer/pom.xml index 4d66105f3..cf1be329b 100644 --- a/kernel-d-timer/pom.xml +++ b/kernel-d-timer/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-timer/timer-api/pom.xml b/kernel-d-timer/timer-api/pom.xml index 78d2f3eaf..e724c6821 100644 --- a/kernel-d-timer/timer-api/pom.xml +++ b/kernel-d-timer/timer-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-timer - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-timer/timer-business/pom.xml b/kernel-d-timer/timer-business/pom.xml index 030657749..ce4e7c44b 100644 --- a/kernel-d-timer/timer-business/pom.xml +++ b/kernel-d-timer/timer-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-timer - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-timer/timer-sdk-hutool/pom.xml b/kernel-d-timer/timer-sdk-hutool/pom.xml index b639df682..a86d10780 100644 --- a/kernel-d-timer/timer-sdk-hutool/pom.xml +++ b/kernel-d-timer/timer-sdk-hutool/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-timer - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-timer/timer-spring-boot-starter/pom.xml b/kernel-d-timer/timer-spring-boot-starter/pom.xml index 3bdab9245..3e273f699 100644 --- a/kernel-d-timer/timer-spring-boot-starter/pom.xml +++ b/kernel-d-timer/timer-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-timer - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-validator/pom.xml b/kernel-d-validator/pom.xml index 61fc5f2ab..b61e6485c 100644 --- a/kernel-d-validator/pom.xml +++ b/kernel-d-validator/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-validator/validator-api-table-unique/pom.xml b/kernel-d-validator/validator-api-table-unique/pom.xml index 8b872fef6..310288c7c 100644 --- a/kernel-d-validator/validator-api-table-unique/pom.xml +++ b/kernel-d-validator/validator-api-table-unique/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-validator - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-validator/validator-api/pom.xml b/kernel-d-validator/validator-api/pom.xml index 2a3302218..3bf3a20ad 100644 --- a/kernel-d-validator/validator-api/pom.xml +++ b/kernel-d-validator/validator-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-validator - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-validator/validator-spring-boot-starter/pom.xml b/kernel-d-validator/validator-spring-boot-starter/pom.xml index b58e92e50..0a40fe72b 100644 --- a/kernel-d-validator/validator-spring-boot-starter/pom.xml +++ b/kernel-d-validator/validator-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-validator - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-wrapper/pom.xml b/kernel-d-wrapper/pom.xml index 89e614753..2ece88d43 100644 --- a/kernel-d-wrapper/pom.xml +++ b/kernel-d-wrapper/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-wrapper/wrapper-api/pom.xml b/kernel-d-wrapper/wrapper-api/pom.xml index 9e7f61ac6..d5c324150 100644 --- a/kernel-d-wrapper/wrapper-api/pom.xml +++ b/kernel-d-wrapper/wrapper-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-wrapper - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-wrapper/wrapper-field-sdk/pom.xml b/kernel-d-wrapper/wrapper-field-sdk/pom.xml index c4f005b7c..4d6ad88e9 100644 --- a/kernel-d-wrapper/wrapper-field-sdk/pom.xml +++ b/kernel-d-wrapper/wrapper-field-sdk/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-wrapper - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-wrapper/wrapper-sdk/pom.xml b/kernel-d-wrapper/wrapper-sdk/pom.xml index 3bbdd3f5a..9081aba3f 100644 --- a/kernel-d-wrapper/wrapper-sdk/pom.xml +++ b/kernel-d-wrapper/wrapper-sdk/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-wrapper - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-d-wrapper/wrapper-spring-boot-starter/pom.xml b/kernel-d-wrapper/wrapper-spring-boot-starter/pom.xml index acecf8270..849abeb9f 100644 --- a/kernel-d-wrapper/wrapper-spring-boot-starter/pom.xml +++ b/kernel-d-wrapper/wrapper-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-d-wrapper - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-o-monitor/monitor-api/pom.xml b/kernel-o-monitor/monitor-api/pom.xml index c4c872ca7..0dd9d452a 100644 --- a/kernel-o-monitor/monitor-api/pom.xml +++ b/kernel-o-monitor/monitor-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-o-monitor - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-o-monitor/monitor-business-system-info/pom.xml b/kernel-o-monitor/monitor-business-system-info/pom.xml index 41900a8ca..398e26d97 100644 --- a/kernel-o-monitor/monitor-business-system-info/pom.xml +++ b/kernel-o-monitor/monitor-business-system-info/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-o-monitor - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-o-monitor/monitor-spring-boot-starter/pom.xml b/kernel-o-monitor/monitor-spring-boot-starter/pom.xml index 36df54abe..57faf7503 100644 --- a/kernel-o-monitor/monitor-spring-boot-starter/pom.xml +++ b/kernel-o-monitor/monitor-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-o-monitor - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-o-monitor/pom.xml b/kernel-o-monitor/pom.xml index c6740d595..e06d6dc59 100644 --- a/kernel-o-monitor/pom.xml +++ b/kernel-o-monitor/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-customer/customer-api/pom.xml b/kernel-s-customer/customer-api/pom.xml index 7dba946f4..adf26fdb1 100644 --- a/kernel-s-customer/customer-api/pom.xml +++ b/kernel-s-customer/customer-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-customer - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-customer/customer-business/pom.xml b/kernel-s-customer/customer-business/pom.xml index 7ce1748b7..01dbd9311 100644 --- a/kernel-s-customer/customer-business/pom.xml +++ b/kernel-s-customer/customer-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-customer - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-customer/customer-spring-boot-starter/pom.xml b/kernel-s-customer/customer-spring-boot-starter/pom.xml index dfb81ff1e..e4d54efdc 100644 --- a/kernel-s-customer/customer-spring-boot-starter/pom.xml +++ b/kernel-s-customer/customer-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-customer - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-customer/pom.xml b/kernel-s-customer/pom.xml index abd617a02..682fe2620 100644 --- a/kernel-s-customer/pom.xml +++ b/kernel-s-customer/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-demo/demo-api/pom.xml b/kernel-s-demo/demo-api/pom.xml index c0ab7c2b1..d99ccbceb 100644 --- a/kernel-s-demo/demo-api/pom.xml +++ b/kernel-s-demo/demo-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-demo - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-demo/demo-business/pom.xml b/kernel-s-demo/demo-business/pom.xml index cbc6c186a..2bced5848 100644 --- a/kernel-s-demo/demo-business/pom.xml +++ b/kernel-s-demo/demo-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-demo - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-demo/demo-spring-boot-starter/pom.xml b/kernel-s-demo/demo-spring-boot-starter/pom.xml index 3e11a2ad9..5b82f0cd9 100644 --- a/kernel-s-demo/demo-spring-boot-starter/pom.xml +++ b/kernel-s-demo/demo-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-demo - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-demo/pom.xml b/kernel-s-demo/pom.xml index 205dd9942..6e30e653c 100644 --- a/kernel-s-demo/pom.xml +++ b/kernel-s-demo/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-dict/dict-api/pom.xml b/kernel-s-dict/dict-api/pom.xml index a2d877b28..4b5d9ce42 100644 --- a/kernel-s-dict/dict-api/pom.xml +++ b/kernel-s-dict/dict-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-dict - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-dict/dict-business/pom.xml b/kernel-s-dict/dict-business/pom.xml index 216d4d4c2..ee08b0864 100644 --- a/kernel-s-dict/dict-business/pom.xml +++ b/kernel-s-dict/dict-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-dict - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-dict/dict-city-business/pom.xml b/kernel-s-dict/dict-city-business/pom.xml index 3930925e2..027f4b857 100644 --- a/kernel-s-dict/dict-city-business/pom.xml +++ b/kernel-s-dict/dict-city-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-dict - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-dict/dict-spring-boot-starter/pom.xml b/kernel-s-dict/dict-spring-boot-starter/pom.xml index 87a3a6d99..6c5198fbf 100644 --- a/kernel-s-dict/dict-spring-boot-starter/pom.xml +++ b/kernel-s-dict/dict-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-dict - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-dict/pom.xml b/kernel-s-dict/pom.xml index 30b5d7e30..601b3f5fd 100644 --- a/kernel-s-dict/pom.xml +++ b/kernel-s-dict/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-group/group-api/pom.xml b/kernel-s-group/group-api/pom.xml index 6615732f6..26e3309c8 100644 --- a/kernel-s-group/group-api/pom.xml +++ b/kernel-s-group/group-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-group - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-group/group-business/pom.xml b/kernel-s-group/group-business/pom.xml index cbbe6f4fe..b259d510c 100644 --- a/kernel-s-group/group-business/pom.xml +++ b/kernel-s-group/group-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-group - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-group/group-spring-boot-starter/pom.xml b/kernel-s-group/group-spring-boot-starter/pom.xml index a36b9e724..6a0b1236c 100644 --- a/kernel-s-group/group-spring-boot-starter/pom.xml +++ b/kernel-s-group/group-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-group - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-group/pom.xml b/kernel-s-group/pom.xml index 2401a938f..511124a9a 100644 --- a/kernel-s-group/pom.xml +++ b/kernel-s-group/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-stat/pom.xml b/kernel-s-stat/pom.xml index 13519031f..28b651623 100644 --- a/kernel-s-stat/pom.xml +++ b/kernel-s-stat/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-stat/stat-api/pom.xml b/kernel-s-stat/stat-api/pom.xml index cc186ced0..b273fdd43 100644 --- a/kernel-s-stat/stat-api/pom.xml +++ b/kernel-s-stat/stat-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-stat - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-stat/stat-business/pom.xml b/kernel-s-stat/stat-business/pom.xml index 0e2f5f410..d233339fc 100644 --- a/kernel-s-stat/stat-business/pom.xml +++ b/kernel-s-stat/stat-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-stat - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-stat/stat-spring-boot-starter/pom.xml b/kernel-s-stat/stat-spring-boot-starter/pom.xml index 65e4bb29c..a5fc6e15f 100644 --- a/kernel-s-stat/stat-spring-boot-starter/pom.xml +++ b/kernel-s-stat/stat-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-stat - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-system/pom.xml b/kernel-s-system/pom.xml index 375e5f9b1..798f0d015 100644 --- a/kernel-s-system/pom.xml +++ b/kernel-s-system/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-system/system-api/pom.xml b/kernel-s-system/system-api/pom.xml index 307b4be83..bdfe93674 100644 --- a/kernel-s-system/system-api/pom.xml +++ b/kernel-s-system/system-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-system - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-system/system-business-hr/pom.xml b/kernel-s-system/system-business-hr/pom.xml index 4bf023148..f9dfab181 100644 --- a/kernel-s-system/system-business-hr/pom.xml +++ b/kernel-s-system/system-business-hr/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-system - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/factory/SysUserCreateFactory.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/factory/SysUserCreateFactory.java index 46969c284..23f5db38b 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/factory/SysUserCreateFactory.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/factory/SysUserCreateFactory.java @@ -39,6 +39,11 @@ public class SysUserCreateFactory { if (ObjectUtil.isNotEmpty(sysUserRequest.getPhone())) { sysUser.setPhone(sysUserRequest.getPhone()); } + + // 头像id + if (ObjectUtil.isNotEmpty(sysUserRequest.getAvatar())) { + sysUser.setAvatar(sysUserRequest.getAvatar()); + } } } diff --git a/kernel-s-system/system-business-permission/pom.xml b/kernel-s-system/system-business-permission/pom.xml index 685b89e4e..90a23b1e5 100644 --- a/kernel-s-system/system-business-permission/pom.xml +++ b/kernel-s-system/system-business-permission/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-system - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java index 15ab31e5a..f132d319c 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java @@ -88,7 +88,8 @@ public class UserIndexInfoService { this.fillUserBaseInfo(loginUser.getUserId(), userIndexInfo); // 2. 获取用户所有的部门和任职信息，并默认激活（选中）主部门的任职信息 - this.fillUserOrgInfo(loginUser, userIndexInfo); + List indexUserOrgInfos = this.fillUserOrgInfo(loginUser); + userIndexInfo.setUserOrgInfoList(indexUserOrgInfos); // 3. 获取用户的权限编码集合 List userMenuList = this.fillUserPermissionCodeList(loginUser, userIndexInfo); @@ -144,19 +145,6 @@ public class UserIndexInfoService { sessionManagerApi.updateSession(loginUser.getToken(), loginUser); } - /** - * 填充用户的基本姓名和头像信息 - * - * @author fengshuonan - * @since 2023/6/18 23:01 - */ - private void fillUserBaseInfo(Long userId, UserIndexInfo userIndexInfo) { - SimpleUserDTO simpleUserDTO = sysUserServiceApi.getUserInfoByUserId(userId); - userIndexInfo.setUserId(simpleUserDTO.getUserId()); - userIndexInfo.setRealName(simpleUserDTO.getRealName()); - userIndexInfo.setAvatarUrl(simpleUserDTO.getAvatarUrl()); - } - /** * 获取用户的任职信息，包含了机构的详细描述 *

@@ -167,7 +155,7 @@ public class UserIndexInfoService { * @author fengshuonan * @since 2023/6/18 23:33 */ - private void fillUserOrgInfo(LoginUser loginUser, UserIndexInfo userIndexInfo) { + public List fillUserOrgInfo(LoginUser loginUser) { List resultUserOrg = new ArrayList<>(); @@ -179,8 +167,7 @@ public class UserIndexInfoService { // 查询到机构为空，直接返回 if (ObjectUtil.isEmpty(userOrgList)) { - userIndexInfo.setUserOrgInfoList(resultUserOrg); - return; + return resultUserOrg; } // 判断用户是否被改过机构，判断currentOrgId是否失效 @@ -245,7 +232,20 @@ public class UserIndexInfoService { } // 填充用户组织机构信息 - userIndexInfo.setUserOrgInfoList(resultUserOrg); + return resultUserOrg; + } + + /** + * 填充用户的基本姓名和头像信息 + * + * @author fengshuonan + * @since 2023/6/18 23:01 + */ + private void fillUserBaseInfo(Long userId, UserIndexInfo userIndexInfo) { + SimpleUserDTO simpleUserDTO = sysUserServiceApi.getUserInfoByUserId(userId); + userIndexInfo.setUserId(simpleUserDTO.getUserId()); + userIndexInfo.setRealName(simpleUserDTO.getRealName()); + userIndexInfo.setAvatarUrl(simpleUserDTO.getAvatarUrl()); } /** diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/UserRoleDataScopeImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/UserRoleDataScopeImpl.java index eb004d7c3..4779b5f18 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/UserRoleDataScopeImpl.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/UserRoleDataScopeImpl.java @@ -50,7 +50,7 @@ public class UserRoleDataScopeImpl implements UserRoleDataScopeApi { } // 获取用户的角色id集合 - List userRoleIdList = sysUserRoleServiceApi.getUserRoleIdList(loginUser.getUserId()); + List userRoleIdList = sysUserRoleServiceApi.getUserRoleIdListCurrentCompany(loginUser.getUserId(), loginUser.getCurrentOrgId()); // 如果这个角色列表大于1，也就是不单纯是普通角色，则将普通角色去掉，以配置的角色为主 Long defaultRoleId = sysRoleService.getDefaultRoleId(); diff --git a/kernel-s-system/system-business-portal/pom.xml b/kernel-s-system/system-business-portal/pom.xml index ea750e366..b79f27861 100644 --- a/kernel-s-system/system-business-portal/pom.xml +++ b/kernel-s-system/system-business-portal/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-system - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/message/service/SysMessageService.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/message/service/SysMessageService.java index c857dca92..63158ee0b 100644 --- a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/message/service/SysMessageService.java +++ b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/message/service/SysMessageService.java @@ -6,6 +6,8 @@ import cn.stylefeng.roses.kernel.sys.modular.message.entity.SysMessage; import cn.stylefeng.roses.kernel.sys.modular.message.pojo.request.SysMessageRequest; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * 系统消息服务类 * @@ -42,6 +44,14 @@ public interface SysMessageService extends IService, MessagePublishA */ PageResult findPage(SysMessageRequest sysMessageRequest); + /** + * 获取消息列表 + * + * @author fengshuonan + * @since 2024/3/21 0:37 + */ + List findList(SysMessageRequest sysMessageRequest); + /** * 清空我的消息 * diff --git a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/message/service/impl/SysMessageServiceImpl.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/message/service/impl/SysMessageServiceImpl.java index 3f52d8187..65a370708 100644 --- a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/message/service/impl/SysMessageServiceImpl.java +++ b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/message/service/impl/SysMessageServiceImpl.java @@ -72,6 +72,18 @@ public class SysMessageServiceImpl extends ServiceImpl findList(SysMessageRequest sysMessageRequest) { + LambdaQueryWrapper wrapper = createWrapper(sysMessageRequest); + + // 查询关键字段 + wrapper.select(SysMessage::getMessageId, SysMessage::getMessageTitle, SysMessage::getPriorityLevel, SysMessage::getReadFlag, + SysMessage::getMessageSendTime, + SysMessage::getMessageType, SysMessage::getMessageUrl, SysMessage::getBusinessType, SysMessage::getBusinessId); + + return this.list(wrapper); + } + @Override public void deleteAllMyMessage() { // 只能清空自己的消息 diff --git a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/service/impl/SysThemeServiceImpl.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/service/impl/SysThemeServiceImpl.java index fbc7c8375..ffff0dedc 100644 --- a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/service/impl/SysThemeServiceImpl.java +++ b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/theme/service/impl/SysThemeServiceImpl.java @@ -10,6 +10,7 @@ import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.file.api.FileInfoApi; +import cn.stylefeng.roses.kernel.file.api.expander.FileConfigExpander; import cn.stylefeng.roses.kernel.file.api.pojo.AntdvFileInfo; import cn.stylefeng.roses.kernel.file.api.pojo.request.SysFileInfoRequest; import cn.stylefeng.roses.kernel.rule.callback.ConfigUpdateCallback; @@ -247,7 +248,7 @@ public class SysThemeServiceImpl extends ServiceImpl i this.parseFileUrls(result); // 缓存系统中激活的主题 - themeCacheApi.put(ThemeConstants.THEME_GUNS_PLATFORM, result); + themeCacheApi.put(ThemeConstants.THEME_GUNS_PLATFORM, result, FileConfigExpander.getDefaultFileTimeoutSeconds()); return result; } diff --git a/kernel-s-system/system-spring-boot-starter/pom.xml b/kernel-s-system/system-spring-boot-starter/pom.xml index 32e880677..0135301be 100644 --- a/kernel-s-system/system-spring-boot-starter/pom.xml +++ b/kernel-s-system/system-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-system - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-user-favorite/pom.xml b/kernel-s-user-favorite/pom.xml index 72569e3df..084dc74a0 100644 --- a/kernel-s-user-favorite/pom.xml +++ b/kernel-s-user-favorite/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-user-favorite/user-favorite-api/pom.xml b/kernel-s-user-favorite/user-favorite-api/pom.xml index eda237352..d609c6f7e 100644 --- a/kernel-s-user-favorite/user-favorite-api/pom.xml +++ b/kernel-s-user-favorite/user-favorite-api/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-user-favorite - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-user-favorite/user-favorite-business/pom.xml b/kernel-s-user-favorite/user-favorite-business/pom.xml index 2826a6c61..2a19f000b 100644 --- a/kernel-s-user-favorite/user-favorite-business/pom.xml +++ b/kernel-s-user-favorite/user-favorite-business/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-user-favorite - 8.1.2 + 8.1.3 ../pom.xml diff --git a/kernel-s-user-favorite/user-favorite-spring-boot-starter/pom.xml b/kernel-s-user-favorite/user-favorite-spring-boot-starter/pom.xml index 08df9b2e3..61ba45251 100644 --- a/kernel-s-user-favorite/user-favorite-spring-boot-starter/pom.xml +++ b/kernel-s-user-favorite/user-favorite-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ cn.stylefeng.roses kernel-s-user-favorite - 8.1.2 + 8.1.3 ../pom.xml diff --git a/pom.xml b/pom.xml index d02b24116..529e6cc06 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ cn.stylefeng.roses roses-kernel - 8.1.2 + 8.1.3 pom @@ -112,7 +112,7 @@ 1.8 UTF-8 UTF-8 - 8.1.2 + 8.1.3 5.8.16 1.2.83 1.18.26