fix: 减少 glob 和 realpath 等函数的使用，方便后续 phar 使用。

zoujingli · Sep 1, 2024 · 19028ae · 19028ae
1 parent 7497620
commit 19028ae
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/plugin/think-library/src/service/ModuleService.php b/plugin/think-library/src/service/ModuleService.php
@@ -78,7 +78,7 @@ public static function getModules(array $data = []): array
     {
         $path = Library::$sapp->getBasePath();
         foreach (scandir($path) as $item) if ($item[0] !== '.') {
-            if (is_dir(realpath($path . $item))) $data[] = $item;
+            if (is_dir($path . $item)) $data[] = $item;
         }
         return $data;
     }

diff --git a/plugin/think-plugs-admin/src/controller/api/Plugs.php b/plugin/think-plugs-admin/src/controller/api/Plugs.php
@@ -56,7 +56,7 @@ public function icon()
             }
         }
         $this->field = $this->app->request->get('field', 'icon');
-        $this->fetch(realpath(__DIR__ . '/../../view/api/icon.html'));
+        $this->fetch(dirname(__DIR__, 2) . '/view/api/icon.html');
     }
 
     /**

diff --git a/plugin/think-plugs-admin/src/controller/api/Upload.php b/plugin/think-plugs-admin/src/controller/api/Upload.php
@@ -52,10 +52,9 @@ public function index(): Response
         $allows = str2arr(sysconf('storage.allow_exts|raw'));
         if (empty($uuid) && $unid > 0) $allows = array_intersect($exts, $allows);
         foreach ($allows as $ext) $data['exts'][$ext] = Storage::mime($ext);
-        $template = realpath(__DIR__ . '/../../view/api/upload.js');
         $data['exts'] = json_encode($data['exts'], JSON_UNESCAPED_UNICODE);
         $data['nameType'] = sysconf('storage.name_type|raw') ?: 'xmd5';
-        return view($template, $data)->contentType('application/x-javascript');
+        return view(dirname(__DIR__, 2) . '/view/api/upload.js', $data)->contentType('application/x-javascript');
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,7 +56,7 @@ public function icon() @@
                 }
             }
             $this->field = $this->app->request->get('field', 'icon');
-            $this->fetch(realpath(__DIR__ . '/../../view/api/icon.html'));
+            $this->fetch(dirname(__DIR__, 2) . '/view/api/icon.html');
         }
         /**
@@ Expand Down @@