diff --git a/Infrastructure/CustomException/ResultCode.cs b/Infrastructure/CustomException/ResultCode.cs
index 58739e4c80369701fd295ad73f8cc8215780664e..6f1c9c897f90099b758a913828ac9703b3132db8 100644
--- a/Infrastructure/CustomException/ResultCode.cs
+++ b/Infrastructure/CustomException/ResultCode.cs
@@ -34,6 +34,9 @@ namespace Infrastructure
         [Description("授权失败")]
         OAUTH_FAIL = 201,
 
+        [Description("请先绑定手机号")]
+        PHONE_BIND = 202,
+
         [Description("未授权")]
         DENY = 401,
 
diff --git a/ZR.ServiceCore/ProteryConstant.cs b/Infrastructure/ProteryConstant.cs
similarity index 100%
rename from ZR.ServiceCore/ProteryConstant.cs
rename to Infrastructure/ProteryConstant.cs
diff --git a/ZR.Admin.WebApi/Controllers/Article/ArticleCategoryController.cs b/ZR.Admin.WebApi/Controllers/Article/ArticleCategoryController.cs
index ffa2ac7eb8e11a0221531107d3faf1c0c79dbba4..bb9a8186db7b4ac18600eb72a91a4b56f9585841 100644
--- a/ZR.Admin.WebApi/Controllers/Article/ArticleCategoryController.cs
+++ b/ZR.Admin.WebApi/Controllers/Article/ArticleCategoryController.cs
@@ -1,7 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using ZR.Admin.WebApi.Filters;
+using ZR.Model.Content;
 using ZR.Model.Dto;
-using ZR.Model.System;
+using ZR.Service.Content.IService;
 
 namespace ZR.Admin.WebApi.Controllers
 {
@@ -28,7 +29,7 @@ namespace ZR.Admin.WebApi.Controllers
         /// <param name="parm"></param>
         /// <returns></returns>
         [HttpGet("list")]
-        //[ActionPermissionFilter(Permission = "articlecategory:list")]
+        [AllowAnonymous]
         public IActionResult QueryArticleCategory([FromQuery] ArticleCategoryQueryDto parm)
         {
             var response = _ArticleCategoryService.GetList(parm);
@@ -41,7 +42,7 @@ namespace ZR.Admin.WebApi.Controllers
         /// <param name="parm"></param>
         /// <returns></returns>
         [HttpGet("treeList")]
-        //[ActionPermissionFilter(Permission = "articlecategory:list")]
+        [AllowAnonymous]
         public IActionResult QueryTreeArticleCategory([FromQuery] ArticleCategoryQueryDto parm)
         {
             var response = _ArticleCategoryService.GetTreeList(parm);
@@ -54,6 +55,7 @@ namespace ZR.Admin.WebApi.Controllers
         /// <param name="CategoryId"></param>
         /// <returns></returns>
         [HttpGet("{CategoryId}")]
+        [AllowAnonymous]
         //[ActionPermissionFilter(Permission = "articlecategory:query")]
         public IActionResult GetArticleCategory(int CategoryId)
         {
@@ -62,6 +64,20 @@ namespace ZR.Admin.WebApi.Controllers
             return SUCCESS(response);
         }
 
+        /// <summary>
+        /// 查询目录分类
+        /// </summary>
+        /// <param name="categoryType"></param>
+        /// <returns></returns>
+        [HttpGet("type{categoryType}")]
+        //[ActionPermissionFilter(Permission = "articlecategory:query")]
+        public IActionResult GetArticleCategoryByType(int categoryType)
+        {
+            var response = _ArticleCategoryService.GetFirst(x => x.CategoryType == categoryType);
+
+            return SUCCESS(response);
+        }
+
         /// <summary>
         /// 添加文章目录
         /// </summary>
diff --git a/ZR.Admin.WebApi/Controllers/Article/ArticleController.cs b/ZR.Admin.WebApi/Controllers/Article/ArticleController.cs
index 4056968f89a4a8c949eb3ef5af76a963f37432d2..c8475fc4ec3f94ef50b2cee4df52b54494d9e5a5 100644
--- a/ZR.Admin.WebApi/Controllers/Article/ArticleController.cs
+++ b/ZR.Admin.WebApi/Controllers/Article/ArticleController.cs
@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
-using SqlSugar;
 using ZR.Admin.WebApi.Filters;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.ServiceCore.Model.Enums;
+using ZR.Model.Content;
+using ZR.Model.Dto;
+using ZR.Service.Content.IService;
 
 namespace ZR.Admin.WebApi.Controllers
 {
@@ -21,10 +20,13 @@ namespace ZR.Admin.WebApi.Controllers
         private readonly IArticleService _ArticleService;
         private readonly IArticleCategoryService _ArticleCategoryService;
 
-        public ArticleController(IArticleService ArticleService, IArticleCategoryService articleCategoryService)
+        public ArticleController(
+            IArticleService ArticleService,
+            IArticleCategoryService articleCategoryService)
         {
             _ArticleService = ArticleService;
             _ArticleCategoryService = articleCategoryService;
+            _ArticleService = ArticleService;
         }
 
         /// <summary>
@@ -53,83 +55,36 @@ namespace ZR.Admin.WebApi.Controllers
             return SUCCESS(response);
         }
 
-        /// <summary>
-        /// 前台查询文章列表
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("hotList")]
-        [AllowAnonymous]
-        public IActionResult QueryHot([FromQuery] ArticleQueryDto parm)
-        {
-            var response = _ArticleService.GetHotList(parm);
-
-            return SUCCESS(response);
-        }
-
-        /// <summary>
-        /// 查询最新文章列表
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("newList")]
-        [AllowAnonymous]
-        public IActionResult QueryNew()
-        {
-            var predicate = Expressionable.Create<Article>();
-            predicate = predicate.And(m => m.Status == "1");
-            predicate = predicate.And(m => m.IsPublic == 1);
-
-            var response = _ArticleService.Queryable()
-                .Where(predicate.ToExpression())
-                .Includes(x => x.ArticleCategoryNav) //填充子对象
-                .Take(10)
-                .OrderBy(f => f.UpdateTime, OrderByType.Desc).ToList();
-
-            return SUCCESS(response);
-        }
-
         /// <summary>
         /// 查询文章详情
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
         [HttpGet("{id}")]
-        [AllowAnonymous]
         public IActionResult Get(int id)
         {
             long userId = HttpContext.GetUId();
-            var response = _ArticleService.GetId(id);
-            var model = response.Adapt<ArticleDto>();
-            if (model == null) return ToResponse(ResultCode.FAIL, "文章不存在");
-            if (model.IsPublic == 0 && userId != model.UserId)
-            {
-                return ToResponse(ResultCode.CUSTOM_ERROR, "访问失败");
-            }
-            if (model != null)
-            {
-                model.ArticleCategoryNav = _ArticleCategoryService.GetById(model.CategoryId);
-                model.TagList = model.Tags?.Split(',', StringSplitOptions.RemoveEmptyEntries) ?? Array.Empty<string>();
-            }
-            var CK = "ARTICLE_DETAILS_" + userId + HttpContextExtension.GetClientUserIp(HttpContext);
-            if (!CacheHelper.Exists(CK))
-            {
-                _ArticleService.UpdateArticleHit(id);
-            }
-            CacheHelper.SetCache(CK, 1, 10);
-            return SUCCESS(model);
+            var model = _ArticleService.GetArticle(id, userId);
+            
+            ApiResult apiResult = ApiResult.Success(model);
+
+            return ToResponse(apiResult);
         }
 
         /// <summary>
-        /// 添加文章
+        /// 发布文章
         /// </summary>
         /// <returns></returns>
         [HttpPost("add")]
         [ActionPermissionFilter(Permission = "system:article:add")]
-        [Log(Title = "发布文章", BusinessType = BusinessType.INSERT)]
+        //[Log(Title = "发布文章", BusinessType = BusinessType.INSERT)]
         public IActionResult Create([FromBody] ArticleDto parm)
         {
             var addModel = parm.Adapt<Article>().ToCreate(context: HttpContext);
             addModel.AuthorName = HttpContext.GetName();
             addModel.UserId = HttpContext.GetUId();
+            addModel.UserIP = HttpContext.GetClientUserIp();
+            addModel.Location = HttpContextExtension.GetIpInfo(addModel.UserIP);
 
             return SUCCESS(_ArticleService.InsertReturnIdentity(addModel));
         }
@@ -140,7 +95,7 @@ namespace ZR.Admin.WebApi.Controllers
         /// <returns></returns>
         [HttpPut("edit")]
         [ActionPermissionFilter(Permission = "system:article:update")]
-        [Log(Title = "文章修改", BusinessType = BusinessType.UPDATE)]
+        //[Log(Title = "文章修改", BusinessType = BusinessType.UPDATE)]
         public IActionResult Update([FromBody] ArticleDto parm)
         {
             parm.AuthorName = HttpContext.GetName();
@@ -190,6 +145,5 @@ namespace ZR.Admin.WebApi.Controllers
             var response = _ArticleService.Delete(id);
             return SUCCESS(response);
         }
-
     }
 }
