Quellcode durchsuchen

Merge branch '和田中职' of http://8.141.155.183:3000/bjquanjiang/DigitalScholl into 和田中职

和田中职
suyanyan vor 4 Tagen
Ursprung
Commit
0d15c4dd9a
4 geänderte Dateien mit 10 neuen und 3 gelöschten Zeilen
  1. +1
    -0
      .gitignore
  2. +8
    -2
      Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Hetian/HeTianApi.cs
  3. +1
    -0
      Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue
  4. +0
    -1
      Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue

+ 1
- 0
.gitignore Datei anzeigen

@@ -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

+ 8
- 2
Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Hetian/HeTianApi.cs Datei anzeigen

@@ -51,19 +51,25 @@ namespace Learun.Application.WebApi.Modules.Hetian

private Response CheckTicket(dynamic _)
{
LoginModel loginModel = this.GetReqData<LoginModel>();
var loginModel1 = this.GetReqData();
var loginModel = loginModel1.ToObject<LoginModel>();
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())
{


+ 1
- 0
Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue Datei anzeigen

@@ -96,6 +96,7 @@
<!--#endif -->
</view>
</view>

<tabBar selectedIndex='/pages/home'></tabBar>
</view>
</template>


+ 0
- 1
Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue Datei anzeigen

@@ -14,7 +14,6 @@
</view>
<view class="badge text-white text-lg"><l-icon type="right" round /></view>
</view>

<!-- 用户信息菜单 -->
<l-list border card>
<l-list-item @click="goTo('contact')" arrow>


Laden…
Abbrechen
Speichern