feat: 接口调整

chore(deps): Update module github.com/bytedance/sonic to v1.10.2

See merge request haozi-team/panel!21

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+open_collective: haozi-panel
+custom: ['https://afdian.net/a/haozi-team']

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -58,7 +58,7 @@ body:
     attributes:
       label: 耗子面板版本 (HaoZi Panel Version)
       description: |
-        请提供耗子面板的版本号。
+        请提供面板的版本号。
         Please provide the version number of the panel.
       placeholder: "2.0.0"
     validations:

.github/dependabot.yml

@@ -1,25 +0,0 @@
-# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-version: 2
-updates:
-  - package-ecosystem: gomod
-    directory: /
-    labels:
-      - "🤖 Dependencies"
-    schedule:
-      interval: daily
-    groups:
-      go-modules:
-        patterns:
-          - "*"
-    open-pull-requests-limit: 100
-  - package-ecosystem: github-actions
-    directory: /
-    labels:
-      - "🤖 Dependencies"
-    schedule:
-      interval: daily
-    groups:
-      github-actions:
-        patterns:
-          - "*"
-    open-pull-requests-limit: 100

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
         goarch: [ amd64, arm64 ]
       fail-fast: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           cache: true

.github/workflows/codecov.yml

@@ -8,7 +8,7 @@ jobs:
   codecov:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           go-version: 'stable'

.github/workflows/cr.yml

@@ -1,22 +0,0 @@
-name: Code Review
-
-permissions:
-  contents: read
-  pull-requests: write
-
-on:
-  pull_request:
-    types: [ opened, reopened, synchronize, labeled ]
-
-jobs:
-  test:
-    if: ${{ contains(github.event.pull_request.labels.*.name, '🚀 Review Ready') }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: anc95/ChatGPT-CodeReview@main
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-          OPENAI_API_ENDPOINT: https://api.openai-sb.com/v1
-          MODEL: gpt-3.5-turbo
-          PROMPT: "Below is a code patch, please help me do a brief code review on it. Only answer important bug risks and/or important improvement suggestions, Answer in Chinese and answer must be concisely and short: "

.github/workflows/goreleaser.yml

@@ -10,15 +10,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
           go-version: 'stable'
+      - name: Fetch Frontend
+        run: |
+          sudo apt-get install -y curl jq unzip zip
+          curl -sSL https://api.github.com/repos/haozi-team/panel-frontend/releases/latest | jq -r ".assets[] | select(.name | contains(\"dist\")) | .browser_download_url" | xargs curl -L -o frontend.zip
+          rm -rf public
+          unzip frontend.zip
+          mv dist public
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v4
+        uses: goreleaser/goreleaser-action@v5
         with:
           version: latest
           args: release --clean

.github/workflows/issue-auto-reply.yml

@@ -27,7 +27,7 @@ jobs:
             我们认为您的建议非常有价值！欢迎提交 PR，请包含相应的测试用例、文档等，并确保 CI 通过，感谢和期待您的贡献！
             We think your suggestion is very valuable! Welcome to submit a PR, please include test cases, documentation, etc., and ensure that the CI is passed, thank you and look forward to your contribution! 
             
-            "Talk is cheap, Show me the Code." - Linus Torvalds
+            ![aoligei](https://github.com/haozi-team/panel/assets/115467771/fb04debf-3f4c-4fac-a0b8-c3455f8e57a0)
       - name: ☢️ Bug
         if: github.event.label.name == '☢️ Bug'
         uses: actions-cool/issues-helper@v3
@@ -41,4 +41,4 @@ jobs:
             我们认为您的反馈非常有价值！欢迎提交 PR，请包含相应的测试用例、文档等，并确保 CI 通过，感谢和期待您的贡献！
             We think your feedback is very valuable! Welcome to submit a PR, please include test cases, documentation, etc., and ensure that the CI is passed, thank you and look forward to your contribution! 
             
-            "Talk is cheap, Show me the Code." - Linus Torvalds
+            ![aoligei](https://github.com/haozi-team/panel/assets/115467771/fb04debf-3f4c-4fac-a0b8-c3455f8e57a0)

.github/workflows/lint.yml

@@ -11,7 +11,7 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           go-version: 'stable'

.github/workflows/pr-check-title.yml

@@ -1,11 +0,0 @@
-name: PR Check Title
-on:
-  pull_request:
-jobs:
-  pr-check-title:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: Slashgear/action-check-pr-title@v4.3.0
-        with:
-          regexp: "^(feat|fix|docs|style|refactor|perf|test|workflow|build|ci|chore|types|wip|release|revert)(\\(.+\\))?!?: .+"
-          helpMessage: "Your PR title is invalid. Please follow the Conventional Commits specification: https://www.conventionalcommits.org/zh-hans/v1.0.0/"

.github/workflows/test.yml

@@ -8,11 +8,15 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           go-version: 'stable'
       - name: Install dependencies
-        run: go mod tidy
+        run: sudo apt-get install -y curl jq
+      - name: Set up environment
+        run: |
+          cp panel-example.conf .env
+          go run . artisan key:generate
       - name: Run tests
         run: go test ./...

.gitignore

@@ -1,8 +1,6 @@
 tmp
-.env
-.history
-.air.toml
-panel.conf
+/.air.toml
+/panel.conf
 
 # Golang #
 # `go test -c` 生成的二进制文件
@@ -23,7 +21,7 @@ _cgo_export.*
 *.exe
 *.o
 *.so
-panel
+/panel
 
 # 压缩包 #
 # Git 自带压缩,如果这些压缩包里有代码,建议解压后 commit
@@ -73,3 +71,4 @@ __debug_bin
 # 前端工具链 #
 .sass-cache/*
 node_modules/
+/public

.gitlab-ci.yml

@@ -23,6 +23,7 @@ variables:
 stages:
   - prepare
   - build
+  - release
 
 golangci_lint:
   stage: prepare
@@ -37,6 +38,13 @@ unit_test:
   extends: .go_cache
   allow_failure: true
   script:
+    - rm -rf /etc/apt/sources.list
+    - rm -rf /etc/apt/sources.list.d/*
+    - wget -O /etc/apt/sources.list https://mirrors.ustc.edu.cn/repogen/conf/debian-http-4-bookworm
+    - apt-get update
+    - apt-get install -y curl jq
+    - cp panel-example.conf .env
+    - go run . artisan key:generate
     - go test -v -coverprofile=coverage.txt -covermode=atomic ./...
 
 build:
@@ -49,4 +57,38 @@ build:
     name: "$OUTPUT_NAME"
     paths:
       - $OUTPUT_NAME
-    expire_in: 1 week
+    expire_in: 3 days
+
+fetch:
+  stage: build
+  image: alpine:latest
+  before_script:
+    - sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories
+    - apk add --no-cache curl jq unzip zip
+  script:
+    - curl -sSL "https://jihulab.com/api/v4/projects/haozi-team%2Fpanel-frontend/releases" | jq -r '.[0].assets.links[] | select(.name | contains("dist")) | .direct_asset_url' | xargs curl -L -o frontend.zip
+    - rm -rf public
+    - unzip frontend.zip
+    - mv dist public
+  artifacts:
+    name: "frontend"
+    paths:
+      - public
+    expire_in: 3 days
+
+release:
+  stage: release
+  dependencies:
+    - build
+    - fetch
+  image:
+    name: goreleaser/goreleaser
+    entrypoint: [ '' ]
+  only:
+    - tags
+  variables:
+    # Disable shallow cloning so that goreleaser can diff between tags to
+    # generate a changelog.
+    GIT_DEPTH: 0
+  script:
+    - goreleaser release --clean

.goreleaser.yaml

@@ -5,6 +5,7 @@ builds:
     binary: panel
     env:
       - CGO_ENABLED=0
+      - GOPROXY=https://goproxy.cn,direct
     goos:
       - linux
     goarch:
@@ -12,7 +13,6 @@ builds:
       - arm64
     goamd64:
       - v2
-      - v3
     ldflags:
       - -s -w --extldflags "-static -fpic"
 archives:
@@ -23,7 +23,6 @@ archives:
     format: zip
     wrap_in_directory: false
     strip_parent_binary_folder: true
-    rlcp: true
     files:
       - LICENSE
       - public/*
@@ -31,3 +30,21 @@ archives:
       - database/*
       - scripts/*
       - panel-example.conf
+
+gitlab_urls:
+  api: https://jihulab.com/api/v4/
+  download: https://jihulab.com
+
+  # set to true if you use a self-signed certificate
+  skip_tls_verify: false
+
+  # set to true if you want to upload to the Package Registry rather than attachments
+  # Only works with GitLab 13.5+
+  #
+  # Since: v1.3
+  use_package_registry: true
+
+  # Set this if you set GITLAB_TOKEN to the value of CI_JOB_TOKEN.
+  #
+  # Since: v1.11
+  use_job_token: true

CODE_OF_CONDUCT.md

@@ -0,0 +1,17 @@
+## 行为准则
+
+耗子Linux面板遵守业界通用的行为准则。任何违反行为准则的行为都可以报告给我们：
+
+- 参与者将容忍反对意见。
+- 参与者必须确保他们的语言和行为没有人身攻击和贬低个人言论。
+- 在解释他人的言行时，参与者应始终保持良好的意图。
+- 不能容忍可合理视为骚扰的行为。
+
+## Code of Conduct
+
+The HaoZi Linux Panel complies with the industry's common code of conduct. Any breach of the Code of Conduct can be reported to us:
+
+- Participants will be tolerant of opposing views.
+- Participants must ensure that their language and actions are free of personal attacks and disparaging personal remarks.
+- When interpreting the words and actions of others, participants should always assume good intentions.
+- Behavior that can be reasonably considered harassment will not be tolerated.

LICENSE

@@ -1,202 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+                            Preamble
 
-   1. Definitions.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
 
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-      "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.
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
 
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
 
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
 
-      "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.
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
 
-      "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).
+  The precise terms and conditions for copying, distribution and
+modification follow.
 
-      "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.
+                       TERMS AND CONDITIONS
 
-      "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."
+  0. Definitions.
 
-      "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.
+  "This License" refers to version 3 of the GNU Affero General Public License.
 
-   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.
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
 
-   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.
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
 
-   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:
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
 
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
 
-      (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
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
 
-      (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.
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
 
-      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.
+  1. Source Code.
 
-   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.
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
 
-   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.
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
 
-   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.
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
 
-   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.
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
 
-   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.
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
 
-   END OF TERMS AND CONDITIONS
+  The Corresponding Source for a work in source code form is that
+same work.
 
-   APPENDIX: How to apply the Apache License to your work.
+  2. Basic Permissions.
 
-      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.
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
 
-   Copyright 2022 HaoZi Technology Co., Ltd.
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
 
-   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
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
 
-       http://www.apache.org/licenses/LICENSE-2.0
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 
-   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 covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

README.md

@@ -1,73 +1,131 @@
-# 耗子Linux面板
+<h1 align="center">耗子 Linux 面板</h1>
 
-[![Release](https://img.shields.io/github/release/HaoZi-Team/Panel.svg)](https://github.com/HaoZi-Team/Panel/releases)
-[![Test](https://github.com/HaoZi-Team/Panel/actions/workflows/test.yml/badge.svg)](https://github.com/HaoZi-Team/Panel/actions)
-[![Report Card](https://goreportcard.com/badge/github.com/HaoZi-Team/Panel)](https://goreportcard.com/report/github.com/HaoZi-Team/Panel)
-[![Codecov](https://codecov.io/gh/HaoZi-Team/Panel/branch/main/graph/badge.svg?token=XFT5NGNSRG)](https://codecov.io/gh/HaoZi-Team/Panel)
-![License](https://img.shields.io/github/license/HaoZi-Team/Panel)
+<p align="center">
+  <a href="https://github.com/haozi-team/panel/releases"><img src="https://img.shields.io/github/release/haozi-team/panel.svg"></a>
+  <a href="https://github.com/haozi-team/panel/actions"><img src="https://github.com/haozi-team/panel/actions/workflows/test.yml/badge.svg"></a>
+  <a href="https://goreportcard.com/report/github.com/haozi-team/panel"><img src="https://goreportcard.com/badge/github.com/haozi-team/panel"></a>
+  <a href="https://codecov.io/gh/haozi-team/panel"><img src="https://codecov.io/gh/haozi-team/panel/branch/main/graph/badge.svg?token=XFT5NGNSRG"></a>
+  <a href="https://img.shields.io/github/license/haozi-team/panel"><img src="https://img.shields.io/github/license/haozi-team/panel"></a>
+</p>
 
-这是耗子Linux面板的开源仓库，基于Apache License 2.0协议进行开源，目前处于积极开发状态。
+<p align="center">
+[简体中文] | [<a href="README_EN.md">English</a>]
+</p>
 
-#### 交流QQ群：[12370907](https://jq.qq.com/?_wv=1027&k=I1oJKSTH) | QQ频道：[耗子](https://pd.qq.com/s/fyol46wfy)
+耗子 Linux 面板是针对我们自身业务需要使用 Golang 开发的轻量 Linux 服务器运维管理面板，以 GNU Affero General Public License v3.0 开源。
 
-广告： [`WeAvatar` 多端多元化的统一头像服务](https://weavatar.com)
+免责声明：严禁使用耗子 Linux 面板从事任何非法活动，非法站点请勿向我们请求任何形式的技术支持，如果在技术支持过程中发现非法内容，我们将立即停止技术支持并留存相关证据。
+
+交流QQ群：[12370907](https://jq.qq.com/?_wv=1027&k=I1oJKSTH) | QQ频道：[pd.qq.com/s/fyol46wfy](https://pd.qq.com/s/fyol46wfy)
+
+## 重要说明
+
+目前我们正在重构面板前端部分开发 2.1 版本，v2.0.58 将是 2.0 的最后一个版本。
+
+新前端将使用 Vue + Naive UI 开发，预计 10 月底可以完成。
+
+存量用户请尽快更新至 v2.0.58，以便后续升级到 2.1 版本。
 
 ## 运行环境
 
-面板仅支持主流 `amd64` | `arm64` 系统的最新版本，且随着系统版本的更新，面板也会逐步停止对旧版本的支持。
+耗子Linux面板仅支持 `amd64` | `arm64` 架构下的主流系统的最新版本，不支持 `Ubuntu`，因为其发版太过频繁，难以维护。
 
-不支持 `Ubuntu`，因为其发版太频繁，难以维护。
+低配机器建议使用 `Debian`，资源占用较 `RHEL` 系更低。其他机器建议使用 `AlmaLinux` | `RockyLinux`，维护周期更长也更稳定。
 
-低配机器建议使用 `Debian`，资源占用较 `RHEL` 系更低。其他机器建议使用 `RockyLinux` | `AlmaLinux`，维护周期更长。
+不在下表中的其他系统（OpenCloudOS 8、Anolis 8、CentOS Stream 8/9、Debian 11等），可自行尝试安装，但不保证能够正常运行，且不提供无偿技术支持（理论上不会有大问题）。
 
-不在下表中的其他同版本的 `RHEL` 系统（OpenCloudOS、Anolis、CentOS Stream等），可自行尝试安装，但不保证能够正常运行，且不提供技术支持。
+CentOS Stream 可使用迁移脚本迁移至支持的系统: [CentOS 8/9 迁移脚本](https://github.com/haozi-team/byecentos)
 
 | 系统         | 版本 |
 |------------|----|
-| RockyLinux | 9  |
+| RHEL       | 9  |
 | AlmaLinux  | 9  |
+| RockyLinux | 9  |
 | Debian     | 12 |
 
+随着系统版本的不断更新，我们亦可能会终止部分过于老旧的系统的支持，以保证面板的稳定性。
+
 ## 安装面板
 
+安装面板前，你需要了解LNMP环境的基本知识，以及如何处理常见的LNMP环境问题，不建议0基础的用户安装和使用耗子Linux面板（[推荐: 宝塔 - 简单好用服务器运维面板](https://www.bt.cn/?invite_code=M190eXRpZWE=)）。
+
+如果你决定继续，请以`root`用户登录服务器，执行以下命令安装面板：
 
 ```shell
-bash <(curl -sSL https://dl.cdn.haozi.net/panel/install_panel.sh)
+HAOZI_DL_URL="https://jihulab.com/haozi-team/download/-/raw/main/panel"; curl -sSL -O ${HAOZI_DL_URL}/install_panel.sh && curl -sSL -O ${HAOZI_DL_URL}/install_panel.sh.checksum.txt && sha256sum -c install_panel.sh.checksum.txt && bash install_panel.sh || echo "Checksum 验证失败，文件可能被篡改，已终止操作"
 ```
 
+## 卸载面板
+
+优先建议备份数据重装系统，这样可以保证系统纯净。
+
+如果你无法重装系统，请以`root`用户登录服务器，执行以下命令卸载面板：
+
+```shell
+HAOZI_DL_URL="https://jihulab.com/haozi-team/download/-/raw/main/panel"; curl -sSL -O ${HAOZI_DL_URL}/uninstall_panel.sh && curl -sSL -O ${HAOZI_DL_URL}/uninstall_panel.sh.checksum.txt && sha256sum -c uninstall_panel.sh.checksum.txt && bash uninstall_panel.sh || echo "Checksum 验证失败，文件可能被篡改，已终止操作"
+```
+
+卸载面板前请务必备份好所有数据，提前卸载面板全部插件。卸载后数据将**无法恢复**！
+
 ## 日常维护
 
+使用`panel`命令进行日常维护：
+
 ```shell
 panel
 ```
 
+在 [Wiki](https://github.com/haozi-team/panel/wiki) 中查看更多使用方法和技巧。
+
 ## 问题反馈
 
-使用类问题，可在 [WePublish社区论坛](https://wepublish.cn/forums) 提问寻求帮助。
+使用类问题，可在 [WePublish 社区论坛](https://wepublish.cn/forums) 提问或QQ群`@坤坤`寻求 AI 帮助，亦可在群里寻求付费支持。
 
-对于面板自身问题，可在 GitHub 的`Issues`
-页面提交问题反馈，注意[提问的智慧](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/main/README-zh_CN.md)。
+面板自身问题，可在 GitHub 的`Issues`页面提交问题反馈，注意[提问的智慧](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/main/README-zh_CN.md)。
 
-交流QQ群：[12370907](https://jq.qq.com/?_wv=1027&k=I1oJKSTH) | QQ频道：[耗子](https://pd.qq.com/s/fyol46wfy)
+## 贡献代码
+
+### 寻找/创建 Issue
+
+您可以在 [Issue 列表](https://github.com/haozi-team/panel/issues) 中寻找或创建一个 Issue，留言表达想要处理该 Issue 的意愿，得到维护者的确认后，即可开始处理。
+
+### 创建 PR
+
+- 在开发过程中，如果遇到问题可以随时在 Issue 中详尽描述该问题，以进一步沟通，但在此之前请确保自己已通过 Google 等方式尽可能的尝试解决问题；
+- PR 须提交至我们的极狐 GitLab 仓库[https://jihulab.com/haozi-team/panel](https://jihulab.com/haozi-team/panel)，勿在 GitHub 上提交；
+- 当 PR 开发完毕后，请为其添加 `🚀 Review Ready` 标签，维护者将及时进行评审；
+- 我们非常欢迎您的贡献，将在下次发版时将您添加到首页贡献者中；❤️
 
 ## 赞助商
 
-### 服务器
-
-- [盾云](https://www.ddunyun.com/aff/PNYAXMKI)
-
 ### CDN
 
-- [盾云CDN](http://cdn.ddunyun.com/)
-
 - [无畏云加速](https://su.sctes.com/register?code=8st689ujpmm2p)
 
+- [盾云CDN](http://cdn.ddunyun.com/)
+
+### 对象存储
+
+- [又拍云](https://www.upyun.com/?utm_source=lianmeng&utm_medium=referral)
+
 ### DevOps
 
-- [极狐GitLab](https://www.jihulab.com/)
+- [极狐 GitLab](https://www.jihulab.com/)
 
-#### 接受云资源和资金赞助，可通过QQ群咨询联系
+**接受云资源和资金赞助，可通过QQ群咨询联系**
 
-## Star 趋势
+## 贡献者
 
-[![Star 趋势](https://starchart.cc/HaoZi-Team/Panel.svg)](https://starchart.cc/HaoZi-Team/Panel)
+这个项目的存在要归功于所有做出贡献的人，参与贡献请先查看贡献代码部分。
+
+<a href="https://github.com/DevHaoZi" target="_blank"><img src="https://avatars.githubusercontent.com/u/115467771?v=4" width="48" height="48"></a>
+
+## Star 历史
+
+<a href="https://star-history.com/#haozi-team/panel&Date">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=haozi-team/panel&type=Date&theme=dark" />
+    <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=haozi-team/panel&type=Date" />
+    <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=haozi-team/panel&type=Date" />
+  </picture>
+</a>

README_EN.md

@@ -0,0 +1,127 @@
+<h1 align="center">HaoZi Linux Panel</h1>
+
+<p align="center">
+  <a href="https://github.com/haozi-team/panel/releases"><img src="https://img.shields.io/github/release/haozi-team/panel.svg"></a>
+  <a href="https://github.com/haozi-team/panel/actions"><img src="https://github.com/haozi-team/panel/actions/workflows/test.yml/badge.svg"></a>
+  <a href="https://goreportcard.com/report/github.com/haozi-team/panel"><img src="https://goreportcard.com/badge/github.com/haozi-team/panel"></a>
+  <a href="https://codecov.io/gh/haozi-team/panel"><img src="https://codecov.io/gh/haozi-team/panel/branch/main/graph/badge.svg?token=XFT5NGNSRG"></a>
+  <a href="https://img.shields.io/github/license/haozi-team/panel"><img src="https://img.shields.io/github/license/haozi-team/panel"></a>
+</p>
+
+<p align="center">
+[<a href="README.md">简体中文</a>] | [English]
+</p>
+
+The HaoZi Linux Panel is a lightweight Linux server operation and maintenance management panel developed using Golang for our own business needs. It is open source under the GNU Affero General Public License v3.0 protocol.
+
+Disclaimer: It is strictly prohibited to use the HaoZi Linux Panel to engage in any illegal activities. Please do not request any form of technical support from us for illegal sites. If illegal content is discovered during the technical support process, we will immediately stop technical support and retain relevant evidence.
+
+Communication QQ group: [12370907](https://jq.qq.com/?_wv=1027&k=I1oJKSTH) | QQ channel: [pd.qq.com/s/fyol46wfy](https://pd.qq.com/s/fyol46wfy)
+
+## UI Screenshots
+
+![UI Screenshots](ui.png)
+
+## Operating Environment
+
+HaoZi Linux Panel only supports the latest version of mainstream systems under the `amd64` | `arm64` architecture. It does not support `Ubuntu` because its releases are too frequent and difficult to maintain.
+
+Recommended to use `Debian` for low-configuration machines, as its resource usage is lower than that of the `RHEL` system. For other machines, recommended to use `RockyLinux` | `AlmaLinux`, which has a longer maintenance cycle and is more stable.
+
+For other systems not in the table below (OpenCloudOS 8, Anolis 8, CentOS Stream 8/9, Debian 11, etc.), you can try to install it yourself, but normal operation is not guaranteed, and free technical support is not provided (theoretically there will be no major question).
+
+CentOS Stream can be migrated to a supported system using the migration script: [CentOS 8/9 Migration Script](https://github.com/haozi-team/byecentos)
+
+| OS         | Version |
+|------------|---------|
+| RHEL       | 9       |
+| RockyLinux | 9       |
+| AlmaLinux  | 9       |
+| Debian     | 12      |
+
+As system versions are constantly updated, we may also terminate support for some older systems to ensure the stability of the panel.
+
+## Install Panel
+
+Before installing the panel, you need to understand the basic knowledge of the LNMP environment and how to deal with common LNMP environment problems. It is not recommended for users with zero basic knowledge to install and use HaoZi Linux Panel ([Recommended: aaPanel - easy-to-use server operation and maintenance panel](https://aapanel.com)).
+
+If you decide to continue, please log in to the server as `root` user and execute the following command to install the panel:
+
+```shell
+HAOZI_DL_URL="https://jihulab.com/haozi-team/download/-/raw/main/panel"; curl -sSL -O ${HAOZI_DL_URL}/install_panel.sh && curl -sSL -O ${HAOZI_DL_URL}/install_panel.sh.checksum.txt && sha256sum -c install_panel.sh.checksum.txt && bash install_panel.sh || echo "Checksum Verification Failed, File May Have Been Tampered With, Operation Terminated"
+```
+
+## Uninstall Panel
+
+Recommended to back up data and reinstall the system first, so that the system can be kept clean.
+
+If you are unable to reinstall the system, log in to the server as the `root` user and execute the following command to uninstall the panel:
+
+```shell
+HAOZI_DL_URL="https://jihulab.com/haozi-team/download/-/raw/main/panel"; curl -sSL -O ${HAOZI_DL_URL}/uninstall_panel.sh && curl -sSL -O ${HAOZI_DL_URL}/uninstall_panel.sh.checksum.txt && sha256sum -c uninstall_panel.sh.checksum.txt && bash uninstall_panel.sh || echo "Checksum Verification Failed, File May Have Been Tampered With, Operation Terminated"
+```
+
+Before uninstalling the panel, please be sure to back up all data and uninstall all panel plugins in advance. The data will **not be recoverable** after uninstallation!
+
+## Daily Maintenance
+
+Use `panel` command for daily maintenance:
+
+```shell
+panel
+```
+
+See more usage methods and tips in [Wiki](https://github.com/haozi-team/panel/wiki).
+
+## Feedback
+
+For usage issues, you can ask questions in the [WePublish Community Forum](https://wepublish.cn/forums) or seek AI help in the QQ group `@坤坤`. You can also seek paid support in the group.
+
+For issues with the panel itself, you can submit feedback on the `Issues` page of GitHub. Please note [the wisdom of asking questions](http://www.catb.org/~esr/faqs/smart-questions.html).
+
+## Contribute code
+
+### Find/Create Issue
+
+You can find or create an Issue in [Issue List](https://github.com/haozi-team/panel/issues), leave a message to express your willingness to deal with the Issue, and get confirmation from the maintainer. Start processing.
+
+### Create PR
+
+- During the development process, if you encounter a problem, you can describe the problem in detail in the Issue at any time for further communication, but before doing so, please make sure that you have tried your best to solve the problem through Google and other methods;
+- PRs must be submitted to our JiHu GitLab repository [https://jihulab.com/haozi-team/panel](https://jihulab.com/haozi-team/panel). Do not submit on GitHub;
+- When the PR is completed, please add the `🚀 Review Ready` tag to it, and the maintainer will review it in time;
+- We very much welcome your contributions and will add you to the homepage contributors in the next release; ❤️
+
+## Sponsor
+
+### CDN
+
+- [无畏云加速](https://su.sctes.com/register?code=8st689ujpmm2p)
+
+- [盾云CDN](http://cdn.ddunyun.com/)
+
+### Object Storage
+
+- [又拍云](https://www.upyun.com/?utm_source=lianmeng&utm_medium=referral)
+
+### DevOps
+
+- [JiHu GitLab](https://www.jihulab.com/)
+
+**Accept cloud resources and financial sponsorship, you can contact us through QQ group**
+
+## Contributor
+
+This project owes its existence to all those who have contributed. To contribute, please check the contributed code section first.
+
+<a href="https://github.com/DevHaoZi" target="_blank"><img src="https://avatars.githubusercontent.com/u/115467771?v=4" width="48" height="48"></a>
+
+## Star History
+
+<a href="https://star-history.com/#haozi-team/panel&Date">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=haozi-team/panel&type=Date&theme=dark" />
+    <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=haozi-team/panel&type=Date" />
+    <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=haozi-team/panel&type=Date" />
+  </picture>
+</a>

SECURITY.md

@@ -0,0 +1,25 @@
+## 安全说明
+
+安全性是我们最关心的问题之一，我们已在多个不同应用的生产环境广泛应用耗子Linux面板，至今无一例安全事故。
+
+耗子Linux面板采用业界多种方案尽可能保证面板的安全性，但是我们不能保证面板的绝对安全性，**因此我们不对面板的安全性做任何保证**。
+
+如果您在使用面板的过程中发现任何安全问题，请勿提交 Issue，可通过以下方式直接联系我们：
+
+- 邮箱：i@haozi.net
+- QQ：826896000
+
+致某些 CVE 爱好者：通过面板 `access_token` 执行的任何操作（包括且不限于：获取 root 权限、读取/写入系统敏感文件、执行任意 shell 命令等）均不被认为是安全问题，请不要刷此类报告浪费彼此的时间，这类低水平的报告对你的简历也没有任何帮助。
+
+## Security Policy
+
+Security is one of our biggest concerns. We have widely used HaoZi Linux Panel in production environments for many different applications, and there has been no safety incident so far.
+
+HaoZi Linux Panel adopts various solutions in the industry to ensure the security of the panel as much as possible, but we cannot guarantee the absolute security of the panel, **therefore we do not make any guarantees on the security of the panel**.
+
+If you find any security issues while using the panel, please do not submit an Issue. You can contact us directly through the following methods:
+
+- Email: i@haozi.net
+- Telegram: @devhaozi
+
+To some CVE enthusiasts: Any operation performed through the panel `access_token` (including but not limited to: obtaining root permissions, reading/writing system sensitive files, executing arbitrary shell commands, etc.) is not considered a security issue, please Don’t waste each other’s time with these types of reports. These low-level reports won’t do anything to help your resume.

app/console/commands/panel.go

@@ -1,6 +1,7 @@
 package commands
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 	"sort"
@@ -55,7 +56,7 @@ func (receiver *Panel) Handle(ctx console.Context) error {
 			return nil
 		}
 
-		settings := []models.Setting{{Key: models.SettingKeyName, Value: "耗子Linux面板"}, {Key: models.SettingKeyMonitor, Value: "1"}, {Key: models.SettingKeyMonitorDays, Value: "30"}, {Key: models.SettingKeyBackupPath, Value: "/www/backup"}, {Key: models.SettingKeyWebsitePath, Value: "/www/wwwroot"}, {Key: models.SettingKeyEntrance, Value: "/"}}
+		settings := []models.Setting{{Key: models.SettingKeyName, Value: "耗子Linux面板"}, {Key: models.SettingKeyMonitor, Value: "1"}, {Key: models.SettingKeyMonitorDays, Value: "30"}, {Key: models.SettingKeyBackupPath, Value: "/www/backup"}, {Key: models.SettingKeyWebsitePath, Value: "/www/wwwroot"}, {Key: models.SettingKeyEntrance, Value: "/"}, {Key: models.SettingKeyVersion, Value: facades.Config().GetString("panel.version")}}
 		err = facades.Orm().Query().Create(&settings)
 		if err != nil {
 			color.Redln("初始化失败")
@@ -85,18 +86,20 @@ func (receiver *Panel) Handle(ctx console.Context) error {
 			return nil
 		}
 
-		input := arg1
-		proxy := false
-		if input == "y" || input == "Y" || input == "yes" || input == "Yes" {
-			proxy = true
+		panel, err := tools.GetLatestPanelVersion()
+		if err != nil {
+			color.Redln("获取最新版本失败")
+			return err
 		}
-		err = tools.UpdatePanel(cast.ToBool(proxy))
+
+		err = tools.UpdatePanel(panel)
 		if err != nil {
 			color.Redln("更新失败: " + err.Error())
 			return nil
 		}
 
 		color.Greenln("更新成功")
+		tools.RestartPanel()
 
 	case "getInfo":
 		var user models.User
@@ -122,7 +125,7 @@ func (receiver *Panel) Handle(ctx console.Context) error {
 			return nil
 		}
 
-		port := tools.ExecShell(`cat /www/panel/panel.conf | grep APP_PORT | awk -F '=' '{print $2}' | tr -d '\n'`)
+		port := tools.Exec(`cat /www/panel/panel.conf | grep APP_PORT | awk -F '=' '{print $2}' | tr -d '\n'`)
 
 		color.Greenln("用户名: " + user.Username)
 		color.Greenln("密码: " + password)
@@ -130,7 +133,7 @@ func (receiver *Panel) Handle(ctx console.Context) error {
 		color.Greenln("面板入口: " + services.NewSettingImpl().Get(models.SettingKeyEntrance, "/"))
 
 	case "getPort":
-		port := tools.ExecShell("cat /www/panel/panel.conf | grep APP_PORT | awk -F '=' '{print $2}'")
+		port := tools.Exec("cat /www/panel/panel.conf | grep APP_PORT | awk -F '=' '{print $2}'")
 		color.Greenln("面板端口: " + port)
 
 	case "getEntrance":
@@ -242,7 +245,7 @@ func (receiver *Panel) Handle(ctx console.Context) error {
 			}
 
 			backupFile := path + "/" + website.Name + "_" + carbon.Now().ToShortDateTimeString() + ".zip"
-			tools.ExecShell(`cd '` + website.Path + `' && zip -r '` + backupFile + `' .`)
+			tools.Exec(`cd '` + website.Path + `' && zip -r '` + backupFile + `' .`)
 			color.Greenln("|-备份成功")
 
 		case "mysql":
@@ -258,21 +261,24 @@ func (receiver *Panel) Handle(ctx console.Context) error {
 
 			color.Greenln("|-目标MySQL数据库: " + name)
 			color.Greenln("|-开始导出")
-			tools.ExecShell(`mysqldump -uroot ` + name + ` > /tmp/` + backupFile + ` 2>&1`)
+			tools.Exec(`mysqldump -uroot ` + name + ` > /tmp/` + backupFile + ` 2>&1`)
 			color.Greenln("|-导出成功")
 			color.Greenln("|-开始压缩")
-			tools.ExecShell("cd /tmp && zip -r " + backupFile + ".zip " + backupFile)
-			tools.RemoveFile("/tmp/" + backupFile)
+			tools.Exec("cd /tmp && zip -r " + backupFile + ".zip " + backupFile)
+			tools.Remove("/tmp/" + backupFile)
 			color.Greenln("|-压缩成功")
 			color.Greenln("|-开始移动")
-			tools.Mv("/tmp/"+backupFile+".zip", path+"/"+backupFile+".zip")
+			if _, err := tools.Mv("/tmp/"+backupFile+".zip", path+"/"+backupFile+".zip"); err != nil {
+				color.Redln("|-移动失败: " + err.Error())
+				return nil
+			}
 			color.Greenln("|-移动成功")
 			_ = os.Unsetenv("MYSQL_PWD")
 			color.Greenln("|-备份成功")
 
 		case "postgresql":
 			backupFile := name + "_" + carbon.Now().ToShortDateTimeString() + ".sql"
-			check := tools.ExecShell(`su - postgres -c "psql -l" 2>&1`)
+			check := tools.Exec(`su - postgres -c "psql -l" 2>&1`)
 			if strings.Contains(check, name) {
 				color.Redln("|-数据库不存在")
 				color.Greenln(hr)
@@ -281,14 +287,17 @@ func (receiver *Panel) Handle(ctx console.Context) error {
 
 			color.Greenln("|-目标PostgreSQL数据库: " + name)
 			color.Greenln("|-开始导出")
-			tools.ExecShell(`su - postgres -c "pg_dump '` + name + `'" > /tmp/` + backupFile + ` 2>&1`)
+			tools.Exec(`su - postgres -c "pg_dump '` + name + `'" > /tmp/` + backupFile + ` 2>&1`)
 			color.Greenln("|-导出成功")
 			color.Greenln("|-开始压缩")
-			tools.ExecShell("cd /tmp && zip -r " + backupFile + ".zip " + backupFile)
-			tools.RemoveFile("/tmp/" + backupFile)
+			tools.Exec("cd /tmp && zip -r " + backupFile + ".zip " + backupFile)
+			tools.Remove("/tmp/" + backupFile)
 			color.Greenln("|-压缩成功")
 			color.Greenln("|-开始移动")
-			tools.Mv("/tmp/"+backupFile+".zip", path+"/"+backupFile+".zip")
+			if _, err := tools.Mv("/tmp/"+backupFile+".zip", path+"/"+backupFile+".zip"); err != nil {
+				color.Redln("|-移动失败: " + err.Error())
+				return nil
+			}
 			color.Greenln("|-移动成功")
 			color.Greenln("|-备份成功")
 		}
@@ -315,7 +324,7 @@ func (receiver *Panel) Handle(ctx console.Context) error {
 		for i := cast.ToInt(save); i < len(filteredFiles); i++ {
 			fileToDelete := filepath.Join(path, filteredFiles[i].Name())
 			color.Yellowln("|-清理备份: " + fileToDelete)
-			tools.RemoveFile(fileToDelete)
+			tools.Remove(fileToDelete)
 		}
 		color.Greenln("|-清理完成")
 		color.Greenln(hr)
@@ -351,8 +360,8 @@ func (receiver *Panel) Handle(ctx console.Context) error {
 		}
 
 		backupPath := "/www/wwwlogs/" + website.Name + "_" + carbon.Now().ToShortDateTimeString() + ".log.zip"
-		tools.ExecShell(`cd /www/wwwlogs && zip -r ` + backupPath + ` ` + website.Name + ".log")
-		tools.ExecShell(`echo "" > ` + logPath)
+		tools.Exec(`cd /www/wwwlogs && zip -r ` + backupPath + ` ` + website.Name + ".log")
+		tools.Exec(`echo "" > ` + logPath)
 		color.Greenln("|-切割成功")
 
 		color.Greenln(hr)
@@ -377,7 +386,7 @@ func (receiver *Panel) Handle(ctx console.Context) error {
 		for i := cast.ToInt(save); i < len(filteredFiles); i++ {
 			fileToDelete := filepath.Join("/www/wwwlogs", filteredFiles[i].Name())
 			color.Yellowln("|-清理日志: " + fileToDelete)
-			tools.RemoveFile(fileToDelete)
+			tools.Remove(fileToDelete)
 		}
 		color.Greenln("|-清理完成")
 		color.Greenln(hr)
@@ -457,6 +466,20 @@ func (receiver *Panel) Handle(ctx console.Context) error {
 
 		color.Greenln("写入设置成功")
 
+	case "getSetting":
+		key := arg1
+		if len(key) == 0 {
+			color.Redln("参数错误")
+			return nil
+		}
+
+		var setting models.Setting
+		if err := facades.Orm().Query().Where("key", key).FirstOrFail(&setting); err != nil {
+			return nil
+		}
+
+		fmt.Printf("%s", setting.Value)
+
 	case "deleteSetting":
 		key := arg1
 		if len(key) == 0 {
@@ -475,7 +498,7 @@ func (receiver *Panel) Handle(ctx console.Context) error {
 	default:
 		color.Yellowln(facades.Config().GetString("panel.name") + "命令行工具 - " + facades.Config().GetString("panel.version"))
 		color.Greenln("请使用以下命令：")
-		color.Greenln("panel update {proxy} 更新 / 修复面板到最新版本")
+		color.Greenln("panel update 更新 / 修复面板到最新版本")
 		color.Greenln("panel getInfo 重新初始化面板账号信息")
 		color.Greenln("panel getPort 获取面板访问端口")
 		color.Greenln("panel getEntrance 获取面板访问入口")
@@ -490,6 +513,7 @@ func (receiver *Panel) Handle(ctx console.Context) error {
 		color.Yellowln("panel writeMysqlPassword {password} 写入MySQL root密码")
 		color.Yellowln("panel writeSite {name} {status} {path} {php} {ssl} 写入网站数据到面板")
 		color.Yellowln("panel deleteSite {name} 删除面板网站数据")
+		color.Yellowln("panel getSetting {name} 获取面板设置数据")
 		color.Yellowln("panel writeSetting {name} {value} 写入 / 更新面板设置数据")
 		color.Yellowln("panel deleteSetting {name} 删除面板设置数据")
 	}

app/http/controllers/cron_controller.go

@@ -25,26 +25,27 @@ func NewCronController() *CronController {
 	}
 }
 
-func (c *CronController) List(ctx http.Context) {
-	limit := ctx.Request().QueryInt("limit")
-	page := ctx.Request().QueryInt("page")
+// List 获取计划任务列表
+func (c *CronController) List(ctx http.Context) http.Response {
+	limit := ctx.Request().QueryInt("limit", 10)
+	page := ctx.Request().QueryInt("page", 1)
 
 	var crons []models.Cron
 	var total int64
 	err := facades.Orm().Query().Paginate(page, limit, &crons, &total)
 	if err != nil {
 		facades.Log().Error("[面板][CronController] 查询计划任务列表失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	Success(ctx, http.Json{
+	return Success(ctx, http.Json{
 		"total": total,
 		"items": crons,
 	})
 }
 
-func (c *CronController) Add(ctx http.Context) {
+// Add 添加计划任务
+func (c *CronController) Add(ctx http.Context) http.Response {
 	validator, err := ctx.Request().Validate(map[string]string{
 		"name":        "required|min_len:1|max_len:255",
 		"time":        "required",
@@ -53,18 +54,15 @@ func (c *CronController) Add(ctx http.Context) {
 		"backup_type": "required_if:type,backup|in:website,mysql,postgresql",
 	})
 	if err != nil {
-		Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	// 单独验证时间格式
 	if !regexp.MustCompile(`^((\*|\d+|\d+-\d+|\d+/\d+|\d+-\d+/\d+|\*/\d+)(,(\*|\d+|\d+-\d+|\d+/\d+|\d+-\d+/\d+|\*/\d+))*\s?){5}$`).MatchString(ctx.Request().Input("time")) {
-		Error(ctx, http.StatusBadRequest, "时间格式错误")
-		return
+		return Error(ctx, http.StatusBadRequest, "时间格式错误")
 	}
 
 	shell := ctx.Request().Input("script")
@@ -75,12 +73,15 @@ func (c *CronController) Add(ctx http.Context) {
 		if backupType == "website" {
 			backupName = ctx.Request().Input("website")
 		}
-		backupPath := ctx.Request().Input("backup_path", c.setting.Get(models.SettingKeyBackupPath)+"/"+backupType)
+		backupPath := ctx.Request().Input("backup_path")
+		if len(backupPath) == 0 {
+			backupPath = c.setting.Get(models.SettingKeyBackupPath) + "/" + backupType
+		}
 		backupSave := ctx.Request().InputInt("save", 10)
 		shell = `#!/bin/bash
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH
 
-# 耗子面板 - 数据备份脚本
+# 耗子Linux面板 - 数据备份脚本
 
 type=` + backupType + `
 path=` + backupPath + `
@@ -97,7 +98,7 @@ panel backup ${type} ${name} ${path} ${save} 2>&1
 		shell = `#!/bin/bash
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH
 
-# 耗子面板 - 日志切割脚本
+# 耗子Linux面板 - 日志切割脚本
 
 name=` + website + `
 save=` + cast.ToString(save) + `
@@ -111,21 +112,18 @@ panel cutoff ${name} ${save} 2>&1
 	shellLogDir := "/www/server/cron/logs/"
 	if !tools.Exists(shellDir) {
 		facades.Log().Error("[面板][CronController] 计划任务目录不存在")
-		Error(ctx, http.StatusInternalServerError, "计划任务目录不存在")
-		return
+		return Error(ctx, http.StatusInternalServerError, "计划任务目录不存在")
 	}
 	if !tools.Exists(shellLogDir) {
 		facades.Log().Error("[面板][CronController] 计划任务日志目录不存在")
-		Error(ctx, http.StatusInternalServerError, "计划任务日志目录不存在")
-		return
+		return Error(ctx, http.StatusInternalServerError, "计划任务日志目录不存在")
 	}
 	shellFile := strconv.Itoa(int(carbon.Now().Timestamp())) + tools.RandomString(16)
-	if !tools.WriteFile(shellDir+shellFile+".sh", shell, 0700) {
+	if !tools.Write(shellDir+shellFile+".sh", shell, 0700) {
 		facades.Log().Error("[面板][CronController] 创建计划任务脚本失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
-	tools.ExecShell("dos2unix " + shellDir + shellFile + ".sh")
+	tools.Exec("dos2unix " + shellDir + shellFile + ".sh")
 
 	var cron models.Cron
 	cron.Name = ctx.Request().Input("name")
@@ -138,60 +136,54 @@ panel cutoff ${name} ${save} 2>&1
 	err = facades.Orm().Query().Create(&cron)
 	if err != nil {
 		facades.Log().Error("[面板][CronController] 创建计划任务失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	c.cron.AddToSystem(cron)
 
-	Success(ctx, http.Json{
+	return Success(ctx, http.Json{
 		"id": cron.ID,
 	})
 }
 
 // Script 获取脚本内容
-func (c *CronController) Script(ctx http.Context) {
+func (c *CronController) Script(ctx http.Context) http.Response {
 	var cron models.Cron
 	err := facades.Orm().Query().Where("id", ctx.Request().Input("id")).FirstOrFail(&cron)
 	if err != nil {
-		Error(ctx, http.StatusBadRequest, "计划任务不存在")
-		return
+		return Error(ctx, http.StatusBadRequest, "计划任务不存在")
 	}
 
-	Success(ctx, tools.ReadFile(cron.Shell))
+	return Success(ctx, tools.Read(cron.Shell))
 }
 
-func (c *CronController) Update(ctx http.Context) {
+// Update 更新计划任务
+func (c *CronController) Update(ctx http.Context) http.Response {
 	validator, err := ctx.Request().Validate(map[string]string{
 		"name":   "required|min_len:1|max_len:255",
 		"time":   "required",
 		"script": "required",
 	})
 	if err != nil {
-		Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	// 单独验证时间格式
 	if !regexp.MustCompile(`^((\*|\d+|\d+-\d+|\d+/\d+|\d+-\d+/\d+|\*/\d+)(,(\*|\d+|\d+-\d+|\d+/\d+|\d+-\d+/\d+|\*/\d+))*\s?){5}$`).MatchString(ctx.Request().Input("time")) {
-		Error(ctx, http.StatusBadRequest, "时间格式错误")
-		return
+		return Error(ctx, http.StatusBadRequest, "时间格式错误")
 	}
 
 	var cron models.Cron
 	err = facades.Orm().Query().Where("id", ctx.Request().Input("id")).FirstOrFail(&cron)
 	if err != nil {
-		Error(ctx, http.StatusBadRequest, "计划任务不存在")
-		return
+		return Error(ctx, http.StatusBadRequest, "计划任务不存在")
 	}
 
 	if !cron.Status {
-		Error(ctx, http.StatusBadRequest, "计划任务已禁用")
-		return
+		return Error(ctx, http.StatusBadRequest, "计划任务已禁用")
 	}
 
 	cron.Time = ctx.Request().Input("time")
@@ -199,72 +191,66 @@ func (c *CronController) Update(ctx http.Context) {
 	err = facades.Orm().Query().Save(&cron)
 	if err != nil {
 		facades.Log().Error("[面板][CronController] 更新计划任务失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	if !tools.WriteFile(cron.Shell, ctx.Request().Input("script"), 0644) {
+	if !tools.Write(cron.Shell, ctx.Request().Input("script"), 0644) {
 		facades.Log().Error("[面板][CronController] 更新计划任务脚本失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
-	tools.ExecShell("dos2unix " + cron.Shell)
+	tools.Exec("dos2unix " + cron.Shell)
 
 	c.cron.DeleteFromSystem(cron)
 	if cron.Status {
 		c.cron.AddToSystem(cron)
 	}
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }
 
-func (c *CronController) Delete(ctx http.Context) {
+// Delete 删除计划任务
+func (c *CronController) Delete(ctx http.Context) http.Response {
 	var cron models.Cron
 	err := facades.Orm().Query().Where("id", ctx.Request().Input("id")).FirstOrFail(&cron)
 	if err != nil {
-		Error(ctx, http.StatusBadRequest, "计划任务不存在")
-		return
+		return Error(ctx, http.StatusBadRequest, "计划任务不存在")
 	}
 
 	c.cron.DeleteFromSystem(cron)
-	tools.RemoveFile(cron.Shell)
+	tools.Remove(cron.Shell)
 
 	_, err = facades.Orm().Query().Delete(&cron)
 	if err != nil {
 		facades.Log().Error("[面板][CronController] 删除计划任务失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }
 
-func (c *CronController) Status(ctx http.Context) {
+// Status 更新计划任务状态
+func (c *CronController) Status(ctx http.Context) http.Response {
 	validator, err := ctx.Request().Validate(map[string]string{
 		"status": "bool",
 	})
 	if err != nil {
-		Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	var cron models.Cron
 	err = facades.Orm().Query().Where("id", ctx.Request().Input("id")).FirstOrFail(&cron)
 	if err != nil {
-		Error(ctx, http.StatusBadRequest, "计划任务不存在")
-		return
+		return Error(ctx, http.StatusBadRequest, "计划任务不存在")
 	}
 
 	cron.Status = ctx.Request().InputBool("status")
 	err = facades.Orm().Query().Save(&cron)
 	if err != nil {
 		facades.Log().Error("[面板][CronController] 更新计划任务状态失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	c.cron.DeleteFromSystem(cron)
@@ -272,21 +258,20 @@ func (c *CronController) Status(ctx http.Context) {
 		c.cron.AddToSystem(cron)
 	}
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }
 
-func (c *CronController) Log(ctx http.Context) {
+// Log 获取计划任务日志
+func (c *CronController) Log(ctx http.Context) http.Response {
 	var cron models.Cron
 	err := facades.Orm().Query().Where("id", ctx.Request().Input("id")).FirstOrFail(&cron)
 	if err != nil {
-		Error(ctx, http.StatusBadRequest, "计划任务不存在")
-		return
+		return Error(ctx, http.StatusBadRequest, "计划任务不存在")
 	}
 
 	if !tools.Exists(cron.Log) {
-		Error(ctx, http.StatusBadRequest, "日志文件不存在")
-		return
+		return Error(ctx, http.StatusBadRequest, "日志文件不存在")
 	}
 
-	Success(ctx, tools.ReadFile(cron.Log))
+	return Success(ctx, tools.Read(cron.Log))
 }

app/http/controllers/file_controller.go

@@ -1,9 +1,5 @@
 package controllers
 
-import (
-	"github.com/goravel/framework/contracts/http"
-)
-
 type FileController struct {
 	// Dependent services
 }
@@ -13,6 +9,3 @@ func NewFileController() *FileController {
 		// Inject services
 	}
 }
-
-func (r *FileController) Index(ctx http.Context) {
-}

app/http/controllers/helpers.go

@@ -9,35 +9,33 @@ import (
 	"panel/app/services"
 )
 
-func Success(ctx http.Context, data any) {
-	ctx.Response().Success().Json(http.Json{
+func Success(ctx http.Context, data any) http.Response {
+	return ctx.Response().Success().Json(http.Json{
 		"code":    0,
 		"message": "success",
 		"data":    data,
 	})
 }
 
-func Error(ctx http.Context, code int, message any) {
-	ctx.Response().Json(http.StatusOK, http.Json{
+func Error(ctx http.Context, code int, message any) http.Response {
+	return ctx.Response().Json(http.StatusOK, http.Json{
 		"code":    code,
 		"message": message,
 	})
 }
 
 // Check 检查插件是否可用
-func Check(ctx http.Context, slug string) bool {
+func Check(ctx http.Context, slug string) http.Response {
 	plugin := services.NewPluginImpl().GetBySlug(slug)
 	installedPlugin := services.NewPluginImpl().GetInstalledBySlug(slug)
 	installedPlugins, err := services.NewPluginImpl().AllInstalled()
 	if err != nil {
 		facades.Log().Error("[面板][插件] 获取已安装插件失败")
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return false
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	if installedPlugin.Version != plugin.Version || installedPlugin.Slug != plugin.Slug {
-		Error(ctx, http.StatusForbidden, "插件 "+slug+" 需要更新至 "+plugin.Version+" 版本")
-		return false
+		return Error(ctx, http.StatusForbidden, "插件 "+slug+" 需要更新至 "+plugin.Version+" 版本")
 	}
 
 	var lock sync.RWMutex
@@ -54,8 +52,7 @@ func Check(ctx http.Context, slug string) bool {
 		_, requireFound := pluginsMap[require]
 		lock.RUnlock()
 		if !requireFound {
-			Error(ctx, http.StatusForbidden, "插件 "+slug+" 需要依赖 "+require+" 插件")
-			return false
+			return Error(ctx, http.StatusForbidden, "插件 "+slug+" 需要依赖 "+require+" 插件")
 		}
 	}
 
@@ -64,10 +61,9 @@ func Check(ctx http.Context, slug string) bool {
 		_, excludeFound := pluginsMap[exclude]
 		lock.RUnlock()
 		if excludeFound {
-			Error(ctx, http.StatusForbidden, "插件 "+slug+" 不兼容 "+exclude+" 插件")
-			return false
+			return Error(ctx, http.StatusForbidden, "插件 "+slug+" 不兼容 "+exclude+" 插件")
 		}
 	}
 
-	return true
+	return nil
 }

app/http/controllers/info_controller.go

@@ -1,7 +1,9 @@
 package controllers
 
 import (
+	"database/sql"
 	"fmt"
+	"regexp"
 	"strings"
 
 	"github.com/goravel/framework/contracts/http"
@@ -20,50 +22,38 @@ type MenuItem struct {
 }
 
 type InfoController struct {
-	plugin services.Plugin
+	plugin  services.Plugin
+	setting services.Setting
 }
 
 func NewInfoController() *InfoController {
 	return &InfoController{
-		plugin: services.NewPluginImpl(),
+		plugin:  services.NewPluginImpl(),
+		setting: services.NewSettingImpl(),
 	}
 }
 
-func (c *InfoController) Name(ctx http.Context) {
+// Name 获取面板名称
+func (c *InfoController) Name(ctx http.Context) http.Response {
 	var setting models.Setting
 	err := facades.Orm().Query().Where("key", "name").First(&setting)
 	if err != nil {
 		facades.Log().Error("[面板][InfoController] 查询面板名称失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	Success(ctx, http.Json{
+	return Success(ctx, http.Json{
 		"name": setting.Value,
 	})
 }
 
-func (c *InfoController) Menu(ctx http.Context) {
-	Success(ctx, []MenuItem{
-		{Name: "home", Title: "主页", Icon: "layui-icon-home", Jump: "/"},
-		{Name: "website", Title: "网站管理", Icon: "layui-icon-website", Jump: "website/list"},
-		{Name: "monitor", Title: "资源监控", Icon: "layui-icon-chart-screen", Jump: "monitor"},
-		{Name: "safe", Title: "系统安全", Icon: "layui-icon-auz", Jump: "safe"},
-		/*{Name: "file", Title: "文件管理", Icon: "layui-icon-file", Jump: "file"},*/
-		{Name: "cron", Title: "计划任务", Icon: "layui-icon-date", Jump: "cron"},
-		{Name: "ssh", Title: "SSH", Icon: "layui-icon-layer", Jump: "ssh"},
-		{Name: "plugin", Title: "插件中心", Icon: "layui-icon-app", Jump: "plugin"},
-		{Name: "setting", Title: "面板设置", Icon: "layui-icon-set", Jump: "setting"},
-	})
-}
-
-func (c *InfoController) HomePlugins(ctx http.Context) {
+// HomePlugins 获取首页插件
+func (c *InfoController) HomePlugins(ctx http.Context) http.Response {
 	var plugins []models.Plugin
 	err := facades.Orm().Query().Where("show", 1).Find(&plugins)
 	if err != nil {
 		facades.Log().Error("[面板][InfoController] 查询首页插件失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	type pluginsData struct {
@@ -79,29 +69,135 @@ func (c *InfoController) HomePlugins(ctx http.Context) {
 		})
 	}
 
-	Success(ctx, pluginsJson)
+	return Success(ctx, pluginsJson)
 }
 
-func (c *InfoController) NowMonitor(ctx http.Context) {
-	Success(ctx, tools.GetMonitoringInfo())
+// NowMonitor 获取当前监控信息
+func (c *InfoController) NowMonitor(ctx http.Context) http.Response {
+	return Success(ctx, tools.GetMonitoringInfo())
 }
 
-func (c *InfoController) SystemInfo(ctx http.Context) {
+// SystemInfo 获取系统信息
+func (c *InfoController) SystemInfo(ctx http.Context) http.Response {
 	monitorInfo := tools.GetMonitoringInfo()
 
-	Success(ctx, http.Json{
+	return Success(ctx, http.Json{
 		"os_name":       monitorInfo.Host.Platform + " " + monitorInfo.Host.PlatformVersion,
 		"uptime":        fmt.Sprintf("%.2f", float64(monitorInfo.Host.Uptime)/86400),
 		"panel_version": facades.Config().GetString("panel.version"),
 	})
 }
 
-func (c *InfoController) InstalledDbAndPhp(ctx http.Context) {
+// CountInfo 获取面板统计信息
+func (c *InfoController) CountInfo(ctx http.Context) http.Response {
+	var websiteCount int64
+	err := facades.Orm().Query().Model(models.Website{}).Count(&websiteCount)
+	if err != nil {
+		websiteCount = -1
+	}
+
+	var mysql models.Plugin
+	mysqlInstalled := true
+	err = facades.Orm().Query().Where("slug like ?", "mysql%").FirstOrFail(&mysql)
+	if err != nil {
+		mysqlInstalled = false
+	}
+	var postgresql models.Plugin
+	postgresqlInstalled := true
+	err = facades.Orm().Query().Where("slug like ?", "postgresql%").FirstOrFail(&postgresql)
+	if err != nil {
+		postgresqlInstalled = false
+	}
+	var databaseCount int64
+	if mysqlInstalled {
+		status := tools.Exec("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
+		if status == "active" {
+			rootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
+			type database struct {
+				Name string `json:"name"`
+			}
+
+			db, err := sql.Open("mysql", "root:"+rootPassword+"@unix(/tmp/mysql.sock)/")
+			if err != nil {
+				facades.Log().With(map[string]any{
+					"error": err.Error(),
+				}).Error("[面板][InfoController] 获取数据库列表失败")
+				databaseCount = -1
+			} else {
+				defer db.Close()
+				rows, err := db.Query("SHOW DATABASES")
+				if err != nil {
+					facades.Log().With(map[string]any{
+						"error": err.Error(),
+					}).Error("[面板][InfoController] 获取数据库列表失败")
+					databaseCount = -1
+				} else {
+					defer rows.Close()
+					var databases []database
+					for rows.Next() {
+						var d database
+						err := rows.Scan(&d.Name)
+						if err != nil {
+							continue
+						}
+						if d.Name == "information_schema" || d.Name == "performance_schema" || d.Name == "mysql" || d.Name == "sys" {
+							continue
+						}
+
+						databases = append(databases, d)
+					}
+					databaseCount = int64(len(databases))
+				}
+			}
+		}
+	}
+	if postgresqlInstalled {
+		status := tools.Exec("systemctl status postgresql | grep Active | grep -v grep | awk '{print $2}'")
+		if status == "active" {
+			raw := tools.Exec(`echo "\l" | su - postgres -c "psql"`)
+			databases := strings.Split(raw, "\n")
+			databases = databases[3 : len(databases)-1]
+			for _, db := range databases {
+				parts := strings.Split(db, "|")
+				if len(parts) != 9 || len(strings.TrimSpace(parts[0])) == 0 || strings.TrimSpace(parts[0]) == "template0" || strings.TrimSpace(parts[0]) == "template1" || strings.TrimSpace(parts[0]) == "postgres" {
+					continue
+				}
+
+				databaseCount++
+			}
+		}
+	}
+
+	var ftpCount int64
+	var ftpPlugin = c.plugin.GetInstalledBySlug("pureftpd")
+	if ftpPlugin.ID != 0 {
+		listRaw := tools.Exec("pure-pw list")
+		if len(listRaw) != 0 {
+			listArr := strings.Split(listRaw, "\n")
+			ftpCount = int64(len(listArr))
+		}
+	}
+
+	var cronCount int64
+	err = facades.Orm().Query().Model(models.Cron{}).Count(&cronCount)
+	if err != nil {
+		cronCount = -1
+	}
+
+	return Success(ctx, http.Json{
+		"website":  websiteCount,
+		"database": databaseCount,
+		"ftp":      ftpCount,
+		"cron":     cronCount,
+	})
+}
+
+// InstalledDbAndPhp 获取已安装的数据库和 PHP 版本
+func (c *InfoController) InstalledDbAndPhp(ctx http.Context) http.Response {
 	var php []models.Plugin
 	err := facades.Orm().Query().Where("slug like ?", "php%").Find(&php)
 	if err != nil {
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	var mysql models.Plugin
@@ -119,77 +215,120 @@ func (c *InfoController) InstalledDbAndPhp(ctx http.Context) {
 	}
 
 	type data struct {
-		Slug string `json:"slug"`
-		Name string `json:"name"`
+		Label string `json:"label"`
+		Value string `json:"value"`
 	}
 	var phpData []data
-	phpData = append(phpData, data{Slug: "0", Name: "不使用"})
+	var dbData []data
+	phpData = append(phpData, data{Value: "0", Label: "不使用"})
+	dbData = append(dbData, data{Value: "0", Label: "不使用"})
 	for _, p := range php {
-		phpData = append(phpData, data{Slug: strings.ReplaceAll(p.Slug, "php", ""), Name: c.plugin.GetBySlug(p.Slug).Name})
+		match := regexp.MustCompile(`php(\d+)`).FindStringSubmatch(p.Slug)
+		if len(match) == 0 {
+			continue
+		}
+
+		phpData = append(phpData, data{Value: strings.ReplaceAll(p.Slug, "php", ""), Label: c.plugin.GetBySlug(p.Slug).Name})
 	}
 
-	Success(ctx, http.Json{
-		"php":        phpData,
-		"mysql":      mysqlInstalled,
-		"postgresql": postgresqlInstalled,
+	if mysqlInstalled {
+		dbData = append(dbData, data{Value: "mysql", Label: "MySQL"})
+	}
+	if postgresqlInstalled {
+		dbData = append(dbData, data{Value: "postgresql", Label: "PostgreSQL"})
+	}
+
+	return Success(ctx, http.Json{
+		"php": phpData,
+		"db":  dbData,
 	})
 }
 
-func (c *InfoController) CheckUpdate(ctx http.Context) {
+// CheckUpdate 检查面板更新
+func (c *InfoController) CheckUpdate(ctx http.Context) http.Response {
 	version := facades.Config().GetString("panel.version")
 	remote, err := tools.GetLatestPanelVersion()
 	if err != nil {
-		Error(ctx, http.StatusInternalServerError, "获取最新版本失败")
-		return
+		return Error(ctx, http.StatusInternalServerError, "获取最新版本失败")
 	}
 
-	if version == remote.Version {
-		Success(ctx, http.Json{
-			"update":  false,
-			"version": remote.Version,
-			"name":    remote.Name,
-			"body":    remote.Body,
-			"date":    remote.Date,
+	if tools.VersionCompare(version, remote.Version, ">=") {
+		return Success(ctx, http.Json{
+			"update": false,
 		})
-		return
 	}
 
-	Success(ctx, http.Json{
-		"update":  true,
-		"version": remote.Version,
-		"name":    remote.Name,
-		"body":    remote.Body,
-		"date":    remote.Date,
+	return Success(ctx, http.Json{
+		"update": true,
 	})
 }
 
-func (c *InfoController) Update(ctx http.Context) {
-	var task models.Task
-	err := facades.Orm().Query().Where("status", models.TaskStatusRunning).OrWhere("status", models.TaskStatusWaiting).FirstOrFail(&task)
-	if err == nil {
-		Error(ctx, http.StatusInternalServerError, "当前有任务正在执行，禁止更新")
-		return
-	}
-
-	proxy := ctx.Request().InputBool("proxy")
-	err = tools.UpdatePanel(proxy)
+// UpdateInfo 获取更新信息
+func (c *InfoController) UpdateInfo(ctx http.Context) http.Response {
+	version := facades.Config().GetString("panel.version")
+	current, err := tools.GetLatestPanelVersion()
 	if err != nil {
-		facades.Log().Error("[面板][InfoController] 更新面板失败 ", err.Error())
-		Error(ctx, http.StatusInternalServerError, "更新失败: "+err.Error())
-		return
+		return Error(ctx, http.StatusInternalServerError, "获取最新版本失败")
 	}
 
-	Success(ctx, nil)
+	if tools.VersionCompare(version, current.Version, ">=") {
+		return Error(ctx, http.StatusInternalServerError, "当前版本已是最新版本")
+	}
+
+	versions, err := tools.GenerateVersions(version, current.Version)
+	if err != nil {
+		return Error(ctx, http.StatusInternalServerError, "获取更新信息失败")
+	}
+
+	var versionInfo []tools.PanelInfo
+	for _, v := range versions {
+		info, err := tools.GetPanelVersion(v)
+		if err != nil {
+			continue
+		}
+
+		versionInfo = append(versionInfo, info)
+	}
+
+	return Success(ctx, versionInfo)
 }
 
-func (c *InfoController) Restart(ctx http.Context) {
+// Update 更新面板
+func (c *InfoController) Update(ctx http.Context) http.Response {
 	var task models.Task
 	err := facades.Orm().Query().Where("status", models.TaskStatusRunning).OrWhere("status", models.TaskStatusWaiting).FirstOrFail(&task)
 	if err == nil {
-		Error(ctx, http.StatusInternalServerError, "当前有任务正在执行，禁止重启")
-		return
+		return Error(ctx, http.StatusInternalServerError, "当前有任务正在执行，禁止更新")
 	}
 
-	tools.ExecShell("systemctl restart panel")
-	Success(ctx, nil)
+	panel, err := tools.GetLatestPanelVersion()
+	if err != nil {
+		facades.Log().With(map[string]any{
+			"error": err.Error(),
+		}).Error("[面板][InfoController] 获取最新版本失败")
+		return Error(ctx, http.StatusInternalServerError, "获取最新版本失败")
+	}
+
+	err = tools.UpdatePanel(panel)
+	if err != nil {
+		facades.Log().With(map[string]any{
+			"error": err.Error(),
+		}).Error("[面板][InfoController] 更新面板失败")
+		return Error(ctx, http.StatusInternalServerError, "更新失败: "+err.Error())
+	}
+
+	tools.RestartPanel()
+	return Success(ctx, nil)
+}
+
+// Restart 重启面板
+func (c *InfoController) Restart(ctx http.Context) http.Response {
+	var task models.Task
+	err := facades.Orm().Query().Where("status", models.TaskStatusRunning).OrWhere("status", models.TaskStatusWaiting).FirstOrFail(&task)
+	if err == nil {
+		return Error(ctx, http.StatusInternalServerError, "当前有任务正在执行，禁止重启")
+	}
+
+	tools.RestartPanel()
+	return Success(ctx, nil)
 }

app/http/controllers/monitor_controller.go

@@ -22,56 +22,53 @@ func NewMonitorController() *MonitorController {
 }
 
 // Switch 监控开关
-func (r *MonitorController) Switch(ctx http.Context) {
-	value := ctx.Request().InputBool("switch")
+func (r *MonitorController) Switch(ctx http.Context) http.Response {
+	value := ctx.Request().InputBool("monitor")
 	err := r.setting.Set(models.SettingKeyMonitor, cast.ToString(value))
 	if err != nil {
 		facades.Log().Error("[面板][MonitorController] 更新监控开关失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }
 
 // SaveDays 保存监控天数
-func (r *MonitorController) SaveDays(ctx http.Context) {
+func (r *MonitorController) SaveDays(ctx http.Context) http.Response {
 	days := ctx.Request().Input("days")
 	err := r.setting.Set(models.SettingKeyMonitorDays, days)
 	if err != nil {
 		facades.Log().Error("[面板][MonitorController] 更新监控天数失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }
 
 // SwitchAndDays 监控开关和监控天数
-func (r *MonitorController) SwitchAndDays(ctx http.Context) {
+func (r *MonitorController) SwitchAndDays(ctx http.Context) http.Response {
 	monitor := r.setting.Get(models.SettingKeyMonitor)
 	monitorDays := r.setting.Get(models.SettingKeyMonitorDays)
 
-	Success(ctx, http.Json{
+	return Success(ctx, http.Json{
 		"switch": cast.ToBool(monitor),
 		"days":   cast.ToInt(monitorDays),
 	})
 }
 
 // Clear 清空监控数据
-func (r *MonitorController) Clear(ctx http.Context) {
+func (r *MonitorController) Clear(ctx http.Context) http.Response {
 	_, err := facades.Orm().Query().Where("1 = 1").Delete(&models.Monitor{})
 	if err != nil {
 		facades.Log().Error("[面板][MonitorController] 清空监控数据失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }
 
 // List 监控数据列表
-func (r *MonitorController) List(ctx http.Context) {
+func (r *MonitorController) List(ctx http.Context) http.Response {
 	start := ctx.Request().InputInt64("start")
 	end := ctx.Request().InputInt64("end")
 	startTime := carbon.FromTimestampMilli(start)
@@ -81,13 +78,11 @@ func (r *MonitorController) List(ctx http.Context) {
 	err := facades.Orm().Query().Where("created_at >= ?", startTime.ToDateTimeString()).Where("created_at <= ?", endTime.ToDateTimeString()).Get(&monitors)
 	if err != nil {
 		facades.Log().Error("[面板][MonitorController] 查询监控数据失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	if len(monitors) == 0 {
-		Error(ctx, http.StatusNotFound, "监控数据为空")
-		return
+		return Error(ctx, http.StatusNotFound, "监控数据为空")
 	}
 
 	type load struct {
@@ -172,5 +167,5 @@ func (r *MonitorController) List(ctx http.Context) {
 		bytesRecv2 = 0
 	}
 
-	Success(ctx, data)
+	return Success(ctx, data)
 }

app/http/controllers/plugin_controller.go

@@ -23,11 +23,11 @@ func NewPluginController() *PluginController {
 }
 
 // List 列出所有插件
-func (r *PluginController) List(ctx http.Context) {
+func (r *PluginController) List(ctx http.Context) http.Response {
 	plugins := r.plugin.All()
 	installedPlugins, err := r.plugin.AllInstalled()
 	if err != nil {
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	var lock sync.RWMutex
@@ -51,7 +51,7 @@ func (r *PluginController) List(ctx http.Context) {
 		Show             bool     `json:"show"`
 	}
 
-	var p []plugin
+	var pluginArr []plugin
 	for _, item := range plugins {
 		installed, installedVersion, show := false, "", false
 		if _, ok := installedPluginsMap[item.Slug]; ok {
@@ -59,7 +59,7 @@ func (r *PluginController) List(ctx http.Context) {
 			installedVersion = installedPluginsMap[item.Slug].Version
 			show = installedPluginsMap[item.Slug].Show
 		}
-		p = append(p, plugin{
+		pluginArr = append(pluginArr, plugin{
 			Name:             item.Name,
 			Description:      item.Description,
 			Slug:             item.Slug,
@@ -72,24 +72,40 @@ func (r *PluginController) List(ctx http.Context) {
 		})
 	}
 
-	Success(ctx, p)
+	page := ctx.Request().QueryInt("page", 1)
+	limit := ctx.Request().QueryInt("limit", 10)
+	startIndex := (page - 1) * limit
+	endIndex := page * limit
+	if startIndex > len(pluginArr) {
+		return Success(ctx, http.Json{
+			"total": 0,
+			"items": []plugin{},
+		})
+	}
+	if endIndex > len(pluginArr) {
+		endIndex = len(pluginArr)
+	}
+	pagedPlugins := pluginArr[startIndex:endIndex]
+
+	return Success(ctx, http.Json{
+		"total": len(pluginArr),
+		"items": pagedPlugins,
+	})
 }
 
 // Install 安装插件
-func (r *PluginController) Install(ctx http.Context) {
+func (r *PluginController) Install(ctx http.Context) http.Response {
 	slug := ctx.Request().Input("slug")
 	plugin := r.plugin.GetBySlug(slug)
 	installedPlugin := r.plugin.GetInstalledBySlug(slug)
 	installedPlugins, err := r.plugin.AllInstalled()
 	if err != nil {
 		facades.Log().Error("[面板][PluginController] 获取已安装插件失败")
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	if installedPlugin.ID != 0 {
-		Error(ctx, http.StatusBadRequest, "插件已安装")
-		return
+		return Error(ctx, http.StatusBadRequest, "插件已安装")
 	}
 
 	var lock sync.RWMutex
@@ -106,8 +122,7 @@ func (r *PluginController) Install(ctx http.Context) {
 		_, requireFound := pluginsMap[require]
 		lock.RUnlock()
 		if !requireFound {
-			Error(ctx, http.StatusForbidden, "插件 "+slug+" 需要依赖 "+require+" 插件")
-			return
+			return Error(ctx, http.StatusForbidden, "插件 "+slug+" 需要依赖 "+require+" 插件")
 		}
 	}
 
@@ -116,8 +131,7 @@ func (r *PluginController) Install(ctx http.Context) {
 		_, excludeFound := pluginsMap[exclude]
 		lock.RUnlock()
 		if excludeFound {
-			Error(ctx, http.StatusForbidden, "插件 "+slug+" 不兼容 "+exclude+" 插件")
-			return
+			return Error(ctx, http.StatusForbidden, "插件 "+slug+" 不兼容 "+exclude+" 插件")
 		}
 	}
 
@@ -128,29 +142,26 @@ func (r *PluginController) Install(ctx http.Context) {
 	task.Log = "/tmp/" + plugin.Slug + ".log"
 	if err := facades.Orm().Query().Create(&task); err != nil {
 		facades.Log().Error("[面板][PluginController] 创建任务失败: " + err.Error())
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	r.task.Process(task.ID)
-	Success(ctx, "任务已提交")
+	return Success(ctx, "任务已提交")
 }
 
 // Uninstall 卸载插件
-func (r *PluginController) Uninstall(ctx http.Context) {
+func (r *PluginController) Uninstall(ctx http.Context) http.Response {
 	slug := ctx.Request().Input("slug")
 	plugin := r.plugin.GetBySlug(slug)
 	installedPlugin := r.plugin.GetInstalledBySlug(slug)
 	installedPlugins, err := r.plugin.AllInstalled()
 	if err != nil {
 		facades.Log().Error("[面板][PluginController] 获取已安装插件失败")
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	if installedPlugin.ID == 0 {
-		Error(ctx, http.StatusBadRequest, "插件未安装")
-		return
+		return Error(ctx, http.StatusBadRequest, "插件未安装")
 	}
 
 	var lock sync.RWMutex
@@ -167,8 +178,7 @@ func (r *PluginController) Uninstall(ctx http.Context) {
 		_, requireFound := pluginsMap[require]
 		lock.RUnlock()
 		if !requireFound {
-			Error(ctx, http.StatusForbidden, "插件 "+slug+" 需要依赖 "+require+" 插件")
-			return
+			return Error(ctx, http.StatusForbidden, "插件 "+slug+" 需要依赖 "+require+" 插件")
 		}
 	}
 
@@ -177,8 +187,7 @@ func (r *PluginController) Uninstall(ctx http.Context) {
 		_, excludeFound := pluginsMap[exclude]
 		lock.RUnlock()
 		if excludeFound {
-			Error(ctx, http.StatusForbidden, "插件 "+slug+" 不兼容 "+exclude+" 插件")
-			return
+			return Error(ctx, http.StatusForbidden, "插件 "+slug+" 不兼容 "+exclude+" 插件")
 		}
 	}
 
@@ -189,29 +198,26 @@ func (r *PluginController) Uninstall(ctx http.Context) {
 	task.Log = "/tmp/" + plugin.Slug + ".log"
 	if err := facades.Orm().Query().Create(&task); err != nil {
 		facades.Log().Error("[面板][PluginController] 创建任务失败: " + err.Error())
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	r.task.Process(task.ID)
-	Success(ctx, "任务已提交")
+	return Success(ctx, "任务已提交")
 }
 
 // Update 更新插件
-func (r *PluginController) Update(ctx http.Context) {
+func (r *PluginController) Update(ctx http.Context) http.Response {
 	slug := ctx.Request().Input("slug")
 	plugin := r.plugin.GetBySlug(slug)
 	installedPlugin := r.plugin.GetInstalledBySlug(slug)
 	installedPlugins, err := r.plugin.AllInstalled()
 	if err != nil {
 		facades.Log().Error("[面板][PluginController] 获取已安装插件失败")
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	if installedPlugin.ID == 0 {
-		Error(ctx, http.StatusBadRequest, "插件未安装")
-		return
+		return Error(ctx, http.StatusBadRequest, "插件未安装")
 	}
 
 	var lock sync.RWMutex
@@ -228,8 +234,7 @@ func (r *PluginController) Update(ctx http.Context) {
 		_, requireFound := pluginsMap[require]
 		lock.RUnlock()
 		if !requireFound {
-			Error(ctx, http.StatusForbidden, "插件 "+slug+" 需要依赖 "+require+" 插件")
-			return
+			return Error(ctx, http.StatusForbidden, "插件 "+slug+" 需要依赖 "+require+" 插件")
 		}
 	}
 
@@ -238,8 +243,7 @@ func (r *PluginController) Update(ctx http.Context) {
 		_, excludeFound := pluginsMap[exclude]
 		lock.RUnlock()
 		if excludeFound {
-			Error(ctx, http.StatusForbidden, "插件 "+slug+" 不兼容 "+exclude+" 插件")
-			return
+			return Error(ctx, http.StatusForbidden, "插件 "+slug+" 不兼容 "+exclude+" 插件")
 		}
 	}
 
@@ -250,36 +254,32 @@ func (r *PluginController) Update(ctx http.Context) {
 	task.Log = "/tmp/" + plugin.Slug + ".log"
 	if err := facades.Orm().Query().Create(&task); err != nil {
 		facades.Log().Error("[面板][PluginController] 创建任务失败: " + err.Error())
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	r.task.Process(task.ID)
-	Success(ctx, "任务已提交")
+	return Success(ctx, "任务已提交")
 }
 
 // UpdateShow 更新插件首页显示状态
-func (r *PluginController) UpdateShow(ctx http.Context) {
+func (r *PluginController) UpdateShow(ctx http.Context) http.Response {
 	slug := ctx.Request().Input("slug")
 	show := ctx.Request().InputBool("show")
 
 	var plugin models.Plugin
 	if err := facades.Orm().Query().Where("slug", slug).First(&plugin); err != nil {
 		facades.Log().Error("[面板][PluginController] 查询插件失败: " + err.Error())
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 	if plugin.ID == 0 {
-		Error(ctx, http.StatusBadRequest, "插件未安装")
-		return
+		return Error(ctx, http.StatusBadRequest, "插件未安装")
 	}
 
 	plugin.Show = show
 	if err := facades.Orm().Query().Save(&plugin); err != nil {
 		facades.Log().Error("[面板][PluginController] 更新插件失败: " + err.Error())
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	Success(ctx, "操作成功")
+	return Success(ctx, "操作成功")
 }

app/http/controllers/plugins/fail2ban/fail2ban_controller.go

@@ -0,0 +1,451 @@
+package fail2ban
+
+import (
+	"regexp"
+	"strings"
+
+	"github.com/goravel/framework/contracts/http"
+	"github.com/goravel/framework/facades"
+	"github.com/spf13/cast"
+
+	"panel/app/http/controllers"
+	"panel/app/models"
+	"panel/app/services"
+	"panel/pkg/tools"
+)
+
+type Fail2banController struct {
+	website services.Website
+}
+
+func NewFail2banController() *Fail2banController {
+	return &Fail2banController{
+		website: services.NewWebsiteImpl(),
+	}
+}
+
+type Jail struct {
+	Name     string `json:"name"`
+	Enabled  bool   `json:"enabled"`
+	LogPath  string `json:"log_path"`
+	MaxRetry int    `json:"max_retry"`
+	FindTime int    `json:"find_time"`
+	BanTime  int    `json:"ban_time"`
+}
+
+// Status 获取运行状态
+func (c *Fail2banController) Status(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "fail2ban")
+	if check != nil {
+		return check
+	}
+
+	status := tools.Exec("systemctl status fail2ban | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取服务运行状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Reload 重载配置
+func (c *Fail2banController) Reload(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "fail2ban")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl reload fail2ban")
+	status := tools.Exec("systemctl status fail2ban | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取服务运行状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Restart 重启服务
+func (c *Fail2banController) Restart(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "fail2ban")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl restart fail2ban")
+	status := tools.Exec("systemctl status fail2ban | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取服务运行状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Start 启动服务
+func (c *Fail2banController) Start(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "fail2ban")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl start fail2ban")
+	status := tools.Exec("systemctl status fail2ban | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取服务运行状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Stop 停止服务
+func (c *Fail2banController) Stop(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "fail2ban")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl stop fail2ban")
+	status := tools.Exec("systemctl status fail2ban | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取服务运行状态失败")
+	}
+
+	if status != "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// List 所有 Fail2ban 规则
+func (c *Fail2banController) List(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "fail2ban")
+	if check != nil {
+		return check
+	}
+
+	page := ctx.Request().QueryInt("page", 1)
+	limit := ctx.Request().QueryInt("limit", 10)
+	raw := tools.Read("/etc/fail2ban/jail.local")
+	if len(raw) == 0 {
+		return controllers.Error(ctx, http.StatusBadRequest, "Fail2ban 规则为空")
+	}
+
+	jailList := regexp.MustCompile(`\[(.*?)]`).FindAllStringSubmatch(raw, -1)
+	if len(jailList) == 0 {
+		return controllers.Error(ctx, http.StatusBadRequest, "Fail2ban 规则为空")
+	}
+
+	var jails []Jail
+	for i, jail := range jailList {
+		if i == 0 {
+			continue
+		}
+
+		jailName := jail[1]
+		jailRaw := tools.Cut(raw, "# "+jailName+"-START", "# "+jailName+"-END")
+		if len(jailRaw) == 0 {
+			continue
+		}
+		jailEnabled := strings.Contains(jailRaw, "enabled = true")
+		jailLogPath := regexp.MustCompile(`logpath = (.*)`).FindStringSubmatch(jailRaw)
+		jailMaxRetry := regexp.MustCompile(`maxretry = (.*)`).FindStringSubmatch(jailRaw)
+		jailFindTime := regexp.MustCompile(`findtime = (.*)`).FindStringSubmatch(jailRaw)
+		jailBanTime := regexp.MustCompile(`bantime = (.*)`).FindStringSubmatch(jailRaw)
+
+		jails = append(jails, Jail{
+			Name:     jailName,
+			Enabled:  jailEnabled,
+			LogPath:  jailLogPath[1],
+			MaxRetry: cast.ToInt(jailMaxRetry[1]),
+			FindTime: cast.ToInt(jailFindTime[1]),
+			BanTime:  cast.ToInt(jailBanTime[1]),
+		})
+	}
+
+	startIndex := (page - 1) * limit
+	endIndex := page * limit
+	if startIndex > len(jails) {
+		return controllers.Success(ctx, http.Json{
+			"total": 0,
+			"items": []Jail{},
+		})
+	}
+	if endIndex > len(jails) {
+		endIndex = len(jails)
+	}
+	pagedJails := jails[startIndex:endIndex]
+
+	return controllers.Success(ctx, http.Json{
+		"total": len(jails),
+		"items": pagedJails,
+	})
+}
+
+// Add 添加 Fail2ban 规则
+func (c *Fail2banController) Add(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "fail2ban")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"name":         "required",
+		"type":         "required|in:website,service",
+		"maxretry":     "required",
+		"findtime":     "required",
+		"bantime":      "required",
+		"website_mode": "required_if:type,website",
+		"website_path": "required_if:type,website",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusUnprocessableEntity, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusUnprocessableEntity, validator.Errors().One())
+	}
+
+	jailName := ctx.Request().Input("name")
+	jailType := ctx.Request().Input("type")
+	jailMaxRetry := ctx.Request().Input("maxretry")
+	jailFindTime := ctx.Request().Input("findtime")
+	jailBanTime := ctx.Request().Input("bantime")
+	jailWebsiteMode := ctx.Request().Input("website_mode")
+	jailWebsitePath := ctx.Request().Input("website_path")
+
+	raw := tools.Read("/etc/fail2ban/jail.local")
+	if strings.Contains(raw, "["+jailName+"]") || (strings.Contains(raw, "["+jailName+"]"+"-cc") && jailWebsiteMode == "cc") || (strings.Contains(raw, "["+jailName+"]"+"-path") && jailWebsiteMode == "path") {
+		return controllers.Error(ctx, http.StatusUnprocessableEntity, "规则已存在")
+	}
+
+	switch jailType {
+	case "website":
+		var website models.Website
+		err := facades.Orm().Query().Where("name", jailName).FirstOrFail(&website)
+		if err != nil {
+			return controllers.Error(ctx, http.StatusUnprocessableEntity, "网站不存在")
+		}
+		config, err := c.website.GetConfig(int(website.ID))
+		if err != nil {
+			return controllers.Error(ctx, http.StatusUnprocessableEntity, "获取网站配置失败")
+		}
+		var ports string
+		for _, port := range config.Ports {
+			if len(strings.Split(port, " ")) > 1 {
+				ports += strings.Split(port, " ")[0] + ","
+			} else {
+				ports += port + ","
+			}
+		}
+
+		rule := `
+# ` + jailName + `-` + jailWebsiteMode + `-START
+[` + jailName + `-` + jailWebsiteMode + `]
+enabled = true
+filter = haozi-` + jailName + `-` + jailWebsiteMode + `
+port = ` + ports + `
+maxretry = ` + jailMaxRetry + `
+findtime = ` + jailFindTime + `
+bantime = ` + jailBanTime + `
+action = %(action_mwl)s
+logpath = /www/wwwlogs/` + website.Name + `.log
+# ` + jailName + `-` + jailWebsiteMode + `-END
+`
+		raw += rule
+		tools.Write("/etc/fail2ban/jail.local", raw, 0644)
+
+		var filter string
+		if jailWebsiteMode == "cc" {
+			filter = `
+[Definition]
+failregex = ^<HOST>\s-.*HTTP/.*$
+ignoreregex =
+`
+		} else {
+			filter = `
+[Definition]
+failregex = ^<HOST>\s-.*\s` + jailWebsitePath + `.*HTTP/.*$
+ignoreregex =
+`
+		}
+		tools.Write("/etc/fail2ban/filter.d/haozi-"+jailName+"-"+jailWebsiteMode+".conf", filter, 0644)
+
+	case "service":
+		var logPath string
+		var filter string
+		var port string
+		switch jailName {
+		case "ssh":
+			if tools.IsDebian() {
+				logPath = "/var/log/auth.log"
+			} else {
+				logPath = "/var/log/secure"
+			}
+			filter = "sshd"
+			port = tools.Exec("cat /etc/ssh/sshd_config | grep 'Port ' | awk '{print $2}'")
+		case "mysql":
+			logPath = "/www/server/mysql/mysql-error.log"
+			filter = "mysqld-auth"
+			port = tools.Exec("cat /www/server/mysql/conf/my.cnf | grep 'port' | head -n 1 | awk '{print $3}'")
+		case "pure-ftpd":
+			logPath = "/var/log/messages"
+			filter = "pure-ftpd"
+			port = tools.Exec(`cat /www/server/pure-ftpd/etc/pure-ftpd.conf | grep "Bind" | awk '{print $2}' | awk -F "," '{print $2}'`)
+		default:
+			return controllers.Error(ctx, http.StatusUnprocessableEntity, "未知服务")
+		}
+		if len(port) == 0 {
+			return controllers.Error(ctx, http.StatusUnprocessableEntity, "获取服务端口失败，请检查是否安装")
+		}
+
+		rule := `
+# ` + jailName + `-START
+[` + jailName + `]
+enabled = true
+filter = ` + filter + `
+port = ` + port + `
+maxretry = ` + jailMaxRetry + `
+findtime = ` + jailFindTime + `
+bantime = ` + jailBanTime + `
+action = %(action_mwl)s
+logpath = ` + logPath + `
+# ` + jailName + `-END
+`
+		raw += rule
+		tools.Write("/etc/fail2ban/jail.local", raw, 0644)
+	}
+
+	tools.Exec("fail2ban-client reload")
+	return controllers.Success(ctx, nil)
+}
+
+// Delete 删除规则
+func (c *Fail2banController) Delete(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "fail2ban")
+	if check != nil {
+		return check
+	}
+
+	jailName := ctx.Request().Input("name")
+	raw := tools.Read("/etc/fail2ban/jail.local")
+	if !strings.Contains(raw, "["+jailName+"]") {
+		return controllers.Error(ctx, http.StatusUnprocessableEntity, "规则不存在")
+	}
+
+	rule := tools.Cut(raw, "# "+jailName+"-START", "# "+jailName+"-END")
+	raw = strings.Replace(raw, "\n# "+jailName+"-START"+rule+"# "+jailName+"-END", "", -1)
+	raw = strings.TrimSpace(raw)
+	tools.Write("/etc/fail2ban/jail.local", raw, 0644)
+
+	tools.Exec("fail2ban-client reload")
+	return controllers.Success(ctx, nil)
+}
+
+// BanList 获取封禁列表
+func (c *Fail2banController) BanList(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "fail2ban")
+	if check != nil {
+		return check
+	}
+
+	name := ctx.Request().Query("name")
+	if len(name) == 0 {
+		return controllers.Error(ctx, http.StatusUnprocessableEntity, "缺少参数")
+	}
+
+	currentlyBan := tools.Exec(`fail2ban-client status ` + name + ` | grep "Currently banned" | awk '{print $4}'`)
+	totalBan := tools.Exec(`fail2ban-client status ` + name + ` | grep "Total banned" | awk '{print $4}'`)
+	bannedIp := tools.Exec(`fail2ban-client status ` + name + ` | grep "Banned IP list" | awk -F ":" '{print $2}'`)
+	bannedIpList := strings.Split(bannedIp, " ")
+
+	var list []map[string]string
+	for _, ip := range bannedIpList {
+		if len(ip) > 0 {
+			list = append(list, map[string]string{
+				"name": name,
+				"ip":   ip,
+			})
+		}
+	}
+
+	return controllers.Success(ctx, http.Json{
+		"currentlyBan": currentlyBan,
+		"totalBan":     totalBan,
+		"bannedIpList": list,
+	})
+}
+
+// Unban 解封
+func (c *Fail2banController) Unban(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "fail2ban")
+	if check != nil {
+		return check
+	}
+
+	name := ctx.Request().Input("name")
+	ip := ctx.Request().Input("ip")
+	if len(name) == 0 || len(ip) == 0 {
+		return controllers.Error(ctx, http.StatusUnprocessableEntity, "缺少参数")
+	}
+
+	tools.Exec("fail2ban-client set " + name + " unbanip " + ip)
+	return controllers.Success(ctx, nil)
+}
+
+// SetWhiteList 设置白名单
+func (c *Fail2banController) SetWhiteList(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "fail2ban")
+	if check != nil {
+		return check
+	}
+
+	ip := ctx.Request().Input("ip")
+	if len(ip) == 0 {
+		return controllers.Error(ctx, http.StatusUnprocessableEntity, "缺少参数")
+	}
+
+	raw := tools.Read("/etc/fail2ban/jail.local")
+	// 正则替换
+	reg := regexp.MustCompile(`ignoreip\s*=\s*.*\n`)
+	if reg.MatchString(raw) {
+		raw = reg.ReplaceAllString(raw, "ignoreip = "+ip+"\n")
+	} else {
+		return controllers.Error(ctx, http.StatusInternalServerError, "解析Fail2ban规则失败，Fail2ban可能已损坏")
+	}
+
+	tools.Write("/etc/fail2ban/jail.local", raw, 0644)
+	tools.Exec("fail2ban-client reload")
+	return controllers.Success(ctx, nil)
+}
+
+// GetWhiteList 获取白名单
+func (c *Fail2banController) GetWhiteList(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "fail2ban")
+	if check != nil {
+		return check
+	}
+
+	raw := tools.Read("/etc/fail2ban/jail.local")
+	reg := regexp.MustCompile(`ignoreip\s*=\s*(.*)\n`)
+	if reg.MatchString(raw) {
+		ignoreIp := reg.FindStringSubmatch(raw)[1]
+		return controllers.Success(ctx, ignoreIp)
+	} else {
+		return controllers.Error(ctx, http.StatusInternalServerError, "解析Fail2ban规则失败，Fail2ban可能已损坏")
+	}
+}

app/http/controllers/plugins/mysql57/mysql57_controller.go

@@ -29,169 +29,165 @@ func NewMysql57Controller() *Mysql57Controller {
 }
 
 // Status 获取运行状态
-func (c *Mysql57Controller) Status(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) Status(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
-	status := tools.ExecShell("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
+	status := tools.Exec("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
 // Reload 重载配置
-func (c *Mysql57Controller) Reload(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) Reload(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl reload mysqld")
-	status := tools.ExecShell("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl reload mysqld")
+	status := tools.Exec("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
 // Restart 重启服务
-func (c *Mysql57Controller) Restart(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) Restart(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl restart mysqld")
-	status := tools.ExecShell("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl restart mysqld")
+	status := tools.Exec("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
 // Start 启动服务
-func (c *Mysql57Controller) Start(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) Start(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl start mysqld")
-	status := tools.ExecShell("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl start mysqld")
+	status := tools.Exec("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
 // Stop 停止服务
-func (c *Mysql57Controller) Stop(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) Stop(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl stop mysqld")
-	status := tools.ExecShell("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl stop mysqld")
+	status := tools.Exec("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
 	}
 
 	if status != "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
 // GetConfig 获取配置
-func (c *Mysql57Controller) GetConfig(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) GetConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
 	// 获取配置
-	config := tools.ReadFile("/www/server/mysql/conf/my.cnf")
+	config := tools.Read("/www/server/mysql/conf/my.cnf")
 	if len(config) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL配置失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL配置失败")
 	}
 
-	controllers.Success(ctx, config)
+	return controllers.Success(ctx, config)
 }
 
 // SaveConfig 保存配置
-func (c *Mysql57Controller) SaveConfig(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) SaveConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
 	config := ctx.Request().Input("config")
 	if len(config) == 0 {
-		controllers.Error(ctx, http.StatusBadRequest, "配置不能为空")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "配置不能为空")
 	}
 
-	if !tools.WriteFile("/www/server/mysql/conf/my.cnf", config, 0644) {
-		controllers.Error(ctx, http.StatusInternalServerError, "写入MySQL配置失败")
-		return
+	if !tools.Write("/www/server/mysql/conf/my.cnf", config, 0644) {
+		return controllers.Error(ctx, http.StatusInternalServerError, "写入MySQL配置失败")
 	}
 
-	controllers.Success(ctx, "保存MySQL配置成功")
+	return c.Restart(ctx)
 }
 
 // Load 获取负载
-func (c *Mysql57Controller) Load(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) Load(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
 	rootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
 	if len(rootPassword) == 0 {
-		controllers.Error(ctx, http.StatusBadRequest, "MySQL root密码为空")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "MySQL root密码为空")
 	}
 
-	status := tools.ExecShell("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
+	status := tools.Exec("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
 	if status != "active" {
-		controllers.Error(ctx, http.StatusInternalServerError, "MySQL 已停止运行")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "MySQL 已停止运行")
 	}
 
-	raw := tools.ExecShell("mysqladmin -uroot -p" + rootPassword + " extended-status 2>&1")
+	raw := tools.Exec("/www/server/mysql/bin/mysqladmin -uroot -p" + rootPassword + " extended-status 2>&1")
 	if strings.Contains(raw, "Access denied for user") {
-		controllers.Error(ctx, http.StatusBadRequest, "MySQL root密码错误")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "MySQL root密码错误")
 	}
 	if !strings.Contains(raw, "Uptime") {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL负载失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL负载失败")
 	}
 
-	data := make(map[int]map[string]string)
+	var data []map[string]string
 	expressions := []struct {
 		regex string
 		name  string
@@ -216,16 +212,18 @@ func (c *Mysql57Controller) Load(ctx http.Context) {
 		{`Table_locks_waited\s+\|\s+(\d+)\s+\|`, "锁表次数"},
 	}
 
-	for i, expression := range expressions {
+	for _, expression := range expressions {
 		re := regexp.MustCompile(expression.regex)
 		matches := re.FindStringSubmatch(raw)
 		if len(matches) > 1 {
-			data[i] = make(map[string]string)
-			data[i] = map[string]string{"name": expression.name, "value": matches[1]}
+			d := make(map[string]string)
+			d = map[string]string{"name": expression.name, "value": matches[1]}
 
 			if expression.name == "发送" || expression.name == "接收" {
-				data[i]["value"] = tools.FormatBytes(cast.ToFloat64(matches[1]))
+				d["value"] = tools.FormatBytes(cast.ToFloat64(matches[1]))
 			}
+
+			data = append(data, d)
 		}
 	}
 
@@ -238,106 +236,108 @@ func (c *Mysql57Controller) Load(ctx http.Context) {
 	bufferPoolReadRequests := cast.ToFloat64(data[12]["value"])
 	data[10]["value"] = fmt.Sprintf("%.2f%%", bufferPoolReadRequests/(bufferPoolReads+bufferPoolReadRequests)*100)
 
-	controllers.Success(ctx, data)
+	return controllers.Success(ctx, data)
 }
 
 // ErrorLog 获取错误日志
-func (c *Mysql57Controller) ErrorLog(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) ErrorLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
-	log := tools.ExecShell("tail -n 100 /www/server/mysql/mysql-error.log")
-	controllers.Success(ctx, log)
+	log := tools.Escape(tools.Exec("tail -n 100 /www/server/mysql/mysql-error.log"))
+	return controllers.Success(ctx, log)
 }
 
 // ClearErrorLog 清空错误日志
-func (c *Mysql57Controller) ClearErrorLog(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) ClearErrorLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("echo '' > /www/server/mysql/mysql-error.log")
-	controllers.Success(ctx, "清空错误日志成功")
+	tools.Exec("echo '' > /www/server/mysql/mysql-error.log")
+	return controllers.Success(ctx, "清空错误日志成功")
 }
 
 // SlowLog 获取慢查询日志
-func (c *Mysql57Controller) SlowLog(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) SlowLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
-	log := tools.ExecShell("tail -n 100 /www/server/mysql/mysql-slow.log")
-	controllers.Success(ctx, log)
+	log := tools.Escape(tools.Exec("tail -n 100 /www/server/mysql/mysql-slow.log"))
+	return controllers.Success(ctx, log)
 }
 
 // ClearSlowLog 清空慢查询日志
-func (c *Mysql57Controller) ClearSlowLog(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) ClearSlowLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("echo '' > /www/server/mysql/mysql-slow.log")
-	controllers.Success(ctx, "清空慢查询日志成功")
+	tools.Exec("echo '' > /www/server/mysql/mysql-slow.log")
+	return controllers.Success(ctx, "清空慢查询日志成功")
 }
 
 // GetRootPassword 获取root密码
-func (c *Mysql57Controller) GetRootPassword(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) GetRootPassword(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
 	rootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
 	if len(rootPassword) == 0 {
-		controllers.Error(ctx, http.StatusBadRequest, "MySQL root密码为空")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "MySQL root密码为空")
 	}
 
-	controllers.Success(ctx, rootPassword)
+	return controllers.Success(ctx, rootPassword)
 }
 
 // SetRootPassword 设置root密码
-func (c *Mysql57Controller) SetRootPassword(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) SetRootPassword(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
-	status := tools.ExecShell("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
+	status := tools.Exec("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
 	}
 	if status != "active" {
-		controllers.Error(ctx, http.StatusInternalServerError, "MySQL 未运行")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "MySQL 未运行")
 	}
 
 	rootPassword := ctx.Request().Input(models.SettingKeyMysqlRootPassword)
 	if len(rootPassword) == 0 {
-		controllers.Error(ctx, http.StatusBadRequest, "MySQL root密码不能为空")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "MySQL root密码不能为空")
 	}
 
 	oldRootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
 	if oldRootPassword != rootPassword {
-		tools.ExecShell("mysql -uroot -p" + oldRootPassword + " -e \"ALTER USER 'root'@'localhost' IDENTIFIED BY '" + rootPassword + "';\"")
-		tools.ExecShell("mysql -uroot -p" + oldRootPassword + " -e \"FLUSH PRIVILEGES;\"")
+		tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + oldRootPassword + " -e \"ALTER USER 'root'@'localhost' IDENTIFIED BY '" + rootPassword + "';\"")
+		tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + oldRootPassword + " -e \"FLUSH PRIVILEGES;\"")
 		err := c.setting.Set(models.SettingKeyMysqlRootPassword, rootPassword)
 		if err != nil {
-			tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"ALTER USER 'root'@'localhost' IDENTIFIED BY '" + oldRootPassword + "';\"")
-			tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
-			controllers.Error(ctx, http.StatusInternalServerError, "设置root密码失败")
-			return
+			tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"ALTER USER 'root'@'localhost' IDENTIFIED BY '" + oldRootPassword + "';\"")
+			tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
+			return controllers.Error(ctx, http.StatusInternalServerError, "设置root密码失败")
 		}
 	}
 
-	controllers.Success(ctx, "设置root密码成功")
+	return controllers.Success(ctx, "设置root密码成功")
 }
 
 // DatabaseList 获取数据库列表
-func (c *Mysql57Controller) DatabaseList(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) DatabaseList(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
 	rootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
@@ -348,16 +348,14 @@ func (c *Mysql57Controller) DatabaseList(ctx http.Context) {
 	db, err := sql.Open("mysql", "root:"+rootPassword+"@unix(/tmp/mysql.sock)/")
 	if err != nil {
 		facades.Log().Error("[MySQL57] 连接数据库失败" + err.Error())
-		controllers.Error(ctx, http.StatusInternalServerError, "连接数据库失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "连接数据库失败")
 	}
 	defer db.Close()
 
 	rows, err := db.Query("SHOW DATABASES")
 	if err != nil {
 		facades.Log().Error("[MySQL57] 获取数据库列表失败" + err.Error())
-		controllers.Error(ctx, http.StatusInternalServerError, "获取数据库列表失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取数据库列表失败")
 	}
 	defer rows.Close()
 
@@ -374,17 +372,35 @@ func (c *Mysql57Controller) DatabaseList(ctx http.Context) {
 
 	if err := rows.Err(); err != nil {
 		facades.Log().Error("[MySQL57] 获取数据库列表失败" + err.Error())
-		controllers.Error(ctx, http.StatusInternalServerError, "获取数据库列表失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取数据库列表失败")
 	}
 
-	controllers.Success(ctx, databases)
+	page := ctx.Request().QueryInt("page", 1)
+	limit := ctx.Request().QueryInt("limit", 10)
+	startIndex := (page - 1) * limit
+	endIndex := page * limit
+	if startIndex > len(databases) {
+		return controllers.Success(ctx, http.Json{
+			"total": 0,
+			"items": []database{},
+		})
+	}
+	if endIndex > len(databases) {
+		endIndex = len(databases)
+	}
+	pagedDatabases := databases[startIndex:endIndex]
+
+	return controllers.Success(ctx, http.Json{
+		"total": len(databases),
+		"items": pagedDatabases,
+	})
 }
 
 // AddDatabase 添加数据库
-func (c *Mysql57Controller) AddDatabase(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) AddDatabase(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
@@ -393,12 +409,10 @@ func (c *Mysql57Controller) AddDatabase(ctx http.Context) {
 		"password": "required|min_len:8|max_len:255",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	rootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
@@ -406,61 +420,64 @@ func (c *Mysql57Controller) AddDatabase(ctx http.Context) {
 	user := ctx.Request().Input("user")
 	password := ctx.Request().Input("password")
 
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"CREATE DATABASE IF NOT EXISTS " + database + " DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_general_ci;\"")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"CREATE USER '" + user + "'@'localhost' IDENTIFIED BY '" + password + "';\"")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"GRANT ALL PRIVILEGES ON " + database + ".* TO '" + user + "'@'localhost';\"")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"CREATE DATABASE IF NOT EXISTS " + database + " DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_general_ci;\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"CREATE USER '" + user + "'@'localhost' IDENTIFIED BY '" + password + "';\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"GRANT ALL PRIVILEGES ON " + database + ".* TO '" + user + "'@'localhost';\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
 
-	controllers.Success(ctx, "添加数据库成功")
+	return controllers.Success(ctx, "添加数据库成功")
 }
 
 // DeleteDatabase 删除数据库
-func (c *Mysql57Controller) DeleteDatabase(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) DeleteDatabase(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
 		"database": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$|not_in:information_schema,mysql,performance_schema,sys",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	rootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
 	database := ctx.Request().Input("database")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"DROP DATABASE IF EXISTS " + database + ";\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"DROP DATABASE IF EXISTS " + database + ";\"")
 
-	controllers.Success(ctx, "删除数据库成功")
+	return controllers.Success(ctx, "删除数据库成功")
 }
 
 // BackupList 获取备份列表
-func (c *Mysql57Controller) BackupList(ctx http.Context) {
+func (c *Mysql57Controller) BackupList(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
+	}
+
 	backupList, err := c.backup.MysqlList()
 	if err != nil {
 		facades.Log().Error("[MySQL57] 获取备份列表失败：" + err.Error())
-		controllers.Error(ctx, http.StatusInternalServerError, "获取备份列表失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取备份列表失败")
 	}
 
-	controllers.Success(ctx, backupList)
+	return controllers.Success(ctx, backupList)
 }
 
 // UploadBackup 上传备份
-func (c *Mysql57Controller) UploadBackup(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) UploadBackup(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
 	file, err := ctx.Request().File("file")
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, "上传文件失败")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "上传文件失败")
 	}
 
 	backupPath := c.setting.Get(models.SettingKeyBackupPath) + "/mysql"
@@ -471,100 +488,95 @@ func (c *Mysql57Controller) UploadBackup(ctx http.Context) {
 	name := file.GetClientOriginalName()
 	_, err = file.StoreAs(backupPath, name)
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, "上传文件失败")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "上传文件失败")
 	}
 
-	controllers.Success(ctx, "上传文件成功")
+	return controllers.Success(ctx, "上传文件成功")
 }
 
 // CreateBackup 创建备份
-func (c *Mysql57Controller) CreateBackup(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) CreateBackup(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
 		"database": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$|not_in:information_schema,mysql,performance_schema,sys",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	database := ctx.Request().Input("database")
 	err = c.backup.MysqlBackup(database)
 	if err != nil {
 		facades.Log().Error("[MYSQL57] 创建备份失败：" + err.Error())
-		controllers.Error(ctx, http.StatusInternalServerError, "创建备份失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "创建备份失败")
 	}
 
-	controllers.Success(ctx, "备份成功")
+	return controllers.Success(ctx, "备份成功")
 }
 
 // DeleteBackup 删除备份
-func (c *Mysql57Controller) DeleteBackup(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) DeleteBackup(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
-		"name": "required|min_len:1|max_len:255",
+		"backup": "required|min_len:1|max_len:255",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	backupPath := c.setting.Get(models.SettingKeyBackupPath) + "/mysql"
-	fileName := ctx.Request().Input("name")
-	tools.RemoveFile(backupPath + "/" + fileName)
+	fileName := ctx.Request().Input("backup")
+	tools.Remove(backupPath + "/" + fileName)
 
-	controllers.Success(ctx, "删除备份成功")
+	return controllers.Success(ctx, "删除备份成功")
 }
 
 // RestoreBackup 还原备份
-func (c *Mysql57Controller) RestoreBackup(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) RestoreBackup(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
-		"name":     "required|min_len:1|max_len:255",
+		"backup":   "required|min_len:1|max_len:255",
 		"database": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$|not_in:information_schema,mysql,performance_schema,sys",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
-	err = c.backup.MysqlRestore(ctx.Request().Input("database"), ctx.Request().Input("name"))
+	err = c.backup.MysqlRestore(ctx.Request().Input("database"), ctx.Request().Input("backup"))
 	if err != nil {
 		facades.Log().Error("[MYSQL57] 还原失败：" + err.Error())
-		controllers.Error(ctx, http.StatusInternalServerError, "还原失败: "+err.Error())
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "还原失败: "+err.Error())
 	}
 
-	controllers.Success(ctx, "还原成功")
+	return controllers.Success(ctx, "还原成功")
 }
 
 // UserList 用户列表
-func (c *Mysql57Controller) UserList(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) UserList(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
 	type user struct {
@@ -577,14 +589,14 @@ func (c *Mysql57Controller) UserList(ctx http.Context) {
 	db, err := sql.Open("mysql", "root:"+rootPassword+"@unix(/tmp/mysql.sock)/")
 	if err != nil {
 		facades.Log().Error("[MYSQL57] 连接数据库失败：" + err.Error())
-		controllers.Error(ctx, http.StatusInternalServerError, "连接数据库失败")
+		return controllers.Error(ctx, http.StatusInternalServerError, "连接数据库失败")
 	}
 	defer db.Close()
 
 	rows, err := db.Query("SELECT user, host FROM mysql.user")
 	if err != nil {
 		facades.Log().Error("[MYSQL57] 查询数据库失败：" + err.Error())
-		controllers.Error(ctx, http.StatusInternalServerError, "查询数据库失败")
+		return controllers.Error(ctx, http.StatusInternalServerError, "查询数据库失败")
 	}
 	defer rows.Close()
 
@@ -622,17 +634,35 @@ func (c *Mysql57Controller) UserList(ctx http.Context) {
 	}
 
 	if err := rows.Err(); err != nil {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取用户列表失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取用户列表失败")
 	}
 
-	controllers.Success(ctx, userGrants)
+	page := ctx.Request().QueryInt("page", 1)
+	limit := ctx.Request().QueryInt("limit", 10)
+	startIndex := (page - 1) * limit
+	endIndex := page * limit
+	if startIndex > len(userGrants) {
+		return controllers.Success(ctx, http.Json{
+			"total": 0,
+			"items": []user{},
+		})
+	}
+	if endIndex > len(userGrants) {
+		endIndex = len(userGrants)
+	}
+	pagedUserGrants := userGrants[startIndex:endIndex]
+
+	return controllers.Success(ctx, http.Json{
+		"total": len(userGrants),
+		"items": pagedUserGrants,
+	})
 }
 
 // AddUser 添加用户
-func (c *Mysql57Controller) AddUser(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) AddUser(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
@@ -641,54 +671,52 @@ func (c *Mysql57Controller) AddUser(ctx http.Context) {
 		"password": "required|min_len:8|max_len:255",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	rootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
 	user := ctx.Request().Input("user")
 	password := ctx.Request().Input("password")
 	database := ctx.Request().Input("database")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"CREATE USER '" + user + "'@'localhost' IDENTIFIED BY '" + password + ";'\"")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"GRANT ALL PRIVILEGES ON " + database + ".* TO '" + user + "'@'localhost';\"")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"CREATE USER '" + user + "'@'localhost' IDENTIFIED BY '" + password + ";'\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"GRANT ALL PRIVILEGES ON " + database + ".* TO '" + user + "'@'localhost';\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
 
-	controllers.Success(ctx, "添加成功")
+	return controllers.Success(ctx, "添加成功")
 }
 
 // DeleteUser 删除用户
-func (c *Mysql57Controller) DeleteUser(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) DeleteUser(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
 		"user": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	rootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
 	user := ctx.Request().Input("user")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"DROP USER '" + user + "'@'localhost';\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"DROP USER '" + user + "'@'localhost';\"")
 
-	controllers.Success(ctx, "删除成功")
+	return controllers.Success(ctx, "删除成功")
 }
 
 // SetUserPassword 设置用户密码
-func (c *Mysql57Controller) SetUserPassword(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) SetUserPassword(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
@@ -696,27 +724,26 @@ func (c *Mysql57Controller) SetUserPassword(ctx http.Context) {
 		"password": "required|min_len:8|max_len:255",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	rootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
 	user := ctx.Request().Input("user")
 	password := ctx.Request().Input("password")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"ALTER USER '" + user + "'@'localhost' IDENTIFIED BY '" + password + "';\"")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"ALTER USER '" + user + "'@'localhost' IDENTIFIED BY '" + password + "';\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
 
-	controllers.Success(ctx, "修改成功")
+	return controllers.Success(ctx, "修改成功")
 }
 
 // SetUserPrivileges 设置用户权限
-func (c *Mysql57Controller) SetUserPrivileges(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql57") {
-		return
+func (c *Mysql57Controller) SetUserPrivileges(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql57")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
@@ -724,20 +751,18 @@ func (c *Mysql57Controller) SetUserPrivileges(ctx http.Context) {
 		"database": "required|min_len:1|max_len:255",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	rootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
 	user := ctx.Request().Input("user")
 	database := ctx.Request().Input("database")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"REVOKE ALL PRIVILEGES ON *.* FROM '" + user + "'@'localhost';\"")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"GRANT ALL PRIVILEGES ON " + database + ".* TO '" + user + "'@'localhost';\"")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"REVOKE ALL PRIVILEGES ON *.* FROM '" + user + "'@'localhost';\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"GRANT ALL PRIVILEGES ON " + database + ".* TO '" + user + "'@'localhost';\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
 
-	controllers.Success(ctx, "修改成功")
+	return controllers.Success(ctx, "修改成功")
 }

app/http/controllers/plugins/mysql80/mysql80_controller.go

@@ -29,169 +29,165 @@ func NewMysql80Controller() *Mysql80Controller {
 }
 
 // Status 获取运行状态
-func (c *Mysql80Controller) Status(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) Status(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
-	status := tools.ExecShell("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
+	status := tools.Exec("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
 // Reload 重载配置
-func (c *Mysql80Controller) Reload(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) Reload(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl reload mysqld")
-	status := tools.ExecShell("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl reload mysqld")
+	status := tools.Exec("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
 // Restart 重启服务
-func (c *Mysql80Controller) Restart(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) Restart(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl restart mysqld")
-	status := tools.ExecShell("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl restart mysqld")
+	status := tools.Exec("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
 // Start 启动服务
-func (c *Mysql80Controller) Start(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) Start(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl start mysqld")
-	status := tools.ExecShell("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl start mysqld")
+	status := tools.Exec("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
 // Stop 停止服务
-func (c *Mysql80Controller) Stop(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) Stop(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl stop mysqld")
-	status := tools.ExecShell("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl stop mysqld")
+	status := tools.Exec("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
 	}
 
 	if status != "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
 // GetConfig 获取配置
-func (c *Mysql80Controller) GetConfig(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) GetConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
 	// 获取配置
-	config := tools.ReadFile("/www/server/mysql/conf/my.cnf")
+	config := tools.Read("/www/server/mysql/conf/my.cnf")
 	if len(config) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL配置失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL配置失败")
 	}
 
-	controllers.Success(ctx, config)
+	return controllers.Success(ctx, config)
 }
 
 // SaveConfig 保存配置
-func (c *Mysql80Controller) SaveConfig(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) SaveConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
 	config := ctx.Request().Input("config")
 	if len(config) == 0 {
-		controllers.Error(ctx, http.StatusBadRequest, "配置不能为空")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "配置不能为空")
 	}
 
-	if !tools.WriteFile("/www/server/mysql/conf/my.cnf", config, 0644) {
-		controllers.Error(ctx, http.StatusInternalServerError, "写入MySQL配置失败")
-		return
+	if !tools.Write("/www/server/mysql/conf/my.cnf", config, 0644) {
+		return controllers.Error(ctx, http.StatusInternalServerError, "写入MySQL配置失败")
 	}
 
-	controllers.Success(ctx, "保存MySQL配置成功")
+	return c.Restart(ctx)
 }
 
 // Load 获取负载
-func (c *Mysql80Controller) Load(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) Load(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
 	rootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
 	if len(rootPassword) == 0 {
-		controllers.Error(ctx, http.StatusBadRequest, "MySQL root密码为空")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "MySQL root密码为空")
 	}
 
-	status := tools.ExecShell("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
+	status := tools.Exec("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
 	if status != "active" {
-		controllers.Error(ctx, http.StatusInternalServerError, "MySQL 已停止运行")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "MySQL 已停止运行")
 	}
 
-	raw := tools.ExecShell("mysqladmin -uroot -p" + rootPassword + " extended-status 2>&1")
+	raw := tools.Exec("/www/server/mysql/bin/mysqladmin -uroot -p" + rootPassword + " extended-status 2>&1")
 	if strings.Contains(raw, "Access denied for user") {
-		controllers.Error(ctx, http.StatusBadRequest, "MySQL root密码错误")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "MySQL root密码错误")
 	}
 	if !strings.Contains(raw, "Uptime") {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL负载失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL负载失败")
 	}
 
-	data := make(map[int]map[string]string)
+	var data []map[string]string
 	expressions := []struct {
 		regex string
 		name  string
@@ -216,16 +212,18 @@ func (c *Mysql80Controller) Load(ctx http.Context) {
 		{`Table_locks_waited\s+\|\s+(\d+)\s+\|`, "锁表次数"},
 	}
 
-	for i, expression := range expressions {
+	for _, expression := range expressions {
 		re := regexp.MustCompile(expression.regex)
 		matches := re.FindStringSubmatch(raw)
 		if len(matches) > 1 {
-			data[i] = make(map[string]string)
-			data[i] = map[string]string{"name": expression.name, "value": matches[1]}
+			d := make(map[string]string)
+			d = map[string]string{"name": expression.name, "value": matches[1]}
 
 			if expression.name == "发送" || expression.name == "接收" {
-				data[i]["value"] = tools.FormatBytes(cast.ToFloat64(matches[1]))
+				d["value"] = tools.FormatBytes(cast.ToFloat64(matches[1]))
 			}
+
+			data = append(data, d)
 		}
 	}
 
@@ -238,106 +236,108 @@ func (c *Mysql80Controller) Load(ctx http.Context) {
 	bufferPoolReadRequests := cast.ToFloat64(data[12]["value"])
 	data[10]["value"] = fmt.Sprintf("%.2f%%", bufferPoolReadRequests/(bufferPoolReads+bufferPoolReadRequests)*100)
 
-	controllers.Success(ctx, data)
+	return controllers.Success(ctx, data)
 }
 
 // ErrorLog 获取错误日志
-func (c *Mysql80Controller) ErrorLog(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) ErrorLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
-	log := tools.ExecShell("tail -n 100 /www/server/mysql/mysql-error.log")
-	controllers.Success(ctx, log)
+	log := tools.Escape(tools.Exec("tail -n 100 /www/server/mysql/mysql-error.log"))
+	return controllers.Success(ctx, log)
 }
 
 // ClearErrorLog 清空错误日志
-func (c *Mysql80Controller) ClearErrorLog(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) ClearErrorLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("echo '' > /www/server/mysql/mysql-error.log")
-	controllers.Success(ctx, "清空错误日志成功")
+	tools.Exec("echo '' > /www/server/mysql/mysql-error.log")
+	return controllers.Success(ctx, "清空错误日志成功")
 }
 
 // SlowLog 获取慢查询日志
-func (c *Mysql80Controller) SlowLog(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) SlowLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
-	log := tools.ExecShell("tail -n 100 /www/server/mysql/mysql-slow.log")
-	controllers.Success(ctx, log)
+	log := tools.Escape(tools.Exec("tail -n 100 /www/server/mysql/mysql-slow.log"))
+	return controllers.Success(ctx, log)
 }
 
 // ClearSlowLog 清空慢查询日志
-func (c *Mysql80Controller) ClearSlowLog(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) ClearSlowLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("echo '' > /www/server/mysql/mysql-slow.log")
-	controllers.Success(ctx, "清空慢查询日志成功")
+	tools.Exec("echo '' > /www/server/mysql/mysql-slow.log")
+	return controllers.Success(ctx, "清空慢查询日志成功")
 }
 
 // GetRootPassword 获取root密码
-func (c *Mysql80Controller) GetRootPassword(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) GetRootPassword(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
 	rootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
 	if len(rootPassword) == 0 {
-		controllers.Error(ctx, http.StatusBadRequest, "MySQL root密码为空")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "MySQL root密码为空")
 	}
 
-	controllers.Success(ctx, rootPassword)
+	return controllers.Success(ctx, rootPassword)
 }
 
 // SetRootPassword 设置root密码
-func (c *Mysql80Controller) SetRootPassword(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) SetRootPassword(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
-	status := tools.ExecShell("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
+	status := tools.Exec("systemctl status mysqld | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取MySQL状态失败")
 	}
 	if status != "active" {
-		controllers.Error(ctx, http.StatusInternalServerError, "MySQL 未运行")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "MySQL 未运行")
 	}
 
 	rootPassword := ctx.Request().Input(models.SettingKeyMysqlRootPassword)
 	if len(rootPassword) == 0 {
-		controllers.Error(ctx, http.StatusBadRequest, "MySQL root密码不能为空")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "MySQL root密码不能为空")
 	}
 
 	oldRootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
 	if oldRootPassword != rootPassword {
-		tools.ExecShell("mysql -uroot -p" + oldRootPassword + " -e \"ALTER USER 'root'@'localhost' IDENTIFIED BY '" + rootPassword + "';\"")
-		tools.ExecShell("mysql -uroot -p" + oldRootPassword + " -e \"FLUSH PRIVILEGES;\"")
+		tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + oldRootPassword + " -e \"ALTER USER 'root'@'localhost' IDENTIFIED BY '" + rootPassword + "';\"")
+		tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + oldRootPassword + " -e \"FLUSH PRIVILEGES;\"")
 		err := c.setting.Set(models.SettingKeyMysqlRootPassword, rootPassword)
 		if err != nil {
-			tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"ALTER USER 'root'@'localhost' IDENTIFIED BY '" + oldRootPassword + "';\"")
-			tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
-			controllers.Error(ctx, http.StatusInternalServerError, "设置root密码失败")
-			return
+			tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"ALTER USER 'root'@'localhost' IDENTIFIED BY '" + oldRootPassword + "';\"")
+			tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
+			return controllers.Error(ctx, http.StatusInternalServerError, "设置root密码失败")
 		}
 	}
 
-	controllers.Success(ctx, "设置root密码成功")
+	return controllers.Success(ctx, "设置root密码成功")
 }
 
 // DatabaseList 获取数据库列表
-func (c *Mysql80Controller) DatabaseList(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) DatabaseList(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
 	rootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
@@ -348,16 +348,14 @@ func (c *Mysql80Controller) DatabaseList(ctx http.Context) {
 	db, err := sql.Open("mysql", "root:"+rootPassword+"@unix(/tmp/mysql.sock)/")
 	if err != nil {
 		facades.Log().Error("[MySQL80] 连接数据库失败" + err.Error())
-		controllers.Error(ctx, http.StatusInternalServerError, "连接数据库失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "连接数据库失败")
 	}
 	defer db.Close()
 
 	rows, err := db.Query("SHOW DATABASES")
 	if err != nil {
 		facades.Log().Error("[MySQL80] 获取数据库列表失败" + err.Error())
-		controllers.Error(ctx, http.StatusInternalServerError, "获取数据库列表失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取数据库列表失败")
 	}
 	defer rows.Close()
 
@@ -374,17 +372,35 @@ func (c *Mysql80Controller) DatabaseList(ctx http.Context) {
 
 	if err := rows.Err(); err != nil {
 		facades.Log().Error("[MySQL80] 获取数据库列表失败" + err.Error())
-		controllers.Error(ctx, http.StatusInternalServerError, "获取数据库列表失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取数据库列表失败")
 	}
 
-	controllers.Success(ctx, databases)
+	page := ctx.Request().QueryInt("page", 1)
+	limit := ctx.Request().QueryInt("limit", 10)
+	startIndex := (page - 1) * limit
+	endIndex := page * limit
+	if startIndex > len(databases) {
+		return controllers.Success(ctx, http.Json{
+			"total": 0,
+			"items": []database{},
+		})
+	}
+	if endIndex > len(databases) {
+		endIndex = len(databases)
+	}
+	pagedDatabases := databases[startIndex:endIndex]
+
+	return controllers.Success(ctx, http.Json{
+		"total": len(databases),
+		"items": pagedDatabases,
+	})
 }
 
 // AddDatabase 添加数据库
-func (c *Mysql80Controller) AddDatabase(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) AddDatabase(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
@@ -393,12 +409,10 @@ func (c *Mysql80Controller) AddDatabase(ctx http.Context) {
 		"password": "required|min_len:8|max_len:255",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	rootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
@@ -406,61 +420,64 @@ func (c *Mysql80Controller) AddDatabase(ctx http.Context) {
 	user := ctx.Request().Input("user")
 	password := ctx.Request().Input("password")
 
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"CREATE DATABASE IF NOT EXISTS " + database + " DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_general_ci;\"")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"CREATE USER '" + user + "'@'localhost' IDENTIFIED BY '" + password + "';\"")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"GRANT ALL PRIVILEGES ON " + database + ".* TO '" + user + "'@'localhost';\"")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"CREATE DATABASE IF NOT EXISTS " + database + " DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_general_ci;\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"CREATE USER '" + user + "'@'localhost' IDENTIFIED BY '" + password + "';\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"GRANT ALL PRIVILEGES ON " + database + ".* TO '" + user + "'@'localhost';\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
 
-	controllers.Success(ctx, "添加数据库成功")
+	return controllers.Success(ctx, "添加数据库成功")
 }
 
 // DeleteDatabase 删除数据库
-func (c *Mysql80Controller) DeleteDatabase(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) DeleteDatabase(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
 		"database": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$|not_in:information_schema,mysql,performance_schema,sys",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	rootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
 	database := ctx.Request().Input("database")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"DROP DATABASE IF EXISTS " + database + ";\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"DROP DATABASE IF EXISTS " + database + ";\"")
 
-	controllers.Success(ctx, "删除数据库成功")
+	return controllers.Success(ctx, "删除数据库成功")
 }
 
 // BackupList 获取备份列表
-func (c *Mysql80Controller) BackupList(ctx http.Context) {
+func (c *Mysql80Controller) BackupList(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
+	}
+
 	backupList, err := c.backup.MysqlList()
 	if err != nil {
 		facades.Log().Error("[MySQL80] 获取备份列表失败：" + err.Error())
-		controllers.Error(ctx, http.StatusInternalServerError, "获取备份列表失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取备份列表失败")
 	}
 
-	controllers.Success(ctx, backupList)
+	return controllers.Success(ctx, backupList)
 }
 
 // UploadBackup 上传备份
-func (c *Mysql80Controller) UploadBackup(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) UploadBackup(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
 	file, err := ctx.Request().File("file")
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, "上传文件失败")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "上传文件失败")
 	}
 
 	backupPath := c.setting.Get(models.SettingKeyBackupPath) + "/mysql"
@@ -471,100 +488,95 @@ func (c *Mysql80Controller) UploadBackup(ctx http.Context) {
 	name := file.GetClientOriginalName()
 	_, err = file.StoreAs(backupPath, name)
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, "上传文件失败")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "上传文件失败")
 	}
 
-	controllers.Success(ctx, "上传文件成功")
+	return controllers.Success(ctx, "上传文件成功")
 }
 
 // CreateBackup 创建备份
-func (c *Mysql80Controller) CreateBackup(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) CreateBackup(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
 		"database": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$|not_in:information_schema,mysql,performance_schema,sys",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	database := ctx.Request().Input("database")
 	err = c.backup.MysqlBackup(database)
 	if err != nil {
 		facades.Log().Error("[MYSQL80] 创建备份失败：" + err.Error())
-		controllers.Error(ctx, http.StatusInternalServerError, "创建备份失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "创建备份失败")
 	}
 
-	controllers.Success(ctx, "备份成功")
+	return controllers.Success(ctx, "备份成功")
 }
 
 // DeleteBackup 删除备份
-func (c *Mysql80Controller) DeleteBackup(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) DeleteBackup(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
-		"name": "required|min_len:1|max_len:255",
+		"backup": "required|min_len:1|max_len:255",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	backupPath := c.setting.Get(models.SettingKeyBackupPath) + "/mysql"
-	fileName := ctx.Request().Input("name")
-	tools.RemoveFile(backupPath + "/" + fileName)
+	fileName := ctx.Request().Input("backup")
+	tools.Remove(backupPath + "/" + fileName)
 
-	controllers.Success(ctx, "删除备份成功")
+	return controllers.Success(ctx, "删除备份成功")
 }
 
 // RestoreBackup 还原备份
-func (c *Mysql80Controller) RestoreBackup(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) RestoreBackup(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
-		"name":     "required|min_len:1|max_len:255",
+		"backup":   "required|min_len:1|max_len:255",
 		"database": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$|not_in:information_schema,mysql,performance_schema,sys",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
-	err = c.backup.MysqlRestore(ctx.Request().Input("database"), ctx.Request().Input("name"))
+	err = c.backup.MysqlRestore(ctx.Request().Input("database"), ctx.Request().Input("backup"))
 	if err != nil {
 		facades.Log().Error("[MYSQL80] 还原失败：" + err.Error())
-		controllers.Error(ctx, http.StatusInternalServerError, "还原失败: "+err.Error())
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "还原失败: "+err.Error())
 	}
 
-	controllers.Success(ctx, "还原成功")
+	return controllers.Success(ctx, "还原成功")
 }
 
 // UserList 用户列表
-func (c *Mysql80Controller) UserList(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) UserList(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
 	type user struct {
@@ -577,14 +589,14 @@ func (c *Mysql80Controller) UserList(ctx http.Context) {
 	db, err := sql.Open("mysql", "root:"+rootPassword+"@unix(/tmp/mysql.sock)/")
 	if err != nil {
 		facades.Log().Error("[MYSQL80] 连接数据库失败：" + err.Error())
-		controllers.Error(ctx, http.StatusInternalServerError, "连接数据库失败")
+		return controllers.Error(ctx, http.StatusInternalServerError, "连接数据库失败")
 	}
 	defer db.Close()
 
 	rows, err := db.Query("SELECT user, host FROM mysql.user")
 	if err != nil {
 		facades.Log().Error("[MYSQL80] 查询数据库失败：" + err.Error())
-		controllers.Error(ctx, http.StatusInternalServerError, "查询数据库失败")
+		return controllers.Error(ctx, http.StatusInternalServerError, "查询数据库失败")
 	}
 	defer rows.Close()
 
@@ -622,17 +634,35 @@ func (c *Mysql80Controller) UserList(ctx http.Context) {
 	}
 
 	if err := rows.Err(); err != nil {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取用户列表失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取用户列表失败")
 	}
 
-	controllers.Success(ctx, userGrants)
+	page := ctx.Request().QueryInt("page", 1)
+	limit := ctx.Request().QueryInt("limit", 10)
+	startIndex := (page - 1) * limit
+	endIndex := page * limit
+	if startIndex > len(userGrants) {
+		return controllers.Success(ctx, http.Json{
+			"total": 0,
+			"items": []user{},
+		})
+	}
+	if endIndex > len(userGrants) {
+		endIndex = len(userGrants)
+	}
+	pagedUserGrants := userGrants[startIndex:endIndex]
+
+	return controllers.Success(ctx, http.Json{
+		"total": len(userGrants),
+		"items": pagedUserGrants,
+	})
 }
 
 // AddUser 添加用户
-func (c *Mysql80Controller) AddUser(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) AddUser(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
@@ -641,54 +671,52 @@ func (c *Mysql80Controller) AddUser(ctx http.Context) {
 		"password": "required|min_len:8|max_len:255",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	rootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
 	user := ctx.Request().Input("user")
 	password := ctx.Request().Input("password")
 	database := ctx.Request().Input("database")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"CREATE USER '" + user + "'@'localhost' IDENTIFIED BY '" + password + ";'\"")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"GRANT ALL PRIVILEGES ON " + database + ".* TO '" + user + "'@'localhost';\"")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"CREATE USER '" + user + "'@'localhost' IDENTIFIED BY '" + password + ";'\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"GRANT ALL PRIVILEGES ON " + database + ".* TO '" + user + "'@'localhost';\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
 
-	controllers.Success(ctx, "添加成功")
+	return controllers.Success(ctx, "添加成功")
 }
 
 // DeleteUser 删除用户
-func (c *Mysql80Controller) DeleteUser(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) DeleteUser(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
 		"user": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	rootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
 	user := ctx.Request().Input("user")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"DROP USER '" + user + "'@'localhost';\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"DROP USER '" + user + "'@'localhost';\"")
 
-	controllers.Success(ctx, "删除成功")
+	return controllers.Success(ctx, "删除成功")
 }
 
 // SetUserPassword 设置用户密码
-func (c *Mysql80Controller) SetUserPassword(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) SetUserPassword(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
@@ -696,27 +724,26 @@ func (c *Mysql80Controller) SetUserPassword(ctx http.Context) {
 		"password": "required|min_len:8|max_len:255",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	rootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
 	user := ctx.Request().Input("user")
 	password := ctx.Request().Input("password")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"ALTER USER '" + user + "'@'localhost' IDENTIFIED BY '" + password + "';\"")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"ALTER USER '" + user + "'@'localhost' IDENTIFIED BY '" + password + "';\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
 
-	controllers.Success(ctx, "修改成功")
+	return controllers.Success(ctx, "修改成功")
 }
 
 // SetUserPrivileges 设置用户权限
-func (c *Mysql80Controller) SetUserPrivileges(ctx http.Context) {
-	if !controllers.Check(ctx, "mysql80") {
-		return
+func (c *Mysql80Controller) SetUserPrivileges(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "mysql80")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
@@ -724,20 +751,18 @@ func (c *Mysql80Controller) SetUserPrivileges(ctx http.Context) {
 		"database": "required|min_len:1|max_len:255",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	rootPassword := c.setting.Get(models.SettingKeyMysqlRootPassword)
 	user := ctx.Request().Input("user")
 	database := ctx.Request().Input("database")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"REVOKE ALL PRIVILEGES ON *.* FROM '" + user + "'@'localhost';\"")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"GRANT ALL PRIVILEGES ON " + database + ".* TO '" + user + "'@'localhost';\"")
-	tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"REVOKE ALL PRIVILEGES ON *.* FROM '" + user + "'@'localhost';\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"GRANT ALL PRIVILEGES ON " + database + ".* TO '" + user + "'@'localhost';\"")
+	tools.Exec("/www/server/mysql/bin/mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
 
-	controllers.Success(ctx, "修改成功")
+	return controllers.Success(ctx, "修改成功")
 }

app/http/controllers/plugins/openresty/openresty_controller.go

@@ -24,176 +24,176 @@ func NewOpenrestyController() *OpenRestyController {
 }
 
 // Status 获取运行状态
-func (r *OpenRestyController) Status(ctx http.Context) {
-	if !controllers.Check(ctx, "openresty") {
-		return
+func (c *OpenRestyController) Status(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "openresty")
+	if check != nil {
+		return check
 	}
 
-	status := tools.ExecShell("systemctl status openresty | grep Active | grep -v grep | awk '{print $2}'")
+	status := tools.Exec("systemctl status openresty | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取OpenResty状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取OpenResty状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
 // Reload 重载配置
-func (r *OpenRestyController) Reload(ctx http.Context) {
-	if !controllers.Check(ctx, "openresty") {
-		return
+func (c *OpenRestyController) Reload(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "openresty")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl reload openresty")
-	status := tools.ExecShell("systemctl status openresty | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl reload openresty")
+	status := tools.Exec("systemctl status openresty | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取OpenResty状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取OpenResty状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, "重载OpenResty成功")
+		return controllers.Success(ctx, "重载OpenResty成功")
 	} else {
-		controllers.Error(ctx, 1, "重载OpenResty失败: "+status)
+		return controllers.Error(ctx, 1, "重载OpenResty失败: "+status)
 	}
 }
 
 // Start 启动OpenResty
-func (r *OpenRestyController) Start(ctx http.Context) {
-	if !controllers.Check(ctx, "openresty") {
-		return
+func (c *OpenRestyController) Start(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "openresty")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl start openresty")
-	status := tools.ExecShell("systemctl status openresty | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl start openresty")
+	status := tools.Exec("systemctl status openresty | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取OpenResty状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取OpenResty状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, "启动OpenResty成功")
+		return controllers.Success(ctx, "启动OpenResty成功")
 	} else {
-		controllers.Error(ctx, 1, "启动OpenResty失败: "+status)
+		return controllers.Error(ctx, 1, "启动OpenResty失败: "+status)
 	}
 }
 
 // Stop 停止OpenResty
-func (r *OpenRestyController) Stop(ctx http.Context) {
-	if !controllers.Check(ctx, "openresty") {
-		return
+func (c *OpenRestyController) Stop(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "openresty")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl stop openresty")
-	status := tools.ExecShell("systemctl status openresty | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl stop openresty")
+	status := tools.Exec("systemctl status openresty | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取OpenResty状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取OpenResty状态失败")
 	}
 
 	if status != "active" {
-		controllers.Success(ctx, "停止OpenResty成功")
+		return controllers.Success(ctx, "停止OpenResty成功")
 	} else {
-		controllers.Error(ctx, 1, "停止OpenResty失败: "+status)
+		return controllers.Error(ctx, 1, "停止OpenResty失败: "+status)
 	}
 }
 
 // Restart 重启OpenResty
-func (r *OpenRestyController) Restart(ctx http.Context) {
-	if !controllers.Check(ctx, "openresty") {
-		return
+func (c *OpenRestyController) Restart(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "openresty")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl restart openresty")
-	status := tools.ExecShell("systemctl status openresty | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl restart openresty")
+	status := tools.Exec("systemctl status openresty | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取OpenResty状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取OpenResty状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, "重启OpenResty成功")
+		return controllers.Success(ctx, "重启OpenResty成功")
 	} else {
-		controllers.Error(ctx, 1, "重启OpenResty失败: "+status)
+		return controllers.Error(ctx, 1, "重启OpenResty失败: "+status)
 	}
 }
 
 // GetConfig 获取配置
-func (r *OpenRestyController) GetConfig(ctx http.Context) {
-	if !controllers.Check(ctx, "openresty") {
-		return
+func (c *OpenRestyController) GetConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "openresty")
+	if check != nil {
+		return check
 	}
 
-	config := tools.ReadFile("/www/server/openresty/conf/nginx.conf")
+	config := tools.Read("/www/server/openresty/conf/nginx.conf")
 	if len(config) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取OpenResty配置失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取OpenResty配置失败")
 	}
 
-	controllers.Success(ctx, config)
+	return controllers.Success(ctx, config)
 }
 
 // SaveConfig 保存配置
-func (r *OpenRestyController) SaveConfig(ctx http.Context) {
-	if !controllers.Check(ctx, "openresty") {
-		return
+func (c *OpenRestyController) SaveConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "openresty")
+	if check != nil {
+		return check
 	}
 
 	config := ctx.Request().Input("config")
 	if len(config) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "配置不能为空")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "配置不能为空")
 	}
 
-	if !tools.WriteFile("/www/server/openresty/conf/nginx.conf", config, 0644) {
-		controllers.Error(ctx, http.StatusInternalServerError, "保存OpenResty配置失败")
-		return
+	if !tools.Write("/www/server/openresty/conf/nginx.conf", config, 0644) {
+		return controllers.Error(ctx, http.StatusInternalServerError, "保存OpenResty配置失败")
 	}
 
-	controllers.Success(ctx, "保存OpenResty配置成功")
+	return c.Reload(ctx)
 }
 
 // ErrorLog 获取错误日志
-func (r *OpenRestyController) ErrorLog(ctx http.Context) {
-	if !controllers.Check(ctx, "openresty") {
-		return
+func (c *OpenRestyController) ErrorLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "openresty")
+	if check != nil {
+		return check
 	}
 
 	if !tools.Exists("/www/wwwlogs/nginx_error.log") {
-		controllers.Success(ctx, "")
-		return
+		return controllers.Success(ctx, "")
 	}
 
-	out := tools.ExecShell("tail -n 100 /www/wwwlogs/nginx_error.log")
-	controllers.Success(ctx, out)
+	out := tools.Exec("tail -n 100 /www/wwwlogs/nginx_error.log")
+	return controllers.Success(ctx, out)
 }
 
 // ClearErrorLog 清空错误日志
-func (r *OpenRestyController) ClearErrorLog(ctx http.Context) {
-	if !controllers.Check(ctx, "openresty") {
-		return
+func (c *OpenRestyController) ClearErrorLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "openresty")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("echo '' > /www/wwwlogs/nginx_error.log")
-	controllers.Success(ctx, "清空OpenResty错误日志成功")
+	tools.Exec("echo '' > /www/wwwlogs/nginx_error.log")
+	return controllers.Success(ctx, "清空OpenResty错误日志成功")
 }
 
 // Load 获取负载
-func (r *OpenRestyController) Load(ctx http.Context) {
-	if !controllers.Check(ctx, "openresty") {
-		return
+func (c *OpenRestyController) Load(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "openresty")
+	if check != nil {
+		return check
 	}
 
 	client := req.C().SetTimeout(10 * time.Second)
 	resp, err := client.R().Get("http://127.0.0.1/nginx_status")
 	if err != nil || !resp.IsSuccessState() {
 		facades.Log().Error("[OpenResty] 获取OpenResty负载失败: " + err.Error())
-		controllers.Error(ctx, http.StatusInternalServerError, "获取OpenResty负载失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取OpenResty负载失败")
 	}
 
 	raw := resp.String()
@@ -203,13 +203,13 @@ func (r *OpenRestyController) Load(ctx http.Context) {
 	}
 	var data []nginxStatus
 
-	workers := tools.ExecShell("ps aux | grep nginx | grep 'worker process' | wc -l")
+	workers := tools.Exec("ps aux | grep nginx | grep 'worker process' | wc -l")
 	data = append(data, nginxStatus{
 		Name:  "工作进程",
 		Value: workers,
 	})
 
-	out := tools.ExecShell("ps aux | grep nginx | grep 'worker process' | awk '{memsum+=$6};END {print memsum}'")
+	out := tools.Exec("ps aux | grep nginx | grep 'worker process' | awk '{memsum+=$6};END {print memsum}'")
 	mem := tools.FormatBytes(cast.ToFloat64(out))
 	data = append(data, nginxStatus{
 		Name:  "内存占用",
@@ -256,5 +256,5 @@ func (r *OpenRestyController) Load(ctx http.Context) {
 		})
 	}
 
-	controllers.Success(ctx, data)
+	return controllers.Success(ctx, data)
 }

app/http/controllers/plugins/php74/php74_controller.go

@@ -30,134 +30,136 @@ func NewPhp74Controller() *Php74Controller {
 	}
 }
 
-func (c *Php74Controller) Status(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php74Controller) Status(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	status := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	status := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php74Controller) Reload(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php74Controller) Reload(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl reload php-fpm-" + c.version)
-	out := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl reload php-fpm-" + c.version)
+	out := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	status := strings.TrimSpace(out)
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php74Controller) Start(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php74Controller) Start(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl start php-fpm-" + c.version)
-	out := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl start php-fpm-" + c.version)
+	out := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	status := strings.TrimSpace(out)
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php74Controller) Stop(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php74Controller) Stop(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl stop php-fpm-" + c.version)
-	out := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl stop php-fpm-" + c.version)
+	out := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	status := strings.TrimSpace(out)
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status != "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php74Controller) Restart(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php74Controller) Restart(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl restart php-fpm-" + c.version)
-	out := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl restart php-fpm-" + c.version)
+	out := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	status := strings.TrimSpace(out)
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php74Controller) GetConfig(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php74Controller) GetConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	config := tools.ReadFile("/www/server/php/" + c.version + "/etc/php.ini")
-	controllers.Success(ctx, config)
+	config := tools.Read("/www/server/php/" + c.version + "/etc/php.ini")
+	return controllers.Success(ctx, config)
 }
 
-func (c *Php74Controller) SaveConfig(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php74Controller) SaveConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	config := ctx.Request().Input("config")
-	tools.WriteFile("/www/server/php/"+c.version+"/etc/php.ini", config, 0644)
-	c.Reload(ctx)
+	tools.Write("/www/server/php/"+c.version+"/etc/php.ini", config, 0644)
+	return c.Reload(ctx)
 }
 
-func (c *Php74Controller) Load(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php74Controller) Load(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	client := req.C().SetTimeout(10 * time.Second)
 	resp, err := client.R().Get("http://127.0.0.1/phpfpm_status/" + c.version)
 	if err != nil || !resp.IsSuccessState() {
 		facades.Log().Error("获取PHP-" + c.version + "运行状态失败")
-		controllers.Error(ctx, http.StatusInternalServerError, "[PHP-"+c.version+"] 获取运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "[PHP-"+c.version+"] 获取运行状态失败")
 	}
 
 	raw := resp.String()
@@ -180,43 +182,47 @@ func (c *Php74Controller) Load(ctx http.Context) {
 		}
 	}
 
-	controllers.Success(ctx, data)
+	return controllers.Success(ctx, data)
 }
 
-func (c *Php74Controller) ErrorLog(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php74Controller) ErrorLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	log := tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/php-fpm.log")
-	controllers.Success(ctx, log)
+	log := tools.Escape(tools.Exec("tail -n 100 /www/server/php/" + c.version + "/var/log/php-fpm.log"))
+	return controllers.Success(ctx, log)
 }
 
-func (c *Php74Controller) SlowLog(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php74Controller) SlowLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	log := tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/slow.log")
-	controllers.Success(ctx, log)
+	log := tools.Escape(tools.Exec("tail -n 100 /www/server/php/" + c.version + "/var/log/slow.log"))
+	return controllers.Success(ctx, log)
 }
 
-func (c *Php74Controller) ClearErrorLog(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php74Controller) ClearErrorLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("echo '' > /www/server/php/" + c.version + "/var/log/php-fpm.log")
-	controllers.Success(ctx, true)
+	tools.Exec("echo '' > /www/server/php/" + c.version + "/var/log/php-fpm.log")
+	return controllers.Success(ctx, true)
 }
 
-func (c *Php74Controller) ClearSlowLog(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php74Controller) ClearSlowLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("echo '' > /www/server/php/" + c.version + "/var/log/slow.log")
-	controllers.Success(ctx, true)
+	tools.Exec("echo '' > /www/server/php/" + c.version + "/var/log/slow.log")
+	return controllers.Success(ctx, true)
 }
 
 type Extension struct {
@@ -226,32 +232,32 @@ type Extension struct {
 	Installed   bool   `json:"installed"`
 }
 
-func (c *Php74Controller) GetExtensionList(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php74Controller) GetExtensionList(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	extensions := c.GetExtensions()
-	controllers.Success(ctx, extensions)
+	return controllers.Success(ctx, extensions)
 }
 
-func (c *Php74Controller) InstallExtension(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php74Controller) InstallExtension(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	slug := ctx.Request().Input("slug")
 	if len(slug) == 0 {
-		controllers.Error(ctx, http.StatusBadRequest, "参数错误")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "参数错误")
 	}
 
 	extensions := c.GetExtensions()
 	for _, item := range extensions {
 		if item.Slug == slug {
 			if item.Installed {
-				controllers.Error(ctx, http.StatusBadRequest, "扩展已安装")
-				return
+				return controllers.Error(ctx, http.StatusBadRequest, "扩展已安装")
 			}
 
 			var task models.Task
@@ -261,37 +267,34 @@ func (c *Php74Controller) InstallExtension(ctx http.Context) {
 			task.Log = "/tmp/" + item.Slug + ".log"
 			if err := facades.Orm().Query().Create(&task); err != nil {
 				facades.Log().Error("[PHP-" + c.version + "] 创建安装拓展任务失败：" + err.Error())
-				controllers.Error(ctx, http.StatusInternalServerError, "系统内部错误")
-				return
+				return controllers.Error(ctx, http.StatusInternalServerError, "系统内部错误")
 			}
 
 			c.task.Process(task.ID)
 
-			controllers.Success(ctx, true)
-			return
+			return controllers.Success(ctx, true)
 		}
 	}
 
-	controllers.Error(ctx, http.StatusBadRequest, "扩展不存在")
+	return controllers.Error(ctx, http.StatusBadRequest, "扩展不存在")
 }
 
-func (c *Php74Controller) UninstallExtension(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php74Controller) UninstallExtension(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	slug := ctx.Request().Input("slug")
 	if len(slug) == 0 {
-		controllers.Error(ctx, http.StatusBadRequest, "参数错误")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "参数错误")
 	}
 
 	extensions := c.GetExtensions()
 	for _, item := range extensions {
 		if item.Slug == slug {
 			if !item.Installed {
-				controllers.Error(ctx, http.StatusBadRequest, "扩展未安装")
-				return
+				return controllers.Error(ctx, http.StatusBadRequest, "扩展未安装")
 			}
 
 			var task models.Task
@@ -301,18 +304,16 @@ func (c *Php74Controller) UninstallExtension(ctx http.Context) {
 			task.Log = "/tmp/" + item.Slug + ".log"
 			if err := facades.Orm().Query().Create(&task); err != nil {
 				facades.Log().Error("[PHP-" + c.version + "] 创建卸载拓展任务失败：" + err.Error())
-				controllers.Error(ctx, http.StatusInternalServerError, "系统内部错误")
-				return
+				return controllers.Error(ctx, http.StatusInternalServerError, "系统内部错误")
 			}
 
 			c.task.Process(task.ID)
 
-			controllers.Success(ctx, true)
-			return
+			return controllers.Success(ctx, true)
 		}
 	}
 
-	controllers.Error(ctx, http.StatusBadRequest, "扩展不存在")
+	return controllers.Error(ctx, http.StatusBadRequest, "扩展不存在")
 }
 
 func (c *Php74Controller) GetExtensions() []Extension {
@@ -354,7 +355,7 @@ func (c *Php74Controller) GetExtensions() []Extension {
 		Installed:   false,
 	})
 
-	raw := tools.ExecShell("/www/server/php/" + c.version + "/bin/php -m")
+	raw := tools.Exec("/www/server/php/" + c.version + "/bin/php -m")
 	rawExtensionList := strings.Split(raw, "\n")
 
 	for _, item := range rawExtensionList {

app/http/controllers/plugins/php80/php80_controller.go

@@ -30,134 +30,136 @@ func NewPhp80Controller() *Php80Controller {
 	}
 }
 
-func (c *Php80Controller) Status(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php80Controller) Status(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	status := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	status := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php80Controller) Reload(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php80Controller) Reload(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl reload php-fpm-" + c.version)
-	out := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl reload php-fpm-" + c.version)
+	out := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	status := strings.TrimSpace(out)
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php80Controller) Start(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php80Controller) Start(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl start php-fpm-" + c.version)
-	out := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl start php-fpm-" + c.version)
+	out := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	status := strings.TrimSpace(out)
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php80Controller) Stop(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php80Controller) Stop(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl stop php-fpm-" + c.version)
-	out := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl stop php-fpm-" + c.version)
+	out := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	status := strings.TrimSpace(out)
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status != "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php80Controller) Restart(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php80Controller) Restart(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl restart php-fpm-" + c.version)
-	out := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl restart php-fpm-" + c.version)
+	out := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	status := strings.TrimSpace(out)
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php80Controller) GetConfig(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php80Controller) GetConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	config := tools.ReadFile("/www/server/php/" + c.version + "/etc/php.ini")
-	controllers.Success(ctx, config)
+	config := tools.Read("/www/server/php/" + c.version + "/etc/php.ini")
+	return controllers.Success(ctx, config)
 }
 
-func (c *Php80Controller) SaveConfig(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php80Controller) SaveConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	config := ctx.Request().Input("config")
-	tools.WriteFile("/www/server/php/"+c.version+"/etc/php.ini", config, 0644)
-	c.Reload(ctx)
+	tools.Write("/www/server/php/"+c.version+"/etc/php.ini", config, 0644)
+	return c.Reload(ctx)
 }
 
-func (c *Php80Controller) Load(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php80Controller) Load(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	client := req.C().SetTimeout(10 * time.Second)
 	resp, err := client.R().Get("http://127.0.0.1/phpfpm_status/" + c.version)
 	if err != nil || !resp.IsSuccessState() {
 		facades.Log().Error("获取PHP-" + c.version + "运行状态失败")
-		controllers.Error(ctx, http.StatusInternalServerError, "[PHP-"+c.version+"] 获取运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "[PHP-"+c.version+"] 获取运行状态失败")
 	}
 
 	raw := resp.String()
@@ -180,43 +182,47 @@ func (c *Php80Controller) Load(ctx http.Context) {
 		}
 	}
 
-	controllers.Success(ctx, data)
+	return controllers.Success(ctx, data)
 }
 
-func (c *Php80Controller) ErrorLog(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php80Controller) ErrorLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	log := tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/php-fpm.log")
-	controllers.Success(ctx, log)
+	log := tools.Escape(tools.Exec("tail -n 100 /www/server/php/" + c.version + "/var/log/php-fpm.log"))
+	return controllers.Success(ctx, log)
 }
 
-func (c *Php80Controller) SlowLog(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php80Controller) SlowLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	log := tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/slow.log")
-	controllers.Success(ctx, log)
+	log := tools.Escape(tools.Exec("tail -n 100 /www/server/php/" + c.version + "/var/log/slow.log"))
+	return controllers.Success(ctx, log)
 }
 
-func (c *Php80Controller) ClearErrorLog(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php80Controller) ClearErrorLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("echo '' > /www/server/php/" + c.version + "/var/log/php-fpm.log")
-	controllers.Success(ctx, true)
+	tools.Exec("echo '' > /www/server/php/" + c.version + "/var/log/php-fpm.log")
+	return controllers.Success(ctx, true)
 }
 
-func (c *Php80Controller) ClearSlowLog(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php80Controller) ClearSlowLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("echo '' > /www/server/php/" + c.version + "/var/log/slow.log")
-	controllers.Success(ctx, true)
+	tools.Exec("echo '' > /www/server/php/" + c.version + "/var/log/slow.log")
+	return controllers.Success(ctx, true)
 }
 
 type Extension struct {
@@ -226,32 +232,32 @@ type Extension struct {
 	Installed   bool   `json:"installed"`
 }
 
-func (c *Php80Controller) GetExtensionList(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php80Controller) GetExtensionList(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	extensions := c.GetExtensions()
-	controllers.Success(ctx, extensions)
+	return controllers.Success(ctx, extensions)
 }
 
-func (c *Php80Controller) InstallExtension(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php80Controller) InstallExtension(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	slug := ctx.Request().Input("slug")
 	if len(slug) == 0 {
-		controllers.Error(ctx, http.StatusBadRequest, "参数错误")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "参数错误")
 	}
 
 	extensions := c.GetExtensions()
 	for _, item := range extensions {
 		if item.Slug == slug {
 			if item.Installed {
-				controllers.Error(ctx, http.StatusBadRequest, "扩展已安装")
-				return
+				return controllers.Error(ctx, http.StatusBadRequest, "扩展已安装")
 			}
 
 			var task models.Task
@@ -261,37 +267,34 @@ func (c *Php80Controller) InstallExtension(ctx http.Context) {
 			task.Log = "/tmp/" + item.Slug + ".log"
 			if err := facades.Orm().Query().Create(&task); err != nil {
 				facades.Log().Error("[PHP-" + c.version + "] 创建安装拓展任务失败：" + err.Error())
-				controllers.Error(ctx, http.StatusInternalServerError, "系统内部错误")
-				return
+				return controllers.Error(ctx, http.StatusInternalServerError, "系统内部错误")
 			}
 
 			c.task.Process(task.ID)
 
-			controllers.Success(ctx, true)
-			return
+			return controllers.Success(ctx, true)
 		}
 	}
 
-	controllers.Error(ctx, http.StatusBadRequest, "扩展不存在")
+	return controllers.Error(ctx, http.StatusBadRequest, "扩展不存在")
 }
 
-func (c *Php80Controller) UninstallExtension(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php80Controller) UninstallExtension(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	slug := ctx.Request().Input("slug")
 	if len(slug) == 0 {
-		controllers.Error(ctx, http.StatusBadRequest, "参数错误")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "参数错误")
 	}
 
 	extensions := c.GetExtensions()
 	for _, item := range extensions {
 		if item.Slug == slug {
 			if !item.Installed {
-				controllers.Error(ctx, http.StatusBadRequest, "扩展未安装")
-				return
+				return controllers.Error(ctx, http.StatusBadRequest, "扩展未安装")
 			}
 
 			var task models.Task
@@ -301,18 +304,16 @@ func (c *Php80Controller) UninstallExtension(ctx http.Context) {
 			task.Log = "/tmp/" + item.Slug + ".log"
 			if err := facades.Orm().Query().Create(&task); err != nil {
 				facades.Log().Error("[PHP-" + c.version + "] 创建卸载拓展任务失败：" + err.Error())
-				controllers.Error(ctx, http.StatusInternalServerError, "系统内部错误")
-				return
+				return controllers.Error(ctx, http.StatusInternalServerError, "系统内部错误")
 			}
 
 			c.task.Process(task.ID)
 
-			controllers.Success(ctx, true)
-			return
+			return controllers.Success(ctx, true)
 		}
 	}
 
-	controllers.Error(ctx, http.StatusBadRequest, "扩展不存在")
+	return controllers.Error(ctx, http.StatusBadRequest, "扩展不存在")
 }
 
 func (c *Php80Controller) GetExtensions() []Extension {
@@ -354,7 +355,7 @@ func (c *Php80Controller) GetExtensions() []Extension {
 		Installed:   false,
 	})
 
-	raw := tools.ExecShell("/www/server/php/" + c.version + "/bin/php -m")
+	raw := tools.Exec("/www/server/php/" + c.version + "/bin/php -m")
 	rawExtensionList := strings.Split(raw, "\n")
 
 	for _, item := range rawExtensionList {

app/http/controllers/plugins/php81/php81_controller.go

@@ -30,134 +30,136 @@ func NewPhp81Controller() *Php81Controller {
 	}
 }
 
-func (c *Php81Controller) Status(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php81Controller) Status(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	status := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	status := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php81Controller) Reload(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php81Controller) Reload(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl reload php-fpm-" + c.version)
-	out := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl reload php-fpm-" + c.version)
+	out := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	status := strings.TrimSpace(out)
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php81Controller) Start(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php81Controller) Start(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl start php-fpm-" + c.version)
-	out := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl start php-fpm-" + c.version)
+	out := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	status := strings.TrimSpace(out)
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php81Controller) Stop(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php81Controller) Stop(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl stop php-fpm-" + c.version)
-	out := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl stop php-fpm-" + c.version)
+	out := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	status := strings.TrimSpace(out)
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status != "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php81Controller) Restart(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php81Controller) Restart(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl restart php-fpm-" + c.version)
-	out := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl restart php-fpm-" + c.version)
+	out := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	status := strings.TrimSpace(out)
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php81Controller) GetConfig(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php81Controller) GetConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	config := tools.ReadFile("/www/server/php/" + c.version + "/etc/php.ini")
-	controllers.Success(ctx, config)
+	config := tools.Read("/www/server/php/" + c.version + "/etc/php.ini")
+	return controllers.Success(ctx, config)
 }
 
-func (c *Php81Controller) SaveConfig(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php81Controller) SaveConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	config := ctx.Request().Input("config")
-	tools.WriteFile("/www/server/php/"+c.version+"/etc/php.ini", config, 0644)
-	c.Reload(ctx)
+	tools.Write("/www/server/php/"+c.version+"/etc/php.ini", config, 0644)
+	return c.Reload(ctx)
 }
 
-func (c *Php81Controller) Load(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php81Controller) Load(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	client := req.C().SetTimeout(10 * time.Second)
 	resp, err := client.R().Get("http://127.0.0.1/phpfpm_status/" + c.version)
 	if err != nil || !resp.IsSuccessState() {
 		facades.Log().Error("获取PHP-" + c.version + "运行状态失败")
-		controllers.Error(ctx, http.StatusInternalServerError, "[PHP-"+c.version+"] 获取运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "[PHP-"+c.version+"] 获取运行状态失败")
 	}
 
 	raw := resp.String()
@@ -180,43 +182,47 @@ func (c *Php81Controller) Load(ctx http.Context) {
 		}
 	}
 
-	controllers.Success(ctx, data)
+	return controllers.Success(ctx, data)
 }
 
-func (c *Php81Controller) ErrorLog(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php81Controller) ErrorLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	log := tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/php-fpm.log")
-	controllers.Success(ctx, log)
+	log := tools.Escape(tools.Exec("tail -n 100 /www/server/php/" + c.version + "/var/log/php-fpm.log"))
+	return controllers.Success(ctx, log)
 }
 
-func (c *Php81Controller) SlowLog(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php81Controller) SlowLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	log := tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/slow.log")
-	controllers.Success(ctx, log)
+	log := tools.Escape(tools.Exec("tail -n 100 /www/server/php/" + c.version + "/var/log/slow.log"))
+	return controllers.Success(ctx, log)
 }
 
-func (c *Php81Controller) ClearErrorLog(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php81Controller) ClearErrorLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("echo '' > /www/server/php/" + c.version + "/var/log/php-fpm.log")
-	controllers.Success(ctx, true)
+	tools.Exec("echo '' > /www/server/php/" + c.version + "/var/log/php-fpm.log")
+	return controllers.Success(ctx, true)
 }
 
-func (c *Php81Controller) ClearSlowLog(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php81Controller) ClearSlowLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("echo '' > /www/server/php/" + c.version + "/var/log/slow.log")
-	controllers.Success(ctx, true)
+	tools.Exec("echo '' > /www/server/php/" + c.version + "/var/log/slow.log")
+	return controllers.Success(ctx, true)
 }
 
 type Extension struct {
@@ -226,32 +232,32 @@ type Extension struct {
 	Installed   bool   `json:"installed"`
 }
 
-func (c *Php81Controller) GetExtensionList(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php81Controller) GetExtensionList(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	extensions := c.GetExtensions()
-	controllers.Success(ctx, extensions)
+	return controllers.Success(ctx, extensions)
 }
 
-func (c *Php81Controller) InstallExtension(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php81Controller) InstallExtension(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	slug := ctx.Request().Input("slug")
 	if len(slug) == 0 {
-		controllers.Error(ctx, http.StatusBadRequest, "参数错误")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "参数错误")
 	}
 
 	extensions := c.GetExtensions()
 	for _, item := range extensions {
 		if item.Slug == slug {
 			if item.Installed {
-				controllers.Error(ctx, http.StatusBadRequest, "扩展已安装")
-				return
+				return controllers.Error(ctx, http.StatusBadRequest, "扩展已安装")
 			}
 
 			var task models.Task
@@ -261,37 +267,34 @@ func (c *Php81Controller) InstallExtension(ctx http.Context) {
 			task.Log = "/tmp/" + item.Slug + ".log"
 			if err := facades.Orm().Query().Create(&task); err != nil {
 				facades.Log().Error("[PHP-" + c.version + "] 创建安装拓展任务失败：" + err.Error())
-				controllers.Error(ctx, http.StatusInternalServerError, "系统内部错误")
-				return
+				return controllers.Error(ctx, http.StatusInternalServerError, "系统内部错误")
 			}
 
 			c.task.Process(task.ID)
 
-			controllers.Success(ctx, true)
-			return
+			return controllers.Success(ctx, true)
 		}
 	}
 
-	controllers.Error(ctx, http.StatusBadRequest, "扩展不存在")
+	return controllers.Error(ctx, http.StatusBadRequest, "扩展不存在")
 }
 
-func (c *Php81Controller) UninstallExtension(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php81Controller) UninstallExtension(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	slug := ctx.Request().Input("slug")
 	if len(slug) == 0 {
-		controllers.Error(ctx, http.StatusBadRequest, "参数错误")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "参数错误")
 	}
 
 	extensions := c.GetExtensions()
 	for _, item := range extensions {
 		if item.Slug == slug {
 			if !item.Installed {
-				controllers.Error(ctx, http.StatusBadRequest, "扩展未安装")
-				return
+				return controllers.Error(ctx, http.StatusBadRequest, "扩展未安装")
 			}
 
 			var task models.Task
@@ -301,18 +304,16 @@ func (c *Php81Controller) UninstallExtension(ctx http.Context) {
 			task.Log = "/tmp/" + item.Slug + ".log"
 			if err := facades.Orm().Query().Create(&task); err != nil {
 				facades.Log().Error("[PHP-" + c.version + "] 创建卸载拓展任务失败：" + err.Error())
-				controllers.Error(ctx, http.StatusInternalServerError, "系统内部错误")
-				return
+				return controllers.Error(ctx, http.StatusInternalServerError, "系统内部错误")
 			}
 
 			c.task.Process(task.ID)
 
-			controllers.Success(ctx, true)
-			return
+			return controllers.Success(ctx, true)
 		}
 	}
 
-	controllers.Error(ctx, http.StatusBadRequest, "扩展不存在")
+	return controllers.Error(ctx, http.StatusBadRequest, "扩展不存在")
 }
 
 func (c *Php81Controller) GetExtensions() []Extension {
@@ -354,7 +355,7 @@ func (c *Php81Controller) GetExtensions() []Extension {
 		Installed:   false,
 	})
 
-	raw := tools.ExecShell("/www/server/php/" + c.version + "/bin/php -m")
+	raw := tools.Exec("/www/server/php/" + c.version + "/bin/php -m")
 	rawExtensionList := strings.Split(raw, "\n")
 
 	for _, item := range rawExtensionList {

app/http/controllers/plugins/php82/php82_controller.go

@@ -30,134 +30,136 @@ func NewPhp82Controller() *Php82Controller {
 	}
 }
 
-func (c *Php82Controller) Status(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php82Controller) Status(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	status := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	status := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php82Controller) Reload(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php82Controller) Reload(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl reload php-fpm-" + c.version)
-	out := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl reload php-fpm-" + c.version)
+	out := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	status := strings.TrimSpace(out)
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php82Controller) Start(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php82Controller) Start(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl start php-fpm-" + c.version)
-	out := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl start php-fpm-" + c.version)
+	out := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	status := strings.TrimSpace(out)
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php82Controller) Stop(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php82Controller) Stop(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl stop php-fpm-" + c.version)
-	out := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl stop php-fpm-" + c.version)
+	out := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	status := strings.TrimSpace(out)
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status != "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php82Controller) Restart(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php82Controller) Restart(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("systemctl restart php-fpm-" + c.version)
-	out := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
+	tools.Exec("systemctl restart php-fpm-" + c.version)
+	out := tools.Exec("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	status := strings.TrimSpace(out)
 	if len(status) == 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 	}
 
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
-func (c *Php82Controller) GetConfig(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php82Controller) GetConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	config := tools.ReadFile("/www/server/php/" + c.version + "/etc/php.ini")
-	controllers.Success(ctx, config)
+	config := tools.Read("/www/server/php/" + c.version + "/etc/php.ini")
+	return controllers.Success(ctx, config)
 }
 
-func (c *Php82Controller) SaveConfig(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php82Controller) SaveConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	config := ctx.Request().Input("config")
-	tools.WriteFile("/www/server/php/"+c.version+"/etc/php.ini", config, 0644)
-	c.Reload(ctx)
+	tools.Write("/www/server/php/"+c.version+"/etc/php.ini", config, 0644)
+	return c.Reload(ctx)
 }
 
-func (c *Php82Controller) Load(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php82Controller) Load(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	client := req.C().SetTimeout(10 * time.Second)
 	resp, err := client.R().Get("http://127.0.0.1/phpfpm_status/" + c.version)
 	if err != nil || !resp.IsSuccessState() {
 		facades.Log().Error("获取PHP-" + c.version + "运行状态失败")
-		controllers.Error(ctx, http.StatusInternalServerError, "[PHP-"+c.version+"] 获取运行状态失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "[PHP-"+c.version+"] 获取运行状态失败")
 	}
 
 	raw := resp.String()
@@ -180,43 +182,47 @@ func (c *Php82Controller) Load(ctx http.Context) {
 		}
 	}
 
-	controllers.Success(ctx, data)
+	return controllers.Success(ctx, data)
 }
 
-func (c *Php82Controller) ErrorLog(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php82Controller) ErrorLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	log := tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/php-fpm.log")
-	controllers.Success(ctx, log)
+	log := tools.Escape(tools.Exec("tail -n 100 /www/server/php/" + c.version + "/var/log/php-fpm.log"))
+	return controllers.Success(ctx, log)
 }
 
-func (c *Php82Controller) SlowLog(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php82Controller) SlowLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	log := tools.ExecShell("tail -n 100 /www/server/php/" + c.version + "/var/log/slow.log")
-	controllers.Success(ctx, log)
+	log := tools.Escape(tools.Exec("tail -n 100 /www/server/php/" + c.version + "/var/log/slow.log"))
+	return controllers.Success(ctx, log)
 }
 
-func (c *Php82Controller) ClearErrorLog(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php82Controller) ClearErrorLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("echo '' > /www/server/php/" + c.version + "/var/log/php-fpm.log")
-	controllers.Success(ctx, true)
+	tools.Exec("echo '' > /www/server/php/" + c.version + "/var/log/php-fpm.log")
+	return controllers.Success(ctx, true)
 }
 
-func (c *Php82Controller) ClearSlowLog(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php82Controller) ClearSlowLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell("echo '' > /www/server/php/" + c.version + "/var/log/slow.log")
-	controllers.Success(ctx, true)
+	tools.Exec("echo '' > /www/server/php/" + c.version + "/var/log/slow.log")
+	return controllers.Success(ctx, true)
 }
 
 type Extension struct {
@@ -226,32 +232,32 @@ type Extension struct {
 	Installed   bool   `json:"installed"`
 }
 
-func (c *Php82Controller) GetExtensionList(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php82Controller) GetExtensionList(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	extensions := c.GetExtensions()
-	controllers.Success(ctx, extensions)
+	return controllers.Success(ctx, extensions)
 }
 
-func (c *Php82Controller) InstallExtension(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php82Controller) InstallExtension(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	slug := ctx.Request().Input("slug")
 	if len(slug) == 0 {
-		controllers.Error(ctx, http.StatusBadRequest, "参数错误")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "参数错误")
 	}
 
 	extensions := c.GetExtensions()
 	for _, item := range extensions {
 		if item.Slug == slug {
 			if item.Installed {
-				controllers.Error(ctx, http.StatusBadRequest, "扩展已安装")
-				return
+				return controllers.Error(ctx, http.StatusBadRequest, "扩展已安装")
 			}
 
 			var task models.Task
@@ -261,37 +267,34 @@ func (c *Php82Controller) InstallExtension(ctx http.Context) {
 			task.Log = "/tmp/" + item.Slug + ".log"
 			if err := facades.Orm().Query().Create(&task); err != nil {
 				facades.Log().Error("[PHP-" + c.version + "] 创建安装拓展任务失败：" + err.Error())
-				controllers.Error(ctx, http.StatusInternalServerError, "系统内部错误")
-				return
+				return controllers.Error(ctx, http.StatusInternalServerError, "系统内部错误")
 			}
 
 			c.task.Process(task.ID)
 
-			controllers.Success(ctx, true)
-			return
+			return controllers.Success(ctx, true)
 		}
 	}
 
-	controllers.Error(ctx, http.StatusBadRequest, "扩展不存在")
+	return controllers.Error(ctx, http.StatusBadRequest, "扩展不存在")
 }
 
-func (c *Php82Controller) UninstallExtension(ctx http.Context) {
-	if !controllers.Check(ctx, "php"+c.version) {
-		return
+func (c *Php82Controller) UninstallExtension(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "php"+c.version)
+	if check != nil {
+		return check
 	}
 
 	slug := ctx.Request().Input("slug")
 	if len(slug) == 0 {
-		controllers.Error(ctx, http.StatusBadRequest, "参数错误")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "参数错误")
 	}
 
 	extensions := c.GetExtensions()
 	for _, item := range extensions {
 		if item.Slug == slug {
 			if !item.Installed {
-				controllers.Error(ctx, http.StatusBadRequest, "扩展未安装")
-				return
+				return controllers.Error(ctx, http.StatusBadRequest, "扩展未安装")
 			}
 
 			var task models.Task
@@ -301,18 +304,16 @@ func (c *Php82Controller) UninstallExtension(ctx http.Context) {
 			task.Log = "/tmp/" + item.Slug + ".log"
 			if err := facades.Orm().Query().Create(&task); err != nil {
 				facades.Log().Error("[PHP-" + c.version + "] 创建卸载拓展任务失败：" + err.Error())
-				controllers.Error(ctx, http.StatusInternalServerError, "系统内部错误")
-				return
+				return controllers.Error(ctx, http.StatusInternalServerError, "系统内部错误")
 			}
 
 			c.task.Process(task.ID)
 
-			controllers.Success(ctx, true)
-			return
+			return controllers.Success(ctx, true)
 		}
 	}
 
-	controllers.Error(ctx, http.StatusBadRequest, "扩展不存在")
+	return controllers.Error(ctx, http.StatusBadRequest, "扩展不存在")
 }
 
 func (c *Php82Controller) GetExtensions() []Extension {
@@ -348,7 +349,7 @@ func (c *Php82Controller) GetExtensions() []Extension {
 		Installed:   false,
 	})
 
-	raw := tools.ExecShell("/www/server/php/" + c.version + "/bin/php -m")
+	raw := tools.Exec("/www/server/php/" + c.version + "/bin/php -m")
 	rawExtensionList := strings.Split(raw, "\n")
 
 	for _, item := range rawExtensionList {

app/http/controllers/plugins/phpmyadmin/phpmyadmin_controller.go

@@ -18,15 +18,15 @@ func NewPhpMyAdminController() *PhpMyAdminController {
 	return &PhpMyAdminController{}
 }
 
-func (c *PhpMyAdminController) Info(ctx http.Context) {
-	if !controllers.Check(ctx, "phpmyadmin") {
-		return
+func (c *PhpMyAdminController) Info(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "phpmyadmin")
+	if check != nil {
+		return check
 	}
 
 	files, err := os.ReadDir("/www/server/phpmyadmin")
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, "找不到 phpMyAdmin 目录")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "找不到 phpMyAdmin 目录")
 	}
 
 	var phpmyadmin string
@@ -36,46 +36,44 @@ func (c *PhpMyAdminController) Info(ctx http.Context) {
 		}
 	}
 	if len(phpmyadmin) == 0 {
-		controllers.Error(ctx, http.StatusBadRequest, "找不到 phpMyAdmin 目录")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "找不到 phpMyAdmin 目录")
 	}
 
-	conf := tools.ReadFile("/www/server/vhost/phpmyadmin.conf")
+	conf := tools.Read("/www/server/vhost/phpmyadmin.conf")
 	match := regexp.MustCompile(`listen\s+(\d+);`).FindStringSubmatch(conf)
 	if len(match) == 0 {
-		controllers.Error(ctx, http.StatusBadRequest, "找不到 phpMyAdmin 端口")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "找不到 phpMyAdmin 端口")
 	}
 
-	controllers.Success(ctx, http.Json{
+	return controllers.Success(ctx, http.Json{
 		"phpmyadmin": phpmyadmin,
 		"port":       match[1],
 	})
 }
 
-func (c *PhpMyAdminController) SetPort(ctx http.Context) {
-	if !controllers.Check(ctx, "phpmyadmin") {
-		return
+func (c *PhpMyAdminController) SetPort(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "phpmyadmin")
+	if check != nil {
+		return check
 	}
 
 	port := ctx.Request().Input("port")
 	if len(port) == 0 {
-		controllers.Error(ctx, http.StatusBadRequest, "端口不能为空")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "端口不能为空")
 	}
 
-	conf := tools.ReadFile("/www/server/vhost/phpmyadmin.conf")
+	conf := tools.Read("/www/server/vhost/phpmyadmin.conf")
 	conf = regexp.MustCompile(`listen\s+(\d+);`).ReplaceAllString(conf, "listen "+port+";")
-	tools.WriteFile("/www/server/vhost/phpmyadmin.conf", conf, 0644)
+	tools.Write("/www/server/vhost/phpmyadmin.conf", conf, 0644)
 
 	if tools.IsRHEL() {
-		tools.ExecShell("firewall-cmd --zone=public --add-port=" + port + "/tcp --permanent")
-		tools.ExecShell("firewall-cmd --reload")
+		tools.Exec("firewall-cmd --zone=public --add-port=" + port + "/tcp --permanent")
+		tools.Exec("firewall-cmd --reload")
 	} else {
-		tools.ExecShell("ufw allow " + port + "/tcp")
-		tools.ExecShell("ufw reload")
+		tools.Exec("ufw allow " + port + "/tcp")
+		tools.Exec("ufw reload")
 	}
-	tools.ExecShell("systemctl reload openresty")
+	tools.Exec("systemctl reload openresty")
 
-	controllers.Success(ctx, nil)
+	return controllers.Success(ctx, nil)
 }

app/http/controllers/plugins/postgresql15/postgresql15_controller.go

@@ -0,0 +1,612 @@
+package postgresql15
+
+import (
+	"strings"
+
+	"github.com/goravel/framework/contracts/http"
+	"github.com/goravel/framework/facades"
+	"github.com/goravel/framework/support/carbon"
+
+	"panel/app/http/controllers"
+	"panel/app/models"
+	"panel/app/services"
+	"panel/pkg/tools"
+)
+
+type Postgresql15Controller struct {
+	setting services.Setting
+	backup  services.Backup
+}
+
+type Info struct {
+	Name  string `json:"name"`
+	Value string `json:"value"`
+}
+
+func NewPostgresql15Controller() *Postgresql15Controller {
+	return &Postgresql15Controller{
+		setting: services.NewSettingImpl(),
+		backup:  services.NewBackupImpl(),
+	}
+}
+
+// Status 获取运行状态
+func (c *Postgresql15Controller) Status(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	status := tools.Exec("systemctl status postgresql | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PostgreSQL状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Reload 重载配置
+func (c *Postgresql15Controller) Reload(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl reload postgresql")
+	status := tools.Exec("systemctl status postgresql | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PostgreSQL状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Restart 重启服务
+func (c *Postgresql15Controller) Restart(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl restart postgresql")
+	status := tools.Exec("systemctl status postgresql | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PostgreSQL状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Start 启动服务
+func (c *Postgresql15Controller) Start(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl start postgresql")
+	status := tools.Exec("systemctl status postgresql | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PostgreSQL状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Stop 停止服务
+func (c *Postgresql15Controller) Stop(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl stop postgresql")
+	status := tools.Exec("systemctl status postgresql | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PostgreSQL状态失败")
+	}
+
+	if status != "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// GetConfig 获取配置
+func (c *Postgresql15Controller) GetConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	// 获取配置
+	config := tools.Read("/www/server/postgresql/data/postgresql.conf")
+	if len(config) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PostgreSQL配置失败")
+	}
+
+	return controllers.Success(ctx, config)
+}
+
+// GetUserConfig 获取用户配置
+func (c *Postgresql15Controller) GetUserConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	// 获取配置
+	config := tools.Read("/www/server/postgresql/data/pg_hba.conf")
+	if len(config) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PostgreSQL配置失败")
+	}
+
+	return controllers.Success(ctx, config)
+}
+
+// SaveConfig 保存配置
+func (c *Postgresql15Controller) SaveConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	config := ctx.Request().Input("config")
+	if len(config) == 0 {
+		return controllers.Error(ctx, http.StatusBadRequest, "配置不能为空")
+	}
+
+	if !tools.Write("/www/server/postgresql/data/postgresql.conf", config, 0644) {
+		return controllers.Error(ctx, http.StatusInternalServerError, "写入PostgreSQL配置失败")
+	}
+
+	return c.Restart(ctx)
+}
+
+// SaveUserConfig 保存用户配置
+func (c *Postgresql15Controller) SaveUserConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	config := ctx.Request().Input("config")
+	if len(config) == 0 {
+		return controllers.Error(ctx, http.StatusBadRequest, "配置不能为空")
+	}
+
+	if !tools.Write("/www/server/postgresql/data/pg_hba.conf", config, 0644) {
+		return controllers.Error(ctx, http.StatusInternalServerError, "写入PostgreSQL配置失败")
+	}
+
+	return c.Restart(ctx)
+}
+
+// Load 获取负载
+func (c *Postgresql15Controller) Load(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	status := tools.Exec("systemctl status postgresql | grep Active | grep -v grep | awk '{print $2}'")
+	if status != "active" {
+		return controllers.Error(ctx, http.StatusInternalServerError, "PostgreSQL 已停止运行")
+	}
+
+	data := []Info{
+		{"启动时间", carbon.Parse(tools.Exec(`echo "select pg_postmaster_start_time();" | su - postgres -c "psql" | sed -n 3p | cut -d'.' -f1`)).ToDateTimeString()},
+		{"进程 PID", tools.Exec(`echo "select pg_backend_pid();" | su - postgres -c "psql" | sed -n 3p`)},
+		{"进程数", tools.Exec(`ps aux | grep postgres | grep -v grep | wc -l`)},
+		{"总连接数", tools.Exec(`echo "SELECT count(*) FROM pg_stat_activity WHERE NOT pid=pg_backend_pid();" | su - postgres -c "psql" | sed -n 3p`)},
+		{"空间占用", tools.Exec(`echo "select pg_size_pretty(pg_database_size('postgres'));" | su - postgres -c "psql" | sed -n 3p`)},
+	}
+
+	return controllers.Success(ctx, data)
+}
+
+// Log 获取日志
+func (c *Postgresql15Controller) Log(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	log := tools.Exec("tail -n 100 /www/server/postgresql/logs/postgresql-" + carbon.Now().ToDateString() + ".log")
+	return controllers.Success(ctx, log)
+}
+
+// ClearLog 清空日志
+func (c *Postgresql15Controller) ClearLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("echo '' > /www/server/postgresql/logs/postgresql-" + carbon.Now().ToDateString() + ".log")
+	return controllers.Success(ctx, nil)
+}
+
+// DatabaseList 获取数据库列表
+func (c *Postgresql15Controller) DatabaseList(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	status := tools.Exec("systemctl status postgresql | grep Active | grep -v grep | awk '{print $2}'")
+	if status != "active" {
+		return controllers.Error(ctx, http.StatusInternalServerError, "PostgreSQL 已停止运行")
+	}
+
+	raw := tools.Exec(`echo "\l" | su - postgres -c "psql"`)
+	databases := strings.Split(raw, "\n")
+	databases = databases[3 : len(databases)-1]
+
+	type database struct {
+		Name     string `json:"name"`
+		Owner    string `json:"owner"`
+		Encoding string `json:"encoding"`
+	}
+
+	var databaseList []database
+	for _, db := range databases {
+		parts := strings.Split(db, "|")
+		if len(parts) != 8 || len(strings.TrimSpace(parts[0])) == 0 {
+			continue
+		}
+
+		databaseList = append(databaseList, database{
+			Name:     strings.TrimSpace(parts[0]),
+			Owner:    strings.TrimSpace(parts[1]),
+			Encoding: strings.TrimSpace(parts[2]),
+		})
+	}
+
+	page := ctx.Request().QueryInt("page", 1)
+	limit := ctx.Request().QueryInt("limit", 10)
+	startIndex := (page - 1) * limit
+	endIndex := page * limit
+	if startIndex > len(databaseList) {
+		return controllers.Success(ctx, http.Json{
+			"total": 0,
+			"items": []database{},
+		})
+	}
+	if endIndex > len(databaseList) {
+		endIndex = len(databaseList)
+	}
+	pagedDatabases := databaseList[startIndex:endIndex]
+
+	return controllers.Success(ctx, http.Json{
+		"total": len(databaseList),
+		"items": pagedDatabases,
+	})
+}
+
+// AddDatabase 添加数据库
+func (c *Postgresql15Controller) AddDatabase(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"database": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$",
+		"user":     "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$",
+		"password": "required|min_len:8|max_len:255",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	database := ctx.Request().Input("database")
+	user := ctx.Request().Input("user")
+	password := ctx.Request().Input("password")
+
+	tools.Exec(`echo "CREATE DATABASE ` + database + `;" | su - postgres -c "psql"`)
+	tools.Exec(`echo "CREATE USER ` + user + ` WITH PASSWORD '` + password + `';" | su - postgres -c "psql"`)
+	tools.Exec(`echo "ALTER DATABASE ` + database + ` OWNER TO ` + user + `;" | su - postgres -c "psql"`)
+	tools.Exec(`echo "GRANT ALL PRIVILEGES ON DATABASE ` + database + ` TO ` + user + `;" | su - postgres -c "psql"`)
+
+	userConfig := "host    " + database + "    " + user + "    127.0.0.1/32    scram-sha-256"
+	tools.Exec(`echo "` + userConfig + `" >> /www/server/postgresql/data/pg_hba.conf`)
+
+	return c.Reload(ctx)
+}
+
+// DeleteDatabase 删除数据库
+func (c *Postgresql15Controller) DeleteDatabase(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"database": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$|not_in:postgres,template0,template1",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	database := ctx.Request().Input("database")
+	tools.Exec(`echo "DROP DATABASE ` + database + `;" | su - postgres -c "psql"`)
+
+	return controllers.Success(ctx, nil)
+}
+
+// BackupList 获取备份列表
+func (c *Postgresql15Controller) BackupList(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	backupList, err := c.backup.PostgresqlList()
+	if err != nil {
+		facades.Log().Error("[PostgreSQL] 获取备份列表失败：" + err.Error())
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取备份列表失败")
+	}
+
+	return controllers.Success(ctx, backupList)
+}
+
+// UploadBackup 上传备份
+func (c *Postgresql15Controller) UploadBackup(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	file, err := ctx.Request().File("file")
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, "上传文件失败")
+	}
+
+	backupPath := c.setting.Get(models.SettingKeyBackupPath) + "/postgresql"
+	if !tools.Exists(backupPath) {
+		tools.Mkdir(backupPath, 0644)
+	}
+
+	name := file.GetClientOriginalName()
+	_, err = file.StoreAs(backupPath, name)
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, "上传文件失败")
+	}
+
+	return controllers.Success(ctx, nil)
+}
+
+// CreateBackup 创建备份
+func (c *Postgresql15Controller) CreateBackup(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"database": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$|not_in:information_schema,mysql,performance_schema,sys",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	database := ctx.Request().Input("database")
+	err = c.backup.PostgresqlBackup(database)
+	if err != nil {
+		facades.Log().Error("[PostgreSQL] 创建备份失败：" + err.Error())
+		return controllers.Error(ctx, http.StatusInternalServerError, "创建备份失败")
+	}
+
+	return controllers.Success(ctx, nil)
+}
+
+// DeleteBackup 删除备份
+func (c *Postgresql15Controller) DeleteBackup(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"name": "required|min_len:1|max_len:255",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	backupPath := c.setting.Get(models.SettingKeyBackupPath) + "/postgresql"
+	fileName := ctx.Request().Input("name")
+	tools.Remove(backupPath + "/" + fileName)
+
+	return controllers.Success(ctx, nil)
+}
+
+// RestoreBackup 还原备份
+func (c *Postgresql15Controller) RestoreBackup(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"name":     "required|min_len:1|max_len:255",
+		"database": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$|not_in:information_schema,mysql,performance_schema,sys",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	err = c.backup.PostgresqlRestore(ctx.Request().Input("database"), ctx.Request().Input("name"))
+	if err != nil {
+		facades.Log().Error("[PostgreSQL] 还原失败：" + err.Error())
+		return controllers.Error(ctx, http.StatusInternalServerError, "还原失败: "+err.Error())
+	}
+
+	return controllers.Success(ctx, nil)
+}
+
+// UserList 用户列表
+func (c *Postgresql15Controller) UserList(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	type user struct {
+		User string `json:"user"`
+		Role string `json:"role"`
+	}
+
+	raw := tools.Exec(`echo "\du" | su - postgres -c "psql"`)
+	users := strings.Split(raw, "\n")
+	if len(users) < 4 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "用户列表为空")
+	}
+	users = users[3:]
+
+	var userList []user
+	for _, u := range users {
+		userInfo := strings.Split(u, "|")
+		if len(userInfo) != 3 {
+			continue
+		}
+
+		userList = append(userList, user{
+			User: strings.TrimSpace(userInfo[0]),
+			Role: strings.TrimSpace(userInfo[1]),
+		})
+	}
+
+	page := ctx.Request().QueryInt("page", 1)
+	limit := ctx.Request().QueryInt("limit", 10)
+	startIndex := (page - 1) * limit
+	endIndex := page * limit
+	if startIndex > len(userList) {
+		return controllers.Success(ctx, http.Json{
+			"total": 0,
+			"items": []user{},
+		})
+	}
+	if endIndex > len(userList) {
+		endIndex = len(userList)
+	}
+	pagedUsers := userList[startIndex:endIndex]
+
+	return controllers.Success(ctx, http.Json{
+		"total": len(userList),
+		"items": pagedUsers,
+	})
+}
+
+// AddUser 添加用户
+func (c *Postgresql15Controller) AddUser(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"database": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$",
+		"user":     "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$",
+		"password": "required|min_len:8|max_len:255",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	user := ctx.Request().Input("user")
+	password := ctx.Request().Input("password")
+	database := ctx.Request().Input("database")
+	tools.Exec(`echo "CREATE USER ` + user + ` WITH PASSWORD '` + password + `';" | su - postgres -c "psql"`)
+	tools.Exec(`echo "GRANT ALL PRIVILEGES ON DATABASE ` + database + ` TO ` + user + `;" | su - postgres -c "psql"`)
+
+	userConfig := "host    " + database + "    " + user + "    127.0.0.1/32    scram-sha-256"
+	tools.Exec(`echo "` + userConfig + `" >> /www/server/postgresql/data/pg_hba.conf`)
+
+	return c.Reload(ctx)
+}
+
+// DeleteUser 删除用户
+func (c *Postgresql15Controller) DeleteUser(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"user": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	user := ctx.Request().Input("user")
+	tools.Exec(`echo "DROP USER ` + user + `;" | su - postgres -c "psql"`)
+	tools.Exec(`sed -i '/` + user + `/d' /www/server/postgresql/data/pg_hba.conf`)
+
+	return c.Reload(ctx)
+}
+
+// SetUserPassword 设置用户密码
+func (c *Postgresql15Controller) SetUserPassword(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql15")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"user":     "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$",
+		"password": "required|min_len:8|max_len:255",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	user := ctx.Request().Input("user")
+	password := ctx.Request().Input("password")
+	tools.Exec(`echo "ALTER USER ` + user + ` WITH PASSWORD '` + password + `';" | su - postgres -c "psql"`)
+
+	return controllers.Success(ctx, nil)
+}

app/http/controllers/plugins/postgresql16/postgresql16_controller.go

@@ -0,0 +1,612 @@
+package postgresql16
+
+import (
+	"strings"
+
+	"github.com/goravel/framework/contracts/http"
+	"github.com/goravel/framework/facades"
+	"github.com/goravel/framework/support/carbon"
+
+	"panel/app/http/controllers"
+	"panel/app/models"
+	"panel/app/services"
+	"panel/pkg/tools"
+)
+
+type Postgresql16Controller struct {
+	setting services.Setting
+	backup  services.Backup
+}
+
+type Info struct {
+	Name  string `json:"name"`
+	Value string `json:"value"`
+}
+
+func NewPostgresql16Controller() *Postgresql16Controller {
+	return &Postgresql16Controller{
+		setting: services.NewSettingImpl(),
+		backup:  services.NewBackupImpl(),
+	}
+}
+
+// Status 获取运行状态
+func (c *Postgresql16Controller) Status(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	status := tools.Exec("systemctl status postgresql | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PostgreSQL状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Reload 重载配置
+func (c *Postgresql16Controller) Reload(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl reload postgresql")
+	status := tools.Exec("systemctl status postgresql | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PostgreSQL状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Restart 重启服务
+func (c *Postgresql16Controller) Restart(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl restart postgresql")
+	status := tools.Exec("systemctl status postgresql | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PostgreSQL状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Start 启动服务
+func (c *Postgresql16Controller) Start(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl start postgresql")
+	status := tools.Exec("systemctl status postgresql | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PostgreSQL状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Stop 停止服务
+func (c *Postgresql16Controller) Stop(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl stop postgresql")
+	status := tools.Exec("systemctl status postgresql | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PostgreSQL状态失败")
+	}
+
+	if status != "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// GetConfig 获取配置
+func (c *Postgresql16Controller) GetConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	// 获取配置
+	config := tools.Read("/www/server/postgresql/data/postgresql.conf")
+	if len(config) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PostgreSQL配置失败")
+	}
+
+	return controllers.Success(ctx, config)
+}
+
+// GetUserConfig 获取用户配置
+func (c *Postgresql16Controller) GetUserConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	// 获取配置
+	config := tools.Read("/www/server/postgresql/data/pg_hba.conf")
+	if len(config) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PostgreSQL配置失败")
+	}
+
+	return controllers.Success(ctx, config)
+}
+
+// SaveConfig 保存配置
+func (c *Postgresql16Controller) SaveConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	config := ctx.Request().Input("config")
+	if len(config) == 0 {
+		return controllers.Error(ctx, http.StatusBadRequest, "配置不能为空")
+	}
+
+	if !tools.Write("/www/server/postgresql/data/postgresql.conf", config, 0644) {
+		return controllers.Error(ctx, http.StatusInternalServerError, "写入PostgreSQL配置失败")
+	}
+
+	return c.Restart(ctx)
+}
+
+// SaveUserConfig 保存用户配置
+func (c *Postgresql16Controller) SaveUserConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	config := ctx.Request().Input("config")
+	if len(config) == 0 {
+		return controllers.Error(ctx, http.StatusBadRequest, "配置不能为空")
+	}
+
+	if !tools.Write("/www/server/postgresql/data/pg_hba.conf", config, 0644) {
+		return controllers.Error(ctx, http.StatusInternalServerError, "写入PostgreSQL配置失败")
+	}
+
+	return c.Restart(ctx)
+}
+
+// Load 获取负载
+func (c *Postgresql16Controller) Load(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	status := tools.Exec("systemctl status postgresql | grep Active | grep -v grep | awk '{print $2}'")
+	if status != "active" {
+		return controllers.Error(ctx, http.StatusInternalServerError, "PostgreSQL 已停止运行")
+	}
+
+	data := []Info{
+		{"启动时间", carbon.Parse(tools.Exec(`echo "select pg_postmaster_start_time();" | su - postgres -c "psql" | sed -n 3p | cut -d'.' -f1`)).ToDateTimeString()},
+		{"进程 PID", tools.Exec(`echo "select pg_backend_pid();" | su - postgres -c "psql" | sed -n 3p`)},
+		{"进程数", tools.Exec(`ps aux | grep postgres | grep -v grep | wc -l`)},
+		{"总连接数", tools.Exec(`echo "SELECT count(*) FROM pg_stat_activity WHERE NOT pid=pg_backend_pid();" | su - postgres -c "psql" | sed -n 3p`)},
+		{"空间占用", tools.Exec(`echo "select pg_size_pretty(pg_database_size('postgres'));" | su - postgres -c "psql" | sed -n 3p`)},
+	}
+
+	return controllers.Success(ctx, data)
+}
+
+// Log 获取日志
+func (c *Postgresql16Controller) Log(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	log := tools.Exec("tail -n 100 /www/server/postgresql/logs/postgresql-" + carbon.Now().ToDateString() + ".log")
+	return controllers.Success(ctx, log)
+}
+
+// ClearLog 清空日志
+func (c *Postgresql16Controller) ClearLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("echo '' > /www/server/postgresql/logs/postgresql-" + carbon.Now().ToDateString() + ".log")
+	return controllers.Success(ctx, nil)
+}
+
+// DatabaseList 获取数据库列表
+func (c *Postgresql16Controller) DatabaseList(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	status := tools.Exec("systemctl status postgresql | grep Active | grep -v grep | awk '{print $2}'")
+	if status != "active" {
+		return controllers.Error(ctx, http.StatusInternalServerError, "PostgreSQL 已停止运行")
+	}
+
+	raw := tools.Exec(`echo "\l" | su - postgres -c "psql"`)
+	databases := strings.Split(raw, "\n")
+	databases = databases[3 : len(databases)-1]
+
+	type database struct {
+		Name     string `json:"name"`
+		Owner    string `json:"owner"`
+		Encoding string `json:"encoding"`
+	}
+
+	var databaseList []database
+	for _, db := range databases {
+		parts := strings.Split(db, "|")
+		if len(parts) != 9 || len(strings.TrimSpace(parts[0])) == 0 {
+			continue
+		}
+
+		databaseList = append(databaseList, database{
+			Name:     strings.TrimSpace(parts[0]),
+			Owner:    strings.TrimSpace(parts[1]),
+			Encoding: strings.TrimSpace(parts[2]),
+		})
+	}
+
+	page := ctx.Request().QueryInt("page", 1)
+	limit := ctx.Request().QueryInt("limit", 10)
+	startIndex := (page - 1) * limit
+	endIndex := page * limit
+	if startIndex > len(databaseList) {
+		return controllers.Success(ctx, http.Json{
+			"total": 0,
+			"items": []database{},
+		})
+	}
+	if endIndex > len(databaseList) {
+		endIndex = len(databaseList)
+	}
+	pagedDatabases := databaseList[startIndex:endIndex]
+
+	return controllers.Success(ctx, http.Json{
+		"total": len(databaseList),
+		"items": pagedDatabases,
+	})
+}
+
+// AddDatabase 添加数据库
+func (c *Postgresql16Controller) AddDatabase(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"database": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$",
+		"user":     "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$",
+		"password": "required|min_len:8|max_len:255",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	database := ctx.Request().Input("database")
+	user := ctx.Request().Input("user")
+	password := ctx.Request().Input("password")
+
+	tools.Exec(`echo "CREATE DATABASE ` + database + `;" | su - postgres -c "psql"`)
+	tools.Exec(`echo "CREATE USER ` + user + ` WITH PASSWORD '` + password + `';" | su - postgres -c "psql"`)
+	tools.Exec(`echo "ALTER DATABASE ` + database + ` OWNER TO ` + user + `;" | su - postgres -c "psql"`)
+	tools.Exec(`echo "GRANT ALL PRIVILEGES ON DATABASE ` + database + ` TO ` + user + `;" | su - postgres -c "psql"`)
+
+	userConfig := "host    " + database + "    " + user + "    127.0.0.1/32    scram-sha-256"
+	tools.Exec(`echo "` + userConfig + `" >> /www/server/postgresql/data/pg_hba.conf`)
+
+	return c.Reload(ctx)
+}
+
+// DeleteDatabase 删除数据库
+func (c *Postgresql16Controller) DeleteDatabase(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"database": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$|not_in:postgres,template0,template1",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	database := ctx.Request().Input("database")
+	tools.Exec(`echo "DROP DATABASE ` + database + `;" | su - postgres -c "psql"`)
+
+	return controllers.Success(ctx, nil)
+}
+
+// BackupList 获取备份列表
+func (c *Postgresql16Controller) BackupList(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	backupList, err := c.backup.PostgresqlList()
+	if err != nil {
+		facades.Log().Error("[PostgreSQL] 获取备份列表失败：" + err.Error())
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取备份列表失败")
+	}
+
+	return controllers.Success(ctx, backupList)
+}
+
+// UploadBackup 上传备份
+func (c *Postgresql16Controller) UploadBackup(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	file, err := ctx.Request().File("file")
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, "上传文件失败")
+	}
+
+	backupPath := c.setting.Get(models.SettingKeyBackupPath) + "/postgresql"
+	if !tools.Exists(backupPath) {
+		tools.Mkdir(backupPath, 0644)
+	}
+
+	name := file.GetClientOriginalName()
+	_, err = file.StoreAs(backupPath, name)
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, "上传文件失败")
+	}
+
+	return controllers.Success(ctx, nil)
+}
+
+// CreateBackup 创建备份
+func (c *Postgresql16Controller) CreateBackup(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"database": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$|not_in:information_schema,mysql,performance_schema,sys",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	database := ctx.Request().Input("database")
+	err = c.backup.PostgresqlBackup(database)
+	if err != nil {
+		facades.Log().Error("[PostgreSQL] 创建备份失败：" + err.Error())
+		return controllers.Error(ctx, http.StatusInternalServerError, "创建备份失败")
+	}
+
+	return controllers.Success(ctx, nil)
+}
+
+// DeleteBackup 删除备份
+func (c *Postgresql16Controller) DeleteBackup(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"name": "required|min_len:1|max_len:255",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	backupPath := c.setting.Get(models.SettingKeyBackupPath) + "/postgresql"
+	fileName := ctx.Request().Input("name")
+	tools.Remove(backupPath + "/" + fileName)
+
+	return controllers.Success(ctx, nil)
+}
+
+// RestoreBackup 还原备份
+func (c *Postgresql16Controller) RestoreBackup(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"name":     "required|min_len:1|max_len:255",
+		"database": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$|not_in:information_schema,mysql,performance_schema,sys",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	err = c.backup.PostgresqlRestore(ctx.Request().Input("database"), ctx.Request().Input("name"))
+	if err != nil {
+		facades.Log().Error("[PostgreSQL] 还原失败：" + err.Error())
+		return controllers.Error(ctx, http.StatusInternalServerError, "还原失败: "+err.Error())
+	}
+
+	return controllers.Success(ctx, nil)
+}
+
+// UserList 用户列表
+func (c *Postgresql16Controller) UserList(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	type user struct {
+		User string `json:"user"`
+		Role string `json:"role"`
+	}
+
+	raw := tools.Exec(`echo "\du" | su - postgres -c "psql"`)
+	users := strings.Split(raw, "\n")
+	if len(users) < 4 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "用户列表为空")
+	}
+	users = users[3:]
+
+	var userList []user
+	for _, u := range users {
+		userInfo := strings.Split(u, "|")
+		if len(userInfo) != 2 {
+			continue
+		}
+
+		userList = append(userList, user{
+			User: strings.TrimSpace(userInfo[0]),
+			Role: strings.TrimSpace(userInfo[1]),
+		})
+	}
+
+	page := ctx.Request().QueryInt("page", 1)
+	limit := ctx.Request().QueryInt("limit", 10)
+	startIndex := (page - 1) * limit
+	endIndex := page * limit
+	if startIndex > len(userList) {
+		return controllers.Success(ctx, http.Json{
+			"total": 0,
+			"items": []user{},
+		})
+	}
+	if endIndex > len(userList) {
+		endIndex = len(userList)
+	}
+	pagedUsers := userList[startIndex:endIndex]
+
+	return controllers.Success(ctx, http.Json{
+		"total": len(userList),
+		"items": pagedUsers,
+	})
+}
+
+// AddUser 添加用户
+func (c *Postgresql16Controller) AddUser(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"database": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$",
+		"user":     "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$",
+		"password": "required|min_len:8|max_len:255",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	user := ctx.Request().Input("user")
+	password := ctx.Request().Input("password")
+	database := ctx.Request().Input("database")
+	tools.Exec(`echo "CREATE USER ` + user + ` WITH PASSWORD '` + password + `';" | su - postgres -c "psql"`)
+	tools.Exec(`echo "GRANT ALL PRIVILEGES ON DATABASE ` + database + ` TO ` + user + `;" | su - postgres -c "psql"`)
+
+	userConfig := "host    " + database + "    " + user + "    127.0.0.1/32    scram-sha-256"
+	tools.Exec(`echo "` + userConfig + `" >> /www/server/postgresql/data/pg_hba.conf`)
+
+	return c.Reload(ctx)
+}
+
+// DeleteUser 删除用户
+func (c *Postgresql16Controller) DeleteUser(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"user": "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	user := ctx.Request().Input("user")
+	tools.Exec(`echo "DROP USER ` + user + `;" | su - postgres -c "psql"`)
+	tools.Exec(`sed -i '/` + user + `/d' /www/server/postgresql/data/pg_hba.conf`)
+
+	return c.Reload(ctx)
+}
+
+// SetUserPassword 设置用户密码
+func (c *Postgresql16Controller) SetUserPassword(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "postgresql16")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"user":     "required|min_len:1|max_len:255|regex:^[a-zA-Z][a-zA-Z0-9_]+$",
+		"password": "required|min_len:8|max_len:255",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	user := ctx.Request().Input("user")
+	password := ctx.Request().Input("password")
+	tools.Exec(`echo "ALTER USER ` + user + ` WITH PASSWORD '` + password + `';" | su - postgres -c "psql"`)
+
+	return controllers.Success(ctx, nil)
+}

app/http/controllers/plugins/pureftpd/pureftpd_controller.go

@@ -0,0 +1,308 @@
+package pureftpd
+
+import (
+	"regexp"
+	"strings"
+
+	"github.com/goravel/framework/contracts/http"
+
+	"panel/app/http/controllers"
+	"panel/pkg/tools"
+)
+
+type PureFtpdController struct {
+}
+
+type User struct {
+	Username string `json:"username"`
+	Path     string `json:"path"`
+}
+
+func NewPureFtpdController() *PureFtpdController {
+	return &PureFtpdController{}
+}
+
+// Status 获取运行状态
+func (c *PureFtpdController) Status(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "pureftpd")
+	if check != nil {
+		return check
+	}
+
+	status := tools.Exec("systemctl status pure-ftpd | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PureFtpd状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Reload 重载配置
+func (c *PureFtpdController) Reload(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "pureftpd")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl reload pure-ftpd")
+	status := tools.Exec("systemctl status pure-ftpd | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PureFtpd状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Restart 重启服务
+func (c *PureFtpdController) Restart(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "pureftpd")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl restart pure-ftpd")
+	status := tools.Exec("systemctl status pure-ftpd | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PureFtpd状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Start 启动服务
+func (c *PureFtpdController) Start(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "pureftpd")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl start pure-ftpd")
+	status := tools.Exec("systemctl status pure-ftpd | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PureFtpd状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Stop 停止服务
+func (c *PureFtpdController) Stop(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "pureftpd")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl stop pure-ftpd")
+	status := tools.Exec("systemctl status pure-ftpd | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PureFtpd状态失败")
+	}
+
+	if status != "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// List 获取用户列表
+func (c *PureFtpdController) List(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "pureftpd")
+	if check != nil {
+		return check
+	}
+
+	listRaw := tools.Exec("pure-pw list")
+	if len(listRaw) == 0 {
+		return controllers.Success(ctx, http.Json{
+			"total": 0,
+			"items": []User{},
+		})
+	}
+
+	listArr := strings.Split(listRaw, "\n")
+	var users []User
+	for _, v := range listArr {
+		if len(v) == 0 {
+			continue
+		}
+
+		match := regexp.MustCompile(`(\S+)\s+(\S+)`).FindStringSubmatch(v)
+		users = append(users, User{
+			Username: match[1],
+			Path:     strings.Replace(match[2], "/./", "/", 1),
+		})
+	}
+
+	page := ctx.Request().QueryInt("page", 1)
+	limit := ctx.Request().QueryInt("limit", 10)
+	startIndex := (page - 1) * limit
+	endIndex := page * limit
+	if startIndex > len(users) {
+		return controllers.Success(ctx, http.Json{
+			"total": 0,
+			"items": []User{},
+		})
+	}
+	if endIndex > len(users) {
+		endIndex = len(users)
+	}
+	pagedUsers := users[startIndex:endIndex]
+
+	return controllers.Success(ctx, http.Json{
+		"total": len(users),
+		"items": pagedUsers,
+	})
+}
+
+// Add 添加用户
+func (c *PureFtpdController) Add(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "pureftpd")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"username": "required",
+		"password": "required|min_len:6",
+		"path":     "required",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	username := ctx.Request().Input("username")
+	password := ctx.Request().Input("password")
+	path := ctx.Request().Input("path")
+
+	if !strings.HasPrefix(path, "/") {
+		path = "/" + path
+	}
+	if !tools.Exists(path) {
+		return controllers.Error(ctx, http.StatusBadRequest, "目录不存在")
+	}
+
+	tools.Chmod(path, 0755)
+	tools.Chown(path, "www", "www")
+	tools.Exec(`yes '` + password + `' | pure-pw useradd ` + username + ` -u www -g www -d ` + path)
+	tools.Exec("pure-pw mkdb")
+
+	return controllers.Success(ctx, nil)
+}
+
+// Delete 删除用户
+func (c *PureFtpdController) Delete(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "pureftpd")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"username": "required",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	username := ctx.Request().Input("username")
+
+	tools.Exec("pure-pw userdel " + username + " -m")
+	tools.Exec("pure-pw mkdb")
+
+	return controllers.Success(ctx, nil)
+}
+
+// ChangePassword 修改密码
+func (c *PureFtpdController) ChangePassword(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "pureftpd")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"username": "required",
+		"password": "required|min_len:6",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	username := ctx.Request().Input("username")
+	password := ctx.Request().Input("password")
+
+	tools.Exec(`yes '` + password + `' | pure-pw passwd ` + username + ` -m`)
+	tools.Exec("pure-pw mkdb")
+
+	return controllers.Success(ctx, nil)
+}
+
+// GetPort 获取端口
+func (c *PureFtpdController) GetPort(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "pureftpd")
+	if check != nil {
+		return check
+	}
+
+	port := tools.Exec(`cat /www/server/pure-ftpd/etc/pure-ftpd.conf | grep "Bind" | awk '{print $2}' | awk -F "," '{print $2}'`)
+	if len(port) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取PureFtpd端口失败")
+	}
+
+	return controllers.Success(ctx, port)
+}
+
+// SetPort 设置端口
+func (c *PureFtpdController) SetPort(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "pureftpd")
+	if check != nil {
+		return check
+	}
+
+	validator, err := ctx.Request().Validate(map[string]string{
+		"port": "required",
+	})
+	if err != nil {
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
+	}
+	if validator.Fails() {
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
+	}
+
+	port := ctx.Request().Input("port")
+	tools.Exec(`sed -i "s/Bind.*/Bind 0.0.0.0,` + port + `/g" /www/server/pure-ftpd/etc/pure-ftpd.conf`)
+	if tools.IsRHEL() {
+		tools.Exec("firewall-cmd --zone=public --add-port=" + port + "/tcp --permanent")
+		tools.Exec("firewall-cmd --reload")
+	} else {
+		tools.Exec("ufw allow " + port + "/tcp")
+		tools.Exec("ufw reload")
+	}
+	tools.Exec("systemctl restart pure-ftpd")
+
+	return controllers.Success(ctx, nil)
+}

app/http/controllers/plugins/redis/redis_controller.go

@@ -0,0 +1,202 @@
+package redis
+
+import (
+	"strings"
+
+	"github.com/goravel/framework/contracts/http"
+
+	"panel/app/http/controllers"
+	"panel/pkg/tools"
+)
+
+type RedisController struct {
+}
+
+type Info struct {
+	Name  string `json:"name"`
+	Value string `json:"value"`
+}
+
+func NewRedisController() *RedisController {
+	return &RedisController{}
+}
+
+// Status 获取运行状态
+func (c *RedisController) Status(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "redis")
+	if check != nil {
+		return check
+	}
+
+	status := tools.Exec("systemctl status redis | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取Redis状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Reload 重载配置
+func (c *RedisController) Reload(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "redis")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl reload redis")
+	status := tools.Exec("systemctl status redis | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取Redis状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Restart 重启服务
+func (c *RedisController) Restart(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "redis")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl restart redis")
+	status := tools.Exec("systemctl status redis | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取Redis状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Start 启动服务
+func (c *RedisController) Start(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "redis")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl start redis")
+	status := tools.Exec("systemctl status redis | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取Redis状态失败")
+	}
+
+	if status == "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// Stop 停止服务
+func (c *RedisController) Stop(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "redis")
+	if check != nil {
+		return check
+	}
+
+	tools.Exec("systemctl stop redis")
+	status := tools.Exec("systemctl status redis | grep Active | grep -v grep | awk '{print $2}'")
+	if len(status) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取Redis状态失败")
+	}
+
+	if status != "active" {
+		return controllers.Success(ctx, true)
+	} else {
+		return controllers.Success(ctx, false)
+	}
+}
+
+// GetConfig 获取配置
+func (c *RedisController) GetConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "redis")
+	if check != nil {
+		return check
+	}
+
+	// 获取配置
+	config := tools.Read("/www/server/redis/redis.conf")
+	if len(config) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取Redis配置失败")
+	}
+
+	return controllers.Success(ctx, config)
+}
+
+// SaveConfig 保存配置
+func (c *RedisController) SaveConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "redis")
+	if check != nil {
+		return check
+	}
+
+	config := ctx.Request().Input("config")
+	if len(config) == 0 {
+		return controllers.Error(ctx, http.StatusBadRequest, "配置不能为空")
+	}
+
+	if !tools.Write("/www/server/redis/redis.conf", config, 0644) {
+		return controllers.Error(ctx, http.StatusInternalServerError, "写入Redis配置失败")
+	}
+
+	return c.Restart(ctx)
+}
+
+// Load 获取负载
+func (c *RedisController) Load(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "redis")
+	if check != nil {
+		return check
+	}
+
+	status := tools.Exec("systemctl status redis | grep Active | grep -v grep | awk '{print $2}'")
+	if status != "active" {
+		return controllers.Error(ctx, http.StatusInternalServerError, "Redis 已停止运行")
+	}
+
+	raw := tools.Exec("redis-cli info")
+	if len(raw) == 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取Redis负载失败")
+	}
+
+	infoLines := strings.Split(raw, "\n")
+	dataRaw := make(map[string]string)
+
+	for _, item := range infoLines {
+		parts := strings.Split(item, ":")
+		if len(parts) == 2 {
+			dataRaw[strings.TrimSpace(parts[0])] = strings.TrimSpace(parts[1])
+		}
+	}
+
+	data := []Info{
+		{"TCP 端口", dataRaw["tcp_port"]},
+		{"已运行天数", dataRaw["uptime_in_days"]},
+		{"连接的客户端数", dataRaw["connected_clients"]},
+		{"已分配的内存总量", dataRaw["used_memory_human"]},
+		{"占用内存总量", dataRaw["used_memory_rss_human"]},
+		{"占用内存峰值", dataRaw["used_memory_peak_human"]},
+		{"内存碎片比率", dataRaw["mem_fragmentation_ratio"]},
+		{"运行以来连接过的客户端的总数", dataRaw["total_connections_received"]},
+		{"运行以来执行过的命令的总数", dataRaw["total_commands_processed"]},
+		{"每秒执行的命令数", dataRaw["instantaneous_ops_per_sec"]},
+		{"查找数据库键成功次数", dataRaw["keyspace_hits"]},
+		{"查找数据库键失败次数", dataRaw["keyspace_misses"]},
+		{"最近一次 fork() 操作耗费的毫秒数", dataRaw["latest_fork_usec"]},
+	}
+
+	return controllers.Success(ctx, data)
+}

app/http/controllers/plugins/s3fs/s3fs_controller.go

@@ -31,9 +31,10 @@ func NewS3fsController() *S3fsController {
 }
 
 // List 所有 S3fs 挂载
-func (c *S3fsController) List(ctx http.Context) {
-	if !controllers.Check(ctx, "s3fs") {
-		return
+func (c *S3fsController) List(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "s3fs")
+	if check != nil {
+		return check
 	}
 
 	page := ctx.Request().QueryInt("page", 1)
@@ -42,34 +43,33 @@ func (c *S3fsController) List(ctx http.Context) {
 	var s3fsList []s3fs
 	err := sonic.UnmarshalString(c.setting.Get("s3fs", "[]"), &s3fsList)
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, "获取 S3fs 挂载失败")
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, "获取 S3fs 挂载失败")
 	}
 
 	startIndex := (page - 1) * limit
 	endIndex := page * limit
 	if startIndex > len(s3fsList) {
-		controllers.Success(ctx, http.Json{
+		return controllers.Success(ctx, http.Json{
 			"total": 0,
 			"items": []s3fs{},
 		})
-		return
 	}
 	if endIndex > len(s3fsList) {
 		endIndex = len(s3fsList)
 	}
 	pagedS3fsList := s3fsList[startIndex:endIndex]
 
-	controllers.Success(ctx, http.Json{
+	return controllers.Success(ctx, http.Json{
 		"total": len(s3fsList),
 		"items": pagedS3fsList,
 	})
 }
 
 // Add 添加 S3fs 挂载
-func (c *S3fsController) Add(ctx http.Context) {
-	if !controllers.Check(ctx, "s3fs") {
-		return
+func (c *S3fsController) Add(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "s3fs")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
@@ -80,12 +80,10 @@ func (c *S3fsController) Add(ctx http.Context) {
 		"path":   "required|regex:^/[a-zA-Z0-9_-]+$",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusUnprocessableEntity, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusUnprocessableEntity, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusUnprocessableEntity, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusUnprocessableEntity, validator.Errors().One())
 	}
 
 	ak := ctx.Request().Input("ak")
@@ -96,8 +94,7 @@ func (c *S3fsController) Add(ctx http.Context) {
 
 	// 检查下地域节点中是否包含bucket，如果包含了，肯定是错误的
 	if strings.Contains(url, bucket) {
-		controllers.Error(ctx, http.StatusUnprocessableEntity, "地域节点不能包含 Bucket 名称")
-		return
+		return controllers.Error(ctx, http.StatusUnprocessableEntity, "地域节点不能包含 Bucket 名称")
 	}
 
 	// 检查挂载目录是否存在且为空
@@ -105,39 +102,34 @@ func (c *S3fsController) Add(ctx http.Context) {
 		tools.Mkdir(path, 0755)
 	}
 	if !tools.Empty(path) {
-		controllers.Error(ctx, http.StatusUnprocessableEntity, "挂载目录必须为空")
-		return
+		return controllers.Error(ctx, http.StatusUnprocessableEntity, "挂载目录必须为空")
 	}
 
 	var s3fsList []s3fs
 	err = sonic.UnmarshalString(c.setting.Get("s3fs", "[]"), &s3fsList)
 	if err != nil {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取 S3fs 挂载失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取 S3fs 挂载失败")
 	}
 
 	for _, s := range s3fsList {
 		if s.Path == path {
-			controllers.Error(ctx, http.StatusUnprocessableEntity, "路径已存在")
-			return
+			return controllers.Error(ctx, http.StatusUnprocessableEntity, "路径已存在")
 		}
 	}
 
 	id := carbon.Now().TimestampMilli()
 	password := ak + ":" + sk
-	tools.WriteFile("/etc/passwd-s3fs-"+cast.ToString(id), password, 0600)
-	tools.ExecShell(`echo 's3fs#` + bucket + ` ` + path + ` fuse _netdev,allow_other,nonempty,url=` + url + `,passwd_file=/etc/passwd-s3fs-` + cast.ToString(id) + ` 0 0' >> /etc/fstab`)
-	check := tools.ExecShell("mount -a 2>&1")
-	if len(check) != 0 {
-		tools.ExecShell(`sed -i 's@^s3fs#` + bucket + `\s` + path + `.*$@@g' /etc/fstab`)
-		controllers.Error(ctx, http.StatusInternalServerError, "检测到/etc/fstab有误: "+check)
-		return
+	tools.Write("/etc/passwd-s3fs-"+cast.ToString(id), password, 0600)
+	tools.Exec(`echo 's3fs#` + bucket + ` ` + path + ` fuse _netdev,allow_other,nonempty,url=` + url + `,passwd_file=/etc/passwd-s3fs-` + cast.ToString(id) + ` 0 0' >> /etc/fstab`)
+	mountCheck := tools.Exec("mount -a 2>&1")
+	if len(mountCheck) != 0 {
+		tools.Exec(`sed -i 's@^s3fs#` + bucket + `\s` + path + `.*$@@g' /etc/fstab`)
+		return controllers.Error(ctx, http.StatusInternalServerError, "检测到/etc/fstab有误: "+mountCheck)
 	}
-	check2 := tools.ExecShell("df -h | grep " + path + " 2>&1")
-	if len(check2) == 0 {
-		tools.ExecShell(`sed -i 's@^s3fs#` + bucket + `\s` + path + `.*$@@g' /etc/fstab`)
-		controllers.Error(ctx, http.StatusInternalServerError, "挂载失败，请检查配置是否正确")
-		return
+	dfCheck := tools.Exec("df -h | grep " + path + " 2>&1")
+	if len(dfCheck) == 0 {
+		tools.Exec(`sed -i 's@^s3fs#` + bucket + `\s` + path + `.*$@@g' /etc/fstab`)
+		return controllers.Error(ctx, http.StatusInternalServerError, "挂载失败，请检查配置是否正确")
 	}
 
 	s3fsList = append(s3fsList, s3fs{
@@ -148,35 +140,32 @@ func (c *S3fsController) Add(ctx http.Context) {
 	})
 	json, err := sonic.MarshalString(s3fsList)
 	if err != nil {
-		controllers.Error(ctx, http.StatusInternalServerError, "添加 S3fs 挂载失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "添加 S3fs 挂载失败")
 	}
 	err = c.setting.Set("s3fs", json)
 	if err != nil {
-		controllers.Error(ctx, http.StatusInternalServerError, "添加 S3fs 挂载失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "添加 S3fs 挂载失败")
 	}
 
-	controllers.Success(ctx, nil)
+	return controllers.Success(ctx, nil)
 }
 
 // Delete 删除 S3fs 挂载
-func (c *S3fsController) Delete(ctx http.Context) {
-	if !controllers.Check(ctx, "s3fs") {
-		return
+func (c *S3fsController) Delete(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "s3fs")
+	if check != nil {
+		return check
 	}
 
 	id := ctx.Request().Input("id")
 	if len(id) == 0 {
-		controllers.Error(ctx, http.StatusUnprocessableEntity, "挂载ID不能为空")
-		return
+		return controllers.Error(ctx, http.StatusUnprocessableEntity, "挂载ID不能为空")
 	}
 
 	var s3fsList []s3fs
 	err := sonic.UnmarshalString(c.setting.Get("s3fs", "[]"), &s3fsList)
 	if err != nil {
-		controllers.Error(ctx, http.StatusInternalServerError, "获取 S3fs 挂载失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "获取 S3fs 挂载失败")
 	}
 
 	var mount s3fs
@@ -187,19 +176,17 @@ func (c *S3fsController) Delete(ctx http.Context) {
 		}
 	}
 	if mount.ID == 0 {
-		controllers.Error(ctx, http.StatusUnprocessableEntity, "挂载ID不存在")
-		return
+		return controllers.Error(ctx, http.StatusUnprocessableEntity, "挂载ID不存在")
 	}
 
-	tools.ExecShell(`fusermount -u '` + mount.Path + `' 2>&1`)
-	tools.ExecShell(`umount '` + mount.Path + `' 2>&1`)
-	tools.ExecShell(`sed -i 's@^s3fs#` + mount.Bucket + `\s` + mount.Path + `.*$@@g' /etc/fstab`)
-	check := tools.ExecShell("mount -a 2>&1")
-	if len(check) != 0 {
-		controllers.Error(ctx, http.StatusInternalServerError, "检测到/etc/fstab有误: "+check)
-		return
+	tools.Exec(`fusermount -u '` + mount.Path + `' 2>&1`)
+	tools.Exec(`umount '` + mount.Path + `' 2>&1`)
+	tools.Exec(`sed -i 's@^s3fs#` + mount.Bucket + `\s` + mount.Path + `.*$@@g' /etc/fstab`)
+	mountCheck := tools.Exec("mount -a 2>&1")
+	if len(mountCheck) != 0 {
+		return controllers.Error(ctx, http.StatusInternalServerError, "检测到/etc/fstab有误: "+mountCheck)
 	}
-	tools.RemoveFile("/etc/passwd-s3fs-" + cast.ToString(mount.ID))
+	tools.Remove("/etc/passwd-s3fs-" + cast.ToString(mount.ID))
 
 	var newS3fsList []s3fs
 	for _, s := range s3fsList {
@@ -209,14 +196,12 @@ func (c *S3fsController) Delete(ctx http.Context) {
 	}
 	json, err := sonic.MarshalString(newS3fsList)
 	if err != nil {
-		controllers.Error(ctx, http.StatusInternalServerError, "删除 S3fs 挂载失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "删除 S3fs 挂载失败")
 	}
 	err = c.setting.Set("s3fs", json)
 	if err != nil {
-		controllers.Error(ctx, http.StatusInternalServerError, "删除 S3fs 挂载失败")
-		return
+		return controllers.Error(ctx, http.StatusInternalServerError, "删除 S3fs 挂载失败")
 	}
 
-	controllers.Success(ctx, nil)
+	return controllers.Success(ctx, nil)
 }

app/http/controllers/plugins/supervisor/supervisor_controller.go

@@ -28,135 +28,144 @@ func NewSupervisorController() *SupervisorController {
 }
 
 // Status 状态
-func (r *SupervisorController) Status(ctx http.Context) {
-	if !controllers.Check(ctx, "supervisor") {
-		return
+func (c *SupervisorController) Status(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "supervisor")
+	if check != nil {
+		return check
 	}
 
-	status := tools.ExecShell(`systemctl status ` + r.ServiceName + ` | grep Active | grep -v grep | awk '{print $2}'`)
+	status := tools.Exec(`systemctl status ` + c.ServiceName + ` | grep Active | grep -v grep | awk '{print $2}'`)
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
 // Start 启动
-func (r *SupervisorController) Start(ctx http.Context) {
-	if !controllers.Check(ctx, "supervisor") {
-		return
+func (c *SupervisorController) Start(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "supervisor")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell(`systemctl start ` + r.ServiceName)
-	status := tools.ExecShell(`systemctl status ` + r.ServiceName + ` | grep Active | grep -v grep | awk '{print $2}'`)
+	tools.Exec(`systemctl start ` + c.ServiceName)
+	status := tools.Exec(`systemctl status ` + c.ServiceName + ` | grep Active | grep -v grep | awk '{print $2}'`)
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
 // Stop 停止
-func (r *SupervisorController) Stop(ctx http.Context) {
-	if !controllers.Check(ctx, "supervisor") {
-		return
+func (c *SupervisorController) Stop(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "supervisor")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell(`systemctl stop ` + r.ServiceName)
-	status := tools.ExecShell(`systemctl status ` + r.ServiceName + ` | grep Active | grep -v grep | awk '{print $2}'`)
+	tools.Exec(`systemctl stop ` + c.ServiceName)
+	status := tools.Exec(`systemctl status ` + c.ServiceName + ` | grep Active | grep -v grep | awk '{print $2}'`)
 	if status != "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
 // Restart 重启
-func (r *SupervisorController) Restart(ctx http.Context) {
-	if !controllers.Check(ctx, "supervisor") {
-		return
+func (c *SupervisorController) Restart(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "supervisor")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell(`systemctl restart ` + r.ServiceName)
-	status := tools.ExecShell(`systemctl status ` + r.ServiceName + ` | grep Active | grep -v grep | awk '{print $2}'`)
+	tools.Exec(`systemctl restart ` + c.ServiceName)
+	status := tools.Exec(`systemctl status ` + c.ServiceName + ` | grep Active | grep -v grep | awk '{print $2}'`)
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
 // Reload 重载
-func (r *SupervisorController) Reload(ctx http.Context) {
-	if !controllers.Check(ctx, "supervisor") {
-		return
+func (c *SupervisorController) Reload(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "supervisor")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell(`systemctl reload ` + r.ServiceName)
-	status := tools.ExecShell(`systemctl status ` + r.ServiceName + ` | grep Active | grep -v grep | awk '{print $2}'`)
+	tools.Exec(`systemctl reload ` + c.ServiceName)
+	status := tools.Exec(`systemctl status ` + c.ServiceName + ` | grep Active | grep -v grep | awk '{print $2}'`)
 	if status == "active" {
-		controllers.Success(ctx, true)
+		return controllers.Success(ctx, true)
 	} else {
-		controllers.Success(ctx, false)
+		return controllers.Success(ctx, false)
 	}
 }
 
 // Log 日志
-func (r *SupervisorController) Log(ctx http.Context) {
-	if !controllers.Check(ctx, "supervisor") {
-		return
+func (c *SupervisorController) Log(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "supervisor")
+	if check != nil {
+		return check
 	}
 
-	log := tools.ExecShell(`tail -n 200 /var/log/supervisor/supervisord.log`)
-	controllers.Success(ctx, log)
+	log := tools.Exec(`tail -n 200 /var/log/supervisor/supervisord.log`)
+	return controllers.Success(ctx, log)
 }
 
 // ClearLog 清空日志
-func (r *SupervisorController) ClearLog(ctx http.Context) {
-	if !controllers.Check(ctx, "supervisor") {
-		return
+func (c *SupervisorController) ClearLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "supervisor")
+	if check != nil {
+		return check
 	}
 
-	tools.ExecShell(`echo "" > /var/log/supervisor/supervisord.log`)
-	controllers.Success(ctx, nil)
+	tools.Exec(`echo "" > /var/log/supervisor/supervisord.log`)
+	return controllers.Success(ctx, nil)
 }
 
 // Config 获取配置
-func (r *SupervisorController) Config(ctx http.Context) {
-	if !controllers.Check(ctx, "supervisor") {
-		return
+func (c *SupervisorController) Config(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "supervisor")
+	if check != nil {
+		return check
 	}
 
 	var config string
 	if tools.IsRHEL() {
-		config = tools.ReadFile(`/etc/supervisord.conf`)
+		config = tools.Read(`/etc/supervisord.conf`)
 	} else {
-		config = tools.ReadFile(`/etc/supervisor/supervisord.conf`)
+		config = tools.Read(`/etc/supervisor/supervisord.conf`)
 	}
-	controllers.Success(ctx, config)
+	return controllers.Success(ctx, config)
 }
 
 // SaveConfig 保存配置
-func (r *SupervisorController) SaveConfig(ctx http.Context) {
-	if !controllers.Check(ctx, "supervisor") {
-		return
+func (c *SupervisorController) SaveConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "supervisor")
+	if check != nil {
+		return check
 	}
 
 	config := ctx.Request().Input("config")
 	if tools.IsRHEL() {
-		tools.WriteFile(`/etc/supervisord.conf`, config, 0644)
+		tools.Write(`/etc/supervisord.conf`, config, 0644)
 	} else {
-		tools.WriteFile(`/etc/supervisor/supervisord.conf`, config, 0644)
+		tools.Write(`/etc/supervisor/supervisord.conf`, config, 0644)
 	}
 
-	tools.ExecShell(`systemctl restart ` + r.ServiceName)
-	controllers.Success(ctx, nil)
+	return c.Restart(ctx)
 }
 
 // Processes 进程列表
-func (r *SupervisorController) Processes(ctx http.Context) {
-	if !controllers.Check(ctx, "supervisor") {
-		return
+func (c *SupervisorController) Processes(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "supervisor")
+	if check != nil {
+		return check
 	}
 
 	page := ctx.Request().QueryInt("page", 1)
@@ -169,7 +178,7 @@ func (r *SupervisorController) Processes(ctx http.Context) {
 		Uptime string `json:"uptime"`
 	}
 
-	out := tools.ExecShell(`supervisorctl status | awk '{print $1}'`)
+	out := tools.Exec(`supervisorctl status | awk '{print $1}'`)
 	var processList []process
 	for _, line := range strings.Split(out, "\n") {
 		if len(line) == 0 {
@@ -178,10 +187,10 @@ func (r *SupervisorController) Processes(ctx http.Context) {
 
 		var p process
 		p.Name = line
-		p.Status = tools.ExecShell(`supervisorctl status ` + line + ` | awk '{print $2}'`)
+		p.Status = tools.Exec(`supervisorctl status ` + line + ` | awk '{print $2}'`)
 		if p.Status == "RUNNING" {
-			p.Pid = strings.ReplaceAll(tools.ExecShell(`supervisorctl status `+line+` | awk '{print $4}'`), ",", "")
-			p.Uptime = tools.ExecShell(`supervisorctl status ` + line + ` | awk '{print $6}'`)
+			p.Pid = strings.ReplaceAll(tools.Exec(`supervisorctl status `+line+` | awk '{print $4}'`), ",", "")
+			p.Uptime = tools.Exec(`supervisorctl status ` + line + ` | awk '{print $6}'`)
 		} else {
 			p.Pid = "-"
 			p.Uptime = "-"
@@ -192,133 +201,140 @@ func (r *SupervisorController) Processes(ctx http.Context) {
 	startIndex := (page - 1) * limit
 	endIndex := page * limit
 	if startIndex > len(processList) {
-		controllers.Success(ctx, http.Json{
+		return controllers.Success(ctx, http.Json{
 			"total": 0,
 			"items": []process{},
 		})
-		return
 	}
 	if endIndex > len(processList) {
 		endIndex = len(processList)
 	}
 	pagedProcessList := processList[startIndex:endIndex]
 
-	controllers.Success(ctx, http.Json{
+	return controllers.Success(ctx, http.Json{
 		"total": len(processList),
 		"items": pagedProcessList,
 	})
 }
 
 // StartProcess 启动进程
-func (r *SupervisorController) StartProcess(ctx http.Context) {
-	if !controllers.Check(ctx, "supervisor") {
-		return
+func (c *SupervisorController) StartProcess(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "supervisor")
+	if check != nil {
+		return check
 	}
 
 	process := ctx.Request().Input("process")
-	tools.ExecShell(`supervisorctl start ` + process)
-	controllers.Success(ctx, nil)
+	tools.Exec(`supervisorctl start ` + process)
+	return controllers.Success(ctx, nil)
 }
 
 // StopProcess 停止进程
-func (r *SupervisorController) StopProcess(ctx http.Context) {
-	if !controllers.Check(ctx, "supervisor") {
-		return
+func (c *SupervisorController) StopProcess(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "supervisor")
+	if check != nil {
+		return check
 	}
 
 	process := ctx.Request().Input("process")
-	tools.ExecShell(`supervisorctl stop ` + process)
-	controllers.Success(ctx, nil)
+	tools.Exec(`supervisorctl stop ` + process)
+	return controllers.Success(ctx, nil)
 }
 
 // RestartProcess 重启进程
-func (r *SupervisorController) RestartProcess(ctx http.Context) {
-	if !controllers.Check(ctx, "supervisor") {
-		return
+func (c *SupervisorController) RestartProcess(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "supervisor")
+	if check != nil {
+		return check
 	}
 
 	process := ctx.Request().Input("process")
-	tools.ExecShell(`supervisorctl restart ` + process)
-	controllers.Success(ctx, nil)
+	tools.Exec(`supervisorctl restart ` + process)
+	return controllers.Success(ctx, nil)
 }
 
 // ProcessLog 进程日志
-func (r *SupervisorController) ProcessLog(ctx http.Context) {
-	if !controllers.Check(ctx, "supervisor") {
-		return
+func (c *SupervisorController) ProcessLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "supervisor")
+	if check != nil {
+		return check
 	}
 
 	process := ctx.Request().Input("process")
 	var logPath string
 	if tools.IsRHEL() {
-		logPath = tools.ExecShell(`cat '/etc/supervisord.d/` + process + `.conf' | grep stdout_logfile= | awk -F "=" '{print $2}'`)
+		logPath = tools.Exec(`cat '/etc/supervisord.d/` + process + `.conf' | grep stdout_logfile= | awk -F "=" '{print $2}'`)
 	} else {
-		logPath = tools.ExecShell(`cat '/etc/supervisor/conf.d/` + process + `.conf' | grep stdout_logfile= | awk -F "=" '{print $2}'`)
+		logPath = tools.Exec(`cat '/etc/supervisor/conf.d/` + process + `.conf' | grep stdout_logfile= | awk -F "=" '{print $2}'`)
 	}
 
-	log := tools.ExecShell(`tail -n 200 ` + logPath)
-	controllers.Success(ctx, log)
+	log := tools.Exec(`tail -n 200 ` + logPath)
+	return controllers.Success(ctx, log)
 }
 
 // ClearProcessLog 清空进程日志
-func (r *SupervisorController) ClearProcessLog(ctx http.Context) {
-	if !controllers.Check(ctx, "supervisor") {
-		return
+func (c *SupervisorController) ClearProcessLog(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "supervisor")
+	if check != nil {
+		return check
 	}
 
 	process := ctx.Request().Input("process")
 	var logPath string
 	if tools.IsRHEL() {
-		logPath = tools.ExecShell(`cat '/etc/supervisord.d/` + process + `.conf' | grep stdout_logfile= | awk -F "=" '{print $2}'`)
+		logPath = tools.Exec(`cat '/etc/supervisord.d/` + process + `.conf' | grep stdout_logfile= | awk -F "=" '{print $2}'`)
 	} else {
-		logPath = tools.ExecShell(`cat '/etc/supervisor/conf.d/` + process + `.conf' | grep stdout_logfile= | awk -F "=" '{print $2}'`)
+		logPath = tools.Exec(`cat '/etc/supervisor/conf.d/` + process + `.conf' | grep stdout_logfile= | awk -F "=" '{print $2}'`)
 	}
 
-	tools.ExecShell(`echo "" > ` + logPath)
-	controllers.Success(ctx, nil)
+	tools.Exec(`echo "" > ` + logPath)
+	return controllers.Success(ctx, nil)
 }
 
 // ProcessConfig 获取进程配置
-func (r *SupervisorController) ProcessConfig(ctx http.Context) {
-	if !controllers.Check(ctx, "supervisor") {
-		return
+func (c *SupervisorController) ProcessConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "supervisor")
+	if check != nil {
+		return check
 	}
 
 	process := ctx.Request().Query("process")
 	var config string
 	if tools.IsRHEL() {
-		config = tools.ReadFile(`/etc/supervisord.d/` + process + `.conf`)
+		config = tools.Read(`/etc/supervisord.d/` + process + `.conf`)
 	} else {
-		config = tools.ReadFile(`/etc/supervisor/conf.d/` + process + `.conf`)
+		config = tools.Read(`/etc/supervisor/conf.d/` + process + `.conf`)
 	}
 
-	controllers.Success(ctx, config)
+	return controllers.Success(ctx, config)
 }
 
 // SaveProcessConfig 保存进程配置
-func (r *SupervisorController) SaveProcessConfig(ctx http.Context) {
-	if !controllers.Check(ctx, "supervisor") {
-		return
+func (c *SupervisorController) SaveProcessConfig(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "supervisor")
+	if check != nil {
+		return check
 	}
 
 	process := ctx.Request().Input("process")
 	config := ctx.Request().Input("config")
 	if tools.IsRHEL() {
-		tools.WriteFile(`/etc/supervisord.d/`+process+`.conf`, config, 0644)
+		tools.Write(`/etc/supervisord.d/`+process+`.conf`, config, 0644)
 	} else {
-		tools.WriteFile(`/etc/supervisor/conf.d/`+process+`.conf`, config, 0644)
+		tools.Write(`/etc/supervisor/conf.d/`+process+`.conf`, config, 0644)
 	}
-	tools.ExecShell(`supervisorctl reread`)
-	tools.ExecShell(`supervisorctl update`)
-	tools.ExecShell(`supervisorctl start ` + process)
+	tools.Exec(`supervisorctl reread`)
+	tools.Exec(`supervisorctl update`)
+	tools.Exec(`supervisorctl start ` + process)
 
-	controllers.Success(ctx, nil)
+	return controllers.Success(ctx, nil)
 }
 
 // AddProcess 添加进程
-func (r *SupervisorController) AddProcess(ctx http.Context) {
-	if !controllers.Check(ctx, "supervisor") {
-		return
+func (c *SupervisorController) AddProcess(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "supervisor")
+	if check != nil {
+		return check
 	}
 
 	validator, err := ctx.Request().Validate(map[string]string{
@@ -329,12 +345,10 @@ func (r *SupervisorController) AddProcess(ctx http.Context) {
 		"num":     "required",
 	})
 	if err != nil {
-		controllers.Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return controllers.Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	name := ctx.Request().Input("name")
@@ -355,36 +369,37 @@ stdout_logfile=/var/log/supervisor/` + name + `.log
 stdout_logfile_maxbytes=2MB
 `
 	if tools.IsRHEL() {
-		tools.WriteFile(`/etc/supervisord.d/`+name+`.conf`, config, 0644)
+		tools.Write(`/etc/supervisord.d/`+name+`.conf`, config, 0644)
 	} else {
-		tools.WriteFile(`/etc/supervisor/conf.d/`+name+`.conf`, config, 0644)
+		tools.Write(`/etc/supervisor/conf.d/`+name+`.conf`, config, 0644)
 	}
-	tools.ExecShell(`supervisorctl reread`)
-	tools.ExecShell(`supervisorctl update`)
-	tools.ExecShell(`supervisorctl start ` + name)
+	tools.Exec(`supervisorctl reread`)
+	tools.Exec(`supervisorctl update`)
+	tools.Exec(`supervisorctl start ` + name)
 
-	controllers.Success(ctx, nil)
+	return controllers.Success(ctx, nil)
 }
 
 // DeleteProcess 删除进程
-func (r *SupervisorController) DeleteProcess(ctx http.Context) {
-	if !controllers.Check(ctx, "supervisor") {
-		return
+func (c *SupervisorController) DeleteProcess(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "supervisor")
+	if check != nil {
+		return check
 	}
 
 	process := ctx.Request().Input("process")
-	tools.ExecShell(`supervisorctl stop ` + process)
+	tools.Exec(`supervisorctl stop ` + process)
 	var logPath string
 	if tools.IsRHEL() {
-		logPath = tools.ExecShell(`cat '/etc/supervisord.d/` + process + `.conf' | grep stdout_logfile= | awk -F "=" '{print $2}'`)
-		tools.RemoveFile(`/etc/supervisord.d/` + process + `.conf`)
+		logPath = tools.Exec(`cat '/etc/supervisord.d/` + process + `.conf' | grep stdout_logfile= | awk -F "=" '{print $2}'`)
+		tools.Remove(`/etc/supervisord.d/` + process + `.conf`)
 	} else {
-		logPath = tools.ExecShell(`cat '/etc/supervisor/conf.d/` + process + `.conf' | grep stdout_logfile= | awk -F "=" '{print $2}'`)
-		tools.RemoveFile(`/etc/supervisor/conf.d/` + process + `.conf`)
+		logPath = tools.Exec(`cat '/etc/supervisor/conf.d/` + process + `.conf' | grep stdout_logfile= | awk -F "=" '{print $2}'`)
+		tools.Remove(`/etc/supervisor/conf.d/` + process + `.conf`)
 	}
-	tools.RemoveFile(logPath)
-	tools.ExecShell(`supervisorctl reread`)
-	tools.ExecShell(`supervisorctl update`)
+	tools.Remove(logPath)
+	tools.Exec(`supervisorctl reread`)
+	tools.Exec(`supervisorctl update`)
 
-	controllers.Success(ctx, nil)
+	return controllers.Success(ctx, nil)
 }

app/http/controllers/plugins/toolbox/toolbox.go

@@ -0,0 +1,217 @@
+package toolbox
+
+import (
+	"regexp"
+	"strconv"
+	"strings"
+
+	"github.com/goravel/framework/contracts/http"
+	"github.com/spf13/cast"
+
+	"panel/app/http/controllers"
+	"panel/pkg/tools"
+)
+
+type ToolBoxController struct {
+}
+
+func NewToolBoxController() *ToolBoxController {
+	return &ToolBoxController{}
+}
+
+// GetDNS 获取 DNS 信息
+func (c *ToolBoxController) GetDNS(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "toolbox")
+	if check != nil {
+		return check
+	}
+
+	raw := tools.Read("/etc/resolv.conf")
+	match := regexp.MustCompile(`nameserver\s+(\S+)`).FindAllStringSubmatch(raw, -1)
+	if len(match) == 0 {
+		return controllers.Error(ctx, http.StatusBadRequest, "找不到 DNS 信息")
+	}
+
+	var dns []string
+	for _, m := range match {
+		dns = append(dns, m[1])
+	}
+
+	return controllers.Success(ctx, dns)
+}
+
+// SetDNS 设置 DNS 信息
+func (c *ToolBoxController) SetDNS(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "toolbox")
+	if check != nil {
+		return check
+	}
+
+	dns1 := ctx.Request().Input("dns1")
+	dns2 := ctx.Request().Input("dns2")
+
+	if len(dns1) == 0 || len(dns2) == 0 {
+		return controllers.Error(ctx, http.StatusBadRequest, "DNS 信息不能为空")
+	}
+
+	var dns string
+	dns += "nameserver " + dns1 + "\n"
+	dns += "nameserver " + dns2 + "\n"
+
+	tools.Write("/etc/resolv.conf", dns, 0644)
+	return controllers.Success(ctx, nil)
+}
+
+// GetSWAP 获取 SWAP 信息
+func (c *ToolBoxController) GetSWAP(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "toolbox")
+	if check != nil {
+		return check
+	}
+
+	var total, size, used, free string
+	if tools.Exists("/www/swap") {
+		s, _ := tools.FileSize("/www/swap")
+		size = strconv.Itoa(int(s / 1024 / 1024))
+		total = tools.FormatBytes(float64(s))
+	} else {
+		size = "0.00 B"
+		total = "0.00 B"
+	}
+
+	raw := tools.Exec("LC_ALL=C free | grep Swap")
+	match := regexp.MustCompile(`Swap:\s+(\d+)\s+(\d+)\s+(\d+)`).FindStringSubmatch(raw)
+	if len(match) > 0 {
+		used = tools.FormatBytes(cast.ToFloat64(match[2]) * 1024)
+		free = tools.FormatBytes(cast.ToFloat64(match[3]) * 1024)
+	}
+
+	return controllers.Success(ctx, http.Json{
+		"total": total,
+		"size":  size,
+		"used":  used,
+		"free":  free,
+	})
+}
+
+// SetSWAP 设置 SWAP 信息
+func (c *ToolBoxController) SetSWAP(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "toolbox")
+	if check != nil {
+		return check
+	}
+
+	size := ctx.Request().InputInt("size")
+
+	if tools.Exists("/www/swap") {
+		tools.Exec("swapoff /www/swap")
+		tools.Exec("rm -f /www/swap")
+		tools.Exec("sed -i '/www\\/swap/d' /etc/fstab")
+	}
+
+	if size > 1 {
+		free := tools.Exec("df -k /www | awk '{print $4}' | tail -n 1")
+		if cast.ToInt64(free)*1024 < int64(size)*1024*1024 {
+			return controllers.Error(ctx, http.StatusBadRequest, "磁盘空间不足，当前剩余 "+tools.FormatBytes(cast.ToFloat64(free)))
+		}
+
+		if strings.Contains(tools.Exec("df -T /www | awk '{print $2}' | tail -n 1"), "btrfs") {
+			tools.Exec("btrfs filesystem mkswapfile --size " + cast.ToString(size) + "M --uuid clear /www/swap")
+		} else {
+			tools.Exec("dd if=/dev/zero of=/www/swap bs=1M count=" + cast.ToString(size))
+			tools.Exec("mkswap -f /www/swap")
+			tools.Chmod("/www/swap", 0600)
+		}
+		tools.Exec("swapon /www/swap")
+		tools.Exec("echo '/www/swap    swap    swap    defaults    0 0' >> /etc/fstab")
+	}
+
+	return controllers.Success(ctx, nil)
+}
+
+// GetTimezone 获取时区
+func (c *ToolBoxController) GetTimezone(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "toolbox")
+	if check != nil {
+		return check
+	}
+
+	raw := tools.Exec("LC_ALL=C timedatectl | grep zone")
+	match := regexp.MustCompile(`zone:\s+(\S+)`).FindStringSubmatch(raw)
+	if len(match) == 0 {
+		return controllers.Error(ctx, http.StatusBadRequest, "找不到时区信息")
+	}
+
+	zonesRaw := tools.Exec("LC_ALL=C timedatectl list-timezones")
+	zones := strings.Split(zonesRaw, "\n")
+
+	return controllers.Success(ctx, http.Json{
+		"zone":  match[1],
+		"zones": zones,
+	})
+}
+
+// SetTimezone 设置时区
+func (c *ToolBoxController) SetTimezone(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "toolbox")
+	if check != nil {
+		return check
+	}
+
+	timezone := ctx.Request().Input("timezone")
+	if len(timezone) == 0 {
+		return controllers.Error(ctx, http.StatusBadRequest, "时区不能为空")
+	}
+
+	tools.Exec("timedatectl set-timezone " + timezone)
+
+	return controllers.Success(ctx, nil)
+}
+
+// GetHosts 获取 hosts 信息
+func (c *ToolBoxController) GetHosts(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "toolbox")
+	if check != nil {
+		return check
+	}
+
+	return controllers.Success(ctx, tools.Read("/etc/hosts"))
+}
+
+// SetHosts 设置 hosts 信息
+func (c *ToolBoxController) SetHosts(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "toolbox")
+	if check != nil {
+		return check
+	}
+
+	hosts := ctx.Request().Input("hosts")
+	if len(hosts) == 0 {
+		return controllers.Error(ctx, http.StatusBadRequest, "hosts 信息不能为空")
+	}
+
+	tools.Write("/etc/hosts", hosts, 0644)
+
+	return controllers.Success(ctx, nil)
+}
+
+// SetRootPassword 设置 root 密码
+func (c *ToolBoxController) SetRootPassword(ctx http.Context) http.Response {
+	check := controllers.Check(ctx, "toolbox")
+	if check != nil {
+		return check
+	}
+
+	password := ctx.Request().Input("password")
+	if len(password) == 0 {
+		return controllers.Error(ctx, http.StatusBadRequest, "密码不能为空")
+	}
+	if !regexp.MustCompile(`^[a-zA-Z0-9·~!@#$%^&*()_+-=\[\]{};:'",./<>?]{6,20}$`).MatchString(password) {
+		return controllers.Error(ctx, http.StatusBadRequest, "密码必须为 6-20 位字母、数字或特殊字符")
+	}
+
+	password = strings.ReplaceAll(password, `'`, `\'`)
+	tools.Exec(`yes '` + password + `' | passwd root`)
+
+	return controllers.Success(ctx, nil)
+}

app/http/controllers/safe_controller.go

@@ -20,41 +20,47 @@ func NewSafeController() *SafeController {
 	}
 }
 
-func (r *SafeController) GetFirewallStatus(ctx http.Context) {
-	Success(ctx, r.firewallStatus())
+// GetFirewallStatus 获取防火墙状态
+func (r *SafeController) GetFirewallStatus(ctx http.Context) http.Response {
+	return Success(ctx, r.firewallStatus())
 }
 
-func (r *SafeController) SetFirewallStatus(ctx http.Context) {
+// SetFirewallStatus 设置防火墙状态
+func (r *SafeController) SetFirewallStatus(ctx http.Context) http.Response {
 	var out string
 	if ctx.Request().InputBool("status") {
 		if tools.IsRHEL() {
-			out = tools.ExecShell("systemctl start firewalld")
+			out = tools.Exec("systemctl start firewalld")
 		} else {
-			out = tools.ExecShell("echo y | ufw enable")
+			out = tools.Exec("echo y | ufw enable")
 		}
 	} else {
 		if tools.IsRHEL() {
-			out = tools.ExecShell("systemctl stop firewalld")
+			out = tools.Exec("systemctl stop firewalld")
 		} else {
-			out = tools.ExecShell("ufw disable")
+			out = tools.Exec("ufw disable")
 		}
 	}
 
-	Success(ctx, out)
+	return Success(ctx, out)
 }
 
-func (r *SafeController) GetFirewallRules(ctx http.Context) {
+// GetFirewallRules 获取防火墙规则
+func (r *SafeController) GetFirewallRules(ctx http.Context) http.Response {
 	if !r.firewallStatus() {
-		Success(ctx, nil)
-		return
+		return Success(ctx, nil)
 	}
+	page := ctx.Request().QueryInt("page", 1)
+	limit := ctx.Request().QueryInt("limit", 10)
 
 	if tools.IsRHEL() {
-		out := tools.ExecShell("firewall-cmd --list-all 2>&1")
+		out := tools.Exec("firewall-cmd --list-all 2>&1")
 		match := regexp.MustCompile(`ports: (.*)`).FindStringSubmatch(out)
 		if len(match) == 0 {
-			Success(ctx, nil)
-			return
+			return Success(ctx, http.Json{
+				"total": 0,
+				"items": []map[string]string{},
+			})
 		}
 		ports := strings.Split(match[1], " ")
 		var rules []map[string]string
@@ -66,12 +72,30 @@ func (r *SafeController) GetFirewallRules(ctx http.Context) {
 			})
 		}
 
-		Success(ctx, rules)
+		startIndex := (page - 1) * limit
+		endIndex := page * limit
+		if startIndex > len(rules) {
+			return Success(ctx, http.Json{
+				"total": 0,
+				"items": []map[string]string{},
+			})
+		}
+		if endIndex > len(rules) {
+			endIndex = len(rules)
+		}
+		pagedRules := rules[startIndex:endIndex]
+
+		return Success(ctx, http.Json{
+			"total": len(rules),
+			"items": pagedRules,
+		})
 	} else {
-		out := tools.ExecShell("ufw status | grep -v '(v6)' | grep ALLOW | awk '{print $1}'")
+		out := tools.Exec("ufw status | grep -v '(v6)' | grep ALLOW | awk '{print $1}'")
 		if len(out) == 0 {
-			Success(ctx, nil)
-			return
+			return Success(ctx, http.Json{
+				"total": 0,
+				"items": []map[string]string{},
+			})
 		}
 		var rules []map[string]string
 		for _, port := range strings.Split(out, "\n") {
@@ -82,72 +106,105 @@ func (r *SafeController) GetFirewallRules(ctx http.Context) {
 			})
 		}
 
-		Success(ctx, rules)
+		startIndex := (page - 1) * limit
+		endIndex := page * limit
+		if startIndex > len(rules) {
+			return Success(ctx, http.Json{
+				"total": 0,
+				"items": []map[string]string{},
+			})
+		}
+		if endIndex > len(rules) {
+			endIndex = len(rules)
+		}
+		pagedRules := rules[startIndex:endIndex]
+
+		return Success(ctx, http.Json{
+			"total": len(rules),
+			"items": pagedRules,
+		})
 	}
 }
 
-func (r *SafeController) AddFirewallRule(ctx http.Context) {
+// AddFirewallRule 添加防火墙规则
+func (r *SafeController) AddFirewallRule(ctx http.Context) http.Response {
 	if !r.firewallStatus() {
-		Error(ctx, http.StatusBadRequest, "防火墙未启动")
-		return
+		return Error(ctx, http.StatusBadRequest, "防火墙未启动")
+	}
+
+	port := ctx.Request().Input("port")
+	protocol := ctx.Request().Input("protocol")
+	if port == "" || protocol == "" || (protocol != "tcp" && protocol != "udp") {
+		return Error(ctx, http.StatusBadRequest, "参数错误")
+	}
+	// 端口有 2 种写法，一种是 80-443，一种是 80
+	if strings.Contains(port, "-") {
+		ports := strings.Split(port, "-")
+		startPort := cast.ToInt(ports[0])
+		endPort := cast.ToInt(ports[1])
+		if startPort < 1 || startPort > 65535 || endPort < 1 || endPort > 65535 || startPort > endPort {
+			return Error(ctx, http.StatusBadRequest, "参数错误")
+		}
+	} else {
+		port := cast.ToInt(port)
+		if port < 1 || port > 65535 {
+			return Error(ctx, http.StatusBadRequest, "参数错误")
+		}
+	}
+
+	if tools.IsRHEL() {
+		tools.Exec("firewall-cmd --remove-port=" + cast.ToString(port) + "/" + protocol + " --permanent 2>&1")
+		tools.Exec("firewall-cmd --add-port=" + cast.ToString(port) + "/" + protocol + " --permanent 2>&1")
+		tools.Exec("firewall-cmd --reload")
+	} else {
+		// ufw 需要替换 - 为 : 添加
+		if strings.Contains(port, "-") {
+			port = strings.ReplaceAll(port, "-", ":")
+		}
+		tools.Exec("ufw delete allow " + cast.ToString(port) + "/" + protocol)
+		tools.Exec("ufw allow " + cast.ToString(port) + "/" + protocol)
+		tools.Exec("ufw reload")
+	}
+
+	return Success(ctx, nil)
+}
+
+// DeleteFirewallRule 删除防火墙规则
+func (r *SafeController) DeleteFirewallRule(ctx http.Context) http.Response {
+	if !r.firewallStatus() {
+		return Error(ctx, http.StatusBadRequest, "防火墙未启动")
 	}
 
 	port := ctx.Request().InputInt("port", 0)
 	protocol := ctx.Request().Input("protocol", "")
 	if port == 0 || protocol == "" {
-		Error(ctx, http.StatusBadRequest, "参数错误")
-		return
+		return Error(ctx, http.StatusBadRequest, "参数错误")
 	}
 
 	if tools.IsRHEL() {
-		tools.ExecShell("firewall-cmd --remove-port=" + cast.ToString(port) + "/" + protocol + " --permanent 2>&1")
-		tools.ExecShell("firewall-cmd --add-port=" + cast.ToString(port) + "/" + protocol + " --permanent 2>&1")
-		tools.ExecShell("firewall-cmd --reload")
+		tools.Exec("firewall-cmd --remove-port=" + cast.ToString(port) + "/" + protocol + " --permanent 2>&1")
+		tools.Exec("firewall-cmd --reload")
 	} else {
-		tools.ExecShell("ufw delete allow " + cast.ToString(port) + "/" + protocol)
-		tools.ExecShell("ufw allow " + cast.ToString(port) + "/" + protocol)
-		tools.ExecShell("ufw reload")
+		tools.Exec("ufw delete allow " + cast.ToString(port) + "/" + protocol)
+		tools.Exec("ufw reload")
 	}
 
-	Success(ctx, nil)
-}
-
-func (r *SafeController) DeleteFirewallRule(ctx http.Context) {
-	if !r.firewallStatus() {
-		Error(ctx, http.StatusBadRequest, "防火墙未启动")
-		return
-	}
-
-	port := ctx.Request().InputInt("port", 0)
-	protocol := ctx.Request().Input("protocol", "")
-	if port == 0 || protocol == "" {
-		Error(ctx, http.StatusBadRequest, "参数错误")
-		return
-	}
-
-	if tools.IsRHEL() {
-		tools.ExecShell("firewall-cmd --remove-port=" + cast.ToString(port) + "/" + protocol + " --permanent 2>&1")
-		tools.ExecShell("firewall-cmd --reload")
-	} else {
-		tools.ExecShell("ufw delete allow " + cast.ToString(port) + "/" + protocol)
-		tools.ExecShell("ufw reload")
-	}
-
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }
 
+// firewallStatus 获取防火墙状态
 func (r *SafeController) firewallStatus() bool {
 	var out string
 	var running bool
 	if tools.IsRHEL() {
-		out = tools.ExecShell("systemctl status firewalld | grep Active | awk '{print $3}'")
+		out = tools.Exec("systemctl status firewalld | grep Active | awk '{print $3}'")
 		if out == "(running)" {
 			running = true
 		} else {
 			running = false
 		}
 	} else {
-		out = tools.ExecShell("ufw status | grep Status | awk '{print $2}'")
+		out = tools.Exec("ufw status | grep Status | awk '{print $2}'")
 		if out == "active" {
 			running = true
 		} else {
@@ -158,12 +215,13 @@ func (r *SafeController) firewallStatus() bool {
 	return running
 }
 
-func (r *SafeController) GetSshStatus(ctx http.Context) {
+// GetSshStatus 获取 SSH 状态
+func (r *SafeController) GetSshStatus(ctx http.Context) http.Response {
 	var out string
 	if tools.IsRHEL() {
-		out = tools.ExecShell("systemctl status sshd | grep Active | awk '{print $3}'")
+		out = tools.Exec("systemctl status sshd | grep Active | awk '{print $3}'")
 	} else {
-		out = tools.ExecShell("systemctl status ssh | grep Active | awk '{print $3}'")
+		out = tools.Exec("systemctl status ssh | grep Active | awk '{print $3}'")
 	}
 
 	running := false
@@ -171,88 +229,92 @@ func (r *SafeController) GetSshStatus(ctx http.Context) {
 		running = true
 	}
 
-	Success(ctx, running)
+	return Success(ctx, running)
 }
 
-func (r *SafeController) SetSshStatus(ctx http.Context) {
+// SetSshStatus 设置 SSH 状态
+func (r *SafeController) SetSshStatus(ctx http.Context) http.Response {
 	if ctx.Request().InputBool("status") {
 		if tools.IsRHEL() {
-			tools.ExecShell("systemctl enable sshd")
-			tools.ExecShell("systemctl start sshd")
+			tools.Exec("systemctl enable sshd")
+			tools.Exec("systemctl start sshd")
 		} else {
-			tools.ExecShell("systemctl enable ssh")
-			tools.ExecShell("systemctl start ssh")
+			tools.Exec("systemctl enable ssh")
+			tools.Exec("systemctl start ssh")
 		}
 	} else {
 		if tools.IsRHEL() {
-			tools.ExecShell("systemctl stop sshd")
-			tools.ExecShell("systemctl disable sshd")
+			tools.Exec("systemctl stop sshd")
+			tools.Exec("systemctl disable sshd")
 		} else {
-			tools.ExecShell("systemctl stop ssh")
-			tools.ExecShell("systemctl disable ssh")
+			tools.Exec("systemctl stop ssh")
+			tools.Exec("systemctl disable ssh")
 		}
 	}
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }
 
-func (r *SafeController) GetSshPort(ctx http.Context) {
-	out := tools.ExecShell("cat /etc/ssh/sshd_config | grep 'Port ' | awk '{print $2}'")
-	Success(ctx, out)
+// GetSshPort 获取 SSH 端口
+func (r *SafeController) GetSshPort(ctx http.Context) http.Response {
+	out := tools.Exec("cat /etc/ssh/sshd_config | grep 'Port ' | awk '{print $2}'")
+	return Success(ctx, out)
 }
 
-func (r *SafeController) SetSshPort(ctx http.Context) {
+// SetSshPort 设置 SSH 端口
+func (r *SafeController) SetSshPort(ctx http.Context) http.Response {
 	port := ctx.Request().InputInt("port", 0)
 	if port == 0 {
-		Error(ctx, http.StatusBadRequest, "参数错误")
-		return
+		return Error(ctx, http.StatusBadRequest, "参数错误")
 	}
 
-	oldPort := tools.ExecShell("cat /etc/ssh/sshd_config | grep 'Port ' | awk '{print $2}'")
-	tools.ExecShell("sed -i 's/#Port " + oldPort + "/Port " + cast.ToString(port) + "/g' /etc/ssh/sshd_config")
-	tools.ExecShell("sed -i 's/Port " + oldPort + "/Port " + cast.ToString(port) + "/g' /etc/ssh/sshd_config")
+	oldPort := tools.Exec("cat /etc/ssh/sshd_config | grep 'Port ' | awk '{print $2}'")
+	tools.Exec("sed -i 's/#Port " + oldPort + "/Port " + cast.ToString(port) + "/g' /etc/ssh/sshd_config")
+	tools.Exec("sed -i 's/Port " + oldPort + "/Port " + cast.ToString(port) + "/g' /etc/ssh/sshd_config")
 
-	if status := tools.ExecShell("systemctl status sshd | grep Active | awk '{print $3}'"); status == "(running)" {
-		tools.ExecShell("systemctl restart sshd")
+	if status := tools.Exec("systemctl status sshd | grep Active | awk '{print $3}'"); status == "(running)" {
+		tools.Exec("systemctl restart sshd")
 	}
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }
 
-func (r *SafeController) GetPingStatus(ctx http.Context) {
+// GetPingStatus 获取 Ping 状态
+func (r *SafeController) GetPingStatus(ctx http.Context) http.Response {
 	if tools.IsRHEL() {
-		out := tools.ExecShell("firewall-cmd --query-rich-rule='rule protocol value=icmp drop' 2>&1")
-		if out == "no" {
-			Success(ctx, true)
+		out := tools.Exec(`firewall-cmd --list-all 2>&1`)
+		if !strings.Contains(out, `rule protocol value="icmp" drop`) {
+			return Success(ctx, true)
 		} else {
-			Success(ctx, false)
+			return Success(ctx, false)
 		}
 	} else {
-		config := tools.ReadFile("/etc/ufw/before.rules")
+		config := tools.Read("/etc/ufw/before.rules")
 		if strings.Contains(config, "-A ufw-before-input -p icmp --icmp-type echo-request -j ACCEPT") {
-			Success(ctx, true)
+			return Success(ctx, true)
 		} else {
-			Success(ctx, false)
+			return Success(ctx, false)
 		}
 	}
 }
 
-func (r *SafeController) SetPingStatus(ctx http.Context) {
+// SetPingStatus 设置 Ping 状态
+func (r *SafeController) SetPingStatus(ctx http.Context) http.Response {
 	if tools.IsRHEL() {
 		if ctx.Request().InputBool("status") {
-			tools.ExecShell("firewall-cmd --permanent --remove-rich-rule='rule protocol value=icmp drop'")
+			tools.Exec(`firewall-cmd --permanent --remove-rich-rule='rule protocol value=icmp drop'`)
 		} else {
-			tools.ExecShell("firewall-cmd --permanent --add-rich-rule='rule protocol value=icmp drop'")
+			tools.Exec(`firewall-cmd --permanent --add-rich-rule='rule protocol value=icmp drop'`)
 		}
-		tools.ExecShell("firewall-cmd --reload")
+		tools.Exec(`firewall-cmd --reload`)
 	} else {
 		if ctx.Request().InputBool("status") {
-			tools.ExecShell("sed -i 's/-A ufw-before-input -p icmp --icmp-type echo-request -j DROP/-A ufw-before-input -p icmp --icmp-type echo-request -j ACCEPT/g' /etc/ufw/before.rules")
+			tools.Exec(`sed -i 's/-A ufw-before-input -p icmp --icmp-type echo-request -j DROP/-A ufw-before-input -p icmp --icmp-type echo-request -j ACCEPT/g' /etc/ufw/before.rules`)
 		} else {
-			tools.ExecShell("sed -i 's/-A ufw-before-input -p icmp --icmp-type echo-request -j ACCEPT/-A ufw-before-input -p icmp --icmp-type echo-request -j DROP/g' /etc/ufw/before.rules")
+			tools.Exec(`sed -i 's/-A ufw-before-input -p icmp --icmp-type echo-request -j ACCEPT/-A ufw-before-input -p icmp --icmp-type echo-request -j DROP/g' /etc/ufw/before.rules`)
 		}
-		tools.ExecShell("ufw reload")
+		tools.Exec(`ufw reload`)
 	}
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }

app/http/controllers/setting_controller.go

@@ -1,6 +1,8 @@
 package controllers
 
 import (
+	"regexp"
+
 	"github.com/goravel/framework/contracts/http"
 	"github.com/goravel/framework/facades"
 	"panel/pkg/tools"
@@ -19,42 +21,48 @@ func NewSettingController() *SettingController {
 	}
 }
 
-func (r *SettingController) List(ctx http.Context) {
+// List 获取设置列表
+func (r *SettingController) List(ctx http.Context) http.Response {
 	var settings []models.Setting
 	err := facades.Orm().Query().Get(&settings)
 	if err != nil {
 		facades.Log().Error("[面板][SettingController] 查询设置列表失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	var result = make(map[string]string)
-	for _, setting := range settings {
-		if setting.Key == models.SettingKeyMysqlRootPassword {
-			continue
-		}
-
-		result[setting.Key] = setting.Value
+	type data struct {
+		Name        string `json:"name"`
+		Username    string `json:"username"`
+		Password    string `json:"password"`
+		Email       string `json:"email"`
+		Port        string `json:"port"`
+		Entrance    string `json:"entrance"`
+		WebsitePath string `json:"website_path"`
+		BackupPath  string `json:"backup_path"`
 	}
 
+	var result data
+	result.Name = r.setting.Get(models.SettingKeyName)
+	result.Entrance = r.setting.Get(models.SettingKeyEntrance)
+	result.WebsitePath = r.setting.Get(models.SettingKeyWebsitePath)
+	result.BackupPath = r.setting.Get(models.SettingKeyBackupPath)
+
 	var user models.User
 	err = facades.Auth().User(ctx, &user)
 	if err != nil {
 		facades.Log().Error("[面板][SettingController] 获取用户失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
-	result["username"] = user.Username
-	result["email"] = user.Email
+	result.Username = user.Username
+	result.Email = user.Email
 
-	result["port"] = tools.ExecShell(`cat /www/panel/panel.conf | grep APP_PORT | awk -F '=' '{print $2}' | tr -d '\n'`)
+	result.Port = tools.Exec(`cat /www/panel/panel.conf | grep APP_PORT | awk -F '=' '{print $2}' | tr -d '\n'`)
 
-	Success(ctx, result)
+	return Success(ctx, result)
 }
 
-func (r *SettingController) Save(ctx http.Context) {
+// Save 保存设置
+func (r *SettingController) Save(ctx http.Context) http.Response {
 	name := ctx.Request().Input("name")
 	port := ctx.Request().Input("port")
 	backupPath := ctx.Request().Input("backup_path")
@@ -64,16 +72,18 @@ func (r *SettingController) Save(ctx http.Context) {
 	email := ctx.Request().Input("email")
 	password := ctx.Request().Input("password")
 
+	if !regexp.MustCompile(`^/[^/]*[^/]$`).MatchString(entrance) || entrance == "/api" {
+		return Error(ctx, http.StatusUnprocessableEntity, "入口格式错误")
+	}
+
 	err := r.setting.Set(models.SettingKeyName, name)
 	if err != nil {
 		facades.Log().Error("[面板][SettingController] 保存设置失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
-	oldPort := tools.ExecShell(`cat /www/panel/panel.conf | grep APP_PORT | awk -F '=' '{print $2}' | tr -d '\n'`)
+	oldPort := tools.Exec(`cat /www/panel/panel.conf | grep APP_PORT | awk -F '=' '{print $2}' | tr -d '\n'`)
 	if oldPort != port {
-		tools.ExecShell("sed -i 's/APP_PORT=" + oldPort + "/APP_PORT=" + port + "/g' /www/panel/panel.conf")
+		tools.Exec("sed -i 's/APP_PORT=" + oldPort + "/APP_PORT=" + port + "/g' /www/panel/panel.conf")
 	}
 	if !tools.Exists(backupPath) {
 		tools.Mkdir(backupPath, 0644)
@@ -81,9 +91,7 @@ func (r *SettingController) Save(ctx http.Context) {
 	err = r.setting.Set(models.SettingKeyBackupPath, backupPath)
 	if err != nil {
 		facades.Log().Error("[面板][SettingController] 保存设置失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 	if !tools.Exists(websitePath) {
 		tools.Mkdir(websitePath, 0755)
@@ -92,25 +100,19 @@ func (r *SettingController) Save(ctx http.Context) {
 	err = r.setting.Set(models.SettingKeyWebsitePath, websitePath)
 	if err != nil {
 		facades.Log().Error("[面板][SettingController] 保存设置失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 	err = r.setting.Set(models.SettingKeyEntrance, entrance)
 	if err != nil {
 		facades.Log().Error("[面板][SettingController] 保存设置失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	var user models.User
 	err = facades.Auth().User(ctx, &user)
 	if err != nil {
 		facades.Log().Error("[面板][SettingController] 获取用户失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	if len(username) > 0 {
@@ -123,19 +125,15 @@ func (r *SettingController) Save(ctx http.Context) {
 		hash, err := facades.Hash().Make(password)
 		if err != nil {
 			facades.Log().Error("[面板][SettingController] 保存设置失败 ", err)
-			Error(ctx, http.StatusInternalServerError, "系统内部错误")
-
-			return
+			return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 		}
 		user.Password = hash
 	}
 
 	if err = facades.Orm().Query().Save(&user); err != nil {
 		facades.Log().Error("[面板][SettingController] 保存设置失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }

app/http/controllers/ssh_controller.go

@@ -10,6 +10,7 @@ import (
 	"github.com/goravel/framework/contracts/http"
 	"github.com/goravel/framework/facades"
 	"github.com/gorilla/websocket"
+	"github.com/spf13/cast"
 
 	"panel/app/models"
 	"panel/app/services"
@@ -28,25 +29,26 @@ func NewSshController() *SshController {
 	}
 }
 
-func (r *SshController) GetInfo(ctx http.Context) {
+// GetInfo 获取 SSH 配置
+func (r *SshController) GetInfo(ctx http.Context) http.Response {
 	host := r.setting.Get(models.SettingKeySshHost)
 	port := r.setting.Get(models.SettingKeySshPort)
 	user := r.setting.Get(models.SettingKeySshUser)
 	password := r.setting.Get(models.SettingKeySshPassword)
 	if len(host) == 0 || len(user) == 0 || len(password) == 0 {
-		Error(ctx, http.StatusInternalServerError, "SSH 配置不完整")
-		return
+		return Error(ctx, http.StatusInternalServerError, "SSH 配置不完整")
 	}
 
-	Success(ctx, http.Json{
+	return Success(ctx, http.Json{
 		"host":     host,
-		"port":     port,
+		"port":     cast.ToInt(port),
 		"user":     user,
 		"password": password,
 	})
 }
 
-func (r *SshController) UpdateInfo(ctx http.Context) {
+// UpdateInfo 更新 SSH 配置
+func (r *SshController) UpdateInfo(ctx http.Context) http.Response {
 	validator, err := ctx.Request().Validate(map[string]string{
 		"host":     "required",
 		"port":     "required",
@@ -54,12 +56,10 @@ func (r *SshController) UpdateInfo(ctx http.Context) {
 		"password": "required",
 	})
 	if err != nil {
-		Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	host := ctx.Request().Input("host")
@@ -69,32 +69,29 @@ func (r *SshController) UpdateInfo(ctx http.Context) {
 	err = r.setting.Set(models.SettingKeySshHost, host)
 	if err != nil {
 		facades.Log().Error("[面板][SSH] 更新配置失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 	err = r.setting.Set(models.SettingKeySshPort, port)
 	if err != nil {
 		facades.Log().Error("[面板][SSH] 更新配置失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 	err = r.setting.Set(models.SettingKeySshUser, user)
 	if err != nil {
 		facades.Log().Error("[面板][SSH] 更新配置失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 	err = r.setting.Set(models.SettingKeySshPassword, password)
 	if err != nil {
 		facades.Log().Error("[面板][SSH] 更新配置失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }
 
-func (r *SshController) Session(ctx http.Context) {
+// Session SSH 会话
+func (r *SshController) Session(ctx http.Context) http.Response {
 	upGrader := websocket.Upgrader{
 		ReadBufferSize:  4096,
 		WriteBufferSize: 4096,
@@ -107,8 +104,7 @@ func (r *SshController) Session(ctx http.Context) {
 	ws, err := upGrader.Upgrade(ctx.Response().Writer(), ctx.Request().Origin(), nil)
 	if err != nil {
 		facades.Log().Error("[面板][SSH] 建立连接失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 	defer ws.Close()
 
@@ -121,7 +117,7 @@ func (r *SshController) Session(ctx http.Context) {
 	if err != nil {
 		_ = ws.WriteControl(websocket.CloseMessage,
 			[]byte(err.Error()), time.Now().Add(time.Second))
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 	defer client.Close()
 
@@ -129,7 +125,7 @@ func (r *SshController) Session(ctx http.Context) {
 	if err != nil {
 		_ = ws.WriteControl(websocket.CloseMessage,
 			[]byte(err.Error()), time.Now().Add(time.Second))
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 	defer turn.Close()
 
@@ -161,4 +157,6 @@ func (r *SshController) Session(ctx http.Context) {
 		cancel()
 	}()
 	wg.Wait()
+
+	return Success(ctx, logBuff.String())
 }

app/http/controllers/task_controller.go

@@ -17,64 +17,67 @@ func NewTaskController() *TaskController {
 	}
 }
 
-func (r *TaskController) Status(ctx http.Context) {
+// Status 获取当前任务状态
+func (r *TaskController) Status(ctx http.Context) http.Response {
 	var task models.Task
 	err := facades.Orm().Query().Where("status", models.TaskStatusWaiting).OrWhere("status", models.TaskStatusRunning).FirstOrFail(&task)
 	if err == nil {
-		Success(ctx, http.Json{
+		return Success(ctx, http.Json{
 			"task": true,
 		})
-		return
 	}
 
-	Success(ctx, http.Json{
+	return Success(ctx, http.Json{
 		"task": false,
 	})
 }
 
-func (r *TaskController) List(ctx http.Context) {
-	status := ctx.Request().Query("status")
-	if len(status) == 0 {
-		status = models.TaskStatusWaiting
-	}
-
+// List 获取任务列表
+func (r *TaskController) List(ctx http.Context) http.Response {
 	var tasks []models.Task
 	var total int64
-	err := facades.Orm().Query().Where("status", status).Paginate(ctx.Request().QueryInt("page"), ctx.Request().QueryInt("limit"), &tasks, &total)
+	err := facades.Orm().Query().Paginate(ctx.Request().QueryInt("page", 1), ctx.Request().QueryInt("limit", 10), &tasks, &total)
 	if err != nil {
-		facades.Log().Error("[面板][TaskController] 查询任务列表失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		facades.Log().With(map[string]any{
+			"error": err.Error(),
+		}).Error("[面板][TaskController] 查询任务列表失败")
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	Success(ctx, http.Json{
+	return Success(ctx, http.Json{
 		"total": total,
 		"items": tasks,
 	})
 }
 
-func (r *TaskController) Log(ctx http.Context) {
+// Log 获取任务日志
+func (r *TaskController) Log(ctx http.Context) http.Response {
 	var task models.Task
 	err := facades.Orm().Query().Where("id", ctx.Request().QueryInt("id")).FirstOrFail(&task)
 	if err != nil {
-		facades.Log().Error("[面板][TaskController] 查询任务失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		facades.Log().With(map[string]any{
+			"id":    ctx.Request().QueryInt("id"),
+			"error": err.Error(),
+		}).Error("[面板][TaskController] 查询任务失败")
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	log := tools.ExecShell("tail -n 30 " + task.Log)
+	log := tools.Read(task.Log)
 
-	Success(ctx, log)
+	return Success(ctx, log)
 }
 
-func (r *TaskController) Delete(ctx http.Context) {
+// Delete 删除任务
+func (r *TaskController) Delete(ctx http.Context) http.Response {
 	var task models.Task
 	_, err := facades.Orm().Query().Where("id", ctx.Request().Input("id")).Delete(&task)
 	if err != nil {
-		facades.Log().Error("[面板][TaskController] 删除任务失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		facades.Log().With(map[string]any{
+			"id":    ctx.Request().QueryInt("id"),
+			"error": err.Error(),
+		}).Error("[面板][TaskController] 删除任务失败")
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }

app/http/controllers/user_controller.go

@@ -18,60 +18,61 @@ func NewUserController() *UserController {
 	}
 }
 
-func (r *UserController) Login(ctx http.Context) {
+// Login 用户登录
+func (r *UserController) Login(ctx http.Context) http.Response {
 	var loginRequest requests.LoginRequest
 	errors, err := ctx.Request().ValidateRequest(&loginRequest)
 	if err != nil {
-		Error(ctx, http.StatusUnprocessableEntity, err.Error())
-		return
+		return Error(ctx, http.StatusUnprocessableEntity, err.Error())
 	}
 	if errors != nil {
-		Error(ctx, http.StatusUnprocessableEntity, errors.All())
-		return
+		return Error(ctx, http.StatusUnprocessableEntity, errors.One())
 	}
 
 	var user models.User
 	err = facades.Orm().Query().Where("username", loginRequest.Username).First(&user)
 	if err != nil {
 		facades.Log().Error("[面板][UserController] 查询用户失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	if user.ID == 0 || !facades.Hash().Check(loginRequest.Password, user.Password) {
-		Error(ctx, http.StatusForbidden, "用户名或密码错误")
-		return
+		return Error(ctx, http.StatusForbidden, "用户名或密码错误")
 	}
 
 	if facades.Hash().NeedsRehash(user.Password) {
 		user.Password, err = facades.Hash().Make(loginRequest.Password)
 		if err != nil {
 			facades.Log().Error("[面板][UserController] 更新密码失败 ", err)
-			Error(ctx, http.StatusInternalServerError, "系统内部错误")
-			return
+			return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 		}
 	}
 
 	token, loginErr := facades.Auth().LoginUsingID(ctx, user.ID)
 	if loginErr != nil {
 		facades.Log().Error("[面板][UserController] 登录失败 ", loginErr)
-		Error(ctx, http.StatusInternalServerError, loginErr.Error())
-		return
+		return Error(ctx, http.StatusInternalServerError, loginErr.Error())
 	}
 
-	Success(ctx, http.Json{
+	return Success(ctx, http.Json{
 		"access_token": token,
 	})
 }
 
-func (r *UserController) Info(ctx http.Context) {
-	user, ok := ctx.Value("user").(models.User)
-	if !ok {
-		Error(ctx, http.StatusUnauthorized, "登录已过期")
-		return
+// Info 用户信息
+func (r *UserController) Info(ctx http.Context) http.Response {
+	var user models.User
+	err := facades.Auth().User(ctx, &user)
+	if err != nil {
+		facades.Log().With(map[string]any{
+			"error": err.Error(),
+		}).Error("[面板][UserController] 查询用户信息失败")
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	Success(ctx, http.Json{
+	return Success(ctx, http.Json{
+		"id":       user.ID,
+		"role":     []string{"admin"},
 		"username": user.Username,
 		"email":    user.Email,
 	})

app/http/controllers/website_controller.go

@@ -29,31 +29,32 @@ func NewWebsiteController() *WebsiteController {
 }
 
 // List 网站列表
-func (c *WebsiteController) List(ctx http.Context) {
-	limit := ctx.Request().QueryInt("limit")
-	page := ctx.Request().QueryInt("page")
+func (c *WebsiteController) List(ctx http.Context) http.Response {
+	limit := ctx.Request().QueryInt("limit", 10)
+	page := ctx.Request().QueryInt("page", 1)
 
 	total, websites, err := c.website.List(page, limit)
 	if err != nil {
 		facades.Log().Error("[面板][WebsiteController] 获取网站列表失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	Success(ctx, http.Json{
+	return Success(ctx, http.Json{
 		"total": total,
 		"items": websites,
 	})
 }
 
 // Add 添加网站
-func (c *WebsiteController) Add(ctx http.Context) {
-	if !Check(ctx, "openresty") {
-		return
+func (c *WebsiteController) Add(ctx http.Context) http.Response {
+	check := Check(ctx, "openresty")
+	if check != nil {
+		return check
 	}
 	validator, err := ctx.Request().Validate(map[string]string{
-		"name":        "required|regex:^[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)*$",
-		"domain":      "required",
+		"name":        "required|regex:^[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)*$|not_exists:websites,name",
+		"domains":     "required|slice",
+		"ports":       "required|slice",
 		"php":         "required",
 		"db":          "bool",
 		"db_type":     "required_if:db,true",
@@ -62,17 +63,16 @@ func (c *WebsiteController) Add(ctx http.Context) {
 		"db_password": "required_if:db,true",
 	})
 	if err != nil {
-		Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	var website services.PanelWebsite
 	website.Name = ctx.Request().Input("name")
-	website.Domain = ctx.Request().Input("domain")
+	website.Domains = ctx.Request().InputArray("domains")
+	website.Ports = ctx.Request().InputArray("ports")
 	website.Php = ctx.Request().InputInt("php")
 	website.Db = ctx.Request().InputBool("db")
 	website.DbType = ctx.Request().Input("db_type")
@@ -83,101 +83,99 @@ func (c *WebsiteController) Add(ctx http.Context) {
 	newSite, err := c.website.Add(website)
 	if err != nil {
 		facades.Log().Error("[面板][WebsiteController] 添加网站失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	Success(ctx, newSite)
+	return Success(ctx, newSite)
 }
 
 // Delete 删除网站
-func (c *WebsiteController) Delete(ctx http.Context) {
-	if !Check(ctx, "openresty") {
-		return
+func (c *WebsiteController) Delete(ctx http.Context) http.Response {
+	check := Check(ctx, "openresty")
+	if check != nil {
+		return check
 	}
 	id := ctx.Request().InputInt("id")
 	err := c.website.Delete(id)
 	if err != nil {
 		facades.Log().Error("[面板][WebsiteController] 删除网站失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "删除网站失败: "+err.Error())
-		return
+		return Error(ctx, http.StatusInternalServerError, "删除网站失败: "+err.Error())
 	}
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }
 
 // GetDefaultConfig 获取默认配置
-func (c *WebsiteController) GetDefaultConfig(ctx http.Context) {
-	if !Check(ctx, "openresty") {
-		return
+func (c *WebsiteController) GetDefaultConfig(ctx http.Context) http.Response {
+	check := Check(ctx, "openresty")
+	if check != nil {
+		return check
 	}
-	index := tools.ReadFile("/www/server/openresty/html/index.html")
-	stop := tools.ReadFile("/www/server/openresty/html/stop.html")
+	index := tools.Read("/www/server/openresty/html/index.html")
+	stop := tools.Read("/www/server/openresty/html/stop.html")
 
-	Success(ctx, http.Json{
+	return Success(ctx, http.Json{
 		"index": index,
 		"stop":  stop,
 	})
 }
 
 // SaveDefaultConfig 保存默认配置
-func (c *WebsiteController) SaveDefaultConfig(ctx http.Context) {
-	if !Check(ctx, "openresty") {
-		return
+func (c *WebsiteController) SaveDefaultConfig(ctx http.Context) http.Response {
+	check := Check(ctx, "openresty")
+	if check != nil {
+		return check
 	}
 	index := ctx.Request().Input("index")
 	stop := ctx.Request().Input("stop")
 
-	if !tools.WriteFile("/www/server/openresty/html/index.html", index, 0644) {
+	if !tools.Write("/www/server/openresty/html/index.html", index, 0644) {
 		facades.Log().Error("[面板][WebsiteController] 保存默认配置失败")
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	if !tools.WriteFile("/www/server/openresty/html/stop.html", stop, 0644) {
+	if !tools.Write("/www/server/openresty/html/stop.html", stop, 0644) {
 		facades.Log().Error("[面板][WebsiteController] 保存默认配置失败")
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }
 
 // GetConfig 获取配置
-func (c *WebsiteController) GetConfig(ctx http.Context) {
-	if !Check(ctx, "openresty") {
-		return
+func (c *WebsiteController) GetConfig(ctx http.Context) http.Response {
+	check := Check(ctx, "openresty")
+	if check != nil {
+		return check
 	}
 	id := ctx.Request().InputInt("id")
 	if id == 0 {
-		Error(ctx, http.StatusBadRequest, "参数错误")
-		return
+		return Error(ctx, http.StatusBadRequest, "参数错误")
 	}
 
 	config, err := c.website.GetConfig(id)
 	if err != nil {
 		facades.Log().Error("[面板][WebsiteController] 获取网站配置失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	Success(ctx, config)
+	return Success(ctx, config)
 }
 
 // SaveConfig 保存配置
-func (c *WebsiteController) SaveConfig(ctx http.Context) {
-	if !Check(ctx, "openresty") {
-		return
+func (c *WebsiteController) SaveConfig(ctx http.Context) http.Response {
+	check := Check(ctx, "openresty")
+	if check != nil {
+		return check
 	}
 	validator, err := ctx.Request().Validate(map[string]string{
-		"id":                  "required",
-		"domains":             "required",
-		"ports":               "required",
+		"domains":             "required|slice",
+		"ports":               "required|slice",
 		"hsts":                "bool",
 		"ssl":                 "bool",
 		"http_redirect":       "bool",
 		"open_basedir":        "bool",
-		"waf":                 "required",
+		"waf":                 "bool",
 		"waf_cache":           "required",
 		"waf_mode":            "required",
 		"waf_cc_deny":         "required",
@@ -190,47 +188,41 @@ func (c *WebsiteController) SaveConfig(ctx http.Context) {
 		"ssl_certificate_key": "required_if:ssl,true",
 	})
 	if err != nil {
-		Error(ctx, http.StatusBadRequest, err.Error())
-		return
+		return Error(ctx, http.StatusBadRequest, err.Error())
 	}
 	if validator.Fails() {
-		Error(ctx, http.StatusBadRequest, validator.Errors().One())
-		return
+		return Error(ctx, http.StatusBadRequest, validator.Errors().One())
 	}
 
 	var website models.Website
 	if facades.Orm().Query().Where("id", ctx.Request().Input("id")).FirstOrFail(&website) != nil {
-		Error(ctx, http.StatusBadRequest, "网站不存在")
-		return
+		return Error(ctx, http.StatusBadRequest, "网站不存在")
 	}
 
 	if !website.Status {
-		Error(ctx, http.StatusBadRequest, "网站已停用，请先启用")
-		return
+		return Error(ctx, http.StatusBadRequest, "网站已停用，请先启用")
 	}
 
 	// 原文
-	raw := tools.ReadFile("/www/server/vhost/" + website.Name + ".conf")
+	raw := tools.Read("/www/server/vhost/" + website.Name + ".conf")
 	if strings.TrimSpace(raw) != strings.TrimSpace(ctx.Request().Input("raw")) {
-		tools.WriteFile("/www/server/vhost/"+website.Name+".conf", ctx.Request().Input("raw"), 0644)
-		Success(ctx, nil)
-		return
+		tools.Write("/www/server/vhost/"+website.Name+".conf", ctx.Request().Input("raw"), 0644)
+		tools.Exec("systemctl reload openresty")
+		return Success(ctx, nil)
 	}
 
 	// 目录
 	path := ctx.Request().Input("path")
 	if !tools.Exists(path) {
-		Error(ctx, http.StatusBadRequest, "网站目录不存在")
-		return
+		return Error(ctx, http.StatusBadRequest, "网站目录不存在")
 	}
 	website.Path = path
 
 	// 域名
 	domain := "server_name"
-	domains := strings.Split(ctx.Request().Input("domains"), "\n")
+	domains := ctx.Request().InputArray("domains")
 	if len(domains) == 0 {
-		Error(ctx, http.StatusBadRequest, "域名不能为空")
-		return
+		return Error(ctx, http.StatusBadRequest, "域名不能为空")
 	}
 	for _, v := range domains {
 		if v == "" {
@@ -241,22 +233,19 @@ func (c *WebsiteController) SaveConfig(ctx http.Context) {
 	domain += ";"
 	domainConfigOld := tools.Cut(raw, "# server_name标记位开始", "# server_name标记位结束")
 	if len(strings.TrimSpace(domainConfigOld)) == 0 {
-		Error(ctx, http.StatusBadRequest, "配置文件中缺少server_name标记位")
-		return
+		return Error(ctx, http.StatusBadRequest, "配置文件中缺少server_name标记位")
 	}
 	raw = strings.Replace(raw, domainConfigOld, "\n    "+domain+"\n    ", -1)
 
 	// 端口
 	var port strings.Builder
-	ports := strings.Split(ctx.Request().Input("ports"), "\n")
+	ports := ctx.Request().InputArray("ports")
 	if len(ports) == 0 {
-		Error(ctx, http.StatusBadRequest, "端口不能为空")
-		return
+		return Error(ctx, http.StatusBadRequest, "端口不能为空")
 	}
 	for i, v := range ports {
 		if _, err := strconv.Atoi(v); err != nil && v != "443 ssl http2" {
-			Error(ctx, http.StatusBadRequest, "端口格式错误")
-			return
+			return Error(ctx, http.StatusBadRequest, "端口格式错误")
 		}
 		if v == "443" && ctx.Request().InputBool("ssl") {
 			v = "443 ssl http2"
@@ -269,58 +258,58 @@ func (c *WebsiteController) SaveConfig(ctx http.Context) {
 	}
 	portConfigOld := tools.Cut(raw, "# port标记位开始", "# port标记位结束")
 	if len(strings.TrimSpace(portConfigOld)) == 0 {
-		Error(ctx, http.StatusBadRequest, "配置文件中缺少port标记位")
-		return
+		return Error(ctx, http.StatusBadRequest, "配置文件中缺少port标记位")
 	}
 	raw = strings.Replace(raw, portConfigOld, "\n"+port.String()+"\n    ", -1)
 
 	// 运行目录
 	root := tools.Cut(raw, "# root标记位开始", "# root标记位结束")
 	if len(strings.TrimSpace(root)) == 0 {
-		Error(ctx, http.StatusBadRequest, "配置文件中缺少root标记位")
-		return
+		return Error(ctx, http.StatusBadRequest, "配置文件中缺少root标记位")
 	}
 	match := regexp.MustCompile(`root\s+(.+);`).FindStringSubmatch(root)
 	if len(match) != 2 {
-		Error(ctx, http.StatusBadRequest, "配置文件中root标记位格式错误")
-		return
+		return Error(ctx, http.StatusBadRequest, "配置文件中root标记位格式错误")
 	}
-	rootNew := strings.Replace(root, match[1], path, -1)
+	rootNew := strings.Replace(root, match[1], ctx.Request().Input("root"), -1)
 	raw = strings.Replace(raw, root, rootNew, -1)
 
 	// 默认文件
 	index := tools.Cut(raw, "# index标记位开始", "# index标记位结束")
 	if len(strings.TrimSpace(index)) == 0 {
-		Error(ctx, http.StatusBadRequest, "配置文件中缺少index标记位")
-		return
+		return Error(ctx, http.StatusBadRequest, "配置文件中缺少index标记位")
 	}
 	match = regexp.MustCompile(`index\s+(.+);`).FindStringSubmatch(index)
 	if len(match) != 2 {
-		Error(ctx, http.StatusBadRequest, "配置文件中index标记位格式错误")
-		return
+		return Error(ctx, http.StatusBadRequest, "配置文件中index标记位格式错误")
 	}
 	indexNew := strings.Replace(index, match[1], ctx.Request().Input("index"), -1)
 	raw = strings.Replace(raw, index, indexNew, -1)
 
 	// 防跨站
-	if !strings.HasSuffix(path, "/") {
-		path += "/"
+	root = ctx.Request().Input("root")
+	if !strings.HasSuffix(root, "/") {
+		root += "/"
 	}
 	if ctx.Request().InputBool("open_basedir") {
-		tools.WriteFile(path+".user.ini", "open_basedir="+path+":/tmp/", 0644)
+		tools.Write(root+".user.ini", "open_basedir="+path+":/tmp/", 0644)
 	} else {
-		if tools.Exists(path + ".user.ini") {
-			tools.RemoveFile(path + ".user.ini")
+		if tools.Exists(root + ".user.ini") {
+			tools.Remove(root + ".user.ini")
 		}
 	}
 
 	// WAF
-	waf := ctx.Request().Input("waf")
+	waf := ctx.Request().InputBool("waf")
+	wafStr := "off"
+	if waf {
+		wafStr = "on"
+	}
 	wafMode := ctx.Request().Input("waf_mode", "DYNAMIC")
 	wafCcDeny := ctx.Request().Input("waf_cc_deny", "rate=1000r/m duration=60m")
 	wafCache := ctx.Request().Input("waf_cache", "capacity=50")
 	wafConfig := `# waf标记位开始
-    waf ` + waf + `;
+    waf ` + wafStr + `;
     waf_rule_path /www/server/openresty/ngx_waf/assets/rules/;
     waf_mode ` + wafMode + `;
     waf_cc_deny ` + wafCcDeny + `;
@@ -335,9 +324,9 @@ func (c *WebsiteController) SaveConfig(ctx http.Context) {
 	// SSL
 	ssl := ctx.Request().InputBool("ssl")
 	website.Ssl = ssl
+	tools.Write("/www/server/vhost/ssl/"+website.Name+".pem", ctx.Request().Input("ssl_certificate"), 0644)
+	tools.Write("/www/server/vhost/ssl/"+website.Name+".key", ctx.Request().Input("ssl_certificate_key"), 0644)
 	if ssl {
-		tools.WriteFile("/www/server/vhost/ssl/"+website.Name+".pem", ctx.Request().Input("ssl_certificate"), 0644)
-		tools.WriteFile("/www/server/vhost/ssl/"+website.Name+".key", ctx.Request().Input("ssl_certificate_key"), 0644)
 		sslConfig := `# ssl标记位开始
     ssl_certificate /www/server/vhost/ssl/` + website.Name + `.pem;
     ssl_certificate_key /www/server/vhost/ssl/` + website.Name + `.key;
@@ -350,10 +339,10 @@ func (c *WebsiteController) SaveConfig(ctx http.Context) {
     `
 		if ctx.Request().InputBool("http_redirect") {
 			sslConfig += `# http重定向标记位开始
-    if (\$server_port !~ 443){
-        return 301 https://\$host\$request_uri;
+    if ($server_port !~ 443){
+        return 301 https://$host$request_uri;
     }
-    error_page 497  https://\$host\$request_uri;
+    error_page 497  https://$host$request_uri;
     # http重定向标记位结束
     `
 		}
@@ -389,112 +378,102 @@ func (c *WebsiteController) SaveConfig(ctx http.Context) {
 	err = facades.Orm().Query().Save(&website)
 	if err != nil {
 		facades.Log().Error("[面板][WebsiteController] 保存网站配置失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	tools.WriteFile("/www/server/vhost/"+website.Name+".conf", raw, 0644)
-	tools.WriteFile("/www/server/vhost/rewrite/"+website.Name+".conf", ctx.Request().Input("rewrite"), 0644)
-	tools.ExecShell("systemctl reload openresty")
+	tools.Write("/www/server/vhost/"+website.Name+".conf", raw, 0644)
+	tools.Write("/www/server/vhost/rewrite/"+website.Name+".conf", ctx.Request().Input("rewrite"), 0644)
+	tools.Exec("systemctl reload openresty")
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }
 
 // ClearLog 清空日志
-func (c *WebsiteController) ClearLog(ctx http.Context) {
-	if !Check(ctx, "openresty") {
-		return
+func (c *WebsiteController) ClearLog(ctx http.Context) http.Response {
+	check := Check(ctx, "openresty")
+	if check != nil {
+		return check
 	}
 	id := ctx.Request().InputInt("id")
 	if id == 0 {
-		Error(ctx, http.StatusBadRequest, "参数错误")
-		return
+		return Error(ctx, http.StatusBadRequest, "参数错误")
 	}
 
 	website := models.Website{}
 	err := facades.Orm().Query().Where("id", id).Get(&website)
 	if err != nil {
 		facades.Log().Error("[面板][WebsiteController] 获取网站信息失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	tools.RemoveFile("/www/wwwlogs/" + website.Name + ".log")
+	tools.Remove("/www/wwwlogs/" + website.Name + ".log")
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }
 
 // UpdateRemark 更新备注
-func (c *WebsiteController) UpdateRemark(ctx http.Context) {
+func (c *WebsiteController) UpdateRemark(ctx http.Context) http.Response {
 	id := ctx.Request().InputInt("id")
 	if id == 0 {
-		Error(ctx, http.StatusBadRequest, "参数错误")
-		return
+		return Error(ctx, http.StatusBadRequest, "参数错误")
 	}
 
 	website := models.Website{}
 	err := facades.Orm().Query().Where("id", id).Get(&website)
 	if err != nil {
 		facades.Log().Error("[面板][WebsiteController] 获取网站信息失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	website.Remark = ctx.Request().Input("remark")
 	err = facades.Orm().Query().Save(&website)
 	if err != nil {
 		facades.Log().Error("[面板][WebsiteController] 保存网站备注失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }
 
 // BackupList 备份列表
-func (c *WebsiteController) BackupList(ctx http.Context) {
+func (c *WebsiteController) BackupList(ctx http.Context) http.Response {
 	backupList, err := c.backup.WebsiteList()
 	if err != nil {
 		facades.Log().Error("[面板][WebsiteController] 获取网站备份列表失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	Success(ctx, backupList)
+	return Success(ctx, backupList)
 }
 
 // CreateBackup 创建备份
-func (c *WebsiteController) CreateBackup(ctx http.Context) {
+func (c *WebsiteController) CreateBackup(ctx http.Context) http.Response {
 	id := ctx.Request().InputInt("id")
 	if id == 0 {
-		Error(ctx, http.StatusBadRequest, "参数错误")
-		return
+		return Error(ctx, http.StatusBadRequest, "参数错误")
 	}
 
 	website := models.Website{}
 	err := facades.Orm().Query().Where("id", id).Get(&website)
 	if err != nil {
 		facades.Log().Error("[面板][WebsiteController] 获取网站信息失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "获取网站信息失败: "+err.Error())
-		return
+		return Error(ctx, http.StatusInternalServerError, "获取网站信息失败: "+err.Error())
 	}
 
 	err = c.backup.WebSiteBackup(website)
 	if err != nil {
 		facades.Log().Error("[面板][WebsiteController] 备份网站失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "备份网站失败: "+err.Error())
-		return
+		return Error(ctx, http.StatusInternalServerError, "备份网站失败: "+err.Error())
 	}
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }
 
 // UploadBackup 上传备份
-func (c *WebsiteController) UploadBackup(ctx http.Context) {
+func (c *WebsiteController) UploadBackup(ctx http.Context) http.Response {
 	file, err := ctx.Request().File("file")
 	if err != nil {
-		Error(ctx, http.StatusBadRequest, "上传文件失败")
-		return
+		return Error(ctx, http.StatusBadRequest, "上传文件失败")
 	}
 
 	backupPath := c.setting.Get(models.SettingKeyBackupPath) + "/website"
@@ -505,50 +484,44 @@ func (c *WebsiteController) UploadBackup(ctx http.Context) {
 	name := file.GetClientOriginalName()
 	_, err = file.StoreAs(backupPath, name)
 	if err != nil {
-		Error(ctx, http.StatusBadRequest, "上传文件失败")
-		return
+		return Error(ctx, http.StatusBadRequest, "上传文件失败")
 	}
 
-	Success(ctx, "上传文件成功")
+	return Success(ctx, "上传文件成功")
 }
 
 // RestoreBackup 还原备份
-func (c *WebsiteController) RestoreBackup(ctx http.Context) {
+func (c *WebsiteController) RestoreBackup(ctx http.Context) http.Response {
 	id := ctx.Request().InputInt("id")
 	if id == 0 {
-		Error(ctx, http.StatusBadRequest, "参数错误")
-		return
+		return Error(ctx, http.StatusBadRequest, "参数错误")
 	}
 	fileName := ctx.Request().Input("name")
 	if len(fileName) == 0 {
-		Error(ctx, http.StatusBadRequest, "参数错误")
-		return
+		return Error(ctx, http.StatusBadRequest, "参数错误")
 	}
 
 	website := models.Website{}
 	err := facades.Orm().Query().Where("id", id).Get(&website)
 	if err != nil {
 		facades.Log().Error("[面板][WebsiteController] 获取网站信息失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "获取网站信息失败: "+err.Error())
-		return
+		return Error(ctx, http.StatusInternalServerError, "获取网站信息失败: "+err.Error())
 	}
 
 	err = c.backup.WebsiteRestore(website, fileName)
 	if err != nil {
 		facades.Log().Error("[面板][WebsiteController] 还原网站失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "还原网站失败: "+err.Error())
-		return
+		return Error(ctx, http.StatusInternalServerError, "还原网站失败: "+err.Error())
 	}
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }
 
 // DeleteBackup 删除备份
-func (c *WebsiteController) DeleteBackup(ctx http.Context) {
+func (c *WebsiteController) DeleteBackup(ctx http.Context) http.Response {
 	fileName := ctx.Request().Input("name")
 	if len(fileName) == 0 {
-		Error(ctx, http.StatusBadRequest, "参数错误")
-		return
+		return Error(ctx, http.StatusBadRequest, "参数错误")
 	}
 
 	backupPath := c.setting.Get(models.SettingKeyBackupPath) + "/website"
@@ -556,38 +529,35 @@ func (c *WebsiteController) DeleteBackup(ctx http.Context) {
 		tools.Mkdir(backupPath, 0644)
 	}
 
-	if !tools.RemoveFile(backupPath + "/" + fileName) {
-		Error(ctx, http.StatusInternalServerError, "删除备份失败")
-		return
+	if !tools.Remove(backupPath + "/" + fileName) {
+		return Error(ctx, http.StatusInternalServerError, "删除备份失败")
 	}
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }
 
 // ResetConfig 重置配置
-func (c *WebsiteController) ResetConfig(ctx http.Context) {
-	if !Check(ctx, "openresty") {
-		return
+func (c *WebsiteController) ResetConfig(ctx http.Context) http.Response {
+	check := Check(ctx, "openresty")
+	if check != nil {
+		return check
 	}
 	id := ctx.Request().InputInt("id")
 	if id == 0 {
-		Error(ctx, http.StatusBadRequest, "参数错误")
-		return
+		return Error(ctx, http.StatusBadRequest, "参数错误")
 	}
 
 	website := models.Website{}
 	if err := facades.Orm().Query().Where("id", id).Get(&website); err != nil {
 		facades.Log().Error("[面板][WebsiteController] 获取网站信息失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	website.Status = true
 	website.Ssl = false
 	if err := facades.Orm().Query().Save(&website); err != nil {
 		facades.Log().Error("[面板][WebsiteController] 保存网站配置失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	raw := fmt.Sprintf(`
@@ -649,39 +619,37 @@ server
 
 `, website.Path, website.Php, website.Name, website.Name, website.Name)
 
-	tools.WriteFile("/www/server/vhost/"+website.Name+".conf", raw, 0644)
-	tools.WriteFile("/www/server/vhost/rewrite"+website.Name+".conf", "", 0644)
-	tools.ExecShell("systemctl reload openresty")
+	tools.Write("/www/server/vhost/"+website.Name+".conf", raw, 0644)
+	tools.Write("/www/server/vhost/rewrite"+website.Name+".conf", "", 0644)
+	tools.Exec("systemctl reload openresty")
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }
 
 // Status 网站状态
-func (c *WebsiteController) Status(ctx http.Context) {
-	if !Check(ctx, "openresty") {
-		return
+func (c *WebsiteController) Status(ctx http.Context) http.Response {
+	check := Check(ctx, "openresty")
+	if check != nil {
+		return check
 	}
 	id := ctx.Request().InputInt("id")
 	if id == 0 {
-		Error(ctx, http.StatusBadRequest, "参数错误")
-		return
+		return Error(ctx, http.StatusBadRequest, "参数错误")
 	}
 
 	website := models.Website{}
 	if err := facades.Orm().Query().Where("id", id).Get(&website); err != nil {
 		facades.Log().Error("[面板][WebsiteController] 获取网站信息失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
 	website.Status = ctx.Request().InputBool("status")
 	if err := facades.Orm().Query().Save(&website); err != nil {
 		facades.Log().Error("[面板][WebsiteController] 保存网站配置失败 ", err)
-		Error(ctx, http.StatusInternalServerError, "系统内部错误")
-		return
+		return Error(ctx, http.StatusInternalServerError, "系统内部错误")
 	}
 
-	raw := tools.ReadFile("/www/server/vhost/" + website.Name + ".conf")
+	raw := tools.Read("/www/server/vhost/" + website.Name + ".conf")
 
 	// 运行目录
 	rootConfig := tools.Cut(raw, "# root标记位开始\n", "# root标记位结束")
@@ -707,8 +675,8 @@ func (c *WebsiteController) Status(ctx http.Context) {
 		}
 	}
 
-	tools.WriteFile("/www/server/vhost/"+website.Name+".conf", raw, 0644)
-	tools.ExecShell("systemctl reload openresty")
+	tools.Write("/www/server/vhost/"+website.Name+".conf", raw, 0644)
+	tools.Exec("systemctl reload openresty")
 
-	Success(ctx, nil)
+	return Success(ctx, nil)
 }

app/http/middleware/jwt.go

@@ -6,16 +6,14 @@ import (
 	"github.com/goravel/framework/auth"
 	"github.com/goravel/framework/contracts/http"
 	"github.com/goravel/framework/facades"
-
-	"panel/app/models"
 )
 
 // Jwt 确保通过 JWT 鉴权
 func Jwt() http.Middleware {
 	return func(ctx http.Context) {
-		token := ctx.Request().Header("access_token", ctx.Request().Input("access_token", ctx.Request().Header("Sec-WebSocket-Protocol")))
+		token := ctx.Request().Header("Authorization", ctx.Request().Header("Sec-WebSocket-Protocol"))
 		if len(token) == 0 {
-			ctx.Request().AbortWithStatusJson(http.StatusUnauthorized, http.Json{
+			ctx.Request().AbortWithStatusJson(http.StatusOK, http.Json{
 				"code":    401,
 				"message": "未登录",
 			})
@@ -27,7 +25,7 @@ func Jwt() http.Middleware {
 			if errors.Is(err, auth.ErrorTokenExpired) {
 				token, err = facades.Auth().Refresh(ctx)
 				if err != nil {
-					// Refresh time exceeded
+					// 到达刷新时间上限
 					ctx.Request().AbortWithStatusJson(http.StatusOK, http.Json{
 						"code":    401,
 						"message": "登录已过期",
@@ -45,18 +43,6 @@ func Jwt() http.Middleware {
 			}
 		}
 
-		// 取出用户信息
-		var user models.User
-		if err := facades.Auth().User(ctx, &user); err != nil {
-			ctx.Request().AbortWithStatusJson(http.StatusForbidden, http.Json{
-				"code":    403,
-				"message": "用户不存在",
-			})
-			return
-		}
-
-		ctx.WithValue("user", user)
-
 		ctx.Response().Header("Authorization", token)
 		ctx.Request().Next()
 	}

app/http/middleware/static.go

@@ -1,18 +1,30 @@
 package middleware
 
 import (
-	"github.com/gin-contrib/static"
+	"fmt"
 
-	contractshttp "github.com/goravel/framework/contracts/http"
-	frameworkhttp "github.com/goravel/framework/http"
+	"github.com/gin-contrib/static"
+	"github.com/goravel/framework/contracts/http"
+	"github.com/goravel/gin"
 
 	"panel/app/services"
 )
 
-func Static() contractshttp.Middleware {
-	return func(ctx contractshttp.Context) {
-		static.Serve(services.NewSettingImpl().Get("entrance", "/"), static.LocalFile("/www/panel/public", false))(ctx.(*frameworkhttp.GinContext).Instance())
+func Static() http.Middleware {
+	return func(ctx http.Context) {
+		// 自动纠正 URL 格式
+		if ctx.Request().Path() == services.NewSettingImpl().Get("entrance", "/") && ctx.Request().Path() != "/" {
+			// ctx.Response().Redirect(http.StatusFound, ctx.Request().Path()+"/")
+			ctx.Response().Writer().WriteHeader(http.StatusFound)
+			_, err := ctx.Response().Writer().Write([]byte(fmt.Sprintf(`<html><head><meta http-equiv="refresh" content="0;url=%s/"></head></html>`, ctx.Request().Path())))
+			if err != nil {
+				return
+			}
+			ctx.Response().Flush()
+			return
+		}
 
+		static.Serve(services.NewSettingImpl().Get("entrance", "/"), static.LocalFile("public", false))(ctx.(*gin.Context).Instance())
 		ctx.Request().Next()
 	}
 }

app/models/setting.go

@@ -4,6 +4,7 @@ import "github.com/goravel/framework/support/carbon"
 
 const (
 	SettingKeyName              = "name"
+	SettingKeyVersion           = "version"
 	SettingKeyMonitor           = "monitor"
 	SettingKeyMonitorDays       = "monitor_days"
 	SettingKeyBackupPath        = "backup_path"

app/plugins/fail2ban/fail2ban.go

@@ -0,0 +1,13 @@
+package fail2ban
+
+var (
+	Name        = "Fail2ban"
+	Description = "Fail2ban 扫描系统日志文件并从中找出多次尝试失败的IP地址，将该IP地址加入防火墙的拒绝访问列表中。"
+	Slug        = "fail2ban"
+	Version     = "1.0.0"
+	Requires    = []string{}
+	Excludes    = []string{}
+	Install     = `bash /www/panel/scripts/fail2ban/install.sh`
+	Uninstall   = `bash /www/panel/scripts/fail2ban/uninstall.sh`
+	Update      = `bash /www/panel/scripts/fail2ban/update.sh`
+)

app/plugins/mysql57/mysql57.go

@@ -4,10 +4,10 @@ var (
 	Name        = "MySQL-5.7"
 	Description = "MySQL 是最流行的关系型数据库管理系统之一，Oracle 旗下产品。"
 	Slug        = "mysql57"
-	Version     = "5.7.42"
+	Version     = "5.7.43"
 	Requires    = []string{}
 	Excludes    = []string{"mysql80"}
 	Install     = `bash /www/panel/scripts/mysql/install.sh 57`
 	Uninstall   = `bash /www/panel/scripts/mysql/uninstall.sh 57`
-	Update      = `echo "not support now"`
+	Update      = `bash /www/panel/scripts/mysql/update.sh 57`
 )

app/plugins/mysql80/mysql80.go

@@ -4,10 +4,10 @@ var (
 	Name        = "MySQL-8.0"
 	Description = "MySQL 是最流行的关系型数据库管理系统之一，Oracle 旗下产品。(内存 < 4G 无法安装)"
 	Slug        = "mysql80"
-	Version     = "8.0.33"
+	Version     = "8.0.34"
 	Requires    = []string{}
 	Excludes    = []string{"mysql57"}
 	Install     = `bash /www/panel/scripts/mysql/install.sh 80`
 	Uninstall   = `bash /www/panel/scripts/mysql/uninstall.sh 80`
-	Update      = `echo "not support now"`
+	Update      = `bash /www/panel/scripts/mysql/update.sh 80`
 )

app/plugins/openresty/openresty.go

@@ -4,7 +4,7 @@ var (
 	Name        = "OpenResty"
 	Description = "OpenResty® 是一款基于 NGINX 和 LuaJIT 的 Web 平台。"
 	Slug        = "openresty"
-	Version     = "1.21.4.1"
+	Version     = "1.21.4.2"
 	Requires    = []string{}
 	Excludes    = []string{}
 	Install     = "bash /www/panel/scripts/openresty/install.sh"

app/plugins/php80/php80.go

@@ -4,7 +4,7 @@ var (
 	Name        = "PHP-8.0"
 	Description = "PHP 是世界上最好的语言！"
 	Slug        = "php80"
-	Version     = "8.0.29"
+	Version     = "8.0.30"
 	Requires    = []string{}
 	Excludes    = []string{}
 	Install     = `bash /www/panel/scripts/php/install.sh 80`

app/plugins/php81/php81.go

@@ -4,7 +4,7 @@ var (
 	Name        = "PHP-8.1"
 	Description = "PHP 是世界上最好的语言！"
 	Slug        = "php81"
-	Version     = "8.1.21"
+	Version     = "8.1.23"
 	Requires    = []string{}
 	Excludes    = []string{}
 	Install     = `bash /www/panel/scripts/php/install.sh 81`

app/plugins/php82/php82.go

@@ -4,7 +4,7 @@ var (
 	Name        = "PHP-8.2"
 	Description = "PHP 是世界上最好的语言！"
 	Slug        = "php82"
-	Version     = "8.2.8"
+	Version     = "8.2.10"
 	Requires    = []string{}
 	Excludes    = []string{}
 	Install     = `bash /www/panel/scripts/php/install.sh 82`

app/plugins/postgresql15/postgresql15.go

@@ -0,0 +1,13 @@
+package postgresql15
+
+var (
+	Name        = "PostgreSQL-15"
+	Description = "PostgreSQL 是世界上最先进的开源关系数据库，在类似 BSD 与 MIT 许可的 PostgreSQL 许可下发行。"
+	Slug        = "postgresql15"
+	Version     = "15.4"
+	Requires    = []string{}
+	Excludes    = []string{"postgresql16"}
+	Install     = `bash /www/panel/scripts/postgresql/install.sh 15`
+	Uninstall   = `bash /www/panel/scripts/postgresql/uninstall.sh 15`
+	Update      = `bash /www/panel/scripts/postgresql/update.sh 15`
+)

app/plugins/postgresql16/postgresql16.go

@@ -0,0 +1,13 @@
+package postgresql16
+
+var (
+	Name        = "PostgreSQL-16"
+	Description = "PostgreSQL 是世界上最先进的开源关系数据库，在类似 BSD 与 MIT 许可的 PostgreSQL 许可下发行。"
+	Slug        = "postgresql16"
+	Version     = "16.0"
+	Requires    = []string{}
+	Excludes    = []string{"postgresql15"}
+	Install     = `bash /www/panel/scripts/postgresql/install.sh 16`
+	Uninstall   = `bash /www/panel/scripts/postgresql/uninstall.sh 16`
+	Update      = `bash /www/panel/scripts/postgresql/update.sh 16`
+)

app/plugins/pureftpd/pureftpd.go

@@ -0,0 +1,13 @@
+package pureftpd
+
+var (
+	Name        = "Pure-FTPd"
+	Description = "Pure-Ftpd 是一个快速、高效、轻便、安全的 FTP 服务器，它以安全和配置简单为设计目标，支持虚拟主机，IPV6，PAM 等功能。"
+	Slug        = "pureftpd"
+	Version     = "1.0.50"
+	Requires    = []string{}
+	Excludes    = []string{}
+	Install     = `bash /www/panel/scripts/pureftpd/install.sh`
+	Uninstall   = `bash /www/panel/scripts/pureftpd/uninstall.sh`
+	Update      = `bash /www/panel/scripts/pureftpd/update.sh`
+)

app/plugins/redis/redis.go

@@ -0,0 +1,13 @@
+package redis
+
+var (
+	Name        = "Redis"
+	Description = "Redis 是一个开源的使用ANSI C语言编写、支持网络、可基于内存亦可持久化的日志型、Key-Value数据库，并提供多种语言的API。"
+	Slug        = "redis"
+	Version     = "7.0.12"
+	Requires    = []string{}
+	Excludes    = []string{}
+	Install     = `bash /www/panel/scripts/redis/install.sh`
+	Uninstall   = `bash /www/panel/scripts/redis/uninstall.sh`
+	Update      = `bash /www/panel/scripts/redis/update.sh`
+)

app/plugins/toolbox/toolbox.go

@@ -0,0 +1,13 @@
+package toolbox
+
+var (
+	Name        = "系统工具箱"
+	Description = "可视化调整一些常用的配置项，如 DNS、SWAP、时区 等"
+	Slug        = "toolbox"
+	Version     = "1.0"
+	Requires    = []string{}
+	Excludes    = []string{}
+	Install     = `panel writePlugin toolbox 1.0`
+	Uninstall   = `panel deletePlugin toolbox`
+	Update      = `panel writePlugin toolbox 1.0`
+)

app/providers/database_service_provider.go

@@ -0,0 +1,22 @@
+package providers
+
+import (
+	"github.com/goravel/framework/contracts/database/seeder"
+	"github.com/goravel/framework/contracts/foundation"
+	"github.com/goravel/framework/facades"
+
+	"panel/database/seeders"
+)
+
+type DatabaseServiceProvider struct {
+}
+
+func (receiver *DatabaseServiceProvider) Register(app foundation.Application) {
+
+}
+
+func (receiver *DatabaseServiceProvider) Boot(app foundation.Application) {
+	facades.Seeder().Register([]seeder.Seeder{
+		&seeders.DatabaseSeeder{},
+	})
+}

app/providers/route_service_provider.go

@@ -12,14 +12,15 @@ type RouteServiceProvider struct {
 }
 
 func (receiver *RouteServiceProvider) Register(app foundation.Application) {
-	//Add HTTP middlewares
-	facades.Route().GlobalMiddleware(http.Kernel{}.Middleware()...)
 }
 
 func (receiver *RouteServiceProvider) Boot(app foundation.Application) {
+	// Add HTTP middlewares
+	facades.Route().GlobalMiddleware(http.Kernel{}.Middleware()...)
+
 	receiver.configureRateLimiting()
 
-	routes.Web()
+	routes.Api()
 	routes.Plugin()
 }
 

app/services/backup.go

@@ -20,6 +20,9 @@ type Backup interface {
 	MysqlList() ([]BackupFile, error)
 	MysqlBackup(database string) error
 	MysqlRestore(database string, backupFile string) error
+	PostgresqlList() ([]BackupFile, error)
+	PostgresqlBackup(database string) error
+	PostgresqlRestore(database string, backupFile string) error
 }
 
 type BackupFile struct {
@@ -81,7 +84,7 @@ func (s *BackupImpl) WebSiteBackup(website models.Website) error {
 	}
 
 	backupFile := backupPath + "/" + website.Name + "_" + carbon.Now().ToShortDateTimeString() + ".zip"
-	tools.ExecShell(`cd '` + website.Path + `' && zip -r '` + backupFile + `' .`)
+	tools.Exec(`cd '` + website.Path + `' && zip -r '` + backupFile + `' .`)
 
 	return nil
 }
@@ -103,8 +106,8 @@ func (s *BackupImpl) WebsiteRestore(website models.Website, backupFile string) e
 		return errors.New("备份文件不存在")
 	}
 
-	tools.ExecShell(`rm -rf '` + website.Path + `/*'`)
-	tools.ExecShell(`unzip -o '` + backupFile + `' -d '` + website.Path + `' 2>&1`)
+	tools.Exec(`rm -rf '` + website.Path + `/*'`)
+	tools.Exec(`unzip -o '` + backupFile + `' -d '` + website.Path + `' 2>&1`)
 	tools.Chmod(website.Path, 0755)
 	tools.Chown(website.Path, "www", "www")
 
@@ -155,9 +158,9 @@ func (s *BackupImpl) MysqlBackup(database string) error {
 		return err
 	}
 
-	tools.ExecShell("mysqldump -uroot " + database + " > " + backupPath + "/" + backupFile)
-	tools.ExecShell("cd " + backupPath + " && zip -r " + backupPath + "/" + backupFile + ".zip " + backupFile)
-	tools.RemoveFile(backupPath + "/" + backupFile)
+	tools.Exec("/www/server/mysql/bin/mysqldump -uroot " + database + " > " + backupPath + "/" + backupFile)
+	tools.Exec("cd " + backupPath + " && zip -r " + backupPath + "/" + backupFile + ".zip " + backupFile)
+	tools.Remove(backupPath + "/" + backupFile)
 	_ = os.Unsetenv("MYSQL_PWD")
 
 	return nil
@@ -180,26 +183,26 @@ func (s *BackupImpl) MysqlRestore(database string, backupFile string) error {
 
 	switch ext {
 	case ".zip":
-		tools.ExecShell("unzip -o " + backupFile + " -d " + backupPath)
+		tools.Exec("unzip -o " + backupFile + " -d " + backupPath)
 		backupFile = strings.TrimSuffix(backupFile, ext)
 	case ".gz":
 		if strings.HasSuffix(backupFile, ".tar.gz") {
 			// 解压.tar.gz文件
-			tools.ExecShell("tar -zxvf " + backupFile + " -C " + backupPath)
+			tools.Exec("tar -zxvf " + backupFile + " -C " + backupPath)
 			backupFile = strings.TrimSuffix(backupFile, ".tar.gz")
 		} else {
 			// 解压.gz文件
-			tools.ExecShell("gzip -d " + backupFile)
+			tools.Exec("gzip -d " + backupFile)
 			backupFile = strings.TrimSuffix(backupFile, ext)
 		}
 	case ".bz2":
-		tools.ExecShell("bzip2 -d " + backupFile)
+		tools.Exec("bzip2 -d " + backupFile)
 		backupFile = strings.TrimSuffix(backupFile, ext)
 	case ".tar":
-		tools.ExecShell("tar -xvf " + backupFile + " -C " + backupPath)
+		tools.Exec("tar -xvf " + backupFile + " -C " + backupPath)
 		backupFile = strings.TrimSuffix(backupFile, ext)
 	case ".rar":
-		tools.ExecShell("unrar x " + backupFile + " " + backupPath)
+		tools.Exec("unrar x " + backupFile + " " + backupPath)
 		backupFile = strings.TrimSuffix(backupFile, ext)
 	}
 
@@ -207,8 +210,97 @@ func (s *BackupImpl) MysqlRestore(database string, backupFile string) error {
 		return errors.New("自动解压失败，请手动解压")
 	}
 
-	tools.ExecShell("mysql -uroot " + database + " < " + backupFile)
+	tools.Exec("/www/server/mysql/bin/mysql -uroot " + database + " < " + backupFile)
 	_ = os.Unsetenv("MYSQL_PWD")
 
 	return nil
 }
+
+// PostgresqlList PostgreSQL备份列表
+func (s *BackupImpl) PostgresqlList() ([]BackupFile, error) {
+	backupPath := s.setting.Get(models.SettingKeyBackupPath)
+	if len(backupPath) == 0 {
+		return []BackupFile{}, nil
+	}
+
+	backupPath += "/postgresql"
+	if !tools.Exists(backupPath) {
+		tools.Mkdir(backupPath, 0644)
+	}
+
+	files, err := os.ReadDir(backupPath)
+	if err != nil {
+		return []BackupFile{}, err
+	}
+	var backupList []BackupFile
+	for _, file := range files {
+		info, err := file.Info()
+		if err != nil {
+			continue
+		}
+		backupList = append(backupList, BackupFile{
+			Name: file.Name(),
+			Size: tools.FormatBytes(float64(info.Size())),
+		})
+	}
+
+	return backupList, nil
+}
+
+// PostgresqlBackup PostgreSQL备份
+func (s *BackupImpl) PostgresqlBackup(database string) error {
+	backupPath := s.setting.Get(models.SettingKeyBackupPath) + "/postgresql"
+	backupFile := database + "_" + carbon.Now().ToShortDateTimeString() + ".sql"
+	if !tools.Exists(backupPath) {
+		tools.Mkdir(backupPath, 0644)
+	}
+
+	tools.Exec(`su - postgres -c "pg_dump ` + database + `" > ` + backupPath + "/" + backupFile)
+	tools.Exec("cd " + backupPath + " && zip -r " + backupPath + "/" + backupFile + ".zip " + backupFile)
+	tools.Remove(backupPath + "/" + backupFile)
+
+	return nil
+}
+
+// PostgresqlRestore PostgreSQL恢复
+func (s *BackupImpl) PostgresqlRestore(database string, backupFile string) error {
+	backupPath := s.setting.Get(models.SettingKeyBackupPath) + "/postgresql"
+	ext := filepath.Ext(backupFile)
+	backupFile = backupPath + "/" + backupFile
+	if !tools.Exists(backupFile) {
+		return errors.New("备份文件不存在")
+	}
+
+	switch ext {
+	case ".zip":
+		tools.Exec("unzip -o " + backupFile + " -d " + backupPath)
+		backupFile = strings.TrimSuffix(backupFile, ext)
+	case ".gz":
+		if strings.HasSuffix(backupFile, ".tar.gz") {
+			// 解压.tar.gz文件
+			tools.Exec("tar -zxvf " + backupFile + " -C " + backupPath)
+			backupFile = strings.TrimSuffix(backupFile, ".tar.gz")
+		} else {
+			// 解压.gz文件
+			tools.Exec("gzip -d " + backupFile)
+			backupFile = strings.TrimSuffix(backupFile, ext)
+		}
+	case ".bz2":
+		tools.Exec("bzip2 -d " + backupFile)
+		backupFile = strings.TrimSuffix(backupFile, ext)
+	case ".tar":
+		tools.Exec("tar -xvf " + backupFile + " -C " + backupPath)
+		backupFile = strings.TrimSuffix(backupFile, ext)
+	case ".rar":
+		tools.Exec("unrar x " + backupFile + " " + backupPath)
+		backupFile = strings.TrimSuffix(backupFile, ext)
+	}
+
+	if !tools.Exists(backupFile) {
+		return errors.New("自动解压失败，请手动解压")
+	}
+
+	tools.Exec(`su - postgres -c "psql ` + database + `" < ` + backupFile)
+
+	return nil
+}

app/services/cron.go

@@ -22,11 +22,11 @@ func NewCronImpl() *CronImpl {
 // AddToSystem 添加到系统
 func (r *CronImpl) AddToSystem(cron models.Cron) {
 	if tools.IsRHEL() {
-		tools.ExecShell("echo \"" + cron.Time + " " + cron.Shell + " >> " + cron.Log + " 2>&1\" >> /var/spool/cron/root")
-		tools.ExecShell("systemctl restart crond")
+		tools.Exec("echo \"" + cron.Time + " " + cron.Shell + " >> " + cron.Log + " 2>&1\" >> /var/spool/cron/root")
+		tools.Exec("systemctl restart crond")
 	} else {
-		tools.ExecShell("echo \"" + cron.Time + " " + cron.Shell + " >> " + cron.Log + " 2>&1\" >> /var/spool/cron/crontabs/root")
-		tools.ExecShell("systemctl restart cron")
+		tools.Exec("echo \"" + cron.Time + " " + cron.Shell + " >> " + cron.Log + " 2>&1\" >> /var/spool/cron/crontabs/root")
+		tools.Exec("systemctl restart cron")
 	}
 }
 
@@ -35,10 +35,10 @@ func (r *CronImpl) DeleteFromSystem(cron models.Cron) {
 	// 需要转义Shell路径的/为\/
 	cron.Shell = strings.ReplaceAll(cron.Shell, "/", "\\/")
 	if tools.IsRHEL() {
-		tools.ExecShell("sed -i '/" + cron.Shell + "/d' /var/spool/cron/root")
-		tools.ExecShell("systemctl restart crond")
+		tools.Exec("sed -i '/" + cron.Shell + "/d' /var/spool/cron/root")
+		tools.Exec("systemctl restart crond")
 	} else {
-		tools.ExecShell("sed -i '/" + cron.Shell + "/d' /var/spool/cron/crontabs/root")
-		tools.ExecShell("systemctl restart cron")
+		tools.Exec("sed -i '/" + cron.Shell + "/d' /var/spool/cron/crontabs/root")
+		tools.Exec("systemctl restart cron")
 	}
 }

app/services/plugin.go

@@ -5,6 +5,7 @@ import (
 	"github.com/goravel/framework/facades"
 
 	"panel/app/models"
+	"panel/app/plugins/fail2ban"
 	"panel/app/plugins/mysql57"
 	"panel/app/plugins/mysql80"
 	"panel/app/plugins/openresty"
@@ -13,8 +14,13 @@ import (
 	"panel/app/plugins/php81"
 	"panel/app/plugins/php82"
 	"panel/app/plugins/phpmyadmin"
+	"panel/app/plugins/postgresql15"
+	"panel/app/plugins/postgresql16"
+	"panel/app/plugins/pureftpd"
+	"panel/app/plugins/redis"
 	"panel/app/plugins/s3fs"
 	"panel/app/plugins/supervisor"
+	"panel/app/plugins/toolbox"
 )
 
 // PanelPlugin 插件元数据结构
@@ -91,6 +97,28 @@ func (r *PluginImpl) All() []PanelPlugin {
 		Uninstall:   mysql80.Uninstall,
 		Update:      mysql80.Update,
 	})
+	p = append(p, PanelPlugin{
+		Name:        postgresql15.Name,
+		Description: postgresql15.Description,
+		Slug:        postgresql15.Slug,
+		Version:     postgresql15.Version,
+		Requires:    postgresql15.Requires,
+		Excludes:    postgresql15.Excludes,
+		Install:     postgresql15.Install,
+		Uninstall:   postgresql15.Uninstall,
+		Update:      postgresql15.Update,
+	})
+	p = append(p, PanelPlugin{
+		Name:        postgresql16.Name,
+		Description: postgresql16.Description,
+		Slug:        postgresql16.Slug,
+		Version:     postgresql16.Version,
+		Requires:    postgresql16.Requires,
+		Excludes:    postgresql16.Excludes,
+		Install:     postgresql16.Install,
+		Uninstall:   postgresql16.Uninstall,
+		Update:      postgresql16.Update,
+	})
 	p = append(p, PanelPlugin{
 		Name:        php74.Name,
 		Description: php74.Description,
@@ -146,6 +174,28 @@ func (r *PluginImpl) All() []PanelPlugin {
 		Uninstall:   phpmyadmin.Uninstall,
 		Update:      phpmyadmin.Update,
 	})
+	p = append(p, PanelPlugin{
+		Name:        pureftpd.Name,
+		Description: pureftpd.Description,
+		Slug:        pureftpd.Slug,
+		Version:     pureftpd.Version,
+		Requires:    pureftpd.Requires,
+		Excludes:    pureftpd.Excludes,
+		Install:     pureftpd.Install,
+		Uninstall:   pureftpd.Uninstall,
+		Update:      pureftpd.Update,
+	})
+	p = append(p, PanelPlugin{
+		Name:        redis.Name,
+		Description: redis.Description,
+		Slug:        redis.Slug,
+		Version:     redis.Version,
+		Requires:    redis.Requires,
+		Excludes:    redis.Excludes,
+		Install:     redis.Install,
+		Uninstall:   redis.Uninstall,
+		Update:      redis.Update,
+	})
 	p = append(p, PanelPlugin{
 		Name:        s3fs.Name,
 		Description: s3fs.Description,
@@ -168,6 +218,28 @@ func (r *PluginImpl) All() []PanelPlugin {
 		Uninstall:   supervisor.Uninstall,
 		Update:      supervisor.Update,
 	})
+	p = append(p, PanelPlugin{
+		Name:        fail2ban.Name,
+		Description: fail2ban.Description,
+		Slug:        fail2ban.Slug,
+		Version:     fail2ban.Version,
+		Requires:    fail2ban.Requires,
+		Excludes:    fail2ban.Excludes,
+		Install:     fail2ban.Install,
+		Uninstall:   fail2ban.Uninstall,
+		Update:      fail2ban.Update,
+	})
+	p = append(p, PanelPlugin{
+		Name:        toolbox.Name,
+		Description: toolbox.Description,
+		Slug:        toolbox.Slug,
+		Version:     toolbox.Version,
+		Requires:    toolbox.Requires,
+		Excludes:    toolbox.Excludes,
+		Install:     toolbox.Install,
+		Uninstall:   toolbox.Uninstall,
+		Update:      toolbox.Update,
+	})
 
 	return p
 }

app/services/website.go

@@ -2,9 +2,12 @@
 package services
 
 import (
+	"crypto/x509"
+	"encoding/pem"
 	"errors"
 	"fmt"
 	"regexp"
+	"strconv"
 	"strings"
 
 	"github.com/goravel/framework/facades"
@@ -19,36 +22,43 @@ type Website interface {
 	Add(website PanelWebsite) (models.Website, error)
 	Delete(id int) error
 	GetConfig(id int) (WebsiteSetting, error)
+	GetConfigByName(name string) (WebsiteSetting, error)
 }
 
 type PanelWebsite struct {
-	Name       string `json:"name"`
-	Status     bool   `json:"status"`
-	Domain     string `json:"domain"`
-	Path       string `json:"path"`
-	Php        int    `json:"php"`
-	Ssl        bool   `json:"ssl"`
-	Remark     string `json:"remark"`
-	Db         bool   `json:"db"`
-	DbType     string `json:"db_type"`
-	DbName     string `json:"db_name"`
-	DbUser     string `json:"db_user"`
-	DbPassword string `json:"db_password"`
+	Name       string   `json:"name"`
+	Status     bool     `json:"status"`
+	Domains    []string `json:"domains"`
+	Ports      []string `json:"ports"`
+	Path       string   `json:"path"`
+	Php        int      `json:"php"`
+	Ssl        bool     `json:"ssl"`
+	Remark     string   `json:"remark"`
+	Db         bool     `json:"db"`
+	DbType     string   `json:"db_type"`
+	DbName     string   `json:"db_name"`
+	DbUser     string   `json:"db_user"`
+	DbPassword string   `json:"db_password"`
 }
 
 // WebsiteSetting 网站设置
 type WebsiteSetting struct {
 	Name              string   `json:"name"`
-	Ports             []string `json:"ports"`
 	Domains           []string `json:"domains"`
+	Ports             []string `json:"ports"`
 	Root              string   `json:"root"`
 	Path              string   `json:"path"`
 	Index             string   `json:"index"`
-	Php               int      `json:"php"`
+	Php               string   `json:"php"`
 	OpenBasedir       bool     `json:"open_basedir"`
 	Ssl               bool     `json:"ssl"`
 	SslCertificate    string   `json:"ssl_certificate"`
 	SslCertificateKey string   `json:"ssl_certificate_key"`
+	SslNotBefore      string   `json:"ssl_not_before"`
+	SslNotAfter       string   `json:"ssl_not_after"`
+	SSlDNSNames       []string `json:"ssl_dns_names"`
+	SslIssuer         string   `json:"ssl_issuer"`
+	SslOCSPServer     []string `json:"ssl_ocsp_server"`
 	HttpRedirect      bool     `json:"http_redirect"`
 	Hsts              bool     `json:"hsts"`
 	Waf               bool     `json:"waf"`
@@ -100,7 +110,6 @@ func (r *WebsiteImpl) Add(website PanelWebsite) (models.Website, error) {
 
 	website.Ssl = false
 	website.Status = true
-	website.Domain = strings.TrimSpace(website.Domain)
 
 	w := models.Website{
 		Name:   website.Name,
@@ -119,44 +128,81 @@ func (r *WebsiteImpl) Add(website PanelWebsite) (models.Website, error) {
 	index := `<!DOCTYPE html>
 <html lang="zh-CN">
 <head>
-<meta charset="utf-8">
-<title>耗子Linux面板</title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>耗子Linux面板</title>
+    <style>
+        body {
+            background-color: #f9f9f9;
+            margin: 0;
+            padding: 0;
+        }
+        .container {
+            max-width: 800px;
+            margin: 2em auto;
+            background-color: #ffffff;
+            padding: 20px;
+            border-radius: 12px;
+            box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+        }
+        h1 {
+            font-size: 2.5em;
+            margin-top: 0;
+            margin-bottom: 20px;
+            text-align: center;
+            color: #333;
+            border-bottom: 2px solid #ddd;
+            padding-bottom: 0.5em;
+        }
+        p {
+            color: #555;
+            line-height: 1.8;
+        }
+        @media screen and (max-width: 768px) {
+            .container {
+                padding: 15px;
+                margin: 2em 15px;
+            }
+            h1 {
+                font-size: 1.8em;
+            }
+        }
+    </style>
 </head>
 <body>
-<h1>耗子Linux面板</h1>
-<p>这是耗子Linux面板的网站默认页面！</p>
-<p>当您看到此页面，说明您的网站已创建成功。</p>
+    <div class="container">
+        <h1>耗子Linux面板</h1>
+        <p>这是耗子Linux面板的网站默认页面！</p>
+        <p>当您看到此页面，说明您的网站已创建成功。</p>
+    </div>
 </body>
 </html>
+
 `
-	tools.WriteFile(website.Path+"/index.html", index, 0644)
+	tools.Write(website.Path+"/index.html", index, 0644)
 
-	domainArr := strings.Split(website.Domain, "\n")
 	portList := ""
-	portArr := make(map[string]bool)
 	domainList := ""
-	for key, value := range domainArr {
-		temp := strings.Split(value, ":")
-		domainList += " " + temp[0]
+	portUsed := make(map[string]bool)
+	domainUsed := make(map[string]bool)
 
-		if len(temp) < 2 {
-			if _, ok := portArr["80"]; !ok {
-				if key == len(domainArr)-1 {
-					portList += "    listen 80;"
-				} else {
-					portList += "    listen 80;\n"
-				}
-				portArr["80"] = true
-			}
-		} else {
-			if _, ok := portArr[temp[1]]; !ok {
-				if key == len(domainArr)-1 {
-					portList += "    listen " + temp[1] + ";"
-				} else {
-					portList += "    listen " + temp[1] + ";\n"
-				}
-				portArr[temp[1]] = true
+	for i, port := range website.Ports {
+		if _, ok := portUsed[port]; !ok {
+			if i == len(website.Ports)-1 {
+				portList += "    listen " + port + ";"
+			} else {
+				portList += "    listen " + port + ";\n"
 			}
+			portUsed[port] = true
+		}
+	}
+	if len(website.Ports) == 0 {
+		portList += "    listen 80;\n"
+	}
+	for _, domain := range website.Domains {
+		if _, ok := domainUsed[domain]; !ok {
+			domainList += " " + domain
+			domainUsed[domain] = true
 		}
 	}
 
@@ -217,24 +263,30 @@ server
 }
 `, portList, domainList, website.Path, website.Php, website.Name, website.Name, website.Name)
 
-	tools.WriteFile("/www/server/vhost/"+website.Name+".conf", nginxConf, 0644)
-	tools.WriteFile("/www/server/vhost/rewrite/"+website.Name+".conf", "", 0644)
-	tools.WriteFile("/www/server/vhost/ssl/"+website.Name+".pem", "", 0644)
-	tools.WriteFile("/www/server/vhost/ssl/"+website.Name+".key", "", 0644)
+	tools.Write("/www/server/vhost/"+website.Name+".conf", nginxConf, 0644)
+	tools.Write("/www/server/vhost/rewrite/"+website.Name+".conf", "", 0644)
+	tools.Write("/www/server/vhost/ssl/"+website.Name+".pem", "", 0644)
+	tools.Write("/www/server/vhost/ssl/"+website.Name+".key", "", 0644)
 
 	tools.Chmod(r.setting.Get(models.SettingKeyWebsitePath), 0755)
 	tools.Chmod(website.Path, 0755)
 	tools.Chown(r.setting.Get(models.SettingKeyWebsitePath), "www", "www")
 	tools.Chown(website.Path, "www", "www")
 
-	tools.ExecShell("systemctl reload openresty")
+	tools.Exec("systemctl reload openresty")
 
 	rootPassword := r.setting.Get(models.SettingKeyMysqlRootPassword)
 	if website.Db && website.DbType == "mysql" {
-		tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"CREATE DATABASE IF NOT EXISTS " + website.DbName + " DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_general_ci;\"")
-		tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"CREATE USER '" + website.DbUser + "'@'localhost' IDENTIFIED BY '" + website.DbPassword + "';\"")
-		tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"GRANT ALL PRIVILEGES ON " + website.DbName + ".* TO '" + website.DbUser + "'@'localhost';\"")
-		tools.ExecShell("mysql -uroot -p" + rootPassword + " -e \"FLUSH PRIVILEGES;\"")
+		tools.Exec(`/www/server/mysql/bin/mysql -uroot -p` + rootPassword + ` -e "CREATE DATABASE IF NOT EXISTS ` + website.DbName + ` DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_general_ci;"`)
+		tools.Exec(`/www/server/mysql/bin/mysql -uroot -p` + rootPassword + ` -e "CREATE USER '` + website.DbUser + `'@'localhost' IDENTIFIED BY '` + website.DbPassword + `';"`)
+		tools.Exec(`/www/server/mysql/bin/mysql -uroot -p` + rootPassword + ` -e "GRANT ALL PRIVILEGES ON ` + website.DbName + `.* TO '` + website.DbUser + `'@'localhost';"`)
+		tools.Exec(`/www/server/mysql/bin/mysql -uroot -p` + rootPassword + ` -e "FLUSH PRIVILEGES;"`)
+	}
+	if website.Db && website.DbType == "postgresql" {
+		tools.Exec(`echo "CREATE DATABASE ` + website.DbName + `;" | su - postgres -c "psql"`)
+		tools.Exec(`echo "CREATE USER ` + website.DbUser + ` WITH PASSWORD '` + website.DbPassword + `';" | su - postgres -c "psql"`)
+		tools.Exec(`echo "ALTER DATABASE ` + website.DbName + ` OWNER TO ` + website.DbUser + `;" | su - postgres -c "psql"`)
+		tools.Exec(`echo "GRANT ALL PRIVILEGES ON DATABASE ` + website.DbName + ` TO ` + website.DbUser + `;" | su - postgres -c "psql"`)
 	}
 
 	return w, nil
@@ -251,13 +303,13 @@ func (r *WebsiteImpl) Delete(id int) error {
 		return err
 	}
 
-	tools.RemoveFile("/www/server/vhost/" + website.Name + ".conf")
-	tools.RemoveFile("/www/server/vhost/rewrite/" + website.Name + ".conf")
-	tools.RemoveFile("/www/server/vhost/ssl/" + website.Name + ".pem")
-	tools.RemoveFile("/www/server/vhost/ssl/" + website.Name + ".key")
-	tools.RemoveFile(website.Path)
+	tools.Remove("/www/server/vhost/" + website.Name + ".conf")
+	tools.Remove("/www/server/vhost/rewrite/" + website.Name + ".conf")
+	tools.Remove("/www/server/vhost/ssl/" + website.Name + ".pem")
+	tools.Remove("/www/server/vhost/ssl/" + website.Name + ".key")
+	tools.Remove(website.Path)
 
-	tools.ExecShell("systemctl reload openresty")
+	tools.Exec("systemctl reload openresty")
 
 	return nil
 }
@@ -269,13 +321,13 @@ func (r *WebsiteImpl) GetConfig(id int) (WebsiteSetting, error) {
 		return WebsiteSetting{}, err
 	}
 
-	config := tools.ReadFile("/www/server/vhost/" + website.Name + ".conf")
+	config := tools.Read("/www/server/vhost/" + website.Name + ".conf")
 
 	var setting WebsiteSetting
 	setting.Name = website.Name
 	setting.Path = website.Path
 	setting.Ssl = website.Ssl
-	setting.Php = website.Php
+	setting.Php = strconv.Itoa(website.Php)
 	setting.Raw = config
 
 	ports := tools.Cut(config, "# port标记位开始", "# port标记位结束")
@@ -303,7 +355,7 @@ func (r *WebsiteImpl) GetConfig(id int) (WebsiteSetting, error) {
 	}
 
 	if tools.Exists(setting.Root + "/.user.ini") {
-		userIni := tools.ReadFile(setting.Path + "/.user.ini")
+		userIni := tools.Read(setting.Path + "/.user.ini")
 		if strings.Contains(userIni, "open_basedir") {
 			setting.OpenBasedir = true
 		} else {
@@ -313,21 +365,26 @@ func (r *WebsiteImpl) GetConfig(id int) (WebsiteSetting, error) {
 		setting.OpenBasedir = false
 	}
 
+	setting.SslCertificate = tools.Read("/www/server/vhost/ssl/" + website.Name + ".pem")
+	setting.SslCertificateKey = tools.Read("/www/server/vhost/ssl/" + website.Name + ".key")
 	if setting.Ssl {
 		ssl := tools.Cut(config, "# ssl标记位开始", "# ssl标记位结束")
-		match = regexp.MustCompile(`ssl_certificate\s+(.*);`).FindStringSubmatch(ssl)
-		if len(match) > 1 {
-			setting.SslCertificate = tools.ReadFile(match[1])
-		}
-		match = regexp.MustCompile(`ssl_certificate_key\s+(.*);`).FindStringSubmatch(ssl)
-		if len(match) > 1 {
-			setting.SslCertificateKey = tools.ReadFile(match[1])
-		}
 		setting.HttpRedirect = strings.Contains(ssl, "# http重定向标记位")
 		setting.Hsts = strings.Contains(ssl, "# hsts标记位")
+
+		certData := tools.Read("/www/server/vhost/ssl/" + website.Name + ".pem")
+		block, _ := pem.Decode([]byte(certData))
+		if block != nil {
+			cert, err := x509.ParseCertificate(block.Bytes)
+			if err == nil {
+				setting.SslNotBefore = cert.NotBefore.Format("2006-01-02 15:04:05")
+				setting.SslNotAfter = cert.NotAfter.Format("2006-01-02 15:04:05")
+				setting.SslIssuer = cert.Issuer.CommonName
+				setting.SslOCSPServer = cert.OCSPServer
+				setting.SSlDNSNames = cert.DNSNames
+			}
+		}
 	} else {
-		setting.SslCertificate = ""
-		setting.SslCertificateKey = ""
 		setting.HttpRedirect = false
 		setting.Hsts = false
 	}
@@ -347,8 +404,18 @@ func (r *WebsiteImpl) GetConfig(id int) (WebsiteSetting, error) {
 		setting.WafCache = match[1]
 	}
 
-	setting.Rewrite = tools.ReadFile("/www/server/vhost/rewrite/" + website.Name + ".conf")
-	setting.Log = tools.ExecShell(`tail -n 100 '/www/wwwlogs/` + website.Name + `.log'`)
+	setting.Rewrite = tools.Read("/www/server/vhost/rewrite/" + website.Name + ".conf")
+	setting.Log = tools.Escape(tools.Exec(`tail -n 100 '/www/wwwlogs/` + website.Name + `.log'`))
 
 	return setting, nil
 }
+
+// GetConfigByName 根据网站名称获取网站配置
+func (r *WebsiteImpl) GetConfigByName(name string) (WebsiteSetting, error) {
+	var website models.Website
+	if err := facades.Orm().Query().Where("name", name).First(&website); err != nil {
+		return WebsiteSetting{}, err
+	}
+
+	return r.GetConfig(int(website.ID))
+}

bootstrap/app.go

@@ -2,7 +2,6 @@ package bootstrap
 
 import (
 	"github.com/goravel/framework/foundation"
-	"github.com/goravel/framework/support/carbon"
 
 	"panel/config"
 )
@@ -15,7 +14,4 @@ func Boot() {
 
 	// Bootstrap the config.
 	config.Boot()
-
-	// 设置 Carbon 时区
-	carbon.SetTimezone(carbon.PRC)
 }

config/app.go

@@ -18,7 +18,9 @@ import (
 	"github.com/goravel/framework/route"
 	"github.com/goravel/framework/schedule"
 	"github.com/goravel/framework/support/carbon"
+	"github.com/goravel/framework/testing"
 	"github.com/goravel/framework/validation"
+	"github.com/goravel/gin"
 
 	"panel/app/providers"
 )
@@ -51,7 +53,7 @@ func init() {
 		// Here you may specify the default timezone for your application.
 		// Example: UTC, Asia/Shanghai
 		// More: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-		"timezone": carbon.UTC,
+		"timezone": carbon.PRC,
 
 		// Encryption Key
 		//
@@ -80,6 +82,7 @@ func init() {
 			&crypt.ServiceProvider{},
 			&filesystem.ServiceProvider{},
 			&validation.ServiceProvider{},
+			&testing.ServiceProvider{},
 			&providers.AppServiceProvider{},
 			&providers.AuthServiceProvider{},
 			&providers.RouteServiceProvider{},
@@ -87,6 +90,8 @@ func init() {
 			&providers.QueueServiceProvider{},
 			&providers.EventServiceProvider{},
 			&providers.ValidationServiceProvider{},
+			&providers.DatabaseServiceProvider{},
+			&gin.ServiceProvider{},
 		},
 	})
 }

config/cors.go

@@ -14,10 +14,11 @@ func init() {
 		// in web browsers. You are free to adjust these settings as needed.
 		//
 		// To learn more: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
+		"paths":                []string{"*"},
 		"allowed_methods":      []string{"*"},
 		"allowed_origins":      []string{"*"},
 		"allowed_headers":      []string{"*"},
-		"exposed_headers":      []string{"*"},
+		"exposed_headers":      []string{""},
 		"max_age":              0,
 		"supports_credentials": false,
 	})

config/http.go

@@ -1,12 +1,24 @@
 package config
 
 import (
+	"github.com/goravel/framework/contracts/route"
 	"github.com/goravel/framework/facades"
+	ginfacades "github.com/goravel/gin/facades"
 )
 
 func init() {
 	config := facades.Config()
 	config.Add("http", map[string]any{
+		// HTTP Driver
+		"default": "gin",
+		// HTTP Drivers
+		"drivers": map[string]any{
+			"gin": map[string]any{
+				"route": func() (route.Route, error) {
+					return ginfacades.Route("gin"), nil
+				},
+			},
+		},
 		// HTTP URL
 		"url": "http://localhost",
 		// HTTP Host

config/jwt.go

@@ -32,7 +32,7 @@ func init() {
 		// the original token being created until they must re-authenticate.
 		// Defaults to 2 weeks.
 		//
-		// You can also set this to null, to yield an infinite refresh time.
+		// You can also set this to 0, to yield an infinite refresh time.
 		// Some may want this instead of never expiring tokens for e.g. a mobile app.
 		// This is not particularly recommended, so make sure you have appropriate
 		// systems in place to revoke the token if necessary.

config/panel.go

@@ -7,7 +7,7 @@ import (
 func init() {
 	config := facades.Config()
 	config.Add("panel", map[string]any{
-		"name":    "耗子面板",
-		"version": "v2.0.21",
+		"name":    "耗子Linux面板",
+		"version": "v2.1.3",
 	})
 }

database/seeders/database_seeder.go

@@ -0,0 +1,14 @@
+package seeders
+
+type DatabaseSeeder struct {
+}
+
+// Signature The name and signature of the seeder.
+func (s *DatabaseSeeder) Signature() string {
+	return "DatabaseSeeder"
+}
+
+// Run executes the seeder logic.
+func (s *DatabaseSeeder) Run() error {
+	return nil
+}

go.mod

@@ -3,28 +3,29 @@ module panel
 go 1.18
 
 require (
-	github.com/bytedance/sonic v1.9.2
+	github.com/bytedance/sonic v1.10.2
 	github.com/gertd/go-pluralize v0.2.1
 	github.com/gin-contrib/static v0.0.1
 	github.com/gookit/color v1.5.4
-	github.com/goravel/framework v1.12.1-0.20230726100652-342097efc4ce
+	github.com/goravel/framework v1.13.2
+	github.com/goravel/gin v1.1.5
 	github.com/gorilla/websocket v1.5.0
-	github.com/iancoleman/strcase v0.2.0
-	github.com/imroc/req/v3 v3.37.2
+	github.com/iancoleman/strcase v0.3.0
+	github.com/imroc/req/v3 v3.42.1
 	github.com/mojocn/base64Captcha v1.3.5
 	github.com/shirou/gopsutil v3.21.11+incompatible
 	github.com/spf13/cast v1.5.1
 	github.com/stretchr/testify v1.8.4
-	golang.org/x/crypto v0.11.0
-	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
+	golang.org/x/crypto v0.14.0
+	golang.org/x/exp v0.0.0-20231006140011-7918f672742d
 )
 
 require (
-	cloud.google.com/go v0.110.0 // indirect
-	cloud.google.com/go/compute v1.19.1 // indirect
+	cloud.google.com/go v0.110.6 // indirect
+	cloud.google.com/go/compute v1.23.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/pubsub v1.30.0 // indirect
+	cloud.google.com/go/iam v1.1.1 // indirect
+	cloud.google.com/go/pubsub v1.33.0 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
 	github.com/Azure/go-autorest/autorest/adal v0.9.16 // indirect
@@ -37,21 +38,23 @@ require (
 	github.com/RichardKnop/machinery/v2 v2.0.11 // indirect
 	github.com/andybalholm/brotli v1.0.5 // indirect
 	github.com/aws/aws-sdk-go v1.37.16 // indirect
-	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
-	github.com/containerd/continuity v0.3.0 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+	github.com/chenzhuoyu/iasm v0.9.0 // indirect
+	github.com/cloudflare/circl v1.3.3 // indirect
+	github.com/containerd/continuity v0.4.2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/docker/cli v20.10.22+incompatible // indirect
-	github.com/docker/docker v20.10.24+incompatible // indirect
+	github.com/docker/cli v24.0.6+incompatible // indirect
+	github.com/docker/docker v24.0.6+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
-	github.com/gaukas/godicttls v0.0.3 // indirect
+	github.com/gaukas/godicttls v0.0.4 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/gin-gonic/gin v1.9.1 // indirect
 	github.com/glebarez/go-sqlite v1.21.2 // indirect
@@ -59,7 +62,7 @@ require (
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.14.1 // indirect
+	github.com/go-playground/validator/v10 v10.15.3 // indirect
 	github.com/go-redis/redis/v8 v8.11.5 // indirect
 	github.com/go-redsync/redsync/v4 v4.0.4 // indirect
 	github.com/go-sql-driver/mysql v1.7.1 // indirect
@@ -70,7 +73,7 @@ require (
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
 	github.com/golang-migrate/migrate/v4 v4.16.2 // indirect
-	github.com/golang-module/carbon/v2 v2.2.3 // indirect
+	github.com/golang-module/carbon/v2 v2.2.8 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
@@ -80,23 +83,23 @@ require (
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/gomodule/redigo v2.0.0+incompatible // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 // indirect
-	github.com/google/s2a-go v0.1.3 // indirect
+	github.com/google/pprof v0.0.0-20230907193218-d3ddc7976beb // indirect
+	github.com/google/s2a-go v0.1.4 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
 	github.com/google/wire v0.5.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
-	github.com/googleapis/gax-go/v2 v2.8.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.11.0 // indirect
 	github.com/gookit/filter v1.2.0 // indirect
 	github.com/gookit/goutil v0.6.12 // indirect
-	github.com/gookit/validate v1.5.0 // indirect
+	github.com/gookit/validate v1.5.1 // indirect
 	github.com/goravel/file-rotatelogs v0.0.0-20211215053220-2ab31dd9575c // indirect
 	github.com/goravel/file-rotatelogs/v2 v2.4.1 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/imdario/mergo v0.3.13 // indirect
+	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
 	github.com/jackc/pgx/v5 v5.3.1 // indirect
@@ -106,7 +109,7 @@ require (
 	github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kelseyhightower/envconfig v1.4.0 // indirect
-	github.com/klauspost/compress v1.16.6 // indirect
+	github.com/klauspost/compress v1.16.7 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/lestrrat-go/strftime v1.0.5 // indirect
@@ -118,24 +121,25 @@ require (
 	github.com/moby/term v0.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/onsi/ginkgo/v2 v2.11.0 // indirect
+	github.com/onsi/ginkgo/v2 v2.12.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.2 // indirect
-	github.com/opencontainers/runc v1.1.5 // indirect
+	github.com/opencontainers/runc v1.1.9 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/ory/dockertest/v3 v3.10.0 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
-	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
-	github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
-	github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
-	github.com/quic-go/quic-go v0.36.0 // indirect
-	github.com/refraction-networking/utls v1.3.2 // indirect
+	github.com/quic-go/qtls-go1-20 v0.3.4 // indirect
+	github.com/quic-go/quic-go v0.38.1 // indirect
+	github.com/refraction-networking/utls v1.5.3 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
+	github.com/rotisserie/eris v0.5.4 // indirect
+	github.com/rs/cors v1.10.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/afero v1.9.5 // indirect
@@ -149,6 +153,7 @@ require (
 	github.com/tklauser/numcpus v0.6.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
+	github.com/unrolled/secure v1.13.0 // indirect
 	github.com/urfave/cli/v2 v2.25.7 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.1 // indirect
@@ -163,30 +168,30 @@ require (
 	go.mongodb.org/mongo-driver v1.7.5 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
-	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/image v0.0.0-20190802002840-cff245a6509b // indirect
-	golang.org/x/mod v0.11.0 // indirect
-	golang.org/x/net v0.11.0 // indirect
-	golang.org/x/oauth2 v0.7.0 // indirect
-	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
-	golang.org/x/tools v0.10.0 // indirect
-	google.golang.org/api v0.122.0 // indirect
+	golang.org/x/arch v0.5.0 // indirect
+	golang.org/x/image v0.11.0 // indirect
+	golang.org/x/mod v0.13.0 // indirect
+	golang.org/x/net v0.16.0 // indirect
+	golang.org/x/oauth2 v0.10.0 // indirect
+	golang.org/x/sync v0.4.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/tools v0.14.0 // indirect
+	google.golang.org/api v0.126.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230525234025-438c736192d0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
-	google.golang.org/grpc v1.56.2 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
+	google.golang.org/grpc v1.58.2 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gorm.io/driver/mysql v1.5.1 // indirect
 	gorm.io/driver/postgres v1.5.2 // indirect
 	gorm.io/driver/sqlserver v1.5.1 // indirect
-	gorm.io/gorm v1.25.2 // indirect
-	gorm.io/plugin/dbresolver v1.4.1 // indirect
+	gorm.io/gorm v1.25.4 // indirect
+	gorm.io/plugin/dbresolver v1.4.7 // indirect
 	modernc.org/libc v1.22.5 // indirect
 	modernc.org/mathutil v1.5.0 // indirect
 	modernc.org/memory v1.5.0 // indirect

go.sum

@@ -17,31 +17,30 @@ cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHOb
 cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
 cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
 cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
-cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys=
-cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY=
+cloud.google.com/go v0.110.6 h1:8uYAkj3YHTP/1iwReuHPxLSbdcyc+dSBbzFMrVwDR6Q=
+cloud.google.com/go v0.110.6/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
 cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/compute v1.19.1 h1:am86mquDUgjGNWxiGn+5PGLbmgiWXlE/yNWpIpNvuXY=
-cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE=
+cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY=
+cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=
 cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
 cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k=
-cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0=
-cloud.google.com/go/kms v1.10.1 h1:7hm1bRqGCA1GBRQUrp831TwJ9TWhP+tvLuP497CQS2g=
-cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM=
+cloud.google.com/go/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y=
+cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU=
+cloud.google.com/go/kms v1.15.0 h1:xYl5WEaSekKYN5gGRyhjvZKM22GVBBCzegGNVPy+aIs=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
 cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
 cloud.google.com/go/pubsub v1.10.0/go.mod h1:eNpTrkOy7dCpkNyaSNetMa6udbgecJMd0ZsTJS/cuNo=
-cloud.google.com/go/pubsub v1.30.0 h1:vCge8m7aUKBJYOgrZp7EsNDf6QMd2CAlXZqWTn3yq6s=
-cloud.google.com/go/pubsub v1.30.0/go.mod h1:qWi1OPS0B+b5L+Sg6Gmc9zD1Y+HaM0MdUr7LsupY1P4=
+cloud.google.com/go/pubsub v1.33.0 h1:6SPCPvWav64tj0sVX/+npCBKhUi/UjJehy9op/V3p2g=
+cloud.google.com/go/pubsub v1.33.0/go.mod h1:f+w71I33OMyxf9VpMVcZbnG5KSUkCOUHYpFd5U1GdRc=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
@@ -85,25 +84,29 @@ github.com/aws/aws-sdk-go v1.37.16 h1:Q4YOP2s00NpB9wfmTDZArdcLRuG9ijbnoAwTW3ivle
 github.com/aws/aws-sdk-go v1.37.16/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
-github.com/brianvoe/gofakeit/v6 v6.23.0 h1:pgVhyWpYq4e0GEVCh2gdZnS/nBX+8SnyTBliHg5xjks=
+github.com/brianvoe/gofakeit/v6 v6.23.2 h1:lVde18uhad5wII/f5RMVFLtdQNE0HaGFuBUXmYKk8i8=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
-github.com/bytedance/sonic v1.9.2 h1:GDaNjuWSGu09guE9Oql0MSTNhNCLlWwO8y/xM5BzcbM=
-github.com/bytedance/sonic v1.9.2/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
-github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4=
-github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
+github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
+github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE=
+github.com/bytedance/sonic v1.10.2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
+github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
+github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E=
 github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
-github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
+github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0=
+github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA=
+github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo=
+github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs=
+github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
@@ -111,15 +114,12 @@ github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XP
 github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
-github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
-github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM=
-github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM=
+github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
-github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -128,14 +128,13 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cu
 github.com/dhui/dktest v0.3.16 h1:i6gq2YQEtcrjKbeJpBkWjE8MmLZPYllcjOFbTZuPDnw=
 github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/docker/cli v20.10.22+incompatible h1:0E7UqWPcn4SlvLImMHyh6xwyNRUGdPxhstpHeh0bFL0=
-github.com/docker/cli v20.10.22+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY=
+github.com/docker/cli v24.0.6+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
-github.com/docker/docker v20.10.24+incompatible h1:Ugvxm7a8+Gz6vqQYQQ2W7GYq5EUPaAiuPgIfVyI3dYE=
-github.com/docker/docker v20.10.24+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v24.0.6+incompatible h1:hceabKCtUgDqPu+qm0NgsaXf28Ljf4/pWFL7xjWWDgE=
+github.com/docker/docker v24.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
-github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
@@ -148,7 +147,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
 github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239/go.mod h1:Gdwt2ce0yfBxPvZrHkprdPPTTS3N5rwmLE8T22KBXlw=
-github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
 github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
@@ -156,8 +154,8 @@ github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
 github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
-github.com/gaukas/godicttls v0.0.3 h1:YNDIf0d9adcxOijiLrEzpfZGAkNwLRzPaG6OjU7EITk=
-github.com/gaukas/godicttls v0.0.3/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
+github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
+github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
 github.com/gertd/go-pluralize v0.2.1 h1:M3uASbVjMnTsPb0PNqg+E/24Vwigyo/tvyMTtAlLgiA=
 github.com/gertd/go-pluralize v0.2.1/go.mod h1:rbYaKDbsXxmRfr8uygAEKhOWsjyrrqrkHVpZvoOp8zk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -189,8 +187,8 @@ github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
-github.com/go-playground/validator/v10 v10.14.1 h1:9c50NUPC30zyuKprjL3vNZ0m5oG+jU0zvx4AqHGnv4k=
-github.com/go-playground/validator/v10 v10.14.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+github.com/go-playground/validator/v10 v10.15.3 h1:S+sSpunYjNPDuXkWbK+x+bA7iXiW296KG4dL3X7xUZo=
+github.com/go-playground/validator/v10 v10.15.3/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg=
 github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
 github.com/go-redis/redis/v7 v7.4.0 h1:7obg6wUoj05T0EpY0o8B59S9w5yeMWql7sw2kwNW1x4=
@@ -236,8 +234,6 @@ github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/V
 github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
@@ -248,8 +244,8 @@ github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJ
 github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang-migrate/migrate/v4 v4.16.2 h1:8coYbMKUyInrFk1lfGfRovTLAW7PhWp8qQDT2iKfuoA=
 github.com/golang-migrate/migrate/v4 v4.16.2/go.mod h1:pfcJX4nPHaVdc5nmdCikFBWtm+UBpiZjRNNsyBbp0/o=
-github.com/golang-module/carbon/v2 v2.2.3 h1:WvGIc5+qzq9drNzH+Gnjh1TZ0JgDY/IA+m2Dvk7Qm4Q=
-github.com/golang-module/carbon/v2 v2.2.3/go.mod h1:LdzRApgmDT/wt0eNT8MEJbHfJdSqCtT46uZhfF30dqI=
+github.com/golang-module/carbon/v2 v2.2.8 h1:a1VxHHKAR7fc1ho7sYXhS1s5S4x7+oqAf2EY5p8C46A=
+github.com/golang-module/carbon/v2 v2.2.8/go.mod h1:XDALX7KgqmHk95xyLeaqX9/LJGbfLATyruTziq68SZ8=
 github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
 github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
@@ -324,26 +320,27 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf
 github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 h1:hR7/MlvK23p6+lIw9SN1TigNLn9ZnF3W4SYRKq2gAHs=
-github.com/google/pprof v0.0.0-20230602150820-91b7bce49751/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA=
+github.com/google/pprof v0.0.0-20230907193218-d3ddc7976beb h1:LCMfzVg3sflxTs4UvuP4D8CkoZnfHLe2qzqgDn/4OHs=
+github.com/google/pprof v0.0.0-20230907193218-d3ddc7976beb/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/s2a-go v0.1.3 h1:FAgZmpLl/SXurPEZyCMPBIiiYeTbqfjlbdnCNTAkbGE=
-github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
+github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
+github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/wire v0.5.0 h1:I7ELFeVBr3yfPIcc8+MWvrjk+3VjbcSzoXm3JVa+jD8=
 github.com/google/wire v0.5.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU=
 github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k=
 github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK67vJZc=
-github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=
+github.com/googleapis/gax-go/v2 v2.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4=
+github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
 github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0=
 github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w=
@@ -351,14 +348,16 @@ github.com/gookit/filter v1.2.0 h1:r7E01dHVkysb5WgzooiGsfblHGShEZCeGcyYM+5IpYU=
 github.com/gookit/filter v1.2.0/go.mod h1:bXs9RcB4Blxwny970opiwABeIEqQ/gzOMmHBhKwBdms=
 github.com/gookit/goutil v0.6.12 h1:73vPUcTtVGXbhSzBOFcnSB1aJl7Jq9np3RAE50yIDZc=
 github.com/gookit/goutil v0.6.12/go.mod h1:g6krlFib8xSe3G1h02IETowOtrUGpAmetT8IevDpvpM=
-github.com/gookit/validate v1.5.0 h1:aTy974I1vPDYPFzoFH4vtJONrK4oRDvjUxteUan7beE=
-github.com/gookit/validate v1.5.0/go.mod h1:SskOHUQokzMNt6T3r7N+N/4me/6fxDx+tmoXf/3ZQog=
+github.com/gookit/validate v1.5.1 h1:rPp64QZQJM+fysGFAhKpvekQAav4Ok6sjfTs9ZtxcpA=
+github.com/gookit/validate v1.5.1/go.mod h1:SskOHUQokzMNt6T3r7N+N/4me/6fxDx+tmoXf/3ZQog=
 github.com/goravel/file-rotatelogs v0.0.0-20211215053220-2ab31dd9575c h1:obhFK91JAhcf7s6h5sggZishm1VyGW/gBCreo+7/SwQ=
 github.com/goravel/file-rotatelogs v0.0.0-20211215053220-2ab31dd9575c/go.mod h1:YSWsLXlG16u5CWFaXNZHhEQD10+NwF3xfgDV816OwLE=
 github.com/goravel/file-rotatelogs/v2 v2.4.1 h1:ogkeIFcTHSBRUBpZYiyJbpul8hkVXxHPuDbOaP78O1M=
 github.com/goravel/file-rotatelogs/v2 v2.4.1/go.mod h1:euk9qr52WrzM8ICs1hecFcR4CZ/ZZOPdacHfvHgbOf0=
-github.com/goravel/framework v1.12.1-0.20230726100652-342097efc4ce h1:1qgkBySstIMAkzRjbrjPjF6J0UIKBfXY1osSfL7azNY=
-github.com/goravel/framework v1.12.1-0.20230726100652-342097efc4ce/go.mod h1:qLv6cmf4RqXkTZ782H38cY/7vhkFLamPV9pAU0s7nKQ=
+github.com/goravel/framework v1.13.2 h1:7BRNihQ/ZNeA384941yg8zRytXRXkkStksXNyyUEgQI=
+github.com/goravel/framework v1.13.2/go.mod h1:BOUTIwzhOMyKNXaxSYbVB74NkmbS2xv1W1fPRv9eDws=
+github.com/goravel/gin v1.1.5 h1:HWVBxSDHsfpq2lWvuagQVMJlCwznf6ifc71IYEo3sCE=
+github.com/goravel/gin v1.1.5/go.mod h1:FxnhnqcMJk/Sk6jA/xcXn6tHtFzayNXeFuw7GnLORMY=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
@@ -379,14 +378,14 @@ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0=
-github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
+github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=
+github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
-github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
-github.com/imroc/req/v3 v3.37.2 h1:vEemuA0cq9zJ6lhe+mSRhsZm951bT0CdiSH47+KTn6I=
-github.com/imroc/req/v3 v3.37.2/go.mod h1:DECzjVIrj6jcUr5n6e+z0ygmCO93rx4Jy0RjOEe1YCI=
+github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
+github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
+github.com/imroc/req/v3 v3.42.1 h1:g82SouLvX7pqwqJjpQJYrVvuI+LOycWhyuwxtLlyQJk=
+github.com/imroc/req/v3 v3.42.1/go.mod h1:W7dOrfQORA9nFoj+CafIZ6P5iyk+rWdbp2sffOAvABU=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
@@ -428,16 +427,16 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.16.6 h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk=
-github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
+github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
 github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -464,7 +463,6 @@ github.com/microsoft/go-mssqldb v1.1.0 h1:jsV+tpvcPTbNNKW0o3kiCD69kOHICsfjZ2VcVu
 github.com/microsoft/go-mssqldb v1.1.0/go.mod h1:LzkFdl4z2Ck+Hi+ycGOTbL56VEfgoyA2DvYejrNGbRk=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
 github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
 github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -479,7 +477,6 @@ github.com/mojocn/base64Captcha v1.3.5/go.mod h1:/tTTXn4WTpX9CfrmipqRytCpJ27Uw3G
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
-github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -488,22 +485,20 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108
 github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
 github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
-github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU=
-github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM=
+github.com/onsi/ginkgo/v2 v2.12.0 h1:UIVDowFPwpg6yMUpPjGkYvf06K3RAiJXUhCxEwQVHRI=
+github.com/onsi/ginkgo/v2 v2.12.0/go.mod h1:ZNEzXISYlqpb8S36iN71ifqLi3vVD1rVJGvWRCJOUpQ=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
-github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc=
+github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
 github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
-github.com/opencontainers/runc v1.1.5 h1:L44KXEpKmfWDcS02aeGm8QNTFXTo2D+8MYGDIJ/GDEs=
-github.com/opencontainers/runc v1.1.5/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg=
-github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
+github.com/opencontainers/runc v1.1.9 h1:XR0VIHTGce5eWPkaPesqTBrhW2yAcaraWfsEalNwQLM=
+github.com/opencontainers/runc v1.1.9/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
@@ -512,8 +507,8 @@ github.com/ory/dockertest/v3 v3.10.0/go.mod h1:nr57ZbRWMqfsdGdFNLHz5jjNdDb7VVFnz
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
-github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
-github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
+github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
+github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -525,14 +520,12 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
-github.com/quic-go/qtls-go1-19 v0.3.2 h1:tFxjCFcTQzK+oMxG6Zcvp4Dq8dx4yD3dDiIiyc86Z5U=
-github.com/quic-go/qtls-go1-19 v0.3.2/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
-github.com/quic-go/qtls-go1-20 v0.2.2 h1:WLOPx6OY/hxtTxKV1Zrq20FtXtDEkeY00CGQm8GEa3E=
-github.com/quic-go/qtls-go1-20 v0.2.2/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
-github.com/quic-go/quic-go v0.36.0 h1:JIrO7p7Ug6hssFcARjWDiqS2RAKJHCiwPxBAA989rbI=
-github.com/quic-go/quic-go v0.36.0/go.mod h1:zPetvwDlILVxt15n3hr3Gf/I3mDf7LpLKPhR4Ez0AZQ=
-github.com/refraction-networking/utls v1.3.2 h1:o+AkWB57mkcoW36ET7uJ002CpBWHu0KPxi6vzxvPnv8=
-github.com/refraction-networking/utls v1.3.2/go.mod h1:fmoaOww2bxzzEpIKOebIsnBvjQpqP7L2vcm/9KUfm/E=
+github.com/quic-go/qtls-go1-20 v0.3.4 h1:MfFAPULvst4yoMgY9QmtpYmfij/em7O8UUi+bNVm7Cg=
+github.com/quic-go/qtls-go1-20 v0.3.4/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
+github.com/quic-go/quic-go v0.38.1 h1:M36YWA5dEhEeT+slOu/SwMEucbYd0YFidxG3KlGPZaE=
+github.com/quic-go/quic-go v0.38.1/go.mod h1:ijnZM7JsFIkp4cRyjxJNIzdSfCLmUMg9wdyhGmg+SN4=
+github.com/refraction-networking/utls v1.5.3 h1:Ds5Ocg1+MC1ahNx5iBEcHe0jHeLaA/fLey61EENm7ro=
+github.com/refraction-networking/utls v1.5.3/go.mod h1:SPuDbBmgLGp8s+HLNc83FuavwZCFoMmExj+ltUHiHUw=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
@@ -545,18 +538,19 @@ github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE=
+github.com/rotisserie/eris v0.5.4 h1:Il6IvLdAapsMhvuOahHWiBnl1G++Q0/L5UIkI5mARSk=
+github.com/rotisserie/eris v0.5.4/go.mod h1:Z/kgYTJiJtocxCbFfvRmO+QejApzG6zpyky9G1A4g9s=
+github.com/rs/cors v1.10.0 h1:62NOS1h+r8p1mW6FM0FSB0exioXLhd/sh15KpjWBZ+8=
+github.com/rs/cors v1.10.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
@@ -588,14 +582,12 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203 h1:QVqDTf3h2WHt08YuiTGPZLls0Wq99X9bWd0Q5ZSBesM=
 github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203/go.mod h1:oqN97ltKNihBbwlX8dLpwxCl3+HnXKV/R0e+sRLd9C8=
 github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
 github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
-github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/tebeka/strftime v0.1.3/go.mod h1:7wJm3dZlpr4l/oVK0t1HYIc4rMzQ2XJlOMIUJUJH6XQ=
 github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
@@ -610,12 +602,10 @@ github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLY
 github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
 github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/unrolled/secure v1.13.0 h1:sdr3Phw2+f8Px8HE5sd1EHdj1aV3yUwed/uZXChLFsk=
-github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/unrolled/secure v1.13.0/go.mod h1:BmF5hyM6tXczk3MpQkFf1hpKSRqCyhqcbiQtiAF7+40=
 github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
 github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
-github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
-github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
@@ -671,8 +661,8 @@ go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
-golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/arch v0.5.0 h1:jpGode6huXQxcskEIpOCvrU+tzo81b6+oFLUYXWtH/Y=
+golang.org/x/arch v0.5.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
@@ -690,8 +680,8 @@ golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
-golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
-golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -702,12 +692,13 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
-golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190501045829-6d32002ffd75/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.11.0 h1:ds2RoQvBvYTiJkwpSFDwCcDFNX7DqjL2WsUgTNk0Ooo=
+golang.org/x/image v0.11.0/go.mod h1:bglhjqbqVuEb9e9+eNR45Jfu7D+T4Qan+NhQk8Ck2P8=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -732,8 +723,8 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
-golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
+golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -777,8 +768,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU=
-golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
+golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos=
+golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -789,8 +780,8 @@ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210113205817-d3ed898aa8a3/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g=
-golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=
+golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8=
+golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -805,8 +796,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
+golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -820,7 +811,6 @@ golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -828,8 +818,6 @@ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -865,9 +853,7 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -876,14 +862,14 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -897,8 +883,9 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
-golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -962,8 +949,8 @@ golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg=
-golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
+golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
+golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -988,8 +975,8 @@ google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ
 google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
 google.golang.org/api v0.39.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
 google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/api v0.122.0 h1:zDobeejm3E7pEG1mNHvdxvjs5XJoCMzyNH+CmwL94Es=
-google.golang.org/api v0.122.0/go.mod h1:gcitW0lvnyWjSp9nKxAbdHKIZ6vF4aajGueeslZOyms=
+google.golang.org/api v0.126.0 h1:q4GJq+cAdMAC7XP7njvQ4tvohGLiSlytuL4BQxbIZ+o=
+google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -1037,12 +1024,12 @@ google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6D
 google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210207032614-bba0dbe2a9ea/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20230525234025-438c736192d0 h1:x1vNwUhVOcsYoKyEGCZBH694SBmmBjA2EfauFVEI2+M=
-google.golang.org/genproto v0.0.0-20230525234025-438c736192d0/go.mod h1:9ExIQyXL5hZrHzQceCwuSYwZZ5QZBazOcprJ5rgs3lY=
-google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a h1:HiYVD+FGJkTo+9zj1gqz0anapsa1JxjiSrN+BJKyUmE=
-google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a/go.mod h1:ts19tUU+Z0ZShN1y3aPyq2+O3d5FUNNgT6FtOzmrNn8=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
+google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWofoFcihmDEMYeDR9KN/ThbPWGrh++g=
+google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8=
+google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e h1:z3vDksarJxsAKM5dmEGv0GHwE2hKJ096wZra71Vs4sw=
+google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -1062,8 +1049,8 @@ google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA5
 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
-google.golang.org/grpc v1.56.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI=
-google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
+google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I=
+google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -1076,9 +1063,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -1101,7 +1087,6 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/driver/mysql v1.4.3/go.mod h1:sSIebwZAVPiT+27jK9HIwvsqOGKx3YMPmrA3mBJR10c=
@@ -1112,12 +1097,12 @@ gorm.io/driver/postgres v1.5.2/go.mod h1:fmpX0m2I1PKuR7mKZiEluwrP3hbs+ps7JIGMUBp
 gorm.io/driver/sqlserver v1.5.1 h1:wpyW/pR26U94uaujltiFGXY7fd2Jw5hC9PB1ZF/Y5s4=
 gorm.io/driver/sqlserver v1.5.1/go.mod h1:AYHzzte2msKTmYBYsSIq8ZUsznLJwBdkB2wpI+kt0nM=
 gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
-gorm.io/gorm v1.24.3/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
 gorm.io/gorm v1.25.1/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-gorm.io/gorm v1.25.2 h1:gs1o6Vsa+oVKG/a9ElL3XgyGfghFfkKA2SInQaCyMho=
 gorm.io/gorm v1.25.2/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-gorm.io/plugin/dbresolver v1.4.1 h1:Ug4LcoPhrvqq71UhxtF346f+skTYoCa/nEsdjvHwEzk=
-gorm.io/plugin/dbresolver v1.4.1/go.mod h1:CTbCtMWhsjXSiJqiW2R8POvJ2cq18RVOl4WGyT5nhNc=
+gorm.io/gorm v1.25.4 h1:iyNd8fNAe8W9dvtlgeRI5zSVZPsq3OpcTu37cYcpCmw=
+gorm.io/gorm v1.25.4/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
+gorm.io/plugin/dbresolver v1.4.7 h1:ZwtwmJQxTx9us7o6zEHFvH1q4OeEo1pooU7efmnunJA=
+gorm.io/plugin/dbresolver v1.4.7/go.mod h1:l4Cn87EHLEYuqUncpEeTC2tTJQkjngPSD+lo8hIvcT0=
 gotest.tools/v3 v3.3.0 h1:MfDY1b1/0xN1CyMlQDac0ziEy9zJQd9CXBRRDHw2jJo=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -1134,6 +1119,7 @@ modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
 modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
 modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM=
 modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk=
+nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=

main.go

@@ -1,17 +1,18 @@
 /*
-Copyright 2022 HaoZi Technology Co., Ltd.
+Copyright (C) 2022 - now  HaoZi Technology Co., Ltd.
 
-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
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-http://www.apache.org/licenses/LICENSE-2.0
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
 
-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.
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package main
 

pkg/ssh/ssh.go

@@ -68,5 +68,5 @@ func NewSSHClient(conf *SSHClientConfig) (*ssh.Client, error) {
 }
 
 func getKey(keyPath string) (ssh.Signer, error) {
-	return ssh.ParsePrivateKey([]byte(tools.ReadFile(keyPath)))
+	return ssh.ParsePrivateKey([]byte(tools.Read(keyPath)))
 }

pkg/tools/os.go

@@ -19,5 +19,5 @@ func IsRHEL() bool {
 
 // IsArm 判断是否是 ARM 架构
 func IsArm() bool {
-	return runtime.GOARCH == "arm"
+	return runtime.GOARCH == "arm" || runtime.GOARCH == "arm64"
 }

pkg/tools/string.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"strings"
+	"text/template"
 	"unicode/utf8"
 )
 
@@ -78,3 +79,8 @@ func Cut(str, begin, end string) string {
 
 	return string([]rune(str)[b:e])
 }
+
+// Escape 转义字符串
+func Escape(str string) string {
+	return template.HTMLEscapeString(str)
+}

pkg/tools/system.go

@@ -1,16 +1,18 @@
 package tools
 
 import (
+	"fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
 
 	"github.com/goravel/framework/facades"
+	"github.com/goravel/framework/support"
 )
 
-// WriteFile 写入文件
-func WriteFile(path string, data string, permission os.FileMode) bool {
+// Write 写入文件
+func Write(path string, data string, permission os.FileMode) bool {
 	if err := os.MkdirAll(filepath.Dir(path), permission); err != nil {
 		facades.Log().Errorf("[面板][Helpers] 创建目录失败: %s", err.Error())
 		return false
@@ -25,8 +27,8 @@ func WriteFile(path string, data string, permission os.FileMode) bool {
 	return true
 }
 
-// ReadFile 读取文件
-func ReadFile(path string) string {
+// Read 读取文件
+func Read(path string) string {
 	data, err := os.ReadFile(path)
 	if err != nil {
 		facades.Log().Errorf("[面板][Helpers] 读取文件 %s 失败: %s", path, err.Error())
@@ -36,8 +38,8 @@ func ReadFile(path string) string {
 	return string(data)
 }
 
-// RemoveFile 删除文件
-func RemoveFile(path string) bool {
+// Remove 删除文件
+func Remove(path string) bool {
 	if err := os.Remove(path); err != nil {
 		facades.Log().Errorf("[面板][Helpers] 删除文件 %s 失败: %s", path, err.Error())
 		return false
@@ -46,32 +48,48 @@ func RemoveFile(path string) bool {
 	return true
 }
 
-// ExecShell 执行 shell 命令
-func ExecShell(shell string) string {
+// Exec 执行 shell 命令
+func Exec(shell string) string {
 	cmd := exec.Command("bash", "-c", shell)
 
 	output, err := cmd.CombinedOutput()
 	if err != nil {
-		facades.Log().Errorf("[面板][Helpers] 执行命令 %s 失败: %s", shell, err.Error())
+		if support.Env == support.EnvTest {
+			fmt.Println(string(output))
+			fmt.Println(err.Error())
+			panic(err)
+		} else {
+			facades.Log().Errorf("[面板][Helpers] 执行命令 %s 失败: %s", shell, err.Error())
+		}
 		return ""
 	}
 
 	return strings.TrimSpace(string(output))
 }
 
-// ExecShellAsync 异步执行 shell 命令
-func ExecShellAsync(shell string) {
+// ExecAsync 异步执行 shell 命令
+func ExecAsync(shell string) {
 	cmd := exec.Command("bash", "-c", shell)
 
 	err := cmd.Start()
 	if err != nil {
-		facades.Log().Errorf("[面板][Helpers] 执行命令 %s 失败: %s", shell, err.Error())
+		if support.Env == support.EnvTest {
+			fmt.Println(err.Error())
+			panic(err)
+		} else {
+			facades.Log().Errorf("[面板][Helpers] 执行命令 %s 失败: %s", shell, err.Error())
+		}
 	}
 
 	go func() {
 		err := cmd.Wait()
 		if err != nil {
-			facades.Log().Errorf("[面板][Helpers] 执行命令 %s 失败: %s", shell, err.Error())
+			if support.Env == support.EnvTest {
+				fmt.Println(err.Error())
+				panic(err)
+			} else {
+				facades.Log().Errorf("[面板][Helpers] 执行命令 %s 失败: %s", shell, err.Error())
+			}
 		}
 	}()
 }
@@ -126,27 +144,55 @@ func Empty(path string) bool {
 }
 
 // Mv 移动路径
-func Mv(src, dst string) bool {
+func Mv(src, dst string) (bool, error) {
 	cmd := exec.Command("mv", src, dst)
 
 	err := cmd.Run()
 	if err != nil {
 		facades.Log().Errorf("[面板][Helpers] 移动 %s 到 %s 失败: %s", src, dst, err.Error())
-		return false
+		return false, err
 	}
 
-	return true
+	return true, nil
 }
 
 // Cp 复制路径
-func Cp(src, dst string) bool {
+func Cp(src, dst string) (bool, error) {
 	cmd := exec.Command("cp", "-r", src, dst)
 
 	err := cmd.Run()
 	if err != nil {
-		facades.Log().Errorf("[面板][Helpers] 复制 %s 到 %s 失败: %s", src, dst, err.Error())
-		return false
+		return false, err
 	}
 
-	return true
+	return true, nil
+}
+
+// Size 获取路径大小
+func Size(path string) (int64, error) {
+	var size int64
+
+	err := filepath.Walk(path, func(filePath string, info os.FileInfo, walkErr error) error {
+		if walkErr != nil {
+			return walkErr
+		}
+		size += info.Size()
+		return nil
+	})
+
+	if err != nil {
+		return 0, err
+	}
+
+	return size, nil
+}
+
+// FileSize 获取文件大小
+func FileSize(path string) (int64, error) {
+	info, err := os.Stat(path)
+	if err != nil {
+		return 0, err
+	}
+
+	return info.Size(), nil
 }

pkg/tools/system_test.go

@@ -17,45 +17,45 @@ func TestSystemHelperTestSuite(t *testing.T) {
 	suite.Run(t, &SystemHelperTestSuite{})
 }
 
-func (s *SystemHelperTestSuite) TestWriteFile() {
+func (s *SystemHelperTestSuite) TestWrite() {
 	filePath := "/tmp/testfile"
 	defer os.Remove(filePath)
 
-	s.True(WriteFile(filePath, "test data", 0644))
+	s.True(Write(filePath, "test data", 0644))
 	s.FileExists(filePath)
 
 	content, _ := os.ReadFile(filePath)
 	s.Equal("test data", string(content))
 }
 
-func (s *SystemHelperTestSuite) TestReadFile() {
+func (s *SystemHelperTestSuite) TestRead() {
 	filePath := "/tmp/testfile"
 	defer os.Remove(filePath)
 
 	err := os.WriteFile(filePath, []byte("test data"), 0644)
 	s.Nil(err)
 
-	s.Equal("test data", ReadFile(filePath))
+	s.Equal("test data", Read(filePath))
 }
 
-func (s *SystemHelperTestSuite) TestRemoveFile() {
+func (s *SystemHelperTestSuite) TestRemove() {
 	filePath := "/tmp/testfile"
 
 	err := os.WriteFile(filePath, []byte("test data"), 0644)
 	s.Nil(err)
 
-	s.True(RemoveFile(filePath))
+	s.True(Remove(filePath))
 }
 
-func (s *SystemHelperTestSuite) TestExecShell() {
-	s.Equal("test", ExecShell("echo 'test'"))
+func (s *SystemHelperTestSuite) TestExec() {
+	s.Equal("test", Exec("echo 'test'"))
 }
 
-func (s *SystemHelperTestSuite) TestExecShellAsync() {
+func (s *SystemHelperTestSuite) TestExecAsync() {
 	command := "echo 'test' > /tmp/testfile"
 	defer os.Remove("/tmp/testfile")
 
-	ExecShellAsync(command)
+	ExecAsync(command)
 
 	time.Sleep(time.Second)
 
@@ -104,3 +104,37 @@ func (s *SystemHelperTestSuite) TestEmpty() {
 	s.True(Empty("/tmp/123"))
 	s.False(Empty("/tmp"))
 }
+
+func (s *SystemHelperTestSuite) TestMv() {
+	filePath := "/tmp/testfile"
+	defer os.Remove(filePath)
+
+	err := os.WriteFile(filePath, []byte("test data"), 0644)
+	s.Nil(err)
+
+	s.True(Mv(filePath, "/tmp/testfile2"))
+	s.False(Exists(filePath))
+}
+
+func (s *SystemHelperTestSuite) TestCp() {
+	filePath := "/tmp/testfile"
+	defer os.Remove(filePath)
+
+	err := os.WriteFile(filePath, []byte("test data"), 0644)
+	s.Nil(err)
+
+	s.True(Cp(filePath, "/tmp/testfile2"))
+	s.True(Exists(filePath))
+}
+
+func (s *SystemHelperTestSuite) TestSize() {
+	size, err := Size("/tmp/123")
+	s.Equal(int64(0), size)
+	s.Error(err)
+}
+
+func (s *SystemHelperTestSuite) TestFileSize() {
+	size, err := FileSize("/tmp/123")
+	s.Equal(int64(0), size)
+	s.Error(err)
+}

pkg/tools/tools.go

@@ -3,13 +3,14 @@ package tools
 
 import (
 	"errors"
+	"fmt"
 	"os"
-	"os/exec"
 	"strconv"
 	"strings"
 	"time"
 
 	"github.com/gookit/color"
+	"github.com/imroc/req/v3"
 	"github.com/shirou/gopsutil/cpu"
 	"github.com/shirou/gopsutil/disk"
 	"github.com/shirou/gopsutil/host"
@@ -57,21 +58,122 @@ func GetMonitoringInfo() MonitoringInfo {
 	return res
 }
 
+// VersionCompare 版本比较
+func VersionCompare(ver1, ver2, operator string) bool {
+	v1 := strings.TrimPrefix(ver1, "v")
+	v2 := strings.TrimPrefix(ver2, "v")
+
+	v1s := strings.Split(v1, ".")
+	v2s := strings.Split(v2, ".")
+
+	for len(v1s) < len(v2s) {
+		v1s = append(v1s, "0")
+	}
+
+	for len(v2s) < len(v1s) {
+		v2s = append(v2s, "0")
+	}
+
+	for i := 0; i < len(v1s); i++ {
+		if v1s[i] > v2s[i] {
+			return operator == ">" || operator == ">=" || operator == "!="
+		} else if v1s[i] < v2s[i] {
+			return operator == "<" || operator == "<=" || operator == "!="
+		}
+	}
+	return operator == "==" || operator == ">=" || operator == "<="
+}
+
+// GenerateVersions 获取版本列表
+func GenerateVersions(start, end string) ([]string, error) {
+	var versions []string
+	start = strings.TrimPrefix(start, "v")
+	end = strings.TrimPrefix(end, "v")
+	startParts := strings.Split(start, ".")
+	endParts := strings.Split(end, ".")
+
+	if len(startParts) != 3 || len(endParts) != 3 {
+		return nil, fmt.Errorf("版本格式错误")
+	}
+
+	startMajor, err := strconv.Atoi(startParts[0])
+	if err != nil {
+		return nil, fmt.Errorf("无效的起始主版本号: %v", err)
+	}
+	startMinor, err := strconv.Atoi(startParts[1])
+	if err != nil {
+		return nil, fmt.Errorf("无效的起始次版本号: %v", err)
+	}
+	startPatch, err := strconv.Atoi(startParts[2])
+	if err != nil {
+		return nil, fmt.Errorf("无效的起始修订号: %v", err)
+	}
+	endMajor, err := strconv.Atoi(endParts[0])
+	if err != nil {
+		return nil, fmt.Errorf("无效的结束主版本号: %v", err)
+	}
+	endMinor, err := strconv.Atoi(endParts[1])
+	if err != nil {
+		return nil, fmt.Errorf("无效的结束次版本号: %v", err)
+	}
+	endPatch, err := strconv.Atoi(endParts[2])
+	if err != nil {
+		return nil, fmt.Errorf("无效的结束修订号: %v", err)
+	}
+
+	for major := startMajor; major <= endMajor; major++ {
+		for minor := 0; minor <= 99; minor++ {
+			for patch := 0; patch <= 99; patch++ {
+				if major == startMajor && minor < startMinor {
+					continue
+				}
+				if major == startMajor && minor == startMinor && patch <= startPatch {
+					continue
+				}
+
+				if major == endMajor && minor > endMinor {
+					return versions, nil
+				}
+				if major == endMajor && minor == endMinor && patch > endPatch {
+					return versions, nil
+				}
+
+				versions = append(versions, fmt.Sprintf("%d.%d.%d", major, minor, patch))
+			}
+		}
+	}
+
+	if len(versions) == 0 {
+		return []string{}, nil
+	}
+
+	return versions, nil
+}
+
 type PanelInfo struct {
-	Name        string `json:"name"`
-	Version     string `json:"version"`
-	DownloadUrl string `json:"download_url"`
-	Body        string `json:"body"`
-	Date        string `json:"date"`
+	Name         string `json:"name"`
+	Version      string `json:"version"`
+	DownloadName string `json:"download_name"`
+	DownloadUrl  string `json:"download_url"`
+	Body         string `json:"body"`
+	Date         string `json:"date"`
+	Checksums    string `json:"checksums"`
+	ChecksumsUrl string `json:"checksums_url"`
 }
 
 // GetLatestPanelVersion 获取最新版本
 func GetLatestPanelVersion() (PanelInfo, error) {
 	var info PanelInfo
+	var output string
+	isChina := IsChina()
 
-	cmd := exec.Command("/bin/bash", "-c", "curl \"https://api.github.com/repos/HaoZi-Team/Panel/releases/latest\"")
-	output, err := cmd.Output()
-	if err != nil {
+	if isChina {
+		output = Exec(`curl -sSL "https://jihulab.com/api/v4/projects/haozi-team%2Fpanel/releases/permalink/latest"`)
+	} else {
+		output = Exec(`curl -sSL "https://api.github.com/repos/haozi-team/panel/releases/latest"`)
+	}
+
+	if len(output) == 0 {
 		return info, errors.New("获取最新版本失败")
 	}
 
@@ -80,7 +182,7 @@ func GetLatestPanelVersion() (PanelInfo, error) {
 		return info, errors.New("创建临时文件失败")
 	}
 	defer os.Remove(file.Name())
-	_, err = file.Write(output)
+	_, err = file.Write([]byte(output))
 	if err != nil {
 		return info, errors.New("写入临时文件失败")
 	}
@@ -90,78 +192,205 @@ func GetLatestPanelVersion() (PanelInfo, error) {
 	}
 	fileName := file.Name()
 
-	name := exec.Command("/bin/bash", "-c", "jq -r '.name' "+fileName)
-	version := exec.Command("/bin/bash", "-c", "jq -r '.tag_name' "+fileName)
-	body := exec.Command("/bin/bash", "-c", "jq -r '.body' "+fileName)
-	date := exec.Command("/bin/bash", "-c", "jq -r '.published_at' "+fileName)
-	nameOutput, _ := name.Output()
-	versionOutput, _ := version.Output()
-	bodyOutput, _ := body.Output()
-	dateOutput, _ := date.Output()
-	info.Name = strings.TrimSpace(string(nameOutput))
-	info.Version = strings.TrimSpace(string(versionOutput))
-	info.Body = strings.TrimSpace(string(bodyOutput))
-	info.Date = strings.TrimSpace(string(dateOutput))
-	if IsArm() {
-		downloadUrl := exec.Command("/bin/bash", "-c", "jq -r '.assets[] | select(.name | contains(\"arm64\")) | .browser_download_url' "+fileName)
-		downloadUrlOutput, _ := downloadUrl.Output()
-		info.DownloadUrl = strings.TrimSpace(string(downloadUrlOutput))
+	var name, version, body, date, downloadName, downloadUrl, checksums, checksumsUrl string
+	if isChina {
+		name = Exec("jq -r '.name' " + fileName)
+		version = Exec("jq -r '.tag_name' " + fileName)
+		body = Exec("jq -r '.description' " + fileName)
+		date = Exec("jq -r '.created_at' " + fileName)
+		checksums = Exec("jq -r '.assets.links[] | select(.name | contains(\"checksums\")) | .name' " + fileName)
+		checksumsUrl = Exec("jq -r '.assets.links[] | select(.name | contains(\"checksums\")) | .direct_asset_url' " + fileName)
+		if IsArm() {
+			downloadName = Exec("jq -r '.assets.links[] | select(.name | contains(\"arm64\")) | .name' " + fileName)
+			downloadUrl = Exec("jq -r '.assets.links[] | select(.name | contains(\"arm64\")) | .direct_asset_url' " + fileName)
+		} else {
+			downloadName = Exec("jq -r '.assets.links[] | select(.name | contains(\"amd64v2\")) | .name' " + fileName)
+			downloadUrl = Exec("jq -r '.assets.links[] | select(.name | contains(\"amd64v2\")) | .direct_asset_url' " + fileName)
+		}
 	} else {
-		downloadUrl := exec.Command("/bin/bash", "-c", "jq -r '.assets[] | select(.name | contains(\"amd64v2\")) | .browser_download_url' "+fileName)
-		downloadUrlOutput, _ := downloadUrl.Output()
-		info.DownloadUrl = strings.TrimSpace(string(downloadUrlOutput))
+		name = Exec("jq -r '.name' " + fileName)
+		version = Exec("jq -r '.tag_name' " + fileName)
+		body = Exec("jq -r '.body' " + fileName)
+		date = Exec("jq -r '.published_at' " + fileName)
+		checksums = Exec("jq -r '.assets[] | select(.name | contains(\"checksums\")) | .name' " + fileName)
+		checksumsUrl = Exec("jq -r '.assets[] | select(.name | contains(\"checksums\")) | .browser_download_url' " + fileName)
+		if IsArm() {
+			downloadName = Exec("jq -r '.assets[] | select(.name | contains(\"arm64\")) | .name' " + fileName)
+			downloadUrl = Exec("jq -r '.assets[] | select(.name | contains(\"arm64\")) | .browser_download_url' " + fileName)
+		} else {
+			downloadName = Exec("jq -r '.assets[] | select(.name | contains(\"amd64v2\")) | .name' " + fileName)
+			downloadUrl = Exec("jq -r '.assets[] | select(.name | contains(\"amd64v2\")) | .browser_download_url' " + fileName)
+		}
 	}
 
+	info.Name = name
+	info.Version = version
+	info.Body = body
+	info.Date = date
+	info.DownloadName = downloadName
+	info.DownloadUrl = downloadUrl
+	info.Checksums = checksums
+	info.ChecksumsUrl = checksumsUrl
+
+	return info, nil
+}
+
+// GetPanelVersion 获取指定面板版本
+func GetPanelVersion(version string) (PanelInfo, error) {
+	var info PanelInfo
+	var output string
+	isChina := IsChina()
+
+	if !strings.HasPrefix(version, "v") {
+		version = "v" + version
+	}
+
+	if isChina {
+		output = Exec(`curl -sSL "https://jihulab.com/api/v4/projects/haozi-team%2Fpanel/releases/` + version + `"`)
+	} else {
+		output = Exec(`curl -sSL "https://api.github.com/repos/haozi-team/panel/releases/tags/` + version + `"`)
+	}
+
+	if len(output) == 0 {
+		return info, errors.New("获取面板版本失败")
+	}
+
+	file, err := os.CreateTemp("", "panel")
+	if err != nil {
+		return info, errors.New("创建临时文件失败")
+	}
+	defer os.Remove(file.Name())
+	_, err = file.Write([]byte(output))
+	if err != nil {
+		return info, errors.New("写入临时文件失败")
+	}
+	err = file.Close()
+	if err != nil {
+		return info, errors.New("关闭临时文件失败")
+	}
+	fileName := file.Name()
+
+	var name, version2, body, date, downloadName, downloadUrl, checksums, checksumsUrl string
+	if isChina {
+		name = Exec("jq -r '.name' " + fileName)
+		version2 = Exec("jq -r '.tag_name' " + fileName)
+		body = Exec("jq -r '.description' " + fileName)
+		date = Exec("jq -r '.created_at' " + fileName)
+		checksums = Exec("jq -r '.assets.links[] | select(.name | contains(\"checksums\")) | .name' " + fileName)
+		checksumsUrl = Exec("jq -r '.assets.links[] | select(.name | contains(\"checksums\")) | .direct_asset_url' " + fileName)
+		if IsArm() {
+			downloadName = Exec("jq -r '.assets.links[] | select(.name | contains(\"arm64\")) | .name' " + fileName)
+			downloadUrl = Exec("jq -r '.assets.links[] | select(.name | contains(\"arm64\")) | .direct_asset_url' " + fileName)
+		} else {
+			downloadName = Exec("jq -r '.assets.links[] | select(.name | contains(\"amd64v2\")) | .name' " + fileName)
+			downloadUrl = Exec("jq -r '.assets.links[] | select(.name | contains(\"amd64v2\")) | .direct_asset_url' " + fileName)
+		}
+	} else {
+		name = Exec("jq -r '.name' " + fileName)
+		version2 = Exec("jq -r '.tag_name' " + fileName)
+		body = Exec("jq -r '.body' " + fileName)
+		date = Exec("jq -r '.published_at' " + fileName)
+		checksums = Exec("jq -r '.assets[] | select(.name | contains(\"checksums\")) | .name' " + fileName)
+		checksumsUrl = Exec("jq -r '.assets[] | select(.name | contains(\"checksums\")) | .browser_download_url' " + fileName)
+		if IsArm() {
+			downloadName = Exec("jq -r '.assets[] | select(.name | contains(\"arm64\")) | .name' " + fileName)
+			downloadUrl = Exec("jq -r '.assets[] | select(.name | contains(\"arm64\")) | .browser_download_url' " + fileName)
+		} else {
+			downloadName = Exec("jq -r '.assets[] | select(.name | contains(\"amd64v2\")) | .name' " + fileName)
+			downloadUrl = Exec("jq -r '.assets[] | select(.name | contains(\"amd64v2\")) | .browser_download_url' " + fileName)
+		}
+	}
+
+	info.Name = name
+	info.Version = version2
+	info.Body = body
+	info.Date = date
+	info.DownloadName = downloadName
+	info.DownloadUrl = downloadUrl
+	info.Checksums = checksums
+	info.ChecksumsUrl = checksumsUrl
+
 	return info, nil
 }
 
 // UpdatePanel 更新面板
-func UpdatePanel(proxy bool) error {
-	panelInfo, err := GetLatestPanelVersion()
-	if err != nil {
-		return err
-	}
-
-	color.Greenln("最新版本: " + panelInfo.Version)
+func UpdatePanel(panelInfo PanelInfo) error {
+	color.Greenln("目标版本: " + panelInfo.Version)
 	color.Greenln("下载链接: " + panelInfo.DownloadUrl)
-	color.Greenln("使用代理: " + strconv.FormatBool(proxy))
 
 	color.Greenln("备份面板配置...")
-	ExecShell("cp -f /www/panel/database/panel.db /tmp/panel.db.bak")
-	ExecShell("cp -f /www/panel/panel.conf /tmp/panel.conf.bak")
+	Exec("cp -f /www/panel/database/panel.db /tmp/panel.db.bak")
+	Exec("cp -f /www/panel/panel.conf /tmp/panel.conf.bak")
 	if !Exists("/tmp/panel.db.bak") || !Exists("/tmp/panel.conf.bak") {
 		return errors.New("备份面板配置失败")
 	}
 	color.Greenln("备份完成")
 
 	color.Greenln("清理旧版本...")
-	ExecShell("rm -rf /www/panel/*")
+	Exec("rm -rf /www/panel/*")
 	color.Greenln("清理完成")
 
 	color.Greenln("正在下载...")
-	if proxy {
-		ExecShell("wget -O /www/panel/panel.zip https://ghproxy.com/" + panelInfo.DownloadUrl)
-	} else {
-		ExecShell("wget -O /www/panel/panel.zip " + panelInfo.DownloadUrl)
+	Exec("wget -T 120 -t 3 -O /www/panel/" + panelInfo.DownloadName + " " + panelInfo.DownloadUrl)
+	Exec("wget -T 20 -t 3 -O /www/panel/" + panelInfo.Checksums + " " + panelInfo.ChecksumsUrl)
+	if !Exists("/www/panel/"+panelInfo.DownloadName) || !Exists("/www/panel/"+panelInfo.Checksums) {
+		return errors.New("下载失败")
 	}
 	color.Greenln("下载完成")
 
+	color.Greenln("校验下载文件...")
+	check := Exec("cd /www/panel && sha256sum -c " + panelInfo.Checksums + " --ignore-missing")
+	if check != panelInfo.DownloadName+": OK" {
+		return errors.New("下载文件校验失败")
+	}
+	Remove("/www/panel/" + panelInfo.Checksums)
+	color.Greenln("文件校验完成")
+
 	color.Greenln("更新新版本...")
-	ExecShell("cd /www/panel && unzip -o panel.zip && rm -rf panel.zip && chmod 700 panel")
+	Exec("cd /www/panel && unzip -o " + panelInfo.DownloadName + " && rm -rf " + panelInfo.DownloadName + " && chmod 700 panel && bash scripts/update_panel.sh")
+	if !Exists("/www/panel/panel") {
+		return errors.New("更新失败，可能是下载过程中出现了问题")
+	}
 	color.Greenln("更新完成")
 
 	color.Greenln("恢复面板配置...")
-	ExecShell("cp -f /tmp/panel.db.bak /www/panel/database/panel.db")
-	ExecShell("cp -f /tmp/panel.conf.bak /www/panel/panel.conf")
+	Exec("cp -f /tmp/panel.db.bak /www/panel/database/panel.db")
+	Exec("cp -f /tmp/panel.conf.bak /www/panel/panel.conf")
 	if !Exists("/www/panel/database/panel.db") || !Exists("/www/panel/panel.conf") {
 		return errors.New("恢复面板配置失败")
 	}
-	ExecShell("/www/panel/panel --env=panel.conf artisan migrate")
+	Exec("/www/panel/panel --env=panel.conf artisan migrate")
 	color.Greenln("恢复完成")
 
-	color.Greenln("重启面板...")
-	ExecShell("systemctl restart panel")
-	color.Greenln("重启完成")
+	Exec("panel writeSetting version " + panelInfo.Version)
+
+	Exec("rm -rf /tmp/panel.db.bak")
+	Exec("rm -rf /tmp/panel.conf.bak")
 
 	return nil
 }
+
+func RestartPanel() {
+	color.Greenln("重启面板...")
+	ExecAsync("sleep 2 && systemctl restart panel")
+	color.Greenln("重启完成")
+}
+
+// IsChina 是否中国大陆
+func IsChina() bool {
+	client := req.C()
+	client.SetTimeout(5 * time.Second)
+	client.SetCommonRetryCount(2)
+	client.ImpersonateSafari()
+
+	resp, err := client.R().Get("https://www.cloudflare-cn.com/cdn-cgi/trace")
+	if err != nil || !resp.IsSuccessState() {
+		return false
+	}
+
+	if strings.Contains(resp.String(), "loc=CN") {
+		return true
+	}
+
+	return false
+}

pkg/tools/tools_test.go

@@ -17,3 +17,80 @@ func TestHelperTestSuite(t *testing.T) {
 func (s *HelperTestSuite) TestGetMonitoringInfo() {
 	s.NotNil(GetMonitoringInfo())
 }
+
+func (s *HelperTestSuite) TestVersionCompare() {
+	s.True(VersionCompare("1.0.0", "1.0.0", "=="))
+	s.True(VersionCompare("1.0.0", "1.0.0", ">="))
+	s.True(VersionCompare("1.0.0", "1.0.0", "<="))
+	s.False(VersionCompare("1.0.0", "1.0.0", ">"))
+	s.False(VersionCompare("1.0.0", "1.0.0", "<"))
+	s.False(VersionCompare("1.0.0", "1.0.0", "!="))
+
+	s.True(VersionCompare("1.0.0", "1.0.1", "<"))
+	s.True(VersionCompare("1.0.0", "1.0.1", "<="))
+	s.True(VersionCompare("1.0.0", "1.0.1", "!="))
+	s.False(VersionCompare("1.0.0", "1.0.1", "=="))
+	s.False(VersionCompare("1.0.0", "1.0.1", ">="))
+	s.False(VersionCompare("1.0.0", "1.0.1", ">"))
+
+	s.True(VersionCompare("1.0.1", "1.0.0", ">"))
+	s.True(VersionCompare("1.0.1", "1.0.0", ">="))
+	s.True(VersionCompare("1.0.1", "1.0.0", "!="))
+	s.False(VersionCompare("1.0.1", "1.0.0", "=="))
+	s.False(VersionCompare("1.0.1", "1.0.0", "<="))
+	s.False(VersionCompare("1.0.1", "1.0.0", "<"))
+
+	s.True(VersionCompare("v1.0.0", "1.0.0", "=="))
+	s.True(VersionCompare("1.0.0", "v1.0.0", "=="))
+	s.True(VersionCompare("v1.0.0", "v1.0.0", "=="))
+}
+
+func (s *HelperTestSuite) TestGenerateVersions() {
+	versions, err := GenerateVersions("1.0.0", "1.0.3")
+	s.NoError(err)
+	s.Equal([]string{"1.0.1", "1.0.2", "1.0.3"}, versions)
+
+	versions, err = GenerateVersions("v1.0.0", "v1.0.3")
+	s.NoError(err)
+	s.Equal([]string{"1.0.1", "1.0.2", "1.0.3"}, versions)
+
+	versions, err = GenerateVersions("1.0.0", "1.0.0")
+	s.NoError(err)
+	s.Equal([]string(nil), versions)
+
+	versions, err = GenerateVersions("1.0.0", "1.1.1")
+	s.NoError(err)
+	s.Equal([]string{
+		"1.0.1", "1.0.2", "1.0.3", "1.0.4", "1.0.5", "1.0.6", "1.0.7", "1.0.8", "1.0.9", "1.0.10",
+		"1.0.11", "1.0.12", "1.0.13", "1.0.14", "1.0.15", "1.0.16", "1.0.17", "1.0.18", "1.0.19", "1.0.20",
+		"1.0.21", "1.0.22", "1.0.23", "1.0.24", "1.0.25", "1.0.26", "1.0.27", "1.0.28", "1.0.29", "1.0.30",
+		"1.0.31", "1.0.32", "1.0.33", "1.0.34", "1.0.35", "1.0.36", "1.0.37", "1.0.38", "1.0.39", "1.0.40",
+		"1.0.41", "1.0.42", "1.0.43", "1.0.44", "1.0.45", "1.0.46", "1.0.47", "1.0.48", "1.0.49", "1.0.50",
+		"1.0.51", "1.0.52", "1.0.53", "1.0.54", "1.0.55", "1.0.56", "1.0.57", "1.0.58", "1.0.59", "1.0.60",
+		"1.0.61", "1.0.62", "1.0.63", "1.0.64", "1.0.65", "1.0.66", "1.0.67", "1.0.68", "1.0.69", "1.0.70",
+		"1.0.71", "1.0.72", "1.0.73", "1.0.74", "1.0.75", "1.0.76", "1.0.77", "1.0.78", "1.0.79", "1.0.80",
+		"1.0.81", "1.0.82", "1.0.83", "1.0.84", "1.0.85", "1.0.86", "1.0.87", "1.0.88", "1.0.89", "1.0.90",
+		"1.0.91", "1.0.92", "1.0.93", "1.0.94", "1.0.95", "1.0.96", "1.0.97", "1.0.98", "1.0.99", "1.1.0",
+		"1.1.1",
+	}, versions)
+
+	versions, err = GenerateVersions("1..0", "1.0.1")
+	s.Error(err)
+	s.Nil(versions)
+
+	versions, err = GenerateVersions("1.0.0", "1..1")
+	s.Error(err)
+	s.Nil(versions)
+}
+
+func (s *HelperTestSuite) TestGetLatestPanelVersion() {
+	version, err := GetLatestPanelVersion()
+	s.NotEmpty(version)
+	s.Nil(err)
+}
+
+func (s *HelperTestSuite) TestGetPanelVersion() {
+	version, err := GetPanelVersion("v2.0.58")
+	s.NotEmpty(version)
+	s.Nil(err)
+}

public/index.html

@@ -1,65 +0,0 @@
-<!--
-////////////////////////////////////////////////////////////////////
-//                          _ooOoo_                               //
-//                         o8888888o                              //
-//                         88" . "88                              //
-//                         (| ^_^ |)                              //
-//                         O\  =  /O                              //
-//                      ____/`---'\____                           //
-//                    .'  \\|     |//  `.                         //
-//                   /  \\|||  :  |||//  \                        //
-//                  /  _||||| -:- |||||-  \                       //
-//                  |   | \\\  -  /// |   |                       //
-//                  | \_|  ''\---/''  |   |                       //
-//                  \  .-\__  `-`  ___/-. /                       //
-//                ___`. .'  /--.--\  `. . ___                     //
-//             ."" '<  `.___\_<|>_/___.'  >'"".                   //
-//            | | :  `- \`.;`\ _ /`;.`/ - ` : | |                 //
-//            \  \ `-.   \_ __\ /__ _/   .-` /  /                 //
-//     ========`-.____`-.___\_____/___.-`____.-'========          //
-//                          `=---='                               //
-//     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          //
-//          佛祖保佑          永无Bug          永不宕机               //
-//    Name: 耗子Linux面板   Author: 耗子  Date: 2023-07-25           //
-////////////////////////////////////////////////////////////////////
--->
-
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>加载中...</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link href="https://cdnjs.cdn.haozi.net/layui/2.8.11/css/layui.min.css" rel="stylesheet">
-</head>
-<body>
-<div id="Panel_app"></div>
-<script src="https://cdnjs.cdn.haozi.net/layui/2.8.11/layui.min.js"></script>
-<script src="https://cdnjs.cdn.haozi.net/ace/1.6.1/ace.js"></script>
-<script src="https://cdnjs.cdn.haozi.net/echarts/5.4.2/echarts.min.js"></script>
-<script src="https://registry.npmmirror.com/xterm/5.2.1/files/lib/xterm.js"></script>
-<script src="https://registry.npmmirror.com/xterm-addon-fit/0.7.0/files/lib/xterm-addon-fit.js"></script>
-<script src="https://cdnjs.cdn.haozi.net/crypto-js/4.1.1/crypto-js.min.js"></script>
-<script>
-  layui.config({
-    base: 'panel/', // 静态资源所在路径
-    version: new Date().getTime()
-  }).use(['index', 'setter'], function () {
-    var admin = layui.admin
-    var setter = layui.setter
-    admin.req({
-      url: '/api/panel/info/name',
-      type: 'get',
-      success: function (res) {
-        if (res.code === 0) {
-          setter.name = res.data.name
-          document.title = setter.name
-        }
-      }
-    })
-  })
-</script>
-</body>
-</html>

public/panel/adminui/src/css/login.css

@@ -1,182 +0,0 @@
-/** 
- * admin.login.css 
- */
-
-html, body, #Panel_app {
-    height: 100%;
-}
-
-.layui-layout-body {
-    overflow: auto;
-}
-
-#LAY-user-login,
-.layadmin-user-display-show {
-    display: block !important;
-}
-
-.layadmin-user-login {
-    position: relative;
-    left: 0;
-    top: 0;
-    padding: 110px 0;
-    min-height: 100%;
-    box-sizing: border-box;
-}
-
-.layadmin-user-login-main {
-    width: 375px;
-    margin: 0 auto;
-    box-sizing: border-box;
-}
-
-.layadmin-user-login-box {
-    padding: 20px;
-}
-
-.layadmin-user-login-header {
-    text-align: center;
-}
-
-.layadmin-user-login-header h2 {
-    margin-bottom: 10px;
-    font-weight: 300;
-    font-size: 30px;
-    color: #000;
-}
-
-.layadmin-user-login-header p {
-    font-weight: 300;
-    color: #999;
-}
-
-.layadmin-user-login-body .layui-form-item {
-    position: relative;
-}
-
-.layadmin-user-login-icon {
-    position: absolute;
-    left: 1px;
-    top: 1px;
-    width: 38px;
-    line-height: 36px;
-    text-align: center;
-    color: #d2d2d2;
-}
-
-.layadmin-user-login-body .layui-form-item .layui-input {
-    padding-left: 38px;
-}
-
-.layadmin-user-login-codeimg {
-    max-height: 38px;
-    width: 100%;
-    cursor: pointer;
-    box-sizing: border-box;
-}
-
-.layadmin-user-login-other {
-    position: relative;
-    font-size: 0;
-    line-height: 38px;
-    padding-top: 20px;
-}
-
-.layadmin-user-login-other > * {
-    display: inline-block;
-    vertical-align: middle;
-    margin-right: 10px;
-    font-size: 14px;
-}
-
-.layadmin-user-login-other .layui-icon {
-    position: relative;
-    top: 2px;
-    font-size: 26px;
-}
-
-.layadmin-user-login-other a:hover {
-    opacity: 0.8;
-}
-
-.layadmin-user-jump-change {
-    float: right;
-}
-
-.layadmin-user-login-footer {
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    width: 100%;
-    line-height: 30px;
-    padding: 20px;
-    text-align: center;
-    box-sizing: border-box;
-    color: rgba(0, 0, 0, .5)
-}
-
-.layadmin-user-login-footer span {
-    padding: 0 5px;
-}
-
-.layadmin-user-login-footer a {
-    padding: 0 5px;
-    color: rgba(0, 0, 0, .5);
-}
-
-.layadmin-user-login-footer a:hover {
-    color: rgba(0, 0, 0, 1);
-}
-
-/* 有背景图时 */
-.layadmin-user-login-main[bgimg] {
-    background-color: #fff;
-    box-shadow: 0 0 5px rgba(0, 0, 0, 0.05);
-}
-
-/* 主题背景 */
-.ladmin-user-login-theme {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    text-align: center;
-}
-
-.ladmin-user-login-theme ul {
-    display: inline-block;
-    padding: 5px;
-    background-color: #fff;
-}
-
-.ladmin-user-login-theme ul li {
-    display: inline-block;
-    vertical-align: top;
-    width: 64px;
-    height: 43px;
-    cursor: pointer;
-    transition: all .3s;
-    -webkit-transition: all .3s;
-    background-color: #f2f2f2;
-}
-
-.ladmin-user-login-theme ul li:hover {
-    opacity: 0.9
-}
-
-@media screen and (max-width: 768px) {
-    .layadmin-user-login {
-        padding-top: 60px;
-    }
-
-    .layadmin-user-login-main {
-        width: 300px;
-    }
-
-    .layadmin-user-login-box {
-        padding: 10px;
-    }
-}
-
-
-

public/panel/adminui/src/modules/admin.js

@@ -1,890 +0,0 @@
-/**
- * 界面核心模块
- */
-
-layui.define('view', function (exports) {
-    var $ = layui.jquery
-        , laytpl = layui.laytpl
-        , element = layui.element
-        , table = layui.table
-        , upload = layui.upload
-        , setter = layui.setter
-        , view = layui.view
-        , device = layui.device()
-
-        , $win = $(window), $body = $('body')
-        , container = $('#' + setter.container)
-
-        , SHOW = 'layui-show', HIDE = 'layui-hide', THIS = 'layui-this', DISABLED = 'layui-disabled', TEMP = 'template'
-        , APP_BODY = '#Panel_app_body', APP_FLEXIBLE = 'Panel_app_flexible'
-        , FILTER_TAB_TBAS = 'layadmin-layout-tabs'
-        , APP_SPREAD_SM = 'layadmin-side-spread-sm', TABS_BODY = 'layadmin-tabsbody-item'
-        , ICON_SHRINK = 'layui-icon-shrink-right', ICON_SPREAD = 'layui-icon-spread-left'
-        , SIDE_SHRINK = 'layadmin-side-shrink', SIDE_MENU = 'LAY-system-side-menu'
-
-        //通用方法
-        , admin = {
-            v: '2.0.0'
-            , mode: 'spa'
-
-            //数据的异步请求
-            , req: view.req
-
-            //清除本地 token，并跳转到登入页
-            , exit: view.exit
-
-            //xss 转义
-            , escape: function (html) {
-                return String(html || '').replace(/&(?!#?[a-zA-Z0-9]+;)/g, '&')
-                    .replace(/</g, '&lt;').replace(/>/g, '&gt;')
-                    .replace(/'/g, '&#39;').replace(/"/g, '&quot;')
-            }
-
-            //事件
-            , on: function (events, callback) {
-                return layui.onevent.call(this, setter.MOD_NAME, events, callback)
-            }
-
-            //弹出面板
-            , popup: view.popup
-
-            //右侧面板
-            , popupRight: function (options) {
-                //layer.close(admin.popup.index);
-                return admin.popup.index = layer.open($.extend({
-                    type: 1
-                    , id: 'LAY_adminPopupR'
-                    , anim: -1
-                    , title: false
-                    , closeBtn: false
-                    , offset: 'r'
-                    , shade: 0.1
-                    , shadeClose: true
-                    , skin: 'layui-anim layui-anim-rl layui-layer-adminRight'
-                    , area: '300px'
-                }, options))
-            }
-
-            //发送验证码
-            , sendAuthCode: function (options) {
-                options = $.extend({
-                    seconds: 60
-                    , elemPhone: '#LAY_phone'
-                    , elemVercode: '#LAY_vercode'
-                }, options)
-
-                var seconds = options.seconds
-                    , token = null
-                    , timer, countDown = function (loop) {
-                    var btn = $(options.elem)
-                    seconds--
-                    if (seconds < 0) {
-                        btn.removeClass(DISABLED).html('获取验证码')
-                        seconds = options.seconds
-                        clearInterval(timer)
-                    } else {
-                        btn.addClass(DISABLED).html(seconds + '秒后重获')
-                    }
-
-                    if (!loop) {
-                        timer = setInterval(function () {
-                            countDown(true)
-                        }, 1000)
-                    }
-                }
-
-                $body.off('click', options.elem).on('click', options.elem, function () {
-                    options.elemPhone = $(options.elemPhone)
-                    options.elemVercode = $(options.elemVercode)
-
-                    var elemPhone = options.elemPhone
-                        , value = elemPhone.val()
-
-                    if (seconds !== options.seconds || $(this).hasClass(DISABLED)) return
-
-                    if (!/^1\d{10}$/.test(value)) {
-                        elemPhone.focus()
-                        return layer.msg('请输入正确的手机号')
-                    }
-
-                    if (typeof options.ajax === 'object') {
-                        var success = options.ajax.success
-                        delete options.ajax.success
-                    }
-
-                    admin.req($.extend(true, {
-                        url: '/auth/code'
-                        , type: 'get'
-                        , data: {
-                            phone: value
-                        }
-                        , success: function (res) {
-                            layer.msg('验证码已发送至你的手机，请注意查收', {
-                                icon: 1
-                                , shade: 0
-                            })
-                            options.elemVercode.focus()
-                            countDown()
-                            success && success(res)
-                        }
-                    }, options.ajax))
-                })
-            }
-
-            //屏幕类型
-            , screen: function () {
-                var width = $win.width()
-                if (width > 1200) {
-                    return 3 //大屏幕
-                } else if (width > 992) {
-                    return 2 //中屏幕
-                } else if (width > 768) {
-                    return 1 //小屏幕
-                } else {
-                    return 0 //超小屏幕
-                }
-            }
-
-            //侧边伸缩
-            , sideFlexible: function (status) {
-                var app = container
-                    , iconElem = $('#' + APP_FLEXIBLE)
-                    , screen = admin.screen()
-
-                //设置状态，PC：默认展开、移动：默认收缩
-                if (status === 'spread') {
-                    //切换到展开状态的 icon，箭头：←
-                    iconElem.removeClass(ICON_SPREAD).addClass(ICON_SHRINK)
-
-                    //移动：从左到右位移；PC：清除多余选择器恢复默认
-                    if (screen < 2) {
-                        app.addClass(APP_SPREAD_SM)
-                    } else {
-                        app.removeClass(APP_SPREAD_SM)
-                    }
-
-                    app.removeClass(SIDE_SHRINK)
-                } else {
-                    //切换到搜索状态的 icon，箭头：→
-                    iconElem.removeClass(ICON_SHRINK).addClass(ICON_SPREAD)
-
-                    //移动：清除多余选择器恢复默认；PC：从右往左收缩
-                    if (screen < 2) {
-                        app.removeClass(SIDE_SHRINK)
-                    } else {
-                        app.addClass(SIDE_SHRINK)
-                    }
-
-                    app.removeClass(APP_SPREAD_SM)
-                }
-
-                layui.event.call(this, setter.MOD_NAME, 'side({*})', {
-                    status: status
-                })
-            }
-
-            //重置主体区域表格尺寸
-            , resizeTable: function (delay) {
-                var that = this, runResizeTable = function () {
-                    that.tabsBody(admin.tabsPage.index).find('.layui-table-view').each(function () {
-                        var tableID = $(this).attr('lay-id')
-                        layui.table.resize(tableID)
-                    })
-                }
-                if (!layui.table) return
-                delay ? setTimeout(runResizeTable, delay) : runResizeTable()
-            }
-
-            //主题设置
-            , theme: function (options) {
-                var theme = setter.theme
-                    , local = layui.data(setter.tableName)
-                    , id = 'LAY_layadmin_theme'
-                    , style = document.createElement('style')
-                    , styleText = laytpl([
-                    //主题色
-                    '.layui-side-menu,'
-                    , '.layui-layer-admin .layui-layer-title,'
-                    , '.layadmin-side-shrink .layui-side-menu .layui-nav>.layui-nav-item>.layui-nav-child'
-                    , '{background-color:{{d.color.main}} !important;}'
-
-                    //背景选中色
-                    , '.layadmin-pagetabs .layui-tab-title li:after,'
-                    , '.layadmin-pagetabs .layui-tab-title li.layui-this:after,'
-                    , '.layui-nav-tree .layui-this,'
-                    , '.layui-nav-tree .layui-this>a,'
-                    , '.layui-nav-tree .layui-nav-child dd.layui-this,'
-                    , '.layui-nav-tree .layui-nav-child dd.layui-this a,'
-                    , '.layui-nav-tree .layui-nav-bar'
-                    , '{background-color:{{d.color.selected}} !important;}'
-
-                    //logo
-                    , '.layui-layout-admin .layui-logo{background-color:{{d.color.logo || d.color.main}} !important;}'
-
-                    //文字选中色
-                    , '.layadmin-pagetabs .layui-tab-title li:hover,'
-                    , '.layadmin-pagetabs .layui-tab-title li.layui-this'
-                    , '{color: {{d.color.selected}} !important;}'
-
-                    //头部色
-                    , '{{# if(d.color.header){ }}'
-                    , '.layui-layout-admin .layui-header{background-color:{{ d.color.header }};}'
-                    , '.layui-layout-admin .layui-header a,'
-                    , '.layui-layout-admin .layui-header a cite{color: #f8f8f8;}'
-                    , '.layui-layout-admin .layui-header a:hover{color: #fff;}'
-                    , '.layui-layout-admin .layui-header .layui-nav .layui-nav-more{border-top-color: #fbfbfb;}'
-                    , '.layui-layout-admin .layui-header .layui-nav .layui-nav-mored{border-color: transparent; border-bottom-color: #fbfbfb;}'
-                    , '.layui-layout-admin .layui-header .layui-nav .layui-this:after, .layui-layout-admin .layui-header .layui-nav-bar{background-color: #fff; background-color: rgba(255,255,255,.5);}'
-                    , '.layadmin-pagetabs .layui-tab-title li:after{display: none;}'
-                    , '{{# } }}'
-                ].join('')).render(options = $.extend({}, local.theme, options))
-                    , styleElem = document.getElementById(id)
-
-                //添加主题样式
-                if ('styleSheet' in style) {
-                    style.setAttribute('type', 'text/css')
-                    style.styleSheet.cssText = styleText
-                } else {
-                    style.innerHTML = styleText
-                }
-                style.id = id
-
-                styleElem && $body[0].removeChild(styleElem)
-                $body[0].appendChild(style)
-                $body.attr('layadmin-themealias', options.color.alias)
-
-                //本地存储记录
-                local.theme = local.theme || {}
-                layui.each(options, function (key, value) {
-                    local.theme[key] = value
-                })
-                layui.data(setter.tableName, {
-                    key: 'theme'
-                    , value: local.theme
-                })
-            }
-
-            //初始化主题
-            , initTheme: function (index) {
-                var theme = setter.theme
-                index = index || 0
-                if (theme.color[index]) {
-                    theme.color[index].index = index
-                    admin.theme({
-                        color: theme.color[index]
-                    })
-                }
-            }
-
-            //记录最近一次点击的页面标签数据
-            , tabsPage: {}
-
-            //获取标签页的头元素
-            , tabsHeader: function (index) {
-                return $('#Panel_app_tabsheader').children('li').eq(index || 0)
-            }
-
-            //获取页面标签主体元素
-            , tabsBody: function (index) {
-                return $(APP_BODY).find('.' + TABS_BODY).eq(index || 0)
-            }
-
-            //切换页面标签主体
-            , tabsBodyChange: function (index) {
-                admin.tabsHeader(index).attr('lay-attr', layui.router().href)
-                admin.tabsBody(index).addClass(SHOW).siblings().removeClass(SHOW)
-                events.rollPage('auto', index)
-            }
-
-            //resize事件管理
-            , resize: function (fn) {
-                var router = layui.router()
-                    , key = router.path.join('-')
-
-                if (admin.resizeFn[key]) {
-                    $win.off('resize', admin.resizeFn[key])
-                    delete admin.resizeFn[key]
-                }
-
-                if (fn === 'off') return //如果是清除 resize 事件，则终止往下执行
-
-                fn(), admin.resizeFn[key] = fn
-                $win.on('resize', admin.resizeFn[key])
-            }
-            , resizeFn: {}
-            , runResize: function () {
-                var router = layui.router()
-                    , key = router.path.join('-')
-                admin.resizeFn[key] && admin.resizeFn[key]()
-            }
-            , delResize: function () {
-                this.resize('off')
-            }
-
-            //关闭当前 pageTabs
-            , closeThisTabs: function () {
-                if (!admin.tabsPage.index) return
-                $(TABS_HEADER).eq(admin.tabsPage.index).find('.layui-tab-close').trigger('click')
-            }
-
-            //全屏
-            , fullScreen: function () {
-                var ele = document.documentElement
-                    , reqFullScreen = ele.requestFullScreen || ele.webkitRequestFullScreen
-                    || ele.mozRequestFullScreen || ele.msRequestFullscreen
-                if (typeof reqFullScreen !== 'undefined' && reqFullScreen) {
-                    reqFullScreen.call(ele)
-                }
-
-            }
-
-            //退出全屏
-            , exitScreen: function () {
-                var ele = document.documentElement
-                if (document.exitFullscreen) {
-                    document.exitFullscreen()
-                } else if (document.mozCancelFullScreen) {
-                    document.mozCancelFullScreen()
-                } else if (document.webkitCancelFullScreen) {
-                    document.webkitCancelFullScreen()
-                } else if (document.msExitFullscreen) {
-                    document.msExitFullscreen()
-                }
-            }
-
-            //纠正单页路由格式
-            , correctRouter: function (href) {
-                if (!/^\//.test(href)) href = '/' + href
-
-                //纠正首尾
-                return href.replace(/^(\/+)/, '/')
-                    .replace(new RegExp('\/' + setter.entry + '$'), '/') //过滤路由最后的默认视图文件名（如：index）
-            }
-
-            //……
-        }
-
-    //事件
-    var events = admin.events = {
-        //伸缩
-        flexible: function (othis) {
-            var iconElem = othis.find('#' + APP_FLEXIBLE)
-                , isSpread = iconElem.hasClass(ICON_SPREAD)
-            admin.sideFlexible(isSpread ? 'spread' : null) //控制伸缩
-            admin.resizeTable(350)
-        }
-
-        //刷新
-        , refresh: function () {
-            admin.render()
-        }
-
-        //输入框搜索
-        , serach: function (othis) {
-            othis.off('keypress').on('keypress', function (e) {
-                if (!this.value.replace(/\s/g, '')) return
-                //回车跳转
-                if (e.keyCode === 13) {
-                    var href = othis.attr('lay-action')
-                        , text = othis.attr('lay-text') || '搜索'
-
-                    href = href + this.value
-                    text = text + ' <span style="color: #FF5722;">' + admin.escape(this.value) + '</span>'
-
-                    //打开标签页
-                    location.hash = admin.correctRouter(href)
-
-                    //如果搜索关键词已经打开，则刷新页面即可
-                    events.serach.keys || (events.serach.keys = {})
-                    events.serach.keys[admin.tabsPage.index] = this.value
-                    if (this.value === events.serach.keys[admin.tabsPage.index]) {
-                        events.refresh(othis)
-                    }
-
-                    //清空输入框
-                    this.value = ''
-                }
-            })
-        }
-
-        //点击消息
-        , message: function (othis) {
-            othis.find('.layui-badge-dot').remove()
-        }
-
-        //弹出主题面板
-        , theme: function () {
-            admin.popupRight({
-                id: 'LAY_adminPopupTheme'
-                , success: function () {
-                    view(this.id).render('ui/theme')
-                }
-            })
-        }
-
-        //便签
-        , note: function (othis) {
-            var mobile = admin.screen() < 2
-                , note = layui.data(setter.tableName).note
-
-            events.note.index = admin.popup({
-                title: '便签'
-                , shade: 0
-                , offset: [
-                    '41px'
-                    , (mobile ? null : (othis.offset().left - 250) + 'px')
-                ]
-                , anim: -1
-                , id: 'LAY_adminNote'
-                , skin: 'layadmin-note layui-anim layui-anim-upbit'
-                , content: '<textarea placeholder="内容"></textarea>'
-                , resize: false
-                , success: function (layero, index) {
-                    var textarea = layero.find('textarea')
-                        ,
-                        value = note === undefined ? '便签中的内容会存储在本地，这样即便你关掉了浏览器，在下次打开时，依然会读取到上一次的记录。是个非常小巧实用的本地备忘录' : note
-
-                    textarea.val(value).focus().on('keyup', function () {
-                        layui.data(setter.tableName, {
-                            key: 'note'
-                            , value: this.value
-                        })
-                    })
-                }
-            })
-        }
-
-        //全屏
-        , fullscreen: function (othis, opts) {
-            var SCREEN_FULL = 'layui-icon-screen-full';
-            var SCREEN_REST = 'layui-icon-screen-restore';
-            var iconElem = othis.children("i");
-            var hasFull = iconElem.hasClass(SCREEN_FULL);
-
-            // 设置图标状态
-            var setIcon = function (status) {
-                if (status) {
-                    iconElem.addClass(SCREEN_REST).removeClass(SCREEN_FULL);
-                } else {
-                    iconElem.addClass(SCREEN_FULL).removeClass(SCREEN_REST);
-                }
-            };
-
-            // 设置全屏状态
-            var setScreen = function (status) {
-                status ? admin.fullScreen() : admin.exitScreen();
-            };
-
-            // 仅设置图标状态
-            if (opts) {
-                return setIcon(opts.status);
-            }
-
-            setIcon(hasFull);
-            setScreen(hasFull);
-        }
-
-        //弹出关于面板
-        , about: function () {
-            admin.popupRight({
-                id: 'LAY_adminPopupAbout'
-                , success: function () {
-                    view(this.id).render('system/about')
-                }
-            })
-        }
-
-        //弹出更多面板
-        , more: function () {
-            admin.popupRight({
-                id: 'LAY_adminPopupMore'
-                , success: function () {
-                    view(this.id).render('system/more')
-                }
-            })
-        }
-
-        //返回上一页
-        , back: function () {
-            history.back()
-        }
-
-        //主题设置
-        , setTheme: function (othis) {
-            var index = othis.data('index')
-                , nextIndex = othis.siblings('.layui-this').data('index')
-
-            if (othis.hasClass(THIS)) return
-
-            othis.addClass(THIS).siblings('.layui-this').removeClass(THIS)
-            admin.initTheme(index)
-        }
-
-        //左右滚动页面标签
-        , rollPage: function (type, index) {
-            var tabsHeader = $('#Panel_app_tabsheader')
-                , liItem = tabsHeader.children('li')
-                , scrollWidth = tabsHeader.prop('scrollWidth')
-                , outerWidth = tabsHeader.outerWidth()
-                , tabsLeft = parseFloat(tabsHeader.css('left'))
-
-            //右左往右
-            if (type === 'left') {
-                if (!tabsLeft && tabsLeft <= 0) return
-
-                //当前的left减去可视宽度，用于与上一轮的页标比较
-                var prefLeft = -tabsLeft - outerWidth
-
-                liItem.each(function (index, item) {
-                    var li = $(item)
-                        , left = li.position().left
-
-                    if (left >= prefLeft) {
-                        tabsHeader.css('left', -left)
-                        return false
-                    }
-                })
-            } else if (type === 'auto') { //自动滚动
-                (function () {
-                    var thisLi = liItem.eq(index), thisLeft
-
-                    if (!thisLi[0]) return
-                    thisLeft = thisLi.position().left
-
-                    //当目标标签在可视区域左侧时
-                    if (thisLeft < -tabsLeft) {
-                        return tabsHeader.css('left', -thisLeft)
-                    }
-
-                    //当目标标签在可视区域右侧时
-                    if (thisLeft + thisLi.outerWidth() >= outerWidth - tabsLeft) {
-                        var subLeft = thisLeft + thisLi.outerWidth() - (outerWidth - tabsLeft)
-                        liItem.each(function (i, item) {
-                            var li = $(item)
-                                , left = li.position().left
-
-                            //从当前可视区域的最左第二个节点遍历，如果减去最左节点的差 > 目标在右侧不可见的宽度，则将该节点放置可视区域最左
-                            if (left + tabsLeft > 0) {
-                                if (left - tabsLeft > subLeft) {
-                                    tabsHeader.css('left', -left)
-                                    return false
-                                }
-                            }
-                        })
-                    }
-                }())
-            } else {
-                //默认向左滚动
-                liItem.each(function (i, item) {
-                    var li = $(item)
-                        , left = li.position().left
-
-                    if (left + li.outerWidth() >= outerWidth - tabsLeft) {
-                        tabsHeader.css('left', -left)
-                        return false
-                    }
-                })
-            }
-        }
-
-        //向右滚动页面标签
-        , leftPage: function () {
-            events.rollPage('left')
-        }
-
-        //向左滚动页面标签
-        , rightPage: function () {
-            events.rollPage()
-        }
-
-        //关闭当前标签页
-        , closeThisTabs: function () {
-            admin.closeThisTabs()
-        }
-
-        //关闭其它标签页
-        , closeOtherTabs: function (type) {
-            var TABS_REMOVE = 'LAY-system-pagetabs-remove'
-            if (type === 'all') {
-                $(TABS_HEADER + ':gt(0)').remove()
-                $(APP_BODY).find('.' + TABS_BODY + ':gt(0)').remove()
-            } else {
-                $(TABS_HEADER).each(function (index, item) {
-                    if (index && index != admin.tabsPage.index) {
-                        $(item).addClass(TABS_REMOVE)
-                        admin.tabsBody(index).addClass(TABS_REMOVE)
-                    }
-                })
-                $('.' + TABS_REMOVE).remove()
-            }
-        }
-
-        //关闭全部标签页
-        , closeAllTabs: function () {
-            events.closeOtherTabs('all')
-            location.hash = ''
-        }
-
-        //遮罩
-        , shade: function () {
-            admin.sideFlexible()
-        }
-    }
-
-    //初始
-    !function () {
-        //主题初始化，本地主题记录优先，其次为 initColorIndex
-        var local = layui.data(setter.tableName)
-        if (local.theme) {
-            admin.theme(local.theme)
-        } else if (setter.theme) {
-            admin.initTheme(setter.theme.initColorIndex)
-        }
-
-        //禁止水平滚动
-        $body.addClass('layui-layout-body')
-
-        //移动端强制不开启页面标签功能
-        if (admin.screen() < 1) {
-            delete setter.pageTabs
-        }
-
-        //不开启页面标签时
-        if (!setter.pageTabs) {
-            container.addClass('layadmin-tabspage-none')
-        }
-
-        //低版本IE提示
-        if (device.ie && device.ie < 10) {
-            view.error('IE' + device.ie + '下访问可能不佳，推荐使用：Chrome / Firefox / Edge 等高级浏览器', {
-                offset: 'auto'
-                , id: 'LAY_errorIE'
-            })
-        }
-
-    }()
-
-    //admin.prevRouter = {}; //上一个路由
-
-    // hash 改变侧边状态
-    admin.on('hash(side)', function (router) {
-        var path = router.path, getData = function (item) {
-                return {
-                    list: item.children('.layui-nav-child')
-                    , name: item.data('name')
-                    , jump: item.data('jump')
-                }
-            }
-            , sideMenu = $('#' + SIDE_MENU)
-            , SIDE_NAV_ITEMD = 'layui-nav-itemed'
-
-            //捕获对应菜单
-            , matchMenu = function (list) {
-                var pathURL = admin.correctRouter(path.join('/'))
-                list.each(function (index1, item1) {
-                    var othis1 = $(item1)
-                        , data1 = getData(othis1)
-                        , listChildren1 = data1.list.children('dd')
-                        , matched1 = path[0] == data1.name || (index1 === 0 && !path[0])
-                        || (data1.jump && pathURL == admin.correctRouter(data1.jump))
-
-                    listChildren1.each(function (index2, item2) {
-                        var othis2 = $(item2)
-                            , data2 = getData(othis2)
-                            , listChildren2 = data2.list.children('dd')
-                            , matched2 = (path[0] == data1.name && path[1] == data2.name)
-                            || (data2.jump && pathURL == admin.correctRouter(data2.jump))
-
-                        listChildren2.each(function (index3, item3) {
-                            var othis3 = $(item3)
-                                , data3 = getData(othis3)
-                                , matched3 = (path[0] == data1.name && path[1] == data2.name && path[2] == data3.name)
-                                || (data3.jump && pathURL == admin.correctRouter(data3.jump))
-
-                            if (matched3) {
-                                var selected = data3.list[0] ? SIDE_NAV_ITEMD : THIS
-                                othis3.addClass(selected).siblings().removeClass(selected) //标记选择器
-                                return false
-                            }
-
-                        })
-
-                        if (matched2) {
-                            var selected = data2.list[0] ? SIDE_NAV_ITEMD : THIS
-                            othis2.addClass(selected).siblings().removeClass(selected) //标记选择器
-                            return false
-                        }
-
-                    })
-
-                    if (matched1) {
-                        var selected = data1.list[0] ? SIDE_NAV_ITEMD : THIS
-                        othis1.addClass(selected).siblings().removeClass(selected) //标记选择器
-                        return false
-                    }
-
-                })
-            }
-
-        //重置状态
-        sideMenu.find('.' + THIS).removeClass(THIS)
-
-        //移动端点击菜单时自动收缩
-        if (admin.screen() < 2) admin.sideFlexible()
-
-        //开始捕获
-        matchMenu(sideMenu.children('li'))
-    })
-
-    //侧边导航点击事件
-    element.on('nav(layadmin-system-side-menu)', function (elem) {
-        if (elem.siblings('.layui-nav-child')[0] && container.hasClass(SIDE_SHRINK)) {
-            admin.sideFlexible('spread')
-            layer.close(elem.data('index'))
-        }
-
-        admin.tabsPage.type = 'nav'
-    })
-
-    //选项卡的更多操作
-    element.on('nav(layadmin-pagetabs-nav)', function (elem) {
-        var dd = elem.parent()
-        dd.removeClass(THIS)
-        dd.parent().removeClass(SHOW)
-    })
-
-    //同步路由
-    var setThisRouter = function (othis) {
-        var layid = othis.attr('lay-id')
-            , attr = othis.attr('lay-attr')
-            , index = othis.index()
-
-        location.hash = layid === setter.entry ? '/' : (attr || '/')
-        admin.tabsBodyChange(index)
-    }
-        , TABS_HEADER = '#Panel_app_tabsheader>li'
-
-    //页面标签点击
-    $body.on('click', TABS_HEADER, function () {
-        var othis = $(this)
-            , index = othis.index()
-
-        admin.tabsPage.type = 'tab'
-        admin.tabsPage.index = index
-
-        //如果是iframe类型的标签页
-        if (othis.attr('lay-attr') === 'iframe') {
-            return admin.tabsBodyChange(index)
-        }
-
-        setThisRouter(othis) //同步路由
-        admin.runResize() //执行resize事件，如果存在的话
-        admin.resizeTable() //重置当前主体区域的表格尺寸
-    })
-
-    // tabspage 删除
-    element.on('tabDelete(layadmin-layout-tabs)', function (obj) {
-        var othis = $(TABS_HEADER + '.layui-this')
-
-        obj.index && admin.tabsBody(obj.index).remove()
-        setThisRouter(othis)
-
-        //移除resize事件
-        admin.delResize()
-    })
-
-    // 页面跳转
-    $body.on('click', '*[lay-href]', function () {
-        var othis = $(this)
-        var href = othis.attr('lay-href')
-        var router = layui.router()
-
-        admin.tabsPage.elem = othis
-        // admin.prevRouter[router.path[0]] = router.href; //记录上一次各菜单的路由信息
-
-        // 执行跳转
-        location.hash = admin.correctRouter(href)
-
-        // 如果为当前页，则执行刷新
-        if (setter.refreshCurrPage) {
-            if (admin.correctRouter(href) === router.href) {
-                admin.events.refresh()
-            }
-        }
-
-        // 清理所有定时器
-        var highestTimeoutId = setTimeout(';')
-        for (var i = 0; i < highestTimeoutId; i++) {
-            clearTimeout(i)
-        }
-    })
-
-    //点击事件
-    $body.on('click', '*[layadmin-event]', function () {
-        var othis = $(this)
-            , attrEvent = othis.attr('layadmin-event')
-        events[attrEvent] && events[attrEvent].call(this, othis)
-    })
-
-    //tips
-    $body.on('mouseenter', '*[lay-tips]', function () {
-        var othis = $(this)
-
-        if (othis.parent().hasClass('layui-nav-item') && !container.hasClass(SIDE_SHRINK)) return
-
-        var tips = othis.attr('lay-tips')
-            , offset = othis.attr('lay-offset')
-            , direction = othis.attr('lay-direction')
-            , index = layer.tips(tips, this, {
-            tips: direction || 1
-            , time: -1
-            , success: function (layero, index) {
-                if (offset) {
-                    layero.css('margin-left', offset + 'px')
-                }
-            }
-        })
-        othis.data('index', index)
-    }).on('mouseleave', '*[lay-tips]', function () {
-        layer.close($(this).data('index'))
-    })
-
-    //窗口resize事件
-    var resizeSystem = layui.data.resizeSystem = function () {
-        //layer.close(events.note.index);
-        layer.closeAll('tips')
-
-        if (!resizeSystem.lock) {
-            setTimeout(function () {
-                admin.sideFlexible(admin.screen() < 2 ? '' : 'spread')
-                delete resizeSystem.lock
-            }, 100)
-        }
-
-        resizeSystem.lock = true
-    }
-    $win.on('resize', layui.data.resizeSystem)
-
-    //设置组件全局 token
-    !function () {
-        var request = setter.request
-        if (request.tokenName) {
-            var obj = {}
-            obj[request.tokenName] = layui.data(setter.tableName)[request.tokenName] || ''
-
-            //table
-            table.set({
-                headers: obj, //通过 request 头传递
-                where: obj //通过参数传递
-            })
-            //upload
-            upload.set({
-                headers: obj, //通过 request 头传递
-                data: obj //通过参数传递
-            })
-        }
-    }()
-
-    //接口输出
-    exports('admin', admin)
-})

public/panel/adminui/src/modules/index.js

@@ -1,198 +0,0 @@
-/**
- * 界面入口模块
- */
-
-layui.define('admin', function (exports) {
-  var setter = layui.setter
-  var element = layui.element
-  var admin = layui.admin
-  var tabsPage = admin.tabsPage
-  var view = layui.view
-
-  //根据路由渲染页面
-  var renderPage = function () {
-    var router = layui.router()
-      , path = router.path
-      , pathURL = admin.correctRouter(router.path.join('/'))
-
-    //默认读取主页
-    if (!path.length) path = ['']
-
-    //如果最后一项为空字符，则读取默认文件
-    if (path[path.length - 1] === '') {
-      path[path.length - 1] = setter.entry
-    }
-
-    //重置状态
-    var reset = function (type) {
-      //renderPage.haveInit && layer.closeAll();
-      if (renderPage.haveInit) {
-        $('.layui-layer').each(function () {
-          var othis = $(this),
-            index = othis.attr('times')
-          if (!(othis.hasClass('layui-layim') || othis.hasClass('layui-layim-chat'))) {
-            layer.close(index)
-          }
-        })
-      }
-      renderPage.haveInit = true
-
-      $(APP_BODY).scrollTop(0)
-      delete tabsPage.type //重置页面标签的来源类型
-    }
-
-    //如果路由来自于 tab 切换，则不重新请求视图
-    if (tabsPage.type === 'tab') {
-      //切换到非主页、或者切换到主页且主页必须有内容。方可阻止请求
-      if (pathURL !== '/' || (pathURL === '/' && admin.tabsBody().html())) {
-        admin.tabsBodyChange(tabsPage.index)
-        return reset(tabsPage.type)
-      }
-    }
-
-    //请求视图渲染
-    view().render(path.join('/')).then(function (res) {
-
-      //遍历页签选项卡
-      var matchTo
-        , tabs = $('#Panel_app_tabsheader>li')
-
-      tabs.each(function (index) {
-        var li = $(this)
-          , layid = li.attr('lay-id')
-
-        if (layid === pathURL) {
-          matchTo = true
-          tabsPage.index = index
-        }
-      })
-
-      //如果未在选项卡中匹配到，则追加选项卡
-      if (setter.pageTabs && pathURL !== '/') {
-        if (!matchTo) {
-          $(APP_BODY).append('<div class="layadmin-tabsbody-item layui-show"></div>')
-          tabsPage.index = tabs.length
-          element.tabAdd(FILTER_TAB_TBAS, {
-            title: '<span>' + (res.title || '新标签页') + '</span>'
-            , id: pathURL
-            , attr: router.href
-          })
-        }
-      }
-
-      this.container = admin.tabsBody(tabsPage.index)
-      setter.pageTabs || this.container.scrollTop(0) //如果不开启标签页，则跳转时重置滚动条
-
-      //定位当前tabs
-      element.tabChange(FILTER_TAB_TBAS, pathURL)
-      admin.tabsBodyChange(tabsPage.index)
-
-    }).done(function () {
-      layui.use('common', layui.cache.callback.common)
-      $win.on('resize', layui.data.resize)
-
-      element.render('breadcrumb', 'breadcrumb')
-
-      //容器 scroll 事件，剔除吸附层
-      admin.tabsBody(tabsPage.index).on('scroll', function () {
-        var othis = $(this)
-          , elemDate = $('.layui-laydate')
-          , layerOpen = $('.layui-layer')[0]
-
-        //关闭 layDate
-        if (elemDate[0]) {
-          elemDate.each(function () {
-            var thisElemDate = $(this)
-            thisElemDate.hasClass('layui-laydate-static') || thisElemDate.remove()
-          })
-          othis.find('input').blur()
-        }
-
-        //关闭 Tips 层
-        layerOpen && layer.closeAll('tips')
-      })
-    })
-
-    reset()
-  }
-
-  //入口页面
-  var entryPage = function (fn) {
-    var router = layui.router()
-      , container = view(setter.container)
-      , pathURL = admin.correctRouter(router.path.join('/'))
-      , isIndPage
-
-    //检查是否属于独立页面
-    layui.each(setter.indPage, function (index, item) {
-      if (pathURL === item) {
-        return isIndPage = true
-      }
-    })
-
-    //将模块根路径设置为 modules 目录
-    layui.config({
-      base: setter.paths.base + 'modules/'
-    })
-
-    //独立页面
-    if (isIndPage) {
-      container.render(router.path.join('/')).done(function () {
-        admin.pageType = 'alone'
-      })
-    } else { //后台框架页面
-
-      //强制拦截未登入
-      if (setter.interceptor) {
-        var local = layui.data(setter.tableName)
-        if (!local[setter.request.tokenName]) {
-          return location.hash = '/login/redirect=' + encodeURIComponent(pathURL) //跳转到登入页
-        }
-      }
-
-      //渲染后台结构
-      if (admin.pageType === 'console') { //后台主体页
-        renderPage()
-      } else { //初始控制台结构
-        container.render('ui/layout').done(function () {
-          renderPage()
-          layui.element.render()
-
-          if (admin.screen() < 2) {
-            admin.sideFlexible()
-          }
-          admin.pageType = 'console'
-        })
-      }
-
-    }
-  }
-
-  var APP_BODY = '#Panel_app_body'
-  var FILTER_TAB_TBAS = 'layadmin-layout-tabs'
-  var $ = layui.$, $win = $(window)
-
-  //初始主体结构
-  layui.link(
-    setter.paths.core + 'css/admin.css?v=' + admin.v
-    , function () {
-      entryPage()
-    }
-    , 'layuiAdmin'
-  )
-
-  //Hash改变
-  window.onhashchange = function () {
-    entryPage()
-    //执行 {setter.MOD_NAME}.hash 下的事件
-    layui.event.call(this, setter.MOD_NAME, 'hash({*})', layui.router())
-  }
-
-  // 对外输出
-  var adminuiIndex = {
-    render: renderPage
-  }
-
-  $.extend(admin, adminuiIndex)
-  exports('adminIndex', adminuiIndex)
-})

public/panel/adminui/src/modules/view.js

@@ -1,325 +0,0 @@
-/**
- * 界面视图模块
- */
-
-layui.define(['laytpl', 'layer'], function (exports) {
-  var $ = layui.jquery, laytpl = layui.laytpl, layer = layui.layer, setter = layui.setter, device = layui.device(),
-    hint = layui.hint()
-
-    //对外接口
-    , view = function (id) {
-      return new Class(id)
-    }
-
-    , SHOW = 'layui-show', LAY_BODY = 'Panel_app_body'
-
-    //构造器
-    , Class = function (id) {
-      this.id = id
-      this.container = $('#' + (id || LAY_BODY))
-    }
-
-  //加载中
-  view.loading = function (elem) {
-    elem.append(this.elemLoad = $('<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon layui-icon-loading layadmin-loading"></i>'))
-  }
-
-  //移除加载
-  view.removeLoad = function () {
-    this.elemLoad && this.elemLoad.remove()
-  }
-
-  //清除 token，并跳转到登入页
-  view.exit = function () {
-    //清空本地记录的 token
-    layui.data(setter.tableName, {
-      key: setter.request.tokenName, remove: true
-    })
-
-    //跳转到登入页
-    location.hash = '/user/login'
-  }
-
-  //Ajax请求
-  view.req = function (options) {
-    var that = this, success = options.success, error = options.error, request = setter.request,
-      response = setter.response, debug = function () {
-        return setter.debug ? '<br><cite>URL：</cite>' + options.url : ''
-      }
-
-    options.data = options.data || {}
-    options.headers = options.headers || {}
-
-    if (request.tokenName) {
-      var sendData = typeof options.data === 'string' ? JSON.parse(options.data) : options.data
-
-      //自动给参数传入默认 token
-      options.data[request.tokenName] = request.tokenName in sendData ? options.data[request.tokenName] : (layui.data(setter.tableName)[request.tokenName] || '')
-
-      //自动给 Request Headers 传入 token
-      options.headers[request.tokenName] = request.tokenName in options.headers ? options.headers[request.tokenName] : (layui.data(setter.tableName)[request.tokenName] || '')
-    }
-
-    delete options.success
-    delete options.error
-
-    if (options.type === 'post' || options.type === 'put' || options.type === 'delete' || options.type === 'patch' || options.type === 'POST' || options.type === 'PUT' || options.type === 'DELETE' || options.type === 'PATCH') {
-      options.contentType = 'application/json'
-      options.data = JSON.stringify(options.data)
-    }
-
-    return $.ajax($.extend({
-      type: 'get', dataType: 'json', success: function (res) {
-        var statusCode = response.statusCode
-
-        //只有 response 的 code 一切正常才执行 done
-        if (res[response.statusName] == statusCode.ok) {
-          typeof options.done === 'function' && options.done(res)
-        }
-
-        //登录状态失效，清除本地 access_token，并强制跳转到登入页
-        else if (res[response.statusName] == statusCode.logout) {
-          view.exit()
-        }
-
-        //其它异常
-        else {
-          var errorText = ['<cite>Error：</cite> ' + (res[response.msgName] || '返回状态码异常'), debug()].join('')
-          view.error(errorText)
-        }
-
-        //只要 http 状态码正常，无论 response 的 code 是否正常都执行 success
-        typeof success === 'function' && success(res)
-      }, error: function (e, code) {
-        console.log('面板响应异常: ' + e.responseText)
-        if (e.status === 422) {
-          var errorText = ''
-          var res = e.responseText
-          try {
-            res = JSON.parse(res)
-          } catch (e) {
-            res = {}
-          }
-          if (typeof res.message === 'object' && res.message !== null) {
-            for (let key in res.message) {
-              if (res.message.hasOwnProperty(key)) {
-                for (let subKey in res.message[key]) {
-                  if (res.message[key].hasOwnProperty(subKey)) {
-                    errorText += '<cite>Error：</cite> ' + res.message[key][subKey] + '<br>'
-                  }
-                }
-              }
-            }
-          } else {
-            errorText = res.message
-          }
-
-          view.error(errorText)
-          return false
-        }
-        var errorText = ['请求异常，请重试<br><cite>错误信息：</cite>' + code, debug()].join('')
-        view.error(errorText)
-
-        typeof error === 'function' && error.apply(this, arguments)
-      }
-    }, options))
-  }
-
-  //弹窗
-  view.popup = function (options) {
-    var success = options.success, skin = options.skin
-
-    delete options.success
-    delete options.skin
-
-    return layer.open($.extend({
-      type: 1,
-      title: '提示',
-      content: '',
-      id: 'LAY-system-view-popup',
-      skin: 'layui-layer-admin' + (skin ? ' ' + skin : ''),
-      shadeClose: true,
-      closeBtn: false,
-      success: function (layero, index) {
-        var elemClose = $('<i class="layui-icon" close>&#x1006;</i>')
-        layero.append(elemClose)
-        elemClose.on('click', function () {
-          layer.close(index)
-        })
-        typeof success === 'function' && success.apply(this, arguments)
-      }
-    }, options))
-  }
-
-  //异常提示
-  view.error = function (content, options) {
-    return view.popup($.extend({
-      content: content, maxWidth: 300
-      //,shade: 0.01
-      , offset: 't', anim: 6, id: 'LAY_adminError'
-    }, options))
-  }
-
-  //请求模板文件渲染
-  Class.prototype.render = function (views, params) {
-    var that = this, router = layui.router()
-    views = (setter.paths && setter.paths.views ? setter.paths.views : setter.views) + views + setter.engine
-
-    $('#' + LAY_BODY).children('.layadmin-loading').remove()
-    view.loading(that.container) //loading
-
-    //请求模板
-    $.ajax({
-      url: views, type: 'get', dataType: 'html', data: {
-        v: layui.cache.version
-      }, success: function (html) {
-        html = '<div>' + html + '</div>'
-
-        var elemTitle = $(html).find('title'),
-          title = elemTitle.text() || (html.match(/\<title\>([\s\S]*)\<\/title>/) || [])[1]
-
-        var res = {
-          title: title, body: html
-        }
-
-        elemTitle.remove()
-        that.params = params || {} //获取参数
-
-        if (that.then) {
-          that.then(res)
-          delete that.then
-        }
-
-        that.parse(html)
-        view.removeLoad()
-
-        if (that.done) {
-          that.done(res)
-          delete that.done
-        }
-
-      }, error: function (e) {
-        view.removeLoad()
-
-        if (that.render.isError) {
-          return view.error('请求视图文件异常，状态：' + e.status)
-        }
-
-        if (e.status === 404) {
-          that.render('ui/404')
-        } else {
-          that.render('ui/error')
-        }
-
-        that.render.isError = true
-      }
-    })
-    return that
-  }
-
-  //解析模板
-  Class.prototype.parse = function (html, refresh, callback) {
-    var that = this, isScriptTpl = typeof html === 'object' //是否模板元素
-      , elem = isScriptTpl ? html : $(html), elemTemp = isScriptTpl ? html : elem.find('*[template]'),
-      fn = function (options) {
-        var tpl = laytpl(options.dataElem.html()), res = $.extend({
-          params: router.params
-        }, options.res)
-
-        options.dataElem.after(tpl.render(res))
-        typeof callback === 'function' && callback()
-
-        try {
-          options.done && new Function('d', options.done)(res)
-        } catch (e) {
-          console.error(options.dataElem[0], '\n存在错误回调脚本\n\n', e)
-        }
-      }, router = layui.router()
-
-    elem.find('title').remove()
-    that.container[refresh ? 'after' : 'html'](elem.children())
-
-    router.params = that.params || {}
-
-    //遍历模板区块
-    for (var i = elemTemp.length; i > 0; i--) {
-      (function () {
-        var dataElem = elemTemp.eq(i - 1), layDone = dataElem.attr('lay-done') || dataElem.attr('lay-then') //获取回调
-          , url = laytpl(dataElem.attr('lay-url') || '').render(router) //接口 url
-          , data = laytpl(dataElem.attr('lay-data') || '').render(router) //接口参数
-          , headers = laytpl(dataElem.attr('lay-headers') || '').render(router) //接口请求的头信息
-
-        try {
-          data = new Function('return ' + data + ';')()
-        } catch (e) {
-          hint.error('lay-data: ' + e.message)
-          data = {}
-        }
-
-        try {
-          headers = new Function('return ' + headers + ';')()
-        } catch (e) {
-          hint.error('lay-headers: ' + e.message)
-          headers = headers || {}
-        }
-
-        if (url) {
-          view.req({
-            type: dataElem.attr('lay-type') || 'get',
-            url: url,
-            data: data,
-            dataType: 'json',
-            headers: headers,
-            success: function (res) {
-              fn({
-                dataElem: dataElem, res: res, done: layDone
-              })
-            }
-          })
-        } else {
-          fn({
-            dataElem: dataElem, done: layDone
-          })
-        }
-      }())
-    }
-
-    return that
-  }
-
-  //直接渲染字符
-  Class.prototype.send = function (views, data) {
-    var tpl = laytpl(views || this.container.html()).render(data || {})
-    this.container.html(tpl)
-    return this
-  }
-
-  //局部刷新模板
-  Class.prototype.refresh = function (callback) {
-    var that = this, next = that.container.next(), templateid = next.attr('lay-templateid')
-
-    if (that.id != templateid) return that
-
-    that.parse(that.container, 'refresh', function () {
-      that.container.siblings('[lay-templateid="' + that.id + '"]:last').remove()
-      typeof callback === 'function' && callback()
-    })
-
-    return that
-  }
-
-  //视图请求成功后的回调
-  Class.prototype.then = function (callback) {
-    this.then = callback
-    return this
-  }
-
-  //视图渲染完毕后的回调
-  Class.prototype.done = function (callback) {
-    this.done = callback
-    return this
-  }
-
-  //对外接口
-  exports('view', view)
-})

public/panel/config.js

@@ -1,99 +0,0 @@
-/**
- * setter
- */
-
-// 初始化配置
-layui.define(['all'], function (exports) {
-  exports('setter', {
-    paths: { // v1.9.0 及以上版本的写法
-      core: layui.cache.base + 'adminui/src/', // 核心库所在目录
-      views: layui.cache.base + 'views/', // 业务视图所在目录
-      modules: layui.cache.base + 'modules/', // 业务模块所在目录
-      base: layui.cache.base // 记录静态资源所在基础目录
-    },
-
-    container: 'Panel_app', // 容器ID
-    entry: 'index', // 默认视图文件名
-    engine: '.html', // 视图文件后缀名
-    pageTabs: true, // 是否开启页面选项卡功能。单页版不推荐开启
-    refreshCurrPage: true, // 当跳转页面 url 与当前页 url 相同时，是否自动执行刷新
-
-    name: '耗子Linux面板', tableName: 'HaoZiPanel', // 本地存储表名
-    MOD_NAME: 'admin', // 模块事件名
-
-    debug: true, // 是否开启调试模式。如开启，接口异常时会抛出异常 URL 等信息
-    interceptor: true, // 是否开启未登入拦截
-
-    // 自定义请求字段
-    request: {
-      tokenName: 'access_token' // 自动携带 token 的字段名。可设置 false 不携带。
-    },
-
-    // 自定义响应字段
-    response: {
-      statusName: 'code', // 数据状态的字段名称
-      statusCode: {
-        ok: 0, // 数据状态一切正常的状态码
-        logout: 401 // 登录状态失效的状态码
-      }, msgName: 'message', // 状态信息的字段名称
-      dataName: 'data' // 数据详情的字段名称
-    },
-
-    // 独立页面路由，可随意添加（无需写参数）
-    indPage: [
-        '/login',
-        '/logout',
-    ],
-
-    // 配置业务模块目录中的特殊模块
-    extend: {},
-
-    // 主题配置
-    theme: {
-      // 内置主题配色方案
-      color: [{
-        main: '#20222A', // 主题色
-        selected: '#16baaa', // 选中色
-        alias: 'default' // 默认别名
-      }, {
-        main: '#03152A', selected: '#3B91FF', alias: 'dark-blue' // 藏蓝
-      }, {
-        main: '#2E241B', selected: '#A48566', alias: 'coffee' // 咖啡
-      }, {
-        main: '#50314F', selected: '#7A4D7B', alias: 'purple-red' // 紫红
-      }, {
-        main: '#344058', logo: '#1E9FFF', selected: '#1E9FFF', alias: 'ocean' // 海洋
-      }, {
-        main: '#3A3D49', logo: '#2F9688', selected: '#16b777', alias: 'green' // 墨绿
-      }, {
-        main: '#20222A', logo: '#F78400', selected: '#F78400', alias: 'red' // 橙色
-      }, {
-        main: '#28333E', logo: '#AA3130', selected: '#AA3130', alias: 'fashion-red' // 时尚红
-      }, {
-        main: '#24262F', logo: '#3A3D49', selected: '#16baaa', alias: 'classic-black' // 经典黑
-      }, {
-        logo: '#226A62', header: '#2F9688', alias: 'green-header' // 墨绿头
-      }, {
-        main: '#344058', logo: '#0085E8', selected: '#1E9FFF', header: '#1E9FFF', alias: 'ocean-header' // 海洋头
-      }, {
-        header: '#393D49', alias: 'classic-black-header' // 经典黑
-      }, {
-        main: '#50314F', logo: '#50314F', selected: '#7A4D7B', header: '#50314F', alias: 'purple-red-header' // 紫红头
-      }, {
-        main: '#28333E', logo: '#28333E', selected: '#AA3130', header: '#AA3130', alias: 'fashion-red-header' // 时尚红头
-      }, {
-        main: '#28333E', logo: '#16baaa', selected: '#16baaa', header: '#16baaa', alias: 'green-header' // 墨绿头
-      }, {
-        main: '#393D49', logo: '#393D49', selected: '#16baaa', header: '#23262E', alias: 'Classic-style1' // 经典风格1
-      }, {
-        main: '#001529', logo: '#001529', selected: '#1890FF', header: '#1890FF', alias: 'Classic-style2' // 经典风格2
-      }, {
-        main: '#25282A', logo: '#25282A', selected: '#35BDB2', header: '#35BDB2', alias: 'Classic-style3' // 经典风格3
-      }],
-
-      // 初始的颜色索引，对应上面的配色方案数组索引
-      // 如果本地已经有主题色记录，则以本地记录为优先，除非请求本地数据（localStorage）
-      initColorIndex: 0
-    }
-  })
-})

public/panel/index.js

@@ -1,40 +0,0 @@
-/**
- * 初始化主题入口模块
- */
-
-layui.extend({
-  setter: 'config' // 将 config.js 扩展到 layui 模块
-}).define(['setter'], function (exports) {
-  var setter = layui.setter
-
-  // 将核心库扩展到 layui 模块
-  layui.each({
-    admin: 'admin',
-    view: 'view',
-    adminIndex: 'index'
-  }, function (modName, fileName) {
-    var libs = {}
-    libs[modName] = '{/}' + setter.paths.core + '/modules/' + fileName
-    layui.extend(libs)
-  })
-
-  // 指定业务模块基础目录
-  layui.config({
-    base: setter.paths.modules
-  })
-
-  // 将业务模块中的特殊模块扩展到 layui 模块
-  layui.each(setter.extend, function (key, value) {
-    var mods = {}
-    mods[key] = '{/}' + layui.cache.base + value
-    layui.extend(mods)
-  })
-
-  // 加载主题核心库入口模块
-  layui.use('adminIndex', function () {
-    layui.use('common') // 加载公共业务模块，如不需要可剔除
-
-    // 输出模块 / 模块加载完毕标志
-    exports('index', layui.admin)
-  })
-})

public/panel/modules/common.js

@@ -1,33 +0,0 @@
-/**
- * common
- */
-
-layui.define(function (exports) {
-  var $ = layui.$
-    , layer = layui.layer
-    , laytpl = layui.laytpl
-    , setter = layui.setter
-    , view = layui.view
-    , admin = layui.admin
-
-  //公共业务的逻辑处理可以写在此处，切换任何页面都会执行
-  //……
-
-  //退出
-  admin.events.logout = function () {
-    //执行退出接口
-    admin.req({
-      url: './res/json/user/logout.js'
-      , type: 'get'
-      , data: {}
-      , done: function (res) { //这里要说明一下：done 是只有 response 的 code 正常才会执行。而 succese 则是只要 http 为 200 就会执行
-
-        //清空本地记录的 token，并跳转到登入页
-        admin.exit()
-      }
-    })
-  }
-
-  //对外暴露的接口
-  exports('common', {})
-})

public/panel/modules/cron.css

@@ -1,194 +0,0 @@
-
-/* 样式加载完毕的标识 */
-html #layuicss-cron {
-    display: none;
-    position: absolute;
-    width: 1989px;
-}
-
-
-/* 主体结构 */
-.layui-cron {
-    width: 550px;
-    position: absolute;
-    z-index: 99999999;
-    margin: 5px 0;
-    border-radius: 2px;
-    font-size: 14px;
-    -webkit-animation-duration: 0.3s;
-    animation-duration: 0.3s;
-    -webkit-animation-fill-mode: both;
-    animation-fill-mode: both;
-    background-color: white;
-    display: flex;
-    flex-direction: column;
-    box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 5px 0px;
-    -webkit-animation-name: cron-upbit;
-    animation-name: cron-upbit;
-    border: 1px solid #e6e6e6;
-}
-
-.layui-cron-main ul {
-    padding-left: 10px;
-}
-
-@-webkit-keyframes cron-upbit {
-
-    /* 微微往上滑入 */
-    from {
-        -webkit-transform: translate3d(0, 20px, 0);
-        opacity: 0.3;
-    }
-
-    to {
-        -webkit-transform: translate3d(0, 0, 0);
-        opacity: 1;
-    }
-}
-
-@keyframes cron-upbit {
-    from {
-        transform: translate3d(0, 20px, 0);
-        opacity: 0.3;
-    }
-
-    to {
-        transform: translate3d(0, 0, 0);
-        opacity: 1;
-    }
-}
-
-/* tabs */
-.layui-cron>.layui-tab {
-    margin: 0;
-    box-shadow: none;
-    border: none;
-}
-
-/* 行 */
-.cron-row {
-    padding-left: 13px;
-}
-/* 格 */
-.cron-grid {
-    padding-left: 15px;
-}
-
-/* 表达式 */
-.cron-title {
-    font-weight: 700;
-    font-size: 14px;
-    margin: 10px;
-    margin-bottom: 0;
-}
-
-.cron-box {
-    margin: 10px;
-}
-
-.cron-box+.cron-box {
-    margin-top: 0;
-}
-
-/* 按钮 */
-.cron-footer-btns {
-    text-align: right;
-    margin-right: 10px;
-    margin-bottom: 10px;
-}
-
-.cron-footer-btns span {
-    height: 26px;
-    line-height: 26px;
-    margin: 0 0 0 -1px;
-    padding: 0 10px;
-    border: 1px solid #C9C9C9;
-    background-color: #fff;
-    white-space: nowrap;
-    vertical-align: top;
-    border-radius: 2px;
-    display: inline-block;
-    cursor: pointer;
-    font-size: 12px;
-    box-sizing: border-box;
-    color: #666;
-}
-
-.cron-footer-btns span:hover {
-    color: #5FB878;
-}
-
-
-/* 表单 */
-.layui-cron .layui-form-radio {
-    margin-right: 0;
-}
-
-.cron-form {
-    line-height: 28px;
-    font-size: 14px;
-}
-
-.cron-input-mid {
-    display: inline-block;
-    vertical-align: middle;
-    margin-top: 6px;
-    background-color: #e5e5e5;
-    padding: 0 12px;
-    height: 28px;
-    line-height: 28px;
-    border: 1px solid #ccc;
-    box-sizing: border-box;
-}
-
-.cron-input {
-    display: inline-block;
-    vertical-align: middle;
-    margin-top: 6px;
-    padding: 0 8px;
-    background-color: #fff;
-    border: 1px solid #ccc;
-    height: 28px;
-    line-height: 28px;
-    box-sizing: border-box;
-    width: 80px;
-    -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-    -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-    transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-}
-
-.cron-input:focus {
-    outline: 0;
-    border: 1px solid #01AAED;
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 4px 0px #01AAED;
-    translate: 1s;
-}
-
-.layui-cron .layui-form-checkbox[lay-skin="primary"] span {
-    padding-right: 10px;
-    min-width: 16px;
-}
-
-.layui-cron .layui-form-checkbox[lay-skin="primary"] {
-    padding-left: 22px;
-    margin-top: 5px;
-}
-.layui-cron input[type=number] {
-    -moz-appearance:textfield;
-}
-.layui-cron input[type=number]::-webkit-inner-spin-button,
-.layui-cron input[type=number]::-webkit-outer-spin-button {
-    -webkit-appearance: none;
-    margin: 0;
-}
-.cron-tips{
-    color: grey;
-    line-height: 28px;
-    height: 28px;
-    display: inline-block;
-    vertical-align: middle;
-    margin-top: 8px;
-    margin-left: 5px;
-}

public/panel/modules/cron.js

@@ -1,970 +0,0 @@
-/**
- @ Name：layui.cron Cron表达式解析器
- @ Author：贝哥哥
- @ License：MIT
- */
-
-layui.define(['lay', 'element', 'form'], function (exports) { //假如该组件依赖 layui.form
-    var $ = layui.$, layer = layui.layer, lay = layui.lay, element = layui.element, form = layui.form
-
-
-        //字符常量
-        , MOD_NAME = 'cron', ELEM = '.layui-cron', THIS = 'layui-this', SHOW = 'layui-show', HIDE = 'layui-hide'
-
-        , ELEM_STATIC = 'layui-cron-static', ELEM_FOOTER = 'layui-cron-footer', ELEM_CONFIRM = '.cron-btns-confirm',
-        ELEM_HINT = 'layui-cron-hint'
-
-        , ELEM_RUN_HINT = 'layui-cron-run-hint'
-
-        //外部接口
-        , cron = {
-            v: '2.0.0' // cron 组件当前版本
-            , index: layui.cron ? (layui.cron.index + 10000) : 0 // corn 实例标识
-
-            //设置全局项
-            , set: function (options) {
-                var that = this;
-                that.config = $.extend({}, that.config, options);
-                return that;
-            }
-
-            //事件监听
-            , on: function (events, callback) {
-                return layui.onevent.call(this, MOD_NAME, events, callback);
-            }
-
-            //主体CSS等待事件
-            , ready: function (fn) {
-                var cssPath = layui.cache.base + "cron.css?v=" + cron.v;
-                layui.link(cssPath, fn, "cron"); //此处的“cron”要对应 cron.css 中的样式： html #layuicss-cron{}
-                return this;
-            }
-        }
-
-        //操作当前实例
-        , thisIns = function () {
-            var that = this, options = that.config, id = options.id || options.index;
-
-            return {
-                //提示框
-                hint: function (content) {
-                    that.hint.call(that, content);
-                }, config: options
-            }
-        }
-
-        //构造器，创建实例
-        , Class = function (options) {
-            var that = this;
-            that.index = ++cron.index;
-            that.config = $.extend({}, that.config, cron.config, options);
-            cron.ready(function () {
-                that.init();
-            });
-        };
-
-    //默认配置
-    Class.prototype.config = {
-        value: null // 当前表达式值，每秒执行一次
-        ,
-        isInitValue: true //用于控制是否自动向元素填充初始值（需配合 value 参数使用）
-        ,
-        lang: "cn" //语言，只支持cn/en，即中文和英文
-        ,
-        tabs: [{key: 'minutes', range: '0-59'}, {
-            key: 'hours', range: '0-23'
-        }, {key: 'days', range: '1-31'}, {key: 'months', range: '1-12'}, {key: 'weeks', range: '1-7'}],
-        defaultCron: {minutes: "*", hours: "*", days: "*", months: "*", weeks: "*"},
-        trigger: "click" //呼出控件的事件
-        ,
-        btns: ['run', 'confirm'] //右下角显示的按钮，会按照数组顺序排列
-        ,
-        position: null //控件定位方式定位, 默认absolute，支持：fixed/absolute/static
-        ,
-        zIndex: null //控件层叠顺序
-        ,
-        show: false //是否直接显示，如果设置 true，则默认直接显示控件
-        ,
-        showBottom: true //是否显示底部栏
-        ,
-        done: null //控件选择完毕后的回调，点击运行/确定也均会触发
-        ,
-        run: null // 最近运行时间接口
-    };
-
-    //多语言
-    Class.prototype.lang = function () {
-        var that = this, options = that.config, text = {
-            cn: {
-                tabs: [{title: "分"}, {title: "时"}, {title: "日"}, {title: "月"}, {
-                    title: "周",
-                    rateBegin: "第",
-                    rateMid: "周的星期",
-                    rateEnd: ""
-                }],
-                every: "每",
-                unspecified: "不指定",
-                period: "周期",
-                periodFrom: "从",
-                rate: "按照",
-                rateBegin: "从",
-                rateMid: "开始，每",
-                rateEnd: "执行一次",
-                weekday: "工作日",
-                weekdayPrefix: "每月",
-                weekdaySuffix: "号最近的那个工作日",
-                lastday: "本月最后一日",
-                lastweek: "本月最后一个星期",
-                custom: "指定",
-                tools: {
-                    confirm: '确定', run: '运行'
-                },
-                formatError: ['Cron格式不合法', '<br>已为你重置']
-            }, en: {
-                tabs: [{title: "Minutes"}, {title: "Hours"}, {title: "Days"}, {title: "Months"}, {title: "Weeks"}],
-                every: "Every ",
-                unspecified: "Unspecified",
-                period: "Period",
-                periodFrom: "From",
-                rate: "According to",
-                rateBegin: "begin at",
-                rateMid: ", every",
-                rateEnd: " execute once",
-                weekday: "Weekday",
-                weekdayPrefix: "Every month at ",
-                weekdaySuffix: "号最近的那个工作日",
-                lastday: "Last day of the month",
-                lastweek: "本月最后一个星期",
-                custom: "Custom",
-                tools: {
-                    confirm: 'Confirm', run: 'Run'
-                },
-                formatError: ['The cron format error', '<br>It has been reset']
-            }
-        };
-        return text[options.lang] || text['cn'];
-    };
-
-    //初始准备
-    Class.prototype.init = function () {
-        var that = this, options = that.config, isStatic = options.position === 'static';
-
-        options.elem = lay(options.elem);
-
-        options.eventElem = lay(options.eventElem);
-
-        if (!options.elem[0]) return;
-
-        //如果不是input|textarea元素，则默认采用click事件
-        if (!that.isInput(options.elem[0])) {
-            if (options.trigger === 'focus') {
-                options.trigger = 'click';
-            }
-        }
-
-        // 设置渲染所绑定元素的唯一KEY
-        if (!options.elem.attr('lay-key')) {
-            options.elem.attr('lay-key', that.index);
-            options.eventElem.attr('lay-key', that.index);
-        }
-
-        // 当前实例主面板ID
-        that.elemID = 'layui-icon' + options.elem.attr('lay-key');
-
-        //默认赋值
-        if (options.value && options.isInitValue) {
-            that.setValue(options.value);
-        }
-        if (!options.value) {
-            options.value = options.elem[0].value || '';
-        }
-        var cronArr = options.value.split(' ');
-        if (cronArr.length >= 6) {
-            options.cron = {
-                minutes: cronArr[0],
-                hours: cronArr[1],
-                days: cronArr[2],
-                months: cronArr[3],
-                weeks: cronArr[4],
-            };
-        } else {
-            options.cron = lay.extend({}, options.defaultCron);
-        }
-
-
-        if (options.show || isStatic) that.render();
-        isStatic || that.events();
-
-
-    };
-
-
-    // 控件主体渲染
-    Class.prototype.render = function () {
-        var that = this, options = that.config, lang = that.lang(), isStatic = options.position === 'static',
-            tabFilter = 'cron-tab' + options.elem.attr('lay-key')
-            //主面板
-            , elem = that.elem = lay.elem('div', {
-                id: that.elemID, 'class': ['layui-cron', isStatic ? (' ' + ELEM_STATIC) : ''].join('')
-            })
-
-            // tab 内容区域
-            , elemTab = that.elemTab = lay.elem('div', {
-                'class': 'layui-tab layui-tab-card', 'lay-filter': tabFilter
-            }), tabHead = lay.elem('ul', {
-                'class': 'layui-tab-title'
-            }), tabContent = lay.elem('div', {
-                'class': 'layui-tab-content'
-            })
-
-            //底部区域
-            , divFooter = that.footer = lay.elem('div', {
-                'class': ELEM_FOOTER
-            });
-
-        if (options.zIndex) elem.style.zIndex = options.zIndex;
-
-        // 生成tab 内容区域
-        elemTab.appendChild(tabHead);
-        elemTab.appendChild(tabContent);
-        lay.each(lang.tabs, function (i, item) {
-            // 表头
-            var li = lay.elem('li', {
-                'class': i === 0 ? THIS : "", 'lay-id': i
-            });
-            li.innerHTML = item.title;
-            tabHead.appendChild(li);
-
-            // 表体
-            tabContent.appendChild(that.getTabContentChildElem(i));
-        });
-
-        // 主区域
-        elemMain = that.elemMain = lay.elem('div', {
-            'class': 'layui-cron-main'
-        });
-        elemMain.appendChild(elemTab);
-
-        //生成底部栏
-        lay(divFooter).html(function () {
-            var html = [], btns = [];
-            lay.each(options.btns, function (i, item) {
-                var title = lang.tools[item] || 'btn';
-                btns.push('<span lay-type="' + item + '" class="cron-btns-' + item + '">' + title + '</span>');
-            });
-            html.push('<div class="cron-footer-btns">' + btns.join('') + '</div>');
-            return html.join('');
-        }());
-
-        //插入到主区域
-        elem.appendChild(elemMain);
-
-        options.showBottom && elem.appendChild(divFooter);
-
-
-        //移除上一个控件
-        that.remove(Class.thisElemCron);
-
-        //如果是静态定位，则插入到指定的容器中，否则，插入到body
-        isStatic ? options.elem.append(elem) : (document.body.appendChild(elem)
-            , that.position());
-
-
-        that.checkCron();
-
-        that.elemEvent(); // 主面板事件
-
-        Class.thisElemCron = that.elemID;
-
-        form.render();
-
-    }
-
-    // 渲染 tab 子控件
-    Class.prototype.getTabContentChildElem = function (index) {
-        var that = this, options = that.config, tabItem = options.tabs[index], tabItemKey = tabItem.key,
-            lang = that.lang(), tabItemLang = lang.tabs[index], cron = options.cron,
-            formFilter = 'cronForm' + tabItemKey + options.elem.attr('lay-key'), data = function () {
-                if (cron[tabItemKey].indexOf('-') != -1) {
-                    // 周期数据
-                    var arr = cron[tabItemKey].split('-');
-                    return {
-                        type: 'range', start: arr[0], end: arr[1]
-                    };
-                }
-                if (cron[tabItemKey].indexOf('/') != -1) {
-                    // 频率数据
-                    var arr = cron[tabItemKey].split('/');
-                    return {
-                        type: 'rate', begin: arr[0], rate: arr[1]
-                    };
-                }
-                if (cron[tabItemKey].indexOf(',') != -1 || /^\+?[0-9][0-9]*$/.test(cron[tabItemKey])) {
-                    // 按照指定执行
-                    var arr = cron[tabItemKey].split(',').map(Number);
-                    return {
-                        type: 'custom', values: arr
-                    };
-                }
-                if (cron[tabItemKey].indexOf('W') != -1) {
-                    // 最近的工作日
-                    var value = cron[tabItemKey].replace('W', '');
-                    return {
-                        type: 'weekday', value: value
-                    };
-                }
-                if (index === 2 && cron[tabItemKey] === 'L') {
-                    // 本月最后一日
-                    return {
-                        type: 'lastday', value: 'L'
-                    };
-                }
-                if (index === 4 && cron[tabItemKey].indexOf('L') != -1) {
-                    // 本月最后一个周 value
-                    var value = cron[tabItemKey].replace('L', '');
-                    return {
-                        type: 'lastweek', value: value
-                    };
-                }
-                if (cron[tabItemKey] === '*') {
-                    // 每次
-                    return {
-                        type: 'every', value: '*'
-                    };
-                }
-                if (cron[tabItemKey] === '?' || cron[tabItemKey] === undefined || cron[tabItemKey] === '') {
-                    // 不指定
-                    return {
-                        //type: 'unspecified', value: cron[tabItemKey]
-                        type: 'every', value: '*'
-                    };
-                }
-            }(), rangeData = function () {
-                if (tabItem.range) {
-                    var arr = tabItem.range.split('-');
-                    return {
-                        min: parseInt(arr[0]), max: parseInt(arr[1])
-                    };
-                }
-            }();
-        var elem = lay.elem('div', {
-            'class': 'layui-tab-item layui-form ' + (index === 0 ? SHOW : ""), 'lay-filter': formFilter
-        });
-
-        // 每次
-        elem.appendChild(function () {
-            var everyRadio = lay.elem('input', {
-                'name': tabItemKey + '[type]',
-                'type': 'radio',
-                'value': 'every',
-                'title': lang.every + tabItemLang.title
-            });
-            if (data.type === 'every') {
-                lay(everyRadio).attr('checked', true);
-            }
-            var everyDiv = lay.elem('div', {
-                'class': 'cron-row'
-            });
-            everyDiv.appendChild(everyRadio);
-            return everyDiv;
-        }());
-
-        // 不指定，从日开始
-        /*if (index >= 2) {
-            elem.appendChild(function () {
-                var unspecifiedRadio = lay.elem('input', {
-                    'name': tabItemKey + '[type]', 'type': 'radio', 'value': 'unspecified', 'title': lang.unspecified
-                });
-                if (data.type === 'unspecified') {
-                    lay(unspecifiedRadio).attr('checked', true);
-                }
-                var unspecifiedDiv = lay.elem('div', {
-                    'class': 'cron-row'
-                });
-                unspecifiedDiv.appendChild(unspecifiedRadio);
-                return unspecifiedDiv;
-            }());
-        }*/
-
-        // 周期
-        var rangeChild = [function () {
-            var rangeRadio = lay.elem('input', {
-                'name': tabItemKey + '[type]', 'type': 'radio', 'value': 'range', 'title': lang.period
-            });
-            if (data.type === 'range') {
-                lay(rangeRadio).attr('checked', true);
-            }
-            return rangeRadio;
-        }(), function () {
-            var elem = lay.elem('div', {
-                'class': 'cron-input-mid'
-            });
-            elem.innerHTML = lang.periodFrom;
-            return elem;
-        }(), function () {
-            var elem = lay.elem('input', {
-                'class': 'cron-input', 'type': 'number', 'name': 'rangeStart', 'value': data.start || ''
-            });
-            return elem;
-        }(), function () {
-            var elem = lay.elem('div', {
-                'class': 'cron-input-mid'
-            });
-            elem.innerHTML = '-';
-            return elem;
-        }(), function () {
-            var elem = lay.elem('input', {
-                'class': 'cron-input', 'type': 'number', 'name': 'rangeEnd', 'value': data.end || ''
-            });
-            return elem;
-        }(), function () {
-            var elem = lay.elem('div', {
-                'class': 'cron-input-mid'
-            });
-            elem.innerHTML = tabItemLang.title;
-            return elem;
-        }()]
-
-            , rangeDiv = lay.elem('div', {
-            'class': 'cron-row'
-        });
-        lay.each(rangeChild, function (i, item) {
-            rangeDiv.appendChild(item);
-        });
-        if (tabItem.range) {
-            var rangeTip = lay.elem('div', {
-                'class': 'cron-tips'
-            });
-            rangeTip.innerHTML = ['(', tabItem.range, ')'].join('');
-            rangeDiv.appendChild(rangeTip);
-        }
-        elem.appendChild(rangeDiv);
-
-        // 频率,年没有
-        if (index < 6) {
-            var rateChild = [function () {
-                var rateRadio = lay.elem('input', {
-                    'name': tabItemKey + '[type]', 'type': 'radio', 'value': 'rate', 'title': lang.rate
-                });
-                if (data.type === 'rate') {
-                    lay(rateRadio).attr('checked', true);
-                }
-                return rateRadio;
-            }(), function () {
-                var elem = lay.elem('div', {
-                    'class': 'cron-input-mid'
-                });
-                elem.innerHTML = tabItemLang.rateBegin || lang.rateBegin;
-                return elem;
-            }(), function () {
-                var elem = lay.elem('input', {
-                    'class': 'cron-input', 'type': 'number', 'name': 'begin', 'value': data.begin || ''
-                });
-                return elem;
-            }(), function () {
-                var elem = lay.elem('div', {
-                    'class': 'cron-input-mid'
-                });
-                elem.innerHTML = tabItemLang.rateMid || (tabItemLang.title + lang.rateMid);
-                return elem;
-            }(), function () {
-                var elem = lay.elem('input', {
-                    'class': 'cron-input', 'type': 'number', 'name': 'rate', 'value': data.rate || ''
-                });
-                return elem;
-            }(), function () {
-                var elem = lay.elem('div', {
-                    'class': 'cron-input-mid'
-                });
-                elem.innerHTML = undefined != tabItemLang.rateEnd ? tabItemLang.rateEnd : (tabItemLang.title + lang.rateEnd);
-                if (undefined != tabItemLang.rateEnd && tabItemLang.rateEnd === '') {
-                    lay(elem).addClass(HIDE);
-                }
-                return elem;
-            }()]
-
-                , rateDiv = lay.elem('div', {
-                'class': 'cron-row'
-            });
-            lay.each(rateChild, function (i, item) {
-                rateDiv.appendChild(item);
-            });
-            if (tabItem.range) {
-                var rateTip = lay.elem('div', {
-                    'class': 'cron-tips'
-                });
-                if (index === 4) {
-                    // 周
-                    rateTip.innerHTML = '(1-4/1-7)';
-                } else {
-                    rateTip.innerHTML = ['(', rangeData.min, '/', (rangeData.max + (index <= 1 ? 1 : 0)), ')'].join('');
-                }
-                rateDiv.appendChild(rateTip);
-            }
-            elem.appendChild(rateDiv);
-        }
-
-        // 特殊：日（最近的工作日、最后一日），周（最后一周）
-        /*if (index === 2) {
-            // 日
-            // 最近的工作日
-            var weekChild = [function () {
-                var weekRadio = lay.elem('input', {
-                    'name': tabItemKey + '[type]', 'type': 'radio', 'value': 'weekday', 'title': lang.weekday
-                });
-                if (data.type === 'weekday') {
-                    lay(weekRadio).attr('checked', true);
-                }
-                return weekRadio;
-            }(), function () {
-                var elem = lay.elem('div', {
-                    'class': 'cron-input-mid'
-                });
-                elem.innerHTML = lang.weekdayPrefix;
-                return elem;
-            }(), function () {
-                var elem = lay.elem('input', {
-                    'class': 'cron-input', 'type': 'number', 'name': 'weekday', 'value': data.value || ''
-                });
-                return elem;
-            }(), function () {
-                var elem = lay.elem('div', {
-                    'class': 'cron-input-mid'
-                });
-                elem.innerHTML = lang.weekdaySuffix;
-                return elem;
-            }(), function () {
-                var elem = lay.elem('div', {
-                    'class': 'cron-tips'
-                });
-                elem.innerHTML = ['(', tabItem.range, ')'].join('');
-                return elem;
-            }()]
-
-                , weekDiv = lay.elem('div', {
-                'class': 'cron-row'
-            });
-            lay.each(weekChild, function (i, item) {
-                weekDiv.appendChild(item);
-            });
-            elem.appendChild(weekDiv);
-
-            // 本月最后一日
-            elem.appendChild(function () {
-                var lastRadio = lay.elem('input', {
-                    'name': tabItemKey + '[type]', 'type': 'radio', 'value': 'lastday', 'title': lang.lastday
-                });
-                if (data.type === 'lastday') {
-                    lay(lastRadio).attr('checked', true);
-                }
-                var lastDiv = lay.elem('div', {
-                    'class': 'cron-row'
-                });
-                lastDiv.appendChild(lastRadio);
-                return lastDiv;
-            }());
-
-        }
-
-        if (index === 4) {
-            // 本月最后一个周几
-            var lastWeekChild = [function () {
-                var lastWeekRadio = lay.elem('input', {
-                    'name': tabItemKey + '[type]', 'type': 'radio', 'value': 'lastweek', 'title': lang.lastweek
-                });
-                if (data.type === 'lastweek') {
-                    lay(lastWeekRadio).attr('checked', true);
-                }
-                return lastWeekRadio;
-            }(), function () {
-                var elem = lay.elem('input', {
-                    'class': 'cron-input', 'type': 'number', 'name': 'lastweek', 'value': data.value || ''
-                });
-                return elem;
-            }(), function () {
-                var elem = lay.elem('div', {
-                    'class': 'cron-tips'
-                });
-                elem.innerHTML = ['(', tabItem.range, ')'].join('');
-                return elem;
-            }()]
-
-                , lastWeekDiv = lay.elem('div', {
-                'class': 'cron-row'
-            });
-            lay.each(lastWeekChild, function (i, item) {
-                lastWeekDiv.appendChild(item);
-            });
-            elem.appendChild(lastWeekDiv);
-
-        }*/
-
-        // 指定
-        if (index <= 4) {
-            elem.appendChild(function () {
-                var customRadio = lay.elem('input', {
-                    'name': tabItemKey + '[type]', 'type': 'radio', 'value': 'custom', 'title': lang.custom
-                });
-                if (data.type === 'custom') {
-                    lay(customRadio).attr('checked', true);
-                }
-                var customDiv = lay.elem('div', {
-                    'class': 'cron-row'
-                });
-                customDiv.appendChild(customRadio);
-                return customDiv;
-            }());
-
-            // 指定数值，时分秒显示两位数，自动补零
-            elem.appendChild(function () {
-                var customGrid = lay.elem('div', {
-                    'class': 'cron-grid'
-                });
-                var i = rangeData.min;
-                while (i <= rangeData.max) {
-                    // 时分秒显示两位数，自动补零
-                    var gridItemValue = index <= 1 ? lay.digit(i, 2) : i;
-                    var gridItem = lay.elem('input', {
-                        'type': 'checkbox',
-                        'title': gridItemValue,
-                        'lay-skin': 'primary',
-                        'name': tabItemKey + '[custom]',
-                        'value': i
-                    });
-                    if (data.values && data.values.includes(i)) {
-                        lay(gridItem).attr('checked', true);
-                    }
-                    customGrid.appendChild(gridItem);
-                    i++;
-                }
-                return customGrid;
-            }());
-        }
-
-
-        return elem;
-    }
-
-    //是否输入框
-    Class.prototype.isInput = function (elem) {
-        return /input|textarea/.test(elem.tagName.toLocaleLowerCase());
-    };
-
-    // 绑定的元素事件处理
-    Class.prototype.events = function () {
-        var that = this, options = that.config
-
-            //绑定呼出控件事件
-            , showEvent = function (elem, bind) {
-                elem.on(options.trigger, function () {
-                    bind && (that.bindElem = this);
-                    that.render();
-                });
-            };
-
-        if (!options.elem[0] || options.elem[0].eventHandler) return;
-
-        showEvent(options.elem, 'bind');
-        showEvent(options.eventElem);
-
-        //绑定关闭控件事件
-        lay(document).on('click', function (e) {
-            if (e.target === options.elem[0] || e.target === options.eventElem[0] || e.target === lay(options.closeStop)[0]) {
-                return;
-            }
-            that.remove();
-        }).on('keydown', function (e) {
-            if (e.keyCode === 13) {
-                if (lay('#' + that.elemID)[0] && that.elemID === Class.thisElemDate) {
-                    e.preventDefault();
-                    lay(that.footer).find(ELEM_CONFIRM)[0].click();
-                }
-            }
-        });
-
-        //自适应定位
-        lay(window).on('resize', function () {
-            if (!that.elem || !lay(ELEM)[0]) {
-                return false;
-            }
-            that.position();
-        });
-
-        options.elem[0].eventHandler = true;
-    };
-
-    // 主面板事件
-    Class.prototype.elemEvent = function () {
-        var that = this, options = that.config, tabFilter = 'cron-tab' + options.elem.attr('lay-key');
-
-        // 阻止主面板点击冒泡，避免因触发文档事件而关闭主面
-        lay(that.elem).on('click', function (e) {
-            lay.stope(e);
-        });
-
-        // tab选项卡切换
-        var lis = lay(that.elemTab).find('li');
-        lis.on('click', function () {
-            var layid = lay(this).attr('lay-id');
-            if (undefined === layid) {
-                return;
-            }
-            element.tabChange(tabFilter, layid);
-        });
-
-        // cron选项点击
-        form.on('radio', function (data) {
-            var $parent = data.othis.parent();
-            var formFilter = $parent.parent().attr('lay-filter');
-            var formData = form.val(formFilter);
-            var radioType = data.value;
-            if ('range' === radioType) {
-                // 范围
-                form.val(formFilter, {
-                    rangeStart: formData.rangeStart || 0, rangeEnd: formData.rangeEnd || 2
-                });
-            }
-            if ('rate' === radioType) {
-                // 频率
-                form.val(formFilter, {
-                    begin: formData.begin || 0, rate: formData.rate || 2
-                });
-            }
-            if ('custom' === radioType) {
-                // custom
-                var $grid = $parent.next();
-                if ($grid.find(':checkbox:checked').length <= 0) {
-                    $grid.children(':checkbox:first').next().click()
-                }
-            }
-            if ('weekday' === radioType) {
-                // weekday
-                form.val(formFilter, {
-                    weekday: formData.weekday || 1
-                });
-            }
-            if ('lastweek' === radioType) {
-                // lastweek
-                form.val(formFilter, {
-                    lastweek: formData.lastweek || 1
-                });
-            }
-
-        });
-
-        //gird checkbox点击时，自动选中radio
-        form.on('checkbox', function (data) {
-            //触发选项的点击事件
-            var $parent = data.othis.parent().parent();
-            //循环父级，找到子级的子级找到value="custom"的radio
-            var $radio = $parent.children().find('input[value="custom"]');
-            //触发radio的点击事件
-            $radio.next().click();
-        });
-
-        //点击底部按钮
-        lay(that.footer).find('span').on('click', function () {
-            var type = lay(this).attr('lay-type');
-            that.tool(this, type);
-        });
-    };
-
-    //底部按钮点击事件
-    Class.prototype.tool = function (btn, type) {
-        var that = this, options = that.config, lang = that.lang(), isStatic = options.position === 'static', active = {
-            //运行
-            run: function () {
-                var value = that.parse();
-                var loading = layer.load();
-                $.get(options.run, {cron: value}, function (res) {
-                    layer.close(loading);
-                    if (res.code !== 0) {
-                        return that.hint(res.msg);
-                    }
-                    that.runHint(res.data);
-                }, 'json').fail(function () {
-                    layer.close(loading);
-                    that.hint('服务器异常！');
-                });
-            }
-
-            //确定
-            , confirm: function () {
-                var value = that.parse();
-                that.done([value]);
-                that.setValue(value).remove()
-            }
-        };
-        active[type] && active[type]();
-    };
-
-    //执行 done/change 回调
-    Class.prototype.done = function (param, type) {
-        var that = this, options = that.config;
-
-        param = param || [that.parse()];
-        typeof options[type || 'done'] === 'function' && options[type || 'done'].apply(options, param);
-
-        return that;
-    };
-
-    // 解析cron表达式
-    Class.prototype.parse = function () {
-        var that = this, options = that.config, valueArr = [];
-
-        lay.each(options.tabs, function (index, item) {
-            var key = item.key;
-            var formFilter = 'cronForm' + key + options.elem.attr('lay-key');
-            var formData = form.val(formFilter);
-            var radioType = (key + '[type]');
-            var current = "";
-            if (formData[radioType] === 'every') {
-                // 每次
-                current = "*";
-            }
-            if (formData[radioType] === 'range') {
-                // 范围
-                current = formData.rangeStart + "-" + formData.rangeEnd;
-            }
-            if (formData[radioType] === 'rate') {
-                // 频率
-                current = formData.begin + "/" + formData.rate;
-            }
-            if (formData[radioType] === 'custom') {
-                // 指定
-                var checkboxName = (item.key + '[custom]');
-                var customArr = [];
-                $('input[name="' + checkboxName + '"]:checked').each(function () {
-                    customArr.push($(this).val());
-                });
-                current = customArr.join(',');
-            }
-            if (formData[radioType] === 'weekday') {
-                // 每月 formData.weekday 号最近的那个工作日
-                current = formData.weekday + "W";
-            }
-            if (formData[radioType] === 'lastday') {
-                // 本月最后一日
-                current = "L";
-            }
-            if (formData[radioType] === 'lastweek') {
-                // 本月最后星期
-                current = formData.lastweek + "L";
-            }
-
-            if (formData[radioType] === 'unspecified' && index != 6) {
-                // 不指定
-                current = "?";
-            }
-            if (current !== "") {
-                valueArr.push(current);
-                options.cron[key] = current;
-            }
-        });
-        return valueArr.join(' ');
-    };
-
-    //控件移除
-    Class.prototype.remove = function (prev) {
-        var that = this, options = that.config, elem = lay('#' + (prev || that.elemID));
-        if (!elem[0]) return that;
-
-        if (!elem.hasClass(ELEM_STATIC)) {
-            that.checkCron(function () {
-                elem.remove();
-            });
-        }
-        return that;
-    };
-
-    //定位算法
-    Class.prototype.position = function () {
-        var that = this, options = that.config;
-        lay.position(that.bindElem || options.elem[0], that.elem, {
-            position: options.position
-        });
-        return that;
-    };
-
-    //提示
-    Class.prototype.hint = function (content) {
-        var that = this, options = that.config, div = lay.elem('div', {
-            'class': ELEM_HINT
-        });
-
-        if (!that.elem) return;
-
-        div.innerHTML = content || '';
-        lay(that.elem).find('.' + ELEM_HINT).remove();
-        that.elem.appendChild(div);
-
-        clearTimeout(that.hinTimer);
-        that.hinTimer = setTimeout(function () {
-            lay(that.elem).find('.' + ELEM_HINT).remove();
-        }, 3000);
-    };
-
-    //运行提示
-    Class.prototype.runHint = function (runList) {
-        var that = this, options = that.config, div = lay.elem('div', {
-            'class': ELEM_RUN_HINT
-        });
-        // debugger;
-        if (!that.elem || !runList || !runList.length) return;
-
-
-        lay(div).html(function () {
-            var html = [];
-            lay.each(runList, function (i, item) {
-                html.push('<div class="cron-run-list">' + item + '</div>');
-            });
-            return html.join('');
-        }());
-
-        lay(that.elem).find('.' + ELEM_RUN_HINT).remove();
-        that.elem.appendChild(div);
-    };
-
-    //赋值
-    Class.prototype.setValue = function (value = '') {
-        var that = this, options = that.config, elem = that.bindElem || options.elem[0],
-            valType = that.isInput(elem) ? 'val' : 'html'
-
-        options.position === 'static' || lay(elem)[valType](value || '');
-        elem.textContent = '生成';
-        return this;
-    };
-
-    //cron校验
-    Class.prototype.checkCron = function (fn) {
-        var that = this, options = that.config, lang = that.lang(), elem = that.bindElem || options.elem[0],
-            value = that.isInput(elem) ? elem.value : (options.position === 'static' ? '' : elem.innerHTML)
-
-            , checkValid = function (value = "") {
-
-            };
-
-        // cron 值，多个空格替换为一个空格，去掉首尾空格
-        value = value || options.value;
-        if (typeof value === 'string') {
-            value = value.replace(/\s+/g, ' ').replace(/^\s|\s$/g, '');
-        }
-
-        if (fn === 'init') return checkValid(value), that;
-
-        value = that.parse();
-        if (value) {
-            that.setValue(value);
-        }
-        fn && fn();
-        return that;
-    };
-
-    //核心入口
-    cron.render = function (options) {
-        var ins = new Class(options);
-        return thisIns.call(ins);
-    };
-
-    exports('cron', cron);
-});

public/panel/modules/echartsTheme.js

@@ -1,261 +0,0 @@
-/**
- * Set echarts theme
- */
-
-layui.define(function (exports) {
-  exports('echartsTheme', {
-    // 默认色板
-    color: [
-      '#16baaa', '#1E9FFF', '#16b777', '#FFB980', '#D87A80',
-      '#8d98b3', '#e5cf0d', '#97b552', '#95706d', '#dc69aa',
-      '#07a2a4', '#9a7fd1', '#588dd5', '#f5994e', '#c05050',
-      '#59678c', '#c9ab00', '#7eb00a', '#6f5553', '#c14089'
-    ],
-
-    // 图表标题
-    title: {
-      textStyle: {
-        fontWeight: 'normal',
-        color: '#5F5F5F'      // 主标题文字颜色
-      }
-    },
-
-    // 值域
-    dataRange: {
-      itemWidth: 15,
-      color: ['#16baaa', '#e0ffff']
-    },
-
-    // 工具箱
-    toolbox: {
-      color: ['#1e90ff', '#1e90ff', '#1e90ff', '#1e90ff'],
-      effectiveColor: '#ff4500'
-    },
-
-    // 提示框
-    tooltip: {
-      backgroundColor: 'rgba(50,50,50,0.5)',   // 提示背景颜色，默认为透明度为0.7的黑色
-      axisPointer: {      // 坐标轴指示器，坐标轴触发有效
-        type: 'line',     // 默认为直线，可选为：'line' | 'shadow'
-        lineStyle: {      // 直线指示器样式设置
-          color: '#16baaa'
-        },
-        crossStyle: {
-          color: '#008acd'
-        },
-        shadowStyle: {           // 阴影指示器样式设置
-          color: 'rgba(200,200,200,0.2)'
-        }
-      }
-    },
-
-    // 区域缩放控制器
-    dataZoom: {
-      dataBackgroundColor: '#efefff',      // 数据背景颜色
-      fillerColor: 'rgba(182,162,222,0.2)',   // 填充颜色
-      handleColor: '#008acd'  // 手柄颜色
-    },
-
-    // 网格
-    grid: {
-      borderColor: '#eee'
-    },
-
-    // 类目轴 - X轴
-    categoryAxis: {
-      axisLine: {      // 坐标轴线
-        lineStyle: {     // 属性lineStyle控制线条样式
-          color: '#16baaa'
-        }
-      },
-      axisTick: { //小标记
-        show: false
-      },
-      splitLine: {       // 分隔线
-        lineStyle: {     // 属性lineStyle（详见lineStyle）控制线条样式
-          color: ['#eee']
-        }
-      }
-    },
-
-    // 数值型坐标轴默认参数 - Y轴
-    valueAxis: {
-      axisLine: {      // 坐标轴线
-        lineStyle: {     // 属性lineStyle控制线条样式
-          color: '#16baaa'
-        }
-      },
-      splitArea: {
-        show: true,
-        areaStyle: {
-          color: ['rgba(250,250,250,0.1)', 'rgba(200,200,200,0.1)']
-        }
-      },
-      splitLine: {       // 分隔线
-        lineStyle: {     // 属性lineStyle（详见lineStyle）控制线条样式
-          color: ['#eee']
-        }
-      }
-    },
-
-    polar: {
-      axisLine: {      // 坐标轴线
-        lineStyle: {     // 属性lineStyle控制线条样式
-          color: '#ddd'
-        }
-      },
-      splitArea: {
-        show: true,
-        areaStyle: {
-          color: ['rgba(250,250,250,0.2)', 'rgba(200,200,200,0.2)']
-        }
-      },
-      splitLine: {
-        lineStyle: {
-          color: '#ddd'
-        }
-      }
-    },
-
-    timeline: {
-      lineStyle: {
-        color: '#16baaa'
-      },
-      controlStyle: {
-        normal: { color: '#16baaa' },
-        emphasis: { color: '#16baaa' }
-      },
-      symbol: 'emptyCircle',
-      symbolSize: 3
-    },
-
-    // 柱形图默认参数
-    bar: {
-      itemStyle: {
-        normal: {
-          barBorderRadius: 2
-        },
-        emphasis: {
-          barBorderRadius: 2
-        }
-      }
-    },
-
-    // 折线图默认参数
-    line: {
-      smooth: true,
-      symbol: 'emptyCircle',  // 拐点图形类型
-      symbolSize: 3       // 拐点图形大小
-    },
-
-    // K线图默认参数
-    k: {
-      itemStyle: {
-        normal: {
-          color: '#d87a80',     // 阳线填充颜色
-          color0: '#2ec7c9',    // 阴线填充颜色
-          lineStyle: {
-            color: '#d87a80',   // 阳线边框颜色
-            color0: '#2ec7c9'   // 阴线边框颜色
-          }
-        }
-      }
-    },
-
-    // 散点图默认参数
-    scatter: {
-      symbol: 'circle',  // 图形类型
-      symbolSize: 4    // 图形大小，半宽（半径）参数，当图形为方向或菱形则总宽度为symbolSize * 2
-    },
-
-    // 雷达图默认参数
-    radar: {
-      symbol: 'emptyCircle',  // 图形类型
-      symbolSize: 3
-      //symbol: null,     // 拐点图形类型
-      //symbolRotate : null,  // 图形旋转控制
-    },
-
-    map: {
-      itemStyle: {
-        normal: {
-          areaStyle: {
-            color: '#ddd'
-          },
-          label: {
-            textStyle: {
-              color: '#d87a80'
-            }
-          }
-        },
-        emphasis: {         // 也是选中样式
-          areaStyle: {
-            color: '#fe994e'
-          }
-        }
-      }
-    },
-
-    force: {
-      itemStyle: {
-        normal: {
-          linkStyle: {
-            color: '#1e90ff'
-          }
-        }
-      }
-    },
-
-    chord: {
-      itemStyle: {
-        normal: {
-          borderWidth: 1,
-          borderColor: 'rgba(128, 128, 128, 0.5)',
-          chordStyle: {
-            lineStyle: {
-              color: 'rgba(128, 128, 128, 0.5)'
-            }
-          }
-        },
-        emphasis: {
-          borderWidth: 1,
-          borderColor: 'rgba(128, 128, 128, 0.5)',
-          chordStyle: {
-            lineStyle: {
-              color: 'rgba(128, 128, 128, 0.5)'
-            }
-          }
-        }
-      }
-    },
-
-    gauge: {
-      axisLine: {      // 坐标轴线
-        lineStyle: {     // 属性lineStyle控制线条样式
-          color: [[0.2, '#2ec7c9'], [0.8, '#5ab1ef'], [1, '#d87a80']],
-          width: 10
-        }
-      },
-      axisTick: {      // 坐标轴小标记
-        splitNumber: 10,   // 每份split细分多少段
-        length: 15,    // 属性length控制线长
-        lineStyle: {     // 属性lineStyle控制线条样式
-          color: 'auto'
-        }
-      },
-      splitLine: {       // 分隔线
-        length: 22,     // 属性length控制线长
-        lineStyle: {     // 属性lineStyle（详见lineStyle）控制线条样式
-          color: 'auto'
-        }
-      },
-      pointer: {
-        width: 5
-      }
-    },
-
-    textStyle: {
-      fontFamily: '微软雅黑, Arial, Verdana, sans-serif'
-    }
-  })
-})