From e11c4a4456905c435de3106eb0a25489d0f5c73b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Sun, 15 Jan 2023 23:22:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=80=A7=EF=BC=9A=E8=A7=84=E8=8C=83HT?= =?UTF-8?q?ML=E6=A0=87=E7=AD=BE=E6=A0=BC=E5=BC=8F=E5=8F=8A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=AE=B8=E5=8F=AF=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 202 +++++++++++++++++++++++++ README.md | 2 +- app/Console/Commands/Panel.php | 8 +- resources/views/cron.blade.php | 8 +- resources/views/plugin.blade.php | 4 +- resources/views/safe.blade.php | 10 +- resources/views/setting.blade.php | 16 +- resources/views/website/add.blade.php | 6 +- resources/views/website/edit.blade.php | 10 +- resources/views/website/list.blade.php | 2 +- 10 files changed, 235 insertions(+), 33 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..7a4a3ea2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "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. \ No newline at end of file diff --git a/README.md b/README.md index 417dd047..daba5be5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ 耗子Linux面板 =============== -#### 这是耗子Linux面板的开源仓库，基于AGPLv3协议进行开源，目前处于积极开发状态。 +#### 这是耗子Linux面板的开源仓库，基于Apache License 2.0协议进行开源，目前处于积极开发状态。 ## 运行环境 diff --git a/app/Console/Commands/Panel.php b/app/Console/Commands/Panel.php index afe33546..c947fd08 100644 --- a/app/Console/Commands/Panel.php +++ b/app/Console/Commands/Panel.php @@ -261,10 +261,10 @@ class Panel extends Command return; } // 入库 - Plugin::query()->create([ - 'slug' => $pluginSlug, - 'show' => 0, - ]); + Plugin::query()->updateOrCreate( + ['slug' => $pluginSlug], + ['show' => 0] + ); $this->info('成功'); } diff --git a/resources/views/cron.blade.php b/resources/views/cron.blade.php index 3a2125cf..6428e998 100644 --- a/resources/views/cron.blade.php +++ b/resources/views/cron.blade.php @@ -9,7 +9,7 @@
+ autocomplete="off" class="layui-input">
请填写任务名称
@@ -17,7 +17,7 @@
+ lay-verify="required" placeholder="请选择或输入cron表达式" class="layui-input">
请务必正确填写执行周期
@@ -53,7 +53,7 @@ lay-filter="cron-status" value="@{{ d.status }}" data-id="@{{ d.id }}" @{{ d.status== - 1 ? 'checked' : '' }} /> + 1 ? 'checked' : '' }}> @@ -154,7 +154,7 @@ , id: 'cron-log' , - content: '任务名    
    执行周期    
' + data.script + '

' + content: '任务名    
    执行周期    
' + data.script + '

' , success: function (layero, index) { cronEditScriptEditor = ace.edit("cron-edit-script-editor", { diff --git a/resources/views/plugin.blade.php b/resources/views/plugin.blade.php index b384e932..ea6c0429 100644 --- a/resources/views/plugin.blade.php +++ b/resources/views/plugin.blade.php @@ -32,7 +32,7 @@ lay-filter="plugin-show-home" value="@{{ d.show }}" data-plugin-slug="@{{ d.slug }}" @{{ d.show== - 1 ? 'checked' : '' }} /> + 1 ? 'checked' : '' }}> @@ -58,7 +58,7 @@ , {field: 'show', title: '首页显示', width: 90, templet: '#plugin-show', unresize: true} , { field: 'control', - width: 160, + width: 180, title: '操作', templet: '#panel-plugin-control', fixed: 'right', diff --git a/resources/views/safe.blade.php b/resources/views/safe.blade.php index 8c3cd3dc..a5b9c178 100644 --- a/resources/views/safe.blade.php +++ b/resources/views/safe.blade.php @@ -6,21 +6,21 @@
防火墙 + lay-text="ON|OFF"> 启用SSH - + SSH端口
+ max=65535 disabled>
允许Ping - +
{{--
- +
API Token，用于携带访问面板接口
- +
开启后将允许多设备同时登录面板，可能具有一定安全隐患 @@ -38,35 +38,35 @@ Date: 2022-12-08
- +
修改面板的显示名称
- +
修改面板的登录用户名
- +
修改面板的登录密码（留空不修改）
- +
修改面板账号的邮箱，目前用于签发免费SSL证书
- +
修改面板的访问端口（保存后需要手动修改浏览器地址栏的端口为新端口以访问面板）
diff --git a/resources/views/website/add.blade.php b/resources/views/website/add.blade.php index ba94c19f..d4fd5d61 100644 --- a/resources/views/website/add.blade.php +++ b/resources/views/website/add.blade.php @@ -53,20 +53,20 @@ Date: 2022-12-01
- +
- +
+ class="layui-input">
diff --git a/resources/views/website/edit.blade.php b/resources/views/website/edit.blade.php index f1b7c0ed..4cb03cac 100644 --- a/resources/views/website/edit.blade.php +++ b/resources/views/website/edit.blade.php @@ -79,7 +79,7 @@ Date: 2022-12-08
+ @{{ d.params.config.open_basedir== 1 ? 'checked' : '' }}>
@@ -96,7 +96,7 @@ Date: 2022-12-08
+ @{{ d.params.config.waf== 1 ? 'checked' : '' }}>
只有打开了总开关，下面的设置才会生效！
@@ -131,7 +131,7 @@ Date: 2022-12-08
+ @{{ d.params.config.ssl== 1 ? 'checked' : '' }}>
只有打开了总开关，下面的设置才会生效！
@@ -141,14 +141,14 @@ Date: 2022-12-08
+ @{{ d.params.config.http_redirect== 1 ? 'checked' : '' }}>
+ @{{ d.params.config.hsts== 1 ? 'checked' : '' }}>
diff --git a/resources/views/website/list.blade.php b/resources/views/website/list.blade.php index dbb3a41f..2dc007a2 100644 --- a/resources/views/website/list.blade.php +++ b/resources/views/website/list.blade.php @@ -31,7 +31,7 @@ Date: 2022-11-28 + @{{ d.status== 1 ? 'checked' : '' }}>