diff --git a/LICENSE b/LICENSE index 2c66292..261eeb9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,201 @@ -MIT License + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -Copyright (c) 2021 walkor and contributors (see https://github.com/walkor/webman/contributors) + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: + 1. Definitions. -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README.md b/README.md index ab096c9..cc03c16 100644 --- a/README.md +++ b/README.md @@ -55,18 +55,25 @@ 1、首先将本框架直接clone到你本地,或者直接下载 ``` -git clone https://gitee.com/meystack/swiftadmin.git + * git clone https://gitee.com/meystack/swiftadmin.git + * 请使用宝塔面板或其他PHP集成环境 + * 安装Apache或者NGINX服务器 + * 安装PHP，版本 >= 7.3 <= 8.1 + * 安装PHP扩展fileinfo opcache redis imagemagick exif + * 开发环境下关闭禁用PHP函数exec、putenv、proc_open、proc_get_status、pcntl_signal[如果存在] ``` 2、Windows环境下启动开发服务 ``` -找到根目录下的Windows.bat文件，执行该文件即可启动服务。 +找到根目录下的Windows.bat文件，双击执行该文件即可启动服务。 ``` 3、Linux环境下启动开发服务 ``` 执行命令：php start.php start # 启动开发服务 执行命令：php start.php stop # 停止开发服务 执行命令：php start.php restart # 重启开发服务 -守护进程：php start.php start -d # 启动守护进程 一般为生产环境 +守护进程：php start.php start -d # 启动守护进程 一般为生产环境/修改文件后无法自动重载 + +注：当前默认只有app、config文件夹下文件内容被修改后才会自动重启，全局监听方案，请参考开发文档 ``` 4、打开浏览器输入网址，访问项目 ``` @@ -99,9 +106,6 @@ http://demo.swiftadmin.net/manage
- - - diff --git a/app/functions.php b/app/functions.php index e7be33d..a67e9ad 100644 --- a/app/functions.php +++ b/app/functions.php @@ -1029,6 +1029,10 @@ if (!function_exists('request_error')) { */ spl_autoload_register(function ($class) { + $pluginPath = plugin_path(); + if (!is_dir($pluginPath)) { + @mkdir($pluginPath,0777); + } $dirs = traverse_scanDir(plugin_path(), false); foreach ($dirs as $index => $dir) { $functions = plugin_path($dir) . 'function.php'; @@ -1048,7 +1052,7 @@ if (!function_exists('plugin_path')) { */ function plugin_path(string $string = ''): string { - return $string ? root_path('plugin/' . $string) : root_path('plugin'); + return $string ? root_path('plugin' . DIRECTORY_SEPARATOR . $string) : root_path('plugin'); } } diff --git a/app/install/controller/Index.php b/app/install/controller/Index.php index 73a1498..da3fde8 100644 --- a/app/install/controller/Index.php +++ b/app/install/controller/Index.php @@ -3,6 +3,7 @@ declare (strict_types=1); namespace app\install\controller; +use app\common\library\DataBase; use think\facade\Cache; use app\BaseController; @@ -53,7 +54,7 @@ class Index extends BaseController } return view('/index/step1', [ - 'checkEnv' => $this->checkEnv(), + 'checkEnv' => $this->checkEnv(), 'checkDirFile' => $this->checkDirFile(), ]); } @@ -187,91 +188,36 @@ class Index extends BaseController } // 读取SQL文件加载进缓存 - $mysqlPath = root_path('app/install'). 'install.sql'; + $mysqlPath = root_path('app/install') . 'install.sql'; $sqlRecords = file_get_contents($mysqlPath); - $sqlRecords = str_replace("\r", "\n", $sqlRecords); + $sqlRecords = str_ireplace("\r", "\n", $sqlRecords); // 替换数据库表前缀 $sqlRecords = explode(";\n", $sqlRecords); $sqlRecords = str_replace(" `__PREFIX__", " `{$mysqlInfo['prefix']}", $sqlRecords); - // 缓存任务总数 - $recordCount = count($sqlRecords); - if ($recordCount >= 1 && is_numeric($recordCount)) { - Cache::set('sqlRecords', $sqlRecords); - Cache::set('recordCount', $recordCount); - } else { - return $this->error('读取install.sql出错'); - } - - return $this->success('success'); - } - } - - /** - * 获取安装进度 - * - * @return \support\Response|void - * @throws \Psr\SimpleCache\InvalidArgumentException - */ - public function progress() - { - if (request()->isAjax()) { - - $mysqlInfo = Cache::get('mysqlInfo'); - $sqlRecords = Cache::get('sqlRecords'); - $recordCount = Cache::get('recordCount'); - - // 链接数据库 $sqlConnect = @mysqli_connect($mysqlInfo['hostname'] . ':' . $mysqlInfo['hostport'], $mysqlInfo['username'], $mysqlInfo['password']); mysqli_select_db($sqlConnect, $mysqlInfo['database']); mysqli_query($sqlConnect, "set names utf8mb4"); - $key = input('key') ?? 1; - if (isset($sqlRecords[$key - 1])) { - - $sqlLine = trim($sqlRecords[$key - 1]); + foreach ($sqlRecords as $index => $sqlLine) { + $sqlLine = trim($sqlLine); if (!empty($sqlLine)) { try { // 创建表数据 - if (substr($sqlLine, 0, 12) == 'CREATE TABLE') { - $name = preg_replace("/^CREATE TABLE `(\w+)` .*/s", "\\1", $sqlLine); - $msg = "创建数据表 {$name}..."; - - if (mysqli_query($sqlConnect, $sqlLine) !== false) { - $msg .= '成功！'; - } else { - $msg .= '失败！'; - } - } else { - if (mysqli_query($sqlConnect, $sqlLine) === false) { - throw new \Exception(mysqli_error($sqlConnect)); - } + if (mysqli_query($sqlConnect, $sqlLine) === false) { + throw new \Exception(mysqli_error($sqlConnect)); } } catch (\Throwable $th) { return $this->error($th->getMessage()); } } - - // 修改初始化密码 - if ($key == ($recordCount - 1)) { - $pwd = encryptPwd($mysqlInfo['pwd']); - mysqli_query($sqlConnect, "UPDATE {$mysqlInfo['prefix']}admin SET pwd='{$pwd}' where id = 1"); - } - - // 更新进度 - $progress = round(($key / $recordCount) * 100) . '%'; - $result = [ - 'code' => 200, - 'total' => $recordCount, - 'key' => $key, - 'msg' => $msg ?? '', - 'progress' => $progress, - ]; - - Cache::set('progress', $progress); - return json($result); } + + $pwd = encryptPwd($mysqlInfo['pwd']); + mysqli_query($sqlConnect, "UPDATE {$mysqlInfo['prefix']}admin SET pwd='{$pwd}' where id = 1"); + + return $this->success('success'); } } @@ -302,7 +248,7 @@ class Index extends BaseController // 清理安装包 Cache::clear(); - recursive_delete(root_path('app/install')); + recursive_delete(root_path('app' . DIRECTORY_SEPARATOR . 'install')); system_reload(); } catch (\Throwable $th) { return $this->error($th->getMessage()); diff --git a/app/install/view/index/index.html b/app/install/view/index/index.html index 77e149a..4355060 100644 --- a/app/install/view/index/index.html +++ b/app/install/view/index/index.html @@ -16,7 +16,7 @@
-

SwiftAdmin

+

SwiftAdmin

安装向导
diff --git a/app/install/view/index/step1.html b/app/install/view/index/step1.html index 6ebfa46..065ec34 100644 --- a/app/install/view/index/step1.html +++ b/app/install/view/index/step1.html @@ -16,7 +16,7 @@
-

SwiftAdmin

+

SwiftAdmin

安装向导
diff --git a/app/install/view/index/step2.html b/app/install/view/index/step2.html index ce60076..cbe34f2 100644 --- a/app/install/view/index/step2.html +++ b/app/install/view/index/step2.html @@ -16,7 +16,7 @@
-

SwiftAdmin

+

SwiftAdmin

安装向导
diff --git a/app/install/view/index/step3.html b/app/install/view/index/step3.html index 7b188ef..f2a2bf1 100644 --- a/app/install/view/index/step3.html +++ b/app/install/view/index/step3.html @@ -16,12 +16,11 @@
-

SwiftAdmin

+

SwiftAdmin

安装向导
-
@@ -51,14 +50,8 @@
-
正在安装，请稍后...
-
-
-
- -
  • 创建数据表...
    • +
    正在安装，请勿刷新...
    -