ComposerUpdate

composer.lock

@@ -783,12 +783,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/zoujingli/ThinkLibrary.git",
-                "reference": "ad940b565ff7432ede780d57aeae2a05bfd925a6"
+                "reference": "c05c1ddf0a710dee48791bb7989b1bb3a79a20cd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/ad940b565ff7432ede780d57aeae2a05bfd925a6",
+                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c05c1ddf0a710dee48791bb7989b1bb3a79a20cd",
-                "reference": "ad940b565ff7432ede780d57aeae2a05bfd925a6",
+                "reference": "c05c1ddf0a710dee48791bb7989b1bb3a79a20cd",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -808,7 +808,7 @@
             "extra": {
                 "think": {
                     "services": [
-                        "think\\admin\\ThinkLibrary"
+                        "think\\admin\\Library"
                     ]
                 }
             },
@@ -832,7 +832,7 @@
             ],
             "description": "ThinkPHP v6.0 Development Library",
             "homepage": "http://framework.thinkadmin.top",
-            "time": "2019-11-13T06:45:23+00:00"
+            "time": "2019-11-13T10:54:48+00:00"
         }
     ],
     "packages-dev": [],

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit53454ac98c72727d5ff48461854fbb40::getLoader();
+return ComposerAutoloaderInit0ebda76f49a312d0931869f268c1812b::getLoader();

vendor/composer/autoload_classmap.php

