ComposerUpdate

app/admin/controller/Login.php

@@ -97,7 +97,7 @@ class Login extends Controller
             'type.require'  => '验证码类型不能为空!',
             'token.require' => '验证码标识不能为空!',
         ]);
-        $image = CaptchaService::instance();
+        $image = CaptchaService::instance()->initialize();
         $captcha = ['image' => $image->getData(), 'uniqid' => $image->getUniqid()];
         if ($this->app->session->get($input['type']) === $input['token']) {
             $captcha['code'] = $image->getCode();

app/admin/controller/api/Upload.php

@@ -57,7 +57,7 @@ class Upload extends Controller
      */
     public function state()
     {
-        list($this->name, $this->safe) = [input('name', null), $this->getSafe()];
+        [$this->name, $this->safe] = [input('name', null), $this->getSafe()];
         $data = ['uptype' => $this->getType(), 'xkey' => input('xkey'), 'safe' => intval($this->safe)];
         if ($info = Storage::instance($data['uptype'])->info($data['xkey'], $this->safe, $this->name)) {
             $data['url'] = $info['url'];
@@ -102,13 +102,13 @@ class Upload extends Controller
         if (in_array($this->extension, ['php', 'sh'])) {
             return json(['uploaded' => false, 'error' => ['message' => '可执行文件禁止上传到本地服务器']]);
         }
-        list($this->safe, $this->uptype, $this->name) = [$this->getSafe(), $this->getType(), input('xkey')];
+        [$this->safe, $this->uptype, $this->name] = [$this->getSafe(), $this->getType(), input('xkey')];
         if (empty($this->name)) $this->name = Storage::name($file->getPathname(), $this->extension, '', 'md5_file');
         if ($this->uptype === 'local') {
             $local = LocalStorage::instance();
             $realpath = dirname($realname = $local->path($this->name, $this->safe));
             file_exists($realpath) && is_dir($realpath) || mkdir($realpath, 0755, true);
-            @move_uploaded_file($file->getPathname(), $realname);
+            rename($file->getPathname(), $realname);
             $info = $local->info($this->name, $this->safe, $file->getOriginalName());
         } else {
             $bina = file_get_contents($file->getRealPath());

composer.lock

@@ -909,12 +909,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/zoujingli/ThinkLibrary.git",
-                "reference": "e313082651d91f411caf10b77d0b786ef4784445"
+                "reference": "43dcb252b35e954ea14577de75919022471a426a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/e313082651d91f411caf10b77d0b786ef4784445",
-                "reference": "e313082651d91f411caf10b77d0b786ef4784445",
+                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/43dcb252b35e954ea14577de75919022471a426a",
+                "reference": "43dcb252b35e954ea14577de75919022471a426a",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -958,7 +958,7 @@
             ],
             "description": "ThinkPHP v6.0 Development Library",
             "homepage": "http://framework.thinkadmin.top",
-            "time": "2020-05-06T02:31:00+00:00"
+            "time": "2020-05-11T02:31:16+00:00"
         },
         {
             "name": "zoujingli/wechat-developer",

vendor/composer/installed.json

@@ -935,12 +935,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/ThinkLibrary.git",
-            "reference": "53001a2ea7a733136a2d8264a04a854cbc0f6205"
+            "reference": "43dcb252b35e954ea14577de75919022471a426a"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/53001a2ea7a733136a2d8264a04a854cbc0f6205",
-            "reference": "53001a2ea7a733136a2d8264a04a854cbc0f6205",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/43dcb252b35e954ea14577de75919022471a426a",
+            "reference": "43dcb252b35e954ea14577de75919022471a426a",
             "shasum": "",
             "mirrors": [
                 {
@@ -956,7 +956,7 @@
             "ext-json": "*",
             "topthink/framework": "^6.0"
         },
-        "time": "2020-05-06T06:23:28+00:00",
+        "time": "2020-05-11T02:31:16+00:00",
         "type": "library",
         "extra": {
             "think": {

vendor/services.php

@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2020-05-07 11:28:21
+// This file is automatically generated at:2020-05-11 14:38:35
 declare (strict_types = 1);
 return array (
   0 => 'think\\app\\Service',

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

@@ -38,10 +38,11 @@ class CaptchaService extends Service
      * @param array $config
      * @return static
      */
-    protected function initialize($config = [])
+    public function initialize($config = [])
     {
         // 动态配置属性
         foreach ($config as $k => $v) if (isset($this->$k)) $this->$k = $v;
+        $this->code = '';
         // 生成验证码序号
         $this->uniqid = uniqid('captcha') . mt_rand(1000, 9999);
         // 生成验证码字符串

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

@@ -180,8 +180,8 @@ class SystemService extends Service
         return $this->app->db->name('SystemOplog')->insert([
             'node'     => NodeService::instance()->getCurrent(),
             'action'   => $action, 'content' => $content,
-            'geoip'    => $this->app->request->isCli() ? '127.0.0.1' : $this->app->request->ip(),
-            'username' => $this->app->request->isCli() ? 'cli' : $this->app->session->get('user.username', ''),
+            'geoip'    => $this->app->request->ip() ?: '127.0.0.1',
+            'username' => AdminService::instance()->getUserName() ?: '-',
         ]);
     }