From 3d69c04346fe4792e1e885e7b917fe8c6fc065c6 Mon Sep 17 00:00:00 2001
From: shecs <408299694@qq.com>
Date: Fri, 14 Jun 2024 09:48:33 +0800
Subject: [PATCH] 11
---
.../Evaluation/EvaluationNew.aspx | 2 +-
.../Evaluation/EvaluationNew.aspx.cs | 2 +-
FCL/FineUIPro.Web/FineUIPro.Web.csproj | 20 +-
FCL/FineUIPro.Web/Web.config | 287 ++++++++++--------
FCL/FineUIPro.Web/packages.config | 10 +-
FCL/FineUIPro.Web/ssocallback.aspx.cs | 13 +-
6 files changed, 179 insertions(+), 155 deletions(-)
diff --git a/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx b/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx
index 545bfc0..71b3957 100644
--- a/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx
+++ b/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx
@@ -174,7 +174,7 @@
-
+
diff --git a/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx.cs b/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx.cs
index eeb8be7..0b7003b 100644
--- a/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx.cs
+++ b/FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx.cs
@@ -1005,7 +1005,7 @@ namespace FineUIPro.Web.Evaluation
{
sesList = Funs.DB.FC_SESReportView.Where(p => p.FO_NO == FoNo && p.Requisitioner == CurrUser.Account).ToList();
}
- Grid2.DataSource = sesList;
+ Grid2.DataSource = sesList.OrderByDescending(x=>x.ShowViolationDegree);
Grid2.DataBind();
}
#endregion
diff --git a/FCL/FineUIPro.Web/FineUIPro.Web.csproj b/FCL/FineUIPro.Web/FineUIPro.Web.csproj
index c0d8a24..d708374 100644
--- a/FCL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/FCL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -69,14 +69,14 @@
..\packages\Microsoft.IdentityModel.Abstractions.7.6.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll
-
- ..\packages\Microsoft.IdentityModel.JsonWebTokens.7.6.0\lib\net461\Microsoft.IdentityModel.JsonWebTokens.dll
+
+ ..\packages\Microsoft.IdentityModel.JsonWebTokens.6.22.1\lib\net461\Microsoft.IdentityModel.JsonWebTokens.dll
..\packages\Microsoft.IdentityModel.Logging.7.6.0\lib\net461\Microsoft.IdentityModel.Logging.dll
-
- ..\packages\Microsoft.IdentityModel.Tokens.7.6.0\lib\net461\Microsoft.IdentityModel.Tokens.dll
+
+ ..\packages\Microsoft.IdentityModel.Tokens.6.22.1\lib\net461\Microsoft.IdentityModel.Tokens.dll
@@ -125,8 +125,8 @@
-
- ..\packages\System.IdentityModel.Tokens.Jwt.7.6.0\lib\net461\System.IdentityModel.Tokens.Jwt.dll
+
+ ..\packages\System.IdentityModel.Tokens.Jwt.6.22.1\lib\net461\System.IdentityModel.Tokens.Jwt.dll
@@ -138,16 +138,16 @@
..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
-
- ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
+
+ ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll
..\packages\System.Text.Encodings.Web.4.7.2\lib\net461\System.Text.Encodings.Web.dll
-
- ..\packages\System.Text.Json.4.7.2\lib\net461\System.Text.Json.dll
+
+ ..\packages\System.Text.Json.4.6.0\lib\net461\System.Text.Json.dll
..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
diff --git a/FCL/FineUIPro.Web/Web.config b/FCL/FineUIPro.Web/Web.config
index 5d985da..d291e38 100644
--- a/FCL/FineUIPro.Web/Web.config
+++ b/FCL/FineUIPro.Web/Web.config
@@ -1,32 +1,35 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/FCL/FineUIPro.Web/packages.config b/FCL/FineUIPro.Web/packages.config
index 994ad53..189e829 100644
--- a/FCL/FineUIPro.Web/packages.config
+++ b/FCL/FineUIPro.Web/packages.config
@@ -2,9 +2,9 @@
-
+
-
+
@@ -12,12 +12,12 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/FCL/FineUIPro.Web/ssocallback.aspx.cs b/FCL/FineUIPro.Web/ssocallback.aspx.cs
index 36c73e6..2e85fcc 100644
--- a/FCL/FineUIPro.Web/ssocallback.aspx.cs
+++ b/FCL/FineUIPro.Web/ssocallback.aspx.cs
@@ -1,19 +1,12 @@
using BLL;
using BLL.Common;
-using Microsoft.IdentityModel.Logging;
using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
-using Org.BouncyCastle.Utilities.Encoders;
using System;
-using System.Collections.Generic;
-using System.IdentityModel.Tokens.Jwt;
using System.Linq;
using System.Text;
-using System.Web;
using System.Web.Security;
-using System.Web.UI;
-using System.Web.UI.WebControls;
namespace FineUIPro.Web
{
@@ -43,10 +36,10 @@ namespace FineUIPro.Web
private AccessTokenModel GetAccessToken(string _code)
{
- string clientId = "9379ad91-eef9-4956-a1ee-8b04bb3d42c8";
- string clientSecret = "iLu8Q~4DRYAn~sMjvO1j.tgRERFWhILvLYRPNc9S";
+ string clientId = System.Web.Configuration.WebConfigurationManager.AppSettings["clientId"];
+ string clientSecret = System.Web.Configuration.WebConfigurationManager.AppSettings["clientSecret"];
string grant_type = "authorization_code";
- string redirect_url = "https://fcl-test.basf-ypc.net.cn/ssocallback.aspx";
+ string redirect_url = System.Web.Configuration.WebConfigurationManager.AppSettings["redirect_url"];
string scope = "profile openid";
string baseUrl = $"https://login.microsoftonline.com/ecaa386b-c8df-4ce0-ad01-740cbdb5ba55/oauth2/v2.0/token";