From 561ef76cf91503ef6ce478f4240240da5d8828e4 Mon Sep 17 00:00:00 2001
From: admin <182004222@qq.com>
Date: 星期四, 04 四月 2024 16:26:06 +0800
Subject: [PATCH] .
---
GasolineBlend.BLL/app.config | 29 ++++++
/dev/null | 0
.vs/config/applicationhost.config | 2
GasolineBlend.DAL/packages.config | 31 ++++++-
RiskControl.NewService/app.config | 22 +++++
RiskControlRR.sln | 4
GasolineBlend/Web.config | 25 +++++
GasolineBlend.DAL/GasolineBlend.DAL.csproj | 79 +++++++++++++++----
GasolineBlend.DAL/app.config | 20 ++++
GasolineBlend/Controllers/WenCaiController.cs | 14 ++
10 files changed, 189 insertions(+), 37 deletions(-)
diff --git a/.vs/RiskControlRR/v15/Server/sqlite3/storage.ide b/.vs/RiskControlRR/v15/Server/sqlite3/storage.ide
deleted file mode 100644
index 426330a..0000000
--- a/.vs/RiskControlRR/v15/Server/sqlite3/storage.ide
+++ /dev/null
Binary files differ
diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config
index eae6fbb..8211888 100644
--- a/.vs/config/applicationhost.config
+++ b/.vs/config/applicationhost.config
@@ -170,7 +170,7 @@
</site>
<site name="GasolineBlend(1)" id="3">
<application path="/" applicationPool="Clr4IntegratedAppPool">
- <virtualDirectory path="/" physicalPath="C:\Users\leo\Documents\Visual Studio 2017\Project\RR_RiskControl_Fast\GasolineBlend" />
+ <virtualDirectory path="/" physicalPath="E:\.NETproject\RFK\RiskControl_RR_Fast\GasolineBlend" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:45219:localhost" />
diff --git a/GasolineBlend.BLL/app.config b/GasolineBlend.BLL/app.config
index 9bd9f81..345a737 100644
--- a/GasolineBlend.BLL/app.config
+++ b/GasolineBlend.BLL/app.config
@@ -7,7 +7,8 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://47.92.245.94:8080/ServiceCruOil.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IServiceCruOil" contract="WcfServiceCruOil.IServiceCruOil" name="BasicHttpBinding_IServiceCruOil" />
+ <!--localhost:8080 -->
+ <endpoint address="http://47.92.245.94:8080/ServiceCruOil.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IServiceCruOil" contract="WcfServiceCruOil.IServiceCruOil" name="BasicHttpBinding_IServiceCruOil" />
</client>
</system.serviceModel>
<runtime>
@@ -34,7 +35,31 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-8.0.31.0" newVersion="8.0.31.0" />
+ <bindingRedirect oldVersion="0.0.0.0-8.2.0.0" newVersion="8.2.0.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.0.0.2" newVersion="5.0.0.2" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Runtime.Loader" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Security.Principal.Windows" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
diff --git a/GasolineBlend.DAL/GasolineBlend.DAL.csproj b/GasolineBlend.DAL/GasolineBlend.DAL.csproj
index df54a81..8c3dce1 100644
--- a/GasolineBlend.DAL/GasolineBlend.DAL.csproj
+++ b/GasolineBlend.DAL/GasolineBlend.DAL.csproj
@@ -30,30 +30,36 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
- <HintPath>..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll</HintPath>
+ <Reference Include="BouncyCastle.Crypto, Version=1.8.6.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
+ <HintPath>..\packages\Portable.BouncyCastle.1.8.6\lib\net40\BouncyCastle.Crypto.dll</HintPath>
+ </Reference>
+ <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
+ <HintPath>..\packages\BouncyCastle.Cryptography.2.2.1\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
</Reference>
<Reference Include="Dapper, Version=1.50.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapper.1.50.5\lib\net451\Dapper.dll</HintPath>
</Reference>
- <Reference Include="Google.Protobuf, Version=3.19.4.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
- <HintPath>..\packages\Google.Protobuf.3.19.4\lib\net45\Google.Protobuf.dll</HintPath>
+ <Reference Include="Google.Protobuf, Version=3.21.9.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+ <HintPath>..\packages\Google.Protobuf.3.21.9\lib\net45\Google.Protobuf.dll</HintPath>
</Reference>
- <Reference Include="K4os.Compression.LZ4, Version=1.2.6.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
- <HintPath>..\packages\K4os.Compression.LZ4.1.2.6\lib\net46\K4os.Compression.LZ4.dll</HintPath>
+ <Reference Include="K4os.Compression.LZ4, Version=1.3.5.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
+ <HintPath>..\packages\K4os.Compression.LZ4.1.3.5\lib\netstandard2.0\K4os.Compression.LZ4.dll</HintPath>
</Reference>
- <Reference Include="K4os.Compression.LZ4.Streams, Version=1.2.6.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
- <HintPath>..\packages\K4os.Compression.LZ4.Streams.1.2.6\lib\net46\K4os.Compression.LZ4.Streams.dll</HintPath>
+ <Reference Include="K4os.Compression.LZ4.Streams, Version=1.3.5.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
+ <HintPath>..\packages\K4os.Compression.LZ4.Streams.1.3.5\lib\netstandard2.0\K4os.Compression.LZ4.Streams.dll</HintPath>
</Reference>
- <Reference Include="K4os.Hash.xxHash, Version=1.0.6.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
- <HintPath>..\packages\K4os.Hash.xxHash.1.0.6\lib\net46\K4os.Hash.xxHash.dll</HintPath>
+ <Reference Include="K4os.Hash.xxHash, Version=1.0.8.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
+ <HintPath>..\packages\K4os.Hash.xxHash.1.0.8\lib\netstandard2.0\K4os.Hash.xxHash.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\netstandard2.0\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
- <Reference Include="MySql.Data, Version=8.0.31.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
- <HintPath>..\packages\MySql.Data.8.0.31\lib\net452\MySql.Data.dll</HintPath>
+ <Reference Include="MySql.Data, Version=8.2.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+ <HintPath>..\packages\MySql.Data.8.2.0\lib\netstandard2.0\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="Renci.SshNet, Version=2016.1.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
<HintPath>..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath>
@@ -63,22 +69,60 @@
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+ <Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
+ <Reference Include="System.Configuration.ConfigurationManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Configuration.ConfigurationManager.4.4.1\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
+ </Reference>
<Reference Include="System.Configuration.Install" />
<Reference Include="System.Core" />
+ <Reference Include="System.Data.OracleClient" />
+ <Reference Include="System.Diagnostics.DiagnosticSource, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Diagnostics.DiagnosticSource.7.0.2\lib\netstandard2.0\System.Diagnostics.DiagnosticSource.dll</HintPath>
+ </Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Drawing.Design" />
- <Reference Include="System.Management" />
- <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
- <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+ <Reference Include="System.IO.Pipelines, Version=5.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.IO.Pipelines.5.0.2\lib\net461\System.IO.Pipelines.dll</HintPath>
</Reference>
+ <Reference Include="System.Management" />
+ <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Net" />
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Runtime.Loader, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Runtime.Loader.4.3.0\lib\netstandard1.5\System.Runtime.Loader.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Security" />
+ <Reference Include="System.Security.AccessControl, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Security.AccessControl.4.7.0\lib\net461\System.Security.AccessControl.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Security.Permissions, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Security.Permissions.4.7.0\lib\net461\System.Security.Permissions.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Security.Principal.Windows, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Security.Principal.Windows.4.7.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
+ </Reference>
+ <Reference Include="System.ServiceProcess" />
+ <Reference Include="System.Text.Encoding.CodePages, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Text.Encoding.CodePages.4.4.0\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Text.Encodings.Web, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Text.Encodings.Web.7.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Text.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Text.Json.7.0.1\lib\netstandard2.0\System.Text.Json.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Transactions" />
<Reference Include="System.Xml.Linq" />
@@ -87,8 +131,9 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
- <Reference Include="ZstdNet, Version=1.4.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
- <HintPath>..\packages\MySql.Data.8.0.31\lib\net452\ZstdNet.dll</HintPath>
+ <Reference Include="WindowsBase" />
+ <Reference Include="ZstdSharp, Version=0.7.1.0, Culture=neutral, PublicKeyToken=8d151af33a4ad5cf, processorArchitecture=MSIL">
+ <HintPath>..\packages\ZstdSharp.Port.0.7.1\lib\net461\ZstdSharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --git a/GasolineBlend.DAL/app.config b/GasolineBlend.DAL/app.config
index 4672066..6a18082 100644
--- a/GasolineBlend.DAL/app.config
+++ b/GasolineBlend.DAL/app.config
@@ -16,7 +16,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
+ <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
@@ -24,7 +24,23 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-8.0.31.0" newVersion="8.0.31.0" />
+ <bindingRedirect oldVersion="0.0.0.0-8.2.0.0" newVersion="8.2.0.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.0.0.2" newVersion="5.0.0.2" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Runtime.Loader" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Security.Principal.Windows" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
diff --git a/GasolineBlend.DAL/packages.config b/GasolineBlend.DAL/packages.config
index e9f41c4..bcdedf8 100644
--- a/GasolineBlend.DAL/packages.config
+++ b/GasolineBlend.DAL/packages.config
@@ -1,17 +1,34 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BouncyCastle" version="1.8.3.1" targetFramework="net461" />
+ <package id="BouncyCastle.Cryptography" version="2.2.1" targetFramework="net461" />
<package id="Dapper" version="1.50.5" targetFramework="net461" />
- <package id="Google.Protobuf" version="3.19.4" targetFramework="net461" />
- <package id="K4os.Compression.LZ4" version="1.2.6" targetFramework="net461" />
- <package id="K4os.Compression.LZ4.Streams" version="1.2.6" targetFramework="net461" />
- <package id="K4os.Hash.xxHash" version="1.0.6" targetFramework="net461" />
+ <package id="Google.Protobuf" version="3.21.9" targetFramework="net461" />
+ <package id="K4os.Compression.LZ4" version="1.3.5" targetFramework="net461" />
+ <package id="K4os.Compression.LZ4.Streams" version="1.3.5" targetFramework="net461" />
+ <package id="K4os.Hash.xxHash" version="1.0.8" targetFramework="net461" />
+ <package id="Microsoft.Bcl.AsyncInterfaces" version="7.0.0" targetFramework="net461" />
<package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net461" />
- <package id="MySql.Data" version="8.0.31" targetFramework="net461" />
- <package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net461" />
+ <package id="MySql.Data" version="8.2.0" targetFramework="net461" />
+ <package id="Portable.BouncyCastle" version="1.8.6" targetFramework="net461" />
<package id="SSH.NET" version="2016.1.0" targetFramework="net461" />
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
- <package id="System.Memory" version="4.5.4" targetFramework="net461" />
+ <package id="System.Configuration.ConfigurationManager" version="4.4.1" targetFramework="net461" />
+ <package id="System.Diagnostics.DiagnosticSource" version="7.0.2" targetFramework="net461" />
+ <package id="System.IO" version="4.3.0" targetFramework="net461" />
+ <package id="System.IO.Pipelines" version="5.0.2" targetFramework="net461" />
+ <package id="System.Memory" version="4.5.5" targetFramework="net461" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
+ <package id="System.Reflection" version="4.3.0" targetFramework="net461" />
+ <package id="System.Runtime" version="4.3.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net461" />
+ <package id="System.Runtime.Loader" version="4.3.0" targetFramework="net461" />
+ <package id="System.Security.AccessControl" version="4.7.0" targetFramework="net461" />
+ <package id="System.Security.Permissions" version="4.7.0" targetFramework="net461" />
+ <package id="System.Security.Principal.Windows" version="4.7.0" targetFramework="net461" />
+ <package id="System.Text.Encoding.CodePages" version="4.4.0" targetFramework="net461" />
+ <package id="System.Text.Encodings.Web" version="7.0.0" targetFramework="net461" />
+ <package id="System.Text.Json" version="7.0.1" targetFramework="net461" />
+ <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net461" />
+ <package id="ZstdSharp.Port" version="0.7.1" targetFramework="net461" />
</packages>
\ No newline at end of file
diff --git a/GasolineBlend/Controllers/WenCaiController.cs b/GasolineBlend/Controllers/WenCaiController.cs
index 3639a9e..216c551 100644
--- a/GasolineBlend/Controllers/WenCaiController.cs
+++ b/GasolineBlend/Controllers/WenCaiController.cs
@@ -3,6 +3,7 @@
using System.Web.Mvc;
using CommonHelper;
using CommonHelper.Redis;
+using Newtonsoft.Json.Linq;
using Flurl.Http;
namespace GasolineBlend.Controllers
@@ -20,6 +21,7 @@
{
var v = _customerRedis.Get("wencai_v"); //"A1KZZpxeY5TyBp9oALdJcIVAoxItY1b9iGdKIRyrfoXwL_CIBPOmDVj3mjDv";//
var url = "https://www.iwencai.com/unifiedwap/unified-wap/v2/result/get-robot-data";
+
var param = new
{
question=question,
@@ -28,11 +30,10 @@
source= "Ths_iwencai_Xuangu",
add_info="{\"urp\":{\"scene\":3,\"company\":1,\"business\":1,\"is_lowcode\":1},\"contentType\":\"json\"}"
};
-
var res = await url.WithHeader("hexin-v", v).PostUrlEncodedAsync(param).ReceiveString();
string strCov = Regex.Unescape(res);
//鍘婚櫎鍐椾綑瀛楁
- string tmpInfoA="", strCovA="";
+ string tmpInfoA ="", strCovA="";
int i = strCov.IndexOf("\"meta\"");
int j = strCov.IndexOf("\"puuid\"");
if (i > 0 && j > 0)
@@ -41,7 +42,14 @@
strCovA = strCov.Replace(tmpInfoA, "");
}
i = strCovA.IndexOf("\"layout_data\"");
- j = strCovA.IndexOf("\"layout_mode\"");
+ j = strCovA.IndexOf("\"layout_mode\"");
+ if (i > 0 && j > 0)
+ {
+ tmpInfoA = strCovA.Substring(i, j - i);
+ strCovA = strCovA.Replace(tmpInfoA, "");
+ }
+ i = strCovA.IndexOf("\"appModule\"");
+ j = strCovA.IndexOf("\"appVersion\"");
if (i > 0 && j > 0)
{
tmpInfoA = strCovA.Substring(i, j - i);
diff --git a/GasolineBlend/Web.config b/GasolineBlend/Web.config
index 048ec7f..2fd2fcf 100644
--- a/GasolineBlend/Web.config
+++ b/GasolineBlend/Web.config
@@ -117,7 +117,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-8.0.31.0" newVersion="8.0.31.0" />
+ <bindingRedirect oldVersion="0.0.0.0-8.2.0.0" newVersion="8.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -159,6 +159,26 @@
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.8.6.0" newVersion="1.8.6.0" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.0.0.2" newVersion="5.0.0.2" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Runtime.Loader" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Security.Principal.Windows" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-6.0.0.7" newVersion="6.0.0.7" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
<system.webServer>
@@ -186,7 +206,8 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://47.92.245.94:8080/ServiceCruOil.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IServiceCruOil" contract="WcfServiceCruOil.IServiceCruOil" name="BasicHttpBinding_IServiceCruOil" />
+ <!--localhost-->
+ <endpoint address="http://47.92.245.94:8080:8080/ServiceCruOil.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IServiceCruOil" contract="WcfServiceCruOil.IServiceCruOil" name="BasicHttpBinding_IServiceCruOil" />
</client>
</system.serviceModel>
diff --git a/RiskControl.NewService/app.config b/RiskControl.NewService/app.config
index d5e8caa..ebfea72 100644
--- a/RiskControl.NewService/app.config
+++ b/RiskControl.NewService/app.config
@@ -20,12 +20,32 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-8.0.31.0" newVersion="8.0.31.0" />
+ <bindingRedirect oldVersion="0.0.0.0-8.2.0.0" newVersion="8.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.8.6.0" newVersion="1.8.6.0" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.0.0.2" newVersion="5.0.0.2" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Runtime.Loader" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Security.Principal.Windows" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-6.0.0.7" newVersion="6.0.0.7" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
diff --git a/RiskControlRR.sln b/RiskControlRR.sln
index 6401fea..0bd80e5 100644
--- a/RiskControlRR.sln
+++ b/RiskControlRR.sln
@@ -1,7 +1,7 @@
锘�
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27428.2043
+# Visual Studio Version 17
+VisualStudioVersion = 17.8.34511.84
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GasolineBlend", "GasolineBlend\GasolineBlend.csproj", "{B7376830-31C5-4B3D-8A2B-564661811AC1}"
ProjectSection(ProjectDependencies) = postProject
--
Gitblit v1.8.0