From 42489a3f8904bf24bea1a37a33ec21d3648af023 Mon Sep 17 00:00:00 2001
From: zhangmeng <1334717033@qq.com>
Date: Sat, 11 Dec 2021 18:57:57 +0800
Subject: [PATCH] =?UTF-8?q?2021=E5=B9=B412=E6=9C=8811=E6=97=A518:57:17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysConfigController.java       | 26 +++++++++
 .../admin/manager/dao/SysConfigDao.java       | 14 +++++
 .../manager/service/SysConfigService.java     | 14 +++++
 .../service/impl/SysConfigServiceImpl.java    | 33 +++++++++++
 .../src/main/resources/application.yml        |  1 +
 .../templates/blog/v1/header/header.ftl       | 24 ++++----
 .../templates/xiaoshuo/fiction_chapter.ftl    |  4 +-
 .../resources/templates/xiaoshuo/index.ftl    | 10 ++--
 .../blog/controller/ArticleController.java    | 17 ++++++
 .../zhangmeng/blog/feign/SysConfigFeign.java  | 14 +++++
 .../com/zhangmeng/blog/feign/UserFeign.java   |  4 +-
 .../com/zhangmeng/model/entity/SysConfig.java | 56 +++++++++++++++++++
 12 files changed, 197 insertions(+), 20 deletions(-)
 create mode 100644 mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/SysConfigController.java
 create mode 100644 mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/dao/SysConfigDao.java
 create mode 100644 mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/service/SysConfigService.java
 create mode 100644 mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/service/impl/SysConfigServiceImpl.java
 create mode 100644 mystyle-cloud-blog/src/main/java/com/zhangmeng/blog/feign/SysConfigFeign.java
 create mode 100644 mystyle-cloud-model/src/main/java/com/zhangmeng/model/entity/SysConfig.java

diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/SysConfigController.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/SysConfigController.java
new file mode 100644
index 0000000..52183de
--- /dev/null
+++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/SysConfigController.java
@@ -0,0 +1,26 @@
+package com.zhangmeng.admin.manager.controller;
+
+import com.zhangmeng.admin.manager.service.SysConfigService;
+import com.zhangmeng.model.base.baseController.BaseController;
+import com.zhangmeng.model.dto.system.SysConstant;
+import com.zhangmeng.model.entity.SysConfig;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/sysConfig")
+public class SysConfigController extends BaseController {
+
+    @Autowired
+    private SysConfigService sysConfigService;
+
+    @GetMapping("/getSysConfig")
+    public SysConfig getSysConfig(){
+        SysConfig sysConfig = this.sysConfigService.getSysConfig();
+        System.out.println(sysConfig);
+        return sysConfig;
+
+    }
+}
diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/dao/SysConfigDao.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/dao/SysConfigDao.java
new file mode 100644
index 0000000..889ae06
--- /dev/null
+++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/dao/SysConfigDao.java
@@ -0,0 +1,14 @@
+package com.zhangmeng.admin.manager.dao;
+
+import com.zhangmeng.model.base.baseDao.AbstractBaseMapper;
+import com.zhangmeng.model.entity.SysConfig;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author zhangmeng
+ * @date 2021年7月15日15:30:20
+ * @version 1.0
+ */
+@Mapper
+public interface SysConfigDao extends AbstractBaseMapper<SysConfig> {
+}
diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/service/SysConfigService.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/service/SysConfigService.java
new file mode 100644
index 0000000..6a88ddb
--- /dev/null
+++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/service/SysConfigService.java
@@ -0,0 +1,14 @@
+package com.zhangmeng.admin.manager.service;
+
+import com.zhangmeng.model.base.baseService.BaseService;
+import com.zhangmeng.model.entity.SysConfig;
+
+/**
+ * @author zhangmeng
+ * @date 2021年7月15日15:29:21
+ * @version 1.0
+ */
+public interface SysConfigService extends BaseService<SysConfig> {
+
+   public SysConfig getSysConfig();
+}
diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/service/impl/SysConfigServiceImpl.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/service/impl/SysConfigServiceImpl.java
new file mode 100644
index 0000000..ae4c28b
--- /dev/null
+++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/service/impl/SysConfigServiceImpl.java
@@ -0,0 +1,33 @@
+package com.zhangmeng.admin.manager.service.impl;
+
+
+import com.zhangmeng.admin.manager.service.SysConfigService;
+import com.zhangmeng.model.base.baseService.impl.AbstractBaseServiceImpl;
+import com.zhangmeng.model.entity.SysConfig;
+import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Condition;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.List;
+
+/**
+ * @author zhangmeng
+ * @date 2021年7月15日15:28:58
+ * @version 1.0
+ */
+@Service
+public class SysConfigServiceImpl extends AbstractBaseServiceImpl<SysConfig> implements SysConfigService {
+    @Override
+    public SysConfig getSysConfig() {
+        Condition condition = new Condition(SysConfig.class);
+        Example.Criteria criteria = condition.createCriteria();
+        criteria.andEqualTo("deleteStatus",false);
+        condition.orderBy("addTime");
+        SysConfig sysConfig = null;
+        List<SysConfig> sysConfigs = this.findByCondition(condition);
+        if (sysConfigs.size() > 0 ){
+            sysConfig = sysConfigs.get(0);
+        }
+        return sysConfig;
+    }
+}
diff --git a/mystyle-cloud-admin-manager/src/main/resources/application.yml b/mystyle-cloud-admin-manager/src/main/resources/application.yml
index ba24d1b..f798b0d 100644
--- a/mystyle-cloud-admin-manager/src/main/resources/application.yml
+++ b/mystyle-cloud-admin-manager/src/main/resources/application.yml
@@ -73,6 +73,7 @@ mystyle:
       - /instances/**
       - /blog/index
       - /user/findByUserId
+      - /sysConfig/getSysConfig
 verification-code:
   type: mysql
   expiration-time: 300
diff --git a/mystyle-cloud-admin-manager/src/main/resources/templates/blog/v1/header/header.ftl b/mystyle-cloud-admin-manager/src/main/resources/templates/blog/v1/header/header.ftl
index 3c8c57d..3436bb8 100644
--- a/mystyle-cloud-admin-manager/src/main/resources/templates/blog/v1/header/header.ftl
+++ b/mystyle-cloud-admin-manager/src/main/resources/templates/blog/v1/header/header.ftl
@@ -4,19 +4,19 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/blog/semantic-ui/semantic.min.css">
-    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/blog/semantic-ui/css/customer.css">
-    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/editor/css/typo.css">
-    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/editor/css/animate.css">
-    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/blog/prism/prism.css">
-    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/blog/tocbot/tocbot.css">
+    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/mystyle-cloud-web-blog/blog/semantic-ui/semantic.min.css">
+    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/mystyle-cloud-web-blog/blog/semantic-ui/css/customer.css">
+    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/mystyle-cloud-web-blog/editor/css/typo.css">
+    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/mystyle-cloud-web-blog/editor/css/animate.css">
+    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/mystyle-cloud-web-blog/blog/prism/prism.css">
+    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/mystyle-cloud-web-blog/blog/tocbot/tocbot.css">
 
-    <script src="${springMacroRequestContext.contextPath}/blog/semantic-ui/semantic.min.js"></script>
-    <script src="${springMacroRequestContext.contextPath}/blog/semantic-ui/jquery-1.11.3.js"></script>
-    <script src="${springMacroRequestContext.contextPath}/blog/prism/prism.js"></script>
-    <script src="${springMacroRequestContext.contextPath}/blog/tocbot/tocbot.min.js"></script>
-    <script src="${springMacroRequestContext.contextPath}/blog/qrcode/qrcode.min.js"></script>
-    <script src="${springMacroRequestContext.contextPath}/blog/waypoints/jquery.waypoints.min.js"></script>
+    <script src="${springMacroRequestContext.contextPath}/mystyle-cloud-web-blog/blog/semantic-ui/semantic.min.js"></script>
+    <script src="${springMacroRequestContext.contextPath}/mystyle-cloud-web-blog/blog/semantic-ui/jquery-1.11.3.js"></script>
+    <script src="${springMacroRequestContext.contextPath}/mystyle-cloud-web-blog/blog/prism/prism.js"></script>
+    <script src="${springMacroRequestContext.contextPath}/mystyle-cloud-web-blog/blog/tocbot/tocbot.min.js"></script>
+    <script src="${springMacroRequestContext.contextPath}/mystyle-cloud-web-blog/blog/qrcode/qrcode.min.js"></script>
+    <script src="${springMacroRequestContext.contextPath}/mystyle-cloud-web-blog/blog/waypoints/jquery.waypoints.min.js"></script>
     <script src="//cdn.jsdelivr.net/npm/jquery.scrollto@2.1.2/jquery.scrollTo.min.js"></script>
 
     <title>${blogTools.title()!}</title>
diff --git a/mystyle-cloud-admin-manager/src/main/resources/templates/xiaoshuo/fiction_chapter.ftl b/mystyle-cloud-admin-manager/src/main/resources/templates/xiaoshuo/fiction_chapter.ftl
index baf6528..8d0bb04 100644
--- a/mystyle-cloud-admin-manager/src/main/resources/templates/xiaoshuo/fiction_chapter.ftl
+++ b/mystyle-cloud-admin-manager/src/main/resources/templates/xiaoshuo/fiction_chapter.ftl
@@ -6,7 +6,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <title>${fiction.bookName!}</title>
-    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/blog/bootstrap/dist/css/bootstrap.css" />
+    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/mystyle-cloud-web-blog/blog/bootstrap/dist/css/bootstrap.css" />
     <style>
         html,body{width: 100%;height: 100%;margin:0px;padding:0px;}
         body{overflow: hidden}
@@ -41,7 +41,7 @@
     <iframe name="right" id="iframepage"  src="/fiction/details/${fictionChapter.id!}" width="100%" height="100%"   frameborder="0" ranat="server"></iframe>
 </div>
 
-<script type="text/javascript" src="${springMacroRequestContext.contextPath}/js/jquery.min.js"></script>
+<script type="text/javascript" src="${springMacroRequestContext.contextPath}/mystyle-cloud-web-blog/js/jquery.min.js"></script>
 <script>
     $(function(){
         var wd = 265;
diff --git a/mystyle-cloud-admin-manager/src/main/resources/templates/xiaoshuo/index.ftl b/mystyle-cloud-admin-manager/src/main/resources/templates/xiaoshuo/index.ftl
index 3f83257..3143157 100644
--- a/mystyle-cloud-admin-manager/src/main/resources/templates/xiaoshuo/index.ftl
+++ b/mystyle-cloud-admin-manager/src/main/resources/templates/xiaoshuo/index.ftl
@@ -3,8 +3,8 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <title>${siteName!}</title>
-    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/system/component/layui/css/layui.css">
-    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/blog/css/index.css">
+    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/mystyle-cloud-web-blog/system/component/layui/css/layui.css">
+    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/mystyle-cloud-web-blog/blog/css/index.css">
 </head>
 <body>
 <div class="header">
@@ -59,11 +59,11 @@
         </div>
     </div>
 </div>
-<script src="${springMacroRequestContext.contextPath}/system/component/layui/layui.js"></script>
+<script src="${springMacroRequestContext.contextPath}/mystyle-cloud-web-blog/system/component/layui/layui.js"></script>
 <!-- 引入jquery js -->
-<script src="${springMacroRequestContext.contextPath}/js/jquery.min.js"></script>
+<script src="${springMacroRequestContext.contextPath}/mystyle-cloud-web-blog/js/jquery.min.js"></script>
 <!-- 自定义 js -->
-<script src="${springMacroRequestContext.contextPath}/blog/js/index.js"></script>
+<script src="${springMacroRequestContext.contextPath}/mystyle-cloud-web-blog/blog/js/index.js"></script>
 <script>
     $(function () {
         //init
diff --git a/mystyle-cloud-blog/src/main/java/com/zhangmeng/blog/controller/ArticleController.java b/mystyle-cloud-blog/src/main/java/com/zhangmeng/blog/controller/ArticleController.java
index d1a2f1a..d0b8cbe 100644
--- a/mystyle-cloud-blog/src/main/java/com/zhangmeng/blog/controller/ArticleController.java
+++ b/mystyle-cloud-blog/src/main/java/com/zhangmeng/blog/controller/ArticleController.java
@@ -2,6 +2,7 @@ package com.zhangmeng.blog.controller;
 
 import com.github.pagehelper.PageInfo;
 import com.zhangmeng.api.service.blog.ArticleControllerApi;
+import com.zhangmeng.blog.feign.SysConfigFeign;
 import com.zhangmeng.blog.feign.UserFeign;
 import com.zhangmeng.blog.service.ArticleService;
 import com.zhangmeng.blog.service.CategoryService;
@@ -12,6 +13,7 @@ import com.zhangmeng.model.dto.article.ArticleModel;
 import com.zhangmeng.model.dto.query.QueryParams;
 import com.zhangmeng.model.entity.Article;
 import com.zhangmeng.model.entity.Category;
+import com.zhangmeng.model.entity.SysConfig;
 import com.zhangmeng.model.entity.User;
 import com.zhangmeng.model.vo.Result;
 import com.zhangmeng.model.vo.StatusCode;
@@ -28,6 +30,7 @@ import tk.mybatis.mapper.entity.Example;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 @RestController
@@ -43,6 +46,9 @@ public class ArticleController extends BaseController implements ArticleControll
     @Autowired
     private UserFeign userFeign;
 
+    @Autowired
+    private SysConfigFeign sysConfigFeign;
+
     @Override
     @PostMapping("/save")
     public Result save(@RequestParam @RequestBody Map<String, Object> parms) {
@@ -186,6 +192,7 @@ public class ArticleController extends BaseController implements ArticleControll
         return this.articleService.findById(articleId);
     }
 
+
     @Override
     @GetMapping("/getListByPage")
     public Map<String,Object> getListByPage(@RequestParam Integer pageNum,@RequestParam Integer pageSize){
@@ -213,6 +220,16 @@ public class ArticleController extends BaseController implements ArticleControll
             }
         }
         articleModel.setArticleDto_list(article_dto_list);
+
+        SysConfig sysConfig = this.sysConfigFeign.getSysConfig();
+        if (sysConfig == null){
+            sysConfig = new SysConfig();
+            sysConfig.setAuthor("转身的背影在心底里沉沦");
+        }
+        if (sysConfig.getAuthor() == null){
+            sysConfig.setAuthor("转身的背影在心底里沉沦");
+        }
+
         map.put("articleModel", articleModel);
         return map;
     }
diff --git a/mystyle-cloud-blog/src/main/java/com/zhangmeng/blog/feign/SysConfigFeign.java b/mystyle-cloud-blog/src/main/java/com/zhangmeng/blog/feign/SysConfigFeign.java
new file mode 100644
index 0000000..28b29f1
--- /dev/null
+++ b/mystyle-cloud-blog/src/main/java/com/zhangmeng/blog/feign/SysConfigFeign.java
@@ -0,0 +1,14 @@
+package com.zhangmeng.blog.feign;
+
+import com.zhangmeng.model.dto.system.SysConstant;
+import com.zhangmeng.model.entity.SysConfig;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@FeignClient(value = SysConstant.mystyle_cloud_admin_manager,contextId = "sysconfig")
+public interface SysConfigFeign {
+
+   @GetMapping("/sysConfig/getSysConfig")
+   public SysConfig getSysConfig();
+
+}
diff --git a/mystyle-cloud-blog/src/main/java/com/zhangmeng/blog/feign/UserFeign.java b/mystyle-cloud-blog/src/main/java/com/zhangmeng/blog/feign/UserFeign.java
index d90a548..2ad12c7 100644
--- a/mystyle-cloud-blog/src/main/java/com/zhangmeng/blog/feign/UserFeign.java
+++ b/mystyle-cloud-blog/src/main/java/com/zhangmeng/blog/feign/UserFeign.java
@@ -6,7 +6,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(SysConstant.mystyle_cloud_admin_manager)
+@FeignClient(value = SysConstant.mystyle_cloud_admin_manager,contextId = "user")
 public interface UserFeign {
 
     @GetMapping("/user/current")
@@ -14,4 +14,6 @@ public interface UserFeign {
 
     @GetMapping("/user/findByUserId")
     public User findByUserId(@RequestParam("userId") Long userId);
+
+
 }
diff --git a/mystyle-cloud-model/src/main/java/com/zhangmeng/model/entity/SysConfig.java b/mystyle-cloud-model/src/main/java/com/zhangmeng/model/entity/SysConfig.java
new file mode 100644
index 0000000..61d677a
--- /dev/null
+++ b/mystyle-cloud-model/src/main/java/com/zhangmeng/model/entity/SysConfig.java
@@ -0,0 +1,56 @@
+package com.zhangmeng.model.entity;
+
+import com.zhangmeng.model.base.baseEntity.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @author zhengmeng
+ * @date 2021年1月7日17:44:40
+ * @version 1.0
+ */
+@NoArgsConstructor
+@Data
+@AllArgsConstructor
+@Entity
+@EqualsAndHashCode(callSuper = false)
+@Table(name = "sys_config")
+public class SysConfig extends BaseEntity<Long> {
+
+    public enum MailType{
+
+        mail_163("smtp.163.com"),
+        mail_qq("smtp.qq.com");
+
+        private String description;//描述
+
+        MailType(String description) {
+            this.description = description;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+    }
+
+    private String siteName;//站点名称
+
+    private String domain;//域名设置
+
+    private String siteIntroduction;  //站点简介
+
+    private MailType mailType;//邮箱类型
+
+    private String blogTitle;//博客标题
+
+    private String author;
+}