blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

[更新]修改服务器URL根计算方法

Browse Source
This commit is contained in:
Anyon 2017-09-13 10:10:06 +08:00
parent 3b91c084d9
commit c8015228ee
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extend/hook/FilterView.php
View File

@ -40,7 +40,7 @@ class FilterView
{ {
$this->request = Request::instance(); $this->request = Request::instance();
list($appRoot, $uriSelf) = [$this->request->root(true), $this->request->url(true)]; list($appRoot, $uriSelf) = [$this->request->root(true), $this->request->url(true)];
$uriRoot = strpos($appRoot, EXT) ? ltrim(dirname($appRoot), DS) : $appRoot; $uriRoot = preg_match('/\.php$/', $appRoot) ? dirname($appRoot) : $appRoot;
$uriStatic = "{$uriRoot}/static"; $uriStatic = "{$uriRoot}/static";
$replace = ['__APP__' => $appRoot, '__SELF__' => $uriSelf, '__PUBLIC__' => $uriRoot, '__STATIC__' => $uriStatic]; $replace = ['__APP__' => $appRoot, '__SELF__' => $uriSelf, '__PUBLIC__' => $uriRoot, '__STATIC__' => $uriStatic];
$params = str_replace(array_keys($replace), array_values($replace), $params); $params = str_replace(array_keys($replace), array_values($replace), $params);

10
extend/service/FileService.php
View File

@ -131,13 +131,9 @@ class FileService
*/ */
public static function getBaseUriLocal() public static function getBaseUriLocal()
{ {
$request = request(); $appRoot = request()->root(true);
$base = $request->root(); $uriRoot = preg_match('/\.php$/', $appRoot) ? dirname($appRoot) : $appRoot;
$root = strpos($base, '.') ? ltrim(dirname($base), DS) : $base; return "{$uriRoot}/static/upload/";
if ('' != $root) {
$root = '/' . ltrim($root, '/');
}
return ($request->isSsl() ? 'https' : 'http') . '://' . $request->host() . "{$root}/static/upload/";
} }
/** /**