Jelajahi Sumber

ComposerUpdate

Anyon 4 tahun lalu
induk
melakukan
b33bac363d

+ 4 - 4
composer.lock

@@ -937,12 +937,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/zoujingli/ThinkLibrary.git",
-                "reference": "3feaa83edec0dc5d4979f5eeb2eff872678bedec"
+                "reference": "1076fed8234de42aba3f3c6a51d55fd96f996272"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/3feaa83edec0dc5d4979f5eeb2eff872678bedec",
-                "reference": "3feaa83edec0dc5d4979f5eeb2eff872678bedec",
+                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/1076fed8234de42aba3f3c6a51d55fd96f996272",
+                "reference": "1076fed8234de42aba3f3c6a51d55fd96f996272",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -987,7 +987,7 @@
             ],
             "description": "ThinkPHP v6.0 Development Library",
             "homepage": "http://thinkadmin.top",
-            "time": "2020-08-21T03:31:56+00:00"
+            "time": "2020-08-21T09:27:14+00:00"
         },
         {
             "name": "zoujingli/wechat-developer",

+ 16 - 18
config/database.php

@@ -26,39 +26,37 @@ return [
     'connections'     => [
         'mysql' => [
             // 数据库类型
-            'type'              => 'mysql',
+            'type'            => 'mysql',
             // 服务器地址
-            'hostname'          => '127.0.0.1',
+            'hostname'        => '127.0.0.1',
             // 数据库名
-            'database'          => 'admin_v6',
+            'database'        => 'admin_v6',
             // 用户名
-            'username'          => 'admin_v6',
+            'username'        => 'admin_v6',
             // 密码
-            'password'          => 'FbYBHcWKr2',
+            'password'        => 'FbYBHcWKr2',
             // 端口
-            'hostport'          => '3306',
+            'hostport'        => '3306',
             // 数据库连接参数
-            'params'            => [],
+            'params'          => [],
             // 数据库编码默认采用utf8
-            'charset'           => 'utf8mb4',
+            'charset'         => 'utf8mb4',
             // 数据库表前缀
-            'prefix'            => '',
+            'prefix'          => '',
             // 数据库调试模式
-            'debug'             => app()->isDebug(),
+            'debug'           => app()->isDebug(),
             // 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器)
-            'deploy'            => 0,
+            'deploy'          => 0,
             // 数据库读写是否分离 主从式有效
-            'rw_separate'       => false,
+            'rw_separate'     => false,
             // 读写分离后 主服务器数量
-            'master_num'        => 1,
+            'master_num'      => 1,
             // 指定从服务器序号
-            'slave_no'          => '',
+            'slave_no'        => '',
             // 是否严格检查字段是否存在
-            'fields_strict'     => true,
+            'fields_strict'   => true,
             // 是否需要断线重连
-            'break_reconnect'   => false,
-            // 字段缓存路径
-            'schema_cache_path' => app()->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . 'schema' . DIRECTORY_SEPARATOR,
+            'break_reconnect' => false,
         ],
     ],
 ];

+ 4 - 4
vendor/composer/installed.json

@@ -963,12 +963,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/ThinkLibrary.git",
-            "reference": "3feaa83edec0dc5d4979f5eeb2eff872678bedec"
+            "reference": "1076fed8234de42aba3f3c6a51d55fd96f996272"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/3feaa83edec0dc5d4979f5eeb2eff872678bedec",
-            "reference": "3feaa83edec0dc5d4979f5eeb2eff872678bedec",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/1076fed8234de42aba3f3c6a51d55fd96f996272",
+            "reference": "1076fed8234de42aba3f3c6a51d55fd96f996272",
             "shasum": "",
             "mirrors": [
                 {
@@ -985,7 +985,7 @@
             "ext-mbstring": "*",
             "topthink/framework": "^6.0"
         },
-        "time": "2020-08-21T03:31:56+00:00",
+        "time": "2020-08-21T09:27:14+00:00",
         "type": "library",
         "extra": {
             "think": {

+ 1 - 1
vendor/services.php

@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2020-08-21 11:37:33
+// This file is automatically generated at:2020-08-22 13:00:57
 declare (strict_types = 1);
 return array (
   0 => 'think\\admin\\Library',

+ 1 - 0
vendor/zoujingli/think-library/src/extend/DataExtend.php

@@ -54,6 +54,7 @@ class DataExtend
         foreach (static::arr2tree($list, $cid, $pid) as $attr) {
             $attr[$cpath] = "{$ppath}-{$attr[$cid]}";
             $attr['sub'] = $attr['sub'] ?? [];
+            $attr['spc'] = count($attr['sub']);
             $attr['spt'] = substr_count($ppath, '-');
             $attr['spl'] = str_repeat(" ├ ", $attr['spt']);
             $sub = $attr['sub'];

+ 0 - 4
vendor/zoujingli/think-library/src/service/QueueService.php

@@ -164,10 +164,6 @@ class QueueService extends Service
             if (is_null($message)) $message = '>>> 任务执行失败 <<<';
         }
         try {
-            // 文件缓存时,重置 opcache 缓存
-            if (function_exists('opcache_invalidate') && strtolower($this->app->cache->getDefaultDriver()) === 'file') {
-                @opcache_invalidate($this->app->cache->getCacheKey($cachefile), true);
-            }
             $data = $this->app->cache->get($cachefile, [
                 'code' => $this->code, 'status' => $status, 'message' => $message, 'progress' => $progress, 'history' => [],
             ]);