From ca5751ef06cf1a023ef51c2eec2ea453082dba29 Mon Sep 17 00:00:00 2001 From: linhaojun Date: Tue, 11 Oct 2022 20:19:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/aurora/constant/AuthConstant.java | 13 ++--- .../com/aurora/constant/CommonConstant.java | 40 +++++++-------- .../com/aurora/constant/OptTypeConstant.java | 14 +++--- .../com/aurora/constant/RabbitMQConstant.java | 14 +++--- .../com/aurora/constant/RedisConstant.java | 24 ++++----- .../com/aurora/constant/ScheduleConstant.java | 30 +++-------- .../aurora/constant/SocialLoginConstant.java | 8 +-- .../java/com/aurora/enums/JobStatusEnum.java | 17 +++++++ .../java/com/aurora/model/vo/ResultVO.java | 50 +++++++++++-------- .../aurora/service/impl/JobServiceImpl.java | 7 ++- 10 files changed, 112 insertions(+), 105 deletions(-) create mode 100644 aurora-springboot/src/main/java/com/aurora/enums/JobStatusEnum.java diff --git a/aurora-springboot/src/main/java/com/aurora/constant/AuthConstant.java b/aurora-springboot/src/main/java/com/aurora/constant/AuthConstant.java index 223382e..4894e8a 100644 --- a/aurora-springboot/src/main/java/com/aurora/constant/AuthConstant.java +++ b/aurora-springboot/src/main/java/com/aurora/constant/AuthConstant.java @@ -1,14 +1,15 @@ package com.aurora.constant; -public class AuthConstant { +public interface AuthConstant { - public static final String TOKEN_HEADER = "Authorization"; + int TWENTY_MINUTES = 20; - public static final String TOKEN_PREFIX = "Bearer "; + int EXPIRE_TIME = 7 * 24 * 60 * 60; - public final static Integer TWENTY_MINUTES = 20; + String TOKEN_HEADER = "Authorization"; - public final static String SECRET = "huaweimian"; + String TOKEN_PREFIX = "Bearer "; + + String SECRET = "huaweimian"; - public final static Integer EXPIRE_TIME = 7 * 24 * 60 * 60; } diff --git a/aurora-springboot/src/main/java/com/aurora/constant/CommonConstant.java b/aurora-springboot/src/main/java/com/aurora/constant/CommonConstant.java index 427cc5e..953f3df 100644 --- a/aurora-springboot/src/main/java/com/aurora/constant/CommonConstant.java +++ b/aurora-springboot/src/main/java/com/aurora/constant/CommonConstant.java @@ -1,43 +1,43 @@ package com.aurora.constant; -public class CommonConstant { +public interface CommonConstant { - public static final int ONE = 1; + int ONE = 1; - public static final int ZERO = 0; + int ZERO = 0; - public static final int FALSE = 0; + int FALSE = 0; - public static final int TRUE = 1; + int TRUE = 1; - public static final String PRE_TAG = ""; + int BLOGGER_ID = 1; - public static final String POST_TAG = ""; + int DEFAULT_CONFIG_ID = 1; - public static final String CURRENT = "current"; + int DEFAULT_ABOUT_ID = 1; - public static final String SIZE = "size"; + String PRE_TAG = ""; - public static final Integer BLOGGER_ID = 1; + String POST_TAG = ""; - public static final String DEFAULT_SIZE = "10"; + String CURRENT = "current"; - public static final String DEFAULT_NICKNAME = "用户"; + String SIZE = "size"; - public static String COMPONENT = "Layout"; + String DEFAULT_SIZE = "10"; - public static final String UNKNOWN = "未知"; + String DEFAULT_NICKNAME = "用户"; - public static final String APPLICATION_JSON = "application/json;charset=utf-8"; + String COMPONENT = "Layout"; - public static final Integer DEFAULT_CONFIG_ID = 1; + String UNKNOWN = "未知"; - public static final Integer DEFAULT_ABOUT_ID = 1; + String APPLICATION_JSON = "application/json;charset=utf-8"; - public static final String CAPTCHA = "验证码"; + String CAPTCHA = "验证码"; - public static final String CHECK_REMIND = "审核提醒"; + String CHECK_REMIND = "审核提醒"; - public static final String COMMENT_REMIND = "评论提醒"; + String COMMENT_REMIND = "评论提醒"; } diff --git a/aurora-springboot/src/main/java/com/aurora/constant/OptTypeConstant.java b/aurora-springboot/src/main/java/com/aurora/constant/OptTypeConstant.java index 3b299f6..bb22404 100644 --- a/aurora-springboot/src/main/java/com/aurora/constant/OptTypeConstant.java +++ b/aurora-springboot/src/main/java/com/aurora/constant/OptTypeConstant.java @@ -1,17 +1,17 @@ package com.aurora.constant; -public class OptTypeConstant { +public interface OptTypeConstant { - public static final String SAVE_OR_UPDATE = "新增或修改"; + String SAVE_OR_UPDATE = "新增或修改"; - public static final String SAVE = "新增"; + String SAVE = "新增"; - public static final String UPDATE = "修改"; + String UPDATE = "修改"; - public static final String DELETE = "删除"; + String DELETE = "删除"; - public static final String UPLOAD = "上传"; + String UPLOAD = "上传"; - public static final String EXPORT = "导出"; + String EXPORT = "导出"; } diff --git a/aurora-springboot/src/main/java/com/aurora/constant/RabbitMQConstant.java b/aurora-springboot/src/main/java/com/aurora/constant/RabbitMQConstant.java index e40a705..5a63d6d 100644 --- a/aurora-springboot/src/main/java/com/aurora/constant/RabbitMQConstant.java +++ b/aurora-springboot/src/main/java/com/aurora/constant/RabbitMQConstant.java @@ -1,17 +1,17 @@ package com.aurora.constant; -public class RabbitMQConstant { +public interface RabbitMQConstant { - public static final String MAXWELL_QUEUE = "maxwell_queue"; + String MAXWELL_QUEUE = "maxwell_queue"; - public static final String MAXWELL_EXCHANGE = "maxwell_exchange"; + String MAXWELL_EXCHANGE = "maxwell_exchange"; - public static final String EMAIL_QUEUE = "email_queue"; + String EMAIL_QUEUE = "email_queue"; - public static final String EMAIL_EXCHANGE = "email_exchange"; + String EMAIL_EXCHANGE = "email_exchange"; - public static final String SUBSCRIBE_QUEUE = "subscribe_queue"; + String SUBSCRIBE_QUEUE = "subscribe_queue"; - public static final String SUBSCRIBE_EXCHANGE = "subscribe_exchange"; + String SUBSCRIBE_EXCHANGE = "subscribe_exchange"; } diff --git a/aurora-springboot/src/main/java/com/aurora/constant/RedisConstant.java b/aurora-springboot/src/main/java/com/aurora/constant/RedisConstant.java index 98c5ebe..105ad7c 100644 --- a/aurora-springboot/src/main/java/com/aurora/constant/RedisConstant.java +++ b/aurora-springboot/src/main/java/com/aurora/constant/RedisConstant.java @@ -1,27 +1,27 @@ package com.aurora.constant; -public class RedisConstant { +public interface RedisConstant { - public static final long CODE_EXPIRE_TIME = 15 * 60; + long CODE_EXPIRE_TIME = 15 * 60; - public static final String USER_CODE_KEY = "code:"; + String USER_CODE_KEY = "code:"; - public static final String BLOG_VIEWS_COUNT = "blog_views_count"; + String BLOG_VIEWS_COUNT = "blog_views_count"; - public static final String ARTICLE_VIEWS_COUNT = "article_views_count"; + String ARTICLE_VIEWS_COUNT = "article_views_count"; - public static final String WEBSITE_CONFIG = "website_config"; + String WEBSITE_CONFIG = "website_config"; - public static final String USER_AREA = "user_area"; + String USER_AREA = "user_area"; - public static final String VISITOR_AREA = "visitor_area"; + String VISITOR_AREA = "visitor_area"; - public static final String ABOUT = "about"; + String ABOUT = "about"; - public static final String UNIQUE_VISITOR = "unique_visitor"; + String UNIQUE_VISITOR = "unique_visitor"; - public static final String LOGIN_USER = "login_user"; + String LOGIN_USER = "login_user"; - public static final String ARTICLE_ACCESS = "article_access:"; + String ARTICLE_ACCESS = "article_access:"; } diff --git a/aurora-springboot/src/main/java/com/aurora/constant/ScheduleConstant.java b/aurora-springboot/src/main/java/com/aurora/constant/ScheduleConstant.java index 3077344..b4506d2 100644 --- a/aurora-springboot/src/main/java/com/aurora/constant/ScheduleConstant.java +++ b/aurora-springboot/src/main/java/com/aurora/constant/ScheduleConstant.java @@ -1,33 +1,17 @@ package com.aurora.constant; -public class ScheduleConstant { +public interface ScheduleConstant { - public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME"; + int MISFIRE_DEFAULT = 0; - public static final String TASK_PROPERTIES = "TASK_PROPERTIES"; + int MISFIRE_IGNORE_MISFIRES = 1; - public static final int MISFIRE_DEFAULT = 0; + int MISFIRE_FIRE_AND_PROCEED = 2; - public static final int MISFIRE_IGNORE_MISFIRES = 1; + int MISFIRE_DO_NOTHING = 3; - public static final int MISFIRE_FIRE_AND_PROCEED = 2; + String TASK_CLASS_NAME = "TASK_CLASS_NAME"; - public static final int MISFIRE_DO_NOTHING = 3; + String TASK_PROPERTIES = "TASK_PROPERTIES"; - public enum Status { - - NORMAL(1), - - PAUSE(0); - - private final Integer value; - - Status(Integer value) { - this.value = value; - } - - public Integer getValue() { - return value; - } - } } diff --git a/aurora-springboot/src/main/java/com/aurora/constant/SocialLoginConstant.java b/aurora-springboot/src/main/java/com/aurora/constant/SocialLoginConstant.java index 32a1bff..06bf9ed 100644 --- a/aurora-springboot/src/main/java/com/aurora/constant/SocialLoginConstant.java +++ b/aurora-springboot/src/main/java/com/aurora/constant/SocialLoginConstant.java @@ -1,11 +1,11 @@ package com.aurora.constant; -public class SocialLoginConstant { +public interface SocialLoginConstant { - public static final String QQ_OPEN_ID = "openid"; + String QQ_OPEN_ID = "openid"; - public static final String ACCESS_TOKEN = "access_token"; + String ACCESS_TOKEN = "access_token"; - public static final String OAUTH_CONSUMER_KEY = "oauth_consumer_key"; + String OAUTH_CONSUMER_KEY = "oauth_consumer_key"; } diff --git a/aurora-springboot/src/main/java/com/aurora/enums/JobStatusEnum.java b/aurora-springboot/src/main/java/com/aurora/enums/JobStatusEnum.java new file mode 100644 index 0000000..d327e4d --- /dev/null +++ b/aurora-springboot/src/main/java/com/aurora/enums/JobStatusEnum.java @@ -0,0 +1,17 @@ +package com.aurora.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum JobStatusEnum { + + NORMAL(1), + + PAUSE(0); + + private final Integer value; + +} + diff --git a/aurora-springboot/src/main/java/com/aurora/model/vo/ResultVO.java b/aurora-springboot/src/main/java/com/aurora/model/vo/ResultVO.java index e4d5723..9d286b9 100644 --- a/aurora-springboot/src/main/java/com/aurora/model/vo/ResultVO.java +++ b/aurora-springboot/src/main/java/com/aurora/model/vo/ResultVO.java @@ -1,10 +1,18 @@ package com.aurora.model.vo; import com.aurora.enums.StatusCodeEnum; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; + import static com.aurora.enums.StatusCodeEnum.*; @Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@SuppressWarnings("all") public class ResultVO { private Boolean flag; @@ -16,56 +24,54 @@ public class ResultVO { private T data; public static ResultVO ok() { - return restResult(true, null, SUCCESS.getCode(), SUCCESS.getDesc()); + return resultVO(true, SUCCESS.getCode(), SUCCESS.getDesc(), null); } public static ResultVO ok(T data) { - return restResult(true, data, SUCCESS.getCode(), SUCCESS.getDesc()); + return resultVO(true, SUCCESS.getCode(), SUCCESS.getDesc(), data); } public static ResultVO ok(T data, String message) { - return restResult(true, data, SUCCESS.getCode(), message); + return resultVO(true, SUCCESS.getCode(), message, data); } public static ResultVO fail() { - return restResult(false, null, FAIL.getCode(), FAIL.getDesc()); + return resultVO(false, FAIL.getCode(), FAIL.getDesc(), null); } public static ResultVO fail(StatusCodeEnum statusCodeEnum) { - return restResult(false, null, statusCodeEnum.getCode(), statusCodeEnum.getDesc()); + return resultVO(false, statusCodeEnum.getCode(), statusCodeEnum.getDesc(), null); } public static ResultVO fail(String message) { - return restResult(false, message); + return resultVO(false, message); } public static ResultVO fail(T data) { - return restResult(false, data, FAIL.getCode(), FAIL.getDesc()); + return resultVO(false, FAIL.getCode(), FAIL.getDesc(), data); } public static ResultVO fail(T data, String message) { - return restResult(false, data, FAIL.getCode(), message); + return resultVO(false, FAIL.getCode(), message, data); } public static ResultVO fail(Integer code, String message) { - return restResult(false, null, code, message); + return resultVO(false, code, message, null); } - private static ResultVO restResult(Boolean flag, String message) { - ResultVO apiResultVO = new ResultVO<>(); - apiResultVO.setFlag(flag); - apiResultVO.setCode(flag ? SUCCESS.getCode() : FAIL.getCode()); - apiResultVO.setMessage(message); - return apiResultVO; + private static ResultVO resultVO(Boolean flag, String message) { + return ResultVO.builder() + .flag(flag) + .code(flag ? SUCCESS.getCode() : FAIL.getCode()) + .message(message).build(); } - private static ResultVO restResult(Boolean flag, T data, Integer code, String message) { - ResultVO apiResultVO = new ResultVO<>(); - apiResultVO.setFlag(flag); - apiResultVO.setData(data); - apiResultVO.setCode(code); - apiResultVO.setMessage(message); - return apiResultVO; + private static ResultVO resultVO(Boolean flag, Integer code, String message, T data) { + return ResultVO.builder() + .flag(flag) + .code(code) + .message(message) + .data(data).build(); } } diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/JobServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/JobServiceImpl.java index 60a4786..509762e 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/JobServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/JobServiceImpl.java @@ -1,6 +1,7 @@ package com.aurora.service.impl; import com.aurora.constant.ScheduleConstant; +import com.aurora.enums.JobStatusEnum; import com.aurora.model.dto.JobDTO; import com.aurora.entity.Job; import com.aurora.mapper.JobMapper; @@ -115,9 +116,9 @@ public class JobServiceImpl extends ServiceImpl implements JobSe updateWrapper.eq(Job::getId, jobStatusVO.getId()).set(Job::getStatus, status); int row = jobMapper.update(null, updateWrapper); if (row > 0) { - if (ScheduleConstant.Status.NORMAL.getValue().equals(status)) { + if (JobStatusEnum.NORMAL.getValue().equals(status)) { scheduler.resumeJob(ScheduleUtil.getJobKey(jobId, jobGroup)); - } else if (ScheduleConstant.Status.PAUSE.getValue().equals(status)) { + } else if (JobStatusEnum.PAUSE.getValue().equals(status)) { scheduler.pauseJob(ScheduleUtil.getJobKey(jobId, jobGroup)); } } @@ -144,10 +145,8 @@ public class JobServiceImpl extends ServiceImpl implements JobSe @SneakyThrows public void updateSchedulerJob(Job job, String jobGroup) { Integer jobId = job.getId(); - // 判断是否存在 JobKey jobKey = ScheduleUtil.getJobKey(jobId, jobGroup); if (scheduler.checkExists(jobKey)) { - // 防止创建时存在数据问题 先移除，然后在执行创建操作 scheduler.deleteJob(jobKey); } ScheduleUtil.createScheduleJob(scheduler, job); From 7f979d677deada5b8dae7e4c15c7df9177859c02 Mon Sep 17 00:00:00 2001 From: linhaojun Date: Tue, 11 Oct 2022 20:46:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?:art:=20=E4=BF=AE=E6=94=B9=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E7=9A=84=E5=91=BD=E5=90=8D=E9=A3=8E=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PhotoAlbumServiceImpl.java | 8 ++-- .../service/impl/ResourceServiceImpl.java | 48 +++++++++---------- .../aurora/service/impl/TagServiceImpl.java | 4 +- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/PhotoAlbumServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/PhotoAlbumServiceImpl.java index 8945559..1dede23 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/PhotoAlbumServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/PhotoAlbumServiceImpl.java @@ -58,15 +58,15 @@ public class PhotoAlbumServiceImpl extends ServiceImpl(); } - List photoAlbumBackList = photoAlbumMapper.listPhotoAlbumsAdmin(PageUtil.getLimitCurrent(), PageUtil.getSize(), conditionVO); - return new PageResultDTO<>(photoAlbumBackList, count); + List photoAlbumBacks = photoAlbumMapper.listPhotoAlbumsAdmin(PageUtil.getLimitCurrent(), PageUtil.getSize(), conditionVO); + return new PageResultDTO<>(photoAlbumBacks, count); } @Override public List listPhotoAlbumInfosAdmin() { - List photoAlbumList = photoAlbumMapper.selectList(new LambdaQueryWrapper() + List photoAlbums = photoAlbumMapper.selectList(new LambdaQueryWrapper() .eq(PhotoAlbum::getIsDelete, FALSE)); - return BeanCopyUtil.copyList(photoAlbumList, PhotoAlbumDTO.class); + return BeanCopyUtil.copyList(photoAlbums, PhotoAlbumDTO.class); } @Override diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/ResourceServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/ResourceServiceImpl.java index 9351811..e7d8352 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/ResourceServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/ResourceServiceImpl.java @@ -46,13 +46,13 @@ public class ResourceServiceImpl extends ServiceImpl i @Autowired private FilterInvocationSecurityMetadataSourceImpl filterInvocationSecurityMetadataSource; - @SuppressWarnings("unchecked") + @SuppressWarnings("all") @Transactional(rollbackFor = Exception.class) @Override public void importSwagger() { this.remove(null); roleResourceMapper.delete(null); - List resourceList = new ArrayList<>(); + List resources = new ArrayList<>(); Map data = restTemplate.getForObject("http://localhost:8080/v2/api-docs", Map.class); List> tagList = (List>) data.get("tags"); tagList.forEach(item -> { @@ -61,12 +61,12 @@ public class ResourceServiceImpl extends ServiceImpl i .isAnonymous(FALSE) .createTime(LocalDateTime.now()) .build(); - resourceList.add(resource); + resources.add(resource); }); - this.saveBatch(resourceList); - Map permissionMap = resourceList.stream() + this.saveBatch(resources); + Map permissionMap = resources.stream() .collect(Collectors.toMap(Resource::getResourceName, Resource::getId)); - resourceList.clear(); + resources.clear(); Map>> path = (Map>>) data.get("paths"); path.forEach((url, value) -> value.forEach((requestMethod, info) -> { String permissionName = info.get("summary").toString(); @@ -80,9 +80,9 @@ public class ResourceServiceImpl extends ServiceImpl i .isAnonymous(FALSE) .createTime(LocalDateTime.now()) .build(); - resourceList.add(resource); + resources.add(resource); })); - this.saveBatch(resourceList); + this.saveBatch(resources); } @Override @@ -99,48 +99,48 @@ public class ResourceServiceImpl extends ServiceImpl i if (count > 0) { throw new BizException("该资源下存在角色"); } - List resourceIdList = resourceMapper.selectList(new LambdaQueryWrapper() + List resourceIds = resourceMapper.selectList(new LambdaQueryWrapper() .select(Resource::getId). eq(Resource::getParentId, resourceId)) .stream() .map(Resource::getId) .collect(Collectors.toList()); - resourceIdList.add(resourceId); - resourceMapper.deleteBatchIds(resourceIdList); + resourceIds.add(resourceId); + resourceMapper.deleteBatchIds(resourceIds); } @Override public List listResources(ConditionVO conditionVO) { - List resourceList = resourceMapper.selectList(new LambdaQueryWrapper() + List resources = resourceMapper.selectList(new LambdaQueryWrapper() .like(StringUtils.isNotBlank(conditionVO.getKeywords()), Resource::getResourceName, conditionVO.getKeywords())); - List parentList = listResourceModule(resourceList); - Map> childrenMap = listResourceChildren(resourceList); - List resourceDTOList = parentList.stream().map(item -> { + List parents = listResourceModule(resources); + Map> childrenMap = listResourceChildren(resources); + List resourceDTOs = parents.stream().map(item -> { ResourceDTO resourceDTO = BeanCopyUtil.copyObject(item, ResourceDTO.class); - List childrenList = BeanCopyUtil.copyList(childrenMap.get(item.getId()), ResourceDTO.class); - resourceDTO.setChildren(childrenList); + List child = BeanCopyUtil.copyList(childrenMap.get(item.getId()), ResourceDTO.class); + resourceDTO.setChildren(child); childrenMap.remove(item.getId()); return resourceDTO; }).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(childrenMap)) { List childrenList = new ArrayList<>(); childrenMap.values().forEach(childrenList::addAll); - List childrenDTOList = childrenList.stream() + List childrenDTOs = childrenList.stream() .map(item -> BeanCopyUtil.copyObject(item, ResourceDTO.class)) .collect(Collectors.toList()); - resourceDTOList.addAll(childrenDTOList); + resourceDTOs.addAll(childrenDTOs); } - return resourceDTOList; + return resourceDTOs; } @Override public List listResourceOption() { - List resourceList = resourceMapper.selectList(new LambdaQueryWrapper() + List resources = resourceMapper.selectList(new LambdaQueryWrapper() .select(Resource::getId, Resource::getResourceName, Resource::getParentId) .eq(Resource::getIsAnonymous, FALSE)); - List parentList = listResourceModule(resourceList); - Map> childrenMap = listResourceChildren(resourceList); - return parentList.stream().map(item -> { + List parents = listResourceModule(resources); + Map> childrenMap = listResourceChildren(resources); + return parents.stream().map(item -> { List list = new ArrayList<>(); List children = childrenMap.get(item.getId()); if (CollectionUtils.isNotEmpty(children)) { diff --git a/aurora-springboot/src/main/java/com/aurora/service/impl/TagServiceImpl.java b/aurora-springboot/src/main/java/com/aurora/service/impl/TagServiceImpl.java index 1d634dc..01af44f 100644 --- a/aurora-springboot/src/main/java/com/aurora/service/impl/TagServiceImpl.java +++ b/aurora-springboot/src/main/java/com/aurora/service/impl/TagServiceImpl.java @@ -58,10 +58,10 @@ public class TagServiceImpl extends ServiceImpl implements TagSe @SneakyThrows @Override public List listTagsAdminBySearch(ConditionVO conditionVO) { - List tagList = tagMapper.selectList(new LambdaQueryWrapper() + List tags = tagMapper.selectList(new LambdaQueryWrapper() .like(StringUtils.isNotBlank(conditionVO.getKeywords()), Tag::getTagName, conditionVO.getKeywords()) .orderByDesc(Tag::getId)); - return BeanCopyUtil.copyList(tagList, TagAdminDTO.class); + return BeanCopyUtil.copyList(tags, TagAdminDTO.class); } @Override From 38851f4610b7caafbb37f8ac2afea1808d63dcd8 Mon Sep 17 00:00:00 2001 From: linhaojun Date: Tue, 11 Oct 2022 21:09:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aurora-vue/aurora-blog/src/views/Tags.vue | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/aurora-vue/aurora-blog/src/views/Tags.vue b/aurora-vue/aurora-blog/src/views/Tags.vue index e745c32..f2a62d0 100644 --- a/aurora-vue/aurora-blog/src/views/Tags.vue +++ b/aurora-vue/aurora-blog/src/views/Tags.vue @@ -6,18 +6,9 @@
-