Merge pull request #177 from terwer/v4.x

feat:fix ing
terwer · Jul 18, 2022 · c9bc853 · c9bc853
2 parents 69027ac + ea714bd
commit c9bc853
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 25 deletions.
diff --git a/jvue-front/components/themes/default/HeaderMenu.vue b/jvue-front/components/themes/default/HeaderMenu.vue
@@ -50,6 +50,18 @@ export default {
           link: "/",
           icon: "fa fa-home"
         },
+        {
+          id: 1,
+          name: "笔记",
+          link: "/note",
+          icon: "fa fa-pencil"
+        },
+        {
+          id: 1,
+          name: "随笔",
+          link: "/essay",
+          icon: "fa fa-bolt"
+        },
         {
           id: 2,
           name: "关于",

diff --git a/jvue-front/pages/essay.css b/jvue-front/pages/essay.css
@@ -31,7 +31,7 @@
 .lay-blog .container .item .comment{width: 100%; line-height: 56px; background: #f9f9f9; font-size: 14px; overflow:hidden;}
 .lay-blog .container .item .comment a{display:inline-block;width:50%;text-align:center;float: left;}
 .lay-blog .container .item .comment a+a{border-left:1px solid #efefef;margin-left:-1px;}
-.lay-blog .container .item-btn{text-align:center;margin-top:20px;}
+.lay-blog .container .item-btn{text-align:center;/*margin-top:20px;*/}
 
 
 @media only screen and (max-width:  750px) {
@@ -52,13 +52,13 @@
 .lay-blog .container-message .item-btn{
     text-align: right;
 }
-.lay-blog .container-message .item-btn{margin-bottom: 50px;}
-.lay-blog .container-message .info-item{font-size:14px;margin-bottom: 16px;}
+.lay-blog .container-message .item-btn{/*margin-bottom: 50px;*/}
+.lay-blog .container-message .info-item{font-size:14px;margin-bottom: 16px;clear: both;}
 .lay-blog .container-message .info-img{cursor: pointer;float: left;padding-right:20px;width: 50px;    margin-top: 20px;margin-left: 20px;}
 .lay-blog .container-message .info-text{padding-left: 60px;border: solid 1px #ffffff;border-radius: 4px;}
 .lay-blog .container-message .title{overflow:hidden;}
 .lay-blog .container-message .title .name{float: left; display: block; line-height: 38px; color:#787878;}
 .info-intr{padding-left: 10px;line-height: 24px;margin-bottom: 5px;}
 .lay-blog .container-message .title .info-img{float: right;color:#4b5a75;    width: auto;}
 .lay-blog .container-message .title .info-img i{font-size: 24px;padding-right: 5px;position: relative;top: 4px;}
-.lay-blog .container-message .paging{text-align:center;}
+.lay-blog .container-message .paging{text-align:center;}
diff --git a/jvue-front/pages/essay/index.vue b/jvue-front/pages/essay/index.vue
@@ -37,20 +37,22 @@
                                   </form>
 
                                   <div class="item-btn">
-                                    <button
+                                    <el-button
                                       id="item-btn"
-                                      class="layui-btn layui-btn-normal"
+                                      slot="append"
+                                      type="primary"
+                                      size="small"
                                       @click="publishEssay"
                                     >
                                       提交
-                                    </button>
+                                    </el-button>
                                   </div>
 
                                   <div id="LAY-msg-box">
                                     <div class="info-box">
                                       <div
                                         v-for="timeline in postListArray"
-                                        :key="timeline.postId"
+                                        :key="timeline.id"
                                         class="info-item"
                                       >
                                         <img
@@ -59,23 +61,36 @@
                                           alt=""
                                         />
                                         <div class="info-text">
-                                          <h4>{{ timeline.postDate }}</h4>
+                                          <h4>
+                                            {{
+                                              new Date(
+                                                timeline.created
+                                              ).toLocaleString()
+                                            }}
+                                          </h4>
                                           <div class="title count">
                                             <span class="name">倚楼听雨</span>
                                           </div>
                                           <div
                                             class="info-intr"
-                                            v-html="timeline.postContent"
+                                            v-html="timeline.desc"
                                           ></div>
                                           <div class="read-more">
                                             <span
                                               v-if="
-                                                timeline.postContent &&
-                                                  timeline.postContent.length >=
-                                                    50
+                                                timeline.desc &&
+                                                  timeline.desc.length >= 50
                                               "
                                             >
-                                              <a target="_blank">阅读全文</a>
+                                              <nuxt-link
+                                                :to="
+                                                  '/post/' +
+                                                    timeline.id +
+                                                    '.html'
+                                                "
+                                              >
+                                                <h2>阅读全文</h2>
+                                              </nuxt-link>
                                             </span>
                                           </div>
                                         </div>
@@ -108,12 +123,14 @@
         <el-col :xs="0" :md="2">&nbsp;</el-col>
       </el-row>
       <el-row>
-        <el-col>
+        <el-col :xs="0" :md="2">&nbsp;</el-col>
+        <el-col :xs="24" :md="20">
           <el-footer>
-            <Footer :site-config="siteConfigObj" />
             <FriendLink />
+            <Footer :site-config="siteConfigObj" />
           </el-footer>
         </el-col>
+        <el-col :xs="0" :md="2">&nbsp;</el-col>
       </el-row>
     </el-main>
   </el-container>
@@ -124,6 +141,7 @@ import FriendLink from "../../components/themes/default/FriendLink";
 import HeaderTime from "@/components/themes/default/HeaderTime";
 import Header from "@/components/themes/default/Header";
 import Footer from "@/components/themes/default/Footer";
+import { inBrowser } from "@/util/dom";
 
 export default {
   name: "Essay",
@@ -198,8 +216,27 @@ export default {
     },
     async publishEssay() {
       console.log("start publish essay:" + this.newEssay);
-      const result = await this.loadmore();
-      console.log("result=>", result);
+      const result = await this.$axios.$post("admin/post/save", {
+        title: new Date().toLocaleDateString(),
+        type: "essay",
+        status: "publish",
+        content: this.newEssay
+      });
+      const ret = result.status === 1;
+      console.log("ret=>", ret);
+
+      await this.loadmore();
+
+      this.$message({
+        message: "随笔发布成功",
+        type: "success"
+      });
+
+      setTimeout(function() {
+        if (inBrowser) {
+          window.location.reload();
+        }
+      }, 1000);
     }
   }
 };
@@ -211,10 +248,15 @@ export default {
 @import "../essay.css";
 
 .essay {
-  color: #ffffff;
+  color: #333333;
 }
 .read-more a {
   color: #1e9fff;
+  cursor: pointer;
+  h2 {
+    font-size: 14px;
+    padding-left: 10px;
+  }
 }
 .load-more {
   color: #ffb800;

diff --git a/jvue-front/pages/note.vue b/jvue-front/pages/note.vue
@@ -25,12 +25,14 @@
         <el-col :xs="0" :md="2">&nbsp;</el-col>
       </el-row>
       <el-row>
-        <el-col>
+        <el-col :xs="0" :md="2">&nbsp;</el-col>
+        <el-col :xs="24" :md="20">
           <el-footer>
-            <Footer :site-config="siteConfigObj" />
             <FriendLink />
+            <Footer :site-config="siteConfigObj" />
           </el-footer>
         </el-col>
+        <el-col :xs="0" :md="2">&nbsp;</el-col>
       </el-row>
     </el-main>
   </el-container>

diff --git a/jvue-front/pages/post/_id.vue b/jvue-front/pages/post/_id.vue
@@ -72,12 +72,14 @@
         <el-col :xs="0" :md="2">&nbsp;</el-col>
       </el-row>
       <el-row>
-        <el-col>
+        <el-col :xs="0" :md="2">&nbsp;</el-col>
+        <el-col :xs="24" :md="20">
           <el-footer>
-            <Footer :site-config="siteConfigObj" />
             <FriendLink />
+            <Footer :site-config="siteConfigObj" />
           </el-footer>
         </el-col>
+        <el-col :xs="0" :md="2">&nbsp;</el-col>
       </el-row>
     </el-main>
   </el-container>

diff --git a/jvue-server/src/main/java/com/terwergreen/jvueserver/service/impl/PostServiceImpl.java b/jvue-server/src/main/java/com/terwergreen/jvueserver/service/impl/PostServiceImpl.java
@@ -7,13 +7,15 @@
 import com.terwergreen.jvueserver.service.PostService;
 import com.terwergreen.jvueserver.util.PostStatusEnum;
 import com.terwergreen.jvueserver.util.PostTypeEmum;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -81,8 +83,15 @@ public Post savePost(Post post) {
         if (null != post.getId() && post.getId() > 0) {
             commonDAO.updateByObject("updatePost", post);
         } else {
-            post.setAuthorId(1);
-            post.setType(PostTypeEmum.POST_TYPE_POST.getName());
+            if (null == post.getAuthorId()) {
+                post.setAuthorId(1);
+            }
+            if (StringUtils.isEmpty(post.getType())) {
+                post.setType(PostTypeEmum.POST_TYPE_POST.getName());
+            }
+            if (StringUtils.isEmpty(post.getTitle())) {
+                post.setTitle(new Date().toString());
+            }
             commonDAO.insertByObject("insertPost", post);
         }
         return post;