edit

api/Manage.php → app/Api/Manage.php

@@ -11,9 +11,9 @@ class Manage extends Auth
             $array = explode(',', $key);
             $result['key']['set'] = [];
             foreach ($array as $k => $v) {
-                $value = Dever::db('spec_value', $project)->find($v);
+                $value = Dever::db($project . '/spec_value')->find($v);
                 if ($value) {
-                    $spec = Dever::db('spec', $project)->find($value['spec_id']);
+                    $spec = Dever::db($project . '/spec')->find($value['spec_id']);
                     $result['key']['set']['s_' . $spec['id']] = [$spec['name'], $value['value']];
                 }
             }
@@ -25,7 +25,7 @@ class Manage extends Auth
     public function getSettingName($value = false)
     {
         if ($value) {
-            $info = Dever::db('platform_setting', 'api')->find($value);
+            $info = Dever::db('api/platform_setting')->find($value);
             $result['key']['value'] = $info['key'];
             return $result;
         }
@@ -35,7 +35,7 @@ class Manage extends Auth
     public function getCertName($value = false)
     {
         if ($value) {
-            $info = Dever::db('platform_cert', 'api')->find($value);
+            $info = Dever::db('api/platform_cert')->find($value);
             $result['type']['value'] = $info['type'];
             return $result;
         }
@@ -47,7 +47,7 @@ class Manage extends Auth
         if ($value) {
             $where['platform_id'] = $value;
             $result['api_id']['value'] = '';
-            $result['api_id']['option'] = Dever::db('api', 'api')->select($where);
+            $result['api_id']['option'] = Dever::db('api/api')->select($where);
             return $result;
         }
     }
@@ -55,11 +55,11 @@ class Manage extends Auth
     # 根据应用获取平台
     public function getAppPlatform()
     {
-        return Dever::load('common', 'manage')->cascader(2, function($level, $parent) {
+        return Dever::load(\Manage\Lib\Util::class)->cascader(2, function($level, $parent) {
             if ($level == 1) {
-                $data = Dever::db('app', 'api')->select([]);
+                $data = Dever::db('api/app')->select([]);
             } elseif ($level == 2) {
-                $data = Dever::load('app', 'api')->getPlatform($parent);
+                $data = Dever::load(\Api\Lib\App::class)->getPlatform($parent);
             }
             return $data;
         });
@@ -70,10 +70,10 @@ class Manage extends Auth
     {
         $id = Dever::input('id');
         if ($id) {
-            $info = Dever::db('api', 'api')->find($id);
+            $info = Dever::db('api/api')->find($id);
             unset($info['id']);
             unset($info['cdate']);
-            Dever::db('api', 'api')->insert($info);
+            Dever::db('api/api')->insert($info);
         }
         return '复制成功';
     }

api/Notify.php → app/Api/Notify.php

@@ -48,7 +48,7 @@ class Notify extends Api
         if ($this->info['notify'] == 2) {
             $this->error('error');
         }
-        $this->notify = Dever::db('api_notify', 'api')->find(['api_id' => $api_id]);
+        $this->notify = Dever::db('api/api_notify')->find(['api_id' => $api_id]);
         if (!$this->notify) {
             $this->error('error');
         }
@@ -78,7 +78,7 @@ class Notify extends Api
 
     protected function body($body)
     {
-        $config = Dever::db('api_notify_body', 'api')->select(['api_id' => $this->info['id']]);
+        $config = Dever::db('api/api_notify_body')->select(['api_id' => $this->info['id']]);
         $result = Value::load($this->field)->get($config, $body);
         if ($result) {
             foreach ($config as $k => $v) {
@@ -94,7 +94,7 @@ class Notify extends Api
     protected function header()
     {
         $header = getallheaders();
-        $config = Dever::db('platform_response_header', 'api')->select(['platform_id' => $this->platform['id']]);
+        $config = Dever::db('api/platform_response_header')->select(['platform_id' => $this->platform['id']]);
         if ($config) {
             foreach ($config as $k => $v) {
                 if (isset($header[$v['value']])) {
@@ -103,7 +103,7 @@ class Notify extends Api
                 }
             }
         }
-        $config = Dever::db('api_response_header', 'api')->select(['api_id' => $this->info['id']]);
+        $config = Dever::db('api/api_response_header')->select(['api_id' => $this->info['id']]);
         if ($config) {
             foreach ($config as $k => $v) {
                 if (isset($header[$v['value']])) {
@@ -119,7 +119,7 @@ class Notify extends Api
         if (!$this->notify['sign_id']) {
             Dever::error('签名验证失败');
         }
-        $info = Dever::db('platform_sign', 'api')->find($this->notify['sign_id']);
+        $info = Dever::db('api/platform_sign')->find($this->notify['sign_id']);
         Sign::load($this->field, $info)->check($this->notify['sign_arg']);
     }
 
@@ -127,7 +127,7 @@ class Notify extends Api
     {
         # 1成功 2失败 3不做任何操作
         $status = 3;
-        $config = Dever::db('api_notify_code', 'api')->select(['api_id' => $this->info['id']]);
+        $config = Dever::db('api/api_notify_code')->select(['api_id' => $this->info['id']]);
         if ($config) {
             foreach ($config as $k => $v) {
                 if (isset($body[$v['key']]) && $body[$v['key']] == $v['value']) {

api/Oauth.php → app/Api/Oauth.php

@@ -22,24 +22,24 @@ class Oauth
                 'refer' => Secure::encode($refer),
             )
         ));
-        Dever::load('account', 'api')->run($this->account, 'oauth_code', $param, 1, 'jump');
+        Dever::load('api/account')->run($this->account, 'oauth_code', $param, 1, 'jump');
     }
 
     # 获取token
     public function token()
     {
         $param['code'] = Dever::input('code', 'is_string', 'code');
-        $data = Dever::load('account', 'api')->run($this->account, 'oauth_token', $param);
+        $data = Dever::load('api/account')->run($this->account, 'oauth_token', $param);
         if ($data && isset($data['openid'])) {
             if ($t = Secure::checkLogin($this->t)) {
                 if ($t['uid'] && $t['uid'] > 0) {
                     $update['uid'] = $t['uid'];
                     $update['account_id'] = $data['account_id'];
                     $update['env'] = 3;
-                    $info = Dever::db('openid', 'api')->find($update);
+                    $info = Dever::db('api/openid')->find($update);
                     if (!$info) {
                         $update['openid'] = $data['openid'];
-                        Dever::db('openid', 'api')->insert($update);
+                        Dever::db('api/openid')->insert($update);
                     }
                 }
             }
@@ -58,7 +58,7 @@ class Oauth
     {
         $param['access_token'] = $data['access_token'];
         $param['openid'] = $data['openid'];
-        $data = Dever::load('account', 'api')->run($this->account, 'oauth_user', $param);
+        $data = Dever::load('api/account')->run($this->account, 'oauth_user', $param);
         if ($data) {
             # 获取到用户了
         }

api/Task.php → app/Api/Task.php

@@ -7,12 +7,12 @@ class Task
     {
         $where['status'] = 1;
         $where['cron_time'] = ['>', '0'];
-        $data = Dever::db('app_func', 'api')->select($where);
+        $data = Dever::db('api/app_func')->select($where);
         if ($data) {
             foreach ($data as $k => $v) {
-                $account = Dever::db('account', 'api')->find(['app_id' => $v['app_id']]);
+                $account = Dever::db('api/account')->find(['app_id' => $v['app_id']]);
                 if ($account) {
-                    Dever::load('account', 'api')->run($account, $v);
+                    Dever::load('api/account')->run($account, $v);
                 }
             }
         }
@@ -24,6 +24,6 @@ class Task
     public function api()
     {
         $param = Dever::input();
-        return Dever::load('api', 'api')->run($param['api_id'], $param);
+        return Dever::load('api/api')->run($param['api_id'], $param);
     }
 }

lib/Account.php → app/Lib/Account.php

@@ -29,9 +29,9 @@ class Account
         } else {
             $where = ['key' => $account];
         }
-        $account = Dever::db('account', 'api')->find($where);
+        $account = Dever::db('api/account')->find($where);
         if ($project != 'api') {
-            $info = Dever::db('account', $project)->find(['key' => $account['key']]);
+            $info = Dever::db($project . '/account')->find(['key' => $account['key']]);
             if ($info) {
                 $info['app_id'] = $account['app_id'];
                 $info['platform_id'] = $account['platform_id'];
@@ -50,12 +50,12 @@ class Account
             Dever::error('账户无效');
         }
         if (!is_array($func)) {
-            $func = Dever::db('app_func', 'api')->find(['app_id' => $account['app_id'], 'key' => $func]);
+            $func = Dever::db('api/app_func')->find(['app_id' => $account['app_id'], 'key' => $func]);
         }
         if (!$func) {
             Dever::error('功能无效');
         }
-        $api = Dever::load('app', 'api')->getApi($func['id'], $env);
+        $api = Dever::load(App::class)->getApi($func['id'], $env);
         if (!$api) {
             Dever::error('接口无效');
         }
@@ -64,7 +64,7 @@ class Account
         $result = [];
         if ($func['type'] == 1) {
             # 仅执行第一个
-            $result = Dever::load('api', 'api')->$method($api[0], $param);
+            $result = Dever::load(Api::class)->$method($api[0], $param);
             if (is_array($result)) {
                 $result['account_id'] = $account['id'];
                 $result['api_id'] = $api[0]['id'];
@@ -72,7 +72,7 @@ class Account
         } elseif ($func['type'] == 2) {
             # 同步执行
             foreach ($api as $k => $v) {
-                $result = Dever::load('api', 'api')->$method($v, $param);
+                $result = Dever::load(Api::class)->$method($v, $param);
                 if ($result && is_array($result)) {
                     $param = array_merge($result, $param);
                 }

lib/App.php → app/Lib/App.php

@@ -4,18 +4,18 @@ class App
 {
     public function update($db, $data)
     {
-        $func = Dever::db('app_func_work', 'api')->select(['app_func_id' => $data['id']]);
+        $func = Dever::db('api/app_func_work')->select(['app_func_id' => $data['id']]);
         if ($func) {
             $platform = [];
-            Dever::db('app_platform', 'api')->delete(['app_id' => $data['app_id']]);
+            Dever::db('api/app_platform')->delete(['app_id' => $data['app_id']]);
             foreach ($func as $k => $v) {
-                $api = Dever::db('api', 'api')->find($v['api_id']);
+                $api = Dever::db('api/api')->find($v['api_id']);
                 if ($api) {
                     $platform[$api['platform_id']] = $api['platform_id'];
                 }
             }
             foreach ($platform as $k => $v) {
-                Dever::db('app_platform', 'api')->insert(['app_id' => $data['app_id'], 'platform_id' => $v]);
+                Dever::db('api/app_platform')->insert(['app_id' => $data['app_id'], 'platform_id' => $v]);
             }
         }
     }
@@ -37,23 +37,24 @@ class App
             ],
         ];
         $set['col'] = 't0.id as id,t0.name as name';
-        $platform = Dever::db('app_platform', 'api')->select(['app_id' => $app], $set);
+        $platform = Dever::db('api/app_platform')->select(['app_id' => $app], $set);
         return $platform;
     }
 
     public function getSetting($platform_id)
     {
-        return Dever::db('platform_setting', 'api')->select(['platform_id' => $platform_id]);
+        return Dever::db('api/platform_setting')->select(['platform_id' => $platform_id]);
     }
 
-    public function getCert($platform_id)
+    public function getCert($account_id)
     {
-        return Dever::db('platform_cert', 'api')->select(['platform_id' => $platform_id]);
+        $account = Dever::db('api/account')->find($account_id);
+        return Dever::db('api/platform_cert')->select(['platform_id' => $account['platform_id']]);
     }
 
     public function getCertName($id)
     {
-        $info = Dever::db('platform_cert', 'api')->find($id);
+        $info = Dever::db('api/platform_cert')->find($id);
         return $info['name'];
     }
 
@@ -73,13 +74,13 @@ class App
         if ($env) {
             $where['t0.env'] = $env;
         }
-        return Dever::db('app_func_work', 'api')->select($where, $set);
+        return Dever::db('api/app_func_work')->select($where, $set);
     }
 
     public function getAppPlatform($app_id, $platform_id)
     {
-        $app = Dever::db('app', 'api')->find($app_id);
-        $platform = Dever::db('platform', 'api')->find($platform_id);
+        $app = Dever::db('api/app')->find($app_id);
+        $platform = Dever::db('api/platform')->find($platform_id);
         return $app['name'] . '-' . $platform['name'];
     }
 }

app/Lib/Cert.php

@@ -0,0 +1,30 @@
+<?php namespace Api\Lib;
+use Dever;
+class Cert
+{
+    # 获取证书列表
+    public function list($platform_id)
+    {
+        return Dever::db("api/platform_cert")->select(["platform_id" => $platform_id]);
+    }
+
+    # 获取加密列表
+    public function getEncrypt($platform_id)
+    {
+        $encrypt = [
+            -1 => '无需加密',
+            -2 => 'md5',
+            -3 => 'sha256',
+            -4 => 'sha1',
+        ];
+        if ($platform_id) {
+            $info = Dever::db('api/platform_ssl')->select(['platform_id' => $platform_id]);
+            if ($info) {
+                foreach ($info as $k => $v) {
+                    $encrypt[$v['id']] = $v['name'];
+                }
+            }
+        }
+        return $encrypt;
+    }
+}

lib/Platform.php → app/Lib/Platform.php

@@ -20,7 +20,7 @@ class Platform
 
     protected function info($id)
     {
-        $this->info = is_array($id) ? $id : Dever::db($this->type, 'api')->find($id);
+        $this->info = is_array($id) ? $id : Dever::db('api/' . $this->type)->find($id);
         if (!$this->info) {
             Dever::error('info error');
         }
@@ -28,7 +28,7 @@ class Platform
 
     protected function platform()
     {
-        $this->platform = Dever::db('platform', 'api')->find($this->info['platform_id']);
+        $this->platform = Dever::db('api/platform')->find($this->info['platform_id']);
         if (!$this->platform) {
             Dever::error('platform error');
         }
@@ -46,10 +46,10 @@ class Platform
         if (isset($field['account_project']) && isset($field['account_id'])) {
             $this->info['account_id'] = $field['account_id'];
             $this->info['account_project'] = $field['account_project'];
-            $setting = Dever::db('account_setting', $field['account_project'])->select(['account_id' => $field['account_id']]);
+            $setting = Dever::db($field['account_project'] . '/account_setting')->select(['account_id' => $field['account_id']]);
             if ($setting) {
                 foreach ($setting as $k => $v) {
-                    $info = Dever::db('platform_setting', 'api')->find($v['platform_setting_id']);
+                    $info = Dever::db('api/platform_setting')->find($v['platform_setting_id']);
                     if ($info) {
                         $v['key'] = $info['key'];
                         if (isset($field[$v['key']])) {
@@ -73,7 +73,7 @@ class Platform
         $this->field->setUri($this->info['uri']);
         $this->field->setNotify($this->createNotify($field));
 
-        $setting = Dever::db('api_setting', 'api')->select(['api_id' => $this->info['id']]);
+        $setting = Dever::db('api/api_setting')->select(['api_id' => $this->info['id']]);
         if ($setting) {
             foreach ($setting as $k => $v) {
                 $this->field->set($v['key'], $this->field->value($v['value'], $v['type']));
@@ -114,7 +114,7 @@ class Platform
         $log['response_body'] = $response_body;
         $log['response_header'] = $response_header;
         $log['data'] = $result;
-        Dever::db('api_log', 'api')->update($log['request_id'], $log);
+        Dever::db('api/api_log')->update($log['request_id'], $log);
         if ($this->field->log) {
             Dever::log($log, 'api');
             Dever::debug($log, 'api');
@@ -159,7 +159,7 @@ class Platform
         if (strstr($this->info['uri'], 'http')) {
             $this->platform['host'] = '';
         }
-        $path = Dever::db('api_path', 'api')->select(['api_id' => $this->info['id']]);
+        $path = Dever::db('api/api_path')->select(['api_id' => $this->info['id']]);
         if ($path) {
             $path = [];
             foreach ($path as $k => $v) {
@@ -179,7 +179,7 @@ class Platform
             }
         }
 
-        $query = Dever::db('api_query', 'api')->select(['api_id' => $this->info['id']]);
+        $query = Dever::db('api/api_query')->select(['api_id' => $this->info['id']]);
         if ($query) {
             $param = [];
             foreach ($query as $k => $v) {

lib/Platform/Field.php → app/Lib/Platform/Field.php

@@ -39,7 +39,7 @@ class Field
 
     public function createRequestId()
     {
-        $value = Dever::db('api_log', 'api')->insert([]);
+        $value = Dever::db('api/api_log')->insert([]);
         $this->set('request_id', $value);
     }
 
@@ -125,18 +125,18 @@ class Field
         }
         if (!$type && $source == $value) {
             /*
-            $field = Dever::db('platform_field', 'api')->find(['platform_id' => $this->data['platform_id'], 'key' => $value]);
+            $field = Dever::db('api/platform_field')->find(['platform_id' => $this->data['platform_id'], 'key' => $value]);
             if ($field) {
                 $value = $field['value'];
                 $type = $field['type'];
             } else {
-                $sign = Dever::db('platform_sign', 'api')->find(['platform_id' => $this->data['platform_id'], 'name' => $value]);
+                $sign = Dever::db('api/platform_sign')->find(['platform_id' => $this->data['platform_id'], 'name' => $value]);
                 if ($sign) {
                     $value = '';
                     $type = '3,' . $sign['id'];
                 }
             }*/
-            $sign = Dever::db('platform_sign', 'api')->find(['platform_id' => $this->data['platform_id'], 'name' => $value]);
+            $sign = Dever::db('api/platform_sign')->find(['platform_id' => $this->data['platform_id'], 'name' => $value]);
             if ($sign) {
                 $value = '';
                 $type = '3,' . $sign['id'];
@@ -172,7 +172,7 @@ class Field
         if (strpos($type, ',')) {
             list($type, $type_id) = explode(',', $type);
             if ($type == 1) {
-                $info = Dever::db('format', 'api')->find($type_id);
+                $info = Dever::db('api/format')->find($type_id);
                 if ($info) {
                     $value = \Dever\Helper\Str::val($info['method'], ['value' => $value]);
                 }
@@ -184,7 +184,7 @@ class Field
                     $value = $this->ssl->decrypt($type_id, $value);
                 }
             } elseif ($type == 3) {
-                $info = Dever::db('platform_sign', 'api')->find($type_id);
+                $info = Dever::db('api/platform_sign')->find($type_id);
                 if ($info) {
                     if ($value) {
                         $info['arg'] = $value;

lib/Platform/Response.php → app/Lib/Platform/Response.php

@@ -25,9 +25,9 @@ class Response
 
     public function header()
     {
-        $header = Dever::db($this->type . '_response_header', 'api')->select([$this->type . '_id' => $this->type_id]);
+        $header = Dever::db('api/' . $this->type . '_response_header')->select([$this->type . '_id' => $this->type_id]);
         if (!$header) {
-            $header = Dever::db('platform_response_header', 'api')->select(['platform_id' => $this->config['id']]);
+            $header = Dever::db('api/platform_response_header')->select(['platform_id' => $this->config['id']]);
         }
         if ($header) {
             foreach ($header as $k => $v) {
@@ -79,7 +79,7 @@ class Response
     {
         $msg = '';
         $status = 1;
-        $code = Dever::db('platform_response_code', 'api')->select(['platform_id' => $this->config['id']]);
+        $code = Dever::db('api/platform_response_code')->select(['platform_id' => $this->config['id']]);
         if ($code) {
             foreach ($code as $k => $v) {
                 if (isset($data[$v['key']]) && $data[$v['key']] == $v['value']) {
@@ -100,9 +100,9 @@ class Response
     protected function handle($data)
     {
         $result = [];
-        $body = Dever::db($this->type . '_response_body', 'api')->select([$this->type . '_id' => $this->type_id]);
+        $body = Dever::db('api/' . $this->type . '_response_body')->select([$this->type . '_id' => $this->type_id]);
         if (!$body) {
-            $body = Dever::db('platform_response_body', 'api')->select(['platform_id' => $this->config['id']]);
+            $body = Dever::db('api/platform_response_body')->select(['platform_id' => $this->config['id']]);
         }
         $value = Value::load($this->field);
         $result = $value->get($body, $data);
@@ -112,7 +112,7 @@ class Response
 
     protected function save($value, $data)
     {
-        $save = Dever::db($this->type . '_save', 'api')->select([$this->type . '_id' => $this->type_id]);
+        $save = Dever::db('api/' . $this->type . '_save')->select([$this->type . '_id' => $this->type_id]);
         if ($save) {
             $table = [];
             foreach ($save as $k => $v) {

lib/Platform/Sign.php → app/Lib/Platform/Sign.php

@@ -2,14 +2,9 @@
 use Dever;
 class Sign
 {
-    protected static $load;
     public static function load($field, $config)
     {
-        $key = $config['id'];
-        if (empty(self::$load[$key])) {
-            self::$load[$key] = new self($field, $config);
-        }
-        return self::$load[$key];
+        return new self($field, $config);
     }
 
     public function __construct($field, $config)

lib/Platform/Value.php → app/Lib/Platform/Value.php

@@ -2,13 +2,9 @@
 use Dever;
 class Value
 {
-    protected static $load;
     public static function load($field)
     {
-        if (empty(self::$load)) {
-            self::$load = new self($field);
-        }
-        return self::$load;
+        return new self($field);
     }
 
     public function __construct($field)

lib/Sku.php → app/Lib/Sku.php

@@ -8,9 +8,9 @@ class Sku
         $result = [];
         if ($spec_type == 2) {
             $where['key'] = '-1';
-            $sku = Dever::db('sku', $app)->find($where);
+            $sku = Dever::db($app . '/sku')->find($where);
         } elseif ($spec_type == 3) {
-            $sku = Dever::db('sku', $app)->find($where, ['order' => 'price asc']);
+            $sku = Dever::db($app . '/sku')->find($where, ['order' => 'price asc']);
         }
         if (isset($sku) && $sku && $sku['key']) {
             $result['price'] = $sku['price'];
@@ -30,12 +30,12 @@ class Sku
     public function getInfo($where, $app)
     {
         $where['state'] = 1;
-        $info = Dever::db('sku', $app)->find($where);
+        $info = Dever::db($app . '/sku')->find($where);
         if ($info) {
             $info['name'] = $this->getName($info['key'], $app);
             if (!$info['pic']) {
                 $key = explode(',', $info['key']);
-                $value = Dever::db('spec_value', $app)->find($key[0], ['col' => 'id,value,pic']);
+                $value = Dever::db($app . '/spec_value')->find($key[0], ['col' => 'id,value,pic']);
                 if ($value && $value['pic']) {
                     $info['pic'] = $value['pic'];
                 }
@@ -49,7 +49,7 @@ class Sku
     {
         $result = [];
         $where['state'] = 1;
-        $sku = Dever::db('sku', $app)->select($where);
+        $sku = Dever::db($app . '/sku')->select($where);
         if ($sku) {
             $spec = [];
             $result['info'] = [];
@@ -64,7 +64,7 @@ class Sku
                     $spec = explode(',', $v['key']);
                 }
             }
-            $result['spec'] = Dever::load('spec', 'api')->getList($where, $app, $spec);
+            $result['spec'] = Dever::load(Spec::class)->getList($where, $app, $spec);
         }
         return $result;
     }
@@ -77,10 +77,10 @@ class Sku
         } else {
             $name = [];
             $where['id'] = ['in', $key];
-            $data = Dever::db('spec_value', $app)->select($where, array('order' => 'field(id, '.$key.')'));
+            $data = Dever::db($app . '/spec_value')->select($where, array('order' => 'field(id, '.$key.')'));
             if ($data) {
                 foreach ($data as $k => $v) {
-                    $info = Dever::db('spec', $app)->find($v['spec_id']);
+                    $info = Dever::db($app . '/spec')->find($v['spec_id']);
                     if ($show) {
                         $name[] = $info['name'] . ':' . $v['value'];
                     } else {

lib/Spec.php → app/Lib/Spec.php

@@ -39,13 +39,13 @@ class Spec
     public function getList($where, $app, $select = false)
     {
         $where['state'] = 1;
-        $data = Dever::db('spec', $app)->select($where, ['col' => 'id,name']);
+        $data = Dever::db($app . '/spec')->select($where, ['col' => 'id,name']);
         if ($data) {
             foreach ($data as &$v) {
                 $w = $where;
                 $w['spec_id'] = $v['id'];
                 unset($v['id']);
-                $v['value'] = Dever::db('spec_value', $app)->select($w, ['col' => 'id,value,pic']);
+                $v['value'] = Dever::db($app . '/spec_value')->select($w, ['col' => 'id,value,pic']);
                 if ($select) {
                     foreach ($v['value'] as &$v1) {
                         $v1['selected'] = false;

lib/Util.php → app/Lib/Util.php

@@ -17,8 +17,8 @@ class Util
     # 获取某个setting值
     public function setting($key, $account, $project = 'api')
     {
-        $setting = Dever::db('platform_setting', 'api')->find(['key' => $key]);
-        $setting = Dever::db('account_setting', $project)->find(['account_id' => $account, 'platform_setting_id' => $setting['id']]);
+        $setting = Dever::db('api/platform_setting')->find(['key' => $key]);
+        $setting = Dever::db($project . '/account_setting')->find(['account_id' => $account, 'platform_setting_id' => $setting['id']]);
         $value = $setting['value'] ?? 0;
         return $value;
     }
@@ -26,13 +26,14 @@ class Util
     # 获取openid 仅jspai和小程序需要openid
     public function openid($account, $env, $uid, $result = [], $project = 'api')
     {
-        $account = Dever::load('account', 'api')->get($account, $project);
+        $account = Dever::load(Account::class)->get($account, $project);
         if ($account) {
-            $info = Dever::db('openid', 'api')->find(['account_id' => $account['id'], 'uid' => $uid, 'env' => $env]);
+            $info = Dever::db('api/openid')->find(['account_id' => $account['id'], 'uid' => $uid, 'env' => $env]);
             if ($info) {
                 $result['openid'] = $info['openid'];
             } else {
-                if ($env == 3) {
+                # 这里需要修改
+                if ($env == 3 || $env == 2) {
                     # jsapi 一般需要oauth授权
                     if (empty($result['t'])) {
                         $result['t'] = \Dever\Helper\Secure::login($uid);
@@ -42,14 +43,14 @@ class Util
                 } elseif ($env == 5) {
                     # 小程序
                     $param['js_code'] = Dever::input('applet_code', 'is_string', '登录信息');
-                    $data = Dever::load('account', 'api')->run($account, 'applet_login', $param, $env, 'run', $project);
+                    $data = Dever::load(Account::class)->run($account, 'applet_login', $param, $env, 'run', $project);
                     if (isset($data['openid'])) {
                         $result['openid'] = $data['openid'];
                         $update['uid'] = $uid;
                         $update['account_id'] = $account['id'];
                         $update['env'] = $env;
                         $update['openid'] = $data['openid'];
-                        Dever::db('openid', 'api')->insert($update);
+                        Dever::db('api/openid')->insert($update);
                     }
                 }
             }
@@ -60,7 +61,7 @@ class Util
     # 获取token
     public function token($account, $env, $project = 'api')
     {
-        $account = Dever::load('account', 'api')->get($account, $project);
+        $account = Dever::load(Account::clas)->get($account, $project);
         $result = '';
         if ($env == 5) {
             $appid = 'applet_appid';
@@ -70,19 +71,19 @@ class Util
         $secret = $this->setting($secret, $account['id'], $project);
         if ($account && $appid && $secret) {
             $param = ['appid' => $appid, 'appsecret' => $secret];
-            $info = Dever::db('token', 'api')->find($param);
+            $info = Dever::db('api/token')->find($param);
             if ($info && time() <= $info['edate']) {
                 $result = $info['token'];
             } else {
-                $data = Dever::load('account', 'api')->run($account, 'access_token', $param, 1, 'run', $project);
+                $data = Dever::load(Account::clas)->run($account, 'access_token', $param, 1, 'run', $project);
                 if (isset($data['access_token'])) {
                     $result = $data['access_token'];
                     $param['token'] = $result;
                     $param['edate'] = time() + $data['expires_in'];
                     if ($info) {
-                        Dever::db('token', 'api')->update($info['id'], $param);
+                        Dever::db('api/token')->update($info['id'], $param);
                     } else {
-                        Dever::db('token', 'api')->insert($param);
+                        Dever::db('api/token')->insert($param);
                     }
                 }
             }
@@ -98,7 +99,7 @@ class Util
         (
             'id' => 1,
             'name' => '格式转换',
-            'children' => Dever::db('format', 'api')->select([]),
+            'children' => Dever::db('api/format')->select([]),
         );
 
         $where = ['platform_id' => $platform_id];
@@ -107,14 +108,14 @@ class Util
         (
             'id' => 2,
             'name' => '加密',
-            'children' => Dever::db('platform_ssl', 'api')->select($where),
+            'children' => Dever::db('api/platform_ssl')->select($where),
         );
 
         $data[] = array
         (
             'id' => 3,
             'name' => '签名',
-            'children' => Dever::db('platform_sign', 'api')->select($where),
+            'children' => Dever::db('api/platform_sign')->select($where),
         );
         return $data;
     }
@@ -122,15 +123,15 @@ class Util
     # 获取签名列表
     public function getPlatformSign($platform_id)
     {
-        return Dever::db('platform_sign', 'api')->select(['platform_id' => $platform_id]);
+        return Dever::db('api/platform_sign')->select(['platform_id' => $platform_id]);
     }
 
     # 格式转换
     public function format($id, $value)
     {
-        $info = Dever::db('format', 'api')->find($id);
+        $info = Dever::db('api/format')->find($id);
         if ($info) {
-            //$info['method'] = str_replace('{value}', "'{value}'", $info['method']);
+            $info['method'] = str_replace('{value}', "'{value}'", $info['method']);
             $value = \Dever\Helper\Str::val($info['method'], ['value' => $value]);
         }
         return $value;

index.php

@@ -1,5 +1,5 @@
 <?php
-define('DEVER_APP_NAME', 'api');
+define('DEVER_APP_NAME', 'Api');
 define('DEVER_APP_LANG', '接口管理');
 define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 include(DEVER_APP_PATH . '../../boot.php');

lib/Cert.php

@@ -1,10 +0,0 @@
-<?php namespace Api\Lib;
-use Dever;
-class Cert
-{
-    # 获取证书列表
-    public function list($platform_id)
-    {
-        return Dever::db("api/platform_cert")->select(["platform_id" => $platform_id]);
-    }
-}

manage/Api/Platform.php

@@ -0,0 +1,9 @@
+<?php namespace Api\Manage\Api;
+use Dever;
+class Platform
+{
+    public function test()
+    {
+        return 122;
+    }
+}

manage/Lib/Platform.php

@@ -0,0 +1,9 @@
+<?php namespace Api\Manage\Lib;
+use Dever;
+class Platform
+{
+    public function getId()
+    {
+        return Dever::load(\Manage\Lib\Util::class)->request('platform_id', 'id');
+    }
+}

manage/account.php

@@ -3,8 +3,8 @@ $account_id = Dever::input('id');
 $show = false;
 $account_setting = [];
 if ($account_id) {
-    $account = Dever::db('account', 'api')->find($account_id);
-    $setting = Dever::db('platform_setting', 'api')->select(['platform_id' => $account['platform_id']]);
+    $account = Dever::db('api/account')->find($account_id);
+    $setting = Dever::db('api/platform_setting')->select(['platform_id' => $account['platform_id']]);
     if ($setting) {
         $show = true;
         foreach ($setting as $k => $v) {
@@ -20,10 +20,10 @@ return [
             'name',
             'key',
             'app_id' => [
-                'show' => 'Dever::call("api/app-find", "{app_id}")["name"]',
+                'show' => 'Dever::db("api/app")->find("{app_id}")["name"]',
             ],
             'platform_id' => [
-                'show' => 'Dever::call("api/platform-find", "{platform_id}")["name"]',
+                'show' => 'Dever::db("api/platform")->find("{platform_id}")["name"]',
             ],
             'cdate',
         ],
@@ -44,7 +44,7 @@ return [
             'key',
             'app_platform' => [
                 'type' => 'cascader',
-                'remote'    => 'api/manage.getAppPlatform',
+                'remote'    => 'Api/Api/Manage.getAppPlatform',
             ],
         ],
     ],
@@ -58,13 +58,13 @@ return [
                 'desc' => '【提交后不能更改】',
                 'rules' => true,
                 'type' => 'cascader',
-                'remote'    => 'api/manage.getAppPlatform',
+                'remote'    => 'Api/Api/Manage.getAppPlatform',
                 'remote_default' => false,
             ],
             'app_platform_name' => [
                 'name' => '平台与应用',
                 'type' => 'show',
-                'default' => 'Dever::call("api/app.getAppPlatform", ["{app_id}", "{platform_id}"])',
+                'default' => 'Dever::call("Api/Lib/App.getAppPlatform", ["{app_id}", "{platform_id}"])',
             ],
             'api/account_setting' => [
                 'show' => $show,
@@ -85,6 +85,6 @@ return [
             ],
         ],
         'check' => 'key',
-        'start' => ['manage/util.updateKey', 'api/account.update'],
+        'start' => ['Manage/Lib/Util.updateKey', 'Api/Lib/Account.update'],
     ],
 ];

manage/account_cert.php

@@ -1,25 +1,20 @@
 <?php
-$account_id = Dever::input('set')['account_id'] ?? 0;
-if (!$account_id) {
-    $account_id = Dever::input('field')['account_id'] ?? 0;
-}
-$account = Dever::db('account', 'api')->find($account_id);
 return [
     'list' => [
-        'where' => ['account_id' => $account_id],
+        'where' => ['account_id'],
         'field'      => [
             'id',
             'platform_cert_id' => [
-                'show' => 'Dever::call("api/app.getCertName", "{platform_cert_id}")',
+                'show' => 'Dever::call("Api/Lib/App.getCertName", "{platform_cert_id}")',
             ],
             'number',
             'cdate',
         ],
         'data_button' => [
-            '编辑' => ['fastedit', ['account_id' => $account_id]],
+            '编辑' => ['fastedit'],
         ],
         'button' => [
-            '新增' => ['fastadd', ['account_id' => $account_id]],
+            '新增' => ['fastadd'],
         ],
         'search' => [
             'account_id' => 'hidden',
@@ -33,7 +28,9 @@ return [
             'platform_cert_id' => [
                 'rules' => true,
                 'type' => 'select',
-                'option'     => 'Dever::call("api/app.getCert", '.$account['platform_id'].')',
+                //'option'     => 'Dever::call("Api/Lib/App.getCert", '.$account['platform_id'].')',
+
+                'option'     => 'Dever::call("Api/Lib/App.getCert", "{account_id}")',
                 //'remote' => 'api/manage.getCertName',
                 //'remote_default' => false,
             ],

manage/account_setting.php

@@ -1,6 +1,4 @@
 <?php
-$account_id = Dever::input('id');
-$account = Dever::db('account', 'api')->find($account_id);
 return [
     'update' => [
         'field'    => [
@@ -8,7 +6,7 @@ return [
             'platform_setting_name' => [
                 'name' => '参数名',
                 'type' => 'show',
-                'default' => 'Dever::call("api/platform_setting-find", "{platform_setting_id}")["name"]',
+                'default' => 'Dever::db("api/platform_setting")->find("{platform_setting_id}")["name"]',
                 //'disable' => true,
                 //'option'     => 'Dever::call("api/app.getSetting", '.$account['platform_id'].')',
                 //'remote' => 'api/manage.getSettingName',

manage/api.php

@@ -1,12 +1,8 @@
 <?php
-$platform_id = Dever::input('set')['platform_id'] ?? 0;
-if (!$platform_id) {
-    $platform_id = Dever::input('field')['platform_id'] ?? 0;
-}
 $platform = include('platform.php');
 $config = [
     'list' => [
-        'where' => ['platform_id' => $platform_id],
+        'where' => ['platform_id'],
         'field'      => [
             //'id',
             'sort' => 'input',
@@ -22,25 +18,21 @@ $config = [
             ],
         ],
         'data_button' => [
-            '设置' => ['edit', ['platform_id' => $platform_id]],
+            '设置' => ['edit'],
             //'删除' => 'delete',
             '复制' => ['api', 'api/manage.copyApi'],
         ],
         'button' => [
-            '新增' => ['fastadd', ['platform_id' => $platform_id, 'field' => 'name,env,platform_id,uri']],
+            '新增' => ['fastadd', ['field' => 'name,env,platform_id,uri']],
         ],
         'search' => [
-            'platform_id' => [
-                'type' => 'hidden',
-                'default' => $platform_id,
-            ],
             'name',
             'uri',
             'status',
         ],
     ],
     'update' => [
-        'end' => 'api/app.updateApi',
+        'end' => 'Api/Lib/App.updateApi',
         'desc' => $platform['update']['desc'],
         'tab' => [
             '基本设置' => 'name,env,api/api_setting',

manage/api_notify.php

@@ -8,7 +8,7 @@ return [
         'field'    => [
             'sign_id' => [
                 'type' => 'select',
-                'option'     => 'Dever::call("api/util.getPlatformSign", '.$platform_id.')',
+                'option'     => 'Dever::call("Api/Lib/Util.getPlatformSign", '.$platform_id.')',
                 'clearable' => true,
                 'default' => '',
             ],

manage/app_func.php

@@ -1,8 +1,7 @@
 <?php
-$app_id = Dever::input('set')['app_id'] ?? 0;
 return [
     'list' => [
-        'where' => ['app_id' => $app_id],
+        'where' => ['app_id'],
         'field'      => [
             'id',
             'name',
@@ -17,10 +16,10 @@ return [
             'cdate',
         ],
         'data_button' => [
-            '编辑' => ['edit', ['app_id' => $app_id]],
+            '编辑' => ['edit'],
         ],
         'button' => [
-            '新增' => ['add', ['app_id' => $app_id]],
+            '新增' => ['add'],
         ],
         'search' => [
             'app_id' => 'hidden',
@@ -30,7 +29,7 @@ return [
         ],
     ],
     'update' => [
-        'end' => 'api/app.update',
+        'end' => 'Api/Lib/App.update',
         'tab' => [
             '基本设置' => 'app_id,name,key,desc,cron_date,cron_time',
             '接口设置' => 'type,api/app_func_work',
@@ -90,7 +89,7 @@ return [
                 # 设置规格表关联字段
                 'spec_field' => 'app_func_id',
                 # 获取规格数据的接口
-                'spec_data' => 'api/spec.manage',
+                'spec_data' => 'Api/Lib/Spec.manage',
             ],
 
             'api/app_func_input' => [

manage/app_func_work.php

@@ -5,7 +5,7 @@ return [
             'platform_id' => [
                 'rules' => true,
                 'type' => 'select',
-                'remote'    => 'api/manage.getApi',
+                'remote'    => 'Api/Api/Manage.getApi',
                 # 无需默认值
                 'remote_default' => false,
             ],

manage/platform_request_body.php

@@ -1,14 +1,11 @@
 <?php
-$platform_id = Dever::input('set')['platform_id'] ?? 0;
-if (!$platform_id) {
-    $platform_id = Dever::input('field')['platform_id'] ?? 0;
-}
-if (!$platform_id) {
-    $platform_id = Dever::input('id');
-}
 return [
     'update' => [
         'field'    => [
+            'platform_id' => [
+                'type' => 'hidden',
+                'default' => 'Dever::call("Api/Manage/Lib/Platform.getId")',
+            ],
             'key' => [
                 'type' => 'textarea',
                 'autosize' => ['minRows' => 2],
@@ -19,7 +16,7 @@ return [
             ],
             'type' => [
                 'type' => 'cascader',
-                'option'    => 'Dever::call("api/util.fieldType", '.$platform_id.')',
+                'option'    => 'Dever::call("Api/Lib/Util.fieldType", "{platform_id}")',
                 'clearable' => true,
             ],
         ],

manage/platform_sign.php

@@ -1,26 +1,8 @@
 <?php
 $platform = include('platform.php');
-$encrypt = [
-    -1 => '无需加密',
-    -2 => 'md5',
-    -3 => 'sha256',
-    -4 => 'sha1',
-];
-$platform_id = Dever::input('set')['platform_id'] ?? 0;
-if (!$platform_id) {
-    $platform_id = Dever::input('field')['platform_id'] ?? 0;
-}
-if ($platform_id) {
-    $info = Dever::db('platform_ssl', 'api')->select(['platform_id' => $platform_id]);
-    if ($info) {
-        foreach ($info as $k => $v) {
-            $encrypt[$v['id']] = $v['name'];
-        }
-    }
-}
 return [
     'list' => [
-        'where' => ['platform_id' => $platform_id],
+        'where' => ['platform_id'],
         'field'      => [
             'id',
             'name',
@@ -28,14 +10,13 @@ return [
             'cdate',
         ],
         'data_button' => [
-            '编辑' => ['edit', ['platform_id' => $platform_id]],
+            '编辑' => ['edit'],
             '删除' => 'delete',
         ],
         'button' => [
-            '新增' => ['add', ['platform_id' => $platform_id]],
+            '新增' => ['add'],
         ],
         'search' => [
-            'platform_id' => 'hidden',
             'name',
         ],
     ],
@@ -46,9 +27,7 @@ return [
             '键名键值设置' => 'kv_type,kv_sort,kv_value_empty,kv_key_handle,kv_value_handle,kv_join,kv_join_handle',
         ],
         'field'    => [
-            'platform_id' => [
-                'default' => $platform_id,
-            ],
+            'platform_id' => 'hidden',
             'name' => [
                 'desc' => '填写后，以{签名名称}形式调用',
             ],
@@ -59,7 +38,7 @@ return [
             ],
             'encrypt' => [
                 'type' => 'radio',
-                'option' => $encrypt,
+                'option'     => 'Dever::call("Api/Lib/Cert.getEncrypt", "{platform_id}")',
             ],
             'after' => [
                 'type' => 'select',

manage/platform_ssl.php

@@ -1,11 +1,7 @@
 <?php
-$platform_id = Dever::input('set')['platform_id'] ?? 0;
-if (!$platform_id) {
-    $platform_id = Dever::input('field')['platform_id'] ?? 0;
-}
 return [
     'list' => [
-        'where' => ['platform_id' => $platform_id],
+        'where' => ['platform_id'],
         'field'      => [
             'id',
             'name',
@@ -13,10 +9,10 @@ return [
             'cdate',
         ],
         'data_button' => [
-            '编辑' => ['fastedit', ['platform_id' => $platform_id]],
+            '编辑' => ['fastedit'],
         ],
         'button' => [
-            '新增' => ['fastadd', ['platform_id' => $platform_id]],
+            '新增' => ['fastadd'],
         ],
         'search' => [
             'platform_id' => 'hidden',
@@ -60,7 +56,7 @@ return [
             'encrypt_cert_id' => [
                 'type' => 'select',
                 'clearable' => true,
-                'option'     => 'Dever::call("api/cert.list", ['.$platform_id.'])',
+                'option'     => 'Dever::call("Api/Lib/Cert.list", "{platform_id}")',
             ],
 
             'decrypt_cert_type' => 'radio',
@@ -71,7 +67,7 @@ return [
             'decrypt_cert_id' => [
                 'type' => 'select',
                 'clearable' => true,
-                'option'     => 'Dever::call("api/cert.list", ['.$platform_id.'])',
+                'option'     => 'Dever::call("Api/Lib/Cert.list", "{platform_id}"))',
             ],
         ],
 

manage/sku.php

@@ -4,7 +4,7 @@ return [
         'field'    => [
             'key' => [
                 'type' => 'hidden',
-                'remote' => 'api/manage.keyToField?project=api',
+                'remote' => 'Api/Api/Manage.keyToField?project=api',
             ],
             'price' => [
                 'type' => 'text',

table/api_log.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => 'api日志',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'store' => 'log',
     'struct' => [
         'platform_id' => [

table/openid.php

@@ -1,7 +1,7 @@
 <?php
 return [
     'name' => 'openid表',
-    'partition' => 'Dever::call("manage/util.system")',
+    'partition' => 'Dever::call("Manage/Lib/Util.system")',
     'struct' => [
         'account_id'        => [
             'type'      => 'int(11)',