Skip to content

Commit 15a2516

Browse files
zeng-github01zeng-github01
committed
Change GetLog method to List
1 parent 2f1e4e7 commit 15a2516

File tree

5 files changed

+56
-42
lines changed

5 files changed

+56
-42
lines changed

‎CDK/CDK.csproj‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@
3636
<HintPath>lib\Assembly-CSharp.dll</HintPath>
3737
<Private>False</Private>
3838
</Reference>
39-
<Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll</HintPath>
41-
</Reference>
4239
<Reference Include="com.rlabrecque.steamworks.net, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
4340
<SpecificVersion>False</SpecificVersion>
4441
<HintPath>lib\com.rlabrecque.steamworks.net.dll</HintPath>
@@ -47,23 +44,23 @@
4744
<Reference Include="Dapper, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
4845
<HintPath>..\packages\Dapper.2.0.123\lib\net461\Dapper.dll</HintPath>
4946
</Reference>
50-
<Reference Include="Google.Protobuf, Version=3.21.9.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Google.Protobuf.3.21.9\lib\net45\Google.Protobuf.dll</HintPath>
47+
<Reference Include="Google.Protobuf, Version=3.23.2.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Google.Protobuf.3.23.2\lib\net45\Google.Protobuf.dll</HintPath>
5249
</Reference>
53-
<Reference Include="K4os.Compression.LZ4, Version=1.2.16.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
54-
<HintPath>..\packages\K4os.Compression.LZ4.1.2.16\lib\net46\K4os.Compression.LZ4.dll</HintPath>
50+
<Reference Include="K4os.Compression.LZ4, Version=1.3.5.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
51+
<HintPath>..\packages\K4os.Compression.LZ4.1.3.5\lib\net462\K4os.Compression.LZ4.dll</HintPath>
5552
</Reference>
56-
<Reference Include="K4os.Compression.LZ4.Streams, Version=1.2.16.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
57-
<HintPath>..\packages\K4os.Compression.LZ4.Streams.1.2.16\lib\net46\K4os.Compression.LZ4.Streams.dll</HintPath>
53+
<Reference Include="K4os.Compression.LZ4.Streams, Version=1.3.5.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
54+
<HintPath>..\packages\K4os.Compression.LZ4.Streams.1.3.5\lib\net462\K4os.Compression.LZ4.Streams.dll</HintPath>
5855
</Reference>
5956
<Reference Include="K4os.Hash.xxHash, Version=1.0.8.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
6057
<HintPath>..\packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll</HintPath>
6158
</Reference>
62-
<Reference Include="MySql.Data, Version=8.0.31.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
63-
<HintPath>..\packages\MySql.Data.8.0.31\lib\net48\MySql.Data.dll</HintPath>
59+
<Reference Include="MySql.Data, Version=8.0.33.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
60+
<HintPath>..\packages\MySql.Data.8.0.33\lib\net48\MySql.Data.dll</HintPath>
6461
</Reference>
6562
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
66-
<HintPath>..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
63+
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
6764
</Reference>
6865
<Reference Include="PermissionSync, Version=1.0.1.2, Culture=neutral, processorArchitecture=MSIL">
6966
<SpecificVersion>False</SpecificVersion>
@@ -93,6 +90,9 @@
9390
<Reference Include="System.Configuration" />
9491
<Reference Include="System.Configuration.Install" />
9592
<Reference Include="System.Core" />
93+
<Reference Include="System.IO.Pipelines, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
94+
<HintPath>..\packages\System.IO.Pipelines.7.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
95+
</Reference>
9696
<Reference Include="System.Management" />
9797
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
9898
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
@@ -104,6 +104,9 @@
104104
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
105105
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
106106
</Reference>
107+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
108+
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
109+
</Reference>
107110
<Reference Include="System.Transactions" />
108111
<Reference Include="System.Xml.Linq">
109112
<Private>True</Private>
@@ -126,9 +129,6 @@
126129
<HintPath>lib\UnityEngine.CoreModule.dll</HintPath>
127130
<Private>False</Private>
128131
</Reference>
129-
<Reference Include="ZstdNet, Version=1.4.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
130-
<HintPath>..\packages\MySql.Data.8.0.31\lib\net48\ZstdNet.dll</HintPath>
131-
</Reference>
132132
</ItemGroup>
133133
<ItemGroup>
134134
<Compile Include="CDKCommand.cs" />

