From c448afdd1ddc7cb7736de77cabf1a941503cd47d Mon Sep 17 00:00:00 2001 From: j4587698 Date: Sun, 16 Feb 2020 22:11:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=8F=AF=E7=94=A8=E5=90=8E?= =?UTF-8?q?=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controllers/ArticleController.cs | 18 - .../Admin/Controllers/ClassifyController.cs | 73 ++ .../Admin/Controllers/CollectionController.cs | 37 +- .../Admin/Controllers/HomeController.cs | 4 +- .../Admin/Controllers/InstallController.cs | 174 ++++ .../Admin/Controllers/MovieController.cs | 21 + .../Admin/Views/Article/Index.cshtml | 265 ------ .../Views/Classify/ClassifyDialog.cshtml | 42 + .../Admin/Views/Classify/Index.cshtml | 160 ++++ .../Collection/BindingClassifyDialog.cshtml | 35 + .../Admin/Views/Collection/Index.cshtml | 10 +- .../Admin/Views/Home/Index.cshtml | 7 +- .../Admin/Views/Movie/Index.cshtml | 131 +++ .../Controllers/HomeController.cs | 7 + CMS/JXCMS.CMS.Movie/Entity/ActorEntity.cs | 14 + CMS/JXCMS.CMS.Movie/Entity/ClassifyEntity.cs | 14 + CMS/JXCMS.CMS.Movie/Entity/DirectorEntity.cs | 9 + .../Entity/MovieActorEntity.cs | 18 + CMS/JXCMS.CMS.Movie/Entity/MovieEntity.cs | 44 + CMS/JXCMS.CMS.Movie/Entity/MovieListEntity.cs | 22 + .../Entity/WebSiteClassifyEntity.cs | 19 + CMS/JXCMS.CMS.Movie/Entity/WebSiteEntity.cs | 13 + CMS/JXCMS.CMS.Movie/JXCMS.CMS.Movie.csproj | 1 + .../Models/MovieListInfoModel.cs | 33 + CMS/JXCMS.CMS.Movie/Program.cs | 3 +- CMS/JXCMS.CMS.Movie/Spider/ClassifySpider.cs | 38 + CMS/JXCMS.CMS.Movie/Spider/MovieSpider.cs | 265 ++++++ CMS/JXCMS.CMS.Movie/Startup.cs | 9 + CMS/JXCMS.CMS.Movie/Utils/Classify.cs | 46 + CMS/JXCMS.CMS.Movie/Utils/HttpHelper.cs | 848 ++++++++++++++++++ .../Views/Default/Home/Test.cshtml | 16 + Core/JXCMS.Core/Db/DbExtension.cs | 9 +- .../Extensions/HtmlHelperViewExtensions.cs | 99 ++ Core/JXCMS.Core/Extensions/StringExtension.cs | 17 +- Core/JXCMS.Core/JXCMS.Core.csproj | 14 +- Core/JXCMS.Core/TimingTask/QuartzTask.cs | 38 +- Core/JXCMS.Core/Utils/ConfigHelper.cs | 15 + 37 files changed, 2278 insertions(+), 310 deletions(-) delete mode 100755 CMS/JXCMS.CMS.Movie/Admin/Controllers/ArticleController.cs create mode 100644 CMS/JXCMS.CMS.Movie/Admin/Controllers/ClassifyController.cs create mode 100644 CMS/JXCMS.CMS.Movie/Admin/Controllers/MovieController.cs delete mode 100755 CMS/JXCMS.CMS.Movie/Admin/Views/Article/Index.cshtml create mode 100644 CMS/JXCMS.CMS.Movie/Admin/Views/Classify/ClassifyDialog.cshtml create mode 100644 CMS/JXCMS.CMS.Movie/Admin/Views/Classify/Index.cshtml create mode 100644 CMS/JXCMS.CMS.Movie/Admin/Views/Collection/BindingClassifyDialog.cshtml create mode 100644 CMS/JXCMS.CMS.Movie/Admin/Views/Movie/Index.cshtml create mode 100644 CMS/JXCMS.CMS.Movie/Entity/ActorEntity.cs create mode 100644 CMS/JXCMS.CMS.Movie/Entity/DirectorEntity.cs create mode 100644 CMS/JXCMS.CMS.Movie/Entity/MovieActorEntity.cs create mode 100644 CMS/JXCMS.CMS.Movie/Entity/MovieEntity.cs create mode 100644 CMS/JXCMS.CMS.Movie/Entity/MovieListEntity.cs create mode 100644 CMS/JXCMS.CMS.Movie/Entity/WebSiteClassifyEntity.cs create mode 100644 CMS/JXCMS.CMS.Movie/Models/MovieListInfoModel.cs create mode 100644 CMS/JXCMS.CMS.Movie/Spider/ClassifySpider.cs create mode 100644 CMS/JXCMS.CMS.Movie/Spider/MovieSpider.cs create mode 100644 CMS/JXCMS.CMS.Movie/Utils/Classify.cs create mode 100644 CMS/JXCMS.CMS.Movie/Utils/HttpHelper.cs create mode 100644 CMS/JXCMS.CMS.Movie/Views/Default/Home/Test.cshtml create mode 100644 Core/JXCMS.Core/Extensions/HtmlHelperViewExtensions.cs create mode 100644 Core/JXCMS.Core/Utils/ConfigHelper.cs diff --git a/CMS/JXCMS.CMS.Movie/Admin/Controllers/ArticleController.cs b/CMS/JXCMS.CMS.Movie/Admin/Controllers/ArticleController.cs deleted file mode 100755 index d188ca9..0000000 --- a/CMS/JXCMS.CMS.Movie/Admin/Controllers/ArticleController.cs +++ /dev/null @@ -1,18 +0,0 @@ -using JXCMS.CMS.Attribute; -using Microsoft.AspNetCore.Mvc; - -namespace JXCMS.CMS.Admin.Controllers -{ - [Area("Admin")] - [AdminAuthentication] - public class ArticleController : Controller - { - // GET - public IActionResult Index() - { - ViewBag.title = "所有文章"; - - return View(); - } - } -} \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/Admin/Controllers/ClassifyController.cs b/CMS/JXCMS.CMS.Movie/Admin/Controllers/ClassifyController.cs new file mode 100644 index 0000000..21aec2b --- /dev/null +++ b/CMS/JXCMS.CMS.Movie/Admin/Controllers/ClassifyController.cs @@ -0,0 +1,73 @@ +using System.Linq; +using FreeSql; +using JXCMS.CMS.Attribute; +using JXCMS.CMS.Entity; +using JXCMS.CMS.Movie.Entity; +using JXCMS.CMS.Movie.Spider; +using JXCMS.CMS.Movie.Utils; +using Microsoft.AspNetCore.Mvc; + +namespace JXCMS.CMS.Movie.Admin.Controllers +{ + [Area("Admin")] + [AdminAuthentication] + public class ClassifyController : Controller + { + public IActionResult Index(int pageNumber = 1, int pageSize = 20) + { + var list = ClassifyEntity.Select.Include(x => x.Parent).Count(out long count).Page(pageNumber, pageSize).ToList( + x => new ClassifyEntity{Id = x.Id, Name = x.Name, Alias = x.Alias, ParentId = x.ParentId, Parent = x.Parent, UpdateTime = x.UpdateTime, + Count = MovieEntity.Select.Where(y => y.ClassifyId == x.Id).Count()}); + ViewBag.count = count; + ViewBag.pageNumber = pageNumber; + ViewBag.totlePage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1; + return View(list); + } + + public IActionResult ClassifyDialog(int id) + { + + ClassifyEntity classifyEntity = null; + if (id == 0) + { + classifyEntity = new ClassifyEntity(); + ViewBag.title = "添加新分类"; + ViewBag.classifyEntities = ClassifyEntity.Select.ToList(); + } + else + { + classifyEntity = ClassifyEntity.Find(id); + ViewBag.title = "修改分类" + classifyEntity.Name; + ViewBag.classifyEntities = Classify.FindAllNotChildren(ClassifyEntity.Select.ToList(), id); + } + return View(classifyEntity); + } + + public IActionResult DeleteClassify(int id) + { + if (MovieEntity.Select.Any(x => x.ClassifyId == id)) + { + return Redirect(Url.Action("Index")); + } + + if (ClassifyEntity.Select.Any(x => x.ParentId == id)) + { + ClassifyEntity.Where(x => x.ParentId == id).ToUpdate().Set(x => x.ParentId, 0).ExecuteAffrows(); + } + + ClassifyEntity.Find(id).Delete(); + return Redirect(Url.Action("Index")); + } + + public IActionResult ModifyClassify(ClassifyEntity classifyEntity) + { + if (classifyEntity.Id != 0 && + Classify.FindAllChildren(ClassifyEntity.Select.ToList(), classifyEntity.Id).Any(x => x.Id == classifyEntity.ParentId)) + { + return Redirect(Url.Action("Index")); + } + classifyEntity.Save(); + return Redirect(Url.Action("Index")); + } + } +} \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/Admin/Controllers/CollectionController.cs b/CMS/JXCMS.CMS.Movie/Admin/Controllers/CollectionController.cs index 4a63e4f..867208a 100644 --- a/CMS/JXCMS.CMS.Movie/Admin/Controllers/CollectionController.cs +++ b/CMS/JXCMS.CMS.Movie/Admin/Controllers/CollectionController.cs @@ -1,8 +1,12 @@ +using System; using System.Collections.ObjectModel; using System.Linq; +using FreeSql; using JXCMS.CMS.Attribute; using JXCMS.CMS.Movie.Entity; using JXCMS.CMS.Movie.Jobs; +using JXCMS.CMS.Movie.Spider; +using JXCMS.CMS.Movie.Utils; using JXCMS.Core.TimingTask; using Microsoft.AspNetCore.Mvc; using Quartz; @@ -16,7 +20,11 @@ namespace JXCMS.CMS.Movie.Admin.Controllers public IActionResult Index(int pageNumber = 1, int pageSize = 20) { ViewBag.title = "采集地址"; - var website = WebSiteEntity.Select.Count(out long count).Page(pageNumber, pageSize).ToList(); + var website = WebSiteEntity.Select.Count(out long count).Page(pageNumber, pageSize).ToList().Select(x => + { + x.NextRunTime = x.IsEnable ? QuartzTask.GetCronSchedule(x.Cron, 1, DateTimeOffset.Now) : "已禁用"; + return x; + }).ToList(); ViewBag.website = website; ViewBag.count = count; ViewBag.pageNumber = pageNumber; @@ -27,6 +35,10 @@ namespace JXCMS.CMS.Movie.Admin.Controllers [HttpPost] public IActionResult AddWebSite(WebSiteEntity webSiteEntity) { + if (!CronExpression.IsValidExpression(webSiteEntity.Cron)) + { + return Redirect(Url.Action("Index")); + } webSiteEntity.Save(); if (webSiteEntity.IsEnable) { @@ -87,7 +99,26 @@ namespace JXCMS.CMS.Movie.Admin.Controllers } return View(webSiteEntity); } - - + + public IActionResult BindingClassifyDialog(int id) + { + var classifyEntities = Classify.Structured(ClassifyEntity.Select.ToList()); + var webSiteClassifyEntities = WebSiteClassifyEntity.Where(x => x.WebSiteId == id).ToList(); + var webSiteEntity = WebSiteEntity.Find(id); + classifyEntities.Insert(0, new ClassifyEntity(){Id = 0, Name = "未绑定"}); + ViewBag.classifyEntities = classifyEntities; + ClassifySpider.GetAllClassifyFromUrl(id, webSiteEntity.ApiUrl, webSiteClassifyEntities); + ViewBag.title = "修改" + webSiteEntity.WebSiteName + "的类型绑定"; + return View(webSiteClassifyEntities); + } + + public IActionResult UpdateBindingClassify(WebSiteClassifyEntity[] webSiteClassifyEntities) + { + foreach (var webSiteClassifyEntity in webSiteClassifyEntities) + { + webSiteClassifyEntity.Save(); + } + return Redirect(Url.Action("Index")); + } } } \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/Admin/Controllers/HomeController.cs b/CMS/JXCMS.CMS.Movie/Admin/Controllers/HomeController.cs index 0232324..d397fb1 100755 --- a/CMS/JXCMS.CMS.Movie/Admin/Controllers/HomeController.cs +++ b/CMS/JXCMS.CMS.Movie/Admin/Controllers/HomeController.cs @@ -1,17 +1,15 @@ using System.Security.Claims; using System.Threading.Tasks; using JXCMS.CMS.Attribute; -using JXCMS.CMS.Entity; using JXCMS.CMS.Movie.Entity; using JXCMS.CMS.Utils; using JXCMS.Core.Auth; using JXCMS.Core.Encrypt; -using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -namespace JXCMS.CMS.Admin.Controllers +namespace JXCMS.CMS.Movie.Admin.Controllers { [Area("Admin")] [AdminAuthentication] diff --git a/CMS/JXCMS.CMS.Movie/Admin/Controllers/InstallController.cs b/CMS/JXCMS.CMS.Movie/Admin/Controllers/InstallController.cs index 433cfbe..7c2dc1a 100755 --- a/CMS/JXCMS.CMS.Movie/Admin/Controllers/InstallController.cs +++ b/CMS/JXCMS.CMS.Movie/Admin/Controllers/InstallController.cs @@ -73,6 +73,180 @@ namespace JXCMS.CMS.Admin.Controllers Type = "Settings" }); BaseEntity.Orm.Insert(settings).ExecuteInserted(); + var classify = new ClassifyEntity() + { + Name = "电影", + Alias = "dianying", + ParentId = 0 + }; + classify.Save(); + List classifyEntities = new List(); + classifyEntities.Add(new ClassifyEntity() + { + Name = "动作片", + Alias = "dongzuo", + ParentId = classify.Id + }); + classifyEntities.Add(new ClassifyEntity() + { + Name = "喜剧片", + Alias = "xiju", + ParentId = classify.Id + }); + classifyEntities.Add(new ClassifyEntity() + { + Name = "爱情片", + Alias = "aiqing", + ParentId = classify.Id + }); + classifyEntities.Add(new ClassifyEntity() + { + Name = "科幻片", + Alias = "kehuan", + ParentId = classify.Id + }); + classifyEntities.Add(new ClassifyEntity() + { + Name = "恐怖片", + Alias = "kongbu", + ParentId = classify.Id + }); + classifyEntities.Add(new ClassifyEntity() + { + Name = "剧情片", + Alias = "juqing", + ParentId = classify.Id + }); + classifyEntities.Add(new ClassifyEntity() + { + Name = "战争片", + Alias = "zhanzheng", + ParentId = classify.Id + }); + classifyEntities.Add(new ClassifyEntity() + { + Name = "纪录片", + Alias = "jilupian", + ParentId = classify.Id + }); + classifyEntities.Add(new ClassifyEntity() + { + Name = "微电影", + Alias = "weidianying", + ParentId = classify.Id + }); + classifyEntities.Add(new ClassifyEntity() + { + Name = "伦理片", + Alias = "lunli", + ParentId = classify.Id + }); + BaseEntity.Orm.Insert(classifyEntities).ExecuteAffrows(); + classify = new ClassifyEntity() + { + Name = "电视剧", + Alias = "tv", + ParentId = 0 + }; + classify.Save(); + classifyEntities.Clear(); + classifyEntities.Add(new ClassifyEntity() + { + Name = "国产剧", + Alias = "guochanju", + ParentId = classify.Id + }); + classifyEntities.Add(new ClassifyEntity() + { + Name = "香港剧", + Alias = "xianggangju", + ParentId = classify.Id + }); + classifyEntities.Add(new ClassifyEntity() + { + Name = "韩国剧", + Alias = "hanguoju", + ParentId = classify.Id + }); + classifyEntities.Add(new ClassifyEntity() + { + Name = "欧美剧", + Alias = "oumeiju", + ParentId = classify.Id + }); + classifyEntities.Add(new ClassifyEntity() + { + Name = "台湾剧", + Alias = "taiwanju", + ParentId = classify.Id + }); + classifyEntities.Add(new ClassifyEntity() + { + Name = "日本剧", + Alias = "ribenju", + ParentId = classify.Id + }); + classifyEntities.Add(new ClassifyEntity() + { + Name = "海外剧", + Alias = "haiwaiju", + ParentId = classify.Id + }); + BaseEntity.Orm.Insert(classifyEntities).ExecuteAffrows(); + classify = new ClassifyEntity() + { + Name = "综艺片", + Alias = "zongyi", + ParentId = 0 + }; + classify.Save(); + classifyEntities.Clear(); + classifyEntities.Add(new ClassifyEntity() + { + Name = "内地综艺", + Alias = "neidizongyi", + ParentId = classify.Id + }); + classifyEntities.Add(new ClassifyEntity() + { + Name = "日韩综艺", + Alias = "rihanzongyi", + ParentId = classify.Id + }); + classifyEntities.Add(new ClassifyEntity() + { + Name = "欧美综艺", + Alias = "oumeizongyi", + ParentId = classify.Id + }); + BaseEntity.Orm.Insert(classifyEntities).ExecuteAffrows(); + classify = new ClassifyEntity() + { + Name = "动漫片", + Alias = "dongman", + ParentId = 0 + }; + classify.Save(); + classifyEntities.Clear(); + classifyEntities.Add(new ClassifyEntity() + { + Name = "国产动漫", + Alias = "guochandongman", + ParentId = classify.Id + }); + classifyEntities.Add(new ClassifyEntity() + { + Name = "日韩动漫", + Alias = "rihandongman", + ParentId = classify.Id + }); + classifyEntities.Add(new ClassifyEntity() + { + Name = "欧美动漫", + Alias = "oumeidongman", + ParentId = classify.Id + }); + BaseEntity.Orm.Insert(classifyEntities).ExecuteAffrows(); System.IO.File.Create("install.lock"); return View(); } diff --git a/CMS/JXCMS.CMS.Movie/Admin/Controllers/MovieController.cs b/CMS/JXCMS.CMS.Movie/Admin/Controllers/MovieController.cs new file mode 100644 index 0000000..27f6507 --- /dev/null +++ b/CMS/JXCMS.CMS.Movie/Admin/Controllers/MovieController.cs @@ -0,0 +1,21 @@ +using JXCMS.CMS.Attribute; +using JXCMS.CMS.Movie.Entity; +using Microsoft.AspNetCore.Mvc; + +namespace JXCMS.CMS.Movie.Admin.Controllers +{ + [Area("Admin")] + [AdminAuthentication] + public class MovieController : Controller + { + public IActionResult Index(int pageNumber = 1, int pageSize = 20) + { + var model = MovieEntity.Select.Count(out long count).Page(pageNumber, pageSize) + .Include(x => x.DirectorEntity).Include(x => x.ClassifyEntity).ToList(); + ViewBag.count = count; + ViewBag.pageNumber = pageNumber; + ViewBag.totlePage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1; + return View(model); + } + } +} \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/Admin/Views/Article/Index.cshtml b/CMS/JXCMS.CMS.Movie/Admin/Views/Article/Index.cshtml deleted file mode 100755 index 9e02d50..0000000 --- a/CMS/JXCMS.CMS.Movie/Admin/Views/Article/Index.cshtml +++ /dev/null @@ -1,265 +0,0 @@ -
- -
-
-
-
-
-
-
- - - -
- -
-
-
- 新增 - 启用 - 禁用 - 删除 -
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - 编号标题书籍作者阅读量状态操作
- - 1第01章 天涯思君不可忘《倚天屠龙记》金庸36正常 -
- - -
-
- - 2第01章 古道腾驹惊白发，危峦快剑识青翎《书剑恩仇录》金庸44正常 -
- - -
-
- - 3一个戴水獭皮帽子的朋友《湘行散记》沈从文39正常 -
- - -
-
- - 4你是要灼灼容颜，还是要宜其室家《诗三百：思无邪》安意如36正常 -
- - -
-
- - 5海上的消息《打开心内的窗》林清玄32正常 -
- - -
-
- - 6楔子 一阕词来 南国清秋魂梦绕 十年人散 绣房红烛剑光寒《七剑下天山》梁羽生42正常 -
- - -
-
- - 7祝福《彷徨》鲁迅40正常 -
- - -
-
- - 8一个女长年的故事《莫泊桑短篇小说集》莫泊桑36正常 -
- - -
-
- - 9第一回 赈民饥包公奉旨　图谋害庞相施计《五虎征西》李雨堂35正常 -
- - -
-
- - 10第一回 于按察山东赴任　邹其仁赴路登程《于公案》佚名37正常 -
- - -
-
-
- - -
-
-
- -
- -
diff --git a/CMS/JXCMS.CMS.Movie/Admin/Views/Classify/ClassifyDialog.cshtml b/CMS/JXCMS.CMS.Movie/Admin/Views/Classify/ClassifyDialog.cshtml new file mode 100644 index 0000000..b821865 --- /dev/null +++ b/CMS/JXCMS.CMS.Movie/Admin/Views/Classify/ClassifyDialog.cshtml @@ -0,0 +1,42 @@ +@using JXCMS.CMS.Movie.Entity +@model JXCMS.CMS.Movie.Entity.ClassifyEntity + +@{ + Layout = "_DialogLayout"; +} + +
+ +
+ + +
+
+ + +
+
+ + +
+
+ +@section dialogScript +{ + +} diff --git a/CMS/JXCMS.CMS.Movie/Admin/Views/Classify/Index.cshtml b/CMS/JXCMS.CMS.Movie/Admin/Views/Classify/Index.cshtml new file mode 100644 index 0000000..6a7f189 --- /dev/null +++ b/CMS/JXCMS.CMS.Movie/Admin/Views/Classify/Index.cshtml @@ -0,0 +1,160 @@ +@using JXCMS.CMS.Movie.Entity +@using JXCMS.Core.Extensions +@model List + +@{ + ViewBag.Title = "分类目录"; + Layout = "_Layout"; +} + +
+ +
+
+
+
+
+ 新增 +
+
+
+ +
+ + + + + + + + + + + + @if (Model.Count == 0) + { + + + + } + @foreach (var classifyEntity in Model) + { + + + + + + + + } + +
名称别名上级分类视频数量操作
无数据
@classifyEntity.Name@(classifyEntity.Alias.IsNullOrEmpty() ? "-" : classifyEntity.Alias)@(classifyEntity.Parent == null ? "无" : classifyEntity.Parent.Name)@classifyEntity.Count +
+ + + + 0) + { + @:disabled + }> + + +
+
+
+
    + @if (ViewBag.pageNumber != 1) + { +
  • + << +
    • + } + @for (int i = ViewBag.pageNumber - 3; i < ViewBag.pageNumber + 3; i++) + { + if (i < 1 || i > ViewBag.totlePage) + { + continue; + } + if (i == ViewBag.pageNumber) + { +
  • + @i +
    • + } + else + { +
  • + @i +
    • + } + } + @if (ViewBag.pageNumber < ViewBag.totlePage) + { +
  • + >> +
    • + } +
+ +
+
+
+ +
+
+ +
+
+ +@section style +{ + +} + +@section script +{ + + + + +} \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/Admin/Views/Collection/BindingClassifyDialog.cshtml b/CMS/JXCMS.CMS.Movie/Admin/Views/Collection/BindingClassifyDialog.cshtml new file mode 100644 index 0000000..c032e94 --- /dev/null +++ b/CMS/JXCMS.CMS.Movie/Admin/Views/Collection/BindingClassifyDialog.cshtml @@ -0,0 +1,35 @@ +@{ + Layout = "_DialogLayout"; +} +@using JXCMS.CMS.Movie.Entity +@model List +@{ + var classifyEntities = (List) ViewBag.classifyEntities; +} +
+ @for (int i = 0; i < Model.Count; i++) + { + @Html.HiddenFor(x => x[i].Id) + @Html.HiddenFor(x => x[i].WebSiteId) + @Html.HiddenFor(x => x[i].TypeName) + @Html.HiddenFor(x => x[i].TypeId) +
+ @Model[i].TypeName + + + + @Html.DropDownListFor(x => x[i].ClassifyId, new SelectList(classifyEntities, "Id", "Name", Model[i].ClassifyId), + new {@class = "form-control"}) +
+ } +
+ +@section dialogScript +{ + + +} \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/Admin/Views/Collection/Index.cshtml b/CMS/JXCMS.CMS.Movie/Admin/Views/Collection/Index.cshtml index f7a512c..d68ac95 100644 --- a/CMS/JXCMS.CMS.Movie/Admin/Views/Collection/Index.cshtml +++ b/CMS/JXCMS.CMS.Movie/Admin/Views/Collection/Index.cshtml @@ -47,10 +47,17 @@ 网站url 采集cron 状态 + 下次执行时间 操作 + @if (ViewBag.website.Count == 0) + { + + 无数据 + + } @foreach (WebSiteEntity webSiteEntity in ViewBag.website) { @@ -65,12 +72,13 @@ @(webSiteEntity.IsEnable ? "正常" : "已禁用") + @webSiteEntity.NextRunTime
- + diff --git a/CMS/JXCMS.CMS.Movie/Admin/Views/Home/Index.cshtml b/CMS/JXCMS.CMS.Movie/Admin/Views/Home/Index.cshtml index 59d7df3..a5db666 100755 --- a/CMS/JXCMS.CMS.Movie/Admin/Views/Home/Index.cshtml +++ b/CMS/JXCMS.CMS.Movie/Admin/Views/Home/Index.cshtml @@ -34,11 +34,10 @@
  • 后台首页
  • - 文章 + 影视
    • diff --git a/CMS/JXCMS.CMS.Movie/Admin/Views/Movie/Index.cshtml b/CMS/JXCMS.CMS.Movie/Admin/Views/Movie/Index.cshtml new file mode 100644 index 0000000..2d01cd8 --- /dev/null +++ b/CMS/JXCMS.CMS.Movie/Admin/Views/Movie/Index.cshtml @@ -0,0 +1,131 @@ +@model List + +@{ + Layout = "_Layout"; +} + +
    + +
    +
    +
    +
    +
    +
    +
    + + + +
    + +
    +
    +
    + 新增 + 显示 + 隐藏 + 删除 +
    +
    +
    + +
    + + + + + + + + + + + + + + + @foreach (var movieEntity in Model) + { + + + + + + + + + + + } + +
    + + 名称导演年份语种分类状态操作
    + + @movieEntity.Name@movieEntity.DirectorEntity.DirectorName@movieEntity.Year@movieEntity.Lang@movieEntity.ClassifyEntity.Name + @(movieEntity.IsEnable ? "正常" : "已隐藏") + +
    + + + + + + +
    +
    +
    +
      + @if (ViewBag.pageNumber != 1) + { +
    • + << +
      • + } + @for (int i = ViewBag.pageNumber - 3; i < ViewBag.pageNumber + 3; i++) + { + if (i < 1 || i > ViewBag.totlePage) + { + continue; + } + if (i == ViewBag.pageNumber) + { +
    • + @i +
      • + } + else + { +
    • + @i +
      • + } + } + @if (ViewBag.pageNumber < ViewBag.totlePage) + { +
    • + >> +
      • + } +
    + +
    +
    +
    + +
    + +
    \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/Controllers/HomeController.cs b/CMS/JXCMS.CMS.Movie/Controllers/HomeController.cs index 8d56625..aa33f54 100755 --- a/CMS/JXCMS.CMS.Movie/Controllers/HomeController.cs +++ b/CMS/JXCMS.CMS.Movie/Controllers/HomeController.cs @@ -6,6 +6,8 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using JXCMS.CMS.Models; +using JXCMS.CMS.Movie.Entity; +using JXCMS.CMS.Movie.Spider; using JXCMS.Core.Themes; namespace JXCMS.CMS.Controllers @@ -35,5 +37,10 @@ namespace JXCMS.CMS.Controllers { return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); } + + public IActionResult Test() + { + return View(); + } } } diff --git a/CMS/JXCMS.CMS.Movie/Entity/ActorEntity.cs b/CMS/JXCMS.CMS.Movie/Entity/ActorEntity.cs new file mode 100644 index 0000000..339904f --- /dev/null +++ b/CMS/JXCMS.CMS.Movie/Entity/ActorEntity.cs @@ -0,0 +1,14 @@ +using System.Collections.Generic; +using FreeSql; +using FreeSql.DataAnnotations; + +namespace JXCMS.CMS.Movie.Entity +{ + public class ActorEntity : BaseEntity + { + public string ActorName { get; set; } + + [Navigate(ManyToMany = typeof(MovieActorEntity))] + public List MovieEntities { get; set; } + } +} \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/Entity/ClassifyEntity.cs b/CMS/JXCMS.CMS.Movie/Entity/ClassifyEntity.cs index bc47c86..988f674 100644 --- a/CMS/JXCMS.CMS.Movie/Entity/ClassifyEntity.cs +++ b/CMS/JXCMS.CMS.Movie/Entity/ClassifyEntity.cs @@ -1,4 +1,7 @@ +using System.Collections.Generic; using FreeSql; +using FreeSql.DataAnnotations; +using Renci.SshNet.Messages.Transport; namespace JXCMS.CMS.Movie.Entity { @@ -6,6 +9,17 @@ namespace JXCMS.CMS.Movie.Entity { public string Name { get; set; } + public string Alias { get; set; } + public int ParentId { get; set; } + + [Navigate("ParentId")] + public ClassifyEntity Parent { get; set; } + + public ICollection Childs { get; set; } + + [Column(IsIgnore = true)] + public long Count { get; set; } + } } \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/Entity/DirectorEntity.cs b/CMS/JXCMS.CMS.Movie/Entity/DirectorEntity.cs new file mode 100644 index 0000000..2fd3082 --- /dev/null +++ b/CMS/JXCMS.CMS.Movie/Entity/DirectorEntity.cs @@ -0,0 +1,9 @@ +using FreeSql; + +namespace JXCMS.CMS.Movie.Entity +{ + public class DirectorEntity : BaseEntity + { + public string DirectorName { get; set; } + } +} \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/Entity/MovieActorEntity.cs b/CMS/JXCMS.CMS.Movie/Entity/MovieActorEntity.cs new file mode 100644 index 0000000..b94ecf1 --- /dev/null +++ b/CMS/JXCMS.CMS.Movie/Entity/MovieActorEntity.cs @@ -0,0 +1,18 @@ +using FreeSql; +using FreeSql.DataAnnotations; + +namespace JXCMS.CMS.Movie.Entity +{ + public class MovieActorEntity : BaseEntity + { + public int ActorId { get; set; } + + [Navigate("ActorId")] + public ActorEntity ActorEntity { get; set; } + + public int MovieId { get; set; } + + [Navigate("MovieId")] + public MovieEntity MovieEntity { get; set; } + } +} \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/Entity/MovieEntity.cs b/CMS/JXCMS.CMS.Movie/Entity/MovieEntity.cs new file mode 100644 index 0000000..7e8669a --- /dev/null +++ b/CMS/JXCMS.CMS.Movie/Entity/MovieEntity.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using FreeSql; +using FreeSql.DataAnnotations; + +namespace JXCMS.CMS.Movie.Entity +{ + public class MovieEntity : BaseEntity + { + public string Name { get; set; } + + public string Pic { get; set; } + + public int ClassifyId { get; set; } + + public string Lang { get; set; } + + public string Area { get; set; } + + public string Year { get; set; } + + public int DirectorId { get; set; } + + public DateTime LastUpdate { get; set; } + + public bool IsEnable { get; set; } = true; + + [StringLength(-1)] + public string Des { get; set; } + + [Navigate("DirectorId")] + public virtual DirectorEntity DirectorEntity { get; set; } + + [Navigate("ClassifyId")] + public virtual ClassifyEntity ClassifyEntity { get; set; } + + [Navigate(ManyToMany = typeof(MovieActorEntity))] + public virtual List ActorEntities { get; set; } + + [Navigate("Id")] + public virtual List MovieListEntities { get; set; } + } +} \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/Entity/MovieListEntity.cs b/CMS/JXCMS.CMS.Movie/Entity/MovieListEntity.cs new file mode 100644 index 0000000..3605706 --- /dev/null +++ b/CMS/JXCMS.CMS.Movie/Entity/MovieListEntity.cs @@ -0,0 +1,22 @@ +using FreeSql; +using FreeSql.DataAnnotations; + +namespace JXCMS.CMS.Movie.Entity +{ + public class MovieListEntity : BaseEntity + { + public string Name { get; set; } + + public string PlayUrl { get; set; } + + public string Type { get; set; } + + public int MovieId { get; set; } + + public int WebSiteId { get; set; } + + [Navigate("MovieId")] + public virtual MovieEntity MovieEntity { get; set; } + + } +} \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/Entity/WebSiteClassifyEntity.cs b/CMS/JXCMS.CMS.Movie/Entity/WebSiteClassifyEntity.cs new file mode 100644 index 0000000..f03239e --- /dev/null +++ b/CMS/JXCMS.CMS.Movie/Entity/WebSiteClassifyEntity.cs @@ -0,0 +1,19 @@ +using FreeSql; +using FreeSql.DataAnnotations; + +namespace JXCMS.CMS.Movie.Entity +{ + public class WebSiteClassifyEntity : BaseEntity + { + public int WebSiteId { get; set; } + + public int TypeId { get; set; } + + public string TypeName { get; set; } + + public int ClassifyId { get; set; } + + [Navigate("WebSiteId")] + public virtual WebSiteEntity WebSiteEntity { get; set; } + } +} \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/Entity/WebSiteEntity.cs b/CMS/JXCMS.CMS.Movie/Entity/WebSiteEntity.cs index 709f776..b096a71 100644 --- a/CMS/JXCMS.CMS.Movie/Entity/WebSiteEntity.cs +++ b/CMS/JXCMS.CMS.Movie/Entity/WebSiteEntity.cs @@ -1,4 +1,7 @@ +using System; +using System.Collections.Generic; using FreeSql; +using FreeSql.DataAnnotations; namespace JXCMS.CMS.Movie.Entity { @@ -11,5 +14,15 @@ namespace JXCMS.CMS.Movie.Entity public string Cron { get; set; } = "0 0 * * * ?"; public bool IsEnable { get; set; } = true; + + public string LatestMovieNote { get; set; } + + public DateTime LatestMoveTime { get; set; } + + [Navigate("Id")] + public List WebSiteClassifyEntities { get; set; } + + [Column(IsIgnore = true)] + public string NextRunTime { get; set; } } } \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/JXCMS.CMS.Movie.csproj b/CMS/JXCMS.CMS.Movie/JXCMS.CMS.Movie.csproj index 2734cea..494553d 100755 --- a/CMS/JXCMS.CMS.Movie/JXCMS.CMS.Movie.csproj +++ b/CMS/JXCMS.CMS.Movie/JXCMS.CMS.Movie.csproj @@ -21,6 +21,7 @@ + diff --git a/CMS/JXCMS.CMS.Movie/Models/MovieListInfoModel.cs b/CMS/JXCMS.CMS.Movie/Models/MovieListInfoModel.cs new file mode 100644 index 0000000..8f63cb5 --- /dev/null +++ b/CMS/JXCMS.CMS.Movie/Models/MovieListInfoModel.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using JXCMS.CMS.Movie.Entity; + +namespace JXCMS.CMS.Movie.Models +{ + public class MovieListInfoModel + { + public string RecordCount { get; set; } + + public string PageSize { get; set; } + + public string CurrentPage { get; set; } + + public string PageCount { get; set; } + + public List MovieInfoModels { get; set; } = new List(); + } + + public class MovieInfoModel + { + public string Id { get; set; } + + public string TypeId { get; set; } + + public DateTime LastUpdateTime { get; set; } + + public string Name { get; set; } + + public string TypeName { get; set; } + + } +} \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/Program.cs b/CMS/JXCMS.CMS.Movie/Program.cs index b56621e..717bdfb 100755 --- a/CMS/JXCMS.CMS.Movie/Program.cs +++ b/CMS/JXCMS.CMS.Movie/Program.cs @@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; +using Serilog; namespace JXCMS.CMS { @@ -22,6 +23,6 @@ namespace JXCMS.CMS .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); - }); + }).UseSerilog(); } } diff --git a/CMS/JXCMS.CMS.Movie/Spider/ClassifySpider.cs b/CMS/JXCMS.CMS.Movie/Spider/ClassifySpider.cs new file mode 100644 index 0000000..24a534d --- /dev/null +++ b/CMS/JXCMS.CMS.Movie/Spider/ClassifySpider.cs @@ -0,0 +1,38 @@ +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Xml; +using JXCMS.CMS.Movie.Entity; +using SufeiUtil; + +namespace JXCMS.CMS.Movie.Spider +{ + public class ClassifySpider + { + public static void GetAllClassifyFromUrl(int websiteId, string url, List webSiteClassifyEntities) + { + var helper = new HttpHelper(); + var item = new HttpItem(); + item.URL = url; + var result = helper.GetHtml(item); + if (result.StatusCode == HttpStatusCode.OK) + { + XmlDocument doc = new XmlDocument(); + doc.LoadXml(result.Html); + var classNode = doc.SelectSingleNode("/rss/class"); + + foreach (XmlNode childNode in classNode.ChildNodes) + { + if (webSiteClassifyEntities.All(x => x.TypeId.ToString() != childNode.Attributes["id"].Value)) + { + WebSiteClassifyEntity webSiteClassifyEntity = new WebSiteClassifyEntity(); + webSiteClassifyEntity.TypeId = int.Parse(childNode.Attributes["id"].Value); + webSiteClassifyEntity.TypeName = childNode.InnerText; + webSiteClassifyEntity.WebSiteId = websiteId; + webSiteClassifyEntities.Add(webSiteClassifyEntity); + } + } + } + } + } +} \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/Spider/MovieSpider.cs b/CMS/JXCMS.CMS.Movie/Spider/MovieSpider.cs new file mode 100644 index 0000000..e9f7521 --- /dev/null +++ b/CMS/JXCMS.CMS.Movie/Spider/MovieSpider.cs @@ -0,0 +1,265 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Xml; +using FreeSql; +using JXCMS.CMS.Movie.Entity; +using JXCMS.CMS.Movie.Models; +using JXCMS.Core.Extensions; +using JXCMS.Core.Log; +using SufeiUtil; +using Log = Serilog.Log; + +namespace JXCMS.CMS.Movie.Spider +{ + public class MovieSpider + { + + private readonly List _webSiteClassifyEntities; + private readonly List _actorEntities; + private readonly List _directorEntities; + + private static MovieSpider _instance; + + public static MovieSpider Instance => _instance ??= new MovieSpider(); + + private MovieSpider() + { + _webSiteClassifyEntities = WebSiteClassifyEntity.Select.ToList(); + _actorEntities = ActorEntity.Select.ToList(); + _directorEntities = DirectorEntity.Select.ToList(); + } + + public MovieListInfoModel GetMovieList(WebSiteEntity webSiteEntity, int number) + { + HttpItem item = new HttpItem(); + item.URL = $"{webSiteEntity.ApiUrl}?pg={number}"; + HttpHelper helper = new HttpHelper(); + var result = helper.GetHtml(item); + if (result.StatusCode == HttpStatusCode.OK) + { + Log.Logger.Information($"{{@name}} 成功获取地址:{item.URL}", webSiteEntity.WebSiteName); + XmlDocument doc = new XmlDocument(); + doc.LoadXml(result.Html); + var listNode = doc.SelectSingleNode("/rss/list"); + MovieListInfoModel movieListInfoModel = new MovieListInfoModel();; + movieListInfoModel.CurrentPage = listNode.Attributes["page"].Value; + movieListInfoModel.PageCount = listNode.Attributes["pagecount"].Value; + movieListInfoModel.PageSize = listNode.Attributes["pagesize"].Value; + movieListInfoModel.RecordCount = listNode.Attributes["recordcount"].Value; + var videos = listNode.SelectNodes("//video"); + foreach (XmlNode video in videos) + { + MovieInfoModel model = new MovieInfoModel + { + LastUpdateTime = DateTime.Parse(video.SelectSingleNode("last").InnerText), + Name = video.SelectSingleNode("name").InnerText, + TypeId = video.SelectSingleNode("tid").InnerText, + Id = video.SelectSingleNode("id").InnerText, + TypeName = video.SelectSingleNode("type").InnerText + }; + movieListInfoModel.MovieInfoModels.Add(model); + } + return movieListInfoModel; + } + Log.Warning($"{{@name}} 获取api失败，错误码{result.StatusCode}", webSiteEntity.WebSiteName); + return null; + } + + public DateTime GetMovieInfos(WebSiteEntity webSiteEntity, List<(string id, string name, string typeId)> idNameTypes) + { + HttpItem item = new HttpItem(); + item.URL = $"{webSiteEntity.ApiUrl}?ac=videolist&ids={string.Join(",", idNameTypes.Select(x => x.id))}"; + HttpHelper helper = new HttpHelper(); + var result = helper.GetHtml(item); + if (result.StatusCode == HttpStatusCode.OK) + { + DateTime dt = DateTime.MinValue; + Log.Logger.Information($"{{@name}} 成功获取地址:{item.URL}", webSiteEntity.WebSiteName); + XmlDocument doc = new XmlDocument(); + doc.LoadXml(result.Html); + var videoNode = doc.SelectNodes("/rss/list/video"); + foreach (XmlNode video in videoNode) + { + var name = video.SelectSingleNode("name").InnerText; + var director = video.SelectSingleNode("director").InnerText; + if (director.IsNullOrEmpty()) + { + director = "未知"; + } + var movieEntity = MovieEntity.Select.Include(x => x.DirectorEntity) + .Where(x => x.Name == name && x.DirectorEntity.DirectorName == director).First(); + if (movieEntity == null) + { + movieEntity = new MovieEntity(); + movieEntity.Area = video.SelectSingleNode("area").InnerText == "" ? "未知":video.SelectSingleNode("area").InnerText; + movieEntity.Des = video.SelectSingleNode("des").InnerText == "" ? "暂无介绍":video.SelectSingleNode("des").InnerText; + movieEntity.Lang = video.SelectSingleNode("lang").InnerText == "" ? "未知":video.SelectSingleNode("lang").InnerText; + movieEntity.Name = video.SelectSingleNode("name").InnerText; + movieEntity.Pic = video.SelectSingleNode("pic").InnerText == "" ? "/img/cover.jpg":video.SelectSingleNode("lang").InnerText; + movieEntity.Year = video.SelectSingleNode("year").InnerText == "" || video.SelectSingleNode("year").InnerText == "0" ? "未知":video.SelectSingleNode("year").InnerText; + movieEntity.ClassifyId = int.Parse(idNameTypes.First(x => x.id == video.SelectSingleNode("id").InnerText).typeId); + var directorId = _directorEntities.FirstOrDefault(x => x.DirectorName == director)?.Id; + if (directorId == null) + { + DirectorEntity directorEntity = new DirectorEntity(); + directorEntity.DirectorName = director; + directorEntity.Save(); + directorId = directorEntity.Id; + } + + movieEntity.DirectorId = directorId.Value; + movieEntity.LastUpdate = DateTime.Parse(video.SelectSingleNode("last").InnerText); + movieEntity.Save(); + if (movieEntity.LastUpdate > dt) + { + dt = movieEntity.LastUpdate; + } + var actorStr = video.SelectSingleNode("actor").InnerText; + if (actorStr.IsNullOrEmpty()) + { + actorStr = "未知"; + } + var actorsStr = actorStr.Split(',', ' '); + var actors = _actorEntities.Where(x => actorsStr.Contains(x.ActorName)).ToList(); + foreach (var actor in actorsStr) + { + var id = actors.FirstOrDefault(x => x.ActorName == actor)?.Id; + if (id == null) + { + ActorEntity actorEntity = new ActorEntity {ActorName = actor}; + actorEntity.Save(); + id = actorEntity.Id; + } + + MovieActorEntity movieActorEntity = new MovieActorEntity + { + ActorId = id.Value, MovieId = movieEntity.Id + }; + movieActorEntity.Save(); + } + } + + var dds = video.SelectNodes("dl/dd"); + var movieListEntity = MovieListEntity.Where(x => x.MovieId == movieEntity.Id && x.WebSiteId == webSiteEntity.Id) + .OrderByDescending(x => x.Id).First(); + if (movieListEntity == null) + { + foreach (XmlNode dd in dds) + { + var number = dd.InnerText.Split('#'); + if (number.Length <= 0 || !number[0].Split('$')[1].ToLower().EndsWith("m3u8")) + { + continue; + } + Log.Logger.Information("{@name} 获取到m3u8列表！", webSiteEntity.WebSiteName); + var movieListEntities = number.Select(x => + { + var sp = x.Split('$'); + return new MovieListEntity + { + Name = sp[0], + Type = sp[2], + MovieId = movieEntity.Id, + PlayUrl = sp[1], + WebSiteId = webSiteEntity.Id + }; + }); + BaseEntity.Orm.Insert(movieListEntities).ExecuteAffrows(); + Log.Logger.Information($"{{@name}} 插入剧集{movieEntity.Name}成功！", webSiteEntity.WebSiteName); + } + } + else + { + var node = dds.Cast().FirstOrDefault(x => x.Attributes["flag"].Value == movieListEntity.Type); + if (node == null) + { + Log.Logger.Error("{@name} 未找到指定的剧集列表！", webSiteEntity.WebSiteName); + } + bool flag = false; + foreach (var number in node.InnerText.Split('#')) + { + var sp = number.Split('$'); + if (sp[0] == movieListEntity.Name) + { + flag = true; + continue; + } + + if (!flag) + { + continue; + } + + new MovieListEntity() + { + Name = sp[0], + MovieId = movieEntity.Id, + PlayUrl = sp[1], + Type = sp[2], + WebSiteId = webSiteEntity.Id + }.Save(); + Log.Logger.Information($"{{@name}} 插入剧集{movieEntity.Name}-{sp[0]}成功！", webSiteEntity.WebSiteName); + } + } + } + return dt; + } + return DateTime.MinValue; + } + + public void StartSpider(WebSiteEntity webSiteEntity, bool reGetAll = false) + { + var model = GetMovieList(webSiteEntity, 1); + if (model == null) + { + Log.Logger.Error("{@name} 获取信息失败，采集结束！", webSiteEntity.WebSiteName); + return; + } + int number = 1; + if (!int.TryParse(model.PageCount, out int count)) + { + Log.Logger.Error("{@name} 获取总页数失败，采集结束！", webSiteEntity.WebSiteName); + return; + } + DateTime dt = DateTime.MinValue; + do + { + model = GetMovieList(webSiteEntity, number++); + if (model == null) + { + Log.Logger.Error("{@name} 获取信息失败，采集结束！", webSiteEntity.WebSiteName); + return; + } + List<(string id, string name, string typeId)> idNameTypes = new List<(string, string, string)>(); + foreach (var modelMovieInfoModel in model.MovieInfoModels) + { + if (webSiteEntity.LatestMoveTime > modelMovieInfoModel.LastUpdateTime) + { + Log.Logger.Information("{@name} 已检查到最后一条", webSiteEntity.WebSiteName); + break; + } + if (!_webSiteClassifyEntities.Any(x => x.WebSiteId == webSiteEntity.Id && x.TypeId.ToString() == modelMovieInfoModel.TypeId)) + { + Log.Logger.Warning($"{{@name}} 未找到与{modelMovieInfoModel.TypeName}对应的分类，自动跳过", webSiteEntity.WebSiteName); + continue; + } + idNameTypes.Add((modelMovieInfoModel.Id, modelMovieInfoModel.Name, modelMovieInfoModel.TypeId)); + } + + if (idNameTypes.Count == 0) + { + if (webSiteEntity.LatestMoveTime < dt) + { + webSiteEntity.LatestMoveTime = dt; + webSiteEntity.Save(); + } + Log.Information("{@name} 采集完成！", webSiteEntity.WebSiteName); + return; + } + dt = GetMovieInfos(webSiteEntity, idNameTypes); + } while (number <= count); + } + } +} \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/Startup.cs b/CMS/JXCMS.CMS.Movie/Startup.cs index 2026f4d..21666d2 100755 --- a/CMS/JXCMS.CMS.Movie/Startup.cs +++ b/CMS/JXCMS.CMS.Movie/Startup.cs @@ -8,12 +8,15 @@ using JXCMS.CMS.Entity; using JXCMS.Core; using JXCMS.Core.Auth; using JXCMS.Core.Db; +using JXCMS.Core.Log; using JXCMS.Core.Themes; +using JXCMS.Core.Utils; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.HttpsPolicy; +using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.Razor; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -28,6 +31,8 @@ namespace JXCMS.CMS { Configuration = configuration; Environment = environment; + ConfigHelper.Configs = Configuration; + Log.Init(); } public IHostEnvironment Environment { get; } @@ -53,6 +58,10 @@ namespace JXCMS.CMS services.AddJXAuth(); services.AddCms(); + + services.AddSingleton(); + + services.AddSingleton(); } diff --git a/CMS/JXCMS.CMS.Movie/Utils/Classify.cs b/CMS/JXCMS.CMS.Movie/Utils/Classify.cs new file mode 100644 index 0000000..84fc17b --- /dev/null +++ b/CMS/JXCMS.CMS.Movie/Utils/Classify.cs @@ -0,0 +1,46 @@ +using System.Collections.Generic; +using System.Linq; +using JXCMS.CMS.Movie.Entity; +using JXCMS.Core.Extensions; + +namespace JXCMS.CMS.Movie.Utils +{ + public static class Classify + { + public static List FindAllChildren(List classifyEntities, int baseId, bool includeSelf = true) + { + var returnValue = new List(); + if (includeSelf) + { + returnValue.AddRange(classifyEntities.Where(x => x.Id == baseId)); + } + var classifyEntityList = classifyEntities.Where(x => x.ParentId == baseId).ToList(); + returnValue.AddRange(classifyEntityList); + foreach (var classifyEntity in classifyEntityList) + { + returnValue.AddRange(FindAllChildren(classifyEntities, classifyEntity.Id, false)); + } + return returnValue; + } + + public static List FindAllNotChildren(List classifyEntities, int baseId) + { + var children = FindAllChildren(classifyEntities, baseId, true); + return classifyEntities.Where(x => !children.Contains(x)).ToList(); + } + + public static List Structured(List classifyEntities, int baseId = 0, int hierarchy = 0) + { + var returnValue = new List(); + var classifyEntityList = classifyEntities.Where(x => x.ParentId == baseId).ToList(); + foreach (var classifyEntity in classifyEntityList) + { + classifyEntity.Name = classifyEntity.Name.InsertMultipleString("-", hierarchy * 2); + returnValue.Add(classifyEntity); + returnValue.AddRange(Structured(classifyEntities, classifyEntity.Id, hierarchy + 1)); + } + + return returnValue; + } + } +} \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/Utils/HttpHelper.cs b/CMS/JXCMS.CMS.Movie/Utils/HttpHelper.cs new file mode 100644 index 0000000..c4eaf6a --- /dev/null +++ b/CMS/JXCMS.CMS.Movie/Utils/HttpHelper.cs @@ -0,0 +1,848 @@ +/// +/// 类说明：HttpHelper类，用来实现Http访问，Post或者Get方式的，直接访问，带Cookie的，带证书的等方式，可以设置代理 +/// 重要提示：请不要自行修改本类，如果因为你自己修改后将无法升级到新版本。如果确实有什么问题请到官方网站提建议， +/// 我们一定会及时修改 +/// 编码日期：2011-09-20 +/// 编 码 人：苏飞 +/// 联系方式：361983679 +/// 官方网址：http://www.sufeinet.com/thread-3-1-1.html +/// 修改日期：2020-02-10 +/// 版 本 号：2.2.9 +/// +using System; +using System.Collections.Generic; +using System.Text; +using System.Net; +using System.IO; +using System.Text.RegularExpressions; +using System.IO.Compression; +using System.Security.Cryptography.X509Certificates; +using System.Net.Security; +using System.Linq; +using System.Net.Cache; + +namespace SufeiUtil +{ + /// + /// Http连接操作帮助类 + /// + public class HttpHelper + { + #region 预定义方变量 + //默认的编码 + private Encoding encoding = Encoding.Default; + //Post数据编码 + private Encoding postencoding = Encoding.Default; + //HttpWebRequest对象用来发起请求 + private HttpWebRequest request = null; + //获取影响流的数据对象 + private HttpWebResponse response = null; + //设置本地的出口ip和端口 + private IPEndPoint _IPEndPoint = null; + #endregion + + #region Public + + /// + /// 根据相传入的数据，得到相应页面数据 + /// + /// 参数类对象 + /// 返回HttpResult类型 + public HttpResult GetHtml(HttpItem item) + { + //返回参数 + HttpResult result = new HttpResult(); + try + { + //准备参数 + SetRequest(item); + } + catch (Exception ex) + { + //配置参数时出错 + return new HttpResult() { Cookie = string.Empty, Header = null, Html = ex.Message, StatusDescription = "配置参数时出错：" + ex.Message }; + } + try + { + //请求数据 + using (response = (HttpWebResponse)request.GetResponse()) + { + GetData(item, result); + } + } + catch (WebException ex) + { + if (ex.Response != null) + { + using (response = (HttpWebResponse)ex.Response) + { + GetData(item, result); + } + } + else + { + result.Html = ex.Message; + } + } + catch (Exception ex) + { + result.Html = ex.Message; + } + if (item.IsToLower) result.Html = result.Html.ToLower(); + //重置request，response为空 + if (item.IsReset) + { + request = null; + response = null; + } + return result; + } + #endregion + + #region GetData + + /// + /// 获取数据的并解析的方法 + /// + /// + /// + private void GetData(HttpItem item, HttpResult result) + { + if (response == null) + { + return; + } + #region base + //获取StatusCode + result.StatusCode = response.StatusCode; + //获取StatusDescription + result.StatusDescription = response.StatusDescription; + //获取Headers + result.Header = response.Headers; + //获取最后访问的URl + result.ResponseUri = response.ResponseUri.ToString(); + //获取CookieCollection + if (response.Cookies != null) result.CookieCollection = response.Cookies; + //获取set-cookie + if (response.Headers["set-cookie"] != null) result.Cookie = response.Headers["set-cookie"]; + #endregion + + #region byte + + //处理网页Byte + byte[] ResponseByte = GetByte(); + + #endregion + + #region Html + if (ResponseByte != null && ResponseByte.Length > 0) + { + //设置编码 + SetEncoding(item, result, ResponseByte); + //得到返回的HTML + result.Html = encoding.GetString(ResponseByte); + } + else + { + //没有返回任何Html代码 + result.Html = string.Empty; + } + #endregion + } + /// + /// 设置编码 + /// + /// HttpItem + /// HttpResult + /// byte[] + private void SetEncoding(HttpItem item, HttpResult result, byte[] ResponseByte) + { + //是否返回Byte类型数据 + if (item.ResultType == ResultType.Byte) result.ResultByte = ResponseByte; + //从这里开始我们要无视编码了 + if (encoding == null) + { + Match meta = Regex.Match(Encoding.Default.GetString(ResponseByte), " 0) + { + c = meta.Groups[1].Value.ToLower().Trim(); + } + if (c.Length > 2) + { + try + { + encoding = Encoding.GetEncoding(c.Replace("\"", string.Empty).Replace("'", "").Replace(";", "").Replace("iso-8859-1", "gbk").Trim()); + } + catch + { + if (string.IsNullOrEmpty(response.CharacterSet)) + { + encoding = Encoding.UTF8; + } + else + { + encoding = Encoding.GetEncoding(response.CharacterSet); + } + } + } + else + { + if (string.IsNullOrEmpty(response.CharacterSet)) + { + encoding = Encoding.UTF8; + } + else + { + encoding = Encoding.GetEncoding(response.CharacterSet); + } + } + } + } + /// + /// 提取网页Byte + /// + /// + private byte[] GetByte() + { + byte[] ResponseByte = null; + using (MemoryStream _stream = new MemoryStream()) + { + //GZIIP处理 + if (response.ContentEncoding != null && response.ContentEncoding.Equals("gzip", StringComparison.InvariantCultureIgnoreCase)) + { + //开始读取流并设置编码方式 + new GZipStream(response.GetResponseStream(), CompressionMode.Decompress).CopyTo(_stream, 1024); + } + else + { + //开始读取流并设置编码方式 + response.GetResponseStream().CopyTo(_stream, 1024); + } + //获取Byte + ResponseByte = _stream.ToArray(); + } + return ResponseByte; + } + + + #endregion + + #region SetRequest + + /// + /// 为请求准备参数 + /// + ///参数列表 + private void SetRequest(HttpItem item) + { + + // 验证证书 + SetCer(item); + if (item.IPEndPoint != null) + { + _IPEndPoint = item.IPEndPoint; + //设置本地的出口ip和端口 + request.ServicePoint.BindIPEndPointDelegate = new BindIPEndPoint(BindIPEndPointCallback); + } + //设置Header参数 + if (item.Header != null && item.Header.Count > 0) foreach (string key in item.Header.AllKeys) + { + request.Headers.Add(key, item.Header[key]); + } + // 设置代理 + SetProxy(item); + if (item.ProtocolVersion != null) request.ProtocolVersion = item.ProtocolVersion; + request.ServicePoint.Expect100Continue = item.Expect100Continue; + //请求方式Get或者Post + request.Method = item.Method; + request.Timeout = item.Timeout; + request.KeepAlive = item.KeepAlive; + request.ReadWriteTimeout = item.ReadWriteTimeout; + if (!string.IsNullOrWhiteSpace(item.Host)) + { + request.Host = item.Host; + } + if (item.IfModifiedSince != null) request.IfModifiedSince = Convert.ToDateTime(item.IfModifiedSince); + if (item.Date!=null) + { + request.Date = Convert.ToDateTime(item.Date); + } + //Accept + request.Accept = item.Accept; + //ContentType返回类型 + request.ContentType = item.ContentType; + //UserAgent客户端的访问类型，包括浏览器版本和操作系统信息 + request.UserAgent = item.UserAgent; + // 编码 + encoding = item.Encoding; + //设置安全凭证 + request.Credentials = item.ICredentials; + //设置Cookie + SetCookie(item); + //来源地址 + request.Referer = item.Referer; + //是否执行跳转功能 + request.AllowAutoRedirect = item.Allowautoredirect; + if (item.MaximumAutomaticRedirections > 0) + { + request.MaximumAutomaticRedirections = item.MaximumAutomaticRedirections; + } + //设置Post数据 + SetPostData(item); + //设置最大连接 + if (item.Connectionlimit > 0) request.ServicePoint.ConnectionLimit = item.Connectionlimit; + } + /// + /// 设置证书 + /// + /// + private void SetCer(HttpItem item) + { + if (!string.IsNullOrWhiteSpace(item.CerPath)) + { + //这一句一定要写在创建连接的前面。使用回调的方法进行证书验证。 + ServicePointManager.ServerCertificateValidationCallback = new System.Net.Security.RemoteCertificateValidationCallback(CheckValidationResult); + //初始化对像，并设置请求的URL地址 + request = (HttpWebRequest)WebRequest.Create(item.URL); + SetCerList(item); + //将证书添加到请求里 + request.ClientCertificates.Add(new X509Certificate(item.CerPath)); + } + else + { + //初始化对像，并设置请求的URL地址 + request = (HttpWebRequest)WebRequest.Create(item.URL); + SetCerList(item); + } + } + /// + /// 设置多个证书 + /// + /// + private void SetCerList(HttpItem item) + { + if (item.ClentCertificates != null && item.ClentCertificates.Count > 0) + { + foreach (X509Certificate c in item.ClentCertificates) + { + request.ClientCertificates.Add(c); + } + } + } + /// + /// 设置Cookie + /// + /// Http参数 + private void SetCookie(HttpItem item) + { + if (!string.IsNullOrEmpty(item.Cookie)) request.Headers[HttpRequestHeader.Cookie] = item.Cookie; + //设置CookieCollection + if (item.ResultCookieType == ResultCookieType.CookieCollection) + { + request.CookieContainer = new CookieContainer(); + if (item.CookieCollection != null && item.CookieCollection.Count > 0) + { + //默认为20个，如果超出需要增加长度 + if (item.CookieCollection.Count > 20) + { + request.CookieContainer.PerDomainCapacity = item.CookieCollection.Count; + } + request.CookieContainer.Add(item.CookieCollection); + } + } + } + /// + /// 设置Post数据 + /// + /// Http参数 + private void SetPostData(HttpItem item) + { + //验证在得到结果时是否有传入数据 + if (!request.Method.Trim().ToLower().Contains("get")) + { + if (item.PostEncoding != null) + { + postencoding = item.PostEncoding; + } + byte[] buffer = null; + //写入Byte类型 + if (item.PostDataType == PostDataType.Byte && item.PostdataByte != null && item.PostdataByte.Length > 0) + { + //验证在得到结果时是否有传入数据 + buffer = item.PostdataByte; + }//写入文件 + else if (item.PostDataType == PostDataType.FilePath && !string.IsNullOrWhiteSpace(item.Postdata)) + { + StreamReader r = new StreamReader(item.Postdata, postencoding); + buffer = postencoding.GetBytes(r.ReadToEnd()); + r.Close(); + } //写入字符串 + else if (!string.IsNullOrWhiteSpace(item.Postdata)) + { + buffer = postencoding.GetBytes(item.Postdata); + } + if (buffer != null) + { + request.ContentLength = buffer.Length; + request.GetRequestStream().Write(buffer, 0, buffer.Length); + } + else + { + request.ContentLength = 0; + } + } + } + /// + /// 设置代理 + /// + /// 参数对象 + private void SetProxy(HttpItem item) + { + bool isIeProxy = false; + if (!string.IsNullOrWhiteSpace(item.ProxyIp)) + { + isIeProxy = item.ProxyIp.ToLower().Contains("ieproxy"); + } + if (!string.IsNullOrWhiteSpace(item.ProxyIp) && !isIeProxy) + { + //设置代理服务器 + if (item.ProxyIp.Contains(":")) + { + string[] plist = item.ProxyIp.Split(':'); + WebProxy myProxy = new WebProxy(plist[0].Trim(), Convert.ToInt32(plist[1].Trim())); + //建议连接 + myProxy.Credentials = new NetworkCredential(item.ProxyUserName, item.ProxyPwd); + //给当前请求对象 + request.Proxy = myProxy; + } + else + { + WebProxy myProxy = new WebProxy(item.ProxyIp, false); + //建议连接 + myProxy.Credentials = new NetworkCredential(item.ProxyUserName, item.ProxyPwd); + //给当前请求对象 + request.Proxy = myProxy; + } + } + else if (isIeProxy) + { + //设置为IE代理 + } + else + { + request.Proxy = item.WebProxy; + } + } + + + #endregion + + #region private main + /// + /// 回调验证证书问题 + /// + /// 流对象 + /// 证书 + /// X509Chain + /// SslPolicyErrors + /// bool + private bool CheckValidationResult(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors errors) { return true; } + + /// + /// 通过设置这个属性，可以在发出连接的时候绑定客户端发出连接所使用的IP地址。 + /// + /// + /// + /// + /// + private IPEndPoint BindIPEndPointCallback(ServicePoint servicePoint, IPEndPoint remoteEndPoint, int retryCount) + { + return _IPEndPoint;//端口号 + } + #endregion + } + + #region public calss + /// + /// Http请求参考类 + /// + public class HttpItem + { + /// + /// 请求URL必须填写 + /// + public string URL { get; set; } + string _Method = "GET"; + /// + /// 请求方式默认为GET方式,当为POST方式时必须设置Postdata的值 + /// + public string Method + { + get { return _Method; } + set { _Method = value; } + } + int _Timeout = 100000; + /// + /// 默认请求超时时间 + /// + public int Timeout + { + get { return _Timeout; } + set { _Timeout = value; } + } + int _ReadWriteTimeout = 30000; + /// + /// 默认写入Post数据超时间 + /// + public int ReadWriteTimeout + { + get { return _ReadWriteTimeout; } + set { _ReadWriteTimeout = value; } + } + /// + /// 设置Host的标头信息 + /// + public string Host { get; set; } + Boolean _KeepAlive = true; + /// + /// 获取或设置一个值，该值指示是否与 Internet 资源建立持久性连接默认为true。 + /// + public Boolean KeepAlive + { + get { return _KeepAlive; } + set { _KeepAlive = value; } + } + string _Accept = "text/html, application/xhtml+xml, */*"; + /// + /// 请求标头值 默认为text/html, application/xhtml+xml, */* + /// + public string Accept + { + get { return _Accept; } + set { _Accept = value; } + } + string _ContentType = "text/html"; + /// + /// 请求返回类型默认 text/html + /// + public string ContentType + { + get { return _ContentType; } + set { _ContentType = value; } + } + string _UserAgent = "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)"; + /// + /// 客户端访问信息默认Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0) + /// + public string UserAgent + { + get { return _UserAgent; } + set { _UserAgent = value; } + } + /// + /// 返回数据编码默认为NUll,可以自动识别,一般为utf-8,gbk,gb2312 + /// + public Encoding Encoding { get; set; } + private PostDataType _PostDataType = PostDataType.String; + /// + /// Post的数据类型 + /// + public PostDataType PostDataType + { + get { return _PostDataType; } + set { _PostDataType = value; } + } + /// + /// Post请求时要发送的字符串Post数据 + /// + public string Postdata { get; set; } + /// + /// Post请求时要发送的Byte类型的Post数据 + /// + public byte[] PostdataByte { get; set; } + /// + /// Cookie对象集合 + /// + public CookieCollection CookieCollection { get; set; } + /// + /// 请求时的Cookie + /// + public string Cookie { get; set; } + /// + /// 来源地址，上次访问地址 + /// + public string Referer { get; set; } + /// + /// 证书绝对路径 + /// + public string CerPath { get; set; } + /// + /// 设置代理对象，不想使用IE默认配置就设置为Null，而且不要设置ProxyIp + /// + public WebProxy WebProxy { get; set; } + private Boolean isToLower = false; + /// + /// 是否设置为全文小写，默认为不转化 + /// + public Boolean IsToLower + { + get { return isToLower; } + set { isToLower = value; } + } + private DateTime? _Date = null; + /// + /// 获取或设置要在 HTTP 请求中使用的 Date HTTP 标头值。默认不填写 + /// + public DateTime? Date + { + get { return _Date; } + set { _Date = value; } + } + private Boolean allowautoredirect = false; + /// + /// 支持跳转页面，查询结果将是跳转后的页面，默认是不跳转 + /// + public Boolean Allowautoredirect + { + get { return allowautoredirect; } + set { allowautoredirect = value; } + } + private int connectionlimit = 1024; + /// + /// 最大连接数 + /// + public int Connectionlimit + { + get { return connectionlimit; } + set { connectionlimit = value; } + } + /// + /// 代理Proxy 服务器用户名 + /// + public string ProxyUserName { get; set; } + /// + /// 代理 服务器密码 + /// + public string ProxyPwd { get; set; } + /// + /// 代理 服务IP,如果要使用IE代理就设置为ieproxy + /// + public string ProxyIp { get; set; } + private ResultType resulttype = ResultType.String; + /// + /// 设置返回类型String和Byte + /// + public ResultType ResultType + { + get { return resulttype; } + set { resulttype = value; } + } + private WebHeaderCollection header = new WebHeaderCollection(); + /// + /// header对象 + /// + public WebHeaderCollection Header + { + get { return header; } + set { header = value; } + } + /// + // 获取或设置用于请求的 HTTP 版本。返回结果:用于请求的 HTTP 版本。默认为 System.Net.HttpVersion.Version11。 + /// + public Version ProtocolVersion { get; set; } + private Boolean _expect100continue = false; + /// + /// 获取或设置一个 System.Boolean 值，该值确定是否使用 100-Continue 行为。如果 POST 请求需要 100-Continue 响应，则为 true；否则为 false。默认值为 true。 + /// + public Boolean Expect100Continue + { + get { return _expect100continue; } + set { _expect100continue = value; } + } + /// + /// 设置509证书集合 + /// + public X509CertificateCollection ClentCertificates { get; set; } + /// + /// 设置或获取Post参数编码,默认的为Default编码 + /// + public Encoding PostEncoding { get; set; } + private ResultCookieType _ResultCookieType = ResultCookieType.String; + /// + /// Cookie返回类型,默认的是只返回字符串类型 + /// + public ResultCookieType ResultCookieType + { + get { return _ResultCookieType; } + set { _ResultCookieType = value; } + } + private ICredentials _ICredentials = CredentialCache.DefaultCredentials; + /// + /// 获取或设置请求的身份验证信息。 + /// + public ICredentials ICredentials + { + get { return _ICredentials; } + set { _ICredentials = value; } + } + /// + /// 设置请求将跟随的重定向的最大数目 + /// + public int MaximumAutomaticRedirections { get; set; } + private DateTime? _IfModifiedSince = null; + /// + /// 获取和设置IfModifiedSince，默认为当前日期和时间 + /// + public DateTime? IfModifiedSince + { + get { return _IfModifiedSince; } + set { _IfModifiedSince = value; } + } + #region ip-port + private IPEndPoint _IPEndPoint = null; + /// + /// 设置本地的出口ip和端口 + /// ] + /// + ///item.IPEndPoint = new IPEndPoint(IPAddress.Parse("192.168.1.1"),80); + /// + public IPEndPoint IPEndPoint + { + get { return _IPEndPoint; } + set { _IPEndPoint = value; } + } + #endregion + + private bool _isReset = false; + /// + /// 是否重置request,response的值，默认不重置，当设置为True时request,response将被设置为Null + /// + public bool IsReset + { + get { return _isReset; } + set { _isReset = value; } + } + } + /// + /// Http返回参数类 + /// + public class HttpResult + { + /// + /// Http请求返回的Cookie + /// + public string Cookie { get; set; } + /// + /// Cookie对象集合 + /// + public CookieCollection CookieCollection { get; set; } + private string _html = string.Empty; + /// + /// 返回的String类型数据 只有ResultType.String时才返回数据，其它情况为空 + /// + public string Html + { + get { return _html; } + set { _html = value; } + } + /// + /// 返回的Byte数组 只有ResultType.Byte时才返回数据，其它情况为空 + /// + public byte[] ResultByte { get; set; } + /// + /// header对象 + /// + public WebHeaderCollection Header { get; set; } + /// + /// 返回状态说明 + /// + public string StatusDescription { get; set; } + /// + /// 返回状态码,默认为OK + /// + public HttpStatusCode StatusCode { get; set; } + /// + /// 最后访问的URl + /// + public string ResponseUri { get; set; } + /// + /// 获取重定向的URl + /// + public string RedirectUrl + { + get + { + try + { + if (Header != null && Header.Count > 0) + { + if (Header.AllKeys.Any(k => k.ToLower().Contains("location"))) + { + string baseurl = Header["location"].ToString().Trim(); + string locationurl = baseurl.ToLower(); + if (!string.IsNullOrWhiteSpace(locationurl)) + { + bool b = locationurl.StartsWith("http://") || locationurl.StartsWith("https://"); + if (!b) + { + baseurl = new Uri(new Uri(ResponseUri), baseurl).AbsoluteUri; + } + } + return baseurl; + } + } + } + catch { } + return string.Empty; + } + } + } + /// + /// 返回类型 + /// + public enum ResultType + { + /// + /// 表示只返回字符串 只有Html有数据 + /// + String, + /// + /// 表示返回字符串和字节流 ResultByte和Html都有数据返回 + /// + Byte + } + /// + /// Post的数据格式默认为string + /// + public enum PostDataType + { + /// + /// 字符串类型，这时编码Encoding可不设置 + /// + String, + /// + /// Byte类型，需要设置PostdataByte参数的值编码Encoding可设置为空 + /// + Byte, + /// + /// 传文件，Postdata必须设置为文件的绝对路径，必须设置Encoding的值 + /// + FilePath + } + /// + /// Cookie返回类型 + /// + public enum ResultCookieType + { + /// + /// 只返回字符串类型的Cookie + /// + String, + /// + /// CookieCollection格式的Cookie集合同时也返回String类型的cookie + /// + CookieCollection + } + #endregion +} \ No newline at end of file diff --git a/CMS/JXCMS.CMS.Movie/Views/Default/Home/Test.cshtml b/CMS/JXCMS.CMS.Movie/Views/Default/Home/Test.cshtml new file mode 100644 index 0000000..83a96a7 --- /dev/null +++ b/CMS/JXCMS.CMS.Movie/Views/Default/Home/Test.cshtml @@ -0,0 +1,16 @@ +@{ + Layout = null; +} + + + + + + + + +
    + @Html.Action("Index") +
    + + \ No newline at end of file diff --git a/Core/JXCMS.Core/Db/DbExtension.cs b/Core/JXCMS.Core/Db/DbExtension.cs index a9afb74..f9adfd8 100755 --- a/Core/JXCMS.Core/Db/DbExtension.cs +++ b/Core/JXCMS.Core/Db/DbExtension.cs @@ -110,12 +110,9 @@ namespace JXCMS.Core.Db jsonObject.Add("Db", JObject.FromObject(dbConfig)); } - using (var writer = new StreamWriter(filePath)) - using (JsonTextWriter jsonwriter = new JsonTextWriter(writer)) - { - jsonwriter.Formatting = Formatting.Indented; - jsonObject.WriteTo(jsonwriter); - } + using var writer = new StreamWriter(filePath); + using JsonTextWriter jsonWriter = new JsonTextWriter(writer) {Formatting = Formatting.Indented}; + jsonObject.WriteTo(jsonWriter); } } } \ No newline at end of file diff --git a/Core/JXCMS.Core/Extensions/HtmlHelperViewExtensions.cs b/Core/JXCMS.Core/Extensions/HtmlHelperViewExtensions.cs new file mode 100644 index 0000000..bef5ee6 --- /dev/null +++ b/Core/JXCMS.Core/Extensions/HtmlHelperViewExtensions.cs @@ -0,0 +1,99 @@ +using Microsoft.AspNetCore.Html; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc.Infrastructure; +using Microsoft.AspNetCore.Routing; +using Microsoft.Extensions.DependencyInjection; +using System; +using System.IO; +using System.Threading.Tasks; + +namespace Microsoft.AspNetCore.Mvc.Rendering +{ + public static class HtmlHelperViewExtensions + { + public static IHtmlContent Action(this IHtmlHelper helper, string action, object parameters = null) + { + var controller = (string)helper.ViewContext.RouteData.Values["controller"]; + + return Action(helper, action, controller, parameters); + } + + public static IHtmlContent Action(this IHtmlHelper helper, string action, string controller, object parameters = null) + { + var area = (string)helper.ViewContext.RouteData.Values["area"]; + + return Action(helper, action, controller, area, parameters); + } + + public static IHtmlContent Action(this IHtmlHelper helper, string action, string controller, string area, object parameters = null) + { + if (action == null) + throw new ArgumentNullException("action"); + + if (controller == null) + throw new ArgumentNullException("controller"); + + + var task = RenderActionAsync(helper, action, controller, area, parameters); + + return task.Result; + } + + private static async Task RenderActionAsync(this IHtmlHelper helper, string action, string controller, string area, object parameters = null) + { + // fetching required services for invocation + var serviceProvider = helper.ViewContext.HttpContext.RequestServices; + var actionContextAccessor = helper.ViewContext.HttpContext.RequestServices.GetRequiredService(); + var httpContextAccessor = helper.ViewContext.HttpContext.RequestServices.GetRequiredService(); + var actionSelector = serviceProvider.GetRequiredService(); + + // creating new action invocation context + var routeData = new RouteData(); + foreach (var router in helper.ViewContext.RouteData.Routers) + { + routeData.PushState(router, null, null); + } + routeData.PushState(null, new RouteValueDictionary(new { controller = controller, action = action, area = area }), null); + routeData.PushState(null, new RouteValueDictionary(parameters ?? new { }), null); + + //get the actiondescriptor + RouteContext routeContext = new RouteContext(helper.ViewContext.HttpContext) { RouteData = routeData }; + var candidates = actionSelector.SelectCandidates(routeContext); + var actionDescriptor = actionSelector.SelectBestCandidate(routeContext, candidates); + + var originalActionContext = actionContextAccessor.ActionContext; + var originalhttpContext = httpContextAccessor.HttpContext; + try + { + var newHttpContext = serviceProvider.GetRequiredService().Create(helper.ViewContext.HttpContext.Features); + if (newHttpContext.Items.ContainsKey(typeof(IUrlHelper))) + { + newHttpContext.Items.Remove(typeof(IUrlHelper)); + } + newHttpContext.Response.Body = new MemoryStream(); + var actionContext = new ActionContext(newHttpContext, routeData, actionDescriptor); + actionContextAccessor.ActionContext = actionContext; + var invoker = serviceProvider.GetRequiredService().CreateInvoker(actionContext); + await invoker.InvokeAsync(); + newHttpContext.Response.Body.Position = 0; + using (var reader = new StreamReader(newHttpContext.Response.Body)) + { + return new HtmlString(reader.ReadToEnd()); + } + } + catch (Exception ex) + { + return new HtmlString(ex.Message); + } + finally + { + actionContextAccessor.ActionContext = originalActionContext; + httpContextAccessor.HttpContext = originalhttpContext; + if (helper.ViewContext.HttpContext.Items.ContainsKey(typeof(IUrlHelper))) + { + helper.ViewContext.HttpContext.Items.Remove(typeof(IUrlHelper)); + } + } + } + } +} \ No newline at end of file diff --git a/Core/JXCMS.Core/Extensions/StringExtension.cs b/Core/JXCMS.Core/Extensions/StringExtension.cs index 9a621fe..4dce37f 100755 --- a/Core/JXCMS.Core/Extensions/StringExtension.cs +++ b/Core/JXCMS.Core/Extensions/StringExtension.cs @@ -1,4 +1,6 @@ -namespace JXCMS.Core.Extensions +using System.Text; + +namespace JXCMS.Core.Extensions { public static class StringExtension { @@ -6,5 +8,18 @@ { return string.IsNullOrEmpty(str); } + + public static string InsertMultipleString(this string str, string insertStr, int count) + { + StringBuilder returnValue = new StringBuilder(); + for (int i = 0; i < count; i++) + { + returnValue.Append(insertStr); + } + + returnValue.Append(str); + return returnValue.ToString(); + } + } } \ No newline at end of file diff --git a/Core/JXCMS.Core/JXCMS.Core.csproj b/Core/JXCMS.Core/JXCMS.Core.csproj index 007924d..590a0f0 100755 --- a/Core/JXCMS.Core/JXCMS.Core.csproj +++ b/Core/JXCMS.Core/JXCMS.Core.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -11,12 +11,12 @@ - - - - - - + + + + + + diff --git a/Core/JXCMS.Core/TimingTask/QuartzTask.cs b/Core/JXCMS.Core/TimingTask/QuartzTask.cs index 56677ba..f1d28ca 100644 --- a/Core/JXCMS.Core/TimingTask/QuartzTask.cs +++ b/Core/JXCMS.Core/TimingTask/QuartzTask.cs @@ -52,6 +52,42 @@ namespace JXCMS.Core.TimingTask { return await _scheduler.DeleteJobs(jobKeys); } - + + + /// + /// Corn表达式的运行时间 + /// + /// 表达式 + /// 计算次数 + /// 开始时间 + /// + public static string GetCronSchedule(String cron, int times, DateTimeOffset startTime) + { + String timeSchedule = ""; + if (!CronExpression.IsValidExpression(cron)) + { + return "Cron表达式不合法!"; + } + try + { + ITrigger trigger1 = TriggerBuilder.Create() + + .WithCronSchedule(cron) + .StartNow() + .Build(); + for (int i = 0; i < times; i++) + { + DateTimeOffset? s = trigger1.GetFireTimeAfter(startTime); + DateTime? time = s?.LocalDateTime; + timeSchedule = time?.ToString("F"); + } + } + catch (System.Exception e) + { + timeSchedule = "未知时间"; + } + + return timeSchedule; + } } } \ No newline at end of file diff --git a/Core/JXCMS.Core/Utils/ConfigHelper.cs b/Core/JXCMS.Core/Utils/ConfigHelper.cs new file mode 100644 index 0000000..084b575 --- /dev/null +++ b/Core/JXCMS.Core/Utils/ConfigHelper.cs @@ -0,0 +1,15 @@ +using Microsoft.Extensions.Configuration; + +namespace JXCMS.Core.Utils +{ + public class ConfigHelper + { + public static IConfiguration Configs { get; set; } + + public static string GetValue(string key) + { + var res = Configs.GetSection(key).Value; + return res; + } + } +} \ No newline at end of file