From b0331f6346771be49c94667bc10e2cb69c86f0ee Mon Sep 17 00:00:00 2001 From: whale Date: Sun, 26 Apr 2020 15:01:18 +0800 Subject: [PATCH] fix some stupid bug --- src/Module/Example/HttpImageManager.php | 35 ------------------------ src/ZM/DB/DB.php | 8 ++++-- src/ZM/DB/InsertBody.php | 4 +-- src/ZM/Event/Swoole/WorkerStartEvent.php | 4 +-- src/ZM/Utils/DataProvider.php | 3 +- 5 files changed, 11 insertions(+), 43 deletions(-) delete mode 100644 src/Module/Example/HttpImageManager.php diff --git a/src/Module/Example/HttpImageManager.php b/src/Module/Example/HttpImageManager.php deleted file mode 100644 index 87e20450..00000000 --- a/src/Module/Example/HttpImageManager.php +++ /dev/null @@ -1,35 +0,0 @@ -response->status(404); - $this->response->end(); - return; - } - $exp = explode(".", $param_name); - if (($type = array_pop($exp))) { - $this->response->header("Content-Type", ZMBuf::config("file_header")[$type] ?? "text/html"); - } - $this->response->end(Co::readFile($filename . $param_name)); - } -} diff --git a/src/ZM/DB/DB.php b/src/ZM/DB/DB.php index 65c11aef..12e314f5 100644 --- a/src/ZM/DB/DB.php +++ b/src/ZM/DB/DB.php @@ -69,7 +69,7 @@ class DB } } - public static function rawQuery(string $line, $params) { + public static function rawQuery(string $line, $params = []) { if (ZMBuf::get("sql_log") === true) { $starttime = microtime(true); } @@ -117,4 +117,8 @@ class DB return false; } } -} \ No newline at end of file + + public static function isTableExists($table) { + return in_array($table, self::$table_list); + } +} diff --git a/src/ZM/DB/InsertBody.php b/src/ZM/DB/InsertBody.php index a8a130d4..0b59d625 100644 --- a/src/ZM/DB/InsertBody.php +++ b/src/ZM/DB/InsertBody.php @@ -23,6 +23,6 @@ class InsertBody } public function save() { - DB::rawQuery('INSERT INTO ' . $this->table->getTableName() . ' VALUES ('.implode(',', array_fill(0, 5, '?')).')', $this->row); + DB::rawQuery('INSERT INTO ' . $this->table->getTableName() . ' VALUES ('.implode(',', array_fill(0, count($this->row), '?')).')', $this->row); } -} \ No newline at end of file +} diff --git a/src/ZM/Event/Swoole/WorkerStartEvent.php b/src/ZM/Event/Swoole/WorkerStartEvent.php index 11c30972..b2caa52f 100644 --- a/src/ZM/Event/Swoole/WorkerStartEvent.php +++ b/src/ZM/Event/Swoole/WorkerStartEvent.php @@ -60,11 +60,11 @@ class WorkerStartEvent implements SwooleEvent $name = explode(".", $v); if (($prefix = end($name)) == "json") { ZMBuf::$config[$name[0]] = json_decode(Co::readFile(WORKING_DIR . '/config/' . $v), true); - Console::info("已读取配置文件(json)：" . $prefix); + Console::info("已读取配置文件：" . $v); } elseif ($prefix == "php") { ZMBuf::$config[$name[0]] = include_once WORKING_DIR . '/config/' . $v; if (is_array(ZMBuf::$config[$name[0]])) - Console::info("已读取配置文件(php)：" . $prefix); + Console::info("已读取配置文件：" . $v); } } if (ZMBuf::globals("sql_config")["sql_host"] != "") { diff --git a/src/ZM/Utils/DataProvider.php b/src/ZM/Utils/DataProvider.php index 69a2db3e..11cc91e3 100644 --- a/src/ZM/Utils/DataProvider.php +++ b/src/ZM/Utils/DataProvider.php @@ -10,7 +10,6 @@ use Framework\ZMBuf; class DataProvider { - const HEADER_TYPE = '{"ai":"application/postscript","aif":"audio/x-aiff","aifc":"audio/x-aiff","aiff":"audio/x-aiff","asc":"text/plain","au":"audio/basic","avi":"video/x-msvideo","bcpio":"application/x-bcpio","bin":"application/octet-stream","bmp":"image/bmp","cdf":"application/x-netcdf","class":"application/octet-stream","cpio":"application/x-cpio","cpt":"application/mac-compactpro","csh":"application/x-csh","css":"text/css","dcr":"application/x-director","dir":"application/x-director","djv":"image/vnd.djvu","djvu":"image/vnd.djvu","dll":"application/octet-stream","dms":"application/octet-stream","doc":"application/msword","dvi":"application/x-dvi","dxr":"application/x-director","eps":"application/postscript","etx":"text/x-setext","exe":"application/octet-stream","ez":"application/andrew-inset","gif":"image/gif","gtar":"application/x-gtar","hdf":"application/x-hdf","hqx":"application/mac-binhex40","htm":"text/html","html":"text/html","ice":"x-conference/x-cooltalk","ief":"image/ief","iges":"model/iges","igs":"model/iges","jpe":"image/jpeg","jpeg":"image/jpeg","jpg":"image/jpeg","js":"application/x-javascript","kar":"audio/midi","latex":"application/x-latex","lha":"application/octet-stream","lzh":"application/octet-stream","m3u":"audio/x-mpegurl","man":"application/x-troff-man","me":"application/x-troff-me","mesh":"model/mesh","mid":"audio/midi","midi":"audio/midi","mif":"application/vnd.mif","mov":"video/quicktime","movie":"video/x-sgi-movie","mp2":"audio/mpeg","mp3":"audio/mpeg","mpe":"video/mpeg","mpeg":"video/mpeg","mpg":"video/mpeg","mpga":"audio/mpeg","ms":"application/x-troff-ms","msh":"model/mesh","mxu":"video/vnd.mpegurl","nc":"application/x-netcdf","oda":"application/oda","pbm":"image/x-portable-bitmap","pdb":"chemical/x-pdb","pdf":"application/pdf","pgm":"image/x-portable-graymap","pgn":"application/x-chess-pgn","png":"image/png","pnm":"image/x-portable-anymap","ppm":"image/x-portable-pixmap","ppt":"application/vnd.ms-powerpoint","ps":"application/postscript","qt":"video/quicktime","ra":"audio/x-realaudio","ram":"audio/x-pn-realaudio","ras":"image/x-cmu-raster","rgb":"image/x-rgb","rm":"audio/x-pn-realaudio","roff":"application/x-troff","rpm":"audio/x-pn-realaudio-plugin","rtf":"text/rtf","rtx":"text/richtext","sgm":"text/sgml","sgml":"text/sgml","sh":"application/x-sh","shar":"application/x-shar","silo":"model/mesh","sit":"application/x-stuffit","skd":"application/x-koan","skm":"application/x-koan","skp":"application/x-koan","skt":"application/x-koan","smi":"application/smil","smil":"application/smil","snd":"audio/basic","so":"application/octet-stream","spl":"application/x-futuresplash","src":"application/x-wais-source","sv4cpio":"application/x-sv4cpio","sv4crc":"application/x-sv4crc","swf":"application/x-shockwave-flash","t":"application/x-troff","tar":"application/x-tar","tcl":"application/x-tcl","tex":"application/x-tex","texi":"application/x-texinfo","texinfo":"application/x-texinfo","tif":"image/tiff","tiff":"image/tiff","tr":"application/x-troff","tsv":"text/tab-separated-values","txt":"text/plain","ustar":"application/x-ustar","vcd":"application/x-cdlink","vrml":"model/vrml","wav":"audio/x-wav","wbmp":"image/vnd.wap.wbmp","wbxml":"application/vnd.wap.wbxml","wml":"text/vnd.wap.wml","wmlc":"application/vnd.wap.wmlc","wmls":"text/vnd.wap.wmlscript","wmlsc":"application/vnd.wap.wmlscriptc","wrl":"model/vrml","xbm":"image/x-xbitmap","xht":"application/xhtml+xml","xhtml":"application/xhtml+xml","xls":"application/vnd.ms-excel","xml":"text/xml","xpm":"image/x-xpixmap","xsl":"text/xml","xwd":"image/x-xwindowdump","xyz":"chemical/x-xyz","zip":"application/zip"}'; public static $buffer_list = []; public static function getResourceFolder() { @@ -52,4 +51,4 @@ class DataProvider public static function getDataFolder() { return ZM_DATA; } -} \ No newline at end of file +}