\ No newline at end of file
diff --git a/ZR.Admin.WebApi/Controllers/Article/ArticleTopicController.cs b/ZR.Admin.WebApi/Controllers/Article/ArticleTopicController.cs
new file mode 100644
index 0000000000000000000000000000000000000000..300c10266d5bec959cdba6c685ef0fcc46157cdd
--- /dev/null
+++ b/ZR.Admin.WebApi/Controllers/Article/ArticleTopicController.cs
@@ -0,0 +1,122 @@
+using Microsoft.AspNetCore.Mvc;
+using ZR.Admin.WebApi.Filters;
+using ZR.Model.Content;
+using ZR.Model.Dto;
+using ZR.Service.Content.IService;
+
+//创建时间：2024-04-29
+namespace ZR.Admin.WebApi.Controllers
+{
+    /// <summary>
+    /// 文章话题
+    /// </summary>
+    [Verify]
+    [ApiExplorerSettings(GroupName = "article")]
+    [Route("article/ArticleTopic")]
+    public class ArticleTopicController : BaseController
+    {
+        /// <summary>
+        /// 文章话题接口
+        /// </summary>
+        private readonly IArticleTopicService _ArticleTopicService;
+
+        public ArticleTopicController(IArticleTopicService ArticleTopicService)
+        {
+            _ArticleTopicService = ArticleTopicService;
+        }
+
+        /// <summary>
+        /// 查询文章话题列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("list")]
+        [ActionPermissionFilter(Permission = "articletopic:list")]
+        public IActionResult QueryArticleTopic([FromQuery] ArticleTopicQueryDto parm)
+        {
+            var response = _ArticleTopicService.GetList(parm);
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 查询文章话题详情
+        /// </summary>
+        /// <param name="TopicId"></param>
+        /// <returns></returns>
+        [HttpGet("{TopicId}")]
+        [ActionPermissionFilter(Permission = "articletopic:query")]
+        public IActionResult GetArticleTopic(long TopicId)
+        {
+            var response = _ArticleTopicService.GetInfo(TopicId);
+            
+            var info = response.Adapt<ArticleTopicDto>();
+            return SUCCESS(info);
+        }
+
+        /// <summary>
+        /// 添加文章话题
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ActionPermissionFilter(Permission = "articletopic:add")]
+        [Log(Title = "文章话题", BusinessType = BusinessType.INSERT)]
+        public IActionResult AddArticleTopic([FromBody] ArticleTopicDto parm)
+        {
+            var modal = parm.Adapt<ArticleTopic>().ToCreate(HttpContext);
+
+            var response = _ArticleTopicService.AddArticleTopic(modal);
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 更新文章话题
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut]
+        [ActionPermissionFilter(Permission = "articletopic:edit")]
+        [Log(Title = "文章话题", BusinessType = BusinessType.UPDATE)]
+        public IActionResult UpdateArticleTopic([FromBody] ArticleTopicDto parm)
+        {
+            var modal = parm.Adapt<ArticleTopic>().ToUpdate(HttpContext);
+            var response = _ArticleTopicService.UpdateArticleTopic(modal);
+
+            return ToResponse(response);
+        }
+
+        /// <summary>
+        /// 删除文章话题
+        /// </summary>
+        /// <returns></returns>
+        [HttpDelete("delete/{ids}")]
+        [ActionPermissionFilter(Permission = "articletopic:delete")]
+        [Log(Title = "文章话题", BusinessType = BusinessType.DELETE)]
+        public IActionResult DeleteArticleTopic([FromRoute] string ids)
+        {
+            var idArr = Tools.SplitAndConvert<long>(ids);
+
+            return ToResponse(_ArticleTopicService.Delete(idArr));
+        }
+
+        /// <summary>
+        /// 导出文章话题
+        /// </summary>
+        /// <returns></returns>
+        [Log(Title = "文章话题", BusinessType = BusinessType.EXPORT, IsSaveResponseData = false)]
+        [HttpGet("export")]
+        [ActionPermissionFilter(Permission = "articletopic:export")]
+        public IActionResult Export([FromQuery] ArticleTopicQueryDto parm)
+        {
+            parm.PageNum = 1;
+            parm.PageSize = 100000;
+            var list = _ArticleTopicService.ExportList(parm).Result;
+            if (list == null || list.Count <= 0)
+            {
+                return ToResponse(ResultCode.FAIL, "没有要导出的数据");
+            }
+            var result = ExportExcelMini(list, "文章话题", "文章话题");
+            return ExportExcel(result.Item2, result.Item1);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/ZR.Admin.WebApi/Controllers/Article/FrontArticleController.cs b/ZR.Admin.WebApi/Controllers/Article/FrontArticleController.cs
new file mode 100644
index 0000000000000000000000000000000000000000..34a3276ad1d251541656cfc1c6580453eba05e92
--- /dev/null
+++ b/ZR.Admin.WebApi/Controllers/Article/FrontArticleController.cs
@@ -0,0 +1,205 @@
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using ZR.Admin.WebApi.Filters;
+using ZR.Model.Content;
+using ZR.Model.Dto;
+using ZR.Model.System.Dto;
+using ZR.Service.Content.IService;
+
+namespace ZR.Admin.WebApi.Controllers
+{
+    /// <summary>
+    /// 内容管理前端接口
+    /// </summary>
+    [Route("front/article")]
+    [ApiExplorerSettings(GroupName = "article")]
+    [Verify]
+    public class FrontArticleController : BaseController
+    {
+        /// <summary>
+        /// 文章接口
+        /// </summary>
+        private readonly IArticleService _ArticleService;
+        private readonly IArticleCategoryService _ArticleCategoryService;
+        private readonly IArticlePraiseService _ArticlePraiseService;
+        private readonly ISysUserService _SysUserService;
+        private readonly IArticleTopicService _ArticleTopicService;
+
+        public FrontArticleController(
+            IArticleService ArticleService,
+            IArticleCategoryService articleCategoryService,
+            IArticlePraiseService articlePraiseService,
+            ISysUserService sysUserService,
+            IArticleTopicService articleTopicService)
+        {
+            _ArticleService = ArticleService;
+            _ArticleCategoryService = articleCategoryService;
+            _ArticleService = ArticleService;
+            _ArticlePraiseService = articlePraiseService;
+            _SysUserService = sysUserService;
+            _ArticleTopicService = articleTopicService;
+        }
+
+        /// <summary>
+        /// 前台查询文章列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("homeList")]
+        [AllowAnonymous]
+        public IActionResult QueryHomeList([FromQuery] ArticleQueryDto parm)
+        {
+            parm.UserId = HttpContext.GetUId();
+            var response = _ArticleService.GetArticleList(parm);
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 查询最新文章列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("newList")]
+        [AllowAnonymous]
+        public IActionResult QueryNew()
+        {
+            var predicate = Expressionable.Create<Article>();
+            predicate = predicate.And(m => m.Status == "1");
+            predicate = predicate.And(m => m.IsPublic == 1);
+            predicate = predicate.And(m => m.ArticleType == 0);
+
+            var response = _ArticleService.Queryable()
+                .Where(predicate.ToExpression())
+                .Includes(x => x.ArticleCategoryNav) //填充子对象
+                .Take(10)
+                .OrderBy(f => f.UpdateTime, OrderByType.Desc).ToList();
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 点赞
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="authorId"></param>
+        /// <returns></returns>
+        [HttpPost("praise/{id}")]
+        [ActionPermissionFilter(Permission = "common")]
+        public IActionResult Praise(int id = 0, long authorId = 0)
+        {
+            ArticlePraise addModel = new()
+            {
+                UserId = HttpContext.GetUId(),
+                UserIP = HttpContext.GetClientUserIp(),
+                ArticleId = id,
+                ToUserId = authorId
+            };
+            addModel.Location = HttpContextExtension.GetIpInfo(addModel.UserIP);
+
+            return SUCCESS(_ArticlePraiseService.Praise(addModel));
+        }
+
+        /// <summary>
+        /// 置顶
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut("top")]
+        [ActionPermissionFilter(Permission = "common")]
+        public IActionResult Top([FromBody] Article parm)
+        {
+            var response = _ArticleService.TopArticle(parm);
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 修改可见范围
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut("changePublic")]
+        [ActionPermissionFilter(Permission = "common")]
+        public IActionResult ChangePublic([FromBody] Article parm)
+        {
+            if (parm == null) { return ToResponse(ResultCode.CUSTOM_ERROR); }
+            var userId = HttpContext.GetUId();
+            if (userId != parm.UserId)
+            {
+                return ToResponse(ResultCode.CUSTOM_ERROR, "操作失败");
+            }
+            var response = _ArticleService.ChangeArticlePublic(parm);
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <returns></returns>
+        [HttpDelete("del/{id}")]
+        [ActionPermissionFilter(Permission = "common")]
+        public IActionResult Delete(int id = 0)
+        {
+            var userId = HttpContext.GetUId();
+            var info = _ArticleService.GetId(id);
+            if (info == null || info.UserId != userId)
+            {
+                return ToResponse(ResultCode.CUSTOM_ERROR, "删除失败(-1)");
+            }
+            var response = _ArticleService.Delete(id);
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 查询文章详情
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet("{id}")]
+        [AllowAnonymous]
+        public IActionResult Get(int id)
+        {
+            long userId = HttpContext.GetUId();
+            var model = _ArticleService.GetArticle(id, userId);
+            var user = _SysUserService.GetById(model.UserId);
+            ApiResult apiResult = ApiResult.Success(model);
+            model.User = new ArticleUser()
+            {
+                Avatar = user.Avatar,
+                NickName = user.NickName,
+                Sex = user.Sex,
+            };
+            //apiResult.Put("user", user.Adapt<UserDto>());
+            return ToResponse(apiResult);
+        }
+
+        /// <summary>
+        /// 前台查询话题
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("topicList")]
+        [AllowAnonymous]
+        public IActionResult QueryTopicList([FromQuery] ArticleTopicQueryDto parm)
+        {
+            var response = _ArticleTopicService.GetTopicList(parm);
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 查询文章话题详情
+        /// </summary>
+        /// <param name="TopicId"></param>
+        /// <returns></returns>
+        [HttpGet("topic/{TopicId}")]
+        [AllowAnonymous]
+        public IActionResult GetArticleTopic(long TopicId)
+        {
+            var response = _ArticleTopicService.GetInfo(TopicId);
+
+            _ArticleTopicService.Update(w => w.TopicId == TopicId, it => new ArticleTopic() { ViewNum = it.ViewNum + 1 });
+
+            var info = response.Adapt<ArticleTopicDto>();
+            return SUCCESS(info);
+        }
+    }
+}
diff --git a/ZR.Admin.WebApi/Controllers/Article/FrontCommentController.cs b/ZR.Admin.WebApi/Controllers/Article/FrontCommentController.cs
new file mode 100644
index 0000000000000000000000000000000000000000..d1a028f342e47c09e9231f35c378e3f63a2742ba
--- /dev/null
+++ b/ZR.Admin.WebApi/Controllers/Article/FrontCommentController.cs
@@ -0,0 +1,115 @@
+using Microsoft.AspNetCore.Mvc;
+using ZR.Admin.WebApi.Filters;
+using ZR.Model;
+using ZR.Model.Content;
+using ZR.Model.Dto;
+using ZR.Service.Content.IService;
+
+namespace ZR.Admin.WebApi.Controllers
+{
+    /// <summary>
+    /// 评论
+    /// </summary>
+    [Route("front/comment")]
+    [ApiExplorerSettings(GroupName = "article")]
+    [ApiController]
+    public class FrontCommentController : BaseController
+    {
+        private readonly IArticleCommentService messageService;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="messageService"></param>
+        public FrontCommentController(IArticleCommentService messageService)
+        {
+            this.messageService = messageService;
+        }
+
+        /// <summary>
+        /// 查询评论列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("list")]
+        public IActionResult QueryList([FromQuery] MessageQueryDto parm)
+        {
+            parm.PageSize = 10;
+            PagedInfo<ArticleCommentDto>? response;
+            //查询二级评论
+            if (parm.CommentId > 0)
+            {
+                response = messageService.GetReplyComments(parm.CommentId, parm);
+            }
+            else
+            {
+                response = messageService.GetMessageList(parm);
+            }
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 评论
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("add")]
+        [Verify]
+        [ActionPermissionFilter(Permission = "common")]
+        public IActionResult Create([FromBody] ArticleCommentDto parm)
+        {
+            var uid = HttpContextExtension.GetUId(HttpContext);
+            if (uid <= 0) { return ToResponse(ResultCode.DENY); }
+
+            var addModel = parm.Adapt<ArticleComment>().ToCreate(context: HttpContext);
+            addModel.UserIP = HttpContextExtension.GetClientUserIp(HttpContext);
+            addModel.UserId = uid;
+            return SUCCESS(messageService.AddMessage(addModel).Adapt<ArticleCommentDto>());
+        }
+
+        /// <summary>
+        /// 评论点赞
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost("praise")]
+        [ActionPermissionFilter(Permission = "common")]
+        [Verify]
+        public IActionResult Praise([FromBody] ArticleCommentDto dto)
+        {
+            if (dto == null || dto.CommentId <= 0) return ToResponse(ResultCode.PARAM_ERROR);
+            //var uid = HttpContextExtension.GetUId(HttpContext);
+
+            return SUCCESS(messageService.PraiseMessage(dto.CommentId));
+        }
+
+        /// <summary>
+        /// 评论删除
+        /// </summary>
+        /// <param name="mid"></param>
+        /// <returns></returns>
+        [HttpDelete("delete/{mid}")]
+        [ActionPermissionFilter(Permission = "common")]
+        [Verify]
+        public IActionResult Delete(long mid)
+        {
+            var uid = HttpContextExtension.GetUId(HttpContext);
+            if (uid <= 0) { return ToResponse(ResultCode.DENY); }
+            return SUCCESS(messageService.DeleteMessage(mid.ParseToLong(), uid));
+        }
+
+        /// <summary>
+        /// 查询我的评论列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("mylist")]
+        [Verify]
+        public IActionResult QueryMyCommentList([FromQuery] MessageQueryDto parm)
+        {
+            PagedInfo<ArticleCommentDto> response = messageService.GetMyMessageList(parm);
+
+            return SUCCESS(response);
+        }
+    }
+}
diff --git a/ZR.Admin.WebApi/Controllers/Article/MonentController.cs b/ZR.Admin.WebApi/Controllers/Article/MomentsController.cs
similarity index 38%
rename from ZR.Admin.WebApi/Controllers/Article/MonentController.cs
rename to ZR.Admin.WebApi/Controllers/Article/MomentsController.cs
index 7ea92ccf8c5b48f235457c8418fc6473c2c6bb00..d1647c47625d733c78da923a46ea2b13881b5ec4 100644
--- a/ZR.Admin.WebApi/Controllers/Article/MonentController.cs
+++ b/ZR.Admin.WebApi/Controllers/Article/MomentsController.cs
@@ -1,25 +1,30 @@
 using Microsoft.AspNetCore.Mvc;
 using ZR.Admin.WebApi.Filters;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.ServiceCore.Model.Enums;
+using ZR.Model.Content;
+using ZR.Model.Dto;
+using ZR.Model.Enum;
+using ZR.Service.Content.IService;
 
 namespace ZR.Admin.WebApi.Controllers
 {
     [Verify]
-    [Route("monent")]
-    public class MonentController : BaseController
+    [Route("moment")]
+    [ApiExplorerSettings(GroupName = "article")]
+    public class MomentsController : BaseController
     {
         /// <summary>
         /// 动态接口
         /// </summary>
         private readonly IArticleService _ArticleService;
-        private readonly IArticleCategoryService _ArticleCategoryService;
 
-        public MonentController(IArticleService ArticleService, IArticleCategoryService articleCategoryService)
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="ArticleService"></param>
+        public MomentsController(
+            IArticleService ArticleService)
         {
             _ArticleService = ArticleService;
-            _ArticleCategoryService = articleCategoryService;
         }
 
         /// <summary>
@@ -40,96 +45,39 @@ namespace ZR.Admin.WebApi.Controllers
         /// 查询动态列表
         /// </summary>
         /// <returns></returns>
-        [HttpGet("monentList")]
+        [HttpGet("momentList")]
         [AllowAnonymous]
         public IActionResult QueryMonentList([FromQuery] ArticleQueryDto parm)
         {
             parm.UserId = HttpContext.GetUId();
             parm.ArticleType = 2;
-            var response = _ArticleService.GetArticleList(parm);
-
-            return SUCCESS(response);
-        }
-
-        /// <summary>
-        /// 置顶
-        /// </summary>
-        /// <returns></returns>
-        [HttpPut("top")]
-        [Log(Title = "置顶动态", BusinessType = BusinessType.UPDATE)]
-        public IActionResult Top([FromBody] Article parm)
-        {
-            var response = _ArticleService.TopArticle(parm);
-
-            return SUCCESS(response);
-        }
-
-        /// <summary>
-        /// 修改可见范围
-        /// </summary>
-        /// <returns></returns>
-        [HttpPut("changePublic")]
-        [Log(Title = "是否公开", BusinessType = BusinessType.UPDATE)]
-        public IActionResult ChangePublic([FromBody] Article parm)
-        {
-            var response = _ArticleService.ChangeArticlePublic(parm);
-
-            return SUCCESS(response);
+            if (parm.TabId == 100)
+            {
+                return SUCCESS(_ArticleService.GetFollowMonentList(parm));
+            }
+            return SUCCESS(_ArticleService.GetMonentList(parm));
         }
 
         /// <summary>
         /// 动态发布
         /// </summary>
         /// <returns></returns>
-        [HttpPost("publishMonent")]
-        [Log(Title = "动态发布", BusinessType = BusinessType.INSERT)]
-        public IActionResult PublishMonent([FromBody] ArticleDto parm)
+        [HttpPost("publishMoment")]
+        [ActionPermissionFilter(Permission = "common")]
+        public IActionResult PublishMoment([FromBody] ArticleDto parm)
         {
+            if (parm == null) { return ToResponse(ResultCode.PARAM_ERROR); }
             var addModel = parm.Adapt<Article>().ToCreate(context: HttpContext);
-            addModel.AuthorName = HttpContext.GetName();
-            addModel.UserId = HttpContext.GetUId();
-            addModel.ArticleType = ArticleTypeEnum.Monent;
-            addModel.UserIP = HttpContext.GetClientUserIp();
+            addModel.Tags = parm.TopicName;
 
-            string location = HttpContextExtension.GetIpInfo(addModel.UserIP);
-            addModel.Location = location;
-            return SUCCESS(_ArticleService.InsertReturnIdentity(addModel));
-        }
-
-        /// <summary>
-        /// 删除动态
-        /// </summary>
-        /// <returns></returns>
-        [HttpDelete("del/{id}")]
-        [Log(Title = "动态删除", BusinessType = BusinessType.DELETE)]
-        public IActionResult DeleteMonents(int id = 0)
-        {
-            var userId = HttpContext.GetUId();
-            var info = _ArticleService.GetId(id);
-            if (info == null || info.UserId != userId)
-            {
-                return ToResponse(ResultCode.CUSTOM_ERROR, "删除失败(-1)");
-            }
-            var response = _ArticleService.Delete(id);
-            return SUCCESS(response);
-        }
-
-        /// <summary>
-        /// 点赞动态
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost("praise/{id}")]
-        public IActionResult PraiseMonents(int id = 0)
-        {
-            var response = _ArticleService.PraiseArticle(id);
-            return SUCCESS(response);
+            return SUCCESS(_ArticleService.PublishMonent(addModel));
         }
 
         /// <summary>
         /// 动态信息
         /// </summary>
         /// <returns></returns>
-        [HttpDelete("getInfo")]
+        [HttpGet("getInfo")]
         public IActionResult GetInfo()
         {
             var userId = HttpContext.GetUId();
diff --git a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
index 3fdd901f7b83f0adea5a60f1bea284e6b3e54ffe..5ea32ff89e6ec47179d889f24267a52d4a1f3fe2 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
@@ -43,7 +43,6 @@ namespace ZR.Admin.WebApi.Controllers.System
             roleService = sysRoleService;
         }
 
-
         /// <summary>
         /// 登录
         /// </summary>
@@ -261,37 +260,49 @@ namespace ZR.Admin.WebApi.Controllers.System
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        [HttpPost("checkMobile")]
+        [HttpPost("/checkMobile")]
         [Log(Title = "发送短息", BusinessType = BusinessType.INSERT)]
         public IActionResult CheckMobile([FromBody] PhoneLoginDto dto)
         {
             dto.LoginIP = HttpContextExtension.GetClientUserIp(HttpContext);
-
-            SysConfig sysConfig = sysConfigService.GetSysConfigByKey("sys.account.captchaOnOff");
-            if (sysConfig?.ConfigValue != "off" && !SecurityCodeHelper.Validate(dto.Uuid, dto.Code, false))
+            var uid = HttpContext.GetUId();
+            //SysConfig sysConfig = sysConfigService.GetSysConfigByKey("sys.account.captchaOnOff");
+            //if (!SecurityCodeHelper.Validate(dto.Uuid, dto.Code, false))
+            //{
+            //    return ToResponse(ResultCode.CUSTOM_ERROR, "验证码错误");
+            //}
+            if (dto.SendType == 0)
+            {
+                var info = sysUserService.GetFirst(f => f.Phonenumber == dto.PhoneNum) ?? throw new CustomException(ResultCode.CUSTOM_ERROR, "该手机号不存在", false);
+                uid = info.UserId;
+            }
+            if (dto.SendType == 1)
             {
-                return ToResponse(ResultCode.CUSTOM_ERROR, "验证码错误");
+                if (sysUserService.CheckPhoneBind(dto.PhoneNum).Count > 0)
+                {
+                    return ToResponse(ResultCode.CUSTOM_ERROR, "手机号已绑定其他账号");
+                }
             }
+
             string location = HttpContextExtension.GetIpInfo(dto.LoginIP);
-            var info = sysUserService.GetFirst(f => f.Phonenumber == dto.PhoneNum) ?? throw new CustomException(ResultCode.CUSTOM_ERROR, "该手机号不存在", false);
 
             var smsCode = RandomHelper.GenerateNum(6);
-            var smsContent = $"验证码{smsCode}（随机验证码）,有效期10分钟。";
+            var smsContent = $"验证码{smsCode},有效期10分钟。";
             //TODO 发送短息验证码,1分钟内允许一次
             smsCodeLogService.AddSmscodeLog(new ServiceCore.Model.SmsCodeLog()
             {
-                Userid = info.UserId,
+                Userid = uid,
                 PhoneNum = dto.PhoneNum.ParseToLong(),
-                AddTime = DateTime.Now,
-                SendType = 1,
+                SendType = dto.SendType,
                 SmsCode = smsCode,
                 SmsContent = smsContent,
                 UserIP = dto.LoginIP,
                 Location = location,
             });
+            
             CacheService.SetPhoneCode(dto.PhoneNum, smsCode);
 
-            return SUCCESS(new { smsCode });
+            return SUCCESS(1);
         }
 
         /// <summary>
@@ -324,5 +335,27 @@ namespace ZR.Admin.WebApi.Controllers.System
             CacheService.SetUserPerms(GlobalConstant.UserPermKEY + user.UserId, permissions);
             return SUCCESS(JwtUtil.GenerateJwtToken(JwtUtil.AddClaims(loginUser)));
         }
+
+        /// <summary>
+        /// 手机号绑定
+        /// </summary>
+        /// <param name="loginBody"></param>
+        /// <returns></returns>
+        [Route("/PhoneBind")]
+        [HttpPost]
+        [Log(Title = "手机号绑定")]
+        public IActionResult PhoneBind([FromBody] PhoneLoginDto loginBody)
+        {
+            if (loginBody == null) { throw new CustomException("请求参数错误"); }
+            loginBody.LoginIP = HttpContextExtension.GetClientUserIp(HttpContext);
+            var uid = HttpContext.GetUId();
+            if (!CacheService.CheckPhoneCode(loginBody.PhoneNum, loginBody.PhoneCode))
+            {
+                return ToResponse(ResultCode.CUSTOM_ERROR, "短信验证码错误");
+            }
+            var result = sysUserService.ChangePhoneNum(uid, loginBody.PhoneNum);
+
+            return SUCCESS(result);
+        }
     }
 }
diff --git a/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs b/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
index 22349dec2a22e22802e69307266ba97b8e65443a..097124addf87cfe1aa1a7b5e34336766bcecf5b0 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
@@ -185,6 +185,20 @@ namespace ZR.Admin.WebApi.Controllers.System
 
             return ToResponse(result);
         }
