From 3513ec87e5e54107cb10937a015aec56a90f429b Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 27 Jan 2021 16:45:34 +0800 Subject: [PATCH] update Former-commit-id: 56fab78ae3a30195505764f2cb07153af1ced096 Former-commit-id: 467363f5c3950d371a2750d61816ab380e9a66ad --- .../TeacherExt/Controllers/HomeController.cs | 16 +- labs/Teacher/TeacherExt/TeacherExt.csproj | 5 +- .../TeacherExt/Views/Home/Update.cshtml | 5 + .../TeacherExt/Views/Shared/_Layout.cshtml | 3 +- labs/Teacher/TeacherExt/install.txt | 2 +- labs/Teacher/TeacherExt/libman.json | 6 + labs/Teacher/TeacherExt/start.sh | 2 + .../jquery-validation/jquery.validate.min.js | 4 +- .../select2/dist/select2-bootstrap4.min.css | 4 +- .../sweetalert2/themes/minimal/minimal.css | 1104 +++++++++++++++++ .../wwwroot/lib/toastr/toastr.js.map | 2 +- 11 files changed, 1143 insertions(+), 10 deletions(-) create mode 100644 labs/Teacher/TeacherExt/start.sh create mode 100644 labs/Teacher/TeacherExt/wwwroot/lib/sweetalert2/themes/minimal/minimal.css diff --git a/labs/Teacher/TeacherExt/Controllers/HomeController.cs b/labs/Teacher/TeacherExt/Controllers/HomeController.cs index 4634e186..238c5c32 100644 --- a/labs/Teacher/TeacherExt/Controllers/HomeController.cs +++ b/labs/Teacher/TeacherExt/Controllers/HomeController.cs @@ -2,6 +2,7 @@ using Infrastructure.Extensions; using Infrastructure.Web; using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Rendering; @@ -156,16 +157,27 @@ namespace TeacherExt.Controllers } [HttpGet] - public IActionResult Update(int id) + public IActionResult Update(int id,string access_token) { var person = this._personRepo.ReadOnlyTable().Where(o => o.Id == id).FirstOrDefault(); var organ = this._organizationRepo.ReadOnlyTable().Where(o => o.Id == person.OrganId).FirstOrDefault(); - var model = person.To(); model.OrganName = organ.Name; this.EntityToModel(person, model); this.ToEditModel(person, model); model.LoginName = this._loginRepo.ReadOnlyTable().Where(o => o.PersonId == model.Id).Select(o => o.LoginName).FirstOrDefault(); + if(!string.IsNullOrEmpty(access_token)) + { + var httpContext = this.Request.HttpContext; + var token = access_token; + var cookieOptions = new CookieOptions + { + HttpOnly = true + }; + var cookieName = httpContext.GetJwtCookieName(); + httpContext.Response.Cookies.Delete(cookieName); + httpContext.Response.Cookies.Append(cookieName, token, cookieOptions); + } return Result(model); } diff --git a/labs/Teacher/TeacherExt/TeacherExt.csproj b/labs/Teacher/TeacherExt/TeacherExt.csproj index 331b9e54..06a0b37a 100644 --- a/labs/Teacher/TeacherExt/TeacherExt.csproj +++ b/labs/Teacher/TeacherExt/TeacherExt.csproj @@ -5,7 +5,7 @@ true en true - 0.5.0.0 + 0.6.0.0 13a75881-1072-47ca-88e9-4d78bd678d65 @@ -20,6 +20,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/labs/Teacher/TeacherExt/Views/Home/Update.cshtml b/labs/Teacher/TeacherExt/Views/Home/Update.cshtml index bad60219..e1c475a3 100644 --- a/labs/Teacher/TeacherExt/Views/Home/Update.cshtml +++ b/labs/Teacher/TeacherExt/Views/Home/Update.cshtml @@ -12,6 +12,10 @@
@Html.AntiForgeryToken() + @if (Context.Request.Query.ContainsKey("iframe")||(Context.Request.Method=="POST"&&Context.Request.Form.ContainsKey("iframe"))) + { + @Html.Hidden("iframe","") + }
@@ -172,6 +176,7 @@