fajiao
/
AutoWeight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

vs 更新修改

HuiZhou
fajiao 3 years ago
parent
40879f8207
commit
9adc9f8e9a
8 changed files with 162 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      AutoWeightServer/App.config
  2. 1
      AutoWeightServer/AutoWeightServer.csproj
  3. 56
      EC.Entity/EC.Entity.csproj
  4. 21
      EC.Entity/app.config
  5. 11
      EC.Entity/packages.config
  6. 41
      EC.Service/EC.Service.csproj
  7. 15
      EC.Service/app.config
  8. 26
      EC.Utils/EC.Utils.csproj

14
AutoWeightServer/App.config
View File

@ -8,7 +8,7 @@
<connectionStrings>
<!--<add name="ConnectionString" connectionString="Data Source=39.105.6.170; Initial Catalog=HFMesDB3;Persist Security Info=True;User ID=sa;Password=qwe123$$" providerName="System.Data.SqlClient" />-->
<!--<add name="BaseDb" connectionString="Data Source=127.0.0.1;port=3306;pooling=true;max pool size=50; min pool size=5;Initial Catalog=autoweight;user id=root;password=2LBd74KoapPCnZR9;charset=utf8" providerName="MySql.Data.MySqlClient" />-->
<add name="BaseDb" connectionString="Data Source=192.168.1.200;port=3308;pooling=true;max pool size=50; min pool size=5;Initial Catalog=autoweight;user id=root;password=root;charset=utf8" providerName="MySql.Data.MySqlClient" />
<add name="BaseDb" connectionString="Data Source=192.168.1.119;port=3306;pooling=true;max pool size=50; min pool size=5;Initial Catalog=autoweight;user id=root;password=123456;charset=utf8" providerName="MySql.Data.MySqlClient" />
<!--<add name="AccessConnectionString" connectionString="Provider=Microsoft.ACE.OLEDB.12.0;Persist Security Info=False;Data Source=C:\Works\Self\Pos\MyPos\MyPos\bin\Debug\DB\MyPos.mdb" />-->
</connectionStrings>
<appSettings>
@ -58,7 +58,7 @@
<!--其它-->
<add key="SavePhoto_Day" value="90" />
<add key="IsPretreatPlate" value="1" />
<add key="ShowDebug" value="1" />
<add key="ShowDebug" value="0" />
<add key="ShowTrailer" value="1" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
@ -103,7 +103,15 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.9.12.0" newVersion="6.9.12.0" />
<bindingRedirect oldVersion="0.0.0.0-8.0.29.0" newVersion="8.0.29.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>

1
AutoWeightServer/AutoWeightServer.csproj
View File

@ -326,7 +326,6 @@
<None Include="App.config">
<SubType>Designer</SubType>
</None>
<None Include="AutoWeightServer_TemporaryKey.pfx" />
<None Include="packages.config" />
<None Include="Properties\app.manifest" />
<None Include="Properties\Settings.settings">

56
EC.Entity/EC.Entity.csproj
View File

@ -33,6 +33,9 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="BouncyCastle.Crypto, Version=1.8.5.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
<HintPath>..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="DevExpress.Charts.v20.2.Core, Version=20.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Data.v20.2, Version=20.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Office.v20.2.Core, Version=20.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
@ -47,11 +50,26 @@
<Reference Include="DevExpress.XtraCharts.v20.2.Wizard, Version=20.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraEditors.v20.2, Version=20.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraPrinting.v20.2, Version=20.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="EC.Data">
<HintPath>..\dll\EC.Data.dll</HintPath>
</Reference>
<Reference Include="EC.Data.Dapper">
<HintPath>..\dll\EC.Data.Dapper.dll</HintPath>
</Reference>
<Reference Include="EC.Data.EF">
<HintPath>..\dll\EC.Data.EF.dll</HintPath>
</Reference>
<Reference Include="EC.Data.Repository">
<HintPath>..\dll\EC.Data.Repository.dll</HintPath>
</Reference>
<Reference Include="EC.DataAccess">
<HintPath>..\..\dll\EC.DataAccess.dll</HintPath>
<HintPath>..\dll\EC.DataAccess.dll</HintPath>
</Reference>
<Reference Include="EC.Dto">
<HintPath>..\dll\EC.Dto.dll</HintPath>
</Reference>
<Reference Include="EC.Util">
<HintPath>..\..\dll\EC.Util.dll</HintPath>
<HintPath>..\dll\EC.Util.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
@ -59,13 +77,37 @@
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.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>
<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\net45\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\net45\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\net45\K4os.Hash.xxHash.dll</HintPath>
</Reference>
<Reference Include="MySql.Data, Version=8.0.29.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.8.0.29\lib\net452\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\netstandard1.1\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.configuration" />
<Reference Include="System.Configuration.Install" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
<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\netstandard1.1\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" />
@ -79,6 +121,12 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Ubiety.Dns.Core, Version=2.2.1.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.8.0.29\lib\net452\Ubiety.Dns.Core.dll</HintPath>
</Reference>
<Reference Include="ZstdNet, Version=1.4.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.8.0.29\lib\net452\ZstdNet.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Transport\IniEntity.cs" />

21
EC.Entity/app.config
View File

@ -7,7 +7,7 @@
<entityFramework>
<providers>
<provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"></provider>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
</providers>
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
@ -16,4 +16,21 @@
</parameters>
</defaultConnectionFactory>
</entityFramework>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.29.0" newVersion="8.0.29.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

