snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/controller/BlogArticleOutsideController.java

@@ -25,6 +25,7 @@
package vip.xiaonuo.modular.blogarticle.controller;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.PageUtil;
import cn.hutool.core.util.StrUtil;
@@ -41,9 +42,9 @@
import vip.xiaonuo.core.pojo.response.ResponseData;
import vip.xiaonuo.core.pojo.response.SuccessResponseData;
import vip.xiaonuo.modular.blogarticle.entity.BlogArticle;
import vip.xiaonuo.modular.blogarticle.entity.BlogArticleVo;
import vip.xiaonuo.modular.blogarticle.param.BlogArticleAddDto;
import vip.xiaonuo.modular.blogarticle.param.BlogArticleQueryDto;
import vip.xiaonuo.modular.blogarticle.param.BlogArticleVo;
import vip.xiaonuo.modular.blogarticle.service.BlogArticleService;
import vip.xiaonuo.modular.blogarticletype.entity.BlogArticleType;
import vip.xiaonuo.modular.blogarticletype.service.BlogArticleTypeService;
@@ -124,7 +125,7 @@
        BlogArticle article = new BlogArticle();
        BeanUtil.copyProperties(addDto, article);
        article.setSeparateYear(DateUtil.year(article.getPublishDate()));
        article.setSeparateMonth(DateUtil.month(article.getPublishDate())+1);
        article.setSeparateMonth(DateUtil.month(article.getPublishDate()) + 1);
        article.setSeparateDay(DateUtil.dayOfMonth(article.getPublishDate()));

        article.setIsEnable(MyConstant.Yes);
@@ -147,8 +148,13 @@
        param.put("pageNo", PageUtil.getStart(queryDto.getPageNo() - 1, queryDto.getPageSize()));
        param.put("pageSize", queryDto.getPageSize());
        param.put("typeId", queryDto.getTypeId());
        param.put("fileType", queryDto.getFileType());

        String blogSourcePrefix = ConstantContextHolder.getBlogSourcePrefix();

        Date now = DateUtil.date();
        //空类型查询条件,排除笔记系列,按更新时间倒序
        //含有类型查询,按发布时间倒序
        List<BlogArticleVo> resList = blogArticleService.searchList(param).stream().map(e -> {
            if (StrUtil.isNotEmpty(e.getCoverFileURL())) {
                if (!e.getCoverFileURL().startsWith("http")) {
@@ -156,6 +162,15 @@
                    e.setCoverFileURL(blogSourcePrefix + e.getCoverFileURL());
                }
            }

            //前端根据条件标注小红点(发布时间和更新时间在7天内)
            if (e.getPublishDate().before(e.getUpdateDate())
                    && DateUtil.between(e.getUpdateDate(), now, DateUnit.DAY) <= 7) {
                e.setIsAnyUpdate(MyConstant.Yes);
            } else {
                e.setIsAnyUpdate(MyConstant.No);
            }

            return e;
        }).collect(Collectors.toList());

@@ -188,7 +203,7 @@
                throw new BlogException(BlogExceptionEnum.article_auth_error);
            }
            //授权码比对
            if (!SecureUtil.md5(find.getAuthPassword()).equals(queryDto.getAuthWord())) {
            if (!find.getAuthPassword().equals(queryDto.getAuthWord())) {
                throw new BlogException(BlogExceptionEnum.article_auth_pass_error);
            }
        } else if (find.getAuthStatus().equals(MyConstant.AuthStatus.privateCode)) {
@@ -206,7 +221,7 @@
            throw new BlogException(BlogExceptionEnum.article_file_lose);

        vo.setArticleFileURL(tempURL);

        vo.setCoverFileURL(this.getBlogSourceURL(vo.getCoverFileId()));
        return new SuccessResponseData(vo);
    }