Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/ArticleOperation/src/main/resources/application.yml

@@ -18,6 +18,7 @@ mybatis:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 server:
   port: 8091
+#  port: 8092
 #upload:
 #  path: C:/Users/12871/Downloads/
 upload:

fhKeeper/formulahousekeeper/webttkuaiban/src/main/java/com/firerock/webttkuaiban/demos/controller/ArticleTemplateController.java

@@ -2,7 +2,6 @@ package com.firerock.webttkuaiban.demos.controller;
 
 import com.firerock.webttkuaiban.demos.pojo.Article;
 import com.firerock.webttkuaiban.demos.service.ArticleService;
-import org.apache.tomcat.util.codec.binary.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,35 +24,35 @@ public class ArticleTemplateController {
     ArticleService articleService;
 
     @GetMapping("/pageList/{pageIndex}")  // 这里的 PageBean 是事先定义好的实体类
-    public Object PageList(Model model, @PathVariable("pageIndex") Integer pageIndex, @RequestParam(required = false) String info)
-    {
-        Integer pageSize=10;
+    public Object PageList(Model model, @PathVariable("pageIndex") Integer pageIndex, @RequestParam(required = false) String info) {
+        Integer pageSize = 10;
         // 定义格式化器
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        List<Article> articleList= articleService.PageList(pageIndex,pageSize,info);
-        Integer total=articleService.getTotal(info);
-        if (!articleList.isEmpty()){
+        List<Article> articleList = articleService.PageList(pageIndex, pageSize, info);
+        Integer total = articleService.getTotal(info);
+        if (!articleList.isEmpty()) {
             for (Article article : articleList) {
                 byte[] imageData = article.getCoverImg();
-                if (imageData != null){
+                if (imageData != null) {
                     String base64Image = Base64.getEncoder().encodeToString(imageData);
                     article.setBaseImage(base64Image);
-                }else {
+                } else {
                     article.setBaseImage("");
                 }
                 article.setCreateTimeStr(article.getCreateTime().format(formatter));
             }
         }
         model.addAttribute("knowledgeFieldTableList", articleList);
-        model.addAttribute("total",total );
+        model.addAttribute("total", total);
         return "knowledge";
     }
+
     @RequestMapping(value = "/articleList", method = RequestMethod.GET)
     public String articleList(Model model) {
         List<HashMap> articles = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
             HashMap<String, String> article = new HashMap<>();
-            article.put("id", "" + (i+1));
+            article.put("id", "" + (i + 1));
             article.put("title", "Article Title " + i);
             article.put("content", "Article Content " + i);
             articles.add(article);
@@ -61,36 +60,34 @@ public class ArticleTemplateController {
         model.addAttribute("articles", articles);
         return "articleList";
     }
+
     @GetMapping("/articleDetail/{id}")  // 这里的 PageBean 是事先定义好的实体类
-    public Object articleDetail(Model model,@PathVariable("id") Integer id)
-    {
+    public Object articleDetail(Model model, @PathVariable("id") Integer id) {
         // 定义格式化器
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
         long l = System.currentTimeMillis();
-        List<Article> latestList =articleService.latestList();
-        if (!latestList.isEmpty()){
+        List<Article> latestList = articleService.latestList();
+        if (!latestList.isEmpty()) {
             for (Article article : latestList) {
                 byte[] imageData = article.getCoverImg();
-                if (imageData != null){
+                if (imageData != null) {
                     String base64Image = Base64.getEncoder().encodeToString(imageData);
                     article.setBaseImage(base64Image);
-                }
-                else {
+                } else {
                     article.setBaseImage("");
                 }
                 article.setCreateTimeStr(article.getCreateTime().format(formatter));
             }
         }
-        List<Article> relatedList =articleService.relatedList(id);
-        if (!relatedList.isEmpty()){
+        List<Article> relatedList = articleService.relatedList(id);
+        if (!relatedList.isEmpty()) {
             for (Article article : relatedList) {
                 byte[] imageData = article.getCoverImg();
-                if (imageData != null){
+                if (imageData != null) {
                     String base64Image = Base64.getEncoder().encodeToString(imageData);
                     article.setBaseImage(base64Image);
-                }
-                else {
+                } else {
                     article.setBaseImage("");
                 }
                 article.setCreateTimeStr(article.getCreateTime().format(formatter));
@@ -102,9 +99,9 @@ public class ArticleTemplateController {
         articleService.updateViewCountById(id);
 
         model.addAttribute("latestList", latestList);
-        model.addAttribute("relatedList",relatedList );
-        model.addAttribute("article",article);
-        model.addAttribute("categoryNameList",article.getCategoryNameList()==null?new ArrayList<String>():article.getCategoryNameList());
+        model.addAttribute("relatedList", relatedList);
+        model.addAttribute("article", article);
+        model.addAttribute("categoryNameList", article.getCategoryNameList() == null ? new ArrayList<String>() : article.getCategoryNameList());
         return "knowledgeDetails";
     }
 }

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/css/knowledgeField.css

@@ -186,9 +186,11 @@
   right: 1.875rem;
   display: flex;
   align-items: center;
+  font-weight: normal;
 }
 .knowledgeFieldCon .knowledgeDetails .knowledgeDetails-left .knowledgeDetails-left-title .previewTwo img {
   width: 1.25rem !important;
+  margin-right: 0.375rem;
 }
 .knowledgeFieldCon .knowledgeDetails .knowledgeDetails-left .knowledgeDetails-left-con {
   padding: 0 1.875rem 0.9375rem 1.875rem;

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/css/knowledgeField.less

@@ -191,8 +191,10 @@
           right: 1.875rem;
           display: flex;
           align-items: center;
+          font-weight: normal;
           img {
             width: 1.25rem !important;
+            margin-right: .375rem;
           }
         }
       }

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/knowledge.ftl

@@ -99,11 +99,12 @@
 <script>
   // 获取当前页面的 URL 参数
   // const params = new URLSearchParams(window.location.search);
-  const url = window.location.search
+  const url = window.location.href
   const match = url.match(/pageList\/(\d+)/);
   const number = match ? match[1] : null;
   const pageIndex = +number || 1
   const pageSize = 10
+  console.log(number, '<==== number')
   // const pageIndex = +params.get('pageIndex') || 1;
   // const pageSize = +params.get('pageSize') || 10;
 

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/templates/css/knowledgeField.css

@@ -103,7 +103,8 @@
 }
 .knowledgeFieldCon .knowledgeField .knowledgeField-content .knowledgeField-content-item .textContent .textContentUnderstand .textContentUnderstandText img {
   width: 1.25rem;
-  padding: 0 0.875rem;
+  margin-left: 20px;
+  margin-right: 0.25rem;
 }
 .knowledgeFieldCon .knowledgeField .knowledgeField-content .knowledgeField-content-item .textContent p {
   color: #7b7b7b;

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/templates/css/knowledgeField.less

@@ -103,7 +103,8 @@
               align-items: center;
               img {
                 width: 1.25rem;
-                padding: 0 .875rem;
+                margin-left: 20px;
+                margin-right: .25rem;
               }
             }
           }

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/templates/knowledge.ftl

@@ -99,11 +99,12 @@
 <script>
   // 获取当前页面的 URL 参数
   // const params = new URLSearchParams(window.location.search);
-  const url = window.location.search
+  const url = window.location.href
   const match = url.match(/pageList\/(\d+)/);
   const number = match ? match[1] : null;
   const pageIndex = +number || 1
   const pageSize = 10
+  console.log(number, '<==== number')
   // const pageIndex = +params.get('pageIndex') || 1;
   // const pageSize = +params.get('pageSize') || 10;
 

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/templates/knowledgeDetails.ftl

@@ -39,7 +39,7 @@
       <div class="knowledgeDetails-left">
         <div class="knowledgeDetails-left-title">
           ${article.title}
-          <div class="previewTwo"><img src="/image/ions/previewIcon.png" />：${article.viewCount}</div>
+          <div class="previewTwo"><img src="/image/ions/previewIcon.png" /> ${article.viewCount}</div>
         </div>
         <div class="dividingLine"></div>
         <div class="knowledgeDetails-left-con">