chore(deps): update

GZTimeWalker · Feb 26, 2024 · 0c1fe11 · 0c1fe11
1 parent 47214c1
commit 0c1fe11
Showing 5 changed files with 145 additions and 150 deletions.
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -39,7 +39,7 @@
     <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.2" />
     <PackageVersion Include="BouncyCastle.Cryptography" Version="2.3.0" />
     <PackageVersion Include="PacketDotNet" Version="1.4.7" />
-    <PackageVersion Include="SharpPcap" Version="6.2.5" />
+    <PackageVersion Include="SharpPcap" Version="6.3.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.2" />
     <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.2" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />

diff --git a/src/GZCTF/ClientApp/package.json b/src/GZCTF/ClientApp/package.json
@@ -29,10 +29,10 @@
     "dayjs": "^1.11.10",
     "echarts": "^5.5.0",
     "echarts-for-react": "^3.0.2",
-    "embla-carousel": "^7.1.0",
-    "embla-carousel-autoplay": "^7.1.0",
-    "embla-carousel-react": "^7.1.0",
-    "i18next": "^23.9.0",
+    "embla-carousel": "^7.0.0",
+    "embla-carousel-autoplay": "^7.0.0",
+    "embla-carousel-react": "^7.0.0",
+    "i18next": "^23.10.0",
     "i18next-browser-languagedetector": "^7.2.0",
     "katex": "^0.16.9",
     "lz-string": "^1.5.0",
@@ -45,7 +45,7 @@
     "react-error-boundary": "^4.0.12",
     "react-google-recaptcha-v3": "^1.10.1",
     "react-i18next": "^14.0.5",
-    "react-pdf": "^7.7.0",
+    "react-pdf": "^7.7.1",
     "react-router": "^6.22.1",
     "react-router-dom": "^6.22.1",
     "swr": "2.2.5"
@@ -56,16 +56,16 @@
     "@nabla/vite-plugin-eslint": "^2.0.2",
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "@types/katex": "^0.16.7",
-    "@types/node": "20.11.19",
+    "@types/node": "20.11.20",
     "@types/prismjs": "^1.26.3",
-    "@types/react": "^18.2.57",
+    "@types/react": "^18.2.58",
     "@types/react-dom": "^18.2.19",
     "@typescript-eslint/eslint-plugin": "^7.0.2",
     "@typescript-eslint/parser": "^7.0.2",
     "@vitejs/plugin-react": "^4.2.1",
     "axios": "^1.6.7",
     "babel-plugin-prismjs": "^2.1.0",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "form-data": "~4.0.0",
     "lodash": "^4.17.21",
@@ -74,7 +74,7 @@
     "swagger-typescript-api": "^13.0.3",
     "tslib": "^2.6.2",
     "typescript": "5.3.3",
-    "vite": "^5.1.3",
+    "vite": "^5.1.4",
     "vite-plugin-pages": "^0.32.0",
     "vite-plugin-prismjs": "^0.0.11",
     "vite-plugin-webfont-dl": "^3.9.1",

diff --git a/src/GZCTF/ClientApp/pnpm-lock.yaml b/src/GZCTF/ClientApp/pnpm-lock.yaml
diff --git a/src/GZCTF/Repositories/GameRepository.cs b/src/GZCTF/Repositories/GameRepository.cs
@@ -211,7 +211,7 @@ static Dictionary<ChallengeTag, IEnumerable<ChallengeInfo>> GenChallenges(Data[]
                 Title = c.Key.Title,
                 Tag = c.Key.Tag,
                 Score = c.Key.CurrentScore,
-                SolvedCount = c.Key.AcceptedCount, // Concurrence!
+                SolvedCount = c.Key.AcceptedCount,
                 Bloods = bloods[c.Key.Id]
             }).GroupBy(c => c.Tag)
             .OrderBy(i => i.Key)
@@ -295,18 +295,18 @@ static ScoreboardItem[] GenScoreboardItems(Data[] data, Game game, IDictionary<i
             {
                 j.Rank = i + 1;
 
-                if (j.Organization is not null)
+                if (j.Organization is null)
+                    return j;
+
+                if (ranks.TryGetValue(j.Organization, out var rank))
                 {
-                    if (ranks.TryGetValue(j.Organization, out var rank))
-                    {
-                        j.OrganizationRank = rank + 1;
-                        ranks[j.Organization]++;
-                    }
-                    else
-                    {
-                        j.OrganizationRank = 1;
-                        ranks[j.Organization] = 1;
-                    }
+                    j.OrganizationRank = rank + 1;
+                    ranks[j.Organization]++;
+                }
+                else
+                {
+                    j.OrganizationRank = 1;
+                    ranks[j.Organization] = 1;
                 }
 
                 return j;

diff --git a/src/GZCTF/Services/Cache/CacheHelper.cs b/src/GZCTF/Services/Cache/CacheHelper.cs
@@ -54,11 +54,6 @@ public static class CacheKey
     /// </summary>
     public static string GameNotice(int id) => $"_GameNotice_{id}";
 
-    /// <summary>
-    /// 比赛通知缓存
-    /// </summary>
-    public static string GameNotice(string id) => $"_ScoreBoard_{id}";
-
     /// <summary>
     /// 容器连接数缓存
     /// </summary>