‎CDK/CDKCommand.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ private EKeyReemeResult RedeemCDK(UnturnedPlayer player, string CDK)
9696
return EKeyReemeResult.MaxRedeemed;
9797
}
9898

99-
if (logdata != null && !cdkdata.Renew)
99+
if (logdata.Count > 0 && !cdkdata.Renew)
100100
{
101101
return EKeyReemeResult.Redeemed;
102102
}
103-
else if (logdata == null)
103+
else if (logdata.Count == 0)
104104
{
105105
if (!KeyVailed(cdkdata))
106106
{
@@ -177,7 +177,7 @@ private EKeyReemeResult RedeemCDK(UnturnedPlayer player, string CDK)
177177
Database.IncreaseRedeemedTime(CDK);
178178
return EKeyReemeResult.Success;
179179
}
180-
else if (logdata != null && cdkdata.Renew)
180+
else if (logdata.Count > 0 && cdkdata.Renew)
181181
{
182182
if (!cdkdata.UsePermissionSync)
183183
{

‎CDK/DatabaseManager.cs‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,25 @@ internal DatabaseManager()
2929

3030
internal void CheckValid(UnturnedPlayer player)
3131
{
32-
LogData logData = GetLogData(player.CSteamID.m_SteamID, ELogQueryType.ByTime);
33-
if (logData != null && logData.GrantPermissionGroup != string.Empty && !logData.UsePermissionSync)
32+
var logList = GetLogData(player.CSteamID.m_SteamID, ELogQueryType.ByTime);
33+
//if (logData != null && logData.GrantPermissionGroup != string.Empty && !logData.UsePermissionSync)
34+
//{
35+
// do
36+
// {
37+
// CDKData cDKData = GetCDKData(logData.CDK);
38+
// R.Permissions.RemovePlayerFromGroup(cDKData.GrantPermissionGroup, player);
39+
// UnturnedChat.Say(player, Main.Instance.Translate("key_expired", logData.CDK));
40+
// logData = GetLogData(player.CSteamID.m_SteamID, ELogQueryType.ByTime);
41+
// } while (logData == null);
42+
//}
43+
foreach(LogData log in logList)
3444
{
35-
do
45+
if (log.GrantPermissionGroup != string.Empty && !log.UsePermissionSync)
3646
{
37-
CDKData cDKData = GetCDKData(logData.CDK);
47+
CDKData cDKData = GetCDKData(log.CDK);
3848
R.Permissions.RemovePlayerFromGroup(cDKData.GrantPermissionGroup, player);
39-
UnturnedChat.Say(player, Main.Instance.Translate("key_expired", logData.CDK));
40-
logData = GetLogData(player.CSteamID.m_SteamID, ELogQueryType.ByTime);
41-
} while (logData == null);
49+
UnturnedChat.Say(player, Main.Instance.Translate("key_expired", log.CDK));
50+
}
4251
}
4352
}
4453

@@ -67,9 +76,9 @@ public CDKData GetCDKData(string key)
6776
return cdkData;
6877
}
6978

70-
public LogData GetLogData(ulong steamid, ELogQueryType type, string keyword = "")
79+
public List<LogData> GetLogData(ulong steamid, ELogQueryType type, string keyword = "")
7180
{
72-
LogData logData = null;
81+
List<LogData> logDatas = new List<LogData>();
7382
var con = CreateConnection();
7483
try
7584
{
@@ -79,17 +88,17 @@ public LogData GetLogData(ulong steamid, ELogQueryType type, string keyword = ""
7988
{
8089
case ELogQueryType.ByCDK:
8190
parameter.Add("@CDK", keyword);
82-
logData = con.QueryFirstOrDefault<LogData>(
83-
$"SELECT * FROM `{Main.Instance.Configuration.Instance.DatabaseRedeemLogTableName}` where `SteamID` = @SteamID and `CDK` = @CDK", parameter);
91+
logDatas = con.Query<LogData>(
92+
$"SELECT * FROM `{Main.Instance.Configuration.Instance.DatabaseRedeemLogTableName}` where `SteamID` = @SteamID and `CDK` = @CDK", parameter).AsList();
8493
break;
8594
case ELogQueryType.ByTime:
86-
logData = con.QueryFirstOrDefault<LogData>(
87-
$"SELECT * FROM `{Main.Instance.Configuration.Instance.DatabaseRedeemLogTableName}` where `SteamID` = @SteamID and ValidUntil < now()",parameter);
95+
logDatas = con.Query<LogData>(
96+
$"SELECT * FROM `{Main.Instance.Configuration.Instance.DatabaseRedeemLogTableName}` where `SteamID` = @SteamID and ValidUntil < now()",parameter).AsList();
8897
break;
8998
case ELogQueryType.ByPermissionGroup:
9099
parameter.Add("@permission", keyword);
91-
logData = con.QueryFirstOrDefault<LogData>(
92-
$"SELECT * FROM `{Main.Instance.Configuration.Instance.DatabaseRedeemLogTableName}` WHERE `SteamID` = @SteamID and `GrantPermissionGroup` = @permission", parameter);
100+
logDatas = con.Query<LogData>(
101+
$"SELECT * FROM `{Main.Instance.Configuration.Instance.DatabaseRedeemLogTableName}` WHERE `SteamID` = @SteamID and `GrantPermissionGroup` = @permission", parameter).AsList();
93102
break;
94103
}
95104
}
@@ -102,7 +111,7 @@ public LogData GetLogData(ulong steamid, ELogQueryType type, string keyword = ""
102111
con.Close();
103112
}
104113

105-
return logData;
114+
return logDatas;
106115
}
107116

108117
internal void SaveLogToDB(LogData logData)

‎CDK/app.config‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-8.0.31.0" newVersion="8.0.31.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-8.0.33.0" newVersion="8.0.33.0" />
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
1111
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
1212
</dependentAssembly>
1313
<dependentAssembly>
1414
<assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-3.21.9.0" newVersion="3.21.9.0" />
15+
<bindingRedirect oldVersion="0.0.0.0-3.23.2.0" newVersion="3.23.2.0" />
1616
</dependentAssembly>
1717
<dependentAssembly>
1818
<assemblyIdentity name="K4os.Compression.LZ4.Streams" publicKeyToken="2186fa9121ef231d" culture="neutral" />
@@ -30,6 +30,10 @@
3030
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
3131
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
3232
</dependentAssembly>
33+
<dependentAssembly>
34+
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
35+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
36+
</dependentAssembly>
3337
</assemblyBinding>
3438
</runtime>
3539
</configuration>

‎CDK/packages.config‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="BouncyCastle" version="1.8.9" targetFramework="net48" />
43
<package id="Dapper" version="2.0.123" targetFramework="net48" />
5-
<package id="Google.Protobuf" version="3.21.9" targetFramework="net48" />
6-
<package id="K4os.Compression.LZ4" version="1.2.16" targetFramework="net48" />
7-
<package id="K4os.Compression.LZ4.Streams" version="1.2.16" targetFramework="net48" />
4+
<package id="Google.Protobuf" version="3.23.2" targetFramework="net48" />
5+
<package id="K4os.Compression.LZ4" version="1.3.5" targetFramework="net48" />
6+
<package id="K4os.Compression.LZ4.Streams" version="1.3.5" targetFramework="net48" />
87
<package id="K4os.Hash.xxHash" version="1.0.8" targetFramework="net48" />
9-
<package id="MySql.Data" version="8.0.31" targetFramework="net48" />
10-
<package id="Newtonsoft.Json" version="13.0.2" targetFramework="net48" />
8+
<package id="MySql.Data" version="8.0.33" targetFramework="net48" />
9+
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
1110
<package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net48" />
1211
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
12+
<package id="System.IO.Pipelines" version="7.0.0" targetFramework="net48" />
1313
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
1414
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
1515
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
16+
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
1617
</packages>

0 commit comments

Comments
 (0)