Sancaros/PSO2SERVER
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正可从lib引入dll文件

Browse Source
This commit is contained in:
Longfeng Qin 2024-09-13 02:23:34 +08:00
parent d75c7ac682
commit d165a9e75c
6 changed files with 56 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Server/Client.cs
View File

@ -57,14 +57,16 @@ namespace PSO2SERVER
private void HandleDataReceived(byte[] data, int size)
{
Logger.Write("[<--] 接收到 {0} 字节", size);
if ((_readBufferSize + size) > _readBuffer.Length)
{
Logger.WriteError("[<--] 接收到 {0} 字节大于预设buf长度", size);
// Buffer overrun
// TODO: Drop the connection when this occurs?
return;
}
Logger.Write("[<--] 接收到 {0} 字节", size);
Array.Copy(data, 0, _readBuffer, _readBufferSize, size);
InputArc4?.TransformBlock(_readBuffer, (int)_readBufferSize, size, _readBuffer, (int)_readBufferSize);

21
Server/Program.cs
View File

@ -53,8 +53,29 @@ namespace PSO2SERVER
public List<QueryServer> QueryServers = new List<QueryServer>();
public Server Server;
private static Assembly ResolveAssembly(object sender, ResolveEventArgs args)
{
string libDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "lib");
string assemblyPath = Path.Combine(libDir, new AssemblyName(args.Name).Name + ".dll");
if (File.Exists(assemblyPath))
{
return Assembly.LoadFrom(assemblyPath);
}
return null;
}
public static void Main(string[] args)
{
// 设置 AssemblyResolve 事件处理程序
AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(ResolveAssembly);
// 继续程序逻辑
Logger.Write("Application started.");
// 继续程序逻辑
Logger.Write("Base directory set to: " + AppDomain.CurrentDomain.BaseDirectory);
Config = new Config();
ConsoleSystem = new ConsoleSystem { Thread = new Thread(ConsoleSystem.StartThread) };

32
Server/Server.csproj
View File

@ -14,6 +14,21 @@
</NuGetPackageImportStamp>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@ -77,8 +92,8 @@
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="Google.Protobuf, Version=3.28.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
<HintPath>..\packages\Google.Protobuf.3.28.0\lib\net45\Google.Protobuf.dll</HintPath>
<Reference Include="Google.Protobuf, Version=3.28.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
<HintPath>..\packages\Google.Protobuf.3.28.1\lib\net45\Google.Protobuf.dll</HintPath>
</Reference>
<Reference Include="K4os.Compression.LZ4, Version=1.3.8.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
<HintPath>..\packages\K4os.Compression.LZ4.1.3.8\lib\net462\K4os.Compression.LZ4.dll</HintPath>
@ -236,7 +251,18 @@
<Target Name="CopyFiles">
<Copy SourceFiles="@(CopyItems)" DestinationFolder="$(OutputPath)\\Resources\\%(CopyItems.RecursiveDir)" />
</Target>
<ItemGroup />
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.8">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.8 %28x86 和 x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>

2
Server/app.config
View File

@ -28,7 +28,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.28.0.0" newVersion="3.28.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.28.1.0" newVersion="3.28.1.0" />
</dependentAssembly>
</assemblyBinding>
<probing privatePath="lib;plugins" />

2
Server/packages.config
View File

@ -3,7 +3,7 @@
<package id="BCrypt-Official" version="0.1.109" targetFramework="net40" />
<package id="BouncyCastle.Cryptography" version="2.4.0" targetFramework="net48" />
<package id="EntityFramework" version="6.5.1" targetFramework="net48" />
<package id="Google.Protobuf" version="3.28.0" targetFramework="net48" />
<package id="Google.Protobuf" version="3.28.1" targetFramework="net48" />
<package id="K4os.Compression.LZ4" version="1.3.8" targetFramework="net48" />
<package id="K4os.Compression.LZ4.Streams" version="1.3.8" targetFramework="net48" />
<package id="K4os.Hash.xxHash" version="1.0.8" targetFramework="net48" />

2
ServerTest/app.config
View File

@ -20,7 +20,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.28.0.0" newVersion="3.28.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.28.1.0" newVersion="3.28.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ZstdSharp" publicKeyToken="8d151af33a4ad5cf" culture="neutral" />