as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

modify

Browse Source
This commit is contained in:
as2252258@163.com
2021-04-04 03:01:12 +08:00
parent 59a8974672
commit c7e059f104
14 changed files with 1230 additions and 1230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Database/DatabasesProviders.php
+2 -2
View File
@@ -71,7 +71,7 @@ class DatabasesProviders extends Providers
*/ */
public function createPool() public function createPool()
{ {
$databases = Config::get('databases', false, []); $databases = Config::get('databases', []);
if (empty($databases)) { if (empty($databases)) {
return; return;
} }
@@ -101,7 +101,7 @@ class DatabasesProviders extends Providers
*/ */
public function getConfig($name): mixed public function getConfig($name): mixed
{ {
return Config::get('databases.' . $name, true); return Config::get('databases.' . $name,null, true);
} }
HttpServer/Abstracts/Callback.php
+2 -2
View File
@@ -108,7 +108,7 @@ abstract class Callback extends HttpService
protected function system_mail($message) protected function system_mail($message)
{ {
try { try {
if (!Config::get('email.enable', false, false)) { if (!Config::get('email.enable', false)) {
return; return;
} }
$mail = $this->createEmail(); $mail = $this->createEmail();
@@ -137,7 +137,7 @@ abstract class Callback extends HttpService
*/ */
protected function clearMysqlClient() protected function clearMysqlClient()
{ {
$databases = Config::get('databases', false, []); $databases = Config::get('databases', []);
if (empty($databases)) { if (empty($databases)) {
return; return;
} }
HttpServer/Http/Request.php
+1 -1
View File
@@ -535,7 +535,7 @@ class Request extends HttpService
$port = $sRequest->clientInfo['server_port']; $port = $sRequest->clientInfo['server_port'];
$rpc = Config::get('rpc.port', false, []); $rpc = Config::get('rpc.port', []);
if ($rpc !== $port) { if ($rpc !== $port) {
$sRequest->headers->replace('request_uri', 'add-port-listen/port_' . $port); $sRequest->headers->replace('request_uri', 'add-port-listen/port_' . $port);
$sRequest->headers->replace('request_method', 'listen'); $sRequest->headers->replace('request_method', 'listen');
HttpServer/Route/Router.php
+1 -1
View File
@@ -61,7 +61,7 @@ class Router extends HttpService implements RouterInterface
*/ */
public function init() public function init()
{ {
$this->dir = Config::get('http.namespace', false, $this->dir); $this->dir = Config::get('http.namespace', $this->dir);
} }
HttpServer/Server.php
+3 -3
View File
@@ -125,7 +125,7 @@ class Server extends HttpService
*/ */
public function start(): string public function start(): string
{ {
$configs = Config::get('servers', true); $configs = Config::get('servers', [], true);
$baseServer = $this->initCore($configs); $baseServer = $this->initCore($configs);
if (!$baseServer) { if (!$baseServer) {
@@ -295,7 +295,7 @@ class Server extends HttpService
*/ */
private function create($config): mixed private function create($config): mixed
{ {
$settings = Config::get('settings', false, []); $settings = Config::get('settings', []);
if (!isset($this->server[$config['type']])) { if (!isset($this->server[$config['type']])) {
throw new Exception('Unknown server type(' . $config['type'] . ').'); throw new Exception('Unknown server type(' . $config['type'] . ').');
} }
@@ -372,7 +372,7 @@ class Server extends HttpService
*/ */
private function startRpcService(): Packet|Websocket|Receive|Http|null private function startRpcService(): Packet|Websocket|Receive|Http|null
{ {
$rpcService = Config::get('rpc.enable', false, []); $rpcService = Config::get('rpc.enable', []);
if ($rpcService === true) { if ($rpcService === true) {
/** @var Service $service */ /** @var Service $service */
$service = Snowflake::app()->get('rpc-service'); $service = Snowflake::app()->get('rpc-service');
Kafka/KafkaProviders.php
+1 -1
View File
@@ -36,7 +36,7 @@ class KafkaProviders extends Providers
return; return;
} }
$kafkaServers = Config::get('kafka.servers', false, []); $kafkaServers = Config::get('kafka.servers', []);
if (empty($kafkaServers)) { if (empty($kafkaServers)) {
return; return;
} }
System/Abstracts/BaseApplication.php
+1 -1
View File
@@ -156,7 +156,7 @@ abstract class BaseApplication extends Service
foreach ($config as $key => $value) { foreach ($config as $key => $value) {
Config::set($key, $value); Config::set($key, $value);
} }
if ($storage = Config::get('storage', false, 'storage')) { if ($storage = Config::get('storage', 'storage')) {
if (!str_contains($storage, APP_PATH)) { if (!str_contains($storage, APP_PATH)) {
$storage = APP_PATH . $storage . '/'; $storage = APP_PATH . $storage . '/';
} }
System/Abstracts/Config.php
+1 -1
View File
@@ -53,7 +53,7 @@ class Config extends Component
* @return mixed * @return mixed
* @throws * @throws
*/ */
public static function get($key, $try = FALSE, $default = null): mixed public static function get($key, $default = null, $try = FALSE): mixed
{ {
$instance = Snowflake::app()->getConfig()->getData(); $instance = Snowflake::app()->getConfig()->getData();
if (!str_contains($key, '.')) { if (!str_contains($key, '.')) {
System/Abstracts/Pool.php
+2 -2
View File
@@ -40,8 +40,8 @@ abstract class Pool extends Component
*/ */
private function getClearTime(): array private function getClearTime(): array
{ {
$firstClear = Config::get('pool.clear.start', false, 600); $firstClear = Config::get('pool.clear.start', 600);
$lastClear = Config::get('pool.clear.end', false, 300); $lastClear = Config::get('pool.clear.end', 300);
return [$firstClear, $lastClear]; return [$firstClear, $lastClear];
} }
System/Error/Logger.php
+1 -1
View File
@@ -112,7 +112,7 @@ class Logger extends Component
*/ */
public function print_r($message, $method = '') public function print_r($message, $method = '')
{ {
$debug = Config::get('debug', false, ['enable' => false]); $debug = Config::get('debug', ['enable' => false]);
if ((bool)$debug['enable'] === true) { if ((bool)$debug['enable'] === true) {
if (!is_callable($debug['callback'] ?? null, true)) { if (!is_callable($debug['callback'] ?? null, true)) {
return; return;
System/Jwt/Jwt.php
+3 -3
View File
@@ -86,9 +86,9 @@ mlAZUEjsoaT9vjvjGTxl3uCm0TX5KTgtSJIt2kA1tYVjQef+/iZTHxY=
if (!Config::has('ssl.public') || !Config::has('ssl.private')) { if (!Config::has('ssl.public') || !Config::has('ssl.private')) {
return; return;
} }
$this->public = Config::get('ssl.public', false, $this->public); $this->public = Config::get('ssl.public', $this->public);
$this->private = Config::get('ssl.private', false, $this->private); $this->private = Config::get('ssl.private', $this->private);
$this->timeout = Config::get('ssl.timeout', false, 7200); $this->timeout = Config::get('ssl.timeout', 7200);
} }
System/Process/ServerInotify.php
+1 -1
View File
@@ -41,7 +41,7 @@ class ServerInotify extends Process
public function onHandler(\Swoole\Process $process): void public function onHandler(\Swoole\Process $process): void
{ {
set_error_handler([$this, 'onErrorHandler']); set_error_handler([$this, 'onErrorHandler']);
$this->dirs = Config::get('inotify', false, [APP_PATH]); $this->dirs = Config::get('inotify', [APP_PATH]);
if (extension_loaded('inotify')) { if (extension_loaded('inotify')) {
$this->inotify = inotify_init(); $this->inotify = inotify_init();
$this->events = IN_MODIFY | IN_DELETE | IN_CREATE | IN_MOVE; $this->events = IN_MODIFY | IN_DELETE | IN_CREATE | IN_MOVE;
System/Snowflake.php
+1 -1
View File
@@ -172,7 +172,7 @@ class Snowflake
public static function getStoragePath(): string public static function getStoragePath(): string
{ {
$default = APP_PATH . 'storage' . DIRECTORY_SEPARATOR; $default = APP_PATH . 'storage' . DIRECTORY_SEPARATOR;
$path = Config::get('storage', false, $default); $path = Config::get('storage', $default);
if (!is_dir($path)) { if (!is_dir($path)) {
mkdir($path, 0777, true); mkdir($path, 0777, true);
} }
function.php
+1 -1
View File
@@ -616,7 +616,7 @@ if (!function_exists('name')) {
return; return;
} }
$name = Config::get('id', false, 'system') . '[' . $pid . ']'; $name = Config::get('id', 'system') . '[' . $pid . ']';
if (!empty($prefix)) { if (!empty($prefix)) {
$name .= '.' . $prefix; $name .= '.' . $prefix;
} }