+        /// <summary>
+        /// 菜单删除
+        /// </summary>
+        /// <param name="menuId"></param>
+        /// <returns></returns>
+        [HttpDelete("deleteAll/{menuId}")]
+        [Log(Title = "菜单管理", BusinessType = BusinessType.DELETE)]
+        [ActionPermissionFilter(Permission = "system:menu:remove")]
+        public IActionResult RemoveAll(int menuId = 0)
+        {
+            int result = sysMenuService.DeleteAllMenuById(menuId);
+
+            return ToResponse(result);
+        }
 
         /// <summary>
         /// 保存排序
diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/UserOnlineLogController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/UserOnlineLogController.cs
index 1a0bce424df6e9d7fed0240d7e4e496c3d7cead9..49962e6786d88b4b70616a0eed549c2f0fd50038 100644
--- a/ZR.Admin.WebApi/Controllers/System/monitor/UserOnlineLogController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/monitor/UserOnlineLogController.cs
@@ -10,6 +10,7 @@ namespace ZR.Admin.WebApi.Controllers
     /// 用户在线时长
     /// </summary>
     [Verify]
+    [ApiExplorerSettings(GroupName = "sys")]
     [Route("monitor/UserOnlineLog")]
     public class UserOnlineLogController : BaseController
     {
diff --git a/ZR.Admin.WebApi/iprate.json b/ZR.Admin.WebApi/iprate.json
index 7269065d863c76655469205dbacaacb70608b7c3..ce41fb9e8faff4bbad52e26dfd9620bc205166fb 100644
--- a/ZR.Admin.WebApi/iprate.json
+++ b/ZR.Admin.WebApi/iprate.json
@@ -20,6 +20,12 @@
         "Period": "3s",
         "Limit": 5
       },
+      {
+        "Endpoint": "*:/checkMobile",
+        //时间段，格式：{数字}{单位}；可使用单位：s, m, h, d
+        "Period": "60s",
+        "Limit": 1
+      },
       {
         "Endpoint": "((post)|(put)):*",
         "Period": "3s",
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/api.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/api.txt
index 30f869c275bdae229a12c85c8fe71a7690ded2a0..93217fcd9adb0d33badf760f98d2f83ab5b7047e 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/api.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/api.txt
@@ -60,19 +60,4 @@ export function del${genTable.BusinessName}(pid) {
     method: 'delete'
   })
 }
-$end
-$if(replaceDto.ShowBtnTruncate)
-// 清空${genTable.functionName}
-export function clear${genTable.BusinessName}() {
-  return request({
-    url: '/${genTable.ModuleName}/${genTable.BusinessName}/clean',
-    method: 'delete'
-  })
-}
-$end
-$if(replaceDto.ShowBtnExport)
-// 导出${genTable.functionName}
-export async function export${genTable.BusinessName}(query) {
-  await downFile('/${genTable.ModuleName}/${genTable.BusinessName}/export', { ...query })
-}
 $end
\ No newline at end of file
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt
index 429ae1525fd50fe8d65c56f2648d484b49089f30..da88a3c96a7d885bc89948a8ee83d3c03957071f 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt
@@ -1,5 +1,6 @@
 <template>
-  <view class="edit-form">
+  <view class="edit-wrap">
+    <view class="edit-form">
     <u--form labelPosition="left" :model="form" labelWidth="90px" :rules="rules" ref="uForm">
 $foreach(column in genTable.Columns)
 $set(columnName = column.CsharpFieldFl)
@@ -67,7 +68,8 @@ $end
 $end
 $end
 
-    </u--form>
+      </u--form>
+    </view>
 
     <view class="form-footer">
       <view class="btn_wrap">
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt
index 189ffba8ab681f612ef9cc428eac7996705e9f1b..cbdcf84b968aed84008b0096700f0f56c5cfa65b 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt
@@ -141,9 +141,6 @@ $if(replaceDto.ShowBtnDelete)
 $end
   } from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName.ToLower()}.js'
 
