diff --git a/app/src/main/java/com/github/catvod/api/Pan123Handler.kt b/app/src/main/java/com/github/catvod/api/Pan123Handler.kt index f79f148d..9f138bdf 100644 --- a/app/src/main/java/com/github/catvod/api/Pan123Handler.kt +++ b/app/src/main/java/com/github/catvod/api/Pan123Handler.kt @@ -49,12 +49,9 @@ object Pan123Handler { passwd = cache!!.user.password auth = cache!!.user.cookie expire = cache!!.user.expire - if (expire == 0L || System.currentTimeMillis() > expire) { - SpiderDebug.log("token已过期") - startFlow() - } else if (StringUtils.isNotBlank(userName) && StringUtils.isNotBlank(passwd)) { - if (StringUtils.isBlank(auth)) { - SpiderDebug.log("userName passwd 不为空,auth 为空") + if (StringUtils.isNotBlank(userName) && StringUtils.isNotBlank(passwd)) { + if (StringUtils.isBlank(auth) || expire == 0L || System.currentTimeMillis() > expire) { + SpiderDebug.log("auth 为空或者登录已过期") this.loginWithPassword(userName, passwd) } } else { diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 310e4657..51ab9903 100644 Binary files a/jar/custom_spider.jar and b/jar/custom_spider.jar differ diff --git a/jar/custom_spider.jar.md5 b/jar/custom_spider.jar.md5 index 989cc8ff..601eaa95 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -8d1566cb9f39f6dc19f1ae7754323b28 +e08d2ec17471fa6606811286d60a1087 diff --git a/json/index.json b/json/index.json index 2f207e8d..7f1601cd 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://andoridspidermt.netlify.app/jar/custom_spider.jar;md5;8d1566cb9f39f6dc19f1ae7754323b28", + "spider": "https://andoridspidermt.netlify.app/jar/custom_spider.jar;md5;e08d2ec17471fa6606811286d60a1087", "lives": [ { "name": "电视直播",