From cfde488bdd0163986087c880e0a2762645f8c14c Mon Sep 17 00:00:00 2001
From: inleft <inleft@qq.com>
Date: Mon, 21 Feb 2022 15:35:35 +0800
Subject: [PATCH] 资源获取修正
---
snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/controller/BlogArticleOutsideController.java | 79 +++++++++++++++++++++++++++++++++++++--
1 files changed, 74 insertions(+), 5 deletions(-)
diff --git a/snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/controller/BlogArticleOutsideController.java b/snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/controller/BlogArticleOutsideController.java
index d6ec646..0889227 100644
--- a/snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/controller/BlogArticleOutsideController.java
+++ b/snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/controller/BlogArticleOutsideController.java
@@ -24,20 +24,28 @@
*/
package vip.xiaonuo.modular.blogarticle.controller;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.PageUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.crypto.SecureUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import vip.xiaonuo.core.annotion.BusinessLog;
+import vip.xiaonuo.core.consts.MyConstant;
import vip.xiaonuo.core.context.constant.ConstantContextHolder;
import vip.xiaonuo.core.enums.LogAnnotionOpTypeEnum;
+import vip.xiaonuo.core.exception.BlogException;
+import vip.xiaonuo.core.exception.enums.BlogExceptionEnum;
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.param.BlogArticleQueryDto;
import vip.xiaonuo.modular.blogarticle.param.BlogArticleVo;
import vip.xiaonuo.modular.blogarticle.service.BlogArticleService;
+import vip.xiaonuo.sys.modular.file.entity.SysFileInfo;
+import vip.xiaonuo.sys.modular.file.service.SysFileInfoService;
import javax.annotation.Resource;
import java.util.HashMap;
@@ -58,6 +66,10 @@
@Resource
private BlogArticleService blogArticleService;
+
+ @Resource
+ private SysFileInfoService fileInfoService;
+
/**
* 查询blog文章
*
@@ -72,16 +84,20 @@
Map<String, Object> param = new HashMap<>(16);
param.put("pageNo", PageUtil.getStart(queryDto.getPageNo() - 1, queryDto.getPageSize()));
param.put("pageSize", queryDto.getPageSize());
- String fileUploadPathForLinux = ConstantContextHolder.getDefaultFileUploadPathForLinux();
+ param.put("typeId", queryDto.getTypeId());
- List<BlogArticleVo> resList = blogArticleService.searchMediaList(param).stream().map(e -> {
- if (StrUtil.isNotEmpty(e.getArticleFileURL())) {
- e.setArticleFileURL(fileUploadPathForLinux + e.getArticleFileURL());
+ String blogSourcePrefix = ConstantContextHolder.getBlogSourcePrefix();
+ List<BlogArticleVo> resList = blogArticleService.searchList(param).stream().map(e -> {
+ if (StrUtil.isNotEmpty(e.getCoverFileURL())) {
+ if (!e.getCoverFileURL().startsWith("http")) {
+ //补上访问参数
+ e.setCoverFileURL(blogSourcePrefix + e.getCoverFileURL());
+ }
}
return e;
}).collect(Collectors.toList());
- long count = blogArticleService.searchMediaListCount(param);
+ long count = blogArticleService.searchListCount(param);
Page<BlogArticleVo> queryPage = new Page<>(queryDto.getPageNo(), queryDto.getPageSize());
queryPage.setRecords(resList);
@@ -90,5 +106,58 @@
return new SuccessResponseData(queryPage);
}
+ @GetMapping("/blogArticle/queryBlogArticleDetail")
+ @BusinessLog(title = "外部blog系统_blog文章详情_查询", opType = LogAnnotionOpTypeEnum.QUERY)
+ public ResponseData queryBlogArticleDetail(BlogArticleQueryDto queryDto) {
+ BlogArticle find = blogArticleService.lambdaQuery()
+ .eq(BlogArticle::getIsEnable, MyConstant.Yes)
+ .eq(BlogArticle::getEditorStatus, MyConstant.Yes)
+ .eq(BlogArticle::getId, queryDto.getId())
+ .one();
+
+ if (find == null) {
+ throw new BlogException(BlogExceptionEnum.article_not_found);
+ }
+
+ //加密文章
+ if (find.getAuthStatus().equals(MyConstant.AuthStatus.authCode)) {
+ //授权码缺失
+ if (StrUtil.isEmpty(queryDto.getAuthWord())) {
+ throw new BlogException(BlogExceptionEnum.article_auth_error);
+ }
+ //授权码比对
+ if (!SecureUtil.md5(find.getAuthPassword()).equals(queryDto.getAuthWord())) {
+ throw new BlogException(BlogExceptionEnum.article_auth_pass_error);
+ }
+ } else if (find.getAuthStatus().equals(MyConstant.AuthStatus.privateCode)) {
+ throw new BlogException(BlogExceptionEnum.article_auth_private_error);
+ }
+
+ BlogArticleVo vo = new BlogArticleVo();
+
+ BeanUtil.copyProperties(find, vo);
+
+ if (queryDto.getId() % 2 == 0) {
+ String tempURL = this.getBlogSourceURL(find.getArticleFileId());
+ if (StrUtil.isEmpty(tempURL))
+ throw new BlogException(BlogExceptionEnum.article_file_lose);
+
+ vo.setArticleFileURL(tempURL);
+ } else {
+ vo.setArticleFileURL("http://t.inleft.com/share/book/blog/es-search.md");
+ }
+
+ return new SuccessResponseData(vo);
+ }
+
+ private String getBlogSourceURL(Long fileId) {
+ SysFileInfo sysFileInfo = fileInfoService.getById(fileId);
+ if (sysFileInfo == null) {
+ return null;
+ } else {
+ String blogSourcePrefix = ConstantContextHolder.getBlogSourcePrefix();
+ return blogSourcePrefix + sysFileInfo.getFileBucket() + sysFileInfo.getFileObjectName();
+ }
+ }
}
--
Gitblit v1.9.1