diff --git a/.gitignore b/.gitignore index 8e0a372a6..c5b0e717c 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js /Learun.Framework.Ultimate V7/Learun.Application.WebApi/logs /Learun.Framework.Ultimate V7/Learun.Application.Web/logs /Learun.Framework.Ultimate V7/Learun.Application.Web/Log/LogInfo/20250106 +/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Log/LogInfo/20250113 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Hetian/HeTianApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Hetian/HeTianApi.cs index 7f65a58ce..8979a8071 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Hetian/HeTianApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Hetian/HeTianApi.cs @@ -51,19 +51,25 @@ namespace Learun.Application.WebApi.Modules.Hetian private Response CheckTicket(dynamic _) { - LoginModel loginModel = this.GetReqData(); + var loginModel1 = this.GetReqData(); + var loginModel = loginModel1.ToObject(); + LogHelper.WriteToLog($"loginModel :{loginModel.ToJson()}"); var ticket = loginModel.ticket; //var uid = "180018"; - if (string.IsNullOrEmpty(ticket)) + if (!string.IsNullOrEmpty(ticket)) { string validationUrl = UrlUtil.ConstructValidateUrl(ticket, CasAuthentication.Gateway, CasAuthentication.Renew, new NameValueCollection()); + LogHelper.WriteToLog($"validationUrl:{validationUrl}"); var a = PerformHttpGet(validationUrl, true); + LogHelper.WriteToLog($"a :{a}"); if (a.Contains("PerformHttpGet")) { return Fail("PerformHttpGet err"); } var serviceResponse = ServiceResponse.ParseResponse(a); + LogHelper.WriteToLog($"serviceResponse:{serviceResponse.ToJson()}"); AuthenticationSuccess authSuccessResponse = (AuthenticationSuccess)serviceResponse.Item; + LogHelper.WriteToLog($"authSuccessResponse:{authSuccessResponse.ToJson()}"); var uid = authSuccessResponse.User; if (!uid.IsNullOrWhiteSpace()) { diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue index 5b66bb977..b9d2f22f6 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue @@ -96,6 +96,7 @@ + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue index d1a8ac349..fca5b3b98 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue @@ -14,7 +14,6 @@ -