diff --git a/blog_main/src/main/java/cn/sticki/blog/config/MybatisPlusConfig.java b/blog_main/src/main/java/cn/sticki/blog/config/MybatisPlusConfig.java
index 57319e63..d40e582c 100644
--- a/blog_main/src/main/java/cn/sticki/blog/config/MybatisPlusConfig.java
+++ b/blog_main/src/main/java/cn/sticki/blog/config/MybatisPlusConfig.java
@@ -1,6 +1,7 @@
 package cn.sticki.blog.config;
 
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -8,10 +9,11 @@
 @Configuration
 public class MybatisPlusConfig {
 
-	@Bean  // 配置分页
+	@Bean
 	public MybatisPlusInterceptor mybatisPlusInterceptor() {
 		MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-		interceptor.addInnerInterceptor(new PaginationInnerInterceptor());
+		interceptor.addInnerInterceptor(new PaginationInnerInterceptor()); // 配置分页助手
+		interceptor.addInnerInterceptor(new BlockAttackInnerInterceptor()); // 阻止恶意的全表更新删除
 		return interceptor;
 	}
 
diff --git a/blog_main/src/main/java/cn/sticki/blog/config/ResourcePath.java b/blog_main/src/main/java/cn/sticki/blog/config/ResourcePath.java
index e2427f88..35231d06 100644
--- a/blog_main/src/main/java/cn/sticki/blog/config/ResourcePath.java
+++ b/blog_main/src/main/java/cn/sticki/blog/config/ResourcePath.java
@@ -13,6 +13,10 @@ public class ResourcePath {
 
 	public static String defaultAvatar;
 
+	public static String blogImage;
+
+	public static String blogImageUrlBase;
+
 	public void setAvatar(String avatar) {
 		ResourcePath.avatar = avatar;
 	}
@@ -25,4 +29,12 @@ public void setDefaultAvatar(String defaultAvatar) {
 		ResourcePath.defaultAvatar = defaultAvatar;
 	}
 
+	public void setBlogImage(String blogImage) {
+		ResourcePath.blogImage = blogImage;
+	}
+
+	public void setBlogImageUrlBase(String blogImageUrlBase) {
+		ResourcePath.blogImageUrlBase = blogImageUrlBase;
+	}
+
 }
\ No newline at end of file
diff --git a/blog_main/src/main/java/cn/sticki/blog/config/SpringSecurityConfig.java b/blog_main/src/main/java/cn/sticki/blog/config/SpringSecurityConfig.java
index 5cb0281e..e3e42a88 100644
--- a/blog_main/src/main/java/cn/sticki/blog/config/SpringSecurityConfig.java
+++ b/blog_main/src/main/java/cn/sticki/blog/config/SpringSecurityConfig.java
@@ -1,11 +1,11 @@
 package cn.sticki.blog.config;
 
 import cn.sticki.blog.security.filter.AuthenticationTokenFilter;
+import cn.sticki.blog.security.filter.IPLimitFilter;
 import cn.sticki.blog.security.handler.AuthAccessDeniedHandler;
 import cn.sticki.blog.security.handler.AuthenticationEntryPointHandler;
 import cn.sticki.blog.security.handler.LoginFailureHandler;
 import cn.sticki.blog.security.handler.LoginSuccessHandler;
-import cn.sticki.blog.util.ResponseUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -57,12 +57,15 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
 	@Autowired
 	private AuthenticationEntryPointHandler authenticationEntryPointHandler;
 
-	/**
-	 * 自定义登录逻辑验证器
-	 */
+	// /**
+	//  * 自定义登录逻辑验证器
+	//  */
 	// @Autowired
 	// private UserAuthenticationProvider userAuthenticationProvider;
 
+	/**
+	 * 用户认证过滤器
+	 */
 	@Autowired
 	private AuthenticationTokenFilter authenticationTokenFilter;
 	//
@@ -73,7 +76,7 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
 	// private AccessDeniedHandler accessDeniedHandler;
 
 	@Autowired
-	private ResponseUtils responseUtils;
+	private IPLimitFilter ipLimitFilter;
 
 	// @Resource
 	// private AuthenticationFailureHandlerAdvice authenticationFailureHandlerAdvice;
@@ -114,6 +117,8 @@ protected void configure(HttpSecurity http) throws Exception {
 		http.headers().cacheControl();
 		// 添加JWT过滤器
 		http.addFilterAt(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class);
+		// 添加ip限制过滤器
+		http.addFilterBefore(ipLimitFilter, UsernamePasswordAuthenticationFilter.class);
 	}
 
 	@Bean
diff --git a/blog_main/src/main/java/cn/sticki/blog/controller/BlogActionController.java b/blog_main/src/main/java/cn/sticki/blog/controller/BlogActionController.java
index a082026d..0a73b688 100644
--- a/blog_main/src/main/java/cn/sticki/blog/controller/BlogActionController.java
+++ b/blog_main/src/main/java/cn/sticki/blog/controller/BlogActionController.java
@@ -17,7 +17,7 @@
 
 @Slf4j
 @RestController
-@RequestMapping("/blog")
+@RequestMapping("/action/blog")
 public class BlogActionController {
 
 	@Resource
diff --git a/blog_main/src/main/java/cn/sticki/blog/controller/BlogConsoleController.java b/blog_main/src/main/java/cn/sticki/blog/controller/BlogConsoleController.java
index 00ca37b9..8eb1d2b6 100644
--- a/blog_main/src/main/java/cn/sticki/blog/controller/BlogConsoleController.java
+++ b/blog_main/src/main/java/cn/sticki/blog/controller/BlogConsoleController.java
@@ -140,4 +140,14 @@ public RestTemplate completelyDeleteBlog(@NotNull Integer id) throws UserIllegal
 		return new RestTemplate(blogConsoleService.remove(wrapper));
 	}
 
+	@PostMapping("/img")
+	public RestTemplate uploadBlogImg(@NotNull MultipartFile file) {
+		log.debug("uploadBlogImg, fileName->{}, userId->{}", file.getOriginalFilename(), authenticationFacade.getUser().getId());
+		if (fileUtils.isNotEmpty(file)) {
+			fileUtils.checkFile(file, 1024 * 1024L, FileType.JPEG, FileType.PNG);
+		}
+		String url = blogConsoleService.uploadImage(file);
+		return new RestTemplate(url);
+	}
+
 }
diff --git a/blog_main/src/main/java/cn/sticki/blog/controller/BlogController.java b/blog_main/src/main/java/cn/sticki/blog/controller/BlogController.java
index 7953fc80..3fd67798 100644
--- a/blog_main/src/main/java/cn/sticki/blog/controller/BlogController.java
+++ b/blog_main/src/main/java/cn/sticki/blog/controller/BlogController.java
@@ -4,7 +4,9 @@
 import cn.sticki.blog.pojo.domain.BlogBasic;
 import cn.sticki.blog.pojo.domain.User;
 import cn.sticki.blog.pojo.dto.UserBlogActionStatusDTO;
-import cn.sticki.blog.pojo.vo.*;
+import cn.sticki.blog.pojo.vo.BlogListVO;
+import cn.sticki.blog.pojo.vo.HotBlogListVO;
+import cn.sticki.blog.pojo.vo.RestTemplate;
 import cn.sticki.blog.security.AuthenticationFacade;
 import cn.sticki.blog.service.BlogActionService;
 import cn.sticki.blog.service.BlogBasicService;
@@ -70,9 +72,7 @@ public RestTemplate recommendBlog(@RequestParam(defaultValue = "1") int page) {
 	public RestTemplate searchBlog(@NotNull String key, @RequestParam(defaultValue = "1") int page) {
 		log.debug("searchBlog,search->{},page->{}", key, page);
 		BlogListVO blogListVO = blogBasicService.searchBlog(key, page, pageSize);
-		IListVO<BlogBasic> blogList = new ListVO<>();
-		blogList.setRecords(blogListVO.getRecords());
-		return new RestTemplate(blogList);
+		return new RestTemplate(blogListVO);
 	}
 
 	/**
diff --git a/blog_main/src/main/java/cn/sticki/blog/controller/CommentController.java b/blog_main/src/main/java/cn/sticki/blog/controller/CommentController.java
new file mode 100644
index 00000000..b2e92ebd
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/controller/CommentController.java
@@ -0,0 +1,64 @@
+package cn.sticki.blog.controller;
+
+import cn.sticki.blog.exception.userException.UserArgumentException;
+import cn.sticki.blog.pojo.domain.Comment;
+import cn.sticki.blog.pojo.domain.User;
+import cn.sticki.blog.pojo.vo.CommentListVO;
+import cn.sticki.blog.pojo.vo.RestTemplate;
+import cn.sticki.blog.security.AuthenticationFacade;
+import cn.sticki.blog.service.CommentService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@RestController
+@RequestMapping("/comment")
+public class CommentController {
+
+	@Resource
+	private AuthenticationFacade authenticationFacade;
+
+	@Resource
+	private CommentService commentService;
+
+	/**
+	 * 新增评论
+	 *
+	 * @param comment 必须传入被评论的博客id和评论内容
+	 */
+	@PostMapping
+	public RestTemplate createComment(@RequestBody Comment comment) {
+		if (comment.getBlogId() == null || comment.getContent() == null)
+			throw new UserArgumentException();
+		User user = authenticationFacade.getUser();
+		comment.setUserId(user.getId());
+		commentService.create(comment);
+		return new RestTemplate();
+	}
+
+	/**
+	 * 删除评论
+	 *
+	 * @param id 评论id
+	 */
+	@DeleteMapping
+	public RestTemplate deleteComment(@RequestParam Integer id) {
+		User user = authenticationFacade.getUser();
+		commentService.checkAndDelete(user.getId(), id);
+		return new RestTemplate();
+	}
+
+	/**
+	 * 获取评论列表
+	 *
+	 * @param blogId 评论的博客id
+	 */
+	@GetMapping("/list")
+	public RestTemplate getCommentList(@RequestParam Integer blogId, @RequestParam Integer page, @RequestParam(defaultValue = "3") Integer pageSize) {
+		CommentListVO commentListVO = commentService.getList(blogId, page, pageSize);
+		return new RestTemplate(commentListVO);
+	}
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/controller/RegisterController.java b/blog_main/src/main/java/cn/sticki/blog/controller/RegisterController.java
index af7868f1..efe78e21 100644
--- a/blog_main/src/main/java/cn/sticki/blog/controller/RegisterController.java
+++ b/blog_main/src/main/java/cn/sticki/blog/controller/RegisterController.java
@@ -48,7 +48,7 @@ public RestTemplate sendMailVerify(String mail) throws Exception {
 			registerService.sendMailVerify(mail);
 			return new RestTemplate(true);
 		}
-		return new RestTemplate(false, "发送频繁");
+		return new RestTemplate(400, "发送频繁");
 	}
 
 	/**
diff --git a/blog_main/src/main/java/cn/sticki/blog/controller/ResourceController.java b/blog_main/src/main/java/cn/sticki/blog/controller/ResourceController.java
index 99808b38..38b7f2c7 100644
--- a/blog_main/src/main/java/cn/sticki/blog/controller/ResourceController.java
+++ b/blog_main/src/main/java/cn/sticki/blog/controller/ResourceController.java
@@ -1,8 +1,8 @@
 package cn.sticki.blog.controller;
 
 import cn.sticki.blog.config.ResourcePath;
-import cn.sticki.blog.exception.systemException.MinioException;
 import cn.sticki.blog.util.OssUtils;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Controller;
@@ -13,7 +13,6 @@
 import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 
 @Slf4j
 @Controller
@@ -30,26 +29,26 @@ public class ResourceController {
 	 * @param response 响应头
 	 */
 	@GetMapping("/avatar/{file}")
