优化

pfinal · May 26, 2018 · b9a96ac · b9a96ac
1 parent d60b79e
commit b9a96ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/MyHttp.php b/src/MyHttp.php
@@ -94,7 +94,7 @@ public function rename($key, $newKey)
         $res = $client->post($this->api, $this->appendSign(array(
             'action' => 'move',
             'key' => $key,
-            'newKey' => $key,
+            'newKey' => $newKey,
         )));
 
         $this->error = $res->getBody();
@@ -121,7 +121,7 @@ public function copy($key, $newKey)
         $res = $client->post($this->api, $this->appendSign(array(
             'action' => 'copy',
             'key' => $key,
-            'newKey' => $key,
+            'newKey' => $newKey,
         )));
 
         $this->error = $res->getBody();

diff --git a/src/MyHttpTrait.php b/src/MyHttpTrait.php
@@ -107,10 +107,10 @@ private function _doUpload(Request $request)
     private function checkFilename($filename)
     {
         // 必须限定在baseDir目录内，不能出现 ..
-        // (\w+\/)* 目录可有可无
-        // \w+ 文件名必须有
+        // ([\w\-]+\/)* 目录可有可无  (字母 数字 下划线 中杠)
+        // [\w\-]+ 文件名必须有
         // (\.\w+)*  扩展名可有可无
-        if (!preg_match('/^(\w+\/)*\w+(\.\w+)*$/', $filename)) {
+        if (!preg_match('/^([\w\-]+\/)*[\w\-]+(\.\w+)*$/', $filename)) {
             throw new \Exception('filename error');
         }
     }