@@ -140,15 +140,14 @@ return array(
     'think\\View' => $vendorDir . '/topthink/framework/src/think/View.php',
     'think\\admin\\Controller' => $vendorDir . '/zoujingli/think-library/src/Controller.php',
     'think\\admin\\Helper' => $vendorDir . '/zoujingli/think-library/src/Helper.php',
+    'think\\admin\\Library' => $vendorDir . '/zoujingli/think-library/src/Library.php',
     'think\\admin\\Queue' => $vendorDir . '/zoujingli/think-library/src/Queue.php',
     'think\\admin\\Service' => $vendorDir . '/zoujingli/think-library/src/Service.php',
     'think\\admin\\Storage' => $vendorDir . '/zoujingli/think-library/src/Storage.php',
-    'think\\admin\\ThinkLibrary' => $vendorDir . '/zoujingli/think-library/src/ThinkLibrary.php',
     'think\\admin\\command\\Install' => $vendorDir . '/zoujingli/think-library/src/command/Install.php',
     'think\\admin\\extend\\CodeExtend' => $vendorDir . '/zoujingli/think-library/src/extend/CodeExtend.php',
     'think\\admin\\extend\\CsvExtend' => $vendorDir . '/zoujingli/think-library/src/extend/CsvExtend.php',
     'think\\admin\\extend\\DataExtend' => $vendorDir . '/zoujingli/think-library/src/extend/DataExtend.php',
-    'think\\admin\\extend\\ExpressExtend' => $vendorDir . '/zoujingli/think-library/src/extend/ExpressExtend.php',
     'think\\admin\\extend\\HttpExtend' => $vendorDir . '/zoujingli/think-library/src/extend/HttpExtend.php',
     'think\\admin\\helper\\DeleteHelper' => $vendorDir . '/zoujingli/think-library/src/helper/DeleteHelper.php',
     'think\\admin\\helper\\FormHelper' => $vendorDir . '/zoujingli/think-library/src/helper/FormHelper.php',
@@ -164,6 +163,7 @@ return array(
     'think\\admin\\queue\\WorkQueue' => $vendorDir . '/zoujingli/think-library/src/queue/WorkQueue.php',
     'think\\admin\\service\\AuthService' => $vendorDir . '/zoujingli/think-library/src/service/AuthService.php',
     'think\\admin\\service\\CaptchaService' => $vendorDir . '/zoujingli/think-library/src/service/CaptchaService.php',
+    'think\\admin\\service\\ExpressService' => $vendorDir . '/zoujingli/think-library/src/service/ExpressService.php',
     'think\\admin\\service\\InstallService' => $vendorDir . '/zoujingli/think-library/src/service/InstallService.php',
     'think\\admin\\service\\MenuService' => $vendorDir . '/zoujingli/think-library/src/service/MenuService.php',
     'think\\admin\\service\\NodeService' => $vendorDir . '/zoujingli/think-library/src/service/NodeService.php',

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit53454ac98c72727d5ff48461854fbb40
+class ComposerAutoloaderInit0ebda76f49a312d0931869f268c1812b
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInit53454ac98c72727d5ff48461854fbb40
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit53454ac98c72727d5ff48461854fbb40', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit0ebda76f49a312d0931869f268c1812b', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit53454ac98c72727d5ff48461854fbb40', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit0ebda76f49a312d0931869f268c1812b', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit53454ac98c72727d5ff48461854fbb40::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit0ebda76f49a312d0931869f268c1812b::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@ class ComposerAutoloaderInit53454ac98c72727d5ff48461854fbb40
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit53454ac98c72727d5ff48461854fbb40::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit0ebda76f49a312d0931869f268c1812b::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire53454ac98c72727d5ff48461854fbb40($fileIdentifier, $file);
+            composerRequire0ebda76f49a312d0931869f268c1812b($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire53454ac98c72727d5ff48461854fbb40($fileIdentifier, $file)
+function composerRequire0ebda76f49a312d0931869f268c1812b($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit53454ac98c72727d5ff48461854fbb40
+class ComposerStaticInit0ebda76f49a312d0931869f268c1812b
 {
     public static $files = array (
         '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php',
@@ -231,15 +231,14 @@ class ComposerStaticInit53454ac98c72727d5ff48461854fbb40
         'think\\View' => __DIR__ . '/..' . '/topthink/framework/src/think/View.php',
         'think\\admin\\Controller' => __DIR__ . '/..' . '/zoujingli/think-library/src/Controller.php',
         'think\\admin\\Helper' => __DIR__ . '/..' . '/zoujingli/think-library/src/Helper.php',
+        'think\\admin\\Library' => __DIR__ . '/..' . '/zoujingli/think-library/src/Library.php',
         'think\\admin\\Queue' => __DIR__ . '/..' . '/zoujingli/think-library/src/Queue.php',
         'think\\admin\\Service' => __DIR__ . '/..' . '/zoujingli/think-library/src/Service.php',
         'think\\admin\\Storage' => __DIR__ . '/..' . '/zoujingli/think-library/src/Storage.php',
-        'think\\admin\\ThinkLibrary' => __DIR__ . '/..' . '/zoujingli/think-library/src/ThinkLibrary.php',
         'think\\admin\\command\\Install' => __DIR__ . '/..' . '/zoujingli/think-library/src/command/Install.php',
         'think\\admin\\extend\\CodeExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/CodeExtend.php',
         'think\\admin\\extend\\CsvExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/CsvExtend.php',
         'think\\admin\\extend\\DataExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/DataExtend.php',
-        'think\\admin\\extend\\ExpressExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/ExpressExtend.php',
         'think\\admin\\extend\\HttpExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/HttpExtend.php',
         'think\\admin\\helper\\DeleteHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/DeleteHelper.php',
         'think\\admin\\helper\\FormHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/FormHelper.php',
@@ -255,6 +254,7 @@ class ComposerStaticInit53454ac98c72727d5ff48461854fbb40
         'think\\admin\\queue\\WorkQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/WorkQueue.php',
         'think\\admin\\service\\AuthService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/AuthService.php',
         'think\\admin\\service\\CaptchaService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/CaptchaService.php',
+        'think\\admin\\service\\ExpressService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/ExpressService.php',
         'think\\admin\\service\\InstallService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/InstallService.php',
         'think\\admin\\service\\MenuService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/MenuService.php',
         'think\\admin\\service\\NodeService' => __DIR__ . '/..' . '/zoujingli/think-library/src/service/NodeService.php',
@@ -470,9 +470,9 @@ class ComposerStaticInit53454ac98c72727d5ff48461854fbb40
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit53454ac98c72727d5ff48461854fbb40::$prefixLengthsPsr4;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit0ebda76f49a312d0931869f268c1812b::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit53454ac98c72727d5ff48461854fbb40::$prefixDirsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit0ebda76f49a312d0931869f268c1812b::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit53454ac98c72727d5ff48461854fbb40::$classMap;
+            $loader->classMap = ComposerStaticInit0ebda76f49a312d0931869f268c1812b::$classMap;
 
         }, null, ClassLoader::class);
     }

vendor/composer/installed.json

@@ -805,12 +805,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/ThinkLibrary.git",
-            "reference": "ad940b565ff7432ede780d57aeae2a05bfd925a6"
+            "reference": "c05c1ddf0a710dee48791bb7989b1bb3a79a20cd"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/ad940b565ff7432ede780d57aeae2a05bfd925a6",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c05c1ddf0a710dee48791bb7989b1bb3a79a20cd",
-            "reference": "ad940b565ff7432ede780d57aeae2a05bfd925a6",
+            "reference": "c05c1ddf0a710dee48791bb7989b1bb3a79a20cd",
             "shasum": "",
             "mirrors": [
                 {
@@ -826,12 +826,12 @@
             "ext-json": "*",
             "topthink/framework": "^6.0"
         },
-        "time": "2019-11-13T06:45:23+00:00",
+        "time": "2019-11-13T10:54:48+00:00",
         "type": "library",
         "extra": {
             "think": {
                 "services": [
-                    "think\\admin\\ThinkLibrary"
+                    "think\\admin\\Library"
                 ]
             }
         },

vendor/services.php

@@ -1,7 +1,7 @@
 <?php 
-// This file is automatically generated at:2019-11-13 14:52:09
+// This file is automatically generated at:2019-11-14 15:35:17
 declare (strict_types = 1);
 return array (
   0 => 'think\\app\\Service',
-  1 => 'think\\admin\\ThinkLibrary',
+  1 => 'think\\admin\\Library',
 );

vendor/zoujingli/think-library/composer.json

@@ -28,7 +28,7 @@
   "extra": {
     "think": {
       "services": [
-        "think\\admin\\ThinkLibrary"
+        "think\\admin\\Library"
       ]
     }
   }

vendor/zoujingli/think-library/src/Library.php

@@ -22,13 +22,13 @@ use think\Service;
 
 /**
  * 模块注册服务
- * Class ThinkLibrary
+ * Class Library
  * @package think\admin
  */
-class ThinkLibrary extends Service
+class Library extends Service
 {
     /**
-     * 依赖服务注册
+     * 服务注册
      */
     public function register()
     {
@@ -41,7 +41,7 @@ class ThinkLibrary extends Service
     }
 
     /**
-     * 服务启动方法
+     * 服务启动
      */
     public function boot()
     {

vendor/zoujingli/think-library/src/Queue.php

@@ -15,6 +15,7 @@
 
 namespace think\admin;
 
+use think\admin\extend\CodeExtend;
 use think\admin\service\ProcessService;
 use think\App;
 
@@ -32,10 +33,10 @@ class Queue
     protected $app;
 
     /**
-     * 当前任务ID
+     * 当前任务编号
      * @var integer
      */
-    protected $jobid = 0;
+    protected $code = 0;
 
     /**
      * 当前任务标题
@@ -58,47 +59,48 @@ class Queue
     /**
      * Queue constructor.
      * @param App $app
-     * @param int $jobid
+     * @param int $code
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function __construct(App $app, $jobid = 0)
+    public function __construct(App $app, $code = 0)
     {
         $this->app = $app;
-        if ($jobid > 0) $this->init($jobid);
+        if ($code > 0) $this->init($code);
     }
 
     /**
      * 静态获取实例
      * @param App $app
-     * @param int $jobid
+     * @param int $code
      * @return static
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public static function instance(App $app, $jobid = 0)
+    public static function instance(App $app, $code = 0)
     {
-        return new static($app, $jobid);
+        return new static($app, $code);
     }
 
     /**
      * 数据初始化
-     * @param integer $jobid
+     * @param integer $code
      * @return Queue
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function init($jobid = 0)
+    public function init($code = 0)
     {
-        if ($jobid > 0) {
+        if ($code > 0) {
-            $this->queue = $this->app->db->name('SystemQueue')->where(['id' => $this->jobid])->find();
+            $this->queue = $this->app->db->name('SystemQueue')->where(['code' => $this->code])->find();
-            if (empty($this->queue)) throw new \think\Exception("Queue {$jobid} Not found.");
+            if (empty($this->queue)) throw new \think\Exception("Queue {$code} Not found.");
+            $this->code = $this->queue['code'];
             $this->title = $this->queue['title'];
             $this->data = json_decode($this->queue['exec_data'], true) ?: [];
         }
@@ -126,10 +128,10 @@ class Queue
     public function reset($wait = 0)
     {
         if (empty($this->queue)) throw new \think\Exception('Queue data cannot be empty!');
-        $this->app->db->name('SystemQueue')->where(['id' => $this->jobid])->failException(true)->update([
+        $this->app->db->name('SystemQueue')->where(['code' => $this->code])->failException(true)->update([
             'exec_time' => time() + $wait, 'attempts' => $this->queue['attempts'] + 1, 'status' => '1',
         ]);
-        return $this->init($this->jobid);
+        return $this->init($this->code);
     }
 
     /**
@@ -151,7 +153,9 @@ class Queue
         if (empty($rscript) && $this->app->db->name('SystemQueue')->where($map)->count() > 0) {
             throw new \think\Exception('该任务已经创建，请耐心等待处理完成！');
         }
-        $this->jobid = $this->app->db->name('SystemQueue')->failException(true)->insertGetId([
+        $this->code = CodeExtend::uniqidDate(16);
+        $this->app->db->name('SystemQueue')->failException(true)->insert([
+            'code'       => $this->code,
             'title'      => $title,
             'command'    => $command,
             'attempts'   => '0',
@@ -161,7 +165,7 @@ class Queue
             'enter_time' => '0',
             'outer_time' => '0',
         ]);
-        return $this->init($this->jobid);
+        return $this->init($this->code);
     }
 
     /**

vendor/zoujingli/think-library/src/command/Install.php

@@ -46,12 +46,6 @@ class Install extends Command
      */
     protected $name;
 
-    /**
-     * 插件工具实例
-     * @var InstallService
-     */
-    protected $service;
-
     /**
      * 规则配置
      * @var array
@@ -84,7 +78,7 @@ class Install extends Command
         if (empty($this->name)) {
             $this->output->error('在线安装的模块名称不能为空！');
         } else {
-            $this->service = InstallService::instance($this->app);
+
             if (isset($this->bind[$this->name])) {
                 $this->rules = empty($this->bind[$this->name]['rules']) ? [] : $this->bind[$this->name]['rules'];
                 $this->ignore = empty($this->bind[$this->name]['ignore']) ? [] : $this->bind[$this->name]['ignore'];
@@ -98,10 +92,11 @@ class Install extends Command
 
     protected function installFile()
     {
-        $data = $this->service->grenerateDifference($this->rules, $this->ignore);
+        $service = InstallService::instance($this->app);
+        $data = $service->grenerateDifference($this->rules, $this->ignore);
         if (empty($data)) $this->output->info('文件比对一致不需更新文件！');
         else foreach ($data as $file) {
-            list($state, $mode, $name) = $this->service->fileSynchronization($file);
+            list($state, $mode, $name) = $service->fileSynchronization($file);
             if ($state) {
                 if ($mode === 'add') $this->output->info("--- 下载 {$name} 添加成功");
                 if ($mode === 'mod') $this->output->info("--- 下载 {$name} 更新成功");

vendor/zoujingli/think-library/src/queue/ListenQueue.php

@@ -47,22 +47,22 @@ class ListenQueue extends Command
     {
         $this->app->db->name('SystemQueue')->count();
         if (($process = ProcessService::instance($this->app))->iswin()) {
-            $this->setProcessTitle("ThinkAdmin 异步任务监听主进程 {$process->version()}");
+            $this->setProcessTitle("ThinkAdmin 监听主进程 {$process->version()}");
         }
         $output->comment('============ 异步任务监听中 ============');
         while (true) {
-            foreach ($this->app->db->name('SystemQueue')->where([['status', '=', '1'], ['exec_time', '<=', time()]])->order('exec_time asc')->select() as $vo) {
+            foreach ($this->app->db->name('SystemQueue')->where([['status', '=', '1'], ['exec_time', '<=', time()]])->order('exec_time asc')->limit(100)->select() as $vo) {
                 try {
-                    $this->app->db->name('SystemQueue')->where(['id' => $vo['id']])->update(['status' => '2', 'enter_time' => time(), 'exec_desc' => '', 'attempts' => $vo['attempts'] + 1]);
+                    $this->app->db->name('SystemQueue')->where(['code' => $vo['code']])->update(['status' => '2', 'enter_time' => time(), 'exec_desc' => '', 'attempts' => $vo['attempts'] + 1]);
-                    if ($process->query($command = $process->think("xtask:_work {$vo['id']} -"))) {
+                    if ($process->query($command = $process->think("xtask:_work {$vo['code']} -"))) {
-                        $output->comment("正在执行 -> [{$vo['id']}] {$vo['title']}");
+                        $output->comment("正在执行 -> [{$vo['code']}] {$vo['title']}");
                     } else {
                         $process->create($command);
-                        $output->info("创建成功 -> [{$vo['id']}] {$vo['title']}");
+                        $output->info("创建成功 -> [{$vo['code']}] {$vo['title']}");
                     }
                 } catch (\Exception $e) {
-                    $this->app->db->name('SystemQueue')->where(['id' => $vo['id']])->update(['status' => '4', 'outer_time' => time(), 'exec_desc' => $e->getMessage()]);
+                    $this->app->db->name('SystemQueue')->where(['code' => $vo['code']])->update(['status' => '4', 'outer_time' => time(), 'exec_desc' => $e->getMessage()]);
-                    $output->error("创建失败 -> [{$vo['id']}] {$vo['title']}，{$e->getMessage()}");
+                    $output->error("创建失败 -> [{$vo['code']}] {$vo['title']}，{$e->getMessage()}");
                 }
             }
             sleep(1);

vendor/zoujingli/think-library/src/queue/WorkQueue.php

@@ -23,7 +23,7 @@ use think\console\input\Argument;
 use think\console\Output;
 
 /**
- * 启动指定独立执行的任务子进程
+ * 启动独立执行进程
  * Class WorkQueue
  * @package think\admin\queue
  */
@@ -31,10 +31,10 @@ class WorkQueue extends Command
 {
 
     /**
-     * 当前任务ID
+     * 当前任务编号
      * @var integer
      */
-    protected $id;
+    protected $code;
 
     /**
      * 绑定数据表
@@ -48,8 +48,8 @@ class WorkQueue extends Command
     protected function configure()
     {
         $this->setName('xtask:_work')->setDescription('[执行]创建执行单个指定任务的进程');
-        $this->addArgument('id', Argument::OPTIONAL, '指定任务ID');
+        $this->addArgument('code', Argument::OPTIONAL, '任务编号');
-        $this->addArgument('sp', Argument::OPTIONAL, '指令结束符');
+        $this->addArgument('splt', Argument::OPTIONAL, '指令结束符');
     }
 
     /**
@@ -61,10 +61,10 @@ class WorkQueue extends Command
     protected function execute(Input $input, Output $output)
     {
         try {
-            $this->id = trim($input->getArgument('id')) ?: 0;
+            $this->code = trim($input->getArgument('code'));
-            if (empty($this->id)) throw new \think\Exception("执行任务需要指定任务编号！");
+            if (empty($this->code)) throw new \think\Exception("执行任务需要指定任务编号！");
-            $queue = $this->app->db->name('SystemQueue')->where(['id' => $this->id, 'status' => '2'])->find();
+            $queue = $this->app->db->name('SystemQueue')->where(['code' => $this->code, 'status' => '2'])->find();
-            if (empty($queue)) throw new \think\Exception("执行任务{$this->id}的信息或状态异常！");;
+            if (empty($queue)) throw new \think\Exception("执行任务{$this->code}的信息或状态异常！");;
             // 设置进程标题
             if (($process = ProcessService::instance($this->app))->iswin()) {
                 $this->setProcessTitle("ThinkAdmin {$process->version()} 执行任务 - {$queue['title']}");
@@ -73,7 +73,7 @@ class WorkQueue extends Command
             if (class_exists($command = $queue['command'])) {
                 if ($command instanceof Queue) {
                     $data = json_decode($queue['data'], true) ?: [];
-                    $this->update('3', $command::instance($this->app, $this->id)->execute($data));
+                    $this->update('3', $command::instance($this->app, $this->code)->execute($data));
                 } else {
                     throw new \think\Exception("任务处理类 {$command} 未继承 think\\admin\\Queue");
                 }
@@ -96,7 +96,7 @@ class WorkQueue extends Command
     protected function update($status, $message)
     {
         $desc = explode("\n", trim(is_string($message) ? $message : ''));
-        $result = $this->app->db->name('SystemQueue')->where(['id' => $this->id])->update([
+        $result = $this->app->db->name('SystemQueue')->where(['code' => $this->code])->update([
             'status' => $status, 'outer_time' => time(), 'exec_desc' => $desc[0],
         ]);
         $this->output->writeln(is_string($message) ? $message : '');

vendor/zoujingli/think-library/src/service/AuthService.php

@@ -49,8 +49,9 @@ class AuthService extends Service
         list($real, $nodes) = [$service->fullnode($node), $service->getMethods()];
         if (!empty($nodes[$real]['isauth'])) {
             return in_array($real, $this->app->session->get('user.nodes', []));
+        } else {
+            return !(!empty($nodes[$real]['islogin']) && !$this->isLogin());
         }
-        return !(!empty($nodes[$real]['islogin']) && !$this->isLogin());
     }
 
     /**

vendor/zoujingli/think-library/src/service/CaptchaService.php

@@ -55,7 +55,7 @@ class CaptchaService extends Service
         // 缓存验证码字符串
         $this->app->cache->set($this->uniqid, $this->code, 360);
     }
-    
+
     /**
      * 获取验证码值
      * @return string

vendor/zoujingli/think-library/src/service/ExpressService.php

@@ -1,7 +1,7 @@
 <?php
 
 // +----------------------------------------------------------------------
-// | Library for ThinkAdmin
+// | ThinkAdmin
 // +----------------------------------------------------------------------
 // | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
 // +----------------------------------------------------------------------
@@ -9,18 +9,20 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | gitee 仓库地址 ：https://gitee.com/zoujingli/ThinkLibrary
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary
+// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
 // +----------------------------------------------------------------------
 
-namespace think\admin\extend;
+namespace think\admin\service;
+
+use think\admin\Service;
 
 /**
- * 物流信息查询扩展
+ * 百度快递100物流查询
- * Class ExpressExtend
+ * Class ExpressService
- * @package think\admin\extend
+ * @package think\admin\service
  */
-class ExpressExtend
+class ExpressService extends Service
 {
     /**
      * 通过百度快递100应用查询物流信息
@@ -28,10 +30,10 @@ class ExpressExtend
      * @param string $number 快递物流编号
      * @return array
      */
-    public static function express($code, $number)
+    public function express($code, $number)
     {
         $list = [];
-        for ($i = 0; $i < 6; $i++) if (is_array($result = self::doExpress($code, $number))) {
+        for ($i = 0; $i < 6; $i++) if (is_array($result = $this->doExpress($code, $number))) {
             if (!empty($result['data']['info']['context'])) {
                 foreach ($result['data']['info']['context'] as $vo) $list[] = [
                     'time' => date('Y-m-d H:i:s', $vo['time']), 'context' => $vo['desc'],
@@ -48,11 +50,12 @@ class ExpressExtend
      * @param string $number 快递单单号
      * @return mixed
      */
-    private static function doExpress($code, $number)
+    private function doExpress($code, $number)
     {
-        list($microtime, $clientIp) = [time(), app()->request->ip()];
+        list($microtime, $clientIp) = [time(), $this->app->request->ip()];
         $url = "https://sp0.baidu.com/9_Q4sjW91Qh3otqbppnN2DJv/pae/channel/data/asyncqury?cb=callback&appid=4001&com={$code}&nu={$number}&vcode=&token=&_={$microtime}";
-        $options = ['cookie_file' => app()->getRuntimePath() . 'temp/cookie', 'headers' => ['Host' => 'www.kuaidi100.com', 'CLIENT-IP' => $clientIp, 'X-FORWARDED-FOR' => $clientIp],];
+        $options = ['cookie_file' => $this->app->getRuntimePath() . 'express_cookie.txt', 'headers' => ['Host' => 'www.kuaidi100.com', 'CLIENT-IP' => $clientIp, 'X-FORWARDED-FOR' => $clientIp],];
         return json_decode(str_replace('/**/callback(', '', trim(http_get($url, [], $options), ')')), true);
     }
+
 }

vendor/zoujingli/think-library/src/storage/LocalStorage.php

@@ -18,7 +18,7 @@ namespace think\admin\storage;
 use think\admin\Storage;
 
 /**
- * 本地服务文件存储支持
+ * 本地存储支持
  * Class LocalStorage
  * @package think\admin\storage
  */

vendor/zoujingli/think-library/src/storage/QiniuStorage.php

@@ -44,7 +44,7 @@ class QiniuStorage extends Storage
         $this->accessKey = sysconf('storage.qiniu_access_key');
         $this->secretKey = sysconf('storage.qiniu_secret_key');
         $this->domain = strtolower(sysconf('storage.qiniu_http_domain'));
-        // 计算前置链接
+        // 计算链接前缀
         $type = strtolower(sysconf('storage.qiniu_http_protocol'));
         if ($type === 'auto') $this->prefix = "//{$this->domain}/";
         elseif ($type === 'http') $this->prefix = "http://{$this->domain}/";