-  import {
-    getDate
-  } from '@/utils/common.js'
   export default {
     dicts: [
 $foreach(item in genTable.Columns)
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
index dae9f789392843811588dfac65006a6ecba5906c..af43680753e9e1be29302fe5a58e0c015b3c1054 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
@@ -66,7 +66,7 @@ $elseif(column.HtmlType == "radio")
       <el-form-item label="${labelName}" prop="${columnName}">
         <el-radio-group v-model="queryParams.${columnName}">
           <el-radio>全部</el-radio>
-          <el-radio v-for="item in $if(column.DictType != "") options.${column.DictType} $else options.${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictValue">{{item.dictLabel}}</el-radio>
+          <el-radio v-for="item in $if(column.DictType != "") options.${column.DictType} $else options.${column.CsharpFieldFl}Options$end" :key="item.dictValue" :value="item.dictValue">{{item.dictLabel}}</el-radio>
         </el-radio-group>
       </el-form-item>
 $else
@@ -309,7 +309,7 @@ $elseif(column.HtmlType == "radio" || column.HtmlType == "selectRadio")
           <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
               <el-radio-group v-model="form.${columnName}"${column.DisabledStr}>
-                <el-radio v-for="item in ${if(column.DictType != "")}options.${column.DictType}${else}options.${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="${value}">
+                <el-radio v-for="item in ${if(column.DictType != "")}options.${column.DictType}${else}options.${column.CsharpFieldFl}Options$end" :key="item.dictValue" :value="${value}">
                   {{item.dictLabel}}
                 </el-radio>
               </el-radio-group>
diff --git a/ZR.Admin.WebApi/wwwroot/data.xlsx b/ZR.Admin.WebApi/wwwroot/data.xlsx
index 08cd79eea0de5536617dfdcdcc8a1d127317c33e..e9f1b7439304b1c492831403e928c56c8bd58f6a 100644
Binary files a/ZR.Admin.WebApi/wwwroot/data.xlsx and b/ZR.Admin.WebApi/wwwroot/data.xlsx differ
diff --git a/ZR.Common/MailHelper.cs b/ZR.Common/MailHelper.cs
index e08ec824224a9908cbdfcc5f406e0053cc4ed453..fe1b52342ccb918b5d6274914111311ac0e15c2d 100644
--- a/ZR.Common/MailHelper.cs
+++ b/ZR.Common/MailHelper.cs
@@ -6,6 +6,7 @@ using MimeKit.Text;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 
 namespace ZR.Common
 {
@@ -14,18 +15,18 @@ namespace ZR.Common
         /// <summary>
         /// 发送人邮箱
         /// </summary>
-        public string FromEmail { get; set; } = "";
         private readonly MailOptions mailOptions = new();
 
-        //public MailHelper()
-        //{
-        //    AppSettings.Bind("MailOptions", mailOptions);
-        //    FromEmail = mailOptions.FromEmail;
-        //}
+        public MailHelper()
+        {
+            List<MailOptions> options = new();
+
+            AppSettings.Bind("MailOptions", options);
+            mailOptions = options.First();
+        }
         public MailHelper(MailOptions _mailOptions)
         {
-            this.mailOptions = _mailOptions;
-            FromEmail = _mailOptions.FromEmail;
+            mailOptions = _mailOptions;
         }
         /// <summary>
         /// 发送一个
diff --git a/ZR.ServiceCore/Model/Article.cs b/ZR.Model/Content/Article.cs
similarity index 91%
rename from ZR.ServiceCore/Model/Article.cs
rename to ZR.Model/Content/Article.cs
index d42b27a0df31df510d171485e730542779d8fb0b..8ab086ba6fe9e7f43e32eb8b9e1c07047e9854a0 100644
--- a/ZR.ServiceCore/Model/Article.cs
+++ b/ZR.Model/Content/Article.cs
@@ -1,11 +1,11 @@
-using ZR.ServiceCore.Model.Enums;
+using ZR.Model.Enum;
 
-namespace ZR.Model.System
+namespace ZR.Model.Content
 {
     /// <summary>
     /// 文章表
     /// </summary>
-    [SugarTable("article", "文章管理")]
+    [SugarTable("article", "内容管理")]
     [Tenant("0")]
     public class Article
     {
@@ -13,11 +13,11 @@ namespace ZR.Model.System
         /// 文章id
         /// </summary>
         [SugarColumn(IsIdentity = true, IsPrimaryKey = true)]
-        public int Cid { get; set; }
+        public long Cid { get; set; }
         /// <summary>
         /// 文章标题
         /// </summary>
-        [SugarColumn(ColumnDescription = "文章标题", Length = 254, ExtendedAttribute = ProteryConstant.NOTNULL)]
+        [SugarColumn(ColumnDescription = "文章标题", Length = 254, ExtendedAttribute = EntityConstant.NOTNULL)]
         public string Title { get; set; }
         /// <summary>
         /// 发布时间
@@ -37,12 +37,12 @@ namespace ZR.Model.System
         /// <summary>
         /// 作者名
         /// </summary>
-        [SugarColumn(ColumnDescription = "作者名", Length = 20, ExtendedAttribute = ProteryConstant.NOTNULL)]
+        [SugarColumn(ColumnDescription = "作者名", Length = 20, ExtendedAttribute = EntityConstant.NOTNULL)]
         public string AuthorName { get; set; }
         /// <summary>
         /// 发布者用户id
         /// </summary>
-        [SugarColumn(ColumnDescription = "发布者用户id", ExtendedAttribute = ProteryConstant.NOTNULL)]
+        [SugarColumn(ColumnDescription = "发布者用户id", ExtendedAttribute = EntityConstant.NOTNULL)]
         public long UserId { get; set; }
         /// <summary>
         /// 文章状态 1、发布 2、草稿
@@ -112,5 +112,9 @@ namespace ZR.Model.System
         /// 手机型号
         /// </summary>
         public string PhoneModel { get; set; }
+        /// <summary>
+        /// 话题ID
+        /// </summary>
+        public long TopicId { get; set; }
     }
 }
diff --git a/ZR.Model/Content/ArticleBrowsingLog.cs b/ZR.Model/Content/ArticleBrowsingLog.cs
new file mode 100644
index 0000000000000000000000000000000000000000..31b9e7ba95cb8e6b8113a9ab0d4dd27ecd13302c
--- /dev/null
+++ b/ZR.Model/Content/ArticleBrowsingLog.cs
@@ -0,0 +1,18 @@
+namespace ZR.Model.Content
+{
+    [SugarTable("article_browsing_log", "内容浏览记录")]
+    [Tenant("0")]
+    public class ArticleBrowsingLog
+    {
+        [SugarColumn(IsPrimaryKey = true)]
+        public long LogId { get; set; }
+        public string Location { get; set; }
+        public string UserIP { get; set; }
+        public DateTime AddTime { get; set; }
+        /// <summary>
+        /// 文章ID
+        /// </summary>
+        public long ArticleId { get; set; }
+        public long UserId { get; set; }
+    }
+}
diff --git a/ZR.ServiceCore/Model/ArticleCategory.cs b/ZR.Model/Content/ArticleCategory.cs
similarity index 53%
rename from ZR.ServiceCore/Model/ArticleCategory.cs
rename to ZR.Model/Content/ArticleCategory.cs
index a7189c1bde3726f48ba83fa9ed184eda75d37758..db712d1e550754c6425407b30da8078529045069 100644
--- a/ZR.ServiceCore/Model/ArticleCategory.cs
+++ b/ZR.Model/Content/ArticleCategory.cs
@@ -1,4 +1,4 @@
-namespace ZR.Model.System
+namespace ZR.Model.Content
 {
     /// <summary>
     /// 文章目录
@@ -13,7 +13,7 @@
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnName = "category_id")]
         public int CategoryId { get; set; }
 
-        [SugarColumn(ColumnDescription = "目录名", Length = 20, ExtendedAttribute = ProteryConstant.NOTNULL)]
+        [SugarColumn(ColumnDescription = "目录名", Length = 20, ExtendedAttribute = EntityConstant.NOTNULL)]
         public string Name { get; set; }
         [SugarColumn(ColumnDescription = "图标")]
         public string Icon { get; set; }
@@ -22,8 +22,31 @@
         /// </summary>
         public int OrderNum { get; set; }
         public int? ParentId { get; set; }
-        [SugarColumn(ColumnDescription = "创建时间", ColumnName = "create_time")]
-        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 背景图
+        /// </summary>
+        public string BgImg { get; set; }
+        /// <summary>
+        /// 介绍
+        /// </summary>
+        public string Introduce { get; set; }
+        /// <summary>
+        /// 分类类型 0、文章  1、圈子
+        /// </summary>
+        public int CategoryType { get; set; }
+        /// <summary>
+        /// 文章数
+        /// </summary>
+        public int ArticleNum { get; set; }
+        /// <summary>
+        /// 加入人数
+        /// </summary>
+        public int JoinNum { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "创建时间", ColumnName = "create_time", InsertServerTime = true)]
+        public DateTime CreateTime { get; set; }
 
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         [SugarColumn(IsIgnore = true)]
diff --git a/ZR.Model/Content/ArticleComment.cs b/ZR.Model/Content/ArticleComment.cs
new file mode 100644
index 0000000000000000000000000000000000000000..415988514c021f21ae4f685a182e82b82fcab70c
--- /dev/null
+++ b/ZR.Model/Content/ArticleComment.cs
@@ -0,0 +1,85 @@
+namespace ZR.Model.Content
+{
+    [SugarTable("article_comment", "评论表")]
+    [Tenant(0)]
+    public class ArticleComment
+    {
+        /// <summary>
+        /// 评论ID
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true)]
+        [JsonConverter(typeof(ValueToStringConverter))]
+        public long CommentId { get; set; }
+        /// <summary>
+        /// 用户id
+        /// </summary>
+        public long UserId { get; set; }
+        /// <summary>
+        /// 内容
+        /// </summary>
+        public string Content { get; set; }
+        /// <summary>
+        /// 最顶级留言id
+        /// </summary>
+        public long ParentId { get; set; } = 0;
+        /// <summary>
+        /// 评论时间
+        /// </summary>
+        public DateTime AddTime { get; set; }
+        /// <summary>
+        /// 回复用户id
+        /// </summary>
+        public long ReplyUserId { get; set; }
+        /// <summary>
+        /// 回复留言id
+        /// </summary>
+        public long ReplyId { get; set; }
+        /// <summary>
+        /// 用户ip
+        /// </summary>
+        public string UserIP { get; set; }
+        /// <summary>
+        /// 地理位置
+        /// </summary>
+        public string Location { get; set; } = string.Empty;
+        /// <summary>
+        /// 喜欢次数
+        /// </summary>
+        public int PraiseNum { get; set; } = 0;
+
+        /// <summary>
+        /// 评论次数
+        /// </summary>
+        public int ReplyNum { get; set; } = 0;
+        /// <summary>
+        /// 审核状态 0、待审核 1、通过 -1、未通过
+        /// </summary>
+        public int AuditStatus { get; set; }
+        /// <summary>
+        /// 描述 :是否删除 1、删除 0、正常
+        /// 空值 : true  
+        /// </summary>
+        [JsonIgnore]
+        public int IsDelete { get; set; } = 0;
+        /// <summary>
+        /// 聊天图片
+        /// </summary>
+        public string ChatImg { get; set; }
+        /// <summary>
+        /// 分类id（可以对应表)
+        /// </summary>
+        public int ClassifyId { get; set; }
+        /// <summary>
+        /// 目标id(内容id)
+        /// </summary>
+        public long TargetId { get; set; }
+        /// <summary>
+        /// 是否置顶
+        /// </summary>
+        public long Top { get; set; }
+        /// <summary>
+        /// 作者回复过
+        /// </summary>
+        public int AuthorReply { get; set; }
+    }
+}
diff --git a/ZR.Model/Content/ArticlePraise.cs b/ZR.Model/Content/ArticlePraise.cs
new file mode 100644
index 0000000000000000000000000000000000000000..dbfdc5fa9d480e291926d283d886c9c5bc235b75
--- /dev/null
+++ b/ZR.Model/Content/ArticlePraise.cs
@@ -0,0 +1,18 @@
+namespace ZR.Model.Content
+{
+    [SugarTable("article_praise", "内容点赞记录")]
+    [Tenant("0")]
+    public class ArticlePraise
+    {
+        [SugarColumn(IsPrimaryKey = true)]
+        public long PId { get; set; }
+        public long UserId { get; set; }
+        public long ArticleId { get; set; }
+        public string UserIP { get; set; }
+        public long ToUserId { get; set; }
+        public int IsDelete { get; set; }
+        [SugarColumn(InsertServerTime = true)]
+        public DateTime AddTime { get; set; }
+        public string Location { get; set; }
+    }
+}
diff --git a/ZR.Model/Content/ArticleTopic.cs b/ZR.Model/Content/ArticleTopic.cs
new file mode 100644
index 0000000000000000000000000000000000000000..d1e7bff8cfb1f7cab702b4f4ec2a6747d69b1157
--- /dev/null
+++ b/ZR.Model/Content/ArticleTopic.cs
@@ -0,0 +1,45 @@
+
+namespace ZR.Model.Content
+{
+    /// <summary>
+    /// 文章话题
+    /// </summary>
+    [SugarTable("article_topic", TableDescription = "话题")]
+    [Tenant("0")]
+    public class ArticleTopic
+    {
+        /// <summary>
+        /// 话题ID 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public long TopicId { get; set; }
+
+        /// <summary>
+        /// 话题名 
+        /// </summary>
+        public string TopicName { get; set; }
+
+        /// <summary>
+        /// 话题描述 
+        /// </summary>
+        public string TopicDescription { get; set; }
+
+        /// <summary>
+        /// 参与/发起次数 
+        /// </summary>
+        public int JoinNum { get; set; }
+        /// <summary>
+        /// 浏览次数
+        /// </summary>
+        public int ViewNum { get; set; }
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(InsertServerTime = true)]
+        public DateTime? AddTime { get; set; }
+        /// <summary>
+        /// 话题分类
+        /// </summary>
+        public int TopicType { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/ZR.ServiceCore/Model/Dto/ArticleCategoryDto.cs b/ZR.Model/Dto/Content/ArticleCategoryDto.cs
similarity index 49%
rename from ZR.ServiceCore/Model/Dto/ArticleCategoryDto.cs
rename to ZR.Model/Dto/Content/ArticleCategoryDto.cs
index 16b94d5a23639908508663eeb020092f813385ff..efe000f191da08cabcd8c894fb074b4a22c6691b 100644
--- a/ZR.ServiceCore/Model/Dto/ArticleCategoryDto.cs
+++ b/ZR.Model/Dto/Content/ArticleCategoryDto.cs
@@ -1,6 +1,3 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-
 namespace ZR.Model.Dto
 {
     /// <summary>
@@ -16,12 +13,31 @@ namespace ZR.Model.Dto
         public int OrderNum { get; set; }
         public DateTime? CreateTime { get; set; }
         public int? ParentId { get; set; }
+        public int CategoryType { get; set; }
+        /// <summary>
+        /// 背景图
+        /// </summary>
+        public string BgImg { get; set; }
+        /// <summary>
+        /// 介绍
+        /// </summary>
+        public string Introduce { get; set; }
+        /// <summary>
+        /// 文章数
+        /// </summary>
+        public int ArticleNum { get; set; }
+        /// <summary>
+        /// 加入人数
+        /// </summary>
+        public int JoinNum { get; set; }
     }
 
     /// <summary>
     /// 文章目录查询对象
     /// </summary>
-    public class ArticleCategoryQueryDto : PagerInfo 
+    public class ArticleCategoryQueryDto : PagerInfo
     {
+        public int? CategoryType { get; set; }
+        public int? ParentId { get; set; }
     }
 }
diff --git a/ZR.Model/Dto/Content/ArticleCommentDto.cs b/ZR.Model/Dto/Content/ArticleCommentDto.cs
new file mode 100644
index 0000000000000000000000000000000000000000..d23ad40a7f12ec0bb36ef44b4bdab6ad20d4316d
--- /dev/null
+++ b/ZR.Model/Dto/Content/ArticleCommentDto.cs
@@ -0,0 +1,112 @@
+namespace ZR.Model.Dto
+{
+    /// <summary>
+    /// 评论
+    /// </summary>
+    public class MessageQueryDto : PagerInfo
+    {
+        public long CommentId { get; set; }
+        public long ParentId { get; set; }
+        public int OrderBy { get; set; }
+        public long? UserId { get; set; }
+        public int ClassifyId { get; set; }
+        public long TargetId { get; set; }
+        public DateTime? BeginAddTime { get; set; }
+        public DateTime? EndAddTime { get; set; }
+    }
+
+    public class ArticleCommentDto
+    {
+        [JsonConverter(typeof(ValueToStringConverter))]
+        public long CommentId { get; set; }
+        /// <summary>
+        /// 用户id
+        /// </summary>
+        public long UserId { get; set; }
+        /// <summary>
+        /// 留言内容
+        /// </summary>
+        public string Content { get; set; }
+        /// <summary>
+        /// 最顶级留言id
+        /// </summary>
+        [JsonConverter(typeof(ValueToStringConverter))]
+        public long ParentId { get; set; }
+        /// <summary>
+        /// 评论时间
+        /// </summary>
+        public DateTime AddTime { get; set; }
+        /// <summary>
+        /// 回复用户id
+        /// </summary>
+        public int ReplyUserId { get; set; }
+        public string ReplyNickName { get; set; }
+        /// <summary>
+        /// 回复留言id
+        /// </summary>
+        [JsonConverter(typeof(ValueToStringConverter))]
+        public long ReplyId { get; set; }
+        /// <summary>
+        /// 用户ip
+        /// </summary>
+        [JsonIgnore]
+        public string UserIP { get; set; }
+        /// <summary>
+        /// 地理位置
+        /// </summary>
+        [JsonIgnore]
+        public string Location { get; set; } = string.Empty;
+        /// <summary>
+        /// 喜欢次数
+        /// </summary>
+        public int PraiseNum { get; set; }
+
+        /// <summary>
+        /// 评论次数
+        /// </summary>
+        public int ReplyNum { get; set; }
+        ///// <summary>
+        ///// 审核状态 0、待审核 1、通过 -1、未通过
+        ///// </summary>
+        //public int AuditStatus { get; set; }
+        /// <summary>
+        /// 描述 :是否删除 1、删除 0、正常
+        /// 空值 : true  
+        /// </summary>
+        [JsonIgnore]
+        public int IsDelete { get; set; } = 0;
+        public string NickName { get; set; }
+
+        ///// <summary>
+        ///// 分享次数
+        ///// </summary>
+        //public int ShareNunm { get; set; }
+        public string Avatar { get; set; } = string.Empty;
+        public string ChatImg { get; set; }
+        /// <summary>
+        /// 分类id
+        /// </summary>
+        public int ClassifyId { get; set; }
+        /// <summary>
+        /// 目标id
+        /// </summary>
+        public long TargetId { get; set; }
+        /// <summary>
+        /// 置顶
+        /// </summary>
+        public long Top { get; set; }
+        public string Position
+        {
+            get
+            {
+                var temp_location = Location.Split("-")?[0];
+
+                if (temp_location == "0")
+                {
+                    return "IP未知";
+                }
+                return temp_location?.Replace("省", "");
+            }
+        }
+    }
+}
diff --git a/ZR.ServiceCore/Model/Dto/ArticleDto.cs b/ZR.Model/Dto/Content/ArticleDto.cs
similarity index 63%
rename from ZR.ServiceCore/Model/Dto/ArticleDto.cs
rename to ZR.Model/Dto/Content/ArticleDto.cs
index 74e654eabbecd28e634dee6227596ab9df8338a8..920c0e39fbc844d13689649314f0ba3fac0123c8 100644
--- a/ZR.ServiceCore/Model/Dto/ArticleDto.cs
+++ b/ZR.Model/Dto/Content/ArticleDto.cs
@@ -1,7 +1,6 @@
-using System.ComponentModel.DataAnnotations;
-using ZR.Common;
+using ZR.Model.Dto;
 
-namespace ZR.Model.System.Dto
+namespace ZR.Model.Dto
 {
     public class ArticleQueryDto : PagerInfo
     {
@@ -19,6 +18,14 @@ namespace ZR.Model.System.Dto
         /// 1、最新 2、私密 3、热门
         /// </summary>
         public int TabId { get; set; }
+        /// <summary>
+        /// 话题ID
+        /// </summary>
+        public int? TopicId { get; set; }
+        /// <summary>
+        /// 排序 1、热门 2、最新
+        /// </summary>
+        public int? OrderBy { get; set; }
     }
 
     /// <summary>
@@ -27,7 +34,7 @@ namespace ZR.Model.System.Dto
     public class ArticleDto
     {
         [Required(ErrorMessage = "Cid不能为空")]
-        public int Cid { get; set; }
+        public long Cid { get; set; }
         [Required(ErrorMessage = "标题不能为空")]
         public string Title { get; set; }
         [Required(ErrorMessage = "内容不能为空")]
@@ -53,8 +60,14 @@ namespace ZR.Model.System.Dto
 
         public string CoverUrl { get; set; }
 
-        public ArticleCategory ArticleCategoryNav { get; set; }
-        public string[] TagList { get; set; }
+        public ArticleCategoryDto CategoryNav { get; set; }
+        public string[] TagList
+        {
+            get
+            {
+                return Tags?.Split(',', StringSplitOptions.RemoveEmptyEntries) ?? Array.Empty<string>();
+            }
+        }
         public int IsPublic { get; set; } = 1;
         public string AbstractText { get; set; }
         public int IsTop { get; set; }
@@ -77,10 +90,12 @@ namespace ZR.Model.System.Dto
         /// <summary>
         /// 用户IP
         /// </summary>
+        [JsonIgnore]
         public string UserIP { get; set; }
         /// <summary>
         /// 地理位置
         /// </summary>
+        [JsonIgnore]
         public string Location { get; set; }
         /// <summary>
         /// 手机型号
@@ -93,10 +108,37 @@ namespace ZR.Model.System.Dto
         {
             get
             {
-                return Tools.SplitAndConvert<string>(CoverUrl, ',');
+                return CoverUrl?.Split(',', StringSplitOptions.RemoveEmptyEntries) ?? Array.Empty<string>();
+            }
+        }
+        /// <summary>
+        /// 地理位置
+        /// </summary>
+        public string Position
+        {
+            get
+            {
+                var temp_location = Location?.Split("-")?[0];
+
+                if (temp_location == "0")
+                {
+                    return "IP未知";
+                }
+                return temp_location?.Replace("省", "");
             }
         }
-        public string Avatar { get; set; }
+        /// <summary>
+        /// 是否点赞
+        /// </summary>
+        public int IsPraise { get; set; }
+        public long TopicId { get; set; }
+        public string TopicName { get; set; }
+        public ArticleUser User { get; set; }
+    }
+    public class ArticleUser
+    {
+        public string Avatar { get; set; } = string.Empty;
         public string NickName { get; set; }
+        public int Sex { get; set; }
     }
 }
diff --git a/ZR.Model/Dto/Content/ArticlePraiseDto.cs b/ZR.Model/Dto/Content/ArticlePraiseDto.cs
new file mode 100644
index 0000000000000000000000000000000000000000..adb7865fe634ae1e4211ac802bd5bfbf04bde9a6
--- /dev/null
+++ b/ZR.Model/Dto/Content/ArticlePraiseDto.cs
@@ -0,0 +1,12 @@
+namespace ZR.Model.Dto
+{
+    public class ArticlePraiseDto
+    {
+        public long UserId { get; set; }
+        public long ArticleId { get; set; }
+        public string UserIP { get; set; }
+        public long ToUserId { get; set; }
+        public int IsDelete { get; set; }
+        public string Location { get; set; }
+    }
+}
diff --git a/ZR.Model/Dto/Content/ArticleTopicDto.cs b/ZR.Model/Dto/Content/ArticleTopicDto.cs
new file mode 100644
index 0000000000000000000000000000000000000000..85aefc48437ba69aa9fe8ee285a54c90e915f402
--- /dev/null
+++ b/ZR.Model/Dto/Content/ArticleTopicDto.cs
@@ -0,0 +1,43 @@
+namespace ZR.Model.Dto
+{
+    /// <summary>
+    /// 文章话题查询对象
+    /// </summary>
+    public class ArticleTopicQueryDto : PagerInfo 
+    {
+    }
+
+    /// <summary>
+    /// 文章话题输入输出对象
+    /// </summary>
+    public class ArticleTopicDto
+    {
+        [Required(ErrorMessage = "话题ID不能为空")]
+        [ExcelColumn(Name = "话题ID")]
+        [ExcelColumnName("话题ID")]
+        public long TopicId { get; set; }
+
+        [Required(ErrorMessage = "话题名不能为空")]
+        [ExcelColumn(Name = "话题名")]
+        [ExcelColumnName("话题名")]
+        public string TopicName { get; set; }
+
+        [ExcelColumn(Name = "话题描述")]
+        [ExcelColumnName("话题描述")]
+        public string TopicDescription { get; set; } = string.Empty;
+
+        [ExcelColumn(Name = "参与次数")]
+        [ExcelColumnName("参与次数")]
+        public int JoinNum { get; set; }
+
+        [ExcelColumn(Name = "创建时间", Format = "yyyy-MM-dd HH:mm:ss", Width = 20)]
+        [ExcelColumnName("创建时间")]
+        public DateTime? AddTime { get; set; }
+        /// <summary>
+        /// 浏览次数
+        /// </summary>
+        [ExcelColumn(Name = "浏览次数")]
+        [ExcelColumnName("浏览次数")]
+        public int ViewNum { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/ZR.Model/Dto/UserDto.cs b/ZR.Model/Dto/UserDto.cs
new file mode 100644
index 0000000000000000000000000000000000000000..00a9b0e4ea5db1b72895ec572257665385ac5acd
--- /dev/null
+++ b/ZR.Model/Dto/UserDto.cs
@@ -0,0 +1,21 @@
+namespace ZR.Model.Dto
+{
+    public class UserDto
+    {
+        public long UserId { get; set; }
+        public string UserName { get; set; }
+        public string NickName { get; set; }
+        public string Email { get; set; }
+        public string Remark { get; set; }
+        public string Avatar { get; set; }
+        /// <summary>
+        /// 用户性别（0男 1女 2未知）
+        /// </summary>
+        public int Sex { get; set; }
+
+        /// <summary>
+        /// 最后登录IP
+        /// </summary>
+        public string LoginIP { get; set; }
+    }
+}
diff --git a/ZR.Model/EntityConstant.cs b/ZR.Model/EntityConstant.cs
new file mode 100644
index 0000000000000000000000000000000000000000..782c2731969d4469e0973cbcf8b5926e13687fdd
--- /dev/null
+++ b/ZR.Model/EntityConstant.cs
@@ -0,0 +1,4 @@
+public enum EntityConstant
+{
+    NOTNULL = 0
+}
diff --git a/ZR.ServiceCore/Model/Enums/ArticleTypeEnum.cs b/ZR.Model/Enum/ArticleTypeEnum.cs
similarity index 72%
rename from ZR.ServiceCore/Model/Enums/ArticleTypeEnum.cs
rename to ZR.Model/Enum/ArticleTypeEnum.cs
index 40af09e5d75db2cda77871e560f2f354d9ffb11b..e0505f5503eacdf56c1c7c8c33fb6e3993fcf537 100644
--- a/ZR.ServiceCore/Model/Enums/ArticleTypeEnum.cs
+++ b/ZR.Model/Enum/ArticleTypeEnum.cs
@@ -1,4 +1,4 @@
-namespace ZR.ServiceCore.Model.Enums
+namespace ZR.Model.Enum
 {
     public enum ArticleTypeEnum
     {
diff --git a/ZR.Repository/BaseRepository.cs b/ZR.Repository/BaseRepository.cs
index e2611f538b928e86d5e0b16b985a4f291d349f36..790b7bcf2c607db1c29ad78489575ca4cbf731ec 100644
--- a/ZR.Repository/BaseRepository.cs
+++ b/ZR.Repository/BaseRepository.cs
@@ -171,15 +171,6 @@ namespace ZR.Repository
             return Context.Deleteable<T>();
         }
 
-        /// <summary>
-        /// 批量删除
-        /// </summary>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        public int Delete(object[] obj, string title = "")
-        {
-            return Context.Deleteable<T>().In(obj).EnableDiffLogEventIF(title.IsNotEmpty(), title).ExecuteCommand();
-        }
         public int Delete(object id, string title = "")
         {
             return Context.Deleteable<T>(id).EnableDiffLogEventIF(title.IsNotEmpty(), title).ExecuteCommand();
diff --git a/ZR.Repository/IBaseRepository.cs b/ZR.Repository/IBaseRepository.cs
index 96f455e49b3ea6cf7c00c4ee770099f2bc443c0c..c8cba010d8b77447df8f2c9bfbe971e277a63d95 100644
--- a/ZR.Repository/IBaseRepository.cs
+++ b/ZR.Repository/IBaseRepository.cs
@@ -42,7 +42,6 @@ namespace ZR.Repository
 
         #region delete
         IDeleteable<T> Deleteable();
-        int Delete(object[] obj, string title = "");
         int Delete(object id, string title = "");
         int DeleteTable();
         bool Truncate();
diff --git a/ZR.ServiceCore/Services/ArticleCategoryService.cs b/ZR.Service/Content/ArticleCategoryService.cs
similarity index 80%
rename from ZR.ServiceCore/Services/ArticleCategoryService.cs
rename to ZR.Service/Content/ArticleCategoryService.cs
index f81644920dbdf289379d00740f9d434123533ac3..7e3ef3e8cd368f03a7611e5a8903f574698f98c8 100644
--- a/ZR.ServiceCore/Services/ArticleCategoryService.cs
+++ b/ZR.Service/Content/ArticleCategoryService.cs
@@ -1,10 +1,12 @@
 using Infrastructure.Attribute;
+using Infrastructure.Extensions;
 using ZR.Model;
+using ZR.Model.Content;
 using ZR.Model.Dto;
-using ZR.Model.System;
 using ZR.Repository;
+using ZR.Service.Content.IService;
 
-namespace ZR.ServiceCore.Services
+namespace ZR.Service.Content
 {
     /// <summary>
     /// 文章目录Service业务层处理
@@ -20,9 +22,12 @@ namespace ZR.ServiceCore.Services
         public PagedInfo<ArticleCategory> GetList(ArticleCategoryQueryDto parm)
         {
             var predicate = Expressionable.Create<ArticleCategory>();
+            predicate.AndIF(parm.CategoryType != null, m => m.CategoryType == parm.CategoryType);
+            predicate.AndIF(parm.ParentId != null, m => m.ParentId == parm.ParentId);
 
             var response = Queryable()
                 .Where(predicate.ToExpression())
+                .WithCache(60 * 5)
                 .ToPage(parm);
 
             return response;
@@ -36,6 +41,8 @@ namespace ZR.ServiceCore.Services
         public List<ArticleCategory> GetTreeList(ArticleCategoryQueryDto parm)
         {
             var predicate = Expressionable.Create<ArticleCategory>();
+            predicate.AndIF(parm.CategoryType != null, m => m.CategoryType == parm.CategoryType);
+
             var response = Queryable()
                 .Where(predicate.ToExpression());
 
diff --git a/ZR.Service/Content/ArticleCommentService.cs b/ZR.Service/Content/ArticleCommentService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..e10047999bcc157963b58bf4c5674b309fe9d468
--- /dev/null
+++ b/ZR.Service/Content/ArticleCommentService.cs
@@ -0,0 +1,220 @@
+using Infrastructure;
+using Infrastructure.Attribute;
+using Infrastructure.Extensions;
+using ZR.Model;
+using ZR.Model.Content;
+using ZR.Model.Dto;
+using ZR.Model.System;
+using ZR.Repository;
+using ZR.Service.Content.IService;
+using ZR.ServiceCore.Services;
+
+namespace ZR.Service.Content
+{
+    [AppService(ServiceType = typeof(IArticleCommentService), ServiceLifetime = LifeTime.Transient)]
+    public class ArticleCommentService : BaseService<ArticleComment>, IArticleCommentService
+    {
+        private ISysUserService UserService;
+        private IEmailLogService EmailLogService;
+        private IArticleService ArticleService;
+        private ISysConfigService SysConfigService;
+
+        public ArticleCommentService(
+            ISysUserService userService,
+            IEmailLogService emailLogService,
+            IArticleService articleService,
+            ISysConfigService sysConfigService)
+        {
+            this.UserService = userService;
+            EmailLogService = emailLogService;
+            ArticleService = articleService;
+            SysConfigService = sysConfigService;
+        }
+
+        /// <summary>
+        /// 获取评论列表
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public PagedInfo<ArticleCommentDto> GetMessageList(MessageQueryDto dto)
+        {
+            var predicate = Expressionable.Create<ArticleComment>();
+            predicate.And(it => it.IsDelete == 0);
+            predicate.And(it => it.ParentId == dto.CommentId);
+            predicate.AndIF(dto.UserId != null, it => it.UserId == dto.UserId);
+            predicate.AndIF(dto.CommentId > 0, it => it.CommentId > dto.CommentId);//分页使用
+            predicate.AndIF(dto.ClassifyId > 0, it => it.ClassifyId == dto.ClassifyId);
+            predicate.AndIF(dto.ClassifyId == 0, it => it.ClassifyId == 0);
+            predicate.AndIF(dto.TargetId > 0, it => it.TargetId == dto.TargetId);
+
+            return Queryable()
+                .LeftJoin<SysUser>((it, u) => it.UserId == u.UserId)
+                .OrderByIF(dto.OrderBy == 1, it => it.PraiseNum, OrderByType.Desc)
+                .OrderByIF(dto.OrderBy == 2, it => it.CommentId, OrderByType.Desc)
+                .Where(predicate.ToExpression())
+                .WithCache(60 * 30)
+                .Select((it, u) => new ArticleCommentDto()
+                {
+                    NickName = u.NickName,
+                    Avatar = u.Avatar
+                }, true)
+                .ToPage(dto);
+        }
+
+        /// <summary>
+        /// 获取评论回复列表
+        /// </summary>
+        /// <param name="pager">分页</param>
+        /// <param name="cid"></param>
+        /// <returns></returns>
+        public PagedInfo<ArticleCommentDto> GetReplyComments(long cid, MessageQueryDto pager)
+        {
+            var list = Queryable()
+                .LeftJoin<SysUser>((f, u) => f.UserId == u.UserId)
+                .Where(f => f.ParentId == cid && f.IsDelete == 0)
+                //.WhereIF(cid > 0, f => f.MId > cid)
+                //.Includes(f => f.User.MappingField(z => z.Useridx, () => f.Useridx))
+                .OrderBy(f => f.CommentId)
+                .Select((f, u) => new ArticleCommentDto()
+                {
+                    NickName = u.NickName,
+                    Avatar = u.Avatar
+                }, true)
+                .ToPage(pager);
+            //Context.ThenMapper(list.Result, f =>
+            //{
+            //    if (f.ReplyId > 0 && f.ReplyUserId > 0)
+            //    {
+            //        f.ReplyNickName = UserService.GetFirst(x => x.UserId == f.ReplyUserId).NickName;
+            //    }
+            //});
+            return list;
+        }
+
+        /// <summary>
+        /// 评论
+        /// </summary>
+        /// <param name="message"></param>
+        /// <returns></returns>
+        public ArticleComment AddMessage(ArticleComment message)
+        {
+            var configInfo = SysConfigService.GetFirst(f => f.ConfigKey == "article.comment") ?? throw new CustomException(ResultCode.CUSTOM_ERROR, "评论失败，请联系管理员");
+            var userInfo = UserService.GetById(message.UserId);
+
+            if (configInfo.ConfigValue == "1" && userInfo.Phonenumber.IsEmpty())
+            {
+                throw new CustomException(ResultCode.PHONE_BIND, "请绑定手机号");
+            }
+
+            var ipInfo = HttpContextExtension.GetIpInfo(message.UserIP);
+            message.Location = ipInfo;
+            message.AddTime = DateTime.Now;
+            ArticleComment result = null;
+            var r = UseTran(() =>
+            {
+                result = InsertReturnEntity(message);
+                if (result != null && result.CommentId > 0)
+                {
+                    if (message.ParentId > 0)
+                    {
+                        //评论表 评论数 + 1
+                        Update(it => it.CommentId == message.ParentId, it => new ArticleComment() { ReplyNum = it.ReplyNum + 1 });
+                    }
+
+                    //内容表评论数加1
+                    if (message.TargetId > 0)
+                    {
+                        ArticleService.Update(it => it.Cid == (int)message.TargetId, it => new Article() { CommentNum = it.CommentNum + 1 });
+                    }
+                }
+            });
+            //查询出评论的内容信息找出作者
+            var targetInfo = GetFirst(f => f.CommentId == message.TargetId);
+            if (targetInfo != null && targetInfo.UserId != message.UserId)
+            {
+                //TODO IM消息
+
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// 消息点赞
+        /// </summary>
+        /// <param name="mid"></param>
+        /// <returns></returns>
+        public int PraiseMessage(long mid)
+        {
+            return Context.Updateable<ArticleComment>()
+                .SetColumns(it => it.PraiseNum == it.PraiseNum + 1)
+                .Where(it => it.CommentId == mid)
+                .ExecuteCommand();
+        }
+
+        /// <summary>
+        /// 删除评论
+        /// </summary>
+        /// <param name="commentId">评论ID</param>
+        /// <param name="userId">当前登录用户</param>
+        /// <returns></returns>
+        public int DeleteMessage(long commentId, long userId)
+        {
+            var info = GetById(commentId) ?? throw new CustomException("评论不存在");
+            var postInfo = ArticleService.GetById(info.TargetId);
+            if (userId != info.UserId && userId != postInfo.UserId)
+            {
+                return 0;
+            }
+            var deleteNum = 0;
+            var result = UseTran(() =>
+            {
+                Update(it => it.CommentId == commentId, it => new ArticleComment() { IsDelete = 1 });
+                if (info.ParentId > 0)
+                {
+                    //评论表 评论数 - 1
+                    Update(it => it.CommentId == info.ParentId, it => new ArticleComment() { ReplyNum = it.ReplyNum - 1 });
+                }
+                //减少文章评论次数
+                if (info.TargetId > 0)
+                {
+                    deleteNum = info.ReplyNum > 0 ? info.ReplyNum + 1 : 1;
+
+                    ArticleService.Update(it => it.Cid == (int)info.TargetId, it => new Article()
+                    {
+                        CommentNum = it.CommentNum - deleteNum
+                    });
+                }
+            });
+            return result.IsSuccess ? deleteNum : 0;
+        }
+
+        /// <summary>
+        /// 获取评论列表
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public PagedInfo<ArticleCommentDto> GetMyMessageList(MessageQueryDto dto)
+        {
+            var predicate = Expressionable.Create<ArticleComment>();
+            predicate.And(it => it.IsDelete == 0);
+            //predicate.And(it => it.ParentId == dto.MId);
+            predicate.AndIF(dto.UserId != null, it => it.UserId == dto.UserId);
+            predicate.AndIF(dto.CommentId > 0, it => it.CommentId > dto.CommentId);//分页使用
+            predicate.AndIF(dto.BeginAddTime != null, it => it.AddTime >= dto.BeginAddTime && it.AddTime <= dto.EndAddTime);//分页使用
+
+            return Queryable()
+                .WithCache(60)
+                .OrderByIF(dto.OrderBy == 1, it => it.PraiseNum, OrderByType.Desc)
+                .OrderByIF(dto.OrderBy == 2, it => it.CommentId, OrderByType.Desc)
+                .Where(predicate.ToExpression())
+                //.Select((it, u) => new MessageDto()
+                //{
+                //    MId = it.MId.SelectAll(),
+                //    //NickName = u.NickName,
+                //    //Avatar = u.Avatar
+                //}, true)
+                .ToPage<ArticleComment, ArticleCommentDto>(dto);
+        }
+    }
+}
diff --git a/ZR.Service/Content/ArticlePraiseService.cs b/ZR.Service/Content/ArticlePraiseService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..94c9cbd11cde6405a6b7fdf6cf17266071673a4f
--- /dev/null
+++ b/ZR.Service/Content/ArticlePraiseService.cs
@@ -0,0 +1,85 @@
+using Infrastructure.Attribute;
+using ZR.Model.Content;
+using ZR.Service.Content.IService;
+
+namespace ZR.Service.Content
+{
+    [AppService(ServiceType = typeof(IArticlePraiseService), ServiceLifetime = LifeTime.Transient)]
+    public class ArticlePraiseService : BaseService<ArticlePraise>, IArticlePraiseService
+    {
+        private IArticleService _articleService;
+
+        public ArticlePraiseService(IArticleService articleService)
+        {
+            _articleService = articleService;
+        }
+
+        /// <summary>
+        /// 点赞
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public int Praise(ArticlePraise dto)
+        {
+            int result = 0;
+            var praiseInfo = GetFirst(f => f.UserId == dto.UserId && f.ArticleId == dto.ArticleId);
+            var isPraise = 0;
+            var r = UseTran(() =>
+            {
+                //第一次点赞插入数据
+                if (praiseInfo == null)
+                {
+                    Insertable(dto).ExecuteReturnSnowflakeId();
+                    result = _articleService.PraiseArticle(dto.ArticleId);
+                    isPraise = 1;
+                    //TODO 消息通知
+                }
+                else
+                {
+                    if (praiseInfo.IsDelete == 0)
+                    {
+                        result = CanclePraise(dto.UserId, dto.ArticleId);
+                        //文章点赞-1
+                        _articleService.CancelPraise(dto.ArticleId);
+                    }
+                    else
+                    {
+                        //文章点赞+1
+                        _articleService.PraiseArticle(dto.ArticleId);
+                        //恢复点赞为未删除状态
+                        PlusPraise(praiseInfo.PId);
+                        isPraise = 1;
+                    }
+                }
+            });
+            return r.IsSuccess && isPraise == 1 ? 1 : 0;
+        }
+
+        /// <summary>
+        /// 取消点赞点赞
+        /// </summary>
+        /// <param name="userid"></param>
+        /// <param name="articleId"></param>
+        /// <returns></returns>
+        public int CanclePraise(long userid, long articleId)
+        {
+            return Deleteable()
+                .Where(f => f.ArticleId == articleId && f.UserId == userid)
+                .IsLogic()
+                .ExecuteCommand(deleteValue: 1);
+        }
+
+        /// <summary>
+        /// 恢复点赞
+        /// </summary>
+        /// <param name="pid"></param>
+        /// <returns></returns>
+        public int PlusPraise(long pid)
+        {
+            return Deleteable()
+                .Where(f => f.PId == pid)
+                .IsLogic()
+                .ExecuteCommand(deleteValue: 0);
+        }
+    }
+}
diff --git a/ZR.ServiceCore/Services/ArticleService.cs b/ZR.Service/Content/ArticleService.cs
similarity index 46%
rename from ZR.ServiceCore/Services/ArticleService.cs
rename to ZR.Service/Content/ArticleService.cs
index cd3b01ea22b550b3f45c9a8c919fbe7809e3bf2c..241308130393f34939fae9cbc89f181228b1f11c 100644
--- a/ZR.ServiceCore/Services/ArticleService.cs
+++ b/ZR.Service/Content/ArticleService.cs
@@ -1,11 +1,18 @@
-using Infrastructure.Attribute;
+using Infrastructure;
+using Infrastructure.Attribute;
+using Infrastructure.Extensions;
+using Mapster;
+using ZR.Common;
 using ZR.Model;
+using ZR.Model.Content;
+using ZR.Model.Dto;
+using ZR.Model.Enum;
 using ZR.Model.System;
-using ZR.Model.System.Dto;
 using ZR.Repository;
-using ZR.ServiceCore.Model.Enums;
+using ZR.Service.Content.IService;
+using ZR.ServiceCore.Services;
 
-namespace ZR.ServiceCore.Services
+namespace ZR.Service.Content
 {
     /// <summary>
     /// 
@@ -13,6 +20,23 @@ namespace ZR.ServiceCore.Services
     [AppService(ServiceType = typeof(IArticleService), ServiceLifetime = LifeTime.Transient)]
     public class ArticleService : BaseService<Article>, IArticleService
     {
+        private readonly IArticleCategoryService _categoryService;
+        private readonly IArticleTopicService _topicService;
+        private readonly ISysConfigService _sysConfigService;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="categoryService"></param>
+        /// <param name="topicService"></param>
+        /// <param name="sysConfigService"></param>
+        public ArticleService(IArticleCategoryService categoryService, IArticleTopicService topicService, ISysConfigService sysConfigService)
+        {
+            _categoryService = categoryService;
+            _topicService = topicService;
+            _sysConfigService = sysConfigService;
+        }
+
         /// <summary>
         /// 查询文章管理列表
         /// </summary>
@@ -28,16 +52,18 @@ namespace ZR.ServiceCore.Services
             predicate = predicate.AndIF(parm.IsPublic != null, m => m.IsPublic == parm.IsPublic);
             predicate = predicate.AndIF(parm.IsTop != null, m => m.IsTop == parm.IsTop);
             predicate = predicate.AndIF(parm.ArticleType != null, m => (int)m.ArticleType == parm.ArticleType);
+            predicate = predicate.AndIF(parm.TopicId != null, m => m.TopicId == parm.TopicId);
 
             if (parm.CategoryId != null)
             {
                 var allChildCategory = Context.Queryable<ArticleCategory>()
-                    .ToChildList(it => it.ParentId, parm.CategoryId);
+                    .ToChildList(m => m.ParentId, parm.CategoryId);
                 var categoryIdList = allChildCategory.Select(x => x.CategoryId).ToArray();
-                predicate = predicate.And(it => categoryIdList.Contains(it.CategoryId));
+                predicate = predicate.And(m => categoryIdList.Contains(m.CategoryId));
             }
 
             var response = Queryable()
+                .WithCache(60 * 24)
                 .IgnoreColumns(x => new { x.Content })
                 .Includes(x => x.ArticleCategoryNav) //填充子对象
                 .Where(predicate.ToExpression())
@@ -52,36 +78,54 @@ namespace ZR.ServiceCore.Services
         /// </summary>
         /// <param name="parm"></param>
         /// <returns></returns>
-        public PagedInfo<ArticleDto> GetHotList(ArticleQueryDto parm)
+        public PagedInfo<ArticleDto> GetArticleList(ArticleQueryDto parm)
         {
             var predicate = Expressionable.Create<Article>();
             predicate = predicate.And(m => m.Status == "1");
             predicate = predicate.And(m => m.IsPublic == 1);
             predicate = predicate.AndIF(parm.IsTop != null, m => m.IsTop == parm.IsTop);
-            predicate = predicate.And(m => (int)m.ArticleType == parm.ArticleType);
+            predicate = predicate.And(m => m.ArticleType == ArticleTypeEnum.Article);
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.Title), m => m.Title.Contains(parm.Title));
+            predicate = predicate.AndIF(parm.TopicId != null, m => m.TopicId == parm.TopicId);
 
             if (parm.CategoryId != null)
             {
                 var allChildCategory = Context.Queryable<ArticleCategory>()
-                    .ToChildList(it => it.ParentId, parm.CategoryId);
+                    .ToChildList(m => m.ParentId, parm.CategoryId);
                 var categoryIdList = allChildCategory.Select(x => x.CategoryId).ToArray();
-                predicate = predicate.And(it => categoryIdList.Contains(it.CategoryId));
+                predicate = predicate.And(m => categoryIdList.Contains(m.CategoryId));
             }
 
             var response = Queryable()
-                .IgnoreColumns(x => new { x.Content })
+                .WithCache(60 * 30)
                 .Includes(x => x.ArticleCategoryNav)
                 .LeftJoin<SysUser>((m, u) => m.UserId == u.UserId).Filter(null, true)
                 .Where(predicate.ToExpression())
                 .OrderByDescending(m => m.Cid)
                 .Select((m, u) => new ArticleDto()
                 {
-                    Avatar = u.Avatar,
-                    NickName = u.NickName
+                    User = new ArticleUser()
+                    {
+                        Avatar = u.Avatar,
+                        NickName = u.NickName,
+                        Sex = u.Sex,
+                    },
+                    Content = string.Empty,
+                    UserIP = string.Empty,
+                    CategoryNav = m.ArticleCategoryNav.Adapt<ArticleCategoryDto>()
                 }, true)
                 .ToPage(parm);
 
+            if (parm.UserId > 0)
+            {
+                Context.ThenMapper(response.Result, item =>
+                {
+                    item.IsPraise = Context.Queryable<ArticlePraise>()
+                    .Where(f => f.UserId == parm.UserId && f.ArticleId == item.Cid && f.IsDelete == 0)
+                    .SetContext(scl => scl.ArticleId, () => item.Cid, item).Any() ? 1 : 0;
+                });
+            }
+
             return response;
         }
 
@@ -90,28 +134,63 @@ namespace ZR.ServiceCore.Services
         /// </summary>
         /// <param name="parm"></param>
         /// <returns></returns>
-        public PagedInfo<ArticleDto> GetArticleList(ArticleQueryDto parm)
+        public PagedInfo<ArticleDto> GetMonentList(ArticleQueryDto parm)
         {
             var predicate = Expressionable.Create<Article>();
             predicate = predicate.And(m => m.Status == "1");
             predicate = predicate.And(m => m.IsPublic == 1);
             predicate = predicate.And(m => m.ArticleType == ArticleTypeEnum.Monent);
+            predicate = predicate.AndIF(parm.TopicId != null, m => m.TopicId == parm.TopicId);
+            predicate = predicate.AndIF(parm.CategoryId != null, m => m.CategoryId == parm.CategoryId);
 
             var response = Queryable()
+                .Includes(x => x.ArticleCategoryNav) //填充子对象
                 .LeftJoin<SysUser>((m, u) => m.UserId == u.UserId).Filter(null, true)
                 .Where(predicate.ToExpression())
-                .OrderByIF(parm.TabId == 3, m => new { m.PraiseNum }, OrderByType.Desc)
+                .OrderByIF(parm.OrderBy == 1, m => new { m.PraiseNum, m.CommentNum }, OrderByType.Desc)
+                .OrderByIF(parm.OrderBy == 2, m => new { m.Cid }, OrderByType.Desc)
                 .OrderBy(m => m.Cid, OrderByType.Desc)
                 .Select((m, u) => new ArticleDto()
                 {
-                    Avatar = u.Avatar,
-                    NickName = u.NickName
+                    User = new ArticleUser()
+                    {
+                        Avatar = u.Avatar,
+                        NickName = u.NickName,
+                        Sex = u.Sex,
+                    },
+                    CategoryNav = m.ArticleCategoryNav.Adapt<ArticleCategoryDto>()
                 }, true)
                 .ToPage(parm);
 
+            if (parm.UserId > 0)
+            {
+                Context.ThenMapper(response.Result, item =>
+                {
+                    item.IsPraise = Context.Queryable<ArticlePraise>()
+                    .Where(f => f.UserId == parm.UserId && f.IsDelete == 0)
+                    .SetContext(scl => scl.ArticleId, () => item.Cid, item).Any() ? 1 : 0;
+                });
+            }
+
             return response;
         }
+        /// <summary>
+        /// 前台查询关注动态列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        public PagedInfo<ArticleDto> GetFollowMonentList(ArticleQueryDto parm)
+        {
+            var predicate = Expressionable.Create<Article>();
+            predicate = predicate.And(m => m.Status == "1");
+            predicate = predicate.And(m => m.IsPublic == 1);
+            predicate = predicate.And(m => m.ArticleType == ArticleTypeEnum.Monent);
+            predicate = predicate.AndIF(parm.TopicId != null, m => m.TopicId == parm.TopicId);
+            predicate = predicate.AndIF(parm.CategoryId != null, m => m.CategoryId == parm.CategoryId);
+
 
+            return new PagedInfo<ArticleDto>() { };
+        }
         /// <summary>
         /// 查询我的文章列表
         /// </summary>
@@ -133,8 +212,8 @@ namespace ZR.ServiceCore.Services
                 //.IgnoreColumns(x => new { x.Content })
                 .Includes(x => x.ArticleCategoryNav)
                 .Where(predicate.ToExpression())
-                .OrderByIF(parm.TabId == 3, m => new { m.PraiseNum }, OrderByType.Desc)
-                .OrderByDescending(m => m.Cid)
+                .OrderByIF(parm.TabId == 3, m => new { m.IsTop, m.PraiseNum }, OrderByType.Desc)
+                .OrderByDescending(m => new { m.IsTop, m.Cid })
                 .Select((x) => new ArticleDto()
                 {
                     Content = x.ArticleType == 0 ? string.Empty : x.Content,
@@ -200,12 +279,9 @@ namespace ZR.ServiceCore.Services
         /// </summary>
         /// <param name="cid"></param>
         /// <returns></returns>
-        public int UpdateArticleHit(int cid)
+        public int UpdateArticleHit(long cid)
         {
-            var response = Context.Updateable<Article>()
-                .SetColumns(it => it.Hits == it.Hits + 1)
-                .Where(it => it.Cid == cid)
-                .ExecuteCommand();
+            var response = Update(w => w.Cid == cid, it => new Article() { Hits = it.Hits + 1 });
             return response;
         }
 
@@ -214,12 +290,93 @@ namespace ZR.ServiceCore.Services
         /// </summary>
         /// <param name="cid"></param>
         /// <returns></returns>
-        public int PraiseArticle(int cid)
+        public int PraiseArticle(long cid)
+        {
+            return Update(w => w.Cid == cid, it => new Article() { PraiseNum = it.PraiseNum + 1 });
+        }
+        public int CancelPraise(long cid)
         {
-            return Context.Updateable<Article>()
-                .SetColumns(it => it.PraiseNum == it.PraiseNum + 1)
-                .Where(it => it.Cid == cid)
-                .ExecuteCommand();
+            return Update(w => w.Cid == cid, it => new Article() { PraiseNum = it.PraiseNum - 1 });
+        }
+
+        public Article PublishArticle(Article article)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// 发布动态
+        /// </summary>
+        /// <param name="article"></param>
+        /// <returns></returns>
+        public Article PublishMonent(Article article)
+        {
+            var httpContext = App.HttpContext;
+            article.ArticleType = ArticleTypeEnum.Monent;
+            article.AuthorName = HttpContextExtension.GetName(httpContext);
+            article.UserId = HttpContextExtension.GetUId(httpContext);
+            article.UserIP = HttpContextExtension.GetClientUserIp(httpContext);
+            article.Location = HttpContextExtension.GetIpInfo(article.UserIP);
+
+            article = InsertReturnEntity(article);
+            //跟新话题加入数
+            if (article.Cid > 0 && article.TopicId > 0)
+            {
+                _topicService.Update(w => w.TopicId == article.TopicId, it => new ArticleTopic() { JoinNum = it.JoinNum + 1 });
+            }
+            //更新圈子加入数
+            if (article.Cid > 0 && article.CategoryId > 0)
+            {
+                _categoryService.Update(w => w.CategoryId == article.CategoryId, it => new ArticleCategory() { JoinNum = it.JoinNum + 1 });
+            }
+            return article;
+        }
+
+        /// <summary>
+        /// 获取文章详情
+        /// </summary>
+        /// <param name="cid">内容id</param>
+        /// <param name="userId">当前用户id</param>
+        /// <returns></returns>
+        /// <exception cref="CustomException"></exception>
+        public ArticleDto GetArticle(long cid, long userId)
+        {
+            var response = GetId(cid);
+            var model = response.Adapt<ArticleDto>() ?? throw new CustomException(ResultCode.FAIL, "内容不存在");
+            if (model.IsPublic == 0 && userId != model.UserId)
+            {
+                throw new CustomException(ResultCode.CUSTOM_ERROR, "访问失败");
+            }
+            if (model != null)
+            {
+                model.CategoryNav = _categoryService.GetById(model.CategoryId).Adapt<ArticleCategoryDto>();
+            }
+
+            var webContext = App.HttpContext;
+            var CK = "ARTICLE_DETAILS_" + userId + HttpContextExtension.GetClientUserIp(webContext);
+            if (!CacheHelper.Exists(CK))
+            {
+                UpdateArticleHit(cid);
+                var userIP = HttpContextExtension.GetClientUserIp(webContext);
+                var location = HttpContextExtension.GetIpInfo(userIP);
+                itenant.InsertableWithAttr(new ArticleBrowsingLog()
+                {
+                    ArticleId = cid,
+                    UserId = userId,
+                    Location = location,
+                    UserIP = userIP,
+                    AddTime = DateTime.Now,
+                }).ExecuteReturnSnowflakeId();
+            }
+            CacheHelper.SetCache(CK, 1, 10);
+            if (userId > 0)
+            {
+                model.IsPraise = Context.Queryable<ArticlePraise>()
+               .Where(f => f.UserId == userId && f.ArticleId == cid && f.IsDelete == 0)
+               .Any() ? 1 : 0;
+            }
+
+            return model;
         }
     }
 }
diff --git a/ZR.Service/Content/ArticleTopicService.cs b/ZR.Service/Content/ArticleTopicService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..fdab831c498d8f45ebac6d80a59bf3b4773f9004
--- /dev/null
+++ b/ZR.Service/Content/ArticleTopicService.cs
@@ -0,0 +1,113 @@
+using Infrastructure.Attribute;
+using Mapster;
+using ZR.Model;
+using ZR.Model.Content;
+using ZR.Model.Dto;
+using ZR.Repository;
+using ZR.Service.Content.IService;
+
+namespace ZR.Service.Content
+{
+    /// <summary>
+    /// 文章话题Service业务层处理
+    /// </summary>
+    [AppService(ServiceType = typeof(IArticleTopicService), ServiceLifetime = LifeTime.Transient)]
+    public class ArticleTopicService : BaseService<ArticleTopic>, IArticleTopicService
+    {
+        /// <summary>
+        /// 查询文章话题列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        public PagedInfo<ArticleTopicDto> GetList(ArticleTopicQueryDto parm)
+        {
+            var predicate = QueryExp(parm);
+
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .ToPage<ArticleTopic, ArticleTopicDto>(parm);
+
+            return response;
+        }
+
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <param name="TopicId"></param>
+        /// <returns></returns>
+        public ArticleTopic GetInfo(long TopicId)
+        {
+            var response = Queryable()
+                .Where(x => x.TopicId == TopicId)
+                .First();
+
+            return response;
+        }
+
+        /// <summary>
+        /// 添加文章话题
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public ArticleTopic AddArticleTopic(ArticleTopic model)
+        {
+            return Insertable(model).ExecuteReturnEntity();
+        }
+
+        /// <summary>
+        /// 修改文章话题
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public int UpdateArticleTopic(ArticleTopic model)
+        {
+            return Update(model, true);
+        }
+
+        /// <summary>
+        /// 导出文章话题
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        public PagedInfo<ArticleTopicDto> ExportList(ArticleTopicQueryDto parm)
+        {
+            var predicate = QueryExp(parm);
+
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .Select((it) => new ArticleTopicDto()
+                {
+                }, true)
+                .ToPage(parm);
+
+            return response;
+        }
+
+        /// <summary>
+        /// 查询导出表达式
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        private static Expressionable<ArticleTopic> QueryExp(ArticleTopicQueryDto parm)
+        {
+            var predicate = Expressionable.Create<ArticleTopic>();
+
+            return predicate;
+        }
+
+        /// <summary>
+        /// 查询热门文章话题列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        public List<ArticleTopicDto> GetTopicList(ArticleTopicQueryDto parm)
+        {
+            var predicate = Expressionable.Create<ArticleTopic>();
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .ToList();
+
+            return response.Adapt<List<ArticleTopicDto>>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/ZR.ServiceCore/Services/IService/IArticleCategoryService.cs b/ZR.Service/Content/IService/IArticleCategoryService.cs
similarity index 84%
rename from ZR.ServiceCore/Services/IService/IArticleCategoryService.cs
rename to ZR.Service/Content/IService/IArticleCategoryService.cs
index 80843ceba4ef064b0c70ce353b1f7e0f16a55e34..190c51dd2f3905877f92274c0ad6c7c774561556 100644
--- a/ZR.ServiceCore/Services/IService/IArticleCategoryService.cs
+++ b/ZR.Service/Content/IService/IArticleCategoryService.cs
@@ -1,8 +1,8 @@
 using ZR.Model;
+using ZR.Model.Content;
 using ZR.Model.Dto;
-using ZR.Model.System;
 
-namespace ZR.ServiceCore.Services
+namespace ZR.Service.Content.IService
 {
     public interface IArticleCategoryService : IBaseService<ArticleCategory>
     {
diff --git a/ZR.Service/Content/IService/IArticleCommentService.cs b/ZR.Service/Content/IService/IArticleCommentService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..306a58cd3e549be26783beb9b798b2614bf34061
--- /dev/null
+++ b/ZR.Service/Content/IService/IArticleCommentService.cs
@@ -0,0 +1,16 @@
+using ZR.Model;
+using ZR.Model.Content;
+using ZR.Model.Dto;
+
+namespace ZR.Service.Content.IService
+{
+    public interface IArticleCommentService
+    {
+        PagedInfo<ArticleCommentDto> GetMessageList(MessageQueryDto dto);
+        ArticleComment AddMessage(ArticleComment message);
+        int PraiseMessage(long mid);
+        int DeleteMessage(long mid, long userId);
+        PagedInfo<ArticleCommentDto> GetReplyComments(long mid, MessageQueryDto pager);
+        PagedInfo<ArticleCommentDto> GetMyMessageList(MessageQueryDto dto);
+    }
+}
diff --git a/ZR.Service/Content/IService/IArticlePraiseService.cs b/ZR.Service/Content/IService/IArticlePraiseService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..3319bc0cfe64fb7008d37da36d9553285fbf6ced
--- /dev/null
+++ b/ZR.Service/Content/IService/IArticlePraiseService.cs
@@ -0,0 +1,11 @@
+using ZR.Model.Content;
+
+namespace ZR.Service.Content.IService
+{
+    public interface IArticlePraiseService : IBaseService<ArticlePraise>
+    {
+        int Praise(ArticlePraise dto);
+        int CanclePraise(long userid, long articleId);
+        int PlusPraise(long pid);
+    }
+}
diff --git a/ZR.ServiceCore/Services/IService/IArticleService.cs b/ZR.Service/Content/IService/IArticleService.cs
similarity index 54%
rename from ZR.ServiceCore/Services/IService/IArticleService.cs
rename to ZR.Service/Content/IService/IArticleService.cs
index 57138a683c743659d820a699abd0c74f00a89323..21dc60dc3246c0fe3fe0d5cd00d58ccf77b37756 100644
--- a/ZR.ServiceCore/Services/IService/IArticleService.cs
+++ b/ZR.Service/Content/IService/IArticleService.cs
@@ -1,8 +1,8 @@
 using ZR.Model;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
+using ZR.Model.Content;
+using ZR.Model.Dto;
 
-namespace ZR.ServiceCore.Services
+namespace ZR.Service.Content.IService
 {
     public interface IArticleService : IBaseService<Article>
     {
@@ -14,11 +14,17 @@ namespace ZR.ServiceCore.Services
         /// <param name="model"></param>
         /// <returns></returns>
         public int UpdateArticle(Article model);
-        PagedInfo<ArticleDto> GetHotList(ArticleQueryDto parm);
         PagedInfo<ArticleDto> GetArticleList(ArticleQueryDto parm);
+        PagedInfo<ArticleDto> GetMonentList(ArticleQueryDto parm);
+        PagedInfo<ArticleDto> GetFollowMonentList(ArticleQueryDto parm);
         int TopArticle(Article model);
         int ChangeArticlePublic(Article model);
-        int UpdateArticleHit(int cid);
-        int PraiseArticle(int cid);
+        int UpdateArticleHit(long cid);
+        int PraiseArticle(long cid);
+        int CancelPraise(long cid);
+        Article PublishArticle(Article article);
+        Article PublishMonent(Article article);
+
+        ArticleDto GetArticle(long cid, long userId);
     }
 }
diff --git a/ZR.Service/Content/IService/IArticleTopicService.cs b/ZR.Service/Content/IService/IArticleTopicService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..02df383d1defa83d925249bc923b4017c16f552f
--- /dev/null
+++ b/ZR.Service/Content/IService/IArticleTopicService.cs
@@ -0,0 +1,23 @@
+using ZR.Model;
+using ZR.Model.Content;
+using ZR.Model.Dto;
+
+namespace ZR.Service.Content.IService
+{
+    /// <summary>
+    /// 文章话题service接口
+    /// </summary>
+    public interface IArticleTopicService : IBaseService<ArticleTopic>
+    {
+        PagedInfo<ArticleTopicDto> GetList(ArticleTopicQueryDto parm);
+
+        ArticleTopic GetInfo(long TopicId);
+
+
+        ArticleTopic AddArticleTopic(ArticleTopic parm);
+        int UpdateArticleTopic(ArticleTopic parm);
+
+        List<ArticleTopicDto> GetTopicList(ArticleTopicQueryDto parm);
+        PagedInfo<ArticleTopicDto> ExportList(ArticleTopicQueryDto parm);
+    }
+}
diff --git a/ZR.Service/HelloService.cs b/ZR.Service/HelloService.cs
index 53a7c341b7c7595537219fcaf862bf47bd9bd48f..dc77352b61dcb806bfbf57833ebdc07ab6f1d6ba 100644
--- a/ZR.Service/HelloService.cs
+++ b/ZR.Service/HelloService.cs
@@ -1,6 +1,7 @@
 using Infrastructure;
 using Infrastructure.Attribute;
 using SqlSugar.IOC;
+using ZR.Model.Content;
 using ZR.Model.System;
 using ZR.Repository;
 using ZR.Service.IService;
diff --git a/ZR.Service/IService/IHelloService.cs b/ZR.Service/IService/IHelloService.cs
index 5bb9391bb96aa197660c529468c07240282d151a..c0ceecdbf6e88db422844758da64c1adf7d1be5b 100644
--- a/ZR.Service/IService/IHelloService.cs
+++ b/ZR.Service/IService/IHelloService.cs
@@ -1,4 +1,4 @@
-using ZR.Model.System;
+using ZR.Model.Content;
 
 namespace ZR.Service.IService
 {
diff --git a/ZR.ServiceCore/Model/CommonLang.cs b/ZR.ServiceCore/Model/CommonLang.cs
index 883e46e1e588ddac5bf6e343df4a97a7074b4b40..e8162fd31dd68a45c69dff644465092d620a64cb 100644
--- a/ZR.ServiceCore/Model/CommonLang.cs
+++ b/ZR.ServiceCore/Model/CommonLang.cs
@@ -1,6 +1,3 @@
-using Newtonsoft.Json;
-using SqlSugar;
-using System;
 using System.ComponentModel;
 
 namespace ZR.Model.Models
diff --git a/ZR.ServiceCore/Model/Dto/PhoneLoginDto.cs b/ZR.ServiceCore/Model/Dto/PhoneLoginDto.cs
index 37e11ad4075686728013999137de7af9dd7ecc0b..2fa61215a514865b0b80936a62556988ec96813b 100644
--- a/ZR.ServiceCore/Model/Dto/PhoneLoginDto.cs
+++ b/ZR.ServiceCore/Model/Dto/PhoneLoginDto.cs
@@ -21,5 +21,9 @@ namespace ZR.ServiceCore.Model.Dto
         /// </summary>
         //[Required(ErrorMessage = "短信验证码不能为空")]
         public string PhoneCode { get; set; }
+        /// <summary>
+        /// 0、登录 1、绑定
+        /// </summary>
+        public int SendType { get; set; }
     }
 }
diff --git a/ZR.ServiceCore/Model/EmailLog.cs b/ZR.ServiceCore/Model/EmailLog.cs
index f63644455cc0c7bbf7ae4c1893de75aedfb4bd2c..17828975c5f57dc68cd356d2a3eac1a020daa76b 100644
--- a/ZR.ServiceCore/Model/EmailLog.cs
+++ b/ZR.ServiceCore/Model/EmailLog.cs
@@ -4,6 +4,7 @@
     /// 邮件发送记录
     /// </summary>
     [SugarTable("email_log")]
+    [Tenant("0")]
     public class EmailLog
     {
         [JsonConverter(typeof(ValueToStringConverter))]
diff --git a/ZR.ServiceCore/Model/EmailTpl.cs b/ZR.ServiceCore/Model/EmailTpl.cs
index aa0f3c93ea939b59dbc407bb35fdeccef6d066c5..4d590723ca44097525745f12beb1d46ea1389e27 100644
--- a/ZR.ServiceCore/Model/EmailTpl.cs
+++ b/ZR.ServiceCore/Model/EmailTpl.cs
@@ -6,6 +6,7 @@ namespace ZR.ServiceCore.Model
     /// 邮件发送模板
     /// </summary>
     [SugarTable("emailTpl")]
+    [Tenant("0")]
     public class EmailTpl : SysBase
     {
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
diff --git a/ZR.ServiceCore/Model/SmsCodeLog.cs b/ZR.ServiceCore/Model/SmsCodeLog.cs
index 5c15b7d56b5716b52ca54eb18c3a304714df006f..2424b05e6a37d9cdd45b8ca46490440936ffd350 100644
--- a/ZR.ServiceCore/Model/SmsCodeLog.cs
+++ b/ZR.ServiceCore/Model/SmsCodeLog.cs
@@ -4,6 +4,7 @@
     /// 短信验证码记录
     /// </summary>
     [SugarTable("smsCode_log")]
+    [Tenant("0")]
     public class SmsCodeLog
     {
         [JsonConverter(typeof(ValueToStringConverter))]
@@ -28,6 +29,7 @@
         /// <summary>
         /// 发送时间
         /// </summary>
+        [SugarColumn(InsertServerTime = true)]
         public DateTime AddTime { get; set; }
         /// <summary>
         /// 用户IP
diff --git a/ZR.ServiceCore/Model/SysDictType.cs b/ZR.ServiceCore/Model/SysDictType.cs
index c323a636d9d8081af987e3e0e730be9feaaa8fa7..9d4a9ec83f50e6080eb3c5e9344d4dc8ea2c8721 100644
--- a/ZR.ServiceCore/Model/SysDictType.cs
+++ b/ZR.ServiceCore/Model/SysDictType.cs
@@ -1,6 +1,4 @@
-using SqlSugar;
-
-namespace ZR.Model.System
+namespace ZR.Model.System
 {
     /// <summary>
     /// 字典类型表
diff --git a/ZR.ServiceCore/Model/SysFile.cs b/ZR.ServiceCore/Model/SysFile.cs
index cc8eb1df717b289970d425191932fb1ebef0a540..53bacc888cedb041119af84f576b268c64612d23 100644
--- a/ZR.ServiceCore/Model/SysFile.cs
+++ b/ZR.ServiceCore/Model/SysFile.cs
@@ -1,8 +1,4 @@
-using Newtonsoft.Json;
-using SqlSugar;
-using System;
-
-namespace ZR.Model.System
+namespace ZR.Model.System
 {
     [Tenant("0")]
     [SugarTable("sys_file", "文件存储表")]
diff --git a/ZR.ServiceCore/Model/SysLogininfor.cs b/ZR.ServiceCore/Model/SysLogininfor.cs
index 79b979cdefe71d40042c7f1488ee903c93190d9d..9bd54942b7e8f976e9b9d282b1da223b9fb5f7dd 100644
--- a/ZR.ServiceCore/Model/SysLogininfor.cs
+++ b/ZR.ServiceCore/Model/SysLogininfor.cs
@@ -1,7 +1,4 @@
-using SqlSugar;
-using System;
-
-namespace ZR.Model.System
+namespace ZR.Model.System
 {
     /// <summary>
     /// sys_logininfor 表
diff --git a/ZR.ServiceCore/Model/SysMenu.cs b/ZR.ServiceCore/Model/SysMenu.cs
index 6e1e1e2878b46f4b6013dcf79352316ac85f2904..eb547d15a6c4af3193aed1f8bc47ae2263b1a6d4 100644
--- a/ZR.ServiceCore/Model/SysMenu.cs
+++ b/ZR.ServiceCore/Model/SysMenu.cs
@@ -1,7 +1,4 @@
-using SqlSugar;
-using System.Collections.Generic;
-
-namespace ZR.Model.System
+namespace ZR.Model.System
 {
     /// <summary>
     /// Sys_menu表
diff --git a/ZR.ServiceCore/Model/SysNotice.cs b/ZR.ServiceCore/Model/SysNotice.cs
index ff00e3422016c8601b3d4194a33a96057c80f7c8..e794c6fa4c5b22b032fdfb697c184b5b4cff3cad 100644
--- a/ZR.ServiceCore/Model/SysNotice.cs
+++ b/ZR.ServiceCore/Model/SysNotice.cs
@@ -1,5 +1,3 @@
-using SqlSugar;
-
 namespace ZR.Model.System
 {
     /// <summary>
diff --git a/ZR.ServiceCore/Model/SysPost.cs b/ZR.ServiceCore/Model/SysPost.cs
index 26edfcfe80a42244cc8961fe529e5559bfa978d9..a9116e19ee155c6f2c99d76e71b6ee5c611762f0 100644
--- a/ZR.ServiceCore/Model/SysPost.cs
+++ b/ZR.ServiceCore/Model/SysPost.cs
@@ -1,6 +1,4 @@
-using SqlSugar;
-
-namespace ZR.Model.System
+namespace ZR.Model.System
 {
     [SugarTable("sys_post", "岗位表")]
     [Tenant("0")]
diff --git a/ZR.ServiceCore/Model/SysRole.cs b/ZR.ServiceCore/Model/SysRole.cs
index 3f48946631d45e0ca0d6259709184d99a40785f9..8bc83bc449e7caf4f086a5d0ae9a8e667617eb48 100644
--- a/ZR.ServiceCore/Model/SysRole.cs
+++ b/ZR.ServiceCore/Model/SysRole.cs
@@ -1,6 +1,4 @@
-using SqlSugar;
-
-namespace ZR.Model.System
+namespace ZR.Model.System
 {
     /// <summary>
     /// 角色表 sys_role
diff --git a/ZR.ServiceCore/Model/SysRoleDept.cs b/ZR.ServiceCore/Model/SysRoleDept.cs
index 14abb4b40799ad3471560d0080f7cbc02d46e005..43152b135e2db6604e9dc256622b0a060ebd9fb0 100644
--- a/ZR.ServiceCore/Model/SysRoleDept.cs
+++ b/ZR.ServiceCore/Model/SysRoleDept.cs
@@ -1,6 +1,4 @@
-using SqlSugar;
-
-namespace ZR.Model.System
+namespace ZR.Model.System
 {
     [SugarTable("sys_role_dept", "角色部门")]
     [Tenant(0)]
diff --git a/ZR.ServiceCore/Model/SysRoleMenu.cs b/ZR.ServiceCore/Model/SysRoleMenu.cs
index 9a037a41c21c0a01d131a802605a912a8f21ed6b..ed5c59fa8bdb27f4d76899bfdfcab837815d50e7 100644
--- a/ZR.ServiceCore/Model/SysRoleMenu.cs
+++ b/ZR.ServiceCore/Model/SysRoleMenu.cs
@@ -1,7 +1,4 @@
-using Newtonsoft.Json;
-using SqlSugar;
-
-namespace ZR.Model.System
+namespace ZR.Model.System
 {
     /// <summary>
     /// 角色菜单
diff --git a/ZR.ServiceCore/Model/SysTasks.cs b/ZR.ServiceCore/Model/SysTasks.cs
index b1a413cf4c16bbddb31813660f73e2ae8b1f5db4..0eadae4e51612f807f75b1b3e763eb9bdfbcb500 100644
--- a/ZR.ServiceCore/Model/SysTasks.cs
+++ b/ZR.ServiceCore/Model/SysTasks.cs
@@ -1,6 +1,4 @@
-using SqlSugar;
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace ZR.Model.System
 {
diff --git a/ZR.ServiceCore/Model/SysTasksLog.cs b/ZR.ServiceCore/Model/SysTasksLog.cs
index 88fbcfc8a7228053673c934039209daddcee4037..98bf859187f18e10060aa6179e56c7390176cd7f 100644
--- a/ZR.ServiceCore/Model/SysTasksLog.cs
+++ b/ZR.ServiceCore/Model/SysTasksLog.cs
@@ -1,7 +1,4 @@
-using SqlSugar;
-using System;
-
-namespace ZR.Model.System
+namespace ZR.Model.System
 {
     /// <summary>
     /// 任务日志
diff --git a/ZR.ServiceCore/Model/SysUserPost.cs b/ZR.ServiceCore/Model/SysUserPost.cs
index 7eadfd0dcc1306929a72887e1dc260ab210d317b..c01bab0a44a5595977a6b3e6155d2b29bd96f613 100644
--- a/ZR.ServiceCore/Model/SysUserPost.cs
+++ b/ZR.ServiceCore/Model/SysUserPost.cs
@@ -1,6 +1,4 @@
-using SqlSugar;
-
-namespace ZR.Model.System
+namespace ZR.Model.System
 {
     /// <summary>
     /// 用户岗位
diff --git a/ZR.ServiceCore/Services/IService/ISysMenuService.cs b/ZR.ServiceCore/Services/IService/ISysMenuService.cs
index ad5ca63c6fcf45e169cf1b6d2f89d78dc90592f8..21138c5150dcd333f679000eea41815c4a95582e 100644
--- a/ZR.ServiceCore/Services/IService/ISysMenuService.cs
+++ b/ZR.ServiceCore/Services/IService/ISysMenuService.cs
@@ -19,6 +19,7 @@ namespace ZR.ServiceCore.Services
         long EditMenu(SysMenu menu);
 
         int DeleteMenuById(int menuId);
+        int DeleteAllMenuById(int menuId);
 
         string CheckMenuNameUnique(SysMenu menu);
 
diff --git a/ZR.ServiceCore/Services/IService/ISysUserService.cs b/ZR.ServiceCore/Services/IService/ISysUserService.cs
index 411983b0880aaf8c447ecdb1f80605087872aaaf..0cfa99ee27e8969e3af1c46c9f851cbccc1d14ff 100644
--- a/ZR.ServiceCore/Services/IService/ISysUserService.cs
+++ b/ZR.ServiceCore/Services/IService/ISysUserService.cs
@@ -37,6 +37,13 @@ namespace ZR.ServiceCore.Services
         public int UpdateUser(SysUser user);
 
         public int ChangeUser(SysUser user);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="phoneNum"></param>
+        /// <returns></returns>
+        List<long> CheckPhoneBind(string phoneNum);
+        int ChangePhoneNum(long userid, string phoneNum);
 
         /// <summary>
         /// 重置密码
diff --git a/ZR.ServiceCore/Services/SeedDataService.cs b/ZR.ServiceCore/Services/SeedDataService.cs
index 70fb6331ca86b86f86039a954772e379ca2e0533..b1460becbc3b630dc2ef0c5649906b22168685cd 100644
--- a/ZR.ServiceCore/Services/SeedDataService.cs
+++ b/ZR.ServiceCore/Services/SeedDataService.cs
@@ -1,7 +1,9 @@
 using MiniExcelLibs;
 using SqlSugar.IOC;
 using ZR.Common;
+using ZR.Model.Content;
 using ZR.Model.System;
+using ZR.ServiceCore.Model;
 
 namespace ZR.ServiceCore.Services
 {
@@ -25,7 +27,7 @@ namespace ZR.ServiceCore.Services
             db.Ado.BeginTran();
             //db.Ado.ExecuteCommand("SET IDENTITY_INSERT sys_user ON");
             var x = db.Storageable(data)
-                .SplitInsert(it => it.NotAny())
+                .SplitInsert(it => it.NotAny())//表示如果有where条件根据条件判断是否存在数据，不存在插入，存在不操作
                 .SplitError(x => x.Item.UserName.IsEmpty(), "用户名不能为空")
                 .SplitError(x => !Tools.CheckUserName(x.Item.UserName), "用户名不符合规范")
                 .WhereColumns(it => it.UserId)//如果不是主键可以这样实现（多字段it=>new{it.x1,it.x2}）
@@ -174,9 +176,7 @@ namespace ZR.ServiceCore.Services
         {
             var db = DbScoped.SugarScope;
             var x = db.Storageable(data)
-                //.SplitInsert(it => it.NotAny())
-                //.SplitUpdate(it => !it.Any())
-                //.WhereColumns(it => new { it.DictType })
+                .WhereColumns(it => new { it.DictType, it.DictValue })
                 .ToStorage();
             x.AsInsertable.ExecuteCommand();
             x.AsUpdateable.ExecuteCommand();
@@ -194,12 +194,29 @@ namespace ZR.ServiceCore.Services
         {
             var db = DbScoped.SugarScope;
             var x = db.Storageable(data)
-                .SplitInsert(it => it.NotAny())
+                //.SplitInsert(it => it.NotAny())
                 .WhereColumns(it => it.Name)
                 .ToStorage();
-            var result = x.AsInsertable.ExecuteCommand();
+            x.AsInsertable.ExecuteCommand();
+            x.AsUpdateable.ExecuteCommand();
+            string msg = $"[文章目录] 插入{x.InsertList.Count} 更新{x.UpdateList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}";
+            return (msg, x.ErrorList, x.IgnoreList);
+        }
 
-            string msg = $"[字典数据] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}";
+        /// <summary>
+        /// 文章话题
+        /// </summary>
+        /// <param name="data"></param>
+        /// <returns></returns>
+        public (string, object, object) InitArticleTopicData(List<ArticleTopic> data)
+        {
+            var db = DbScoped.SugarScope;
+            var x = db.Storageable(data)
+                .WhereColumns(it => it.TopicName)
+                .ToStorage();
+            x.AsInsertable.ExecuteCommand();
+            x.AsUpdateable.ExecuteCommand();
+            string msg = $"[文章话题] 插入{x.InsertList.Count} 更新{x.UpdateList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}";
             return (msg, x.ErrorList, x.IgnoreList);
         }
 
@@ -308,6 +325,10 @@ namespace ZR.ServiceCore.Services
             var result11 = InitArticleCategoryData(sysArticleCategory);
             result.Add(result11.Item1);
 
+            var sysArticleTopic = MiniExcel.Query<ArticleTopic>(path, sheetName: "article_topic").ToList();
+            var result13 = InitArticleTopicData(sysArticleTopic);
+            result.Add(result13.Item1);
+
             var sysNotice = MiniExcel.Query<SysNotice>(path, sheetName: "notice").ToList();
             var result12 = InitNoticeData(sysNotice);
             result.Add(result12.Item1);
diff --git a/ZR.ServiceCore/Services/SysMenuService.cs b/ZR.ServiceCore/Services/SysMenuService.cs
index 499007c9009242b4fb679bd737c5d40a9c908eee..7ae01df8e7368778c2a34e135fe5d6f4d6816247 100644
--- a/ZR.ServiceCore/Services/SysMenuService.cs
+++ b/ZR.ServiceCore/Services/SysMenuService.cs
@@ -1,6 +1,4 @@
 using Infrastructure.Attribute;
-using JinianNet.JNTemplate.Caching;
-using System.ComponentModel;
 using ZR.Common;
 using ZR.Model.System;
 using ZR.Model.System.Dto;
@@ -125,6 +123,22 @@ namespace ZR.ServiceCore.Services
             return Delete(menuId);
         }
 
+        /// <summary>
+        /// 删除所有菜单
+        /// </summary>
+        /// <param name="menuId"></param>
+        /// <returns></returns>
+        public int DeleteAllMenuById(int menuId)
+        {
+            var childMenu = Queryable().ToChildList(x => x.ParentId, menuId).Select(x => x.MenuId);
+            var result = UseTran(() =>
+            {
+                Delete(childMenu.ToArray(), "删除菜单");
+                Context.Deleteable<SysRoleMenu>().Where(f => childMenu.Contains(f.Menu_id)).ExecuteCommand();
+            });
+            return result.IsSuccess ? 1 : 0;
+        }
+
         /// <summary>
         /// 校验菜单名称是否唯一
         /// </summary>
@@ -317,26 +331,6 @@ namespace ZR.ServiceCore.Services
         }
         #region 方法
 
-        ///// <summary>
-        ///// 根据父节点的ID获取所有子节点
-        ///// </summary>
-        ///// <param name="list">分类表</param>
-        ///// <param name="parentId">传入的父节点ID</param>
-        ///// <returns></returns>
-        //public List<SysMenu> GetChildPerms(List<SysMenu> list, int parentId)
-        //{
-        //    List<SysMenu> returnList = new List<SysMenu>();
-        //    var data = list.FindAll(f => f.parentId == parentId);
-
-        //    foreach (var item in data)
-        //    {
-        //        RecursionFn(list, item);
-
-        //        returnList.Add(item);
-        //    }
-        //    return returnList;
-        //}
-
         /// <summary>
         /// 递归列表
         /// </summary>
diff --git a/ZR.ServiceCore/Services/SysUserService.cs b/ZR.ServiceCore/Services/SysUserService.cs
index ab05f7483bcfa8890dfec0d16f58c1cc513a559f..27fc48afac1e6d9c1d9501d95b1281a124da0f18 100644
--- a/ZR.ServiceCore/Services/SysUserService.cs
+++ b/ZR.ServiceCore/Services/SysUserService.cs
@@ -95,6 +95,29 @@ namespace ZR.ServiceCore.Services
             return UserConstants.UNIQUE;
         }
 
+        /// <summary>
+        /// 校验手机号是否绑定
+        /// </summary>
+        /// <param name="phoneNum"></param>
+        /// <returns></returns>
+        public List<long> CheckPhoneBind(string phoneNum)
+        {
+            var list = GetList(it => it.Phonenumber == phoneNum);
+            var temp = list.Select(x => x.UserId).ToList();
+            return list.Count > 0 ?  temp : new List<long>();
+        }
+
+        /// <summary>
+        /// 绑定手机号
+        /// </summary>
+        /// <param name="userid"></param>
+        /// <param name="phoneNum"></param>
+        /// <returns></returns>
+        public int ChangePhoneNum(long userid, string phoneNum)
+        {
+           return Update(new SysUser() { Phonenumber = phoneNum }, it => new { it.Phonenumber }, f => f.UserId == userid);
+        }
+
         /// <summary>
         /// 新增保存用户信息
         /// </summary>
diff --git a/ZR.ServiceCore/SqlSugar/InitTable.cs b/ZR.ServiceCore/SqlSugar/InitTable.cs
index 3ffa359813c04d1f42bc52e17f7606bcc8c72ef9..2cb318dc81bb0bb26954aeda0451d76502e948b9 100644
--- a/ZR.ServiceCore/SqlSugar/InitTable.cs
+++ b/ZR.ServiceCore/SqlSugar/InitTable.cs
@@ -1,4 +1,5 @@
 using SqlSugar.IOC;
+using ZR.Model.Content;
 using ZR.Model.Models;
 using ZR.Model.System;
 using ZR.Model.System.Generate;
@@ -14,16 +15,17 @@ namespace ZR.ServiceCore.SqlSugar
         /// <summary>
         /// 创建db、表
         /// </summary>
-        public static void InitDb()
+        public static void InitDb(bool init)
         {
             var db = DbScoped.SugarScope;
+            //TODO 可在此处单独更新某个表的结构
+            //例如：db.CodeFirst.InitTables(typeof(EmailLog));
+            
+
+            if (!init) return;
             //建库：如果不存在创建数据库存在不会重复创建 
             db.DbMaintenance.CreateDatabase();// 注意 ：Oracle和个别国产库需不支持该方法，需要手动建库 
 
-            //var baseType = typeof(SysBase);
-            //var entityes = AssemblyUtils.GetAllTypes().Where(p => !p.IsAbstract && p != baseType && p.GetCustomAttribute<SugarTable>() != null).ToArray();
-            //db.CodeFirst.InitTables(entityes);
-
             //27个表,建议先使用下面方法初始化表，方便排查问题
             db.CodeFirst.InitTables(typeof(SysUser));
             db.CodeFirst.InitTables(typeof(SysRole));
@@ -44,14 +46,18 @@ namespace ZR.ServiceCore.SqlSugar
             db.CodeFirst.InitTables(typeof(CommonLang));
             db.CodeFirst.InitTables(typeof(GenTable));
             db.CodeFirst.InitTables(typeof(GenTableColumn));
-            db.CodeFirst.InitTables(typeof(Article));
-            db.CodeFirst.InitTables(typeof(ArticleCategory));
             db.CodeFirst.InitTables(typeof(SysDictData));
             db.CodeFirst.InitTables(typeof(SysDictType));
             db.CodeFirst.InitTables(typeof(SqlDiffLog));
             db.CodeFirst.InitTables(typeof(EmailTpl));
             db.CodeFirst.InitTables(typeof(SmsCodeLog));
             db.CodeFirst.InitTables(typeof(EmailLog));
+            db.CodeFirst.InitTables(typeof(Article));
+            db.CodeFirst.InitTables(typeof(ArticleCategory));
+            db.CodeFirst.InitTables(typeof(ArticleBrowsingLog));
+            db.CodeFirst.InitTables(typeof(ArticlePraise));
+            db.CodeFirst.InitTables(typeof(ArticleComment));
+            db.CodeFirst.InitTables(typeof(ArticleTopic));
             //db.CodeFirst.InitTables(typeof(UserOnlineLog));
         }
         public static void InitNewTb()
diff --git a/ZR.ServiceCore/SqlSugar/SqlsugarSetup.cs b/ZR.ServiceCore/SqlSugar/SqlsugarSetup.cs
index 53abaff1bdba7f8a2e58346c7d9bbcc53f499877..5cc1783223e3b27d840e3da7f777bd99e120d1e4 100644
--- a/ZR.ServiceCore/SqlSugar/SqlsugarSetup.cs
+++ b/ZR.ServiceCore/SqlSugar/SqlsugarSetup.cs
@@ -54,10 +54,8 @@ namespace ZR.ServiceCore.SqlSugar
 
             if (environment.IsDevelopment())
             {
-                if (options.InitDb)
-                {
-                    InitTable.InitDb();
-                }
+                InitTable.InitDb(options.InitDb);
+
                 InitTable.InitNewTb();
             }
         }
diff --git a/ZR.Vue/src/views/monitor/operlog/index.vue b/ZR.Vue/src/views/monitor/operlog/index.vue
index b1856fb1d6187e73e1f77bb1f9d43661de525bcd..1966c1997f406046213bdcdce9313441ecaadcc2 100644
--- a/ZR.Vue/src/views/monitor/operlog/index.vue
+++ b/ZR.Vue/src/views/monitor/operlog/index.vue
@@ -9,12 +9,12 @@
       </el-form-item>
       <el-form-item label="类型" prop="businessType">
         <el-select v-model="queryParams.businessType" placeholder="操作类型" clearable style="width: 240px">
-          <el-option v-for="dict in businessTypeOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+          <el-option v-for="dict in sys_oper_type" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
         </el-select>
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="操作状态" clearable style="width: 240px">
-          <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+          <el-option v-for="dict in sys_common_status" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
         </el-select>
       </el-form-item>
       <el-form-item label="操作时间">
@@ -55,7 +55,7 @@
       <el-table-column label="系统模块" align="center" prop="title" :show-overflow-tooltip="true" />
       <el-table-column prop="businessType" label="业务类型" align="center">
         <template slot-scope="scope">
-          <dict-tag :options="businessTypeOptions" :value="scope.row.businessType" />
+          <dict-tag :options="sys_oper_type" :value="scope.row.businessType" />
         </template>
       </el-table-column>
       <el-table-column label="请求方式" align="center" prop="requestMethod" />
@@ -64,7 +64,7 @@
       <el-table-column label="操作地点" align="center" prop="operLocation" :show-overflow-tooltip="true" />
       <el-table-column label="操作状态" align="center" prop="status">
         <template slot-scope="{ row }">
-          <dict-tag :options="statusOptions" :value="row.status"></dict-tag>
+          <dict-tag :options="sys_common_status" :value="row.status"></dict-tag>
         </template>
       </el-table-column>
       <el-table-column label="用时" align="center" prop="elapsed">
@@ -108,7 +108,7 @@
           </el-col>
           <el-col :lg="12">
             <el-form-item label="操作类型：">
-              <dict-tag :options="businessTypeOptions" :value="form.businessType" />
+              <dict-tag :options="sys_oper_type" :value="form.businessType" />
             </el-form-item>
           </el-col>
           <el-col :lg="24">
@@ -121,7 +121,7 @@
           </el-col>
           <el-col :lg="12">
             <el-form-item label="操作状态：">
-              <dict-tag :options="statusOptions" :value="form.status"></dict-tag>
+              <dict-tag :options="sys_common_status" :value="form.status"></dict-tag>
             </el-form-item>
           </el-col>
           <el-col :lg="12">
@@ -161,9 +161,9 @@ export default {
       // 是否显示弹出层
       open: false,
       // 类型数据字典
-      statusOptions: [],
+      sys_common_status: [],
       // 业务类型（0其它 1新增 2修改 3删除）选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
-      businessTypeOptions: [],
+      sys_oper_type: [],
       // 日期范围
       dateRange: [],
       // 表单参数
@@ -181,13 +181,10 @@ export default {
   },
   created() {
     this.getList()
-    var dictParams = [
-      { dictType: 'sys_oper_type', columnName: 'businessTypeOptions' },
-      { dictType: 'sys_common_status', columnName: 'statusOptions' },
-    ]
+    var dictParams = [{ dictType: 'sys_oper_type' }, { dictType: 'sys_common_status' }]
     this.getDicts(dictParams).then((response) => {
       response.data.forEach((element) => {
-        this[element.columnName] = element.list
+        this[element.dictType] = element.list
       })
     })
   },
@@ -206,10 +203,6 @@ export default {
         }
       })
     },
-    // 操作日志状态字典翻译
-    statusFormat(row, column) {
-      return this.selectDictLabel(this.statusOptions, row.status)
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1