diff --git a/public/.htaccess b/.htaccess similarity index 100% rename from public/.htaccess rename to .htaccess diff --git a/_composer.cmd b/_composer.cmd index 3eaf80490..37ce0dea9 100644 --- a/_composer.cmd +++ b/_composer.cmd @@ -1,6 +1,6 @@ :: Composer 安装更新脚本 @title Composer Install -@rmdir /s/q vendor thinkphp +@rmdir /s/q vendor thinkphp composer.lock @echo ========= 下载并安装插件 ========= @composer update --profile --prefer-dist --optimize-autoloader @echo ========= 压缩并发布插件 ========= diff --git a/application/admin/controller/Plugs.php b/application/admin/controller/Plugs.php index cabd73b64..e7ca2c970 100644 --- a/application/admin/controller/Plugs.php +++ b/application/admin/controller/Plugs.php @@ -63,7 +63,7 @@ class Plugs extends BasicAdmin { public function upload() { if ($this->request->isPost()) { $md5s = str_split($this->request->post('md5'), 16); - if (($info = $this->request->file('file')->move('upload' . DS . $md5s[0], $md5s[1], true))) { + if (($info = $this->request->file('file')->move('static' . DS . 'upload' . DS . $md5s[0], $md5s[1], true))) { $filename = join('/', $md5s) . '.' . $info->getExtension(); $site_url = FileService::getFileUrl($filename, 'local'); if ($site_url) { diff --git a/extend/service/FileService.php b/extend/service/FileService.php index 122f2b36d..4d2a7df72 100644 --- a/extend/service/FileService.php +++ b/extend/service/FileService.php @@ -119,7 +119,7 @@ class FileService { if ('' != $root) { $root = '/' . ltrim($root, '/'); } - return ($request->isSsl() ? 'https' : 'http') . '://' . $request->host() . "{$root}/upload/"; + return ($request->isSsl() ? 'https' : 'http') . '://' . $request->host() . "{$root}/static/upload/"; } /** @@ -139,7 +139,7 @@ class FileService { static public function hasFile($filename, $storage = null) { switch (empty($storage) ? sysconf('storage_type') : $storage) { case 'local': - return file_exists(ROOT_PATH . 'public/upload/' . $filename); + return file_exists(ROOT_PATH . 'static/upload/' . $filename); case 'qiniu': $auth = new Auth(sysconf('storage_qiniu_access_key'), sysconf('storage_qiniu_secret_key')); $bucketMgr = new BucketManager($auth); @@ -158,7 +158,7 @@ class FileService { static public function readFile($filename, $storage = null) { switch (empty($storage) ? sysconf('storage_type') : $storage) { case 'local': - $filepath = ROOT_PATH . 'public/upload/' . $filename; + $filepath = ROOT_PATH . 'static/upload/' . $filename; if (file_exists($filepath)) { return file_get_contents($filepath); } @@ -193,7 +193,7 @@ class FileService { * @return string */ static public function local($filename, $bodycontent) { - $filepath = ROOT_PATH . 'public/upload/' . $filename; + $filepath = ROOT_PATH . 'static/upload/' . $filename; try { !file_exists(dirname($filepath)) && mkdir(dirname($filepath), '0755', true); if (file_put_contents($filepath, $bodycontent)) { diff --git a/public/index.php b/index.php similarity index 82% rename from public/index.php rename to index.php index 275db6f82..01425bb12 100644 --- a/public/index.php +++ b/index.php @@ -14,7 +14,12 @@ /* SESSION浼氳瘽鍚嶇О */ session_name(md5(__FILE__)); + /* 瀹氫箟搴旂敤鐩綍 */ -define('APP_PATH', dirname(__DIR__) . '/application/'); +define('APP_PATH', __DIR__ . '/application/'); + +/* 瀹氫箟Runtime杩愯鐩綍 */ +define('RUNTIME_PATH', __DIR__ . '/static/~runtime/'); + /* 鍔犺浇妗嗘灦寮曞鏂囦欢 */ -require dirname(__DIR__) . '/thinkphp/start.php'; +require __DIR__ . '/thinkphp/start.php'; diff --git a/public/MP_verify_jEBPQR2mtMH4lwUJ.txt b/public/MP_verify_jEBPQR2mtMH4lwUJ.txt deleted file mode 100644 index 1f6a1a972..000000000 --- a/public/MP_verify_jEBPQR2mtMH4lwUJ.txt +++ /dev/null @@ -1 +0,0 @@ -jEBPQR2mtMH4lwUJ \ No newline at end of file diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index e71815a66..000000000 Binary files a/public/favicon.ico and /dev/null differ diff --git a/public/robots.txt b/public/robots.txt deleted file mode 100644 index eb0536286..000000000 --- a/public/robots.txt +++ /dev/null @@ -1,2 +0,0 @@ -User-agent: * -Disallow: diff --git a/public/router.php b/public/router.php deleted file mode 100644 index c527f56bc..000000000 --- a/public/router.php +++ /dev/null @@ -1,19 +0,0 @@ -classMap[$class])) { return $this->classMap[$class]; } - if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) { + if ($this->classMapAuthoritative) { return false; } $file = $this->findFileWithExtension($class, '.php'); // Search for Hack files if we are running on HHVM - if (false === $file && defined('HHVM_VERSION')) { + if ($file === null && defined('HHVM_VERSION')) { $file = $this->findFileWithExtension($class, '.hh'); } - if (false === $file) { + if ($file === null) { // Remember that this class does not exist. - $this->missingClasses[$class] = true; + return $this->classMap[$class] = false; } return $file; @@ -399,8 +399,6 @@ class ClassLoader if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) { return $file; } - - return false; } } diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index dc65ade6c..b497e96f1 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitedb255df1ff85fad4659bb49224ffba7 +class ComposerAutoloaderInit5b507475abadaa513a875abacd8b8aee { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInitedb255df1ff85fad4659bb49224ffba7 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitedb255df1ff85fad4659bb49224ffba7', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit5b507475abadaa513a875abacd8b8aee', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitedb255df1ff85fad4659bb49224ffba7', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit5b507475abadaa513a875abacd8b8aee', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION'); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInitedb255df1ff85fad4659bb49224ffba7::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit5b507475abadaa513a875abacd8b8aee::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInitedb255df1ff85fad4659bb49224ffba7 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitedb255df1ff85fad4659bb49224ffba7::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit5b507475abadaa513a875abacd8b8aee::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequireedb255df1ff85fad4659bb49224ffba7($fileIdentifier, $file); + composerRequire5b507475abadaa513a875abacd8b8aee($fileIdentifier, $file); } return $loader; } } -function composerRequireedb255df1ff85fad4659bb49224ffba7($fileIdentifier, $file) +function composerRequire5b507475abadaa513a875abacd8b8aee($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index b895858eb..63fed9738 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitedb255df1ff85fad4659bb49224ffba7 +class ComposerStaticInit5b507475abadaa513a875abacd8b8aee { public static $files = array ( '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', @@ -313,9 +313,9 @@ class ComposerStaticInitedb255df1ff85fad4659bb49224ffba7 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitedb255df1ff85fad4659bb49224ffba7::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitedb255df1ff85fad4659bb49224ffba7::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitedb255df1ff85fad4659bb49224ffba7::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit5b507475abadaa513a875abacd8b8aee::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit5b507475abadaa513a875abacd8b8aee::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit5b507475abadaa513a875abacd8b8aee::$classMap; }, null, ClassLoader::class); }