rabin 1 день назад
Родитель
Сommit
6e4756e62d
2 измененных файлов с 8 добавлено и 16 удалено
  1. 0 15
      app/Lib/Account.php
  2. 8 1
      app/Lib/App.php

+ 0 - 15
app/Lib/Account.php

@@ -29,20 +29,6 @@ class Account
         } else {
             $where = ['key' => $account];
         }
-        $account = Dever::db($project . '/account')->find($where);
-        if (!$account) {
-            Dever::error('账户无效');
-        }
-        if ($project != 'api') {
-            $info = Dever::db('api/account')->find(['key' => $account['key']]);
-            if (!$info) {
-                Dever::error('账户无效');
-            }
-            $account['app_id'] = $info['app_id'];
-            $account['platform_id'] = $info['platform_id'];
-        }
-        return $account;
-        /*
         $account = Dever::db('api/account')->find($where);
         if ($project != 'api') {
             $info = Dever::db($project . '/account')->find(['key' => $account['key']]);
@@ -55,7 +41,6 @@ class Account
             }
         }
         return $account;
-        */
     }
 
     public function run($account, $func, $param = [], $env = 1, $method = 'run', $project = 'api')

+ 8 - 1
app/Lib/App.php

@@ -48,7 +48,14 @@ class App
 
     public function getCert($account_id, $project = 'api')
     {
-        $account = Dever::load(Account::class)->get($account_id, $project);
+        if ($project) {
+            $account = Dever::db($project . '/account')->find($account_id);
+            if ($account) {
+                $account = Dever::db('api/account')->find(['key' => $account['key']]);
+            }
+        } else {
+            $account = Dever::db('api/account')->find($account_id);
+        }
         return Dever::db('api/platform_cert')->select(['platform_id' => $account['platform_id']]);
     }