From 03038d3b64447258d1b81c425fa80d261d232e86 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sat, 27 Jan 2024 15:26:49 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复 Sonar 扫描问题 --- .../admin/common/constant/ContainerConstants.java | 4 +++- .../continew/admin/common/util/SecureUtils.java | 6 +++--- .../admin/common/util/helper/LoginHelper.java | 6 +++--- .../continew/admin/system/mapper/DictItemMapper.java | 5 ++--- .../admin/tool/model/entity/FieldConfigDO.java | 12 +++++------- .../tool/service/impl/GeneratorServiceImpl.java | 8 ++++---- .../src/main/resources/logback-spring.xml | 3 --- 7 files changed, 20 insertions(+), 24 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/ContainerConstants.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/ContainerConstants.java index 55b1c61d..1a4ca937 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/ContainerConstants.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/ContainerConstants.java @@ -16,13 +16,15 @@ package top.charles7c.continew.admin.common.constant; +import top.charles7c.continew.starter.extension.crud.constant.ContainerPool; + /** * 数据源容器相关常量（Crane4j 数据填充组件使用） * * @author Charles7c * @since 2024/1/20 12:33 */ -public class ContainerConstants implements top.charles7c.continew.starter.extension.crud.constant.ContainerConstants { +public class ContainerConstants extends ContainerPool { private ContainerConstants() { } diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java index 99c6def6..2b22476c 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java @@ -30,6 +30,9 @@ import top.charles7c.continew.starter.core.util.validate.ValidationUtils; */ public class SecureUtils { + private SecureUtils() { + } + /** * 公钥加密 * @@ -74,7 +77,4 @@ public class SecureUtils { public static String md5Salt(String data, String salt) { return SecureUtil.md5(SecureUtil.md5(data) + salt); } - - private SecureUtils() { - } } diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java index b1547660..4eaf1fe9 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java @@ -42,6 +42,9 @@ import java.time.LocalDateTime; */ public class LoginHelper { + private LoginHelper() { + } + /** * 用户登录并缓存用户信息 * @@ -133,7 +136,4 @@ public class LoginHelper { public static String getNickname(Long userId) { return ExceptionUtils.exToNull(() -> SpringUtil.getBean(CommonUserService.class).getNicknameById(userId)); } - - private LoginHelper() { - } } diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictItemMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictItemMapper.java index 96dd211d..d35fec4f 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictItemMapper.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictItemMapper.java @@ -16,14 +16,13 @@ package top.charles7c.continew.admin.system.mapper; -import java.util.List; - import org.apache.ibatis.annotations.Param; - import top.charles7c.continew.admin.common.model.resp.LabelValueResp; import top.charles7c.continew.admin.system.model.entity.DictItemDO; import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; +import java.util.List; + /** * 字典项 Mapper * diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/FieldConfigDO.java b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/FieldConfigDO.java index 17a2742b..cfaed9c5 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/FieldConfigDO.java +++ b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/FieldConfigDO.java @@ -143,17 +143,15 @@ public class FieldConfigDO implements Serializable { private LocalDateTime createTime; public FieldConfigDO(@NonNull Column column) { - String columnType = StrUtil.splitToArray(column.getTypeName(), StringConstants.SPACE)[0].toLowerCase(); - boolean isRequired = !column.isPk() && !column.isNullable(); - this.tableName = column.getTableName(); + this.setTableName(column.getTableName()); this.setColumnName(column.getName()); - this.setColumnType(columnType); + this.setColumnType(StrUtil.splitToArray(column.getTypeName(), StringConstants.SPACE)[0].toLowerCase()); this.setColumnSize(column.getSize()); this.setComment(column.getComment()); - this.setIsRequired(isRequired); + this.setIsRequired(!column.isPk() && !column.isNullable()); this.setShowInList(true); - this.setShowInForm(isRequired); - this.setShowInQuery(isRequired); + this.setShowInForm(this.getIsRequired()); + this.setShowInQuery(this.getIsRequired()); this.setFormType(FormTypeEnum.TEXT); this.setQueryType("String".equals(this.getFieldType()) ? QueryTypeEnum.LIKE : QueryTypeEnum.EQ); } diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java index 17b1522d..883ecc7d 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java +++ b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java @@ -134,7 +134,7 @@ public class GeneratorServiceImpl implements GeneratorService { return columnList.stream().map(FieldConfigDO::new).collect(Collectors.toList()); } // 同步最新数据表列信息 - if (requireSync) { + if (Boolean.TRUE.equals(requireSync)) { Collection columnList = MetaUtils.getColumns(dataSource, tableName); // 移除已不存在的字段配置 List columnNameList = columnList.stream().map(Column::getName).collect(Collectors.toList()); @@ -286,7 +286,7 @@ public class GeneratorServiceImpl implements GeneratorService { .getPackageName(), StringConstants.DOT)); File classFile = new File(classParentFile, codePreview.getFileName()); // 如果已经存在，且不允许覆盖，则跳过 - if (classFile.exists() && !isOverride) { + if (classFile.exists() && Boolean.FALSE.equals(isOverride)) { continue; } FileUtil.writeUtf8String(codePreview.getContent(), classFile); @@ -309,7 +309,7 @@ public class GeneratorServiceImpl implements GeneratorService { // 例如：D:/continew-admin-ui/src/api/tool/xxx.ts File apiParentFile = FileUtil.file(frontendModulePath, "src", "api", apiModuleName); File apiFile = new File(apiParentFile, apiCodePreview.getFileName()); - if (apiFile.exists() && !isOverride) { + if (apiFile.exists() && Boolean.FALSE.equals(isOverride)) { return; } FileUtil.writeUtf8String(apiCodePreview.getContent(), apiFile); @@ -318,7 +318,7 @@ public class GeneratorServiceImpl implements GeneratorService { // 例如：D:/continew-admin-ui/src/views/tool/xxx/index.vue File indexFile = FileUtil.file(frontendPath, apiModuleName, StrUtil .lowerFirst(classNamePrefix), "index.vue"); - if (indexFile.exists() && !isOverride) { + if (indexFile.exists() && Boolean.FALSE.equals(isOverride)) { return; } FileUtil.writeUtf8String(viewCodePreview.getContent(), indexFile); diff --git a/continew-admin-webapi/src/main/resources/logback-spring.xml b/continew-admin-webapi/src/main/resources/logback-spring.xml index 981650af..6005daf9 100644 --- a/continew-admin-webapi/src/main/resources/logback-spring.xml +++ b/continew-admin-webapi/src/main/resources/logback-spring.xml @@ -73,10 +73,7 @@ - - -