11
EC.Entity/packages.config
View File

@ -1,8 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BouncyCastle" version="1.8.5" targetFramework="net452" />
<package id="EntityFramework" version="6.2.0" targetFramework="net45" />
<package id="EntityFramework.zh-Hans" version="6.2.0" targetFramework="net45" />
<package id="MySql.Data.Entity" version="6.10.9" targetFramework="net45" requireReinstallation="true" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net45" />
<package id="Google.Protobuf" version="3.19.4" targetFramework="net452" />
<package id="K4os.Compression.LZ4" version="1.2.6" targetFramework="net452" />
<package id="K4os.Compression.LZ4.Streams" version="1.2.6" targetFramework="net452" />
<package id="K4os.Hash.xxHash" version="1.0.6" targetFramework="net452" />
<package id="MySql.Data" version="8.0.29" targetFramework="net452" />
<package id="System.Buffers" version="4.5.1" targetFramework="net452" />
<package id="System.Memory" version="4.5.4" targetFramework="net452" />
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net452" />
<package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net45" />
</packages>

41
EC.Service/EC.Service.csproj
View File

@ -33,37 +33,60 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="EC.Data">
<HintPath>..\dll\EC.Data.dll</HintPath>
</Reference>
<Reference Include="EC.Data.Dapper">
<HintPath>..\dll\EC.Data.Dapper.dll</HintPath>
</Reference>
<Reference Include="EC.Data.EF">
<HintPath>..\dll\EC.Data.EF.dll</HintPath>
</Reference>
<Reference Include="EC.Data.Repository">
<HintPath>..\dll\EC.Data.Repository.dll</HintPath>
</Reference>
<Reference Include="EC.DataAccess">
<HintPath>..\..\dll\EC.DataAccess.dll</HintPath>
<HintPath>..\dll\EC.DataAccess.dll</HintPath>
</Reference>
<Reference Include="EC.Dto">
<HintPath>..\dll\EC.Dto.dll</HintPath>
</Reference>
<Reference Include="EC.Util">
<HintPath>..\..\dll\EC.Util.dll</HintPath>
<HintPath>..\dll\EC.Util.dll</HintPath>
</Reference>
<Reference Include="EC.Util.Extension">
<HintPath>..\..\dll\EC.Util.Extension.dll</HintPath>
<HintPath>..\dll\EC.Util.Extension.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\dll\log4net.dll</HintPath>
<HintPath>..\dll\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.EnterpriseLibrary.Common, Version=4.1.0.0, Culture=neutral, PublicKeyToken=e44a2bc38ed2c13c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\dll\Microsoft.Practices.EnterpriseLibrary.Common.dll</HintPath>
<HintPath>..\dll\Microsoft.Practices.EnterpriseLibrary.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.EnterpriseLibrary.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\dll\Microsoft.Practices.EnterpriseLibrary.Data.dll</HintPath>
<HintPath>..\dll\Microsoft.Practices.EnterpriseLibrary.Data.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ObjectBuilder2, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\dll\Microsoft.Practices.ObjectBuilder2.dll</HintPath>
<HintPath>..\dll\Microsoft.Practices.ObjectBuilder2.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.Unity, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\dll\Microsoft.Practices.Unity.dll</HintPath>
<HintPath>..\dll\Microsoft.Practices.Unity.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.Unity.Configuration">
<HintPath>..\..\dll\Microsoft.Practices.Unity.Configuration.dll</HintPath>
<HintPath>..\dll\Microsoft.Practices.Unity.Configuration.dll</HintPath>
</Reference>
<Reference Include="MySql.Data, Version=8.0.22.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\dll\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="MySql.Data.Entity.EF6, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\dll\MySql.Data.Entity.EF6.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\HFWorkServer\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>

15
EC.Service/app.config
View File

@ -1,4 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

26
EC.Utils/EC.Utils.csproj
View File

@ -33,7 +33,31 @@
<ItemGroup>
<Reference Include="EC.Util, Version=10.0.0.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\dll\EC.Util.dll</HintPath>
<HintPath>..\dll\EC.Util.dll</HintPath>
</Reference>
<Reference Include="EC.Util.Extension">
<HintPath>..\dll\EC.Util.Extension.dll</HintPath>
</Reference>
<Reference Include="EC.Util.FlowWork">
<HintPath>..\dll\EC.Util.FlowWork.dll</HintPath>
</Reference>
<Reference Include="EC.Util.Ioc">
<HintPath>..\dll\EC.Util.Ioc.dll</HintPath>
</Reference>
<Reference Include="EC.Util.Offices">
<HintPath>..\dll\EC.Util.Offices.dll</HintPath>
</Reference>
<Reference Include="EC.Util.Security">
<HintPath>..\dll\EC.Util.Security.dll</HintPath>
</Reference>
<Reference Include="EC.Util.SignalR">
<HintPath>..\dll\EC.Util.SignalR.dll</HintPath>
</Reference>
<Reference Include="EC.Util.WebControl">
<HintPath>..\dll\EC.Util.WebControl.dll</HintPath>
</Reference>
<Reference Include="EC.Util.WeChat">
<HintPath>..\dll\EC.Util.WeChat.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\HFWorkServer\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>

Write Preview
Loading…
Cancel
Save