shecs
/
Basf_FCL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: shecs:43262d1573a994595d963a2cc111ba13771755b0
Branches Tags
shecs:master
shecs:hotfix20240606
...
compare: shecs:7871e1ed7e8d055d2f88ebb72bc09f1ef896d858
Branches Tags
shecs:master
shecs:hotfix20240606

2 Commits
43262d1573 ... 7871e1ed7e

Author SHA1 Message Date
佘春生 7871e1ed7e Merge branch 'master' of http://47.104.102.122:3000/shecs/Basf_FCL 2024-07-01 10:13:54 +08:00
佘春生 c2d553aa61 11 2024-07-01 10:13:44 +08:00
4 changed files with 5 additions and 5 deletions
Show Stats Expand all files Collapse all files

2
FCL/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress> <Use64BitIISExpress>
</Use64BitIISExpress> </Use64BitIISExpress>

2
FCL/FineUIPro.Web/Web.config
View File

@ -54,7 +54,7 @@
<add path="res.axd" verb="GET" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/> <add path="res.axd" verb="GET" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/> <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
</httpHandlers> </httpHandlers>
<compilation debug="true" targetFramework="4.6.1"> <compilation debug="false" targetFramework="4.6.1">
<buildProviders> <buildProviders>
<add extension=".rdlc" type="Microsoft.Reporting.RdlBuildProvider, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/> <add extension=".rdlc" type="Microsoft.Reporting.RdlBuildProvider, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
</buildProviders> </buildProviders>

4
FCL/FineUIPro.Web/ssocallback.aspx.cs
View File

@ -46,9 +46,9 @@ namespace FineUIPro.Web
try try
{ {
string postData = $"code={code}&client_id={clientId}&client_secret={clientSecret}&grant_type={grant_type}&redirect_uri={redirect_url}&scope={scope}"; string postData = $"code={code}&client_id={clientId}&client_secret={clientSecret}&grant_type={grant_type}&redirect_uri={redirect_url}&scope={scope}";
//BLL.ErrLogInfo.WriteLog($"请求参数postData={postData}"); // BLL.ErrLogInfo.WriteLog($"请求参数postData={postData}");
string result = BLL.Common.HttpHelper.PostJsonByHttps(baseUrl, postData); string result = BLL.Common.HttpHelper.PostJsonByHttps(baseUrl, postData);
//BLL.ErrLogInfo.WriteLog($"请求API Result={result}"); // BLL.ErrLogInfo.WriteLog($"请求API Result={result}");
var Data = JsonConvert.DeserializeObject<AccessTokenModel>(result); var Data = JsonConvert.DeserializeObject<AccessTokenModel>(result);
return Data; return Data;

2
FCL/WebApi/WebApi.csproj.user
View File

@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication /> <IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode /> <IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile /> <UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
</PropertyGroup> </PropertyGroup>
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>