Merge pull request #191 from huankong233/dev

[*] 检查账户是否是企业账户
huankong233 · Aug 22, 2024 · f029c36 · f029c36
2 parents 7f35c51 + 5d117c6
commit f029c36
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/.env.example b/.env.example
@@ -23,7 +23,7 @@ MAIL_FROM_NAME=Example
 MAIL_TO_ADDRESS=hello@example.com
 MAIL_TO_NAME=Example
 
-_94LIST_VERSION=1.3.34
+_94LIST_VERSION=1.3.35
 _94LIST_SLEEP=3
 _94LIST_MAX_ONCE=20
 _94LIST_PASSWORD=""

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 2024
 
+### 08-22 v1.3.35
+
+- [*] 检查账户是否是企业账户
+
 ### 08-21 v1.3.34
 
 - [+] 增加新账号类型

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
@@ -123,6 +123,7 @@ public static function _getAccountItems($type, $cookie)
             }
 
             if (isset($response["errmsg"]) && $response["errmsg"] === "Invalid Bduss") return ResponseController::accountExpired();
+            if (!isset($response["data"][0]["cid"])) return ResponseController::accountIsNotEnterprise();
             $cid = $response["data"][0]["cid"];
         }
 

diff --git a/app/Http/Controllers/ResponseController.php b/app/Http/Controllers/ResponseController.php
@@ -373,4 +373,9 @@ public static function accountCanNotBeDeleted()
     {
         return self::response(10067, 500, "自带账户禁止删除");
     }
+
+    public static function accountIsNotEnterprise()
+    {
+        return self::response(10068, 500, "获取账户信息失败或账户非企业用户");
+    }
 }
diff --git a/config/94list.php b/config/94list.php
@@ -5,7 +5,7 @@
     "fake_wx_user_agent" => "Mozilla/5.0 (Linux; Android 7.1.1; MI 6 Build/NMF26X; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/57.0.2987.132 MQQBrowser/6.2 TBS/043807 Mobile Safari/537.36 MicroMessenger/6.6.1.1220(0x26060135) NetType/4G Language/zh_CN MicroMessenger/6.6.1.1220(0x26060135) NetType/4G Language/zh_CN miniProgram",
     "fake_cookie"        => "BAIDUID=A4FDFAE43DDBF7E6956B02F6EF715373:FG=1; BAIDUID_BFESS=A4FDFAE43DDBF7E6956B02F6EF715373:FG=1; newlogin=1",
 
-    "version"        => "1.3.34",
+    "version"        => "1.3.35",
     "sleep"          => (int)env("_94LIST_SLEEP", 3),
     "max_once"       => (int)env("_94LIST_MAX_ONCE", 20),
     "password"       => env("_94LIST_PASSWORD", ""),
-Original file line number
+Diff line change
@@ Expand Up / @@ -123,6 +123,7 @@ public static function _getAccountItems($type, $cookie) @@
                 }
                 if (isset($response["errmsg"]) && $response["errmsg"] === "Invalid Bduss") return ResponseController::accountExpired();
+                if (!isset($response["data"][0]["cid"])) return ResponseController::accountIsNotEnterprise();
                 $cid = $response["data"][0]["cid"];
             }
@@ Expand Down @@