From e343e508ce5f2d355ad82c05a319981c66d1324b Mon Sep 17 00:00:00 2001
From: inleft <inleft@qq.com>
Date: Wed, 02 Mar 2022 01:36:27 +0800
Subject: [PATCH] 评论页追加完成

---
 snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/controller/BlogArticleOutsideController.java |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 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 843e2d0..76073b9 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
@@ -25,6 +25,7 @@
 package vip.xiaonuo.modular.blogarticle.controller;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.PageUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
@@ -42,7 +43,7 @@
 import vip.xiaonuo.modular.blogarticle.entity.BlogArticle;
 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.entity.BlogArticleVo;
 import vip.xiaonuo.modular.blogarticle.service.BlogArticleService;
 import vip.xiaonuo.modular.blogarticletype.entity.BlogArticleType;
 import vip.xiaonuo.modular.blogarticletype.service.BlogArticleTypeService;
@@ -79,7 +80,7 @@
     @PostMapping("/blogArticle/add")
     @BusinessLog(title = "外部blog系统_blog文章_增加", opType = LogAnnotionOpTypeEnum.ADD)
     public ResponseData add(@RequestBody @Validated(BlogArticleAddDto.add.class) BlogArticleAddDto addDto) {
-        if (!SecureUtil.md5(addDto.getSecret()).equals("8616CFB8D5ED3E5B")) {
+        if (!SecureUtil.md5(addDto.getSecret()).equals("b49e4cc48616cfb8d5ed3e5b983165c8")) {
             throw new BlogException("口令错误..");
         }
 
@@ -122,9 +123,12 @@
 
         BlogArticle article = new BlogArticle();
         BeanUtil.copyProperties(addDto, article);
-        System.out.println(article.toString());
+        article.setSeparateYear(DateUtil.year(article.getPublishDate()));
+        article.setSeparateMonth(DateUtil.month(article.getPublishDate())+1);
+        article.setSeparateDay(DateUtil.dayOfMonth(article.getPublishDate()));
 
-//        blogArticleService.add(blogArticleParam);
+        article.setIsEnable(MyConstant.Yes);
+        blogArticleService.save(article);
         return new SuccessResponseData();
     }
 
@@ -184,7 +188,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)) {
@@ -195,16 +199,13 @@
 
         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);
-            vo.setArticleFileURL("http://t.inleft.com/share/book/blog/a岛神灯.md");
-        } else {
-            vo.setArticleFileURL("http://t.inleft.com/share/book/blog/es-search.md");
-        }
+        String tempURL = this.getBlogSourceURL(find.getArticleFileId());
+
+        if (StrUtil.isEmpty(tempURL))
+            throw new BlogException(BlogExceptionEnum.article_file_lose);
+
+        vo.setArticleFileURL(tempURL);
 
         return new SuccessResponseData(vo);
     }
@@ -215,7 +216,7 @@
             return null;
         } else {
             String blogSourcePrefix = ConstantContextHolder.getBlogSourcePrefix();
-            return blogSourcePrefix + sysFileInfo.getFileBucket() + sysFileInfo.getFileObjectName();
+            return blogSourcePrefix + sysFileInfo.getFileBucket() + "/" + sysFileInfo.getFileObjectName();
         }
     }
 

--
Gitblit v1.9.1