zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-23 16:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐛 try not to die.

Browse Source
This commit is contained in:
jerry
2018-11-28 15:43:04 +08:00
parent a8c856d816
commit 04518bb4a6
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cqbot/utils/CQUtil.php
View File

@@ -24,7 +24,7 @@ class CQUtil
public static function loadAllFiles() { public static function loadAllFiles() {
Cache::set("info_level", settings()["info_level"]); Cache::set("info_level", settings()["info_level"]);
Console::debug("loading configs..."); Console::info("loading configs...");
self::initEmptyCaches(); self::initEmptyCaches();
Cache::set("mods", self::getMods());//加载的模块列表 Cache::set("mods", self::getMods());//加载的模块列表
Cache::set("group_list", DP::getJsonData("group_list.json"));//获取群组列表 Cache::set("group_list", DP::getJsonData("group_list.json"));//获取群组列表
@@ -235,7 +235,7 @@ class CQUtil
Console::info("Reloading server"); Console::info("Reloading server");
self::saveAllFiles(); self::saveAllFiles();
Cache::$data = []; Cache::$data = [];
foreach(ConnectionManager::getAll() as $v){ foreach (ConnectionManager::getAll() as $v) {
$v->close(); $v->close();
} }
Cache::$server->reload(); Cache::$server->reload();
@@ -344,8 +344,10 @@ class CQUtil
if (!in_array($v->getQQ(), $robots)) if (!in_array($v->getQQ(), $robots))
$robots[] = $v->getQQ(); $robots[] = $v->getQQ();
} }
foreach (Cache::get("bots") as $v) { if ((Cache::get("bots") ?? []) != []) {
$robots[] = $v; foreach (Cache::get("bots") as $v) {
$robots[] = $v;
}
} }
return in_array($user_id, $robots); return in_array($user_id, $robots);
} }

8
src/cqbot/utils/DataProvider.php
View File

@@ -16,7 +16,7 @@ class DataProvider
* 获取config文件夹 * 获取config文件夹
* @return string * @return string
*/ */
public static function getDataFolder(){ public static function getDataFolder() {
return CONFIG_DIR; return CONFIG_DIR;
} }
@@ -24,7 +24,7 @@ class DataProvider
* 获取用户数据的文件夹 * 获取用户数据的文件夹
* @return string * @return string
*/ */
public static function getUserFolder(){ public static function getUserFolder() {
return USER_DIR; return USER_DIR;
} }
@@ -33,7 +33,7 @@ class DataProvider
* @param $filename * @param $filename
* @return array|mixed * @return array|mixed
*/ */
static function getJsonData($filename){ static function getJsonData($filename) {
if (!file_exists(self::getDataFolder() . $filename)) return array(); if (!file_exists(self::getDataFolder() . $filename)) return array();
return json_decode(file_get_contents(self::getDataFolder() . $filename), true); return json_decode(file_get_contents(self::getDataFolder() . $filename), true);
} }
@@ -44,7 +44,7 @@ class DataProvider
* @param $filename * @param $filename
* @param array $args * @param array $args
*/ */
static function setJsonData($filename, array $args){ static function setJsonData($filename, array $args) {
file_put_contents(self::getDataFolder() . $filename, json_encode($args, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT | JSON_BIGINT_AS_STRING)); file_put_contents(self::getDataFolder() . $filename, json_encode($args, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT | JSON_BIGINT_AS_STRING));
} }