fix: 修复因升级导致校验系统失效

BingZi-233 · Dec 26, 2023 · 945d02f · 945d02f
1 parent 7aa75d5
commit 945d02f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
 group=online.bingiz.bilibili.video
-version=1.3.15
+version=1.3.16
diff --git a/src/main/kotlin/online/bingiz/bilibili/video/internal/engine/NetworkEngine.kt b/src/main/kotlin/online/bingiz/bilibili/video/internal/engine/NetworkEngine.kt
@@ -186,7 +186,7 @@ object NetworkEngine {
             player.warningAsLang("CookieNotFound")
             return
         }
-        val sessData = cookieCache[player.uniqueId]?.let { list -> list.SESSDATA.let { "SESSDATA=$it" } } ?: let {
+        val sessData = cookieCache[player.uniqueId]?.let { list -> list.SESSDATA?.let { "SESSDATA=$it" } } ?: let {
             player.warningAsLang("CookieNotFound")
             return
         }
@@ -258,7 +258,7 @@ object NetworkEngine {
             }
         }
         val sessData = cookieCache[player.uniqueId]?.let { list ->
-            list.SESSDATA.let { "SESSDATA=$it" }
+            list.SESSDATA?.let { "SESSDATA=$it" }
         } ?: let {
             player.warningAsLang("CookieNotFound")
             return
@@ -332,7 +332,9 @@ object NetworkEngine {
      */
     fun getUserInfo(cookie: CookieData): UserInfoData? {
         // 获取 SASSDATA
-        val sessData = "SESSDATA=${cookie.SESSDATA}"
+        val sessData = cookie.SESSDATA?.let { "SESSDATA=$it" } ?: let {
+            return null
+        }
         // 获取用户信息
         val response = bilibiliAPI.getUserInfo(sessData).execute()
         // 判断请求是否成功并且返回的数据 code 是否为 0

diff --git a/src/main/kotlin/online/bingiz/bilibili/video/internal/entity/CookieData.kt b/src/main/kotlin/online/bingiz/bilibili/video/internal/entity/CookieData.kt
@@ -11,9 +11,9 @@ package online.bingiz.bilibili.video.internal.entity
  * @constructor Create empty Cookie data
  */
 data class CookieData(
-    var SESSDATA: String = "",
-    var bili_jct: String = "",
-    var DedeUserID: String = "",
-    var DedeUserID__ckMd5: String = "",
-    var sid: String = ""
+    var SESSDATA: String? = null,
+    var bili_jct: String? = null,
+    var DedeUserID: String? = null,
+    var DedeUserID__ckMd5: String? = null,
+    var sid: String? = null
 )
diff --git a/src/main/kotlin/online/bingiz/bilibili/video/internal/listener/PlayerListener.kt b/src/main/kotlin/online/bingiz/bilibili/video/internal/listener/PlayerListener.kt
@@ -28,11 +28,11 @@ object PlayerListener {
         baffleCache.reset(player.name)
         // 保存玩家Cookie数据
         cookieCache.get(player.uniqueId)?.let {
-            player.setDataContainer("SESSDATA", it.SESSDATA)
-            player.setDataContainer("bili_jct", it.bili_jct)
-            player.setDataContainer("DedeUserID", it.DedeUserID)
-            player.setDataContainer("DedeUserID__ckMd5", it.DedeUserID__ckMd5)
-            player.setDataContainer("sid", it.sid)
+            it.SESSDATA?.let { it1 -> player.setDataContainer("SESSDATA", it1) }
+            it.bili_jct?.let { it1 -> player.setDataContainer("bili_jct", it1) }
+            it.DedeUserID?.let { it1 -> player.setDataContainer("DedeUserID", it1) }
+            it.DedeUserID__ckMd5?.let { it1 -> player.setDataContainer("DedeUserID__ckMd5", it1) }
+            it.sid?.let { it1 -> player.setDataContainer("sid", it1) }
         }
         // 驱逐Cookie缓存
         cookieCache.invalidate(player.uniqueId)