-	public void getAvatar(@PathVariable @NotNull String file, @NotNull HttpServletResponse response)
-			throws IOException, MinioException {
-		log.debug("getAvatar, fileName->{}", file);
-		response.setContentType("image/jpeg");
-		try (
-				ServletOutputStream outputStream = response.getOutputStream()
-		) {
-			ossUtils.download(ResourcePath.avatar + file, outputStream);
-		}
+	public void getAvatar(@PathVariable @NotNull String file, @NotNull HttpServletResponse response) {
+		getImg(ResourcePath.avatar + file, response);
 	}
 
 	@GetMapping("/blog-cover/{file}")
-	public void getBlogCover(@PathVariable @NotNull String file, @NotNull HttpServletResponse response)
-			throws IOException, MinioException {
-		log.debug("getBlogCover, fileName->{}", file);
+	public void getBlogCover(@PathVariable @NotNull String file, @NotNull HttpServletResponse response) {
+		getImg(ResourcePath.blogCoverImage + file, response);
+	}
+
+	@GetMapping("/blog-img/{file}")
+	public void getBlogImg(@PathVariable @NotNull String file, @NotNull HttpServletResponse response) {
+		getImg(ResourcePath.blogImage + file, response);
+	}
+
+	@SneakyThrows
+	private void getImg(String filePath, HttpServletResponse response) {
+		log.debug("getImg, fileName->{}", filePath);
 		response.setContentType("image/jpeg");
-		try (
-				ServletOutputStream outputStream = response.getOutputStream()
-		) {
-			ossUtils.download(ResourcePath.blogCoverImage + file, outputStream);
+		try (ServletOutputStream outputStream = response.getOutputStream()) {
+			ossUtils.download(filePath, outputStream);
 		}
 	}
 
diff --git a/blog_main/src/main/java/cn/sticki/blog/controller/UserController.java b/blog_main/src/main/java/cn/sticki/blog/controller/UserController.java
index 1bb9cbdd..45362b65 100644
--- a/blog_main/src/main/java/cn/sticki/blog/controller/UserController.java
+++ b/blog_main/src/main/java/cn/sticki/blog/controller/UserController.java
@@ -45,10 +45,10 @@ public class UserController {
 	public RestTemplate getByUsername(String username) {
 		User user = authenticationFacade.getUser();
 		User getUser = null;
-		if (username == null && user != null) {
+		if ((username == null || username.length() == 0) && user != null) {
 			getUser = user;
 			log.debug("getByUsername, sessionUser ,user->{}", getUser.getClass());
-		} else if (username != null) {
+		} else if (username != null && username.length() != 0) {
 			getUser = userService.getByUsername(username);
 			log.debug("getByUsername, userService.getByUsername ,user->{}", getUser);
 		}
diff --git a/blog_main/src/main/java/cn/sticki/blog/controller/UserFollowController.java b/blog_main/src/main/java/cn/sticki/blog/controller/UserFollowController.java
new file mode 100644
index 00000000..31ffdf0f
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/controller/UserFollowController.java
@@ -0,0 +1,55 @@
+package cn.sticki.blog.controller;
+
+import cn.sticki.blog.pojo.domain.FansBasic;
+import cn.sticki.blog.pojo.domain.FollowBasic;
+import cn.sticki.blog.pojo.domain.User;
+import cn.sticki.blog.pojo.vo.ListVO;
+import cn.sticki.blog.pojo.vo.RestTemplate;
+import cn.sticki.blog.security.AuthenticationFacade;
+import cn.sticki.blog.service.UserFollowService;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@RestController
+@RequestMapping("/user")
+public class UserFollowController {
+
+	// 默认每页20条
+	private final int pageSize = 20;
+
+	@Resource
+	private AuthenticationFacade authenticationFacade;
+
+	@Resource
+	private UserFollowService userFollowService;
+
+	@GetMapping("/follow")
+	public RestTemplate getFollowList(@RequestParam(defaultValue = "1") int page) {
+		User user = authenticationFacade.getUser();
+		ListVO<FollowBasic> listVO = userFollowService.getFollowList(user.getId(), page, pageSize);
+		return new RestTemplate(listVO);
+	}
+
+	@GetMapping("/fans")
+	public RestTemplate getFansList(@RequestParam(defaultValue = "1") int page) {
+		User user = authenticationFacade.getUser();
+		ListVO<FansBasic> listVO = userFollowService.getFansList(user.getId(), page, pageSize);
+		return new RestTemplate(listVO);
+	}
+
+	@PostMapping("/follow")
+	public RestTemplate doFollow(@NotNull Integer followId) {
+		User user = authenticationFacade.getUser();
+		try {
+			boolean result = userFollowService.follow(user.getId(), followId);
+			return new RestTemplate(200, "success", result, true);
+		} catch (Exception e) {
+			return new RestTemplate(200, "fail", null, false);
+		}
+	}
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/controller/advice/ProjectExceptionAdvice.java b/blog_main/src/main/java/cn/sticki/blog/controller/advice/ProjectExceptionAdvice.java
index 54934a13..e991d7bb 100644
--- a/blog_main/src/main/java/cn/sticki/blog/controller/advice/ProjectExceptionAdvice.java
+++ b/blog_main/src/main/java/cn/sticki/blog/controller/advice/ProjectExceptionAdvice.java
@@ -5,15 +5,18 @@
 import cn.sticki.blog.exception.userException.UserIllegalException;
 import cn.sticki.blog.pojo.vo.RestTemplate;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.catalina.connector.ClientAbortException;
 import org.springframework.beans.TypeMismatchException;
 import org.springframework.http.converter.HttpMessageConversionException;
 import org.springframework.validation.BindException;
+import org.springframework.web.HttpMediaTypeException;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.MissingRequestValueException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.NoHandlerFoundException;
 
+import javax.servlet.ServletException;
 import java.net.ConnectException;
 import java.util.ArrayList;
 
@@ -32,13 +35,19 @@ public RestTemplate doException(Exception e) {
 		return new RestTemplate(500, "服务器故障，请稍后再试", null, false);
 	}
 
+	@ExceptionHandler(ServletException.class)
+	public RestTemplate doServletException(Exception e) {
+		log.warn("请求异常,{}", e.getMessage());
+		return new RestTemplate(400, "请求异常", null, false);
+	}
+
 	@ExceptionHandler(HttpMessageConversionException.class)
 	public RestTemplate doHttpMessageConversionException(HttpMessageConversionException e) {
-		e.printStackTrace();
+		log.warn("数据异常,{}", e.getMessage());
 		return new RestTemplate(400, "数据异常", null, false);
 	}
 
-	@ExceptionHandler(HttpRequestMethodNotSupportedException.class)
+	@ExceptionHandler({HttpRequestMethodNotSupportedException.class, HttpMediaTypeException.class})
 	public RestTemplate doHttpRequestMethodNotSupportedException(Exception e) {
 		log.warn("请求方式异常,{}", e.getMessage());
 		return new RestTemplate(400, "请求方式异常", null, false);
@@ -76,6 +85,12 @@ public RestTemplate doConnectException(ConnectException e) {
 		return new RestTemplate(501, "服务器连接故障，请联系管理员", null, false);
 	}
 
+	@ExceptionHandler(ClientAbortException.class)
+	public RestTemplate doClientAbortException(ClientAbortException e) {
+		log.warn("连接被关闭,{}", e.getMessage());
+		return new RestTemplate(501, "连接被关闭", null, false);
+	}
+
 	@ExceptionHandler(SqlLimitException.class)
 	public RestTemplate doSqlLimitException(SqlLimitException e) {
 		log.info("请求分页数量超过上限,{}", e.getMessage());
diff --git a/blog_main/src/main/java/cn/sticki/blog/enumeration/CacheSpace.java b/blog_main/src/main/java/cn/sticki/blog/enumeration/CacheSpace.java
index 163e4d3f..be999615 100644
--- a/blog_main/src/main/java/cn/sticki/blog/enumeration/CacheSpace.java
+++ b/blog_main/src/main/java/cn/sticki/blog/enumeration/CacheSpace.java
@@ -27,4 +27,9 @@ public class CacheSpace {
 	 */
 	public static final String UserService_MailVerify = "userService:mailVerify:";
 
+	/**
+	 * ip 计数
+	 */
+	public static final String IpService_Count = "ipService:Count:";
+
 }
diff --git a/blog_main/src/main/java/cn/sticki/blog/exception/userException/UserArgumentException.java b/blog_main/src/main/java/cn/sticki/blog/exception/userException/UserArgumentException.java
new file mode 100644
index 00000000..99a2d8cf
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/exception/userException/UserArgumentException.java
@@ -0,0 +1,9 @@
+package cn.sticki.blog.exception.userException;
+
+public class UserArgumentException extends UserIllegalException {
+
+	public UserArgumentException() {
+		super("用户参数异常");
+	}
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/mapper/BlogGeneralMapper.java b/blog_main/src/main/java/cn/sticki/blog/mapper/BlogGeneralMapper.java
index edcb84af..8fc2cef1 100644
--- a/blog_main/src/main/java/cn/sticki/blog/mapper/BlogGeneralMapper.java
+++ b/blog_main/src/main/java/cn/sticki/blog/mapper/BlogGeneralMapper.java
@@ -20,4 +20,10 @@ public interface BlogGeneralMapper extends BaseMapper<BlogGeneral> {
 	@Update("update blog_general set collection_num = collection_num - 1 where blog_id = #{blogId};")
 	int decreaseCollectionNum(Integer blogId);
 
+	@Update("update blog_general set comment_num = comment_num + 1 where blog_id = #{blogId};")
+	int increaseCommentNum(Integer blogId);
+
+	@Update("update blog_general set comment_num = comment_num - 1 where blog_id = #{blogId};")
+	int decreaseCommentNum(Integer blogId);
+
 }
diff --git a/blog_main/src/main/java/cn/sticki/blog/mapper/BlogImgMapper.java b/blog_main/src/main/java/cn/sticki/blog/mapper/BlogImgMapper.java
new file mode 100644
index 00000000..761f39f1
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/mapper/BlogImgMapper.java
@@ -0,0 +1,10 @@
+package cn.sticki.blog.mapper;
+
+import cn.sticki.blog.pojo.domain.BlogImg;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface BlogImgMapper extends BaseMapper<BlogImg> {
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/mapper/CommentBasicMapper.java b/blog_main/src/main/java/cn/sticki/blog/mapper/CommentBasicMapper.java
new file mode 100644
index 00000000..65cea46b
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/mapper/CommentBasicMapper.java
@@ -0,0 +1,10 @@
+package cn.sticki.blog.mapper;
+
+import cn.sticki.blog.pojo.domain.CommentBasic;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface CommentBasicMapper extends BaseMapper<CommentBasic> {
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/mapper/CommentMapper.java b/blog_main/src/main/java/cn/sticki/blog/mapper/CommentMapper.java
new file mode 100644
index 00000000..dc22d2bb
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/mapper/CommentMapper.java
@@ -0,0 +1,10 @@
+package cn.sticki.blog.mapper;
+
+import cn.sticki.blog.pojo.domain.Comment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface CommentMapper extends BaseMapper<Comment> {
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/mapper/FansBasicMapper.java b/blog_main/src/main/java/cn/sticki/blog/mapper/FansBasicMapper.java
new file mode 100644
index 00000000..7a630e62
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/mapper/FansBasicMapper.java
@@ -0,0 +1,10 @@
+package cn.sticki.blog.mapper;
+
+import cn.sticki.blog.pojo.domain.FansBasic;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface FansBasicMapper extends BaseMapper<FansBasic> {
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/mapper/FollowBasicMapper.java b/blog_main/src/main/java/cn/sticki/blog/mapper/FollowBasicMapper.java
new file mode 100644
index 00000000..0add2ba6
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/mapper/FollowBasicMapper.java
@@ -0,0 +1,10 @@
+package cn.sticki.blog.mapper;
+
+import cn.sticki.blog.pojo.domain.FollowBasic;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface FollowBasicMapper extends BaseMapper<FollowBasic> {
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/mapper/UserFollowMapper.java b/blog_main/src/main/java/cn/sticki/blog/mapper/UserFollowMapper.java
new file mode 100644
index 00000000..9bb84197
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/mapper/UserFollowMapper.java
@@ -0,0 +1,10 @@
+package cn.sticki.blog.mapper;
+
+import cn.sticki.blog.pojo.domain.UserFollow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface UserFollowMapper extends BaseMapper<UserFollow> {
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/pojo/domain/BlogImg.java b/blog_main/src/main/java/cn/sticki/blog/pojo/domain/BlogImg.java
new file mode 100644
index 00000000..2eb65cd2
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/pojo/domain/BlogImg.java
@@ -0,0 +1,20 @@
+package cn.sticki.blog.pojo.domain;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+@Data
+public class BlogImg {
+
+	Integer id;
+
+	String img;
+
+	Integer visit;
+
+	Timestamp modified_time;
+
+	Timestamp create_time;
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/pojo/domain/Comment.java b/blog_main/src/main/java/cn/sticki/blog/pojo/domain/Comment.java
new file mode 100644
index 00000000..28568436
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/pojo/domain/Comment.java
@@ -0,0 +1,24 @@
+package cn.sticki.blog.pojo.domain;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+@Data
+public class Comment {
+
+	Integer id; // 评论id
+
+	Integer userId; // 用户id
+
+	Integer blogId; // 博客id
+
+	String content; // 评论内容
+
+	Integer parentId; // 父评论id
+
+	Integer parentUserId; // 回复的用户id
+
+	Timestamp createTime; // 创建时间
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/pojo/domain/CommentBasic.java b/blog_main/src/main/java/cn/sticki/blog/pojo/domain/CommentBasic.java
new file mode 100644
index 00000000..b4e8b7d6
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/pojo/domain/CommentBasic.java
@@ -0,0 +1,30 @@
+package cn.sticki.blog.pojo.domain;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+@Data
+public class CommentBasic {
+
+	Integer id; // 评论id
+
+	Integer blogId; // 博客id
+
+	Integer userId; // 发表评论的用户id
+
+	String nickname; // 用户昵称
+
+	String avatarUrl; // 头像链接
+
+	String content; // 评论内容
+
+	Timestamp createTime; // 发表时间
+
+	Integer parentId; // 父评论id
+
+	Integer parentUserId; // 回复的用户id
+
+	String parentNickname; // 回复的用户昵称
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/pojo/domain/FansBasic.java b/blog_main/src/main/java/cn/sticki/blog/pojo/domain/FansBasic.java
new file mode 100644
index 00000000..5ecc35c7
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/pojo/domain/FansBasic.java
@@ -0,0 +1,30 @@
+package cn.sticki.blog.pojo.domain;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+@Data
+public class FansBasic {
+
+	Integer id;
+
+	Integer userId;
+
+	Integer fansId;
+
+	String note;
+
+	Integer status;
+
+	Timestamp createTime;
+
+	String username;
+
+	String nickname;
+
+	String avatarUrl;
+
+	Timestamp registerTime;
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/pojo/domain/FollowBasic.java b/blog_main/src/main/java/cn/sticki/blog/pojo/domain/FollowBasic.java
new file mode 100644
index 00000000..6ab215f1
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/pojo/domain/FollowBasic.java
@@ -0,0 +1,30 @@
+package cn.sticki.blog.pojo.domain;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+@Data
+public class FollowBasic {
+
+	Integer id;
+
+	Integer userId;
+
+	Integer followId;
+
+	String note;
+
+	Integer status;
+
+	Timestamp createTime;
+
+	String username;
+
+	String nickname;
+
+	String avatarUrl;
+
+	Timestamp registerTime;
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/pojo/domain/UserFollow.java b/blog_main/src/main/java/cn/sticki/blog/pojo/domain/UserFollow.java
new file mode 100644
index 00000000..a78daa53
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/pojo/domain/UserFollow.java
@@ -0,0 +1,22 @@
+package cn.sticki.blog.pojo.domain;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+@Data
+public class UserFollow {
+
+	Integer id;
+
+	Integer fansId;
+
+	Integer followId;
+
+	String note;
+
+	Integer status;
+
+	Timestamp createTime;
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/pojo/dto/CommentDTO.java b/blog_main/src/main/java/cn/sticki/blog/pojo/dto/CommentDTO.java
new file mode 100644
index 00000000..a040c0b4
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/pojo/dto/CommentDTO.java
@@ -0,0 +1,17 @@
+package cn.sticki.blog.pojo.dto;
+
+import cn.sticki.blog.pojo.domain.CommentBasic;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CommentDTO {
+
+	CommentBasic info;
+
+	List<CommentBasic> sub;
+
+	long subCount;
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/pojo/vo/BlogContentVO.java b/blog_main/src/main/java/cn/sticki/blog/pojo/vo/BlogContentVO.java
index 113108fa..4fc30981 100644
--- a/blog_main/src/main/java/cn/sticki/blog/pojo/vo/BlogContentVO.java
+++ b/blog_main/src/main/java/cn/sticki/blog/pojo/vo/BlogContentVO.java
@@ -14,4 +14,6 @@ public class BlogContentVO {
 
 	User author;
 
+	CommentListVO comment;
+
 }
diff --git a/blog_main/src/main/java/cn/sticki/blog/pojo/vo/CommentListVO.java b/blog_main/src/main/java/cn/sticki/blog/pojo/vo/CommentListVO.java
new file mode 100644
index 00000000..1c950642
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/pojo/vo/CommentListVO.java
@@ -0,0 +1,13 @@
+package cn.sticki.blog.pojo.vo;
+
+import cn.sticki.blog.pojo.dto.CommentDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class CommentListVO extends ListVO<CommentDTO> {
+
+	long allCount = 0; // 总评论数量（包括二级评论）
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/pojo/vo/ListVO.java b/blog_main/src/main/java/cn/sticki/blog/pojo/vo/ListVO.java
index 6ce2b329..3c0e9c8c 100644
--- a/blog_main/src/main/java/cn/sticki/blog/pojo/vo/ListVO.java
+++ b/blog_main/src/main/java/cn/sticki/blog/pojo/vo/ListVO.java
@@ -18,7 +18,7 @@ public class ListVO<T> implements IListVO<T> {
 	long total = 0;
 
 	/**
-	 * 每页显示条数，默认 10
+	 * 每页显示条数，默认 20
 	 */
 	long size = 20;
 
diff --git a/blog_main/src/main/java/cn/sticki/blog/security/filter/AuthenticationTokenFilter.java b/blog_main/src/main/java/cn/sticki/blog/security/filter/AuthenticationTokenFilter.java
index b3627c6f..48cc0211 100644
--- a/blog_main/src/main/java/cn/sticki/blog/security/filter/AuthenticationTokenFilter.java
+++ b/blog_main/src/main/java/cn/sticki/blog/security/filter/AuthenticationTokenFilter.java
@@ -60,7 +60,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 				if (user == null) {
 					user = userMapper.selectById(id);
 				}
-				log.debug("Token validate successful,user->{}", user);
+				log.debug("Token get success,user->{}", user);
 				// TODO 获取权限信息封装到Authentication中
 				// 存入SecurityContextHolder，这里构造一个已认证的 authenticationToken ，之后就不用再认证了。
 				if (user != null) {
diff --git a/blog_main/src/main/java/cn/sticki/blog/security/filter/IPLimitFilter.java b/blog_main/src/main/java/cn/sticki/blog/security/filter/IPLimitFilter.java
new file mode 100644
index 00000000..1ba7a057
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/security/filter/IPLimitFilter.java
@@ -0,0 +1,59 @@
+package cn.sticki.blog.security.filter;
+
+import cn.sticki.blog.enumeration.CacheSpace;
+import cn.sticki.blog.pojo.vo.RestTemplate;
+import cn.sticki.blog.util.RequestUtils;
+import cn.sticki.blog.util.ResponseUtils;
+import com.alicp.jetcache.Cache;
+import com.alicp.jetcache.anno.CreateCache;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.annotation.Resource;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@Slf4j
+@Component
+public class IPLimitFilter extends OncePerRequestFilter {
+
+	private final int time = 5;
+
+	private final int count = 30;
+
+	@Resource
+	private ResponseUtils responseUtils;
+
+	@CreateCache(name = CacheSpace.IpService_Count, expire = time)
+	private Cache<String, Integer> cache;
+
+	/**
+	 * ip访问限制过滤器
+	 */
+	@Override
+	protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
+		// todo 有待优化，目前逻辑为，连续访问30次，需要冷却5s
+		// 获取当前ip
+		String ip = RequestUtils.getIPAddress(request);
+		// ip计数
+		Integer ipCount = cache.get(ip);
+		if (ipCount == null) ipCount = 0;
+		if (ipCount > count) {
+			// ip访问超过限制
+			responseUtils.objectToJson(response, new RestTemplate(408, "访问频繁，请稍后再试"));
+			response.sendError(403, "Reject request");
+		} else {
+			ipCount++;
+			cache.put(ip, ipCount);
+			//放行
+			filterChain.doFilter(request, response);
+		}
+		// 打印访问情况
+		log.info("{} {} {}  {}", request.getRemoteAddr(), request.getMethod(), response.getStatus(), request.getServletPath());
+	}
+
+}
\ No newline at end of file
diff --git a/blog_main/src/main/java/cn/sticki/blog/service/BlogConsoleService.java b/blog_main/src/main/java/cn/sticki/blog/service/BlogConsoleService.java
index 9e40b987..f036e424 100644
--- a/blog_main/src/main/java/cn/sticki/blog/service/BlogConsoleService.java
+++ b/blog_main/src/main/java/cn/sticki/blog/service/BlogConsoleService.java
@@ -32,4 +32,9 @@ public interface BlogConsoleService extends IService<Blog> {
 	 */
 	void uploadCoverImage(String name, MultipartFile coverImage);
 
+	/**
+	 * 上传博客图片，自动命名为文件的md5值，返回图片路径
+	 */
+	String uploadImage(MultipartFile coverImage);
+
 }
diff --git a/blog_main/src/main/java/cn/sticki/blog/service/CommentService.java b/blog_main/src/main/java/cn/sticki/blog/service/CommentService.java
new file mode 100644
index 00000000..3759f9b5
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/service/CommentService.java
@@ -0,0 +1,43 @@
+package cn.sticki.blog.service;
+
+import cn.sticki.blog.pojo.domain.Comment;
+import cn.sticki.blog.pojo.vo.CommentListVO;
+
+public interface CommentService {
+
+	/**
+	 * 创建评论
+	 */
+	void create(Comment comment);
+
+	/**
+	 * 删除评论
+	 *
+	 * @param id 评论id
+	 */
+	void delete(int id);
+
+	/**
+	 * 检查评论发表人
+	 *
+	 * @param userId    用户id
+	 * @param commentId 评论id
+	 * @return 若该评论是该用户发表的，返回true
+	 */
+	boolean checkPublisher(int userId, int commentId);
+
+	/**
+	 * 检查发表人并删除评论
+	 */
+	void checkAndDelete(int userId, int commentId);
+
+	/**
+	 * 获取评论信息列表
+	 *
+	 * @param blogId   博客id
+	 * @param page     当前页
+	 * @param pageSize 页大小
+	 */
+	CommentListVO getList(int blogId, int page, int pageSize);
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/service/UserFollowService.java b/blog_main/src/main/java/cn/sticki/blog/service/UserFollowService.java
new file mode 100644
index 00000000..a381de6d
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/service/UserFollowService.java
@@ -0,0 +1,32 @@
+package cn.sticki.blog.service;
+
+import cn.sticki.blog.pojo.domain.FansBasic;
+import cn.sticki.blog.pojo.domain.FollowBasic;
+import cn.sticki.blog.pojo.vo.ListVO;
+
+public interface UserFollowService {
+
+	/**
+	 * 关注用户，已关注的状态下则取消关注
+	 *
+	 * @param userId   用户id（操作者）
+	 * @param followId 关注者的id
+	 * @return 返回调用后是否为关注状态，若为关注则返回true、未关注则返回false
+	 */
+	boolean follow(int userId, int followId);
+
+	/**
+	 * 获取关注列表
+	 *
+	 * @return 关注列表
+	 */
+	ListVO<FollowBasic> getFollowList(int userId, int page, int pageSize);
+
+	/**
+	 * 获取粉丝列表
+	 *
+	 * @return 粉丝列表
+	 */
+	ListVO<FansBasic> getFansList(int userId, int page, int pageSize);
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/service/impl/BlogBasicServiceImpl.java b/blog_main/src/main/java/cn/sticki/blog/service/impl/BlogBasicServiceImpl.java
index 101eb47e..d5725851 100644
--- a/blog_main/src/main/java/cn/sticki/blog/service/impl/BlogBasicServiceImpl.java
+++ b/blog_main/src/main/java/cn/sticki/blog/service/impl/BlogBasicServiceImpl.java
@@ -9,6 +9,7 @@
 import cn.sticki.blog.pojo.vo.BlogContentVO;
 import cn.sticki.blog.pojo.vo.BlogListVO;
 import cn.sticki.blog.service.BlogBasicService;
+import cn.sticki.blog.service.CommentService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -31,6 +32,9 @@ public class BlogBasicServiceImpl extends ServiceImpl<BlogBasicMapper, BlogBasic
 	@Resource
 	private UserMapper userMapper;
 
+	@Resource
+	private CommentService commentService;
+
 	@Override
 	public BlogListVO getRecommendBlogList(int page, int pageSize) {
 		return searchBlog(null, page, pageSize);
@@ -55,6 +59,7 @@ public BlogContentVO getBlogContent(int id) {
 		blog.setInfo(blogBasicMapper.selectById(id));
 		blog.setContent(blogContentMapper.selectById(id));
 		blog.setAuthor(userMapper.selectByUsername(blog.getInfo().getAuthor()));
+		blog.setComment(commentService.getList(id, 1, 3));
 		return blog;
 	}
 
diff --git a/blog_main/src/main/java/cn/sticki/blog/service/impl/BlogConsoleServiceImpl.java b/blog_main/src/main/java/cn/sticki/blog/service/impl/BlogConsoleServiceImpl.java
index 5cd71590..d4c9a8f4 100644
--- a/blog_main/src/main/java/cn/sticki/blog/service/impl/BlogConsoleServiceImpl.java
+++ b/blog_main/src/main/java/cn/sticki/blog/service/impl/BlogConsoleServiceImpl.java
@@ -7,14 +7,13 @@
 import cn.sticki.blog.exception.userException.UserIllegalException;
 import cn.sticki.blog.mapper.BlogContentMapper;
 import cn.sticki.blog.mapper.BlogGeneralMapper;
+import cn.sticki.blog.mapper.BlogImgMapper;
 import cn.sticki.blog.mapper.BlogMapper;
-import cn.sticki.blog.pojo.domain.Blog;
-import cn.sticki.blog.pojo.domain.BlogContent;
-import cn.sticki.blog.pojo.domain.BlogCount;
-import cn.sticki.blog.pojo.domain.BlogGeneral;
+import cn.sticki.blog.pojo.domain.*;
 import cn.sticki.blog.pojo.dto.BlogCountDTO;
 import cn.sticki.blog.pojo.dto.BlogSaveDTO;
 import cn.sticki.blog.service.BlogConsoleService;
+import cn.sticki.blog.util.EncryptUtils;
 import cn.sticki.blog.util.FileUtils;
 import cn.sticki.blog.util.OssUtils;
 import cn.sticki.blog.util.RandomUtils;
@@ -53,6 +52,9 @@ public class BlogConsoleServiceImpl extends ServiceImpl<BlogMapper, Blog> implem
 	@Resource
 	private FileUtils fileUtils;
 
+	@Resource
+	private BlogImgMapper blogImgMapper;
+
 	@Override
 	public void saveBlog(BlogSaveDTO blogDTO) throws UserException, DAOException {
 		log.debug("saveBlog, id->{}", blogDTO.getId());
@@ -187,4 +189,27 @@ public void uploadCoverImage(String name, MultipartFile coverImage) {
 		}
 	}
 
+	@SneakyThrows
+	@Override
+	public String uploadImage(MultipartFile coverImage) {
+		try (InputStream stream = coverImage.getInputStream()) {
+			String md5 = EncryptUtils.toMD5(stream);
+			// 存数据库，上传图片
+			// 先判断数据库是否存在这条记录，存在的话直接返回链接就行了
+			LambdaQueryWrapper<BlogImg> wrapper = new LambdaQueryWrapper<>();
+			wrapper.eq(BlogImg::getImg, md5);
+			if (!blogImgMapper.exists(wrapper)) {
+				// 不存在，则新增
+				BlogImg blogImg = new BlogImg();
+				blogImg.setImg(md5);
+				blogImg.setCreate_time(new Timestamp(System.currentTimeMillis()));
+				blogImgMapper.insert(blogImg);
+				// 上传图片
+				ossUtils.upload(coverImage, ResourcePath.blogImage + md5);
+			}
+			// 返回访问链接
+			return ResourcePath.blogImageUrlBase + md5;
+		}
+	}
+
 }
diff --git a/blog_main/src/main/java/cn/sticki/blog/service/impl/CommentServiceImpl.java b/blog_main/src/main/java/cn/sticki/blog/service/impl/CommentServiceImpl.java
new file mode 100644
index 00000000..f6d19b0b
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/service/impl/CommentServiceImpl.java
@@ -0,0 +1,153 @@
+package cn.sticki.blog.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.sticki.blog.exception.userException.UserIllegalException;
+import cn.sticki.blog.mapper.BlogGeneralMapper;
+import cn.sticki.blog.mapper.BlogMapper;
+import cn.sticki.blog.mapper.CommentBasicMapper;
+import cn.sticki.blog.mapper.CommentMapper;
+import cn.sticki.blog.pojo.domain.Blog;
+import cn.sticki.blog.pojo.domain.Comment;
+import cn.sticki.blog.pojo.domain.CommentBasic;
+import cn.sticki.blog.pojo.dto.CommentDTO;
+import cn.sticki.blog.pojo.vo.CommentListVO;
+import cn.sticki.blog.service.CommentService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+@Slf4j
+@Service
+public class CommentServiceImpl implements CommentService {
+
+	@Resource
+	private CommentMapper commentMapper;
+
+	@Resource
+	private BlogMapper blogMapper;
+
+	@Resource
+	private BlogGeneralMapper blogGeneralMapper;
+
+	@Resource
+	private CommentBasicMapper commentBasicMapper;
+
+	@Override
+	public void create(Comment comment) {
+		// 检查博客是否存在，检查父评论id是否在该博客下
+		boolean exists = false;
+		if (comment.getParentId() != null) {
+			// 判断博客id和父评论id是否正确
+			LambdaQueryWrapper<Comment> wrapper = new LambdaQueryWrapper<>();
+			wrapper.eq(Comment::getBlogId, comment.getBlogId()).eq(Comment::getId, comment.getParentId());
+			Comment parentComment = commentMapper.selectOne(wrapper);
+			if (parentComment != null) {
+				exists = true;
+				// 如果父评论还有上一级评论，则设置父评论的上一级评论为当前评论的父评论，如此，所有子评论的父评论id都一定是一级评论
+				comment.setParentId(parentComment.getParentId() != null ? parentComment.getParentId() : parentComment.getId());
+				// 为了防止有歧义难以理解，故改写成了上面这句
+				// if (parentComment.getParentId() != null) comment.setParentId(parentComment.getParentId());
+				comment.setParentUserId(parentComment.getUserId());
+			}
+		} else {
+			// 判断博客id是否存在
+			LambdaQueryWrapper<Blog> wrapper = new LambdaQueryWrapper<>();
+			wrapper.eq(Blog::getId, comment.getBlogId());
+			exists = blogMapper.exists(wrapper);
+		}
+		if (!exists) throw new UserIllegalException("数据异常");
+		comment.setId(null);
+		comment.setCreateTime(new Timestamp(System.currentTimeMillis()));
+		commentMapper.insert(comment);
+		blogGeneralMapper.increaseCommentNum(comment.getId());
+	}
+
+	@Override
+	public void delete(int id) {
+		int count = commentMapper.deleteById(id);
+		if (count == 0)
+			log.warn("comment 删除异常，id->{}", id);
+		else {
+			// 减少数量
+			blogGeneralMapper.decreaseCommentNum(id);
+		}
+	}
+
+	@Override
+	public boolean checkPublisher(int userId, int commentId) {
+		LambdaQueryWrapper<Comment> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(Comment::getUserId, userId).eq(Comment::getId, commentId);
+		return commentMapper.exists(wrapper);
+	}
+
+	@Override
+	public void checkAndDelete(int userId, int commentId) {
+		if (!checkPublisher(userId, commentId)) {
+			log.warn("非法删除评论，id->{},commentId->{}", userId, commentId);
+			throw new UserIllegalException();
+		} else {
+			delete(commentId);
+		}
+	}
+
+	@Override
+	public CommentListVO getList(int blogId, int page, int pageSize) {
+		CommentListVO vo = new CommentListVO();
+		// 先查总数量
+		LambdaQueryWrapper<CommentBasic> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(CommentBasic::getBlogId, blogId); // 只要博客id一致即可
+		Long count = commentBasicMapper.selectCount(wrapper);
+		vo.setAllCount(count);
+		if (count == 0) return vo; // 若总数为0，直接返回
+
+		// 以时间排序，只查该博客下没有父评论id的，存入父评论组数中
+		wrapper.orderByDesc(CommentBasic::getCreateTime).isNull(CommentBasic::getParentId);
+		IPage<CommentBasic> iPage = new Page<>(page, pageSize);
+		commentBasicMapper.selectPage(iPage, wrapper);
+		BeanUtil.copyProperties(iPage, vo, "records");
+		// 复制父评论
+		ArrayList<CommentDTO> dtoList = new ArrayList<>();
+		for (CommentBasic record : iPage.getRecords()) {
+			CommentDTO dto = new CommentDTO();
+			dto.setInfo(record);
+			dtoList.add(dto);
+		}
+		vo.setRecords(dtoList);
+
+		// 查询子评论
+		// 先获取父评论的id列表
+		ArrayList<Integer> idList = new ArrayList<>();
+		for (CommentBasic commentBasic : iPage.getRecords()) {
+			idList.add(commentBasic.getId());
+		}
+		// 以父评论id查询所有子评论，按时间排序
+		wrapper.clear();
+		wrapper.eq(CommentBasic::getBlogId, blogId)
+				.in(CommentBasic::getParentId, idList)
+				.orderByDesc(CommentBasic::getCreateTime);
+		// 查询所有子评论
+		List<CommentBasic> subList = commentBasicMapper.selectList(wrapper);
+		// 将子评论填充到父评论下
+		for (CommentDTO commentDTO : dtoList) {
+			Integer parentId = commentDTO.getInfo().getId();
+			ArrayList<CommentBasic> tempSub = new ArrayList<>();
+			for (CommentBasic sub : subList) {
+				if (Objects.equals(parentId, sub.getParentId()))
+					tempSub.add(sub);
+			}
+			commentDTO.setSub(tempSub);
+			commentDTO.setSubCount(tempSub.size());
+		}
+
+		return vo;
+	}
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/service/impl/UserCollectBlogServiceImpl.java b/blog_main/src/main/java/cn/sticki/blog/service/impl/UserCollectBlogServiceImpl.java
index 92795f15..8f6a11bc 100644
--- a/blog_main/src/main/java/cn/sticki/blog/service/impl/UserCollectBlogServiceImpl.java
+++ b/blog_main/src/main/java/cn/sticki/blog/service/impl/UserCollectBlogServiceImpl.java
@@ -70,7 +70,12 @@ public BlogListVO getCollectBlogList(@NotNull Integer userId, int page, int page
 		wrapper.eq(UserCollectBlog::getUserId, userId);
 		IPage<UserCollectBlog> iPage = new Page<>(page, pageSize);
 		userCollectBlogMapper.selectPage(iPage, wrapper);
+		BlogListVO blogListVO = BeanUtil.copyProperties(iPage, BlogListVO.class);
 		List<UserCollectBlog> userCollectBlogList = iPage.getRecords();
+		// 若为空，则直接返回
+		if (userCollectBlogList.isEmpty()) {
+			return blogListVO;
+		}
 		ArrayList<Integer> blogIdList = new ArrayList<>();
 		for (UserCollectBlog blog : userCollectBlogList) {
 			blogIdList.add(blog.getBlogId());
@@ -79,7 +84,7 @@ public BlogListVO getCollectBlogList(@NotNull Integer userId, int page, int page
 		LambdaQueryWrapper<BlogBasic> blogWrapper = new LambdaQueryWrapper<>();
 		blogWrapper.in(BlogBasic::getId, blogIdList);
 		List<BlogBasic> blogBasicList = blogBasicMapper.selectList(blogWrapper);
-		BlogListVO blogListVO = BeanUtil.copyProperties(iPage, BlogListVO.class, "records");
+
 		blogListVO.setRecords(blogBasicList);
 		return blogListVO;
 	}
diff --git a/blog_main/src/main/java/cn/sticki/blog/service/impl/UserFollowServiceImpl.java b/blog_main/src/main/java/cn/sticki/blog/service/impl/UserFollowServiceImpl.java
new file mode 100644
index 00000000..77bbc383
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/service/impl/UserFollowServiceImpl.java
@@ -0,0 +1,84 @@
+package cn.sticki.blog.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.sticki.blog.exception.userException.UserIllegalException;
+import cn.sticki.blog.mapper.FansBasicMapper;
+import cn.sticki.blog.mapper.FollowBasicMapper;
+import cn.sticki.blog.mapper.UserFollowMapper;
+import cn.sticki.blog.pojo.domain.FansBasic;
+import cn.sticki.blog.pojo.domain.FollowBasic;
+import cn.sticki.blog.pojo.domain.UserFollow;
+import cn.sticki.blog.pojo.vo.ListVO;
+import cn.sticki.blog.service.UserFollowService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.sql.Timestamp;
+
+@Slf4j
+@Service
+public class UserFollowServiceImpl implements UserFollowService {
+
+	@Resource
+	private UserFollowMapper userFollowMapper;
+
+	@Resource
+	private FollowBasicMapper followBasicMapper;
+
+	@Resource
+	private FansBasicMapper fansBasicMapper;
+
+	@Override
+	public boolean follow(int userId, int followId) {
+		if (userId == followId) {
+			log.warn("User follow oneself,userId->{}", userId);
+			throw new UserIllegalException("Error for follow oneself");
+		}
+		// 关注用户，查询是否存在关注记录，若不存在，则添加记录，若存在，则取消记录
+		LambdaQueryWrapper<UserFollow> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(UserFollow::getFansId, userId).eq(UserFollow::getFollowId, followId);
+		if (userFollowMapper.exists(wrapper)) {
+			// 若存在，则删除记录，返回false
+			userFollowMapper.delete(wrapper);
+			return false;
+		} else {
+			UserFollow userFollow = new UserFollow();
+			userFollow.setFansId(userId);
+			userFollow.setFollowId(followId);
+			userFollow.setCreateTime(new Timestamp(System.currentTimeMillis()));
+			// 不存在，添加记录，返回true
+			userFollowMapper.insert(userFollow);
+			return true;
+		}
+	}
+
+	@Override
+	public ListVO<FollowBasic> getFollowList(int userId, int page, int pageSize) {
+		// 获取关注列表
+		LambdaQueryWrapper<FollowBasic> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(FollowBasic::getUserId, userId);
+		IPage<FollowBasic> iPage = new Page<>(page, pageSize);
+		followBasicMapper.selectPage(iPage, wrapper);
+		// 赋值返回
+		ListVO<FollowBasic> listVO = new ListVO<>();
+		BeanUtil.copyProperties(iPage, listVO);
+		return listVO;
+	}
+
+	@Override
+	public ListVO<FansBasic> getFansList(int userId, int page, int pageSize) {
+		// 获取粉丝列表
+		LambdaQueryWrapper<FansBasic> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(FansBasic::getUserId, userId);
+		IPage<FansBasic> iPage = new Page<>(page, pageSize);
+		fansBasicMapper.selectPage(iPage, wrapper);
+		ListVO<FansBasic> listVO = new ListVO<>();
+		BeanUtil.copyProperties(iPage, listVO);
+		return listVO;
+	}
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/service/impl/UserServiceImpl.java b/blog_main/src/main/java/cn/sticki/blog/service/impl/UserServiceImpl.java
index ddce25fc..eef51386 100644
--- a/blog_main/src/main/java/cn/sticki/blog/service/impl/UserServiceImpl.java
+++ b/blog_main/src/main/java/cn/sticki/blog/service/impl/UserServiceImpl.java
@@ -19,6 +19,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
@@ -27,6 +28,7 @@
 
 @Slf4j
 @Service
+@Transactional
 public class UserServiceImpl implements UserService {
 
 	@Resource
diff --git a/blog_main/src/main/java/cn/sticki/blog/util/EncryptUtils.java b/blog_main/src/main/java/cn/sticki/blog/util/EncryptUtils.java
new file mode 100644
index 00000000..57e1f4a3
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/util/EncryptUtils.java
@@ -0,0 +1,34 @@
+package cn.sticki.blog.util;
+
+import cn.sticki.blog.exception.userException.FileException;
+import org.springframework.util.DigestUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+public class EncryptUtils {
+
+	/**
+	 * MD5加密
+	 *
+	 * @param str 待加密字符串
+	 * @return 16进制加密字符串
+	 */
+	public static String toMD5(String str) {
+		return DigestUtils.md5DigestAsHex(str.getBytes(StandardCharsets.UTF_8));
+	}
+
+	public static String toMD5(byte[] bytes) {
+		return DigestUtils.md5DigestAsHex(bytes);
+	}
+
+	public static String toMD5(InputStream inputStream) {
+		try {
+			return DigestUtils.md5DigestAsHex(inputStream);
+		} catch (IOException e) {
+			throw new FileException("空文件");
+		}
+	}
+
+}
diff --git a/blog_main/src/main/java/cn/sticki/blog/util/OssUtils.java b/blog_main/src/main/java/cn/sticki/blog/util/OssUtils.java
index dbe83d2c..169874bb 100644
--- a/blog_main/src/main/java/cn/sticki/blog/util/OssUtils.java
+++ b/blog_main/src/main/java/cn/sticki/blog/util/OssUtils.java
@@ -70,13 +70,13 @@ public Boolean removeBucket(String bucketName) throws MinioException {
 	/**
 	 * 上传文件，请手动关闭inputStream
 	 */
-	public void upload(String objectName, InputStream inputStream, long objectSize, long partSize, String contentType)
+	public void upload(String filePath, InputStream inputStream, long objectSize, long partSize, String contentType)
 			throws MinioException {
 		try {
 			minioClient.putObject(PutObjectArgs
 					.builder()
 					.bucket(MinioConfig.bucketName)
-					.object(objectName)
+					.object(filePath)
 					// 文件大小和分片大小，填-1默认为5Mib
 					.stream(inputStream, objectSize, partSize)
 					.contentType(contentType)
@@ -108,14 +108,28 @@ public void upload(MultipartFile multipartFile) throws MinioException, IOExcepti
 		}
 	}
 
+	public void upload(MultipartFile multipartFile, String filePath) throws MinioException, IOException {
+		try (
+				InputStream inputStream = multipartFile.getInputStream()
+		) {
+			this.upload(
+					filePath,
+					inputStream,
+					multipartFile.getSize(),
+					-1,
+					multipartFile.getContentType()
+			);
+		}
+	}
+
 	/**
 	 * 下载文件
 	 *
-	 * @param fileName     文件名
+	 * @param filePath     文件名(包括路径)
 	 * @param outputStream 输出流
 	 */
-	public void download(String fileName, ServletOutputStream outputStream) throws MinioException, IOException {
-		InputStream inputStream = this.download(fileName);
+	public void download(String filePath, ServletOutputStream outputStream) throws MinioException, IOException {
+		InputStream inputStream = this.download(filePath);
 		IOUtils.copy(inputStream, outputStream);
 		inputStream.close();
 	}
@@ -123,14 +137,14 @@ public void download(String fileName, ServletOutputStream outputStream) throws M
 	/**
 	 * 下载文件，需要手动关闭流，否则会一直占用资源
 	 *
-	 * @param fileName 文件名
+	 * @param filePath 文件名(包括路径)
 	 */
-	public InputStream download(String fileName) throws MinioException {
+	public InputStream download(String filePath) throws MinioException {
 		try {
 			return minioClient.getObject(GetObjectArgs
 					.builder()
 					.bucket(MinioConfig.bucketName)
-					.object(fileName)
+					.object(filePath)
 					.build());
 		} catch (Exception e) {
 			// e.printStackTrace();
diff --git a/blog_main/src/main/java/cn/sticki/blog/util/RequestUtils.java b/blog_main/src/main/java/cn/sticki/blog/util/RequestUtils.java
new file mode 100644
index 00000000..2f71ed9f
--- /dev/null
+++ b/blog_main/src/main/java/cn/sticki/blog/util/RequestUtils.java
@@ -0,0 +1,45 @@
+package cn.sticki.blog.util;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class RequestUtils {
+
+	public static String getIPAddress(HttpServletRequest request) {
+		String ip = null;
+
+		//X-Forwarded-For：Squid 服务代理
+		String ipAddresses = request.getHeader("X-Forwarded-For");
+
+		if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
+			//Proxy-Client-IP：apache 服务代理
+			ipAddresses = request.getHeader("Proxy-Client-IP");
+		}
+
+		if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
+			//WL-Proxy-Client-IP：weblogic 服务代理
+			ipAddresses = request.getHeader("WL-Proxy-Client-IP");
+		}
+
+		if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
+			//HTTP_CLIENT_IP：有些代理服务器
+			ipAddresses = request.getHeader("HTTP_CLIENT_IP");
+		}
+
+		if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
+			//X-Real-IP：nginx服务代理
+			ipAddresses = request.getHeader("X-Real-IP");
+		}
+
+		//有些网络通过多层代理，那么获取到的ip就会有多个，一般都是通过逗号（,）分割开来，并且第一个ip为客户端的真实IP
+		if (ipAddresses != null && ipAddresses.length() != 0) {
+			ip = ipAddresses.split(",")[0];
+		}
+
+		//还是不能获取到，最后再通过request.getRemoteAddr();获取
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
+			ip = request.getRemoteAddr();
+		}
+		return ip;
+	}
+
+}
diff --git a/blog_main/src/main/resources/application.yml b/blog_main/src/main/resources/application.yml
index 2e1b1ac7..c181c069 100644
--- a/blog_main/src/main/resources/application.yml
+++ b/blog_main/src/main/resources/application.yml
@@ -103,9 +103,11 @@ minio:
   bucket-name: xxx
 
 resource-path:
-  avatar: avatar/
   default-avatar: default_avatar.jpg
+  avatar: avatar/
   blog-cover-image: blogCover/
+  blog-image: blog/
+  blog-image-url-base: https://local.sticki.cn/api/v1/resource/blog-img/
 
 security:
   # JWT配置
@@ -119,7 +121,7 @@ security:
     # 过期时间 单位秒 1天后过期=86400 7天后过期=604800
     expiration: 604800
     # 配置不需要认证的接口，中间不能加空格
-    ant-matchers: /login/**,/blog/**,/resource/**,/user,/register/**
+    ant-matchers: /login/**,/blog/**,/resource/**,/user,/register/**,/comment/list
 
 jetcache:
   statIntervalMinutes: 15
diff --git a/vueblog/package-lock.json b/vueblog/package-lock.json
index 341d0457..03e4626d 100644
--- a/vueblog/package-lock.json
+++ b/vueblog/package-lock.json
@@ -12,7 +12,9 @@
         "bootstrap": "^3.4.1",
         "core-js": "^3.8.3",
         "element-ui": "^2.15.6",
+        "github-markdown-css": "^5.1.0",
         "jquery": "^3.6.0",
+        "markdown-it": "^13.0.0",
         "mavon-editor": "^2.10.4",
         "qs": "^6.10.3",
         "vue": "^2.6.14",
@@ -3024,6 +3026,11 @@
       "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
       "dev": true
     },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+    },
     "node_modules/array-flatten": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
@@ -5141,6 +5148,11 @@
         "node": ">=6"
       }
     },
+    "node_modules/github-markdown-css": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmmirror.com/github-markdown-css/-/github-markdown-css-5.1.0.tgz",
+      "integrity": "sha512-QLtORwHHtUHhPMHu7i4GKfP6Vx5CWZn+NKQXe+cBhslY1HEt0CTEkP4d/vSROKV0iIJSpl4UtlQ16AD8C6lMug=="
+    },
     "node_modules/glob": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
@@ -5896,6 +5908,14 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
+    "node_modules/linkify-it": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmmirror.com/linkify-it/-/linkify-it-4.0.1.tgz",
+      "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==",
+      "dependencies": {
+        "uc.micro": "^1.0.1"
+      }
+    },
     "node_modules/loader-runner": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
@@ -6197,6 +6217,29 @@
         "node": ">=8"
       }
     },
+    "node_modules/markdown-it": {
+      "version": "13.0.1",
+      "resolved": "https://registry.npmmirror.com/markdown-it/-/markdown-it-13.0.1.tgz",
+      "integrity": "sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==",
+      "dependencies": {
+        "argparse": "^2.0.1",
+        "entities": "~3.0.1",
+        "linkify-it": "^4.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.js"
+      }
+    },
+    "node_modules/markdown-it/node_modules/entities": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/entities/-/entities-3.0.1.tgz",
+      "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
     "node_modules/mavon-editor": {
       "version": "2.10.4",
       "resolved": "https://registry.npmjs.org/mavon-editor/-/mavon-editor-2.10.4.tgz",
@@ -6211,6 +6254,11 @@
       "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
       "dev": true
     },
+    "node_modules/mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
+    },
     "node_modules/media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -8790,6 +8838,11 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmmirror.com/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
+    },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
@@ -11973,6 +12026,11 @@
       "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
       "dev": true
     },
+    "argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+    },
     "array-flatten": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
@@ -13692,6 +13750,11 @@
         "pump": "^3.0.0"
       }
     },
+    "github-markdown-css": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmmirror.com/github-markdown-css/-/github-markdown-css-5.1.0.tgz",
+      "integrity": "sha512-QLtORwHHtUHhPMHu7i4GKfP6Vx5CWZn+NKQXe+cBhslY1HEt0CTEkP4d/vSROKV0iIJSpl4UtlQ16AD8C6lMug=="
+    },
     "glob": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
@@ -14291,6 +14354,14 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
+    "linkify-it": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmmirror.com/linkify-it/-/linkify-it-4.0.1.tgz",
+      "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==",
+      "requires": {
+        "uc.micro": "^1.0.1"
+      }
+    },
     "loader-runner": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
@@ -14532,6 +14603,25 @@
         "semver": "^6.0.0"
       }
     },
+    "markdown-it": {
+      "version": "13.0.1",
+      "resolved": "https://registry.npmmirror.com/markdown-it/-/markdown-it-13.0.1.tgz",
+      "integrity": "sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==",
+      "requires": {
+        "argparse": "^2.0.1",
+        "entities": "~3.0.1",
+        "linkify-it": "^4.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "dependencies": {
+        "entities": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmmirror.com/entities/-/entities-3.0.1.tgz",
+          "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q=="
+        }
+      }
+    },
     "mavon-editor": {
       "version": "2.10.4",
       "resolved": "https://registry.npmjs.org/mavon-editor/-/mavon-editor-2.10.4.tgz",
@@ -14546,6 +14636,11 @@
       "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
       "dev": true
     },
+    "mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
+    },
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -16540,6 +16635,11 @@
         "mime-types": "~2.1.24"
       }
     },
+    "uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmmirror.com/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
+    },
     "unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
diff --git a/vueblog/src/assets/css/base.css b/vueblog/src/assets/css/base.css
index 9ae2e42a..1e31a395 100644
--- a/vueblog/src/assets/css/base.css
+++ b/vueblog/src/assets/css/base.css
@@ -53,4 +53,14 @@ a {
 
 .right {
     float: right;
-}
\ No newline at end of file
+}
+ol, ul {
+  list-style: none;
+}
+* {
+  -webkit-user-select: text;
+  -khtml-user-select: text;
+  -moz-user-select: text;
+  -ms-user-select: text;
+  user-select: text;
+}
diff --git a/vueblog/src/assets/img/blogDetail/blogComment/commentLike.png b/vueblog/src/assets/img/blogDetail/blogComment/commentLike.png
new file mode 100644
index 00000000..a77866dd
Binary files /dev/null and b/vueblog/src/assets/img/blogDetail/blogComment/commentLike.png differ
diff --git a/vueblog/src/assets/img/blogDetail/blogComment/commentLikeActive.png b/vueblog/src/assets/img/blogDetail/blogComment/commentLikeActive.png
new file mode 100644
index 00000000..7e25cddb
Binary files /dev/null and b/vueblog/src/assets/img/blogDetail/blogComment/commentLikeActive.png differ
diff --git a/vueblog/src/assets/img/blogDetail/blogComment/commentReply.png b/vueblog/src/assets/img/blogDetail/blogComment/commentReply.png
new file mode 100644
index 00000000..0baf7256
Binary files /dev/null and b/vueblog/src/assets/img/blogDetail/blogComment/commentReply.png differ
diff --git a/vueblog/src/assets/img/blogDetail/collection2.png b/vueblog/src/assets/img/blogDetail/collection2.png
new file mode 100644
index 00000000..9e8f2ea2
Binary files /dev/null and b/vueblog/src/assets/img/blogDetail/collection2.png differ
diff --git a/vueblog/src/assets/img/blogDetail/collection2_active.png b/vueblog/src/assets/img/blogDetail/collection2_active.png
new file mode 100644
index 00000000..6354be00
Binary files /dev/null and b/vueblog/src/assets/img/blogDetail/collection2_active.png differ
diff --git a/vueblog/src/assets/img/blogDetail/comment.png b/vueblog/src/assets/img/blogDetail/comment.png
new file mode 100644
index 00000000..7eb4802b
Binary files /dev/null and b/vueblog/src/assets/img/blogDetail/comment.png differ
diff --git a/vueblog/src/assets/img/blogDetail/good.png b/vueblog/src/assets/img/blogDetail/good.png
new file mode 100644
index 00000000..433dd5c2
Binary files /dev/null and b/vueblog/src/assets/img/blogDetail/good.png differ
diff --git a/vueblog/src/assets/img/blogDetail/good_active.png b/vueblog/src/assets/img/blogDetail/good_active.png
new file mode 100644
index 00000000..7d646657
Binary files /dev/null and b/vueblog/src/assets/img/blogDetail/good_active.png differ
diff --git a/vueblog/src/axios.js b/vueblog/src/axios.js
index 1e741478..1ca11fae 100644
--- a/vueblog/src/axios.js
+++ b/vueblog/src/axios.js
@@ -1,4 +1,42 @@
 import axios from "axios";
+import ElementUI from 'element-ui';
 
 // axios.defaults.baseURL="https://local.sticki.cn/api/v1"
-axios.defaults.baseURL="/api"
+// axios.defaults.baseURL="https://api.scblogs.cn/v1"
+axios.defaults.baseURL = "/api"
+
+// 前置拦截
+axios.interceptors.request.use(config => {
+  return config
+})
+
+// 后置拦截
+axios.interceptors.response.use(response => {
+  let res = response.data;
+  console.log("===============")
+  console.log(res)
+  console.log("===============")
+
+  if (res.code === 200) {
+    return response
+  } else if (res.code === 401) {
+    ElementUI.Message.error("未登录")
+    return Promise.reject(response.data.message)
+  } else {
+    ElementUI.Message.error("错误")
+    return Promise.reject(response.data.message)
+  }
+},
+  error => {
+    console.log("00");
+    console.log(error)
+    if (error.response.data) {
+      error.message = error.response.data.message
+    }
+    if (error.response.status === 401) {
+      ElementUI.Message.error("未登录")
+    }
+    ElementUI.Message.error(error.message)
+    return Promise.reject(error)
+  }
+)
diff --git a/vueblog/src/components/P_user/Manage/managecontent.vue b/vueblog/src/components/P_user/Manage/managecontent.vue
index f3d027f7..a8dbc795 100644
--- a/vueblog/src/components/P_user/Manage/managecontent.vue
+++ b/vueblog/src/components/P_user/Manage/managecontent.vue
@@ -2,6 +2,8 @@
   <div class="managecontent">
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="文章" name="first">
+            <!-- <div class="searchResult">
+            </div> -->
             <div class="firstmodel">
                 <div class="screening-conditions">
                     <ul>
@@ -30,18 +32,34 @@
                         <div>这里啥也没有啊</div>
                         <button @click="TurnToWriteBlog">写博客</button>
                     </div>
-                    <div class="show-content">
-                        <div class="F-1" v-for="(item,index) in List"  :key="index" @click="TurnToShow(item.id)">
+                    <div ref="noneSearch" class="nonesearch">
+                        啥也没搜到！
+                    </div>
+                    <div ref="firstContent" class="show-content">
+                        <div class="F-1" v-for="(item,index) in List"  :key="index" >
                             <div class="BlogContent-a">
-                            <div class="BlogContent-1">{{ item.title }}</div>
-                            <div class="BlogContent-2">{{ item.description }}</div>
-                            <div class="BlogContent-3">
-                                {{ item.releaseTime }}.
-                                <span>{{ item.viewNum }}阅读 .</span>
-                                <span>{{ item.likeNum }}点赞 .</span>
-                                <span>{{ item.commentNum }}评论 .</span>
-                                <span>{{ item.collectionNum }}收藏</span>
+                                <div @click="TurnToShow(item.id)" class="BlogContent-1">{{ item.title }}</div>
+                                <div class="BlogContent-2">{{ item.description }}</div>
+                                <div class="BlogContent-3">
+                                    {{ item.releaseTime }}.
+                                    <span>{{ item.viewNum }}阅读 .</span>
+                                    <span>{{ item.likeNum }}点赞 .</span>
+                                    <span>{{ item.commentNum }}评论 .</span>
+                                    <span>{{ item.collectionNum }}收藏</span>
+                                </div>
                             </div>
+                            <div class="BlogContent-b">
+                                <el-popover
+                                    placement="top"
+                                    width="160"
+                                    v-model="visible2">
+                                    <p>这是一段内容这是一段内容确定删除吗？</p>
+                                    <div style="text-align: right; margin: 0">
+                                    <el-button size="mini" type="text" @click="visible2 = false">取消</el-button>
+                                    <el-button type="primary" size="mini" @click="visible2 = false">确定</el-button>
+                                    </div>
+                                    <el-button style="pointer-events: auto;" slot="reference">删除</el-button>
+                                </el-popover>
                             </div>
                         </div>
                         <!--infinite-loading这个组件要放在列表的底部，滚动的盒子里面-->
@@ -95,35 +113,43 @@ export default {
             // 显示遍历的列表
             List: [],
             // 博客页数
-            page:1,
+            page:0,
             // 搜索博客
             searchblog:"",
             config:{
+                params:{status:"0",page:"0"},
                 headers:{
-                    'token':localStorage.getItem('token',{
-                        params:{
-                            status:""
-                        }
-                    })
+                    'token':localStorage.getItem('token')
                 }
-            }
+            },
+            visible2:false
         }
     },
-    created(){
+    async mounted(){
         // 获取全部用户博客数据显示各种状态下的数据
-        this.GetData()
+    //    await this.GetData()
+    this.$refs.noneSearch.style.display="none"
     },
+    // watch:{
+    //     config:{
+    //         handler(newName, oldName) {
+    //             console.log('注意此时的config对象变化了',this.config);
+    //             },
+    //             immediate: true
+    //     }
+    // },
     methods:{
-        GetData(){
-            console.log("开始调用")
-            this.$axios.get("/blog-console/blog-list",this.config).then(res=>{
-                console.log("获取全部用户博客返回数据",res)
-                this.allList=res.data.data.blogList
-                this.List=this.allList
+       async GetData(){
+            this.List=[]
+           await this.$axios.get("/blog-console/blog-list",this.config).then(res=>{
+                this.allList=res.data.data.records
+                // this.page=res.data.data.pages
+                this.List=this.List.concat(this.allList)
+                // 将传参的页数标记增大1
+                this.config.params.page+1
                 if(this.List.length>0){
                     this.$refs.writeBlog.style.display="none"
                 }
-                console.log("此时应该展示的用户博客",this.List);
             })
         },
         // 手动选择部分
@@ -132,33 +158,43 @@ export default {
       },
     //   滑动触底时调用
     async infiniteHandler($state) {
-        console.log("其实已经到底了")
-        this.$axios
-          .get("/blog/list?page="+this.page)
+        await this.$axios
+          .get("/blog-console/blog-list",this.config)
           .then((res) => {
-              console.log("获取列表接口返回值",res)
-            if(res.data.data.length) {
-              this.page +=1;  // 下一页
-              this.allList = this.allList.concat(res.data.data);
+              if(res.data.data.records.length>0) {
+              this.config.params.page +=1;  // 下一页
+              this.allList = this.allList.concat(res.data.data.records);
               this.List=this.allList
-              console.log("此时所有的博客列表是",this.List)
               $state.loaded();
             }else {
-              $state.complete();
+                $state.complete();
             }
           })
+           if(this.List.length>0){
+                this.$refs.writeBlog.style.display="none"
+                this.$refs.noneSearch.style.display="none"
+            }
+        console.log("此时所有的博客列表是",this.List)
       },
     //   查找关键字博客列表
     SearchBlog(){
         this.$axios.get("/blog/search",{params:{
             key:this.searchblog,
         }}).then(res=>{
-            console.log("搜索博客返回的数据",res)
+            console.log("搜索返回的数据是",res.data)
+            if(res.data.data.records.length==0){
+                // 显示啥都没搜到
+                this.$refs.firstContent.style.display="none"
+                this.$refs.noneSearch.style.display="block"
+            }else{
+                this.$refs.firstContent.style.display="block"
+                this.$refs.noneSearch.style.display="none"
+                this.List=res.data.records
+            }
         })
     },
     // 跳转至博客具体内容列表
     TurnToShow(index){
-      console.log("获取到的文章ID是",index)
         var routeUrl= this.$router.resolve({name:'BlogDetail',params:{blogId:index}})
         window.open(routeUrl.href, '_blank');
     },
@@ -173,13 +209,16 @@ export default {
                         this.ScreenList[i].chose=false
                     }
                 this.ScreenList[index].chose=true
+                this.config.params.status=(index-1).toString()
+                this.config.params.page=1
+                this.GetData()//所有博客
             }
         }
     }
 }
 </script>
 
-<style>
+<style scoped>
 .managecontent{
     width:calc(100%- 40px);
     height: calc(100%- 40px);
@@ -225,7 +264,19 @@ export default {
 }
 .screening-conditionsB .writeBlog{
     width: 100%;
-    height: 100%;
+    height: 500px;
+    text-align: center;
+    /* display: flex;
+    align-items: center;
+    justify-content: center; */
+}
+.screening-conditionsB .nonesearch{
+    width: 100%;
+    height: 500px;
+    font-size: 20px;
+    font-weight: 800;
+    color: red;                 
+    text-align: center;
     /* display: flex;
     align-items: center;
     justify-content: center; */
@@ -261,11 +312,18 @@ export default {
     height: 30%;
 }
 .BlogContent-a {
-  width: 100%;
+  width: 80%;
   height: 100%;
+  display: inline-block;
   padding: 10px 0;
   border-bottom: 1px solid #b7b8bb;
 }
+.BlogContent-b {
+  width: 20%;
+  height: 100%;
+  display: inline-block;
+  /* border-bottom: 1px solid #b7b8bb; */
+}
 .BlogContent-1 {
   width: 100%;
   height: 30%;
diff --git a/vueblog/src/components/P_user/NavigationBar/navigationbar.vue b/vueblog/src/components/P_user/NavigationBar/navigationbar.vue
index fba09b48..f59ba996 100644
--- a/vueblog/src/components/P_user/NavigationBar/navigationbar.vue
+++ b/vueblog/src/components/P_user/NavigationBar/navigationbar.vue
@@ -177,7 +177,8 @@ export default {
       this.recentList = [];
     // 获取文章列表
       await this.$axios.get("/blog-console/blog-list",{headers:{'token':localStorage.getItem('token')}}).then((res) => {
-        this.recentList = this.recentList.concat(res.data.data.blogList);
+        console.log("获取博客列表成功",res)
+        this.recentList = this.recentList.concat(res.data.data.records);
         console.log("获取到的博客列表数据", this.recentList);
         this.DataChange();
       });
diff --git a/vueblog/src/components/P_user/PMELeftTabs/lefttabs.vue b/vueblog/src/components/P_user/PMELeftTabs/lefttabs.vue
index 81d356f8..6b6202a0 100644
--- a/vueblog/src/components/P_user/PMELeftTabs/lefttabs.vue
+++ b/vueblog/src/components/P_user/PMELeftTabs/lefttabs.vue
@@ -291,7 +291,7 @@ export default {
 .rightContentB .rightContentB-1 .button{
   width: 10%;
   height: 50%;
-  /* padding: 8px 8px; */
+  cursor: pointer;
   margin: 0 100px;
   border-radius: 20px;
   border: 2px solid rgb(81, 222, 253);
diff --git a/vueblog/src/components/P_user/PMELeftTabs/lefttabs2.vue b/vueblog/src/components/P_user/PMELeftTabs/lefttabs2.vue
index 64275adb..c90c5575 100644
--- a/vueblog/src/components/P_user/PMELeftTabs/lefttabs2.vue
+++ b/vueblog/src/components/P_user/PMELeftTabs/lefttabs2.vue
@@ -13,7 +13,7 @@
                     <div class="password">
                         <div class="text">密码</div>
                         <div class="right">
-                            <span>{{}}</span>
+                            <span></span>
                             <span @click="ChangePassword">修改密码</span>
                         </div>
                     </div>
diff --git a/vueblog/src/components/P_user/PMELeftTabs/lefttabs5.vue b/vueblog/src/components/P_user/PMELeftTabs/lefttabs5.vue
new file mode 100644
index 00000000..be1c3c3a
--- /dev/null
+++ b/vueblog/src/components/P_user/PMELeftTabs/lefttabs5.vue
@@ -0,0 +1,154 @@
+<template>
+    <div class="content">
+        <div class="myCollect">
+            <div class="myCollectB">我的收藏</div>
+            <div v-if="noneCollect"  class="noneCollect">
+                你还没有收藏哦,快去找些优质文章吧！
+            </div>
+            <div v-if="!noneCollect" class="myCollectA" v-for="(item,index) in collectList" :key="index" >
+                <div class="myCollectTitle" @click="TurnToDetail(item.id)">{{item.title}}</div>
+                <div class="myCollectStar">
+                    <img ref="star" @click="ChangeStar(index)" 
+                    :src="item.starStation? collectStar1:collectStar2"
+                     alt="">
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name:"TabsContent2",
+    data(){
+        return {
+            collectList:[],
+            collectStar1:"data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+CjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiIHdpZHRoPSIzMnB4IiBoZWlnaHQ9IjMycHgiIHZpZXdCb3g9IjAgMCAzMiAzMiIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMzIgMzIiIHhtbDpzcGFjZT0icHJlc2VydmUiPiAgPGltYWdlIGlkPSJpbWFnZTAiIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgeD0iMCIgeT0iMCIKICAgIGhyZWY9ImRhdGE6aW1hZ2UvcG5nO2Jhc2U2NCxpVkJPUncwS0dnb0FBQUFOU1VoRVVnQUFBQ0FBQUFBZ0NBTUFBQUJFcElyR0FBQUFCR2RCVFVFQUFMR1BDL3hoQlFBQUFDQmpTRkpOCkFBQjZKZ0FBZ0lRQUFQb0FBQUNBNkFBQWRUQUFBT3BnQUFBNm1BQUFGM0NjdWxFOEFBQUJMMUJNVkVYLy8vLy96SGIvekhiL3kzYi8KekhiL3pKbi96WGIvekhmLzFZRC95M2IvekhiLzBYYi96WFgvejREL3kzYi96SGIveklEL3kzYi96SGYveklEL3pIWC8ySGIvekhiLwp5M2YvLzRELzBIbi96SGIveTNYL3pYYi8vNnIvMzREL3puYi96WGYvekhiL3kzYi96SFgveTNYL3kzYi96SGIvekhmL3puZi96WGIvCnkzYi95M1gvekhiL3pIZi96WGovelhiL3pIWC95M2IvekhYL3pIYi8wWGIveTNYL3pYai95M24vekhuL3kzYi95M1gvelhqLzBIai8KekhYL3ozci8wWHIvekhYL3pIZi96SG4vekhiL3pubi8wWUQvelhYL3puai96SFgvekhiL3pIYi8wWXYvekhiL3pIWC8vNEQveTNiLwp6blgvem52L3puYi95M2IvMjVMLzFZRC96SFgvMG5qL3pYWC96SGIvekhmLzQ0Ny95M1gvekhYLzI0RC96SGYveTNiL3kzYi96SGIvCnkzWC8vLzk5R2ZheUFBQUFZM1JTVGxNQWZlcnNqUVYxa0JqMytSeUpFUEwxRkh1REN1OE5ibllDSnVIbktRTUlOR1dWeGZUMnk1eHQKUG1iTy9OdHlVWERjM2E2ckovRWtPemMyN1RNeDZ6QXM2UzBvN2lvV1RFU3FvTm9ML2ZnRTQySWZHdWdIQnY0Um1IZDRDYzk4RGcrQQoxSnVzMXBSK0FBQUFBV0pMUjBRQWlBVWRTQUFBQUFkMFNVMUZCK1FIQWhVWE9vQksyeEFBQUFFWFNVUkJWRGpMWTJCQUFZeE16Q3lzCkRMZ0JXeklRc09PVzUrQUVLZURpeHFtQUp6a1pyeEc4ZkJBRi9BSTRGQWdtUTRFUWRubGhKcGdDRVZHc0NzU1M0VUFjaTdTRXBCUkMKZ2JTTUxMS2NuTHlDb3BKeU1ncFFVVlZUMStBRlMydHFhU2ZqQWpxNkRBeDZ5WGlCUG9NQmZnV0dEQ3I0RmFnd0dPRlhZTXhnb294UAozdFNNZ2NIY0ZMZThpQVhJbjVZaXVPU3RyQ0VCWmNPTVhkN1dEaGFVOWc3WTVCMGNFWUh0aE1VV1p4Zms2TERDWWdDeVBEYzJLMXlSCkZMaGhVK0NPTGJFaEExMGtCUjdZRkhnaUtmRENwa0FMSWUvdGcwMkJyeDljZ1NOYzBGOHpBSkUwQStFS2dxQWl3V0loREF5aDZzRVEKWGxnNHdvNElrQUJ6cERBMGcwUTVnL2pJT1RCYWpTa21OZzdCajA5SUZFa0tBVE1CV3Zqa0kxUmlUaDhBQUFBbGRFVllkR1JoZEdVNgpZM0psWVhSbEFESXdNakF0TURjdE1ESlVNVE02TWpNNk5UZ3JNRGc2TUREc0p5OU1BQUFBSlhSRldIUmtZWFJsT20xdlpHbG1lUUF5Ck1ESXdMVEEzTFRBeVZERXpPakl6T2pVNEt6QTRPakF3blhxWDhBQUFBQ0IwUlZoMGMyOW1kSGRoY21VQWFIUjBjSE02THk5cGJXRm4KWlcxaFoybGpheTV2Y21lOHp4MmRBQUFBR0hSRldIUlVhSFZ0WWpvNlJHOWpkVzFsYm5RNk9sQmhaMlZ6QURHbi83c3ZBQUFBRjNSRgpXSFJVYUhWdFlqbzZTVzFoWjJVNk9raGxhV2RvZEFBek1pajArUFFBQUFBV2RFVllkRlJvZFcxaU9qcEpiV0ZuWlRvNlYybGtkR2dBCk16TFFXemg1QUFBQUdYUkZXSFJVYUhWdFlqbzZUV2x0WlhSNWNHVUFhVzFoWjJVdmNHNW5QN0pXVGdBQUFCZDBSVmgwVkdoMWJXSTYKT2sxVWFXMWxBREUxT1RNMk5qYzBNemp6RkI4NUFBQUFFWFJGV0hSVWFIVnRZam82VTJsNlpRQTVNREJDUXJPOW5IVUFBQUJHZEVWWQpkRlJvZFcxaU9qcFZVa2tBWm1sc1pUb3ZMeTloY0hBdmRHMXdMMmx0WVdkbGJHTXZhVzFuZG1sbGR6SmZPVjh4TlRreU5UVTROVFF6Ck5UTTJOVEUxTWw4eU9WOWJNRjBnc0hhZkFBQUFBRWxGVGtTdVFtQ0MiID48L2ltYWdlPgo8L3N2Zz4K",
+            collectStar2:"data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+CjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiIHdpZHRoPSIzMnB4IiBoZWlnaHQ9IjMycHgiIHZpZXdCb3g9IjAgMCAzMiAzMiIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMzIgMzIiIHhtbDpzcGFjZT0icHJlc2VydmUiPiAgPGltYWdlIGlkPSJpbWFnZTAiIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgeD0iMCIgeT0iMCIKICAgIGhyZWY9ImRhdGE6aW1hZ2UvcG5nO2Jhc2U2NCxpVkJPUncwS0dnb0FBQUFOU1VoRVVnQUFBQ0FBQUFBZ0NBUUFBQURaYzdKL0FBQUFCR2RCVFVFQUFMR1BDL3hoQlFBQUFDQmpTRkpOCkFBQjZKZ0FBZ0lRQUFQb0FBQUNBNkFBQWRUQUFBT3BnQUFBNm1BQUFGM0NjdWxFOEFBQUFBbUpMUjBRQS80ZVB6TDhBQUFBSGRFbE4KUlFma0J3SVZHd0lFL1N5Q0FBQUI5VWxFUVZSSXg2VlZUV3NUVVJROTk5azBIODNISkdBUmxBcTJvZ3RwSXdWWExpUkNYZnNiRkQ4UQpMQVZGRndyK0FjV2RwWW8vd1oyZzlBY1VDcUZHVkZTQ1N1bkNoc3g3NDBRYjIzeGNGeWJPWkh3VDNxVDNiV1llNTV3NTU4MjdYRERDCmw3b3ZhN0t1SG5Jc0hET0VMbS9iM0Z1UHcxSEUwTmV2UTd0ZmtmajdUSHVKNmVTV0hpZEMrTmhiNnRNQkhtL2VDc09GT0hDczdpWXkKdm8yZDJORk1QWUlEdmpGQUIxS3R4U2dPVXVvYkh3d0FuZndVR29ZT25NdEJPc0NXdW03bVFEUm0ycXM4cGNGK0h5K2xQNk9qRjBqOApPTlU1VFVVVWVRNFRDSzhtM3FNaUtxamdyZVgwQk5RVlhNTXNIMERFb2lvL0tUd2lkYkg3SWlyVmwzZUpaSlduUnhlZ0wyVHZJRG02CkFKb0NyL1pCQjE2U2U2SlZIbnJ1dzhvZG14ZVpUM1FCN2tqNW5iR0ZiSlVZZ0h1bTg1cXRpSFFwRm5MbDNsWE9ybE9KN0VqME9wM1AKbFlGL3ZXQnQ0QnhxeHZ3YVN0YWJucFRYQzQyVDdUV1RJS1JpWjlNZittKytic3g4Uk5mazg5enk2QU1DelNOY01Bb3crWE5TSy9DNwphSG9FblZtdEFPYjJLY0RHQWdoeFlCeUJmQUxlYjV4UUxndERnZDE4R3UyQUEzVk1ROStpcStJU2JRYTNPZTRjL2k5Q1BIaVZ0OFZpCllTYS9ZajNQSHhjM3NUM2dnTWxyUDk4d1hlNFBVMW1YZHpnMU1FUlQ4cTZVdW1IckJ5WHRaN0ltTjlROXptcW5kYzUrSU45SnBaNXkKM052OUF5ZmVHbEhZaEhSR0FBQUFKWFJGV0hSa1lYUmxPbU55WldGMFpRQXlNREl3TFRBM0xUQXlWREV6T2pJM09qQXlLekE0T2pBdwpDVnplSEFBQUFDVjBSVmgwWkdGMFpUcHRiMlJwWm5rQU1qQXlNQzB3Tnkwd01sUXhNem95Tnpvd01pc3dPRG93TUhnQlpxQUFBQUFnCmRFVllkSE52Wm5SM1lYSmxBR2gwZEhCek9pOHZhVzFoWjJWdFlXZHBZMnN1YjNKbnZNOGRuUUFBQUJoMFJWaDBWR2gxYldJNk9rUnYKWTNWdFpXNTBPanBRWVdkbGN3QXhwLys3THdBQUFCZDBSVmgwVkdoMWJXSTZPa2x0WVdkbE9qcElaV2xuYUhRQU16SW85UGowQUFBQQpGblJGV0hSVWFIVnRZam82U1cxaFoyVTZPbGRwWkhSb0FETXkwRnM0ZVFBQUFCbDBSVmgwVkdoMWJXSTZPazFwYldWMGVYQmxBR2x0CllXZGxMM0J1WnoreVZrNEFBQUFYZEVWWWRGUm9kVzFpT2pwTlZHbHRaUUF4TlRrek5qWTNOakl5Q1Y0VENBQUFBQkYwUlZoMFZHaDEKYldJNk9sTnBlbVVBT0RZd1FrS3J0dW9aQUFBQVJuUkZXSFJVYUhWdFlqbzZWVkpKQUdacGJHVTZMeTh2WVhCd0wzUnRjQzlwYldGbgpaV3hqTDJsdFozWnBaWGN5WHpsZk1UVTVNalUxT0RVME1EQTFPVE0xTWpaZk1UUmZXekJkR0c2Tk1nQUFBQUJKUlU1RXJrSmdnZz09IiA+PC9pbWFnZT4KPC9zdmc+Cg==",
+            config:{
+                headers:{
+                    'token':localStorage.getItem('token')
+                }
+            },
+            noneCollect:false,
+        }
+    },
+    mounted(){
+         this.GetData()
+    },
+    methods:{
+        GetData(){
+            this.$axios.get("/user/collect",this.config).then(res=>{
+                console.log("收藏列表返回数据",res)
+                if(res.data.data.records!=null){
+                    if(res.data.data.records.length>0){
+                        this.collectList=res.data.data.records
+                    }else{
+                        // this.$refs.noneCollect.style.display="block"
+                        this.noneCollect=true
+                    }
+                }else{
+                        // this.$refs.noneCollect.style.display="block"
+                        this.noneCollect=true
+                }
+                //为所有数据添加字段状态starStation
+                this.AddStation()
+            })
+        },
+        //添加收藏列表的初始状态true
+        AddStation(){
+            this.collectList.forEach(item=>{
+                item.starStation=true
+            })
+        },
+        ChangeStar(index){
+            this.collectList[index].starStation=!this.collectList[index].starStation
+            // 开始收藏状态修正
+            this.Collect(index)
+        },
+        Collect(index){
+            if(this.collectList[index].starStation==true){
+                // 开始收藏，将blogid转化成form-data格式
+                let formdata = new FormData()
+				
+				formdata.append("blogid", this.collectList[index].id) 
+				
+                this.$axios.post('/blog/collect',formdata,this.config).then(res=>{
+                    this.$message({
+                            message: '收藏成功',
+                            type: 'success'
+                        });
+                })
+            }else{
+                // 取消收藏部分
+                this.$message({
+                            message: '取消收藏成功',
+                            type: 'success'
+                        });
+            }
+        }
+    }
+}
+</script>
+
+<style scoped>
+.content{
+    width: 100%;
+    background: linear-gradient(to bottom right, rgb(233, 189, 189), rgb(255, 255, 255));
+    border-radius: 5px;
+}
+.myCollect{
+    width: 95%;
+    padding:0 2.5%;
+}
+.myCollect .noneCollect{
+    width:100%;
+    height: 500px;
+    display: block;
+    font-size: 36px;
+    font-weight: bold;
+    line-height: 500px;
+    text-align: center;
+    color: #ff0000;
+    -webkit-text-stroke: 1px rgb(11, 235, 255); 
+}
+.myCollectB{
+    width: 100%;
+    height: 100px;
+    line-height: 100px;
+    font-size: 28px;
+    font-weight: 800;
+    color: black;
+}
+.myCollectA{
+    width: 100%;
+    min-height: 100px;
+    background: white;
+    border: 1px solid rgb(213, 211, 211);
+    border-radius: 10px;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+}
+.myCollectA:hover{
+    box-shadow:  0 4px 8px 0 rgba(0, 0, 0, 0.2);
+}
+.myCollectA .myCollectTitle{
+    width: 80%;
+    font-size: 20px;
+    margin-left: 40px;
+    font-weight: 600;
+    color: rgb(56, 52, 52);
+    display: inline-block;
+}
+.myCollectA .myCollectStar{
+    width: 10%;
+    height: 100%;
+    margin-left: 40px;
+    text-align: center;
+}
+.myCollectA .myCollectStar img{
+    width: 30px;
+    display: block;
+}
+</style>
\ No newline at end of file
diff --git a/vueblog/src/components/P_user/PMELeftTabs/lefttabs8.vue b/vueblog/src/components/P_user/PMELeftTabs/lefttabs8.vue
new file mode 100644
index 00000000..5e648b1a
--- /dev/null
+++ b/vueblog/src/components/P_user/PMELeftTabs/lefttabs8.vue
@@ -0,0 +1,153 @@
+<template>
+    <div class="content">
+        <div class="myLike">
+            <div class="myLikeB">我赞过的</div>
+            <div v-if="noneLike" class="noneLike">
+                你都舍不得点赞吗？
+            </div>
+            <div v-if="!noneLike" class="myLikeA" v-for="(item,index) in likeList" :key="index" >
+                <div class="myLikeTitle" @click="TurnToDetail(item.id)">{{item.title}}</div>
+                <div class="myLikeStar">
+                    <img ref="star" @click="ChangeStar(index)" 
+                    :src="item.starStation? likeStar1:likeStar2"
+                     alt="">
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name:"TabsContent8",
+    data(){
+        return {
+            likeList:[],
+            likeStar1:"data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+CjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiIHdpZHRoPSIzMnB4IiBoZWlnaHQ9IjMycHgiIHZpZXdCb3g9IjAgMCAzMiAzMiIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMzIgMzIiIHhtbDpzcGFjZT0icHJlc2VydmUiPiAgPGltYWdlIGlkPSJpbWFnZTAiIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgeD0iMCIgeT0iMCIKICAgIGhyZWY9ImRhdGE6aW1hZ2UvcG5nO2Jhc2U2NCxpVkJPUncwS0dnb0FBQUFOU1VoRVVnQUFBQ0FBQUFBZ0NBTUFBQUJFcElyR0FBQUFCR2RCVFVFQUFMR1BDL3hoQlFBQUFDQmpTRkpOCkFBQjZKZ0FBZ0lRQUFQb0FBQUNBNkFBQWRUQUFBT3BnQUFBNm1BQUFGM0NjdWxFOEFBQUJMMUJNVkVYLy8vLy96SGIvekhiL3kzYi8KekhiL3pKbi96WGIvekhmLzFZRC95M2IvekhiLzBYYi96WFgvejREL3kzYi96SGIveklEL3kzYi96SGYveklEL3pIWC8ySGIvekhiLwp5M2YvLzRELzBIbi96SGIveTNYL3pYYi8vNnIvMzREL3puYi96WGYvekhiL3kzYi96SFgveTNYL3kzYi96SGIvekhmL3puZi96WGIvCnkzYi95M1gvekhiL3pIZi96WGovelhiL3pIWC95M2IvekhYL3pIYi8wWGIveTNYL3pYai95M24vekhuL3kzYi95M1gvelhqLzBIai8KekhYL3ozci8wWHIvekhYL3pIZi96SG4vekhiL3pubi8wWUQvelhYL3puai96SFgvekhiL3pIYi8wWXYvekhiL3pIWC8vNEQveTNiLwp6blgvem52L3puYi95M2IvMjVMLzFZRC96SFgvMG5qL3pYWC96SGIvekhmLzQ0Ny95M1gvekhYLzI0RC96SGYveTNiL3kzYi96SGIvCnkzWC8vLzk5R2ZheUFBQUFZM1JTVGxNQWZlcnNqUVYxa0JqMytSeUpFUEwxRkh1REN1OE5ibllDSnVIbktRTUlOR1dWeGZUMnk1eHQKUG1iTy9OdHlVWERjM2E2ckovRWtPemMyN1RNeDZ6QXM2UzBvN2lvV1RFU3FvTm9ML2ZnRTQySWZHdWdIQnY0Um1IZDRDYzk4RGcrQQoxSnVzMXBSK0FBQUFBV0pMUjBRQWlBVWRTQUFBQUFkMFNVMUZCK1FIQWhVWE9vQksyeEFBQUFFWFNVUkJWRGpMWTJCQUFZeE16Q3lzCkRMZ0JXeklRc09PVzUrQUVLZURpeHFtQUp6a1pyeEc4ZkJBRi9BSTRGQWdtUTRFUWRubGhKcGdDRVZHc0NzU1M0VUFjaTdTRXBCUkMKZ2JTTUxMS2NuTHlDb3BKeU1ncFFVVlZUMStBRlMydHFhU2ZqQWpxNkRBeDZ5WGlCUG9NQmZnV0dEQ3I0RmFnd0dPRlhZTXhnb294UAozdFNNZ2NIY0ZMZThpQVhJbjVZaXVPU3RyQ0VCWmNPTVhkN1dEaGFVOWc3WTVCMGNFWUh0aE1VV1p4Zms2TERDWWdDeVBEYzJLMXlSCkZMaGhVK0NPTGJFaEExMGtCUjdZRkhnaUtmRENwa0FMSWUvdGcwMkJyeDljZ1NOYzBGOHpBSkUwQStFS2dxQWl3V0loREF5aDZzRVEKWGxnNHdvNElrQUJ6cERBMGcwUTVnL2pJT1RCYWpTa21OZzdCajA5SUZFa0tBVE1CV3Zqa0kxUmlUaDhBQUFBbGRFVllkR1JoZEdVNgpZM0psWVhSbEFESXdNakF0TURjdE1ESlVNVE02TWpNNk5UZ3JNRGc2TUREc0p5OU1BQUFBSlhSRldIUmtZWFJsT20xdlpHbG1lUUF5Ck1ESXdMVEEzTFRBeVZERXpPakl6T2pVNEt6QTRPakF3blhxWDhBQUFBQ0IwUlZoMGMyOW1kSGRoY21VQWFIUjBjSE02THk5cGJXRm4KWlcxaFoybGpheTV2Y21lOHp4MmRBQUFBR0hSRldIUlVhSFZ0WWpvNlJHOWpkVzFsYm5RNk9sQmhaMlZ6QURHbi83c3ZBQUFBRjNSRgpXSFJVYUhWdFlqbzZTVzFoWjJVNk9raGxhV2RvZEFBek1pajArUFFBQUFBV2RFVllkRlJvZFcxaU9qcEpiV0ZuWlRvNlYybGtkR2dBCk16TFFXemg1QUFBQUdYUkZXSFJVYUhWdFlqbzZUV2x0WlhSNWNHVUFhVzFoWjJVdmNHNW5QN0pXVGdBQUFCZDBSVmgwVkdoMWJXSTYKT2sxVWFXMWxBREUxT1RNMk5qYzBNemp6RkI4NUFBQUFFWFJGV0hSVWFIVnRZam82VTJsNlpRQTVNREJDUXJPOW5IVUFBQUJHZEVWWQpkRlJvZFcxaU9qcFZVa2tBWm1sc1pUb3ZMeTloY0hBdmRHMXdMMmx0WVdkbGJHTXZhVzFuZG1sbGR6SmZPVjh4TlRreU5UVTROVFF6Ck5UTTJOVEUxTWw4eU9WOWJNRjBnc0hhZkFBQUFBRWxGVGtTdVFtQ0MiID48L2ltYWdlPgo8L3N2Zz4K",
+            likeStar2:"data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+CjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiIHdpZHRoPSIzMnB4IiBoZWlnaHQ9IjMycHgiIHZpZXdCb3g9IjAgMCAzMiAzMiIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMzIgMzIiIHhtbDpzcGFjZT0icHJlc2VydmUiPiAgPGltYWdlIGlkPSJpbWFnZTAiIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgeD0iMCIgeT0iMCIKICAgIGhyZWY9ImRhdGE6aW1hZ2UvcG5nO2Jhc2U2NCxpVkJPUncwS0dnb0FBQUFOU1VoRVVnQUFBQ0FBQUFBZ0NBUUFBQURaYzdKL0FBQUFCR2RCVFVFQUFMR1BDL3hoQlFBQUFDQmpTRkpOCkFBQjZKZ0FBZ0lRQUFQb0FBQUNBNkFBQWRUQUFBT3BnQUFBNm1BQUFGM0NjdWxFOEFBQUFBbUpMUjBRQS80ZVB6TDhBQUFBSGRFbE4KUlFma0J3SVZHd0lFL1N5Q0FBQUI5VWxFUVZSSXg2VlZUV3NUVVJROTk5azBIODNISkdBUmxBcTJvZ3RwSXdWWExpUkNYZnNiRkQ4UQpMQVZGRndyK0FjV2RwWW8vd1oyZzlBY1VDcUZHVkZTQ1N1bkNoc3g3NDBRYjIzeGNGeWJPWkh3VDNxVDNiV1llNTV3NTU4MjdYRERDCmw3b3ZhN0t1SG5Jc0hET0VMbS9iM0Z1UHcxSEUwTmV2UTd0ZmtmajdUSHVKNmVTV0hpZEMrTmhiNnRNQkhtL2VDc09GT0hDczdpWXkKdm8yZDJORk1QWUlEdmpGQUIxS3R4U2dPVXVvYkh3d0FuZndVR29ZT25NdEJPc0NXdW03bVFEUm0ycXM4cGNGK0h5K2xQNk9qRjBqOApPTlU1VFVVVWVRNFRDSzhtM3FNaUtxamdyZVgwQk5RVlhNTXNIMERFb2lvL0tUd2lkYkg3SWlyVmwzZUpaSlduUnhlZ0wyVHZJRG02CkFKb0NyL1pCQjE2U2U2SlZIbnJ1dzhvZG14ZVpUM1FCN2tqNW5iR0ZiSlVZZ0h1bTg1cXRpSFFwRm5MbDNsWE9ybE9KN0VqME9wM1AKbFlGL3ZXQnQ0QnhxeHZ3YVN0YWJucFRYQzQyVDdUV1RJS1JpWjlNZittKytic3g4Uk5mazg5enk2QU1DelNOY01Bb3crWE5TSy9DNwphSG9FblZtdEFPYjJLY0RHQWdoeFlCeUJmQUxlYjV4UUxndERnZDE4R3UyQUEzVk1ROStpcStJU2JRYTNPZTRjL2k5Q1BIaVZ0OFZpCllTYS9ZajNQSHhjM3NUM2dnTWxyUDk4d1hlNFBVMW1YZHpnMU1FUlQ4cTZVdW1IckJ5WHRaN0ltTjlROXptcW5kYzUrSU45SnBaNXkKM052OUF5ZmVHbEhZaEhSR0FBQUFKWFJGV0hSa1lYUmxPbU55WldGMFpRQXlNREl3TFRBM0xUQXlWREV6T2pJM09qQXlLekE0T2pBdwpDVnplSEFBQUFDVjBSVmgwWkdGMFpUcHRiMlJwWm5rQU1qQXlNQzB3Tnkwd01sUXhNem95Tnpvd01pc3dPRG93TUhnQlpxQUFBQUFnCmRFVllkSE52Wm5SM1lYSmxBR2gwZEhCek9pOHZhVzFoWjJWdFlXZHBZMnN1YjNKbnZNOGRuUUFBQUJoMFJWaDBWR2gxYldJNk9rUnYKWTNWdFpXNTBPanBRWVdkbGN3QXhwLys3THdBQUFCZDBSVmgwVkdoMWJXSTZPa2x0WVdkbE9qcElaV2xuYUhRQU16SW85UGowQUFBQQpGblJGV0hSVWFIVnRZam82U1cxaFoyVTZPbGRwWkhSb0FETXkwRnM0ZVFBQUFCbDBSVmgwVkdoMWJXSTZPazFwYldWMGVYQmxBR2x0CllXZGxMM0J1WnoreVZrNEFBQUFYZEVWWWRGUm9kVzFpT2pwTlZHbHRaUUF4TlRrek5qWTNOakl5Q1Y0VENBQUFBQkYwUlZoMFZHaDEKYldJNk9sTnBlbVVBT0RZd1FrS3J0dW9aQUFBQVJuUkZXSFJVYUhWdFlqbzZWVkpKQUdacGJHVTZMeTh2WVhCd0wzUnRjQzlwYldGbgpaV3hqTDJsdFozWnBaWGN5WHpsZk1UVTVNalUxT0RVME1EQTFPVE0xTWpaZk1UUmZXekJkR0c2Tk1nQUFBQUJKUlU1RXJrSmdnZz09IiA+PC9pbWFnZT4KPC9zdmc+Cg==",
+            config:{
+                headers:{
+                    'token':localStorage.getItem('token')
+                }
+            },
+            // 后端没有数据返回时显示此部分
+            noneLike:false
+        }
+    },
+    mounted(){
+        this.GetData()
+    },
+    methods:{
+        GetData(){
+            this.$axios.get("/user/like",this.config).then(res=>{
+                console.log("点赞列表返回数据",res)
+                if(res.data.data.records!=null){
+                    if(res.data.data.records.length>0){
+                        this.likeList=res.data.data.records
+                    }else{
+                        // this.$refs.noneLike.style.display="block"
+                        this.noneLike=true
+                    }
+                }else{
+                        this.noneLike=true
+                }
+                //为所有数据添加字段状态starStation
+                this.AddStation()
+            })
+        },
+        //添加收藏列表的初始状态true
+        AddStation(){
+            this.likeList.forEach(item=>{
+                item.starStation=true
+            })
+        },
+        ChangeStar(index){
+            this.likeList[index].starStation=!this.likeList[index].starStation
+            // 开始收藏状态修正
+            this.Like(index)
+        },
+        Like(index){
+            if(this.likeList[index].starStation==true){
+                // 开始收藏，将blogid转化成form-data格式
+                let formdata = new FormData()
+				
+				formdata.append("blogid", this.likeList[index].id) 
+				
+                this.$axios.post('/blog/like',formdata,this.config).then(res=>{
+                    this.$message({
+                            message: '点赞成功',
+                            type: 'success'
+                        });
+                })
+            }else{
+                // 取消收藏部分
+                this.$message({
+                            message: '取消点赞成功',
+                            type: 'success'
+                        });
+            }
+        }
+    }
+}
+</script>
+
+<style scoped>
+.content{
+    width: 100%;
+    background: linear-gradient(to bottom right, rgb(233, 189, 189), rgb(255, 255, 255));
+    border-radius: 5px;
+}
+.myLike{
+    width: 95%;
+    padding:0 2.5%;
+}
+.myLike .noneLike{
+    width:100%;
+    height: 500px;
+    display:block;
+    font-size: 36px;
+    font-weight: bold;
+    line-height: 500px;
+    text-align: center;
+    color: #ff0000;
+    -webkit-text-stroke: 1px rgb(11, 235, 255); 
+}
+.myLike .myLikeB{
+    width: 100%;
+    height: 100px;
+    line-height: 100px;
+    font-size: 28px;
+    font-weight: 800;
+    color: black;
+}
+.myLikeA{
+    width: 100%;
+    min-height: 100px;
+    background: white;
+    border: 1px solid rgb(213, 211, 211);
+    border-radius: 10px;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+}
+.myLikeA:hover{
+    box-shadow:  0 4px 8px 0 rgba(0, 0, 0, 0.2);
+}
+.myLikeA .myLikeTitle{
+    width: 80%;
+    font-size: 20px;
+    margin-left: 40px;
+    font-weight: 600;
+    color: rgb(56, 52, 52);
+    display: inline-block;
+}
+.myLikeA .myLikeStar{
+    width: 10%;
+    height: 100%;
+    margin-left: 40px;
+    text-align: center;
+}
+.myLikeA .myLikeStar img{
+    width: 30px;
+}
+</style>
\ No newline at end of file
diff --git a/vueblog/src/main.js b/vueblog/src/main.js
index 67c67293..80511c25 100644
--- a/vueblog/src/main.js
+++ b/vueblog/src/main.js
@@ -36,3 +36,4 @@ new Vue({
   render: h => h(App),
 
 }).$mount('#app')
+
diff --git a/vueblog/src/router/index.js b/vueblog/src/router/index.js
index c55767dd..1756b6cb 100644
--- a/vueblog/src/router/index.js
+++ b/vueblog/src/router/index.js
@@ -13,6 +13,8 @@ const PersonalBlog = () => import('@/views/PersonalBlog')
 const PersonalMessageEdit = () => import('@/views/PersonalMessageEdit')
 const ContentManagement = () => import('@/views/ContentManagement')
 
+// const Test = () => import('@/views/Test')
+
 
 Vue.use(VueRouter)
 
@@ -26,47 +28,47 @@ const routes = [
   {
     path: '/home',
     name: 'Home',
-    component: Home
+    component: Home,
   },
   {
     path: '/login',
     name: 'Login',
-    component: Login
+    component: Login,
   },
   {
     path: '/register',
     name: 'register',
-    component: Register
+    component: Register,
   },
   {
     path: '/blog/search',
     name: 'BlogSearch',
-    component: BlogSearch
+    component: BlogSearch,
   },
   {
     path: '/blog/add',
     name: 'BlogAdd',
-    component: BlogEdit
+    component: BlogEdit,
   },
   {
     path: '/blog/publish',
     name: 'BlogPublishSuccess',
-    component: BlogPublishSuccess
+    component: BlogPublishSuccess,
   },
   {
     path: '/blog/:blogId',
     name: 'BlogDetail',
-    component: BlogDetail
+    component: BlogDetail,
   },
   {
     path: '/blog/:blogId/edit',
     name: 'BlogEdit',
-    component: BlogEdit
+    component: BlogEdit,
   },
   {
     path: '/Personal_Blog',
     name: 'PersonalBlog',
-    component: PersonalBlog
+    component: PersonalBlog,
   },
   {
     path: '/PersonalMessageEdit',
@@ -78,10 +80,16 @@ const routes = [
     name: 'ContentManagement',
     component: ContentManagement
   },
+  // {
+  //   path: '/test',
+  //   name: 'Test',
+  //   component: Test
+  // },
 ]
 
 const router = new VueRouter({
   mode: 'history',
+  // mode: 'hash',
   base: process.env.BASE_URL,
   routes
 })
diff --git a/vueblog/src/views/ContentManagement.vue b/vueblog/src/views/ContentManagement.vue
index dd7cd364..c76c0c57 100644
--- a/vueblog/src/views/ContentManagement.vue
+++ b/vueblog/src/views/ContentManagement.vue
@@ -98,15 +98,16 @@ export default {
 </script>
 
 <style scoped>
+
 .top{
     width: 100%;
     /* height: 50px; */
-    background: white;
+    background: rgb(255, 255, 255);
 }
 .body-content{
   width: 100%;
-    height: 100vh;
-    background: rgb(243,244,246);
+  min-height: 100vh;
+  background: rgb(75, 84, 102);
 }
 .top-mid{
     margin: 0 auto;
diff --git a/vueblog/src/views/PersonalBlog.vue b/vueblog/src/views/PersonalBlog.vue
index fabe51e1..a8660a74 100644
--- a/vueblog/src/views/PersonalBlog.vue
+++ b/vueblog/src/views/PersonalBlog.vue
@@ -133,7 +133,7 @@ export default {
     await this.$axios
         .post("/login/login", qs.stringify(params))
         .then((res) => {
-          console.log("登录成功",res)
+          console.log("登录成功",res.data.data)
           // 将token设置到本地浏览器中
           window.localStorage.setItem("token", res.headers.token);
           window.localStorage.setItem(
@@ -147,10 +147,8 @@ export default {
         .get("/user", this.config)
         .then((res) => {
           localStorage.setItem("userMessage", JSON.stringify(res.data.data));
-        })
-        .then((res) => {
           this.userMessage = res.data.data
-        });
+        })
     },
     TurnToEditPage() {
       // 跳转至编辑页面
diff --git a/vueblog/src/views/PersonalMessageEdit.vue b/vueblog/src/views/PersonalMessageEdit.vue
index 3c1366dd..7b815475 100644
--- a/vueblog/src/views/PersonalMessageEdit.vue
+++ b/vueblog/src/views/PersonalMessageEdit.vue
@@ -42,12 +42,18 @@
                         </div>
                     </div>
                     
-                    <div ref="tabs1" class="contentright">
-                        <TabsContent v-if="leftNavigation[0].chose"></TabsContent>
+                    <div ref="tabs1" v-show="leftNavigation[0].chose" class="contentright">
+                        <TabsContent></TabsContent>
                         <!-- && content1Seens -->
                     </div>
-                    <div ref="tabs2" class="contentright">
-                        <TabsContent2 v-if="leftNavigation[1].chose"></TabsContent2>
+                    <div ref="tabs2" v-show="leftNavigation[1].chose" class="contentright">
+                        <TabsContent2></TabsContent2>
+                    </div>
+                    <div ref="tabs5" v-show="leftNavigation[4].chose" class="contentright">
+                        <TabsContent5></TabsContent5>
+                    </div>
+                    <div ref="tabs8" v-show="leftNavigation[7].chose" class="contentright">
+                        <TabsContent8></TabsContent8>
                     </div>
                 </div>
             </div>
@@ -62,19 +68,23 @@ import TopBarA from "@/components/content/topbar/TopBar";
 import ButtomView from "@/components/P_user/ButtomView/ButtomView.vue"
 import TabsContent from "@/components/P_user/PMELeftTabs/lefttabs.vue";
 import TabsContent2 from "@/components/P_user/PMELeftTabs/lefttabs2.vue"
+import TabsContent5 from "@/components/P_user/PMELeftTabs/lefttabs5.vue"
+import TabsContent8 from "@/components/P_user/PMELeftTabs/lefttabs8.vue"
 export default{
     components:{
         TopBarA,
         ButtomView,
         TabsContent,
-        TabsContent2
+        TabsContent2,
+        TabsContent5,
+        TabsContent8,
     },
     data(){
         return {
             leftNavigation:[{name:"个人资料",chose:true},{name:"账号设置",chose:false},
             {name:"隐私设置",chose:false},{name:"信息认证",chose:false}
             ,{name:"我的收藏",chose:false},{name:"浏览历史",chose:false},
-            {name:"内容管理",chose:false}],
+            {name:"内容管理",chose:false},{name:"我的点赞",chose:false}],
             userMessage:{
                 username:"默认参数P",
                 nickname:"默认参数P",   
@@ -115,14 +125,7 @@ export default{
                 this.leftNavigation[i].chose=false
             }
             this.leftNavigation[index].chose=true
-            // this.$refs.upload.submit();
-            if(index==0){
-                this.$refs.tabs1.style.display="block";
-                this.$refs.tabs2.style.display="none"
-            }else{
-                this.$refs.tabs2.style.display="block"
-                this.$refs.tabs1.style.display="none"
-            }
+            
             if(index==6){
                 this.$router.push('/ContentManagement')
             }
diff --git a/vueblog/src/views/blogDetail/BlogDetail.vue b/vueblog/src/views/blogDetail/BlogDetail.vue
index 7aaf31de..ab9d5de6 100644
--- a/vueblog/src/views/blogDetail/BlogDetail.vue
+++ b/vueblog/src/views/blogDetail/BlogDetail.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="blogDetail">
-    <TopBar />
+    <TopBar/>
     <div class="blog-main">
       <div class="main">
         <!-- 左边box -->
@@ -11,7 +11,7 @@
             <div class="profile-intro">
               <div class="avatar-box">
                 <a href="#">
-                  <img src="../../assets/img/home/default_avatar.jpg" alt="" />
+                  <img :src="profile.avatarUrl" alt=""/>
                 </a>
               </div>
               <div class="user-info">
@@ -81,9 +81,9 @@
           <!-- 侧边盒子2 搜索 -->
           <div class="box asideSearchArticle">
             <div class="search-box">
-              <input type="text" placeholder="搜博主文章" />
+              <input type="text" placeholder="搜博主文章"/>
               <a href="#">
-                <img src="../../assets/img/blogDetail/search.png" alt="" />
+                <img src="../../assets/img/blogDetail/search.png" alt=""/>
               </a>
             </div>
           </div>
@@ -94,7 +94,7 @@
               <ul>
                 <li v-for="(item, index) in 5" :key="index">
                   WPF使用MaterialDesign -- 好看的控件先从button开始
-                  <img src="../../assets/img/blogDetail/view.png" alt="" />
+                  <img src="../../assets/img/blogDetail/view.png" alt=""/>
                   <span>124</span>
                 </li>
               </ul>
@@ -107,7 +107,7 @@
               <ul>
                 <li v-for="(item, index) in 5" :key="index">
                   WPF使用MaterialDesign -- 好看的控件先从button开始
-                  <img src="../../assets/img/blogDetail/view.png" alt="" />
+                  <img src="../../assets/img/blogDetail/view.png" alt=""/>
                   <span>124</span>
                 </li>
               </ul>
@@ -119,6 +119,7 @@
           <el-card class="box-card">
             <div class="text item" v-cloak>
               <h1>{{ blogDetail.title }}</h1>
+              <!--文章信息开始-->
               <div class="article-info">
                 <img
                   class="article-type-img"
@@ -140,19 +141,74 @@
                   alt=""
                 />
                 <div class="info-box">浏览量：{{ blogDetail.viewNum }}</div>
-                <img
-                  class="icon"
-                  src="../../assets/img/blogDetail/collection.png"
-                  alt=""
-                />
-                <div class="info-box">
-                  收藏&nbsp;{{ blogDetail.collectionNum }}
+                <!-- 收藏 -->
+                <div class="collection" @click="addCollectionNum()">
+                  <img
+                    class="icon"
+                    :src="
+                      isCollect
+                        ? require('../../assets/img/blogDetail/collection_active.png')
+                        : require('../../assets/img/blogDetail/collection.png')
+                    "
+                    alt=""
+                  />
+                  <div class="info-box">
+                    收藏&nbsp;{{ blogDetail.collectionNum }}
+                  </div>
                 </div>
               </div>
+              <!--文章信息结束-->
               <el-divider></el-divider>
               <div class="markdown-body" v-html="blogDetail.content"></div>
             </div>
           </el-card>
+          <!-- 底部文章信息 -->
+
+          <!-- <div id="testNavBar" :class="isfixTab == false ? 'fixed1' : 'fixed2'">
+            <div>1234</div>
+          </div> -->
+          <div class="right-toolbox">
+            <div class="toolbox-left">
+              <div class="profile-box">
+                <img class="profile-img" :src="profile.avatarUrl" alt=""/>
+                <span class="profile-name">{{ profile.author }}</span>
+              </div>
+              <div class="profile-attend">
+                <a href="javascript:;">关注</a>
+              </div>
+            </div>
+            <div class="toolbox-middle">
+              <div class="item-box like" @click="addLikeNum()">
+                <img
+                  :src="
+                    isLike
+                      ? require('../../assets/img/blogDetail/good_active.png')
+                      : require('../../assets/img/blogDetail/good.png')
+                  "
+                  alt=""
+                />
+                <span>{{ blogDetail.likeNum }}</span>
+              </div>
+              <div class="item-box comment">
+                <img src="../../assets/img/blogDetail/comment.png" alt=""/>
+                <span>{{ blogDetail.commentNum }}</span>
+              </div>
+              <div class="item-box collection" @click="addCollectionNum()">
+                <img
+                  :src="
+                    isCollect
+                      ? require('../../assets/img/blogDetail/collection2_active.png')
+                      : require('../../assets/img/blogDetail/collection2.png')
+                  "
+                  alt=""
+                />
+                <span>{{ blogDetail.collectionNum }}</span>
+              </div>
+            </div>
+          </div>
+          <!-- 评论 -->
+          <BlogComment :facomment="comment" @func = "getComment" @recordsChange="recordsChange"/>
+
         </div>
       </div>
     </div>
@@ -160,317 +216,591 @@
 </template>
 
 <script>
-import TopBar from "@/components/content/topbar/TopBar";
-import "github-markdown-css/github-markdown.css";
-export default {
-  name: "BlogDetail",
-  components: {
-    TopBar,
-  },
-  data() {
-    return {
-      blogDetail: {
-        id: 1,
-        title: "",
-        content: "",
-        releaseTime: "",
-        viewNum: "",
-        collectionNum: "",
+  import TopBar from "@/components/content/topbar/TopBar";
+  import BlogComment from "@/views/blogDetail/childComps/BlogComment";
+  import "github-markdown-css/github-markdown.css";
+  import qs from "qs";
+
+  export default {
+    name: "BlogDetail",
+    components: {
+      TopBar,
+      BlogComment
+    },
+    data() {
+      return {
+        isfixTab: true,
+        // 点赞收藏id
+        blogIdForm: {
+          blogId: "",
+        },
+        isLike: false,
+        isCollect: false,
+        blogDetail: {
+          id: 1,
+          title: "",
+          content: "",
+          releaseTime: "",
+          viewNum: "",
+          likeNum: '',
+          collectionNum: "",
+          commentNum: "",
+        },
+        profile: {
+          author: "",
+          avatarUrl: "",
+        },
+        // 评论
+        comment: {},
+      };
+    },
+    created() {
+      // 显示文章详情
+      const blogId = this.$route.params.blogId;
+      this.blogIdForm.blogId = this.$route.params.blogId;
+      const _this = this;
+      this.$axios.get("/blog/blog?id=" + blogId).then((res) => {
+        console.log(res);
+        const blog = res.data.data;
+
+        // 渲染md文档
+        var MarkdownIt = require("markdown-it");
+        var md = new MarkdownIt();
+        var result = md.render(blog.content.content);
+
+        _this.blogDetail = {
+          id: blog.content.blogId,
+          title: blog.info.title,
+          content: result,
+          releaseTime: blog.info.releaseTime,
+          viewNum: blog.info.viewNum,
+          likeNum: blog.info.likeNum,
+          collectionNum: blog.info.collectionNum,
+          commentNum: blog.info.commentNum,
+        };
+        _this.profile = {
+          author: blog.info.author,
+          avatarUrl: blog.author.avatarUrl,
+        };
+        _this.comment = blog.comment
+        console.log(_this.comment)
+      })
+    },
+
+    // 滚动开始
+    // 监听页面滚动
+    // mounted () {
+    //   window.addEventListener('scroll', this.handleTabFix, true)
+    // },
+    // //离开当前组件前一定要清除滚动监听，否则进入其他路由会报错
+    // beforeRouteLeave (to, from, next) {
+    //   window.removeEventListener('scroll', this.handleTabFix, true)
+    //   next()
+    // },
+    // 滚动结束
+
+    methods: {
+      recordsChange(records) {
+        this.comment = records
+      },
+      // 获取评论
+      getComment(){
+        console.log("获取评论")
+        const blogId = this.$route.params.blogId;
+        const _this = this;
+        this.$axios.get("/blog/blog?id=" + blogId).then((res) => {
+          console.log(res);
+          const blog = res.data.data;
+          _this.comment = blog.comment
+          console.log(_this.comment)
+        })
       },
-      profile: {
-        author: "",
+      // 点赞
+      addLikeNum() {
+        this.$axios
+          .post("/action/blog/like", qs.stringify(this.blogIdForm), {
+            headers: {token: localStorage.getItem("token")},
+          })
+          .then((res) => {
+            console.log(res);
+            if (res.data.data.status) {
+              this.blogDetail.likeNum++;
+              this.isLike = true;
+            } else {
+              this.blogDetail.likeNum--;
+              this.isLike = false;
+            }
+          });
+      },
+      // 收藏
+      addCollectionNum() {
+        this.$axios
+          .post("/action/blog/collect", qs.stringify(this.blogIdForm), {
+            headers: {token: localStorage.getItem("token")},
+          })
+          .then((res) => {
+            console.log(res);
+            // this.isCollect = res.data.data.status
+            if (res.data.data.status) {
+              this.blogDetail.collectionNum++;
+              this.isCollect = true;
+            } else {
+              this.blogDetail.collectionNum--;
+              this.isCollect = false;
+            }
+          });
+      },
+
+      // 滚动
+      // 先分别获得id为testNavBar的元素距离顶部的距离和页面滚动的距离
+      // 比较他们的大小来确定是否添加fixedNavbar样式
+      handleTabFix() {
+        var scrollTop =
+          window.pageYOffset ||
+          document.documentElement.scrollTop ||
+          document.body.scrollTop;
+        // var offsetTop = document.querySelector('#testNavBar').offsetTop
+        var offsetTop = document.getElementById("testNavBar").offsetTop;
+        console.log(scrollTop);
+        console.log("--------------");
+        console.log(offsetTop);
+        console.log("===============");
+        if (scrollTop > 11590) {
+          this.isfixTab = true;
+        } else {
+          this.isfixTab = false;
+        }
+        // scrollTop > offsetTop ? this.isfixTab = true : this.isfixTab = false
       },
-    };
-  },
-  created() {
-    const blogId = this.$route.params.blogId;
-    const _this = this;
-    this.$axios.get("/blog/blog?id=" + blogId).then((res) => {
-      console.log(res);
-      const blog = res.data.data;
-      _this.blogDetail.id = blog.content.blogId;
-      _this.blogDetail.title = blog.info.title;
-
-      // 渲染md文档
-      var MarkdownIt = require("markdown-it");
-      var md = new MarkdownIt();
-      var result = md.render(blog.content.content);
-      _this.blogDetail.content = result;
-
-      _this.blogDetail.releaseTime = blog.info.releaseTime;
-      _this.blogDetail.viewNum = blog.info.viewNum;
-      _this.blogDetail.collectionNum = blog.info.collectionNum;
-      _this.profile.author = blog.info.author;
-    });
-  },
-  methods: {},
-};
+      // 滚动结束
+    },
+  };
 </script>
 
 <style scoped>
-[v-cloak] {
-  display: none;
-}
-
-.text {
-  font-size: 14px;
-}
-
-.item {
-  padding-bottom: 18px;
-}
-
-/*标题*/
-.item h1 {
-  font-size: 28px;
-  color: #222226;
-  font-weight: 600;
-  word-break: break-all;
-  margin-bottom: 8px;
-  margin-top: 0px;
-}
-
-.blog-main {
-  width: 100%;
-  min-height: 100vh;
-  background: url("../../assets/img/blogDetail/bgc.png");
-  background-size: 16px 16px;
-  padding-top: 10px;
-}
-
-/*main*/
-.main {
-  width: 1380px;
-  display: flex;
-  margin: auto;
-  flex-direction: row;
-  justify-content: space-between;
-  /*background-color: palevioletred;*/
-}
-
-/*博客详情开始*/
-.main-rt {
-  width: 1070px;
-}
-.article-info {
-  display: flex;
-  align-items: center;
-  position: relative;
-  background: #f8f8f8;
-  border-radius: 4px;
-  line-height: 32px;
-}
-.article-info .info-box {
-  margin-right: 12px;
-}
-.article-info .article-type-img {
-  width: 36px;
-  height: 32px;
-  line-height: 32px;
-  margin-right: 12px;
-}
-.article-info .icon {
-  width: 16px;
-  height: 16px;
-  line-height: 32px;
-}
-/*博客详情结束*/
-
-/* 左边开始 */
-.main-lt {
-  width: 300px;
-  /* background-color: plum; */
-}
-.main-lt .box {
-  /* height: 300px; */
-  background-color: #ffffff;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-  margin-bottom: 10px;
-}
-/* 个人box1开始 */
-/* 个人介绍 */
-.profile-intro {
-  padding: 16px 16px 6px 16px;
-  display: flex;
-}
-.profile-intro .avatar-box {
-  position: relative;
-  width: 48px;
-  height: 48px;
-}
-.profile-intro .avatar-box img {
-  display: block;
-  width: 48px;
-  height: 48px;
-  border-radius: 50%;
-}
-.profile-intro .user-info {
-  margin-left: 8px;
-  width: 156px;
-  position: relative;
-  padding-top: 4px;
-  display: flex;
-  flex-direction: column;
-}
-.profile-intro .user-info .name {
-  width: 100%;
-  font-size: 14px;
-  font-weight: 500;
-  height: 20px;
-  line-height: 20px;
-  display: block;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.profile-intro .user-info .user-info-bottom {
-  display: flex;
-}
-.profile-intro .user-info .user-info-bottom .year {
-  min-width: 62px;
-}
-.profile-intro .user-info .user-info-bottom span {
-  color: #999aaa;
-  font-size: 13px;
-  line-height: 20px;
-  height: 20px;
-  overflow: hidden;
-}
-/* 数据信息 */
-.data-info {
-  display: flex;
-  padding: 9px 10px;
-}
-.data-info dl {
-  width: 100%;
-  text-align: center;
-}
-.data-info dl dt {
-  color: #4a4d52;
-  font-size: 14px;
-  font-weight: 500;
-  line-height: 22px;
-}
-.data-info dl dd {
-  color: #222226;
-  font-size: 14px;
-  line-height: 22px;
-  padding: 3px 0;
-}
-/* 分割线 */
-.item-rank {
-  height: 1px;
-  background-color: #f5f6f7;
-  width: 268px;
-  margin: auto;
-}
-/* 关注 */
-.focus-btn {
-  padding: 8px 16px 20px 16px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-.focus-btn .btn {
-  font-size: 14px;
-  width: 126px;
-  height: 28px;
-  border-radius: 14px;
-  text-align: center;
-  color: #555666;
-  line-height: 26px;
-  border: 1px solid #ccccd8;
-  cursor: pointer;
-}
-.focus-btn .btn:hover {
-  border: 1px solid #222226;
-}
-/* 个人box1结束 */
-
-/* 搜索box2开始 */
-.asideSearchArticle {
-  padding: 0 16px;
-  overflow: hidden;
-}
-.asideSearchArticle .search-box {
-  height: 32px;
-  border-radius: 5px;
-  background: #f0f0f5;
-  margin: 8px 0;
-  position: relative;
-}
-.asideSearchArticle .search-box input {
-  font-size: 14px;
-  color: #555666;
-  display: block;
-  float: left;
-  width: 226px;
-  height: 32px;
-  padding-left: 16px;
-  border: 0;
-  border-radius: 5px;
-  background: 0 0;
-  outline: none;
-}
-.asideSearchArticle .search-box a {
-  background-color: #e8e8ee;
-  color: #ccc;
-  font-size: 14px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  text-align: center;
-  width: 32px;
-  height: 32px;
-  float: right;
-  line-height: 32px;
-  transition: background-color 0.5s;
-  border-radius: 0 5px 5px 0;
-}
-.asideSearchArticle .search-box a img {
-  width: 20px;
-  height: 20px;
-}
-/* 搜索box2结束 */
-
-/* 热门文章开始 */
-.asideHotArticle .aside-title {
-  position: relative;
-  padding: 16px 16px 0;
-  font-size: 14px;
-  color: #333;
-  font-weight: bold;
-}
-.asideHotArticle .aside-content {
-  padding: 12px 16px 16px 16px;
-  overflow: hidden;
-}
-.asideHotArticle .aside-content ul {
-  list-style: none;
-}
-.asideHotArticle .aside-content ul li {
-  cursor: pointer;
-  display: block;
-  color: #555666;
-  margin-top: 8px;
-}
-.asideHotArticle .aside-content ul li:hover {
-  color: #fc5531;
-}
-.asideHotArticle .aside-content ul li img {
-  width: 18px;
-  height: 18px;
-  vertical-align: -3px;
-  margin-right: 3px;
-  margin-left: 4px;
-}
-.asideHotArticle .aside-content ul li span {
-  font-size: 12px;
-  color: #999aaa;
-  line-height: 24px;
-}
-
-/* 热门文章结束 */
-
-/* 左边结束 */
+  [v-cloak] {
+    display: none;
+  }
+
+  /*文章点赞收藏底部开始*/
+  .fixed1 {
+    width: 1070px;
+    height: 48px;
+    background-color: pink;
+    /*position: relative;*/
+    position: fixed;
+    /*bottom: 0;*/
+    top: 735px;
+    z-index: 10;
+  }
+
+  .fixed2 {
+    width: 1070px;
+    height: 48px;
+    background-color: green;
+  }
+
+  .fixedNavbar {
+    width: 1070px;
+    height: 48px;
+    background-color: pink;
+    /*position: relative;*/
+    position: fixed;
+    /*bottom: 0;*/
+    top: 735px;
+    z-index: 10;
+  }
+
+  .right-toolbox {
+    display: flex;
+    flex-wrap: nowrap;
+    justify-content: space-between;
+    align-items: center;
+    padding: 17px 24px;
+    height: 64px;
+    box-sizing: border-box;
+    background: #fff;
+    box-shadow: 0 -1px 8px 0 rgba(0, 0, 0, 0.06);
+    border-bottom-left-radius: 2px;
+    border-bottom-right-radius: 2px;
+  }
+
+  .toolbox-left {
+    display: flex;
+    align-items: center;
+  }
+
+  .profile-box {
+    display: flex;
+    flex-wrap: nowrap;
+    align-items: center;
+  }
+
+  .profile-box .profile-img {
+    width: 32px;
+    height: 32px;
+    border-radius: 32px;
+    border: 1px solid #f5f6f7;
+    margin-right: 8px;
+  }
+
+  .profile-box .profile-name {
+    height: 24px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    font-size: 16px;
+    font-weight: 600;
+    color: #222226;
+    line-height: 24px;
+    margin-right: 8px;
+  }
+
+  .profile-attend {
+    position: relative;
+  }
+
+  .profile-attend a {
+    display: block;
+    min-width: 60px;
+    height: 28px;
+    background: #fff;
+    border-radius: 16px;
+    font-size: 14px;
+    line-height: 28px;
+    text-align: center;
+    border: 1px solid #ccccd8;
+    color: #555666;
+  }
+
+  .profile-attend a:hover {
+    border: 1px solid #555666;
+  }
+
+  .toolbox-middle {
+    display: flex;
+  }
+
+  .toolbox-middle .item-box {
+    display: flex;
+    align-items: center;
+    margin-right: 20px;
+  }
+
+  .toolbox-middle .item-box img {
+    width: 24px;
+    height: 24px;
+    margin-right: 4px;
+  }
+
+  .toolbox-middle .item-box span {
+    color: #999aaa;
+    font-size: 14px;
+  }
+
+  /*文章点赞收藏底部结束*/
+
+
+  .text {
+    font-size: 14px;
+  }
+
+  .item {
+    padding-bottom: 18px;
+  }
+
+  /*标题*/
+  .item h1 {
+    font-size: 28px;
+    color: #222226;
+    font-weight: 600;
+    word-break: break-all;
+    margin-bottom: 8px;
+    margin-top: 0px;
+  }
+
+  .blog-main {
+    min-width: 1380px;
+    min-height: 100vh;
+    background: url("../../assets/img/blogDetail/bgc.png");
+    background-size: 16px 16px;
+    padding-top: 10px;
+  }
+
+  /*main*/
+  .main {
+    width: 1380px;
+    display: flex;
+    margin: auto;
+    flex-direction: row;
+    justify-content: space-between;
+    /*background-color: palevioletred;*/
+  }
+
+  /*博客详情开始*/
+  .main-rt {
+    width: 1070px;
+    position: relative;
+  }
+
+  .article-info {
+    display: flex;
+    align-items: center;
+    position: relative;
+    background: #f8f8f8;
+    border-radius: 4px;
+    line-height: 32px;
+  }
+
+  .article-info .info-box {
+    margin-right: 12px;
+  }
+
+  .article-info .article-type-img {
+    width: 36px;
+    height: 32px;
+    line-height: 32px;
+    margin-right: 12px;
+  }
+
+  .article-info .icon {
+    width: 16px;
+    height: 16px;
+    line-height: 32px;
+  }
+
+  .article-info .collection {
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+  }
+
+  /*博客详情结束*/
+
+  /* 左边开始 */
+  .main-lt {
+    width: 300px;
+    /* background-color: plum; */
+  }
+
+  .main-lt .box {
+    /* height: 300px; */
+    background-color: #ffffff;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    margin-bottom: 10px;
+  }
+
+  /* 个人box1开始 */
+  /* 个人介绍 */
+  .profile-intro {
+    padding: 16px 16px 6px 16px;
+    display: flex;
+  }
+
+  .profile-intro .avatar-box {
+    position: relative;
+    width: 48px;
+    height: 48px;
+  }
+
+  .profile-intro .avatar-box img {
+    display: block;
+    width: 48px;
+    height: 48px;
+    border-radius: 50%;
+  }
+
+  .profile-intro .user-info {
+    margin-left: 8px;
+    width: 156px;
+    position: relative;
+    padding-top: 4px;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .profile-intro .user-info .name {
+    width: 100%;
+    font-size: 14px;
+    font-weight: 500;
+    height: 20px;
+    line-height: 20px;
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .profile-intro .user-info .user-info-bottom {
+    display: flex;
+  }
+
+  .profile-intro .user-info .user-info-bottom .year {
+    min-width: 62px;
+  }
+
+  .profile-intro .user-info .user-info-bottom span {
+    color: #999aaa;
+    font-size: 13px;
+    line-height: 20px;
+    height: 20px;
+    overflow: hidden;
+  }
+
+  /* 数据信息 */
+  .data-info {
+    display: flex;
+    padding: 9px 10px;
+  }
+
+  .data-info dl {
+    width: 100%;
+    text-align: center;
+  }
+
+  .data-info dl dt {
+    color: #4a4d52;
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 22px;
+  }
+
+  .data-info dl dd {
+    color: #222226;
+    font-size: 14px;
+    line-height: 22px;
+    padding: 3px 0;
+  }
+
+  /* 分割线 */
+  .item-rank {
+    height: 1px;
+    background-color: #f5f6f7;
+    width: 268px;
+    margin: auto;
+  }
+
+  /* 关注 */
+  .focus-btn {
+    padding: 8px 16px 20px 16px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  .focus-btn .btn {
+    font-size: 14px;
+    width: 126px;
+    height: 28px;
+    border-radius: 14px;
+    text-align: center;
+    color: #555666;
+    line-height: 26px;
+    border: 1px solid #ccccd8;
+    cursor: pointer;
+  }
+
+  .focus-btn .btn:hover {
+    border: 1px solid #222226;
+  }
+
+  /* 个人box1结束 */
+
+  /* 搜索box2开始 */
+  .asideSearchArticle {
+    padding: 0 16px;
+    overflow: hidden;
+  }
+
+  .asideSearchArticle .search-box {
+    height: 32px;
+    border-radius: 5px;
+    background: #f0f0f5;
+    margin: 8px 0;
+    position: relative;
+  }
+
+  .asideSearchArticle .search-box input {
+    font-size: 14px;
+    color: #555666;
+    display: block;
+    float: left;
+    width: 226px;
+    height: 32px;
+    padding-left: 16px;
+    border: 0;
+    border-radius: 5px;
+    background: 0 0;
+    outline: none;
+  }
+
+  .asideSearchArticle .search-box a {
+    background-color: #e8e8ee;
+    color: #ccc;
+    font-size: 14px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+    width: 32px;
+    height: 32px;
+    float: right;
+    line-height: 32px;
+    transition: background-color 0.5s;
+    border-radius: 0 5px 5px 0;
+  }
+
+  .asideSearchArticle .search-box a img {
+    width: 20px;
+    height: 20px;
+  }
+
+  /* 搜索box2结束 */
+
+  /* 热门文章开始 */
+  .asideHotArticle .aside-title {
+    position: relative;
+    padding: 16px 16px 0;
+    font-size: 14px;
+    color: #333;
+    font-weight: bold;
+  }
+
+  .asideHotArticle .aside-content {
+    padding: 12px 16px 16px 16px;
+    overflow: hidden;
+  }
+
+  .asideHotArticle .aside-content ul {
+    list-style: none;
+  }
+
+  .asideHotArticle .aside-content ul li {
+    cursor: pointer;
+    display: block;
+    color: #555666;
+    margin-top: 8px;
+  }
+
+  .asideHotArticle .aside-content ul li:hover {
+    color: #fc5531;
+  }
+
+  .asideHotArticle .aside-content ul li img {
+    width: 18px;
+    height: 18px;
+    vertical-align: -3px;
+    margin-right: 3px;
+    margin-left: 4px;
+  }
+
+  .asideHotArticle .aside-content ul li span {
+    font-size: 12px;
+    color: #999aaa;
+    line-height: 24px;
+  }
+
+  /* 热门文章结束 */
+
+  /* 左边结束 */
 </style>
diff --git a/vueblog/src/views/blogDetail/childComps/BlogComment.vue b/vueblog/src/views/blogDetail/childComps/BlogComment.vue
new file mode 100644
index 00000000..049895e8
--- /dev/null
+++ b/vueblog/src/views/blogDetail/childComps/BlogComment.vue
@@ -0,0 +1,531 @@
+<template>
+  <div>
+    <div class="comment-container">
+      <div class="comment-title">
+        评论 <span>{{ facomment.allCount }}</span>
+      </div>
+      <div class="comment-edit-box">
+        <div class="user-img">
+          <img :src="avatarUrl" alt="" />
+        </div>
+        <div class="comment-form">
+          <input
+            class="comment-content"
+            name="comment_content"
+            id="comment_content"
+            type="text"
+            v-model="comment.content"
+            placeholder="请发表有价值的评论，博客评论不欢迎灌水，良好的社区氛围需大家一起维护。"
+          />
+          <div class="comment-operate-box" @click="firstComment()">评论</div>
+        </div>
+      </div>
+      <div class="comment-list-container">
+        <div class="comment-list-box">
+          <ul
+            class="comment-list"
+            v-for="(item, index) in facomment.records"
+            :key="index"
+          >
+            <!-- 父评论 -->
+            <li class="comment-line-box">
+              <div class="comment-list-item">
+                <img :src="item.info.avatarUrl" alt="" class="avatar" />
+                <div class="right-box">
+                  <div class="new-info-box">
+                    <div class="comment-top">
+                      <div class="user-box">
+                        <span class="name">{{ item.info.nickname }}</span>
+                        <span class="date">{{ item.info.createTime }}</span>
+                      </div>
+                      <div class="comment-btn">
+                        <div
+                          class="delete"
+                          @click="deleteComment(item.info.id)"
+                        >
+                          删除
+                        </div>
+                        <div @click="showFirstEditBox(item.info.id)">
+                          <img
+                            src="../../../assets/img/blogDetail/blogComment/commentReply.png"
+                            alt=""
+                          />
+                          <span class="btn-reply">回复</span>
+                        </div>
+                      </div>
+                      <div class="comment-like">
+                        <img
+                          src="../../../assets/img/blogDetail/blogComment/commentLike.png"
+                          alt=""
+                        />
+                        <span class="like-num">1</span>
+                      </div>
+                    </div>
+                    <div class="comment-center">
+                      <div class="new-comment">{{ item.info.content }}</div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <!-- 评论input开始 -->
+              <div class="first-edit-box" v-if="item.info.id == firstId">
+                <div class="comment-edit-box">
+                  <div class="user-img">
+                    <img :src="avatarUrl" alt="" />
+                  </div>
+                  <div class="comment-form">
+                    <input
+                      class="comment-content"
+                      name="comment_content"
+                      type="text"
+                      placeholder="输入评论..."
+                      v-model="childComment.content"
+                    />
+                    <div
+                      class="comment-operate-box"
+                      @click="secondComment(item.info.id)"
+                    >
+                      评论
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <!-- 评论input结束 -->
+            </li>
+            <!-- 子评论 -->
+            <li
+              class="replay-box"
+              v-for="(child, index) in item.sub"
+              :key="index"
+            >
+              <ul class="comment-list">
+                <li class="comment-line-box">
+                  <div class="comment-list-item">
+                    <img :src="child.avatarUrl" alt="" class="avatar" />
+                    <div class="right-box">
+                      <div class="new-info-box">
+                        <div class="comment-top">
+                          <div class="user-box">
+                            <span class="name">{{ child.nickname }}</span>
+                            <span class="text">回复</span>
+                            <span class="nick-name">{{
+                              child.parentNickname
+                            }}</span>
+                            <span class="date">{{ child.createTime }}</span>
+                          </div>
+                          <div class="comment-btn">
+                            <div
+                              class="delete"
+                              @click="deleteComment(child.id)"
+                            >
+                              删除
+                            </div>
+                            <div @click="showSecondEditBox(child.id)">
+                              <img
+                                src="../../../assets/img/blogDetail/blogComment/commentReply.png"
+                                alt=""
+                              />
+                              <span class="btn-reply">回复</span>
+                            </div>
+                          </div>
+                          <div class="comment-like">
+                            <img
+                              src="../../../assets/img/blogDetail/blogComment/commentLike.png"
+                              alt=""
+                            />
+                            <span class="like-num">1</span>
+                          </div>
+                        </div>
+                        <div class="comment-center">
+                          <div class="new-comment">{{ child.content }}</div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <!-- 评论input开始 -->
+                  <div class="first-edit-box" v-if="child.id == secondId">
+                    <div class="comment-edit-box">
+                      <div class="user-img">
+                        <img :src="avatarUrl" alt="" />
+                      </div>
+                      <div class="comment-form">
+                        <input
+                          class="comment-content"
+                          name="comment_content"
+                          type="text"
+                          placeholder="输入评论..."
+                          v-model="childComment2.content"
+                        />
+                        <div
+                          class="comment-operate-box"
+                          @click="thirdComment(child.id)"
+                        >
+                          评论
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <!-- 评论input结束 -->
+                </li>
+              </ul>
+            </li>
+          </ul>
+        </div>
+        <!-- 分页开始 -->
+        <div class="pagination-box" v-if="facomment.records != null">
+          <el-pagination
+            background
+            layout="prev, pager, next"
+            :current-page="facomment.current"
+            :page-size="facomment.size"
+            :total="facomment.total"
+            @current-change="page1"
+          >
+          </el-pagination>
+        </div>
+        <!-- 分页结束 -->
+      </div>
+    </div>
+<!--    <div>123</div>-->
+  </div>
+</template>
+
+<script>
+import qs from "qs";
+
+export default {
+  name: "",
+  props: ["facomment"],
+  data() {
+    return {
+      // 头像
+      avatarUrl: "",
+      // 父评论
+      comment: {
+        blogId: this.$route.params.blogId,
+        content: "",
+        parentId: "",
+      },
+      // 子评论
+      childComment: {
+        blogId: this.$route.params.blogId,
+        content: "",
+        parentId: "",
+      },
+      childComment2: {
+        blogId: this.$route.params.blogId,
+        content: "",
+        parentId: "",
+      },
+      firstId: null,
+      secondId: null,
+      // 分页
+      blogId: this.$route.params.blogId,
+      page: "2",
+      pageSize: "3",
+    };
+  },
+  created() {
+    this.avatarUrl = window.localStorage.avatarUrl;
+  },
+  methods: {
+    showFirstEditBox(id) {
+      this.firstId = id;
+    },
+    showSecondEditBox(id) {
+      this.secondId = id;
+    },
+    // 发布一级评论
+    firstComment() {
+      this.$axios
+        .post("/comment", this.comment, {
+          headers: { token: localStorage.getItem("token") },
+        })
+        .then((res) => {
+          console.log(res);
+          this.comment.content = "";
+          // 更新评论列表
+          this.$emit("func");
+        });
+    },
+    // 发布二级评论
+    secondComment(parentId) {
+      this.childComment.parentId = parentId;
+      this.$axios
+        .post("/comment", this.childComment, {
+          headers: { token: localStorage.getItem("token") },
+        })
+        .then((res) => {
+          console.log(res);
+          this.childComment.content = "";
+          // 更新评论列表
+          this.$emit("func");
+        });
+    },
+    // 发布三级评论
+    thirdComment(parentId) {
+      this.childComment2.parentId = parentId;
+      this.$axios
+        .post("/comment", this.childComment2, {
+          headers: { token: localStorage.getItem("token") },
+        })
+        .then((res) => {
+          console.log(res);
+          this.childComment2.content = "";
+          // 更新评论列表
+          this.$emit("func");
+        });
+    },
+    // 删除评论
+    deleteComment(id) {
+      this.$axios
+        .delete("/comment", {
+          params: { id: id },
+          headers: { token: localStorage.getItem("token") },
+        })
+        .then((res) => {
+          console.log("删除", res);
+          this.$emit("func");
+        });
+    },
+    // 分页
+    page1(page) {
+      this.$axios
+        .get("/comment/list", {
+          params: {
+            blogId: this.blogId,
+            page: page,
+            pageSize: this.pageSize,
+          },
+        })
+        .then((res) => {
+          this.$emit("recordsChange", res.data.data);
+        });
+    },
+  },
+};
+</script>
+
+<style scoped>
+/*评论盒子开始*/
+.comment-container {
+  width: 1070px;
+  /*height: 100px;*/
+  /*background-color: skyblue;*/
+  margin-top: 10px;
+  margin-bottom: 10px;
+  padding: 16px 24px 24px 24px;
+  border-radius: 2px;
+  background: #fff;
+}
+
+/*评论标题开始*/
+.comment-title {
+  font-size: 18px;
+  font-weight: 600;
+  color: #222226;
+  line-height: 32px;
+  margin-bottom: 8px;
+}
+
+/*评论标题结束*/
+
+/* 回复一级评论开始 */
+.first-edit-box {
+  padding-left: 40px;
+  padding-bottom: 14px;
+}
+/* 回复一级评论结束 */
+
+/*写评论开始*/
+.comment-edit-box {
+  display: flex;
+  align-items: center;
+}
+
+.comment-edit-box .user-img {
+  margin-right: 8px;
+  /*padding-top: 9px;*/
+}
+
+.comment-edit-box .user-img img {
+  display: block;
+  width: 30px;
+  height: 30px;
+  border-radius: 50%;
+  border: 1px solid #e8e8ed;
+}
+
+.comment-form {
+  width: 100%;
+  position: relative;
+  background: rgba(245, 246, 247, 0.8);
+  border-radius: 8px;
+  padding: 8px 0;
+  display: flex;
+}
+.comment-form .comment-content {
+  width: 100%;
+  border: none;
+  outline: none;
+  padding: 4px 12px;
+  height: 30px;
+  font-size: 14px;
+  line-height: 22px;
+  /* -webkit-box-sizing: border-box; */
+  box-sizing: border-box;
+  background: rgba(245, 246, 247, 0.8);
+}
+.comment-form .comment-operate-box {
+  width: 72px;
+  height: 30px;
+  margin: 0 10px;
+  background: #e1e2e6;
+  color: #222226;
+  border-radius: 16px;
+  font-size: 14px;
+  text-align: center;
+  line-height: 32px;
+  cursor: pointer;
+}
+.comment-form:focus-within .comment-operate-box {
+  color: #ffffff;
+  background: #fc5531;
+}
+
+/*写评论结束*/
+
+/* 评论显示开始 */
+.comment-list-container {
+  padding-top: 16px;
+}
+/* 父评论 */
+.comment-list-item {
+  display: flex;
+  width: 100%;
+  /* background-color: pink; */
+}
+.comment-list-item .avatar {
+  display: block;
+  width: 32px;
+  height: 32px;
+  border-radius: 50%;
+  border: 1px solid #e8e8ed;
+  margin-top: 15px;
+  /* padding-top: 15px; */
+}
+.comment-list-item .right-box {
+  border-top: 1px solid #e8e8ed;
+  padding-top: 14px;
+  padding-bottom: 14px;
+  width: 100%;
+  margin-left: 8px;
+}
+.right-box .comment-top {
+  display: flex;
+  margin-bottom: 4px;
+  line-height: 20px;
+  font-size: 14px;
+}
+.right-box .comment-top .user-box {
+  display: flex;
+  flex: 1;
+  align-items: center;
+}
+.right-box .comment-top .user-box .name {
+  display: inline-block;
+  max-width: 300px;
+  color: #777888;
+  margin-right: 10px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.right-box .comment-top .user-box .date {
+  font-size: 14px;
+  color: #777888;
+}
+.right-box .comment-top img {
+  width: 16px;
+  height: 16px;
+  vertical-align: middle;
+  margin-right: 2px;
+}
+.right-box .comment-top .comment-btn .btn-reply {
+  font-size: 14px;
+  color: #555666;
+  margin-right: 16px;
+}
+.right-box .comment-top .comment-like .like-num {
+  color: #999aaa;
+  vertical-align: middle;
+}
+.right-box .comment-top .comment-btn,
+.right-box .comment-top .comment-like {
+  cursor: pointer;
+}
+
+.right-box .comment-center {
+  font-size: 14px;
+  color: #222226;
+  line-height: 22px;
+  word-break: break-word;
+}
+
+.comment-list-item .comment-btn .delete {
+  color: #999aaa;
+  margin-right: 10px;
+}
+.comment-list-item .comment-btn {
+  display: none;
+}
+.comment-list-item:hover .comment-btn {
+  display: flex;
+}
+
+/* 子评论 */
+.replay-box {
+  padding-left: 32px;
+  /* background-color: aqua; */
+}
+.replay-box .avatar {
+  display: block;
+  width: 24px;
+  height: 24px;
+  border-radius: 50%;
+  margin-top: 0;
+}
+.replay-box .comment-list-item .right-box {
+  border-top: 0;
+  padding-top: 0;
+}
+.replay-box .right-box .comment-top .user-box .name {
+  margin-right: 0;
+}
+.replay-box .right-box .comment-top .user-box .text {
+  color: #999aaa;
+  margin: 0 6px;
+}
+.replay-box .right-box .comment-top .user-box .nick-name {
+  color: #777888;
+  margin-right: 10px;
+}
+/* 评论显示结束 */
+
+/* 分页开始 */
+.pagination-box {
+  text-align: center;
+}
+.comment-list-container
+  .pagination-box
+  .el-pagination
+  .is-background
+  .el-pager
+  li:not(.disabled).active {
+  background-color: #555666;
+}
+
+/* 分页结束 */
+
+/*评论盒子结束*/
+</style>
diff --git a/vueblog/src/views/blogEdit/BlogEdit.vue b/vueblog/src/views/blogEdit/BlogEdit.vue
index eb10eb59..753ccd91 100644
--- a/vueblog/src/views/blogEdit/BlogEdit.vue
+++ b/vueblog/src/views/blogEdit/BlogEdit.vue
@@ -30,6 +30,9 @@
       <!-- markdown编辑器  -->
       <mavon-editor
         v-model="ruleForm.content"
+        ref="md"
+        @imgAdd="imgAdd"
+        @imgDel="imgDel"
         style="height: calc(100vh - 56px)"
       ></mavon-editor>
 
@@ -74,6 +77,26 @@ export default {
     this.avatarUrl = window.localStorage.avatarUrl;
   },
   methods: {
+    // md文档开始
+    // 将图片上传到服务器，返回地址替换到md中
+    imgAdd(pos, $file) {
+      var _this = this
+      var formdata = new FormData();
+      formdata.append('file', $file);
+      this.$axios.post("https://local.sticki.cn/api/v1/blog-console/img",formdata,{
+        headers: { token: localStorage.getItem("token") },
+      }).then((response) => {
+        // 第二步.将返回的url替换到文本原位置![...](0) -> ![...](url)
+        if (response.status === 200) {
+          var url = response.data.data;
+          _this.$refs.md.$img2Url(pos,url)
+        }
+      })
+    },
+    imgDel(pos) {
+
+    },
+    // md文档结束
     dialogShowChange(val) {
       this.dialogShow = val;
     },
diff --git a/vueblog/src/views/blogEdit/childComps/BlogEditDialog.vue b/vueblog/src/views/blogEdit/childComps/BlogEditDialog.vue
index 4bec73a1..7e418917 100644
--- a/vueblog/src/views/blogEdit/childComps/BlogEditDialog.vue
+++ b/vueblog/src/views/blogEdit/childComps/BlogEditDialog.vue
@@ -42,44 +42,6 @@
           <el-input type="textarea" v-model="ruleForm.description"></el-input>
         </el-form-item>
 
-        <!-- 标签开始 -->
-        <!-- <el-form-item label="文章标签：" prop="desc">
-          <el-tag
-            :key="tag"
-            v-for="tag in dynamicTags"
-            closable
-            :disable-transitions="false"
-            @close="handleClose(tag)"
-            >{{ tag }}
-          </el-tag>
-          <el-input
-            class="input-new-tag"
-            v-if="inputVisible"
-            v-model="inputValue"
-            ref="saveTagInput"
-            size="small"
-            @keyup.enter.native="handleInputConfirm"
-            @blur="handleInputConfirm"
-          >
-          </el-input>
-          <el-button
-            v-else
-            class="button-new-tag"
-            size="small"
-            @click="showInput"
-            >+ 添加文章标签</el-button
-          >
-        </el-form-item> -->
-        <!-- 标签结束 -->
-        <!-- 文章类型开始 -->
-        <!-- <el-form-item label="文章类型：" prop="resource">
-          <el-radio-group v-model="ruleForm.resource">
-            <el-radio label="原创"></el-radio>
-            <el-radio label="转载"></el-radio>
-          </el-radio-group>
-        </el-form-item> -->
-        <!-- 文章类型结束 -->
-
         <el-form-item label="发布形式：" prop="status" style="margin-top: 10px;">
           <el-radio-group v-model="ruleForm.status">
             <el-radio :label="1">公开</el-radio>
diff --git a/vueblog/src/views/blogSearch/BlogSearch.vue b/vueblog/src/views/blogSearch/BlogSearch.vue
index 4f22ea49..e3362008 100644
--- a/vueblog/src/views/blogSearch/BlogSearch.vue
+++ b/vueblog/src/views/blogSearch/BlogSearch.vue
@@ -29,16 +29,10 @@
           <div class="box related-list">
             <h3>全站热搜榜</h3>
             <ul>
-              <li><span>1</span><a>计算机毕业设计</a></li>
-              <li><span>2</span><a>计算机毕业设计</a></li>
-              <li><span>3</span><a>计算机毕业设计</a></li>
-              <li><span>4</span><a>计算机毕业设计</a></li>
-              <li><span>5</span><a>计算机毕业设计</a></li>
-              <li><span>6</span><a>计算机毕业设计</a></li>
-              <li><span>7</span><a>计算机毕业设计</a></li>
-              <li><span>8</span><a>计算机毕业设计</a></li>
-              <li><span>9</span><a>计算机毕业设计</a></li>
-              <li><span>10</span><a>计算机毕业设计</a></li>
+              <li v-for="(item, index) in relatedList" :key="index" @click="relatedSearch(item)">
+                <span>{{ index + 1 }}</span>
+                <a>{{ item }}</a>
+              </li>
             </ul>
           </div>
           <div class="box">关于我们-{{ key }}</div>
@@ -64,6 +58,18 @@ export default {
     return {
       key: this.$store.state.searchKey,
       blogSearchList: [],
+      relatedList: [
+        "蓝桥杯历年真题",
+        "计算机毕业设计",
+        "微信小程序商城搭建",
+        "数据可视化工具",
+        "彻底搞懂背包问题",
+        "队列的基本操作",
+        "迷宫问题求解",
+        "前端练手项目合集",
+        "凯撒密码实现",
+        "数据库从入门到精通",
+      ],
     };
   },
   watch: {
@@ -80,11 +86,21 @@ export default {
       // 保存key
       this.$store.commit("copySearchKey", this.key);
       sessionStorage.setItem("store", JSON.stringify(this.$store.state));
+
       this.$axios.get("/blog/search?key=" + this.key).then((res) => {
         console.log("加载后再次点击搜索", res);
         this.blogSearchList = res.data.data;
       });
     },
+    // 点击热搜榜搜索博客
+    relatedSearch(key) {
+      this.key = key;
+      // 状态保持清除后刷新页面
+      window.location.reload();
+      // 保存key
+      this.$store.commit("copySearchKey", this.key);
+      sessionStorage.setItem("store", JSON.stringify(this.$store.state));
+    }
   },
 };
 </script>
@@ -93,8 +109,7 @@ export default {
 .container {
   width: 100%;
   height: 100%;
-  /* min-height: 100vh; */
-  min-height: calc(100vh - 65px);
+  min-height: calc(100vh - 48px);
   background-color: #f2f2f2;
 }
 
diff --git a/vueblog/src/views/blogSearch/childComps/BlogSearchArticleItem.vue b/vueblog/src/views/blogSearch/childComps/BlogSearchArticleItem.vue
index 90710e1f..7c2e4927 100644
--- a/vueblog/src/views/blogSearch/childComps/BlogSearchArticleItem.vue
+++ b/vueblog/src/views/blogSearch/childComps/BlogSearchArticleItem.vue
@@ -112,11 +112,14 @@ export default {
     // },
     infiniteHandler($state) {
       this.$axios
-        .get("/blog/search",{params:{key:this.key,page:this.page}})
+        .get("/blog/search",{params:{key:this.key,page:this.page}},{
+          headers: { token: localStorage.getItem("token") },
+        })
         .then((res) => {
-          if(res.data.data.length) {
+          console.log(res)
+          if(res.data.data.records.length) {
             this.page +=1;  // 下一页
-            this.blogSearchList = this.blogSearchList.concat(res.data.data);
+            this.blogSearchList = this.blogSearchList.concat(res.data.data.records);
             console.log("下拉刷新",this.blogSearchList)
             // console.log(this.blogSearchList)
             $state.loaded();
diff --git a/vueblog/src/views/home/Home.vue b/vueblog/src/views/home/Home.vue
index 5910b79f..9f489ee1 100644
--- a/vueblog/src/views/home/Home.vue
+++ b/vueblog/src/views/home/Home.vue
@@ -235,7 +235,7 @@ export default {
 .nav-content ul {
   position: relative;
   background-color: #fff;
-  box-shadow: 0 4px 30px 0 rgb(232 232 237 / 50%);
+  box-shadow: 0 4px 5px 0 rgb(232 232 237 / 50%);
   z-index: 5;
 }
 .nav-content ul li {
diff --git a/vueblog/src/views/home/childComps/HomeArticleItem.vue b/vueblog/src/views/home/childComps/HomeArticleItem.vue
index d682f646..7ec0d466 100644
--- a/vueblog/src/views/home/childComps/HomeArticleItem.vue
+++ b/vueblog/src/views/home/childComps/HomeArticleItem.vue
@@ -1,36 +1,58 @@
 <template>
   <div>
-    <div class="article-main" v-for="(item,index) in blogList" :key="index">
+    <div class="article-main" v-for="(item, index) in blogList" :key="index">
       <div class="article-item">
         <div class="article-title">
           <a href="#">
             <span>
-              <router-link :to="{name:'BlogDetail',params:{blogId:item.id}}" target="_blank">
-                {{item.title}}
+              <router-link
+                :to="{ name: 'BlogDetail', params: { blogId: item.id } }"
+                target="_blank"
+              >
+                {{ item.title }}
               </router-link>
             </span>
           </a>
         </div>
         <div class="article-content-item">
           <div class="article-img-left">
-            <router-link :to="{name:'BlogDetail',params:{blogId:item.id}}" target="_blank">
-              <img :src="item.coverImage" alt="">
+            <router-link
+              :to="{ name: 'BlogDetail', params: { blogId: item.id } }"
+              target="_blank"
+            >
+              <img :src="item.coverImage" alt="" />
             </router-link>
           </div>
           <div class="article-content-right">
-            <router-link :to="{name:'BlogDetail',params:{blogId:item.id}}" target="_blank">
+            <router-link
+              :to="{ name: 'BlogDetail', params: { blogId: item.id } }"
+              target="_blank"
+            >
               <div class="article-content">
-                {{item.description}}
+                {{ item.description }}
               </div>
             </router-link>
             <div class="article-evaluation">
-              <div class="article-good" @click="addLikeNum(item.id,index)" >
-                <img  :src="isShowGoodIcon?require('../../../assets/img/home/good.png'):require('../../../assets/img/home/good_active.png')" alt="">
-<!--                <img  src="../../../assets/img/home/good_active.png" alt="">-->
+              <div class="article-good" @click="addLikeNum(item.id, index)">
+                <!--登录显示-->
+                <img v-if="isShow"
+                  :src="
+                    userAction[item.id].like
+                      ? require('../../../assets/img/home/good_active.png')
+                      : require('../../../assets/img/home/good.png')
+                  "
+                  alt=""
+                />
+                <!--未登录显示-->
+                <img v-if="!isShow" src="../../../assets/img/home/good.png" alt="">
                 {{ item.likeNum }} <span>赞</span>
               </div>
-              <div class="article-author">作者：<span>{{item.author}}</span></div>
-              <div class="article-date">发布时间：<span>{{ item.releaseTime }}</span></div>
+              <div class="article-author">
+                作者：<span>{{ item.author }}</span>
+              </div>
+              <div class="article-date">
+                发布时间：<span>{{ item.releaseTime }}</span>
+              </div>
             </div>
           </div>
         </div>
@@ -48,193 +70,203 @@
       <div slot="no-more">No more Data</div>
       <div slot="no-results">No results Data</div>
       <div slot="error" slot-scope="{ trigger }">
-        Error Data, click <a href="javascript:;" @click="trigger">here</a> toretry
+        Error Data, click
+        <a href="javascript:;" @click="trigger">here</a> toretry
       </div>
     </infinite-loading>
-
   </div>
 </template>
 
 <script>
-  import qs from "qs";
+import qs from "qs";
 
-  import InfiniteLoading from 'vue-infinite-loading'
+import InfiniteLoading from "vue-infinite-loading";
 
-  export default {
-    name: "",
-    data(){
-      return{
-        page:1,
-        blogList:[],
-        isShowGoodIcon:true,
-        blogIdForm:{
-          blogId:"",
-        }
-      }
-    },
-    components: {
-      InfiniteLoading
-    },
-    watch:{
-      // blogList(a,b) {
-      //   return this.blogList = a
-      // }
-    },
-    mounted() {
-      // this.goApi();
-      // this.$axios
-      //   .get("/blog/list")
-      //   .then((res) => {
-      //     console.log(res.data.data);
-      //     this.blogList = res.data.data
-      //   })
-    },
-    methods:{
-      // async goApi() {
-      //   this.$axios
-      //     .get("/blog/list?page="+this.page)
-      //     .then((res) => {
-      //       console.log(res.data.data);
-      //       this.blogList.push(...res.data.data); // 追加数据
-      //     })
-      // },
-      // 点赞
-      addLikeNum(id,index) {
-        this.blogIdForm.blogId = id;
-        this.$axios
-            .post("/blog/like",qs.stringify(this.blogIdForm),{
-              headers: { token: localStorage.getItem("token") },
-            })
-            .then((res) => {
-              console.log(res);
-              if(this.isShowGoodIcon == true){
-                this.blogList[index].likeNum++;
-                this.isShowGoodIcon = false
-              } else {
-                this.blogList[index].likeNum--;
-                this.isShowGoodIcon = true
-              }
-
-            })
+export default {
+  name: "",
+  data() {
+    return {
+      page: 1,
+      blogList: [],
+      blogIdForm: {
+        blogId: "",
       },
-      async infiniteHandler($state) {
-        this.$axios
-          .get("/blog/list?page="+this.page)
-          .then((res) => {
-            if(res.data.data.length) {
-              this.page +=1;  // 下一页
-              this.blogList = this.blogList.concat(res.data.data);
-              console.log(this.blogList)
-              $state.loaded();
-            }else {
-              $state.complete();
+      userAction: {},
+      isLike:false,
+      isShow:false,
+    };
+  },
+  components: {
+    InfiniteLoading,
+  },
+  mounted() {},
+  computed:{
+    // blogList1:function (){
+    //   return this.blogList.filter(function (item) {
+    //     return item.isShow
+    //   })
+    // }
+  },
+  methods: {
+    // 点赞
+    addLikeNum(id, index) {
+      this.blogIdForm.blogId = id;
+      this.$axios
+        .post("/action/blog/like", qs.stringify(this.blogIdForm), {
+          headers: { token: localStorage.getItem("token") },
+        })
+        .then((res) => {
+          console.log(res);
+          if(res.data.code == 400 && res.data.status == false) {
+            this.$message({
+              showClose: true,
+              message: "请先登录哦~",
+              type: "warning",
+            });
+          };
+          if(res.data.code == 200 && res.data.status == true) {
+            if (this.userAction[id].like == false) {
+              this.blogList[index].likeNum++;
+              this.userAction[id].like = true
+            } else {
+              this.blogList[index].likeNum--;
+              this.userAction[id].like = false
             }
-          })
-      },
-    }
-  }
+          }
+
+        });
+    },
+    async infiniteHandler($state) {
+      this.$axios
+        .get("/blog/list?page=" + this.page, {
+          headers: { token: localStorage.getItem("token") },
+        })
+        .then((res) => {
+          console.log(res);
+          // console.log(res.data.data.userAction)
+          if(res.data.data.userAction == null) {
+            this.isShow = false
+          } else {
+            this.isShow = true;
+          }
+          if (res.data.data.records.length) {
+            this.page += 1; // 下一页
+            this.blogList = this.blogList.concat(res.data.data.records);
+            this.userAction = {
+              ...this.userAction,
+              ...res.data.data.userAction,
+            };
+            console.log(this.blogList);
+            $state.loaded();
+          } else {
+            $state.complete();
+          }
+        });
+    },
+  },
+};
 </script>
 
 <style scoped>
-    .article-main {
-        border-radius: 5px;
-        margin-right: 15px;
-        border-bottom: 1px solid #f0f0f2;
-        /*padding: 15px 10px 0;*/
-        padding: 15px 0px 0;
-    }
-
-    .article-main:hover {
-        background-color: #fafafa;
-    }
+.article-main {
+  border-radius: 5px;
+  margin-right: 15px;
+  border-bottom: 1px solid #f0f0f2;
+  /*padding: 15px 10px 0;*/
+  padding: 15px 0px 0;
+}
 
+.article-main:hover {
+  background-color: #fafafa;
+}
 
-    .article-title a {
-        margin-bottom: 10px;
-        font-size: 18px;
-        font-weight: 700;
-        color: #222226;
-        overflow: hidden;
-        white-space: normal;
-        word-break: break-word;
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
-        -webkit-line-clamp: 1;
-        line-height: 25px;
-    }
-    .article-title a span:hover {
-        /*color: pink;*/
-        text-decoration: underline;
-    }
+.article-title a {
+  margin-bottom: 10px;
+  font-size: 18px;
+  font-weight: 700;
+  color: #222226;
+  overflow: hidden;
+  white-space: normal;
+  word-break: break-word;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  line-height: 25px;
+}
+.article-title a span:hover {
+  /*color: pink;*/
+  text-decoration: underline;
+}
 
-    .article-img-left {
-        margin-right: 16px;
-    }
-    .article-img-left a {
-        position: relative;
-        border-radius: 2px;
-        width: 134px;
-        height: 84px;
-        display: inline-block;
-        background-position: 50%;
-        border: 1px solid #f5f6f7;
-        overflow: hidden;
-        background: #f5f6f7;
-      background-image: url('../../../assets/img/home/003.jpg');
-      background-size: cover;
-    }
+.article-img-left {
+  margin-right: 16px;
+}
+.article-img-left a {
+  position: relative;
+  border-radius: 2px;
+  width: 134px;
+  height: 84px;
+  display: inline-block;
+  background-position: 50%;
+  border: 1px solid #f5f6f7;
+  overflow: hidden;
+  background: #f5f6f7;
+  background-image: url("../../../assets/img/home/003.jpg");
+  background-size: cover;
+}
 
-    .article-img-left img {
-        /*width: 132px;*/
-        /*height: 100px;*/
-        width: 100%;
-        left: 50%;
-        top: 50%;
-        -webkit-transform: translate(-50%,-50%);
-        transform: translate(-50%,-50%);
-        height: auto;
-        position: absolute;
-    }
+.article-img-left img {
+  /*width: 132px;*/
+  /*height: 100px;*/
+  width: 100%;
+  left: 50%;
+  top: 50%;
+  -webkit-transform: translate(-50%, -50%);
+  transform: translate(-50%, -50%);
+  height: auto;
+  position: absolute;
+}
 
-    /*图片文章并排显示*/
-    .article-content-item {
-        display: flex;
-        padding-bottom: 15px;
-    }
-    .article-content-right {
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        /*margin-top: 4px;*/
-        font-size: 14px;
-        font-weight: 400;
-        min-height: 6px;
-        min-height: 40px;
-        color: #555666;
-    }
-    .article-content-right .article-content {
-        color: #555666;
-        font-size: 14px;
-        font-weight: 400;
-        line-height: 22px;
-    }
+/*图片文章并排显示*/
+.article-content-item {
+  display: flex;
+  padding-bottom: 15px;
+}
+.article-content-right {
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  justify-content: space-between;
+  /*margin-top: 4px;*/
+  font-size: 14px;
+  font-weight: 400;
+  min-height: 6px;
+  min-height: 40px;
+  color: #555666;
+}
+.article-content-right .article-content {
+  color: #555666;
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 22px;
+}
 
-    /*评价*/
-    .article-evaluation {
-        display: flex;
-        align-items: center;
-    }
-    .article-evaluation img {
-        width: 16px;
-        height: 16px;
-        margin-right: 3px;
-    }
-    .article-evaluation .article-good {
-        display: flex;
-        align-items: center;
-        margin-right: 30px;
-    }
-    .article-evaluation .article-author {
-        margin-right: 30px;
-    }
+/*评价*/
+.article-evaluation {
+  display: flex;
+  align-items: center;
+}
+.article-evaluation img {
+  width: 16px;
+  height: 16px;
+  margin-right: 3px;
+}
+.article-evaluation .article-good {
+  display: flex;
+  align-items: center;
+  margin-right: 30px;
+}
+.article-evaluation .article-author {
+  margin-right: 30px;
+}
 </style>
diff --git a/vueblog/src/views/login/childComps/LoginItem.vue b/vueblog/src/views/login/childComps/LoginItem.vue
index e893cde0..6404830b 100644
--- a/vueblog/src/views/login/childComps/LoginItem.vue
+++ b/vueblog/src/views/login/childComps/LoginItem.vue
@@ -46,6 +46,7 @@
 
 <script>
 import qs from "qs";
+
 export default {
   name: "",
   data() {
@@ -71,10 +72,8 @@ export default {
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          // alert('submit!');
           this.$axios
             .post("/login/login", qs.stringify(this.ruleForm))
-          // { headers: { 'token': sessionStorage.getItem("token") } }
             .then((res) => {
               console.log(res);
               if (res.data.code == 200 && res.data.status == false) {
@@ -91,7 +90,7 @@ export default {
                   type: "success",
                 });
                 console.log(res.headers.token);
-                localStorage.setItem('token', res.headers.token);
+                localStorage.setItem("token", res.headers.token);
 
                 this.avatarUrl = res.data.data.avatarUrl;
                 this.bus.$emit("avatarlink", this.avatarUrl);
diff --git a/vueblog/vue.config.js b/vueblog/vue.config.js
index 63ee2fdd..571c7c22 100644
--- a/vueblog/vue.config.js
+++ b/vueblog/vue.config.js
@@ -4,17 +4,18 @@ module.exports = defineConfig({
 })
 const webpack = require("webpack")
 module.exports = {
-
+  // baseUrl:"./",
+  // publicPath:"./",
   devServer: {
     proxy: {
       '/api': {
         // target:'https://192.168.201.130/api/v1',
-        target: 'https://local.sticki.cn/api/v1',// 后端接口
+        target: 'https://api.scblogs.cn/v1',// 后端接口
         changeOrigin: true, // 是否跨域
         pathRewrite: {
           '/api': ''
         }
       }
     }
-  }
+  },
 }