From c9867844b650a69f6b3b3ea4f9af67807091eb1b Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sun, 18 Feb 2024 22:44:06 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E6=A8=A1=E6=9D=BF=E6=96=B9=E6=B3=95=20API=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apidoc/autoconfigure/SpringDocAutoConfiguration.java | 2 +- .../auth/satoken/autoconfigure/dao/SaTokenDaoRedisImpl.java | 2 +- .../autoconfigure/SpringCacheAutoConfiguration.java | 2 +- .../charles7c/continew/starter/core/util/db/MetaUtils.java | 2 +- .../continew/starter/core/util/validate/CheckUtils.java | 4 ++-- .../plus/datapermission/DataPermissionHandlerImpl.java | 4 ++-- .../starter/data/mybatis/plus/query/QueryWrapperHelper.java | 2 +- .../starter/extension/crud/controller/BaseController.java | 2 +- .../continew/starter/file/excel/util/ExcelUtils.java | 2 +- .../local/autoconfigure/LocalStorageAutoConfiguration.java | 4 ++-- .../web/autoconfigure/exception/GlobalExceptionHandler.java | 2 +- .../charles7c/continew/starter/web/util/FileUploadUtils.java | 4 ++-- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/continew-starter-api-doc/src/main/java/top/charles7c/continew/starter/apidoc/autoconfigure/SpringDocAutoConfiguration.java b/continew-starter-api-doc/src/main/java/top/charles7c/continew/starter/apidoc/autoconfigure/SpringDocAutoConfiguration.java index 1a8dbd35..76f855ab 100644 --- a/continew-starter-api-doc/src/main/java/top/charles7c/continew/starter/apidoc/autoconfigure/SpringDocAutoConfiguration.java +++ b/continew-starter-api-doc/src/main/java/top/charles7c/continew/starter/apidoc/autoconfigure/SpringDocAutoConfiguration.java @@ -75,7 +75,7 @@ public class SpringDocAutoConfiguration implements WebMvcConfigurer { @Bean @ConditionalOnMissingBean public OpenAPI openApi(ProjectProperties projectProperties, SpringDocExtensionProperties properties) { - Info info = new Info().title(String.format("%s %s", projectProperties.getName(), "API 文档")) + Info info = new Info().title("%s %s".formatted(projectProperties.getName(), "API 文档")) .version(projectProperties.getVersion()) .description(projectProperties.getDescription()); ProjectProperties.Contact contact = projectProperties.getContact(); diff --git a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoRedisImpl.java b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoRedisImpl.java index 851c0f6f..9838583b 100644 --- a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoRedisImpl.java +++ b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoRedisImpl.java @@ -140,7 +140,7 @@ public class SaTokenDaoRedisImpl implements SaTokenDao { @Override public List searchData(String prefix, String keyword, int start, int size, boolean sortType) { - Collection keys = RedisUtils.keys(String.format("%s*%s*", prefix, keyword)); + Collection keys = RedisUtils.keys("%s*%s*".formatted(prefix, keyword)); List list = new ArrayList<>(keys); return SaFoxUtil.searchList(list, start, size, sortType); } diff --git a/continew-starter-cache/continew-starter-cache-springcache/src/main/java/top/charles7c/continew/starter/cache/springcache/autoconfigure/SpringCacheAutoConfiguration.java b/continew-starter-cache/continew-starter-cache-springcache/src/main/java/top/charles7c/continew/starter/cache/springcache/autoconfigure/SpringCacheAutoConfiguration.java index 919435c2..fd0b5ad4 100644 --- a/continew-starter-cache/continew-starter-cache-springcache/src/main/java/top/charles7c/continew/starter/cache/springcache/autoconfigure/SpringCacheAutoConfiguration.java +++ b/continew-starter-cache/continew-starter-cache-springcache/src/main/java/top/charles7c/continew/starter/cache/springcache/autoconfigure/SpringCacheAutoConfiguration.java @@ -97,7 +97,7 @@ public class SpringCacheAutoConfiguration implements CachingConfigurer { for (int i = 0; i < params.length; i++) { paramMap.put(String.valueOf(i), params[i]); } - return String.format("%s:%s", key, DigestUtil.sha256Hex(JSONUtil.toJsonStr(paramMap))); + return "%s:%s".formatted(key, DigestUtil.sha256Hex(JSONUtil.toJsonStr(paramMap))); }; } diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/db/MetaUtils.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/db/MetaUtils.java index 6392f73b..cf41516a 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/db/MetaUtils.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/db/MetaUtils.java @@ -62,7 +62,7 @@ public class MetaUtils { List tableEntityList; Db db = Db.use(dataSource); if (CharSequenceUtil.isNotBlank(tableName)) { - tableEntityList = db.query(String.format("%s WHERE NAME = ?", querySql), tableName); + tableEntityList = db.query("%s WHERE NAME = ?".formatted(querySql), tableName); } else { tableEntityList = db.query(querySql); } diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/CheckUtils.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/CheckUtils.java index 9a8c72f0..ce1f5b41 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/CheckUtils.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/CheckUtils.java @@ -45,7 +45,7 @@ public class CheckUtils extends Validator { * @param fieldValue 字段值 */ public static void throwIfNotExists(Object obj, String entityName, String fieldName, Object fieldValue) { - String message = String.format("%s 为 [%s] 的 %s 记录已不存在", fieldName, fieldValue, CharSequenceUtil + String message = "%s 为 [%s] 的 %s 记录已不存在".formatted(fieldName, fieldValue, CharSequenceUtil .replace(entityName, "DO", StringConstants.EMPTY)); throwIfNull(obj, message, EXCEPTION_TYPE); } @@ -81,7 +81,7 @@ public class CheckUtils extends Validator { * @param fieldValue 字段值 */ public static void throwIfExists(Object obj, String entityName, String fieldName, Object fieldValue) { - String message = String.format("%s 为 [%s] 的 %s 记录已存在", fieldName, fieldValue, entityName); + String message = "%s 为 [%s] 的 %s 记录已存在".formatted(fieldName, fieldValue, entityName); throwIfNotNull(obj, message, EXCEPTION_TYPE); } diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java index 2700e2cf..539a46cb 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java @@ -102,7 +102,7 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler { case DEPT -> expression = this.buildDeptExpression(dataPermission, currentUser, expression); case SELF -> expression = this.buildSelfExpression(dataPermission, currentUser, expression); case CUSTOM -> expression = this.buildCustomExpression(dataPermission, role, expression); - default -> throw new IllegalArgumentException(String.format("暂不支持 [%s] 数据权限", dataScope)); + default -> throw new IllegalArgumentException("暂不支持 [%s] 数据权限".formatted(dataScope)); } } return null != where ? new AndExpression(where, new Parenthesis(expression)) : expression; @@ -227,7 +227,7 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler { */ private Column buildColumn(String tableAlias, String columnName) { if (StringUtils.isNotEmpty(tableAlias)) { - return new Column(String.format("%s.%s", tableAlias, columnName)); + return new Column("%s.%s".formatted(tableAlias, columnName)); } return new Column(columnName); } diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/QueryWrapperHelper.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/QueryWrapperHelper.java index 75cd9514..a602a921 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/QueryWrapperHelper.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/QueryWrapperHelper.java @@ -182,7 +182,7 @@ public class QueryWrapperHelper { } case IS_NULL -> consumers.add(q -> q.isNull(columnName)); case IS_NOT_NULL -> consumers.add(q -> q.isNotNull(columnName)); - default -> throw new IllegalArgumentException(String.format("暂不支持 [%s] 查询类型", queryType)); + default -> throw new IllegalArgumentException("暂不支持 [%s] 查询类型".formatted(queryType)); } } } diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/controller/BaseController.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/controller/BaseController.java index 3c615958..fa757cad 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/controller/BaseController.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/controller/BaseController.java @@ -186,6 +186,6 @@ public abstract class BaseController, L, D, Q, String path = crudRequestMapping.value(); String permissionPrefix = String.join(StringConstants.COLON, CharSequenceUtil .splitTrim(path, StringConstants.SLASH)); - StpUtil.checkPermission(String.format("%s:%s", permissionPrefix, api.name().toLowerCase())); + StpUtil.checkPermission("%s:%s".formatted(permissionPrefix, api.name().toLowerCase())); } } diff --git a/continew-starter-file/continew-starter-file-excel/src/main/java/top/charles7c/continew/starter/file/excel/util/ExcelUtils.java b/continew-starter-file/continew-starter-file-excel/src/main/java/top/charles7c/continew/starter/file/excel/util/ExcelUtils.java index 50819f90..b865051f 100644 --- a/continew-starter-file/continew-starter-file-excel/src/main/java/top/charles7c/continew/starter/file/excel/util/ExcelUtils.java +++ b/continew-starter-file/continew-starter-file-excel/src/main/java/top/charles7c/continew/starter/file/excel/util/ExcelUtils.java @@ -70,7 +70,7 @@ public class ExcelUtils { Class clazz, HttpServletResponse response) { try { - String exportFileName = URLUtil.encode(String.format("%s_%s.xlsx", fileName, DateUtil + String exportFileName = URLUtil.encode("%s_%s.xlsx".formatted(fileName, DateUtil .format(new Date(), DatePattern.PURE_DATETIME_PATTERN))); response.setHeader("Content-disposition", "attachment;filename=" + exportFileName); response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8"); diff --git a/continew-starter-storage/continew-starter-storage-local/src/main/java/top/charles7c/continew/starter/storage/local/autoconfigure/LocalStorageAutoConfiguration.java b/continew-starter-storage/continew-starter-storage-local/src/main/java/top/charles7c/continew/starter/storage/local/autoconfigure/LocalStorageAutoConfiguration.java index 929d395d..08eeb580 100644 --- a/continew-starter-storage/continew-starter-storage-local/src/main/java/top/charles7c/continew/starter/storage/local/autoconfigure/LocalStorageAutoConfiguration.java +++ b/continew-starter-storage/continew-starter-storage-local/src/main/java/top/charles7c/continew/starter/storage/local/autoconfigure/LocalStorageAutoConfiguration.java @@ -58,11 +58,11 @@ public class LocalStorageAutoConfiguration implements WebMvcConfigurer { String pathPattern = mapping.getPathPattern(); String location = mapping.getLocation(); if (CharSequenceUtil.isBlank(location)) { - throw new IllegalArgumentException(String.format("Path pattern [%s] location is null.", pathPattern)); + throw new IllegalArgumentException("Path pattern [%s] location is null.".formatted(pathPattern)); } registry.addResourceHandler(CharSequenceUtil.appendIfMissing(pathPattern, StringConstants.PATH_PATTERN)) .addResourceLocations(!location.startsWith("file:") - ? String.format("file:%s", this.format(location)) + ? "file:%s".formatted(this.format(location)) : this.format(location)) .setCachePeriod(0); } diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/exception/GlobalExceptionHandler.java b/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/exception/GlobalExceptionHandler.java index b8f62422..4c2c3cd8 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/exception/GlobalExceptionHandler.java +++ b/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/exception/GlobalExceptionHandler.java @@ -112,7 +112,7 @@ public class GlobalExceptionHandler { public R handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e, HttpServletRequest request) { log.warn("请求地址 [{}]，上传文件失败，文件大小超过限制。", request.getRequestURI(), e); String sizeLimit = CharSequenceUtil.subBetween(e.getMessage(), "The maximum size ", " for"); - String errorMsg = String.format("请上传小于 %sMB 的文件", NumberUtil.parseLong(sizeLimit) / 1024 / 1024); + String errorMsg = "请上传小于 %sMB 的文件".formatted(NumberUtil.parseLong(sizeLimit) / 1024 / 1024); return R.fail(HttpStatus.BAD_REQUEST.value(), errorMsg); } diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/util/FileUploadUtils.java b/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/util/FileUploadUtils.java index 325c97c9..cb3eec79 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/util/FileUploadUtils.java +++ b/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/util/FileUploadUtils.java @@ -54,10 +54,10 @@ public class FileUploadUtils { String fileName; if (isKeepOriginalFilename) { - fileName = String.format("%s-%s.%s", FileNameUtil.getPrefix(originalFilename), DateUtil.format(LocalDateTime + fileName = "%s-%s.%s".formatted(FileNameUtil.getPrefix(originalFilename), DateUtil.format(LocalDateTime .now(), DatePattern.PURE_DATETIME_MS_PATTERN), extensionName); } else { - fileName = String.format("%s.%s", IdUtil.fastSimpleUUID(), extensionName); + fileName = "%s.%s".formatted(IdUtil.fastSimpleUUID(), extensionName); } try {