Fix file cut failure

* switch branches

* update user interface

* switch branch

* switch branch

* change branch

* submit 0.3.3

* Update UI

* update version function

* Update UI

* Update user.go

* update disk

* update person info interface

* Update main.go

* Update UI

* update alpha

* updata ui

* Update assist.sh

* Update assist.sh

* update update function

* add upload sh

* Update init.go

* upload shell script

* Update system.go

* update update.sh

* Update init.go

* update update.sh

* update update.sh

* Update update.sh

* Update system.go

* Update system.go

* update UI

* Update CHANGELOG.md

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Questions, Ideas, Discussions
+    url: https://github.com/IceWhaleTech/CasaOS/discussions
+    about: Ask questions, propose ideas, or discuss anything related to CasaOS

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/submit-application.md

@@ -0,0 +1,15 @@
+---
+name: Submit application
+about: Add an app to this project
+title: ''
+labels: ''
+assignees: LinkLeong
+
+---
+
+Tested platform
+e.g. linux/amd64,linux/arm-v7,linux-arm64
+
+
+
+Please export and upload the configuration file of this application

.github/workflows/casa.yml

@@ -63,7 +63,7 @@ jobs:
       #          git clone $REPO_URL -b $REPO_BRANCH --recursive casa
       #          ln -sf /workdir/casa $GITHUB_WORKSPACE/casa
       #          ls
-
+      
 
       - name: Set enviroment for github-release
         run: |
@@ -76,7 +76,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: '14'
-
+          
       - name: Build frontend with nodejs and yarn
         run: |
           cd UI
@@ -90,7 +90,7 @@ jobs:
       - name: Build with xgo
         uses: crazy-max/ghaction-xgo@v1
         with:
-          xgo_version: latest
+          xgo_version: v0.7.5
           go_version: ${{ matrix.go_version }}
           dest: build
           prefix: casa

.github/workflows/demo.yml

@@ -0,0 +1,79 @@
+name: Demo Reset
+
+# Controls when the workflow will run
+on:
+  schedule:
+  - cron: "0 * * * *"
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# OLD_INSTANCE_SNAPSHOT_NAME=$(aws lightsail get-instance-snapshots | grep '"name": "CasaOS-Demo-Snapshot-[0-9]' | sed 's/ //g' | sed 's/"//g' | sed 's/,//g' | sed 's/name://g')
+# OLD_INSTANCE_NAME=$(aws lightsail get-instances | grep '"name": "CasaOS-Demo-[0-9]' | sed 's/ //g' | sed 's/"//g' | sed 's/,//g' | sed 's/name://g')
+# NEW_INSTANCE_NAME=CasaOS-Demo-$(date +%s)
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  reset:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+      
+      - name: Configure AWS credentials from Test account
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: us-west-2
+          
+      - name: Get old instance and snapshot name, create new instance name
+        run: | 
+          echo "OLD_INSTANCE_SNAPSHOT_NAME=$(aws lightsail get-instance-snapshots | grep '"name": "CasaOS-Demo-Snapshot-1652856810' | sed 's/ //g' | sed 's/"//g' | sed 's/,//g' | sed 's/name://g')" >> $GITHUB_ENV
+          echo "OLD_INSTANCE_NAME=$(aws lightsail get-instances | grep '"name": "CasaOS-Demo-[0-9]' | sed 's/ //g' | sed 's/"//g' | sed 's/,//g' | sed 's/name://g')" >> $GITHUB_ENV
+          echo "NEW_INSTANCE_NAME=CasaOS-Demo-$(date +%s)" >> $GITHUB_ENV
+          
+      - name: Create instances from snapshot
+        run: | 
+          aws lightsail create-instances-from-snapshot \
+              --instance-snapshot-name ${{ env.OLD_INSTANCE_SNAPSHOT_NAME }} \
+              --instance-names ${{ env.NEW_INSTANCE_NAME }} \
+              --availability-zone us-west-2a \
+              --bundle-id medium_2_0
+              
+      - name: Wait for new instance running
+        run: |
+          TIMEOUT=$(($(date +%s)+600))
+          while [ $TIMEOUT -gt $(date +%s) ]
+          do
+            NEW_INSTANCE_STATE=$(aws lightsail get-instance-state --instance-name ${{ env.NEW_INSTANCE_NAME }} | grep '"name":' | sed 's/ //g' | sed 's/"//g' | sed 's/name://g')
+            if [ $NEW_INSTANCE_STATE == running ]
+            then
+              echo "New instance is running now"
+              sleep 10s
+              break
+            fi
+          done
+          
+      - name: Put instance public ports
+        run: |
+          aws lightsail put-instance-public-ports \
+            --port-infos fromPort=0,toPort=65535,protocol=all \
+            --instance-name ${{ env.NEW_INSTANCE_NAME }}
+            
+      - name: Attach static ip
+        run: | 
+          aws lightsail attach-static-ip \
+            --static-ip-name CasaOS-Demo-IP \
+            --instance-name ${{ env.NEW_INSTANCE_NAME }}
+            
+      - name: Delete old instance
+        run: | 
+          aws lightsail delete-instance \
+            --instance-name ${{ env.OLD_INSTANCE_NAME }}
+            
+            

.gitignore

@@ -29,5 +29,11 @@ gen
 /out/
 /db/
 /docs/
+/web/
 /conf/conf.ini
+/conf/conf.conf
+/conf/conf.json
 __debug_bin
+main
+CasaOS
+github.com

CHANGELOG.md

@@ -0,0 +1,441 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added
+
+### Changed
+
+
+### Removed
+
+### Security
+
+### Fixed
+
+## [0.3.3-pre] - 2022-07-01(UTC)
+
+### Added
+
+- [System]Add interface call log
+- Adding Developing file ([#311](https://github.com/IceWhaleTech/CasaOS/pull/311))
+- [App] add new tips for app section.
+- [System] UI Configurable function modules: support turning off the search bar and recommended apps module in the settings.
+- [System] Custom wallpapers: two new preset wallpapers, support for custom uploads, support for setting images from Files as wallpapers, Also support right click on dashboard to change wallpaper.
+
+### Changed
+
+- [App] Cache app store index and category data
+- [System] casaos master program adapted to FHS standards
+- [App] Update casaos icons.
+- [System] Update translation.
+
+### Removed
+
+- [System] Remove upnp function module
+- [System] Remove ddns function module
+- [System] Remove search function module
+- [System] Remove zerotier function module
+- [System] Remove task function module
+- [System] Remove file share function module
+
+### Fixed
+
+- [Disk] Fixed hard drive won't hibernate problem ([#202](https://github.com/IceWhaleTech/CasaOS/issues/202))
+- [File] Fixed the backspace key that causes the folder to rewind ([#252](https://github.com/IceWhaleTech/CasaOS/issues/252))
+- [App] Fixed app logo is not loading when imported. ([#320](https://github.com/IceWhaleTech/CasaOS/issues/320))
+
+## [0.3.2.1] - 2022-06-16(UTC)
+
+### Changed
+
+- [System] Adjusted the display style.
+
+### Fixed
+
+- [System] Fixed the issue of widgets displaying wrongly on mobile devices.
+- [App] Fix the problem of application opening failure on non-80 ports ([#283](https://github.com/IceWhaleTech/CasaOS/issues/283) [#280](https://github.com/IceWhaleTech/CasaOS/issues/280))
+- [System] Modify port failure problem ([#282](https://github.com/IceWhaleTech/CasaOS/issues/282))
+- [App]Modify environment variables disappearing problem([#284](https://github.com/IceWhaleTech/CasaOS/issues/284))
+- [System]Fix no update alert([#278](https://github.com/IceWhaleTech/CasaOS/issues/278))
+- [System] Fixed some bugs of application cpu usage and memory staging([#272](https://github.com/IceWhaleTech/CasaOS/issues/272))
+- [App] Fixed plex and HA network mode error issues ([#299](https://github.com/IceWhaleTech/CasaOS/issues/299))
+- [App] Fix application terminal not working ([#266](https://github.com/IceWhaleTech/CasaOS/issues/266))
+
+## [0.3.2] - 2022-06-10
+
+### Added
+
+- [Files] Files can now be selected multiple files and downloaded, deleted, moved, etc.
+- [Apps] Support to modify the application opening address.([#204](https://github.com/IceWhaleTech/CasaOS/issues/204))
+
+### Changed
+
+- [Apps] Hide the display of non-essential environment variables in the application.([#196](https://github.com/IceWhaleTech/CasaOS/issues/196))
+- [System] Network, disk, cpu, memory, etc. information is modified to be pushed via socket.
+- [System] Optimize opening speed.([#214](https://github.com/IceWhaleTech/CasaOS/issues/214))
+- [Language] Update language pack [zarevskaya](https://github.com/zarevskaya) [patrickhilker](https://github.com/patrickhilker)
+- [System] Interface path adjustment
+
+### Removed
+
+- [Files] Remove the online preview function of PDF files
+
+### Fixed
+
+- [System] Fixed the problem that sync data cannot submit the device ID ([#68](https://github.com/IceWhaleTech/CasaOS/issues/68))
+- [Files] Fixed the code editor center alignment display problem.([#210](https://github.com/IceWhaleTech/CasaOS/issues/210))
+- [Files] Fixed the problem of wrong name when downloading files.([#240](https://github.com/IceWhaleTech/CasaOS/issues/240))
+- [System] Fixed the network display as a negative number problem.([#224](https://github.com/IceWhaleTech/CasaOS/issues/224))
+- [System] Fixed the problem of wireless network card traffic display.([#222](https://github.com/IceWhaleTech/CasaOS/issues/222))
+
+
+## [0.3.1.1] - 2022-05-17
+
+### Fixed
+
+- Fix the data loss problem when importing local applications
+
+## [0.3.1] - 2022-05-16
+
+### Added
+
+- CasaConnect and file add image thumbnail function
+- Import of docker applications
+- List support custom sorting function
+- CasaConnect gives priority to LAN connections
+- USB auto-mount switch (Raspberry Pi is off by default)
+- Application custom installation supports Docker Compose configuration import in YAML format
+- You will see the new version changelog from the next version
+- Added live preview for icons in custom installed applications
+
+### Changed
+
+- Application data is no longer saved to the database
+- Optimize app store speed issues
+- Optimize the way WebUI is filled in
+- Image preview has been completely upgraded and now supports switching between all images in the same folder, as well as dragging, zooming, rotating and resetting.
+- Added color levels to the CPU and RAM charts
+- Optimized the display of the Connect friends list right-click menu
+- Change the initial display directory to /DATA
+
+### Removed
+
+- Historical Application Data
+
+### Fixed
+
+- Fixed the problem that some Docker CLI commands failed to import
+- Fix the problem that the application is not easily recognized in /DATA/AppData directory and docker command line after installation, it will be shown as application name
+- Fix Pi-hole installation failure
+- Fixed the issue that the app could not be updated using WatchTower
+- Fixed the problem that the task status was lost after closing Files when there was an upload task
+
+## [0.3.0] - 2022-04-08
+
+### Added
+
+- Add CasaConnect function, now you can share private files peer-to-peer with your friends.
+- Add a widget for network traffic monitoring.
+- 12 new popular apps added to App Center
+
+### Changed
+
+- Updated the sidebar of Files.
+- Updated the initial directory of Files to the Root directory.
+- Armbian 22.02 armhf/arm64/amd64 platform tests passed [@igorpecovnik ](https://github.com/igorpecovnik)
+- Elementary OS 6.1 Jólnir amd64 platform tests passed [@alvarosamudio ](https://github.com/alvarosamudio)
+
+### Fixed
+
+- Fix an issue in Files where the backspace button would trigger a return to the previous level of the directory when creating a folder.
+- Fix the display problem of application list in CPU widget.
+- Fix the problem that the ipv6 of the application cannot be opened
+
+### Removed
+
+- Interfaces related to "zerotier"
+
+## [0.2.10] - 2022-03-10
+
+### Added
+
+- Added CasaOS own file manager, now you can browse, upload, download files from the system, even edit code online, preview photos and videos through it. It will appear in the first position of Apps.
+- Added CPU core count display and memory capacity display.
+
+### Changed
+
+- Optimized the rendering performance of the home page.
+- Optimized the internationalization display of the time widget.
+- Show the icon of the stopped application as gray.
+- Unify the animation of the drop-down menu.
+- Optimize the display of the application drop-down menu.
+- Replaced the default font to optimize the display.
+
+### Fixed
+
+- Fix the problem of failed to create storage space
+
+## [0.2.9] - 2022-02-18
+
+### Added
+
+- Add a simple notification function
+
+### Changed
+
+- Custom installation of new parameters(Capabilities,Hostname,Privileged)
+- Update front-end translation [@SemVer](https://github.com/zarevskaya) [@koboldMaki](https://github.com/koboldMaki) [@sgastol](https://github.com/sgastol) [@delki8](https://github.com/delki8)
+
+- Modify the default location and name of the usb mount
+
+### Fixed
+
+- Fix the problem of being indexed by search engines
+- Fix some style display issues
+- Solve hard drive can't be formatted, can't finish adding storage
+
+## [0.2.8] - 2022-01-30
+
+### Added
+
+- Add USB disk device display
+
+### Changed
+
+- Update translation [@baptiste313](https://github.com/baptiste313) [@thueske](https://github.com/thueske)
+- Compatible with more types of drives
+
+### Fixed
+
+- Fix the language initialization bug
+- Fix the problem that the login page could not be displayed
+- Fix missing translated content
+
+## [0.2.7] - 2022.01.26
+
+### Changed
+
+- Apply multilingual support
+
+### Security
+
+- Fix an injectable execution bug
+
+## [0.2.6] - 2022.01.26
+
+### Added
+
+- Add a bug report panel.
+- App Store apps start supporting multiple languages
+
+### Fixed
+
+- Fix a disk that cannot be formatted under certain circumstances
+
+## [0.2.5] - 2022.01.24
+
+### Added
+
+- Storage Manager
+
+### Changed
+
+- Update Disk widget
+- Update language files [@ImOstrovskiy](https://github.com/ImOstrovskiy) [@baptiste313](https://github.com/baptiste313)
+
+### Fixed
+
+- File synchronization issues
+- Fix the app store classification problem
+
+## [0.2.4] - 2021.12.30
+
+### Changed
+
+- Brand new App Store
+- Optimize request method
+
+### Fixed
+
+- Fix Sync panel width display error.
+- Fix App panel width display error.
+
+## [0.2.3] - 2021.12.11
+
+### Added
+
+- Add detailed CPU and memory statistics.
+- Add the multi-language function and add Chinese translation.
+- Add the function to modify the search engine.
+- Add the function of modifying the WebUI port
+
+### Changed
+
+- Update update script
+- Preprocessing usb automounting
+
+### Fixed
+
+- Volume path problem when customizing the installation of applications
+- Fix Cpu and Ram usage display error
+- Fix translation errors
+- Fixed an error when importing and exporting appfile.
+
+## [0.2.2] - 2021.12.02
+
+### Changed
+
+- UI adjustment
+
+### Fixed
+
+- Fix the problem of data display error when manually installing apps
+- Fix some spelling problems
+- Fix the bug of synchronization module
+
+## [0.2.1] - 2021.11.25
+
+### Fixed
+
+- Fix Sync display error
+- Fix Sync Downoad url error
+- Fix Smart Block display error
+- Fix widgets settings dispaly error
+- Fix  application installation path error
+
+## [0.2.0] - 2021.11.25
+
+### Added
+
+- Add sync function
+
+
+## [0.1.11] - 2021.11.10
+
+### Changed
+
+- Adaptation of cell phone terminals
+- Optimize user experience
+- Replaced the default background
+- Optimized the display performance and fixed some bugs
+
+### Fixed
+
+- Resolve application installation path errors
+
+## [0.1.10] - 2021.11.04
+
+### Added
+
+- Add application terminal
+- Add application logs
+- Add system logs
+- Add App Store for installation
+
+## [0.1.9] - 2021.11.01 [YANKED]
+
+## [0.1.8] - 2021.10.27
+
+### Added
+
+- Add system terminal
+- Add the ability to modify the user name and password
+
+### Changed
+
+- Experience optimization
+- Improve single user management function
+- Fixed Disk widget display error
+- Fixed Username display error after change
+- Adaptation for mobile access
+
+## [0.1.7] - 2021.10.22
+
+### Added
+
+- Add user authentication module, Login page and initialization page.
+
+### Fixed
+
+- Fix the problem that the application could not start after the system restarted.
+- Home storage space data display exception
+- Script override causes application loss after installation
+- Fix docker network error
+
+## [0.1.6] - 2021.10.19
+
+### Added
+
+- Add app icon auto-fill via docker image name.
+- Add a file selector for app install.
+
+### Changed
+
+- Modify import reminder.
+- Optimize the application installation process
+
+### Fixed
+
+- Fixed an issue with the app were it would disappear when the app was modified.
+- Fixed device selector default dir to /dev
+
+## [0.1.5] - 2021.10.15
+
+### Added
+
+- Add CPU RAM Status with widget
+- Add Disk Info with widget
+- Realize automatic loading of widgets
+
+### Changed
+
+- Enhance the Docker cli import experience and automatically fill in the folders that need to be mounted
+
+### Removed
+
+- Remove Weather widget.
+
+### Fixed
+
+- AppFile upload does not pass verification
+- The setting menu of the app is displayed abnormally when the browser window is too narrow
+- The port is occupied and the program cannot start
+- Fix display bugs when windows size less than 1024px
+
+## [0.1.4] - 2021.09.30
+
+### Added
+
+- Import and export of application configuration files
+- Automatic parsing of docker commands
+
+### Changed
+
+- Improve the program release process
+- Application installation process UX/UI optimization
+
+### Fixed
+
+- Authentication failure during the operation, resulting in the need to re-login
+
+## [0.1.3] - 2021.09.29 [YANKED]
+
+## [0.1.2] - 2021.09.28
+
+### Fixed
+
+- Application modification and new creation failure issues
+
+## [0.1.1] - 2021.09.27
+
+## [0.1.0] - 2021.09.26
+
+### Added
+
+- Application Center

DEVELOPING.md

@@ -0,0 +1,33 @@
+# CasaOS Development
+Here we will describe the steps required to setup a development environment with CasaOS.  
+
+- [Setting up development environment](#setting-up-development-environment)  
+    - [Pre-requisites](#pre-requisites)  
+    - [1. Fork the Repo](#1.-fork-the-repo)  
+    - [2. Clone the repo down](#2.-clone-the-repo-down)  
+    - [3. Install dependencies](#3.-install-dependencies)  
+
+
+## Setting up a development environment
+In this section we will walk you through the general process of setting up your development environment to get started. 
+
+### Pre-requisites
+The following must be installed in order to get started. The details of how to install them is outside the scope of this doc, but generally they should be able to be installed with your systems package manager (apt, yum, brew, choco, etc).
+- Go > v1.17.0
+- yarn
+- node.js
+
+### 1. Fork the Repo
+[Fork the repo](https://docs.github.com/en/get-started/quickstart/fork-a-repo) onto your own GitHub account for developing.  
+
+### 2. Clone the repo down
+1. Navigate into your go workspace (check with `go env GOPATH`).
+2. Navigate to the appropriate path for github. It should look something like this: `<path from GOPATH>/github.com/<GitHub Username>/`. If it doesn't exist create it. 
+3. Clone down the repo with the following: `git clone --recurse-submodules --remote-submodules https://github.com/<your GitHub Username>/CasaOS.git`  
+
+### 3. Install dependencies
+1. `cd UI`
+2. `yarn install`
+3. `yarn build`
+4. `cd ..`
+5. `go get`  

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,4 +1,4 @@
-# CasaOS - A simple, easy-to-use, elegant open-source home server system.
+# CasaOS - A simple, easy-to-use, elegant open-source Home Cloud system.
 
 ![CasaOS](https://raw.githubusercontent.com/IceWhaleTech/logo/main/casaos/casaos_banner_aldeyjarfoss.png)
 
@@ -6,18 +6,58 @@
 [![Pull Requests](https://img.shields.io/github/issues-pr/IceWhaleTech/CasaOS?color=162453&style=flat-square)](https://github.com/IceWhaleTech/CasaOS/pulls)
 [![Issues](https://img.shields.io/github/issues/IceWhaleTech/CasaOS?color=162453&style=flat-square)](https://github.com/IceWhaleTech/CasaOS/issues)
 [![GitHub Stars](https://img.shields.io/github/stars/IceWhaleTech/CasaOS?color=162453&logo=github&style=flat-square)](https://github.com/IceWhaleTech/CasaOS/stargazers)
-[![Discord](https://img.shields.io/discord/884667213326463016?color=162453&label=Chat&logo=discord&logoColor=fff&style=flat-square)](https://discord.gg/Gx4BCEtHjx)
+[![Discord](https://img.shields.io/discord/884667213326463016?color=162453&label=Chat&logo=discord&logoColor=fff&style=flat-square)](https://discord.gg/knqAbbBbeX)
 
-CasaOS is an open-source home server system based on the Docker ecosystem and designed for home scenarios. It is committed to building the world's most simple, easy-to-use, and elegant home server system.
+CasaOS is an open-source Home Cloud system based on the Docker ecosystem and designed for home scenarios. It is committed to building the world's most simple, easy-to-use, and elegant Home Cloud system.
 
 IceWhale team believes that through community-driven collaborative innovation and open communication with global developers, we can reshape the digital home experience like never before.
 
+![CasaOS Snapshot](snapshot.png)
+![CasaOS Snapshot Mobile](snapshot-mobile.png)
+
+## Getting Started
+
+> ⚠️ Note: 
+> 
+> CasaOS is still in the early development stage and may vary significantly with the final release. Feel free to test run and share your feedback in the [Discord server](https://discord.gg/knqAbbBbeX)!
+
+### Quick Setup CasaOS
+
+Fresh install a system from the list below and run the this command:
+
+```sh
+wget -qO- https://get.icewhale.io/casaos.sh | bash
+```
+
+or
+
+```sh
+curl -fsSL https://get.icewhale.io/casaos.sh | bash
+```
+
+### Uninstall CasaOS
+
+```sh
+curl -fsSL https://get.icewhale.io/casaos-uninstall.sh | bash
+```
+
+### System Compatibility
+
+ - Ubuntu Server 20.04 amd64 (✅ Recommend, Tested)
+ - Armbian 22.02 armhf/arm64/amd64 (✅ Recommend, Tested)
+ - Elementary OS 6.1 Jólnir amd64 (✅ Recommend, Tested)
+ - Deepin 20.4 amd64 (⚠️ Not Fully Tested Yet)
+ - Raspberry Pi Lite OS aarch64/arm64 (⚠️ Not Fully Tested Yet)
+ - Debian 11 amd64 (⚠️ Not Fully Tested Yet)
+ - OpenWrt 21.02 amd64 (⚠️ Not Fully Tested Yet)
+ - OpenWrt 21.02 aarch64/arm64 (⚠️ Not Fully Tested Yet)
+
 
 ## Key Features
 
  - UI designed for home scenarios - simple, elegant, and easy-to-use
  - Quick Docker app installation with only three steps, plus automatic management
- - App Store for private cloud 🚧
+ - App Store for Home Cloud 🚧
  - Home data/digital asset management 🚧
  - Smart home manager 🚧
 
@@ -34,48 +74,11 @@ After looking at many systems and software on the market, the team found no serv
 
 So, we set out to build this open source project to develop CasaOS with our own hands, everyone in the community, and you.
 
-> A warm welcome for you to share and discuss your great ideas in the [Discord server](https://discord.gg/Gx4BCEtHjx)!
+> A warm welcome for you to share and discuss your great ideas in the [Discord server](https://discord.gg/knqAbbBbeX)!
 
-[![Discord Card](https://discordapp.com/api/guilds/884667213326463016/widget.png?style=banner2)](https://discord.gg/Gx4BCEtHjx)
+[![Discord Card](https://discordapp.com/api/guilds/884667213326463016/widget.png?style=banner2)](https://discord.gg/knqAbbBbeX)
 
 
-## Getting Started
-
-> ⚠️ Note: 
-> 
-> CasaOS is still in the early development stage and may vary significantly with the final release. Feel free to test run and share your feedback in the [Discord server](https://discord.gg/Gx4BCEtHjx)!
-
-### System Compatibility
-
- - Ubuntu Server 20.04 amd64 (✅ Recommend, Tested)
- - Debian 11 amd64 (⚠️ Not Fully Tested Yet)
- - OpenWrt 21.02 amd64 (⚠️ Not Fully Tested Yet)
- - Raspberry Pi OS aarch64/arm64 (🚧 Under Planning)
- - OpenWrt 21.02 aarch64/arm64 (🚧 Under Planning)
-
-### Quick Setup CasaOS
-
-Fresh install a system from the above list and run the below command:
-
-```sh
-curl -fsSL https://get.icewhale.io/casaos.sh | bash
-```
-
-
-## To Do
-
-**v 0.1.x**
-
- - [x] An elegant UI for home scenarios
- - [x] Custom installation of Docker Apps
- - [x] Update, stop, uninstall, restart, etc. of Docker apps
- - [x] Docker CLI parser
- - [x] System Update
- - [ ] Getting Started tutorial
- - [ ] Docker Compose parser
- - [ ] App config file import and export
- - [ ] macvlan network mode
-
 
 ## Maintainers
  - Jerry Liu
@@ -83,4 +86,4 @@ curl -fsSL https://get.icewhale.io/casaos.sh | bash
  - Ober Zhang
  - Zyaire Ann
  - John Guan
- - Right here, waiting for YOU!
+ - Right here, waiting for YOU!

alpha.md

@@ -0,0 +1,41 @@
+<!--
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-06-27 11:37:26
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-07-01 15:51:29
+ * @FilePath: /CasaOS/alpha.md
+ * @Description: 
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved. 
+-->
+
+# alpha Test Description
+
+## :warning: Warning
+
+There is a risk of data loss in non-release versions, so please be careful to back up your data.
+
+## Install/Update
+
+``` curl -fsSL https://get.casaos.io | bash -s -- -v v0.3.3-alpha ```
+
+## Check change log
+
+[CHANGELOG](https://github.com/IceWhaleTech/CasaOS/blob/main/CHANGELOG.md)
+
+## Check Design drawings
+
+[Design drawings](https://www.figma.com/file/pvlGobvuWEvbCb3GLqXfim/CasaOS-V0.3.3)
+
+## Feedback questions
+
+Go [here]() to give feedback on your question, note that try to match the picture or video
+
+
+## Retest after update
+
+Wait for the fix to appear and update and retest, and follow up on the issue
+
+## Thanks
+
+Thank you for your great support, we will return your support from time to time.

conf/conf.conf.sample

@@ -0,0 +1,32 @@
+[app]
+PAGE_SIZE = 10
+RuntimeRootPath = runtime/
+LogPath = /var/log/casaos/
+LogSaveName = log
+LogFileExt = log
+DateStrFormat = 20060102
+DateTimeFormat = 2006-01-02 15:04:05
+TimeFormat = 15:04:05
+DateFormat = 2006-01-02
+DBPath     = /var/lib/casaos
+ShellPath  = /usr/share/casaos/shell
+UserDataPath = /var/lib/casaos/conf
+TempPath    = /var/lib/casaos/temp
+
+[server]
+HttpPort = 80
+UDPPort = 
+RunMode = release
+ServerApi = https://api.casaos.io/casaos-api
+Handshake = socket.casaos.io
+Token = 
+USBAutoMount =
+
+
+[system]
+WidgetList =
+
+
+[file]
+ShareDir =
+DownloadDir =

conf/conf.ini.sample

@@ -1,41 +0,0 @@
-[app]
-PAGE_SIZE = 10
-RuntimeRootPath = runtime/
-LogSavePath = /casaOS/logs/server/
-LogSaveName = log
-LogFileExt = log
-DateStrFormat = 20060102
-DateTimeFormat = 2006-01-02 15:04:05
-TimeFormat = 15:04:05
-DateFormat = 2006-01-02
-ProjectPath = /casaOS/server
-
-
-[server]
-HttpPort = 8089
-RunMode = release
-ServerApi = https://api.casaos.zimaboard.com
-
-[user]
-UserName = admin
-PWD = zimaboard
-Email = user@gmail.com
-Description = description
-Token = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6ImVyZXJlIiwicGFzc3dvcmQiOiJhZHNmZGYiLCJleHAiOjE2MjQwMDU0ODEsImlzcyI6Imdpbi1ibG9nIn0.JNsCccZuFCwlSMLJg62iOIB2xymk_k7xGa11xhZ07bc
-
-[zerotier]
-UserName = user
-PWD = pwd
-Token = yBKYyavr2RdFAIVN7iTpzlsB1o6CqTgm
-
-[redis]
-Host = 127.0.0.1:6379
-Password =
-MaxIdle = 30
-MaxActive = 30
-IdleTimeout = 200
-
-[system]
-ConfigStr = 
-WidgetList =
-

go.mod

@@ -3,50 +3,52 @@ module github.com/IceWhaleTech/CasaOS
 go 1.16
 
 require (
+	github.com/Curtis-Milo/nat-type-identifier-go v0.0.0-20220215191915-18d42168c63d
 	github.com/Microsoft/go-winio v0.5.0 // indirect
 	github.com/Microsoft/hcsshim v0.8.22 // indirect
-	github.com/PuerkitoBio/goquery v1.7.0
 	github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
-	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
-	github.com/aquasecurity/libbpfgo v0.2.1-libbpf-0.4.0 // indirect
+	github.com/ambelovsky/go-structs v1.1.0 // indirect
+	github.com/ambelovsky/gosf v0.0.0-20201109201340-237aea4d6109
+	github.com/ambelovsky/gosf-socketio v0.0.0-20201109193639-add9d32f8b19 // indirect
 	github.com/bits-and-blooms/bitset v1.2.1 // indirect
 	github.com/containerd/containerd v1.5.7
 	github.com/containerd/continuity v0.2.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
+	github.com/disintegration/imaging v1.6.2
+	github.com/docker/distribution v2.8.0+incompatible // indirect
 	github.com/docker/docker v20.10.7+incompatible
 	github.com/docker/go-connections v0.4.0
+	github.com/dsoprea/go-exif/v3 v3.0.0-20210625224831-a6301f85c82b
+	github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd // indirect
 	github.com/forease/gotld v0.0.0-20190808124948-c50ff635576b
-	github.com/gin-contrib/gzip v0.0.2 // indirect
+	github.com/gin-contrib/gzip v0.0.2
 	github.com/gin-gonic/gin v1.7.2
-	github.com/go-delve/delve v1.7.2 // indirect
 	github.com/go-ini/ini v1.62.0
 	github.com/go-ole/go-ole v1.2.5 // indirect
-	github.com/go-openapi/jsonreference v0.19.6 // indirect
 	github.com/go-openapi/spec v0.20.4 // indirect
-	github.com/go-openapi/swag v0.19.15 // indirect
 	github.com/go-playground/validator/v10 v10.6.1 // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect
-	github.com/golang-jwt/jwt v3.2.2+incompatible
+	github.com/golang-jwt/jwt/v4 v4.4.1
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/gomodule/redigo v1.8.5
-	github.com/google/go-dap v0.6.0 // indirect
 	github.com/google/go-github/v36 v36.0.0
 	github.com/google/uuid v1.3.0 // indirect
+	github.com/googollee/go-socket.io v1.6.2
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gorilla/websocket v1.4.2
 	github.com/jinzhu/copier v0.3.2
 	github.com/json-iterator/go v1.1.11 // indirect
 	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/lucas-clemente/quic-go v0.25.0
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.11 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/mattn/go-runewidth v0.0.13 // indirect
+	github.com/mattn/go-sqlite3 v1.14.11 // indirect
+	github.com/mholt/archiver/v3 v3.5.1
 	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/opencontainers/runc v1.0.2 // indirect
+	github.com/opencontainers/image-spec v1.0.2 // indirect
 	github.com/opencontainers/selinux v1.8.5 // indirect
-	github.com/peterh/liner v1.2.1 // indirect
+	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pkg/errors v0.9.1
 	github.com/prestonTao/upnp v0.0.0-20150206124352-f4370df5e109
 	github.com/prometheus/procfs v0.7.3 // indirect
@@ -56,23 +58,19 @@ require (
 	github.com/sirupsen/logrus v1.8.1
 	github.com/smartystreets/assertions v1.2.0 // indirect
 	github.com/smartystreets/goconvey v1.6.4 // indirect
-	github.com/spf13/cobra v1.2.1 // indirect
 	github.com/swaggo/gin-swagger v1.3.0
 	github.com/swaggo/swag v1.7.3
-	github.com/tidwall/gjson v1.8.0
-	github.com/tidwall/pretty v1.2.0 // indirect
+	github.com/tidwall/gjson v1.10.2
 	github.com/tklauser/go-sysconf v0.3.6 // indirect
 	github.com/ugorji/go v1.2.6 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	go.starlark.net v0.0.0-20210901212718-87f333178d59 // indirect
-	golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
+	go.uber.org/zap v1.10.0
 	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
 	golang.org/x/mod v0.5.0 // indirect
 	golang.org/x/net v0.0.0-20211020060615-d418f374d309 // indirect
 	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f
 	golang.org/x/sys v0.0.0-20211020174200-9d6173849985 // indirect
 	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
-	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
 	golang.org/x/tools v0.1.7 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
@@ -80,8 +78,8 @@ require (
 	google.golang.org/grpc v1.41.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/ini.v1 v1.62.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	gorm.io/driver/sqlite v1.1.5
-	gorm.io/gorm v1.21.15
-	src.techknowlogick.com/xgo v1.4.1-0.20211007230901-4fb1c2d7b2ab // indirect
+	gorm.io/driver/sqlite v1.2.6
+	gorm.io/gorm v1.22.5
 )

main.go

@@ -6,11 +6,16 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/IceWhaleTech/CasaOS/model/notify"
+	"github.com/IceWhaleTech/CasaOS/pkg/cache"
 	"github.com/IceWhaleTech/CasaOS/pkg/config"
 	"github.com/IceWhaleTech/CasaOS/pkg/sqlite"
-	loger2 "github.com/IceWhaleTech/CasaOS/pkg/utils/loger"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/encryption"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/loger"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/random"
 	"github.com/IceWhaleTech/CasaOS/route"
 	"github.com/IceWhaleTech/CasaOS/service"
+
 	"github.com/robfig/cron"
 	"gorm.io/gorm"
 )
@@ -18,17 +23,35 @@ import (
 var sqliteDB *gorm.DB
 
 var configFlag = flag.String("c", "", "config address")
-
+var dbFlag = flag.String("db", "", "db path")
 var showUserInfo = flag.Bool("show-user-info", false, "show user info")
+var resetUser = flag.Bool("ru", false, "reset user")
+var user = flag.String("user", "", "user name")
 
 func init() {
 	flag.Parse()
 	config.InitSetup(*configFlag)
 	config.UpdateSetup()
-	loger2.LogSetup()
-	sqliteDB = sqlite.GetDb(config.AppInfo.ProjectPath)
+	loger.LogInit()
+	if len(*dbFlag) == 0 {
+		*dbFlag = config.AppInfo.DBPath + "/db"
+	}
+	sqliteDB = sqlite.GetDb(*dbFlag)
 	//gredis.GetRedisConn(config.RedisInfo),
-	service.MyService = service.NewService(sqliteDB, loger2.NewOLoger())
+	service.MyService = service.NewService(sqliteDB)
+	service.Cache = cache.Init()
+
+	service.GetToken()
+	service.UDPAddressMap = make(map[string]string)
+	//go service.SocketConnect()
+	service.CancelList = make(map[string]string)
+	service.InternalInspection = make(map[string][]string)
+	service.NewVersionApp = make(map[string]string)
+	route.InitFunction()
+
+	// go service.LoopFriend()
+	// go service.MyService.App().CheckNewImage()
+
 }
 
 // @title casaOS API
@@ -43,27 +66,77 @@ func init() {
 // @name Authorization
 // @BasePath /v1
 func main() {
+	service.NotifyMsg = make(chan notify.Message, 10)
 	if *showUserInfo {
 		fmt.Println("CasaOS User Info")
 		fmt.Println("UserName:" + config.UserInfo.UserName)
 		fmt.Println("Password:" + config.UserInfo.PWD)
 		return
 	}
+	fmt.Println("Reset User", *resetUser)
+	if *resetUser {
+
+		if user == nil || len(*user) == 0 {
+			fmt.Println("user is empty")
+			return
+		}
+		userData := service.MyService.User().GetUserAllInfoByName(*user)
+		if userData.Id == 0 {
+			fmt.Println("user not exist")
+			return
+		}
+		password := random.RandomString(6, false)
+		userData.Password = encryption.GetMD5ByStr(password)
+		service.MyService.User().UpdateUserPassword(userData)
+		fmt.Println("User reset successful")
+		fmt.Println("UserName:" + userData.UserName)
+		fmt.Println("Password:" + password)
+		return
+	}
+	go func() {
+		service.UDPService()
+		service.SendIPToServer()
+	}()
+	go route.SocketInit(service.NotifyMsg)
+	go func() {
+		for i := 0; i < 1000; i++ {
+			time.Sleep(2 * time.Second)
+			//service.NotifyMsg <- strconv.Itoa(i)
+		}
+	}()
+
 	//model.Setup()
 	//gredis.Setup()
 	r := route.InitRouter()
 	//service.SyncTask(sqliteDB)
-	cron2 := cron.New() //创建一个cron实例
-	//执行定时任务（每5秒执行一次）
-	err := cron2.AddFunc("0 0 0 1/1 * *", func() {
+	cron2 := cron.New()
+	//every day execution
+	err := cron2.AddFunc("0 0/5 * * * *", func() {
+		//service.PushIpInfo(*&config.ServerInfo.Token)
 		//service.UpdataDDNSList(mysqldb)
 		//service.SyncTask(sqliteDB)
+
+		service.SendIPToServer()
+
+		service.LoopFriend()
+		//service.MyService.App().CheckNewImage()
+	})
+	if err != nil {
+		fmt.Println(err)
+	}
+	err = cron2.AddFunc("0/5 * * * * *", func() {
+		if service.ClientCount > 0 {
+			//route.SendNetINfoBySocket()
+			//route.SendCPUBySocket()
+			//route.SendMemBySocket()
+			// route.SendDiskBySocket()
+			//route.SendUSBBySocket()
+			route.SendAllHardwareStatusBySocket()
+		}
 	})
 	if err != nil {
 		fmt.Println(err)
 	}
-
-	//启动/关闭
 	cron2.Start()
 	defer cron2.Stop()
 	s := &http.Server{
@@ -73,6 +146,10 @@ func main() {
 		WriteTimeout:   60 * time.Second,
 		MaxHeaderBytes: 1 << 20,
 	}
+
 	s.ListenAndServe()
 
+	// if err := r.Run(fmt.Sprintf(":%v", config.ServerInfo.HttpPort)); err != nil {
+	// 	fmt.Println("failed run app: ", err)
+	// }
 }

middleware/gin.go

@@ -1,28 +1,37 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2021-10-08 10:29:08
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-06-21 15:10:03
+ * @FilePath: /CasaOS/middleware/gin.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
 package middleware
 
 import (
 	"fmt"
-	"github.com/gin-gonic/gin"
 	"net/http"
+
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/loger"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
 )
 
 func Cors() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		method := c.Request.Method
-		//origin := c.Request.Header.Get("Origin") //请求头部
-		//if origin != "" {
-		//接收客户端发送的origin （重要！）
-		c.Writer.Header().Set("Access-Control-Allow-Origin", "*")
+
 		c.Header("Access-Control-Allow-Origin", "*")
-		//服务器支持的所有跨域请求的方法
 		c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE,UPDATE")
 		//允许跨域设置可以返回其他子段，可以自定义字段
-		c.Header("Access-Control-Allow-Headers", "Authorization, Content-Length, X-CSRF-Token, Token,session")
+		c.Header("Access-Control-Allow-Headers", "Authorization, Content-Length, X-CSRF-Token, Token,session,Language")
 		// 允许浏览器（客户端）可以解析的头部 （重要）
 		c.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers")
+		//c.Writer.Header().Set("Access-Control-Allow-Headers", "Accept, Authorization, Content-Type, Content-Length, X-CSRF-Token, Token, session, Origin, Host, Connection, Accept-Encoding, Accept-Language, X-Requested-With")
 		//设置缓存时间
 		c.Header("Access-Control-Max-Age", "172800")
-		//允许客户端传递校验信息比如 cookie (重要)
 		c.Header("Access-Control-Allow-Credentials", "true")
 		c.Set("content-type", "application/json")
 		//}
@@ -41,3 +50,9 @@ func Cors() gin.HandlerFunc {
 		c.Next()
 	}
 }
+func WriteLog() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		loger.Info("request:", zap.Any("path", c.Request.URL.String()), zap.Any("param", c.Params), zap.Any("query", c.Request.URL.Query()), zap.Any("body", c.Request.Body), zap.Any("method", c.Request.Method))
+		c.Next()
+	}
+}

model/app-analyse.go

@@ -0,0 +1,27 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-03-18 11:40:55
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-05-13 14:48:01
+ * @FilePath: /CasaOS/model/app-analyse.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package model
+
+type AppAnalyse struct {
+	Name     string `json:"name"`
+	Type     string `json:"type"`
+	UUId     string `json:"uuid"`
+	Language string `json:"language"`
+	Version  string `json:"version"`
+}
+
+type ConnectionStatus struct {
+	From  string `json:"from"`
+	To    string `json:"to"`
+	Error string `json:"error"`
+	UUId  string `json:"uuid"`
+	Event string `json:"event"`
+}

model/app.go

@@ -6,33 +6,52 @@ import (
 	"time"
 )
 
+type ServerAppListCollection struct {
+	List      []ServerAppList `json:"list"`
+	Recommend []ServerAppList `json:"recommend"`
+	Community []ServerAppList `json:"community"`
+	Version   string          `json:"version"`
+}
+
 type ServerAppList struct {
-	Id             uint       `gorm:"column:id;primary_key" json:"id"`
-	Title          string     `json:"title"`
-	Description    string     `json:"description"`
-	Tagline        string     `json:"tagline"`
-	Tags           Strings    `gorm:"type:json" json:"tags"`
-	Icon           string     `json:"icon"`
-	ScreenshotLink Strings    `gorm:"type:json" json:"screenshot_link"`
-	Category       string     `json:"category"`
-	TcpPort        uint       `json:"tcp_port"`
-	PortMap        uint       `json:"port_map"`
-	ImageVersion   string     `json:"image_version"`
-	Tip            string     `json:"tip"`
-	Configures     configures `gorm:"type:json" json:"configures"`
-	NetworkModel   string     `json:"network_mode"`
-	Image          string     `json:"image"`
-	Index          string     `json:"index"`
-	CreatedAt      time.Time  `json:"created_at"`
-	UpdatedAt      time.Time  `json:"updated_at"`
-	State          string     `json:"state"`
-	Author         string     `json:"author"`
-	MinMemory      int        `json:"min_memory"`
-	MinDisk        int        `json:"min_disk"`
-	MaxMemory      uint64     `json:"max_memory"`
-	Thumbnail      string     `json:"thumbnail"`
-	Healthy        string     `json:"healthy"`
-	Plugins        Strings    `json:"plugins"`
+	Id             uint      `gorm:"column:id;primary_key" json:"id"`
+	Title          string    `json:"title"`
+	Description    string    `json:"description"`
+	Tagline        string    `json:"tagline"`
+	Tags           Strings   `gorm:"type:json" json:"tags"`
+	Icon           string    `json:"icon"`
+	ScreenshotLink Strings   `gorm:"type:json" json:"screenshot_link"`
+	Category       string    `json:"category"`
+	CategoryId     int       `json:"category_id"`
+	CategoryFont   string    `json:"category_font"`
+	PortMap        string    `json:"port_map"`
+	ImageVersion   string    `json:"image_version"`
+	Tip            string    `json:"tip"`
+	Envs           EnvArray  `json:"envs"`
+	Ports          PortArray `json:"ports"`
+	Volumes        PathArray `json:"volumes"`
+	Devices        PathArray `json:"devices"`
+	NetworkModel   string    `json:"network_model"`
+	Image          string    `json:"image"`
+	Index          string    `json:"index"`
+	CreatedAt      time.Time `json:"created_at"`
+	UpdatedAt      time.Time `json:"updated_at"`
+	State          string    `json:"state"`
+	Author         string    `json:"author"`
+	MinMemory      int       `json:"min_memory"`
+	MinDisk        int       `json:"min_disk"`
+	MaxMemory      uint64    `json:"max_memory"`
+	Thumbnail      string    `json:"thumbnail"`
+	Healthy        string    `json:"healthy"`
+	Plugins        Strings   `json:"plugins"`
+	Origin         string    `json:"origin"`
+	Type           int       `json:"type"`
+	QueryCount     int       `json:"query_count"`
+	Developer      string    `json:"developer"`
+	HostName       string    `json:"host_name"`
+	Privileged     bool      `json:"privileged"`
+	CapAdd         Strings   `json:"cap_add"`
+	Cmd            Strings   `json:"cmd"`
 }
 
 type Ports struct {

model/category.go

@@ -1,10 +1,24 @@
+/*
+ * @Author: link a624669980@163.com
+ * @Date: 2022-05-16 17:37:08
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-06-22 17:45:53
+ * @FilePath: /CasaOS/model/category.go
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+
+ */
 package model
 
 type ServerCategoryList struct {
+	Version string         `json:"version"`
+	Item    []CategoryList `json:"item"`
+}
+type CategoryList struct {
 	Id uint `gorm:"column:id;primary_key" json:"id"`
 	//CreatedAt time.Time `json:"created_at"`
 	//
 	//UpdatedAt time.Time `json:"updated_at"`
+	Font  string `json:"font"`
 	Name  string `json:"name"`
 	Count uint   `json:"count"`
 }

model/disk.go

@@ -20,12 +20,57 @@ type LSBLKModel struct {
 	Format      string       `json:"format"`
 	Health      string       `json:"health"`
 	HotPlug     bool         `json:"hotplug"`
+	UUID        string       `json:"uuid"`
 	FSUsed      string       `json:"fsused"`
+	Temperature int          `json:"temperature"`
 	Tran        string       `json:"tran"`
 	MinIO       uint64       `json:"min-io"`
 	UsedPercent float64      `json:"used_percent"`
+	Serial      string       `json:"serial"`
 	Children    []LSBLKModel `json:"children"`
+	SubSystems  string       `json:"subsystems"`
 	//详情特有
 	StartSector uint64 `json:"start_sector,omitempty"`
+	Rota        bool   `json:"rota"` //true(hhd) false(ssd)
+	DiskType    string `json:"disk_type"`
 	EndSector   uint64 `json:"end_sector,omitempty"`
 }
+
+type Drive struct {
+	Name        string `json:"name"`
+	Size        uint64 `json:"size"`
+	Model       string `json:"model"`
+	Health      string `json:"health"`
+	Temperature int    `json:"temperature"`
+	DiskType    string `json:"disk_type"`
+	NeedFormat  bool   `json:"need_format"`
+	Serial      string `json:"serial"`
+	Path        string `json:"path"`
+}
+
+type DriveUSB struct {
+	Name  string `json:"name"`
+	Size  uint64 `json:"size"`
+	Used  uint64 `json:"use"`
+	Model string `json:"model"`
+	Mount bool   `json:"mount"` //是否完全挂载
+	Avail uint64 `json:"avail"` //可用空间
+}
+
+type Storage struct {
+	Name       string `json:"name"`
+	MountPoint string `json:"mountpoint"`
+	Size       string `json:"size"`
+	Avail      string `json:"avail"` //可用空间
+	Type       string `json:"type"`
+	CreatedAt  int64  `json:"create_at"`
+	Path       string `json:"path"`
+	DriveName  string `json:"drive_name"`
+}
+
+type Summary struct {
+	Size   uint64 `json:"size"`
+	Avail  uint64 `json:"avail"` //可用空间
+	Health bool   `json:"health"`
+	Used   uint64 `json:"used"`
+}

model/docker.go

@@ -0,0 +1,18 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2021-12-08 18:10:25
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-06-14 17:20:36
+ * @FilePath: /CasaOS/model/docker.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package model
+
+type DockerStatsModel struct {
+	Icon  string      `json:"icon"`
+	Title string      `json:"title"`
+	Data  interface{} `json:"data"`
+	Pre   interface{} `json:"pre"`
+}

model/file.go

@@ -0,0 +1,33 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-05-20 16:27:12
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-06-09 18:18:46
+ * @FilePath: /CasaOS/model/file.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package model
+
+type FileOperate struct {
+	Type          string     `json:"type" binding:"required"`
+	Item          []FileItem `json:"item" binding:"required"`
+	TotalSize     int64      `json:"total_size"`
+	ProcessedSize int64      `json:"processed_size"`
+	To            string     `json:"to" binding:"required"`
+	Style         string     `json:"style"`
+	Finished      bool       `json:"finished"`
+}
+
+type FileItem struct {
+	From          string `json:"from" binding:"required"`
+	Finished      bool   `json:"finished"`
+	Size          int64  `json:"size"`
+	ProcessedSize int64  `json:"processed_size"`
+}
+
+type FileUpdate struct {
+	FilePath    string `json:"path" binding:"required"`
+	FileContent string `json:"content" binding:"required"`
+}

model/heart.go

@@ -0,0 +1,6 @@
+package model
+
+type CasaOSHeart struct {
+	UuId string `json:"uuid"`
+	Type string `json:"type"`
+}

model/manifest.go

@@ -17,20 +17,22 @@ type UdpPorts struct {
 /*******************使用gorm支持json************************************/
 
 type PortMap struct {
-	ContainerPort string `json:"container,omitempty"`
-	CommendPort   string `json:"host,omitempty"`
+	ContainerPort string `json:"container"`
+	CommendPort   string `json:"host"`
 	Protocol      string `json:"protocol"`
+	Desc          string `json:"desc"`
+	Type          int    `json:"type"`
 }
 
-type PortArrey []PortMap
+type PortArray []PortMap
 
 // Value 实现方法
-func (p PortArrey) Value() (driver.Value, error) {
+func (p PortArray) Value() (driver.Value, error) {
 	return json.Marshal(p)
 }
 
 // Scan 实现方法
-func (p *PortArrey) Scan(input interface{}) error {
+func (p *PortArray) Scan(input interface{}) error {
 	return json.Unmarshal(input.([]byte), p)
 }
 
@@ -41,20 +43,22 @@ func (p *PortArrey) Scan(input interface{}) error {
 type Env struct {
 	Name  string `json:"container"`
 	Value string `json:"host"`
+	Desc  string `json:"desc"`
+	Type  int    `json:"type"`
 }
 
 type JSON json.RawMessage
 
-type EnvArrey []Env
+type EnvArray []Env
 
 // Value 实现方法
-func (p EnvArrey) Value() (driver.Value, error) {
+func (p EnvArray) Value() (driver.Value, error) {
 	return json.Marshal(p)
 	//return .MarshalJSON()
 }
 
 // Scan 实现方法
-func (p *EnvArrey) Scan(input interface{}) error {
+func (p *EnvArray) Scan(input interface{}) error {
 	return json.Unmarshal(input.([]byte), p)
 }
 
@@ -65,17 +69,19 @@ func (p *EnvArrey) Scan(input interface{}) error {
 type PathMap struct {
 	ContainerPath string `json:"container"`
 	Path          string `json:"host"`
+	Type          int    `json:"type"`
+	Desc          string `json:"desc"`
 }
 
-type PathArrey []PathMap
+type PathArray []PathMap
 
 // Value 实现方法
-func (p PathArrey) Value() (driver.Value, error) {
+func (p PathArray) Value() (driver.Value, error) {
 	return json.Marshal(p)
 }
 
 // Scan 实现方法
-func (p *PathArrey) Scan(input interface{}) error {
+func (p *PathArray) Scan(input interface{}) error {
 	return json.Unmarshal(input.([]byte), p)
 }
 
@@ -98,22 +104,29 @@ func (p *PathArrey) Scan(input interface{}) error {
 //}
 
 type CustomizationPostData struct {
+	CustomId     string    `json:"custom_id"`
 	Origin       string    `json:"origin"`
 	NetworkModel string    `json:"network_model"`
 	Index        string    `json:"index"`
 	Icon         string    `json:"icon"`
 	Image        string    `json:"image"`
-	Envs         EnvArrey  `json:"envs"`
-	Ports        PortArrey `json:"ports"`
-	Volumes      PathArrey `json:"volumes"`
-	Devices      PathArrey `json:"devices"`
+	Envs         EnvArray  `json:"envs"`
+	Ports        PortArray `json:"ports"`
+	Volumes      PathArray `json:"volumes"`
+	Devices      PathArray `json:"devices"`
 	//Port         string    `json:"port,omitempty"`
-	PortMap     string `json:"port_map"`
-	CpuShares   int64  `json:"cpu_shares"`
-	Memory      int64  `json:"memory"`
-	Restart     string `json:"restart"`
-	EnableUPNP  bool   `json:"enable_upnp"`
-	Label       string `json:"label"`
-	Description string `json:"description"`
-	Position    bool   `json:"position"`
+	PortMap     string   `json:"port_map"`
+	CpuShares   int64    `json:"cpu_shares"`
+	Memory      int64    `json:"memory"`
+	Restart     string   `json:"restart"`
+	EnableUPNP  bool     `json:"enable_upnp"`
+	Label       string   `json:"label"`
+	Description string   `json:"description"`
+	Position    bool     `json:"position"`
+	HostName    string   `json:"host_name"`
+	Privileged  bool     `json:"privileged"`
+	CapAdd      []string `json:"cap_add"`
+	Cmd         []string `json:"cmd"`
+	Protocol    string   `json:"protocol"`
+	Host        string   `json:"host"`
 }

model/net.go

@@ -1,19 +1,17 @@
 package model
 
-import "time"
-
 type IOCountersStat struct {
-	Name        string    `json:"name"`        // interface name
-	BytesSent   uint64    `json:"bytesSent"`   // number of bytes sent
-	BytesRecv   uint64    `json:"bytesRecv"`   // number of bytes received
-	PacketsSent uint64    `json:"packetsSent"` // number of packets sent
-	PacketsRecv uint64    `json:"packetsRecv"` // number of packets received
-	Errin       uint64    `json:"errin"`       // total number of errors while receiving
-	Errout      uint64    `json:"errout"`      // total number of errors while sending
-	Dropin      uint64    `json:"dropin"`      // total number of incoming packets which were dropped
-	Dropout     uint64    `json:"dropout"`     // total number of outgoing packets which were dropped (always 0 on OSX and BSD)
-	Fifoin      uint64    `json:"fifoin"`      // total number of FIFO buffers errors while receiving
-	Fifoout     uint64    `json:"fifoout"`     // total number of FIFO buffers errors while sending
-	State       string    `json:"state"`
-	DateTime    time.Time `json:"date_time"`
+	Name        string `json:"name"`        // interface name
+	BytesSent   uint64 `json:"bytesSent"`   // number of bytes sent
+	BytesRecv   uint64 `json:"bytesRecv"`   // number of bytes received
+	PacketsSent uint64 `json:"packetsSent"` // number of packets sent
+	PacketsRecv uint64 `json:"packetsRecv"` // number of packets received
+	Errin       uint64 `json:"errin"`       // total number of errors while receiving
+	Errout      uint64 `json:"errout"`      // total number of errors while sending
+	Dropin      uint64 `json:"dropin"`      // total number of incoming packets which were dropped
+	Dropout     uint64 `json:"dropout"`     // total number of outgoing packets which were dropped (always 0 on OSX and BSD)
+	Fifoin      uint64 `json:"fifoin"`      // total number of FIFO buffers errors while receiving
+	Fifoout     uint64 `json:"fifoout"`     // total number of FIFO buffers errors while sending
+	State       string `json:"state"`
+	Time        int64  `json:"time"`
 }

model/notify.go

@@ -0,0 +1,6 @@
+package model
+
+type NotifyMssage struct {
+	Type string `json:"type"`
+	Data string `json:"data"`
+}

model/notify/application.go

@@ -0,0 +1,21 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-05-27 15:01:58
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-05-31 14:51:21
+ * @FilePath: /CasaOS/model/notify/application.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package notify
+
+type Application struct {
+	Name     string `json:"name"`
+	State    string `json:"state"`
+	Type     string `json:"type"`
+	Icon     string `json:"icon"`
+	Message  string `json:"message"`
+	Finished bool   `json:"finished"`
+	Success  bool   `json:"success"`
+}

model/notify/file.go

@@ -0,0 +1,22 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-05-26 14:21:57
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-06-02 11:14:15
+ * @FilePath: /CasaOS/model/notify/file.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package notify
+
+type File struct {
+	Finished       bool   `json:"finished"`
+	ProcessedSize  int64  `json:"processed_size"`
+	ProcessingPath string `json:"processing_path"`
+	Status         string `json:"status"`
+	TotalSize      int64  `json:"total_size"`
+	Id             string `json:"id"`
+	To             string `json:"to"`
+	Type           string `json:"type"`
+}

model/notify/message.go

@@ -0,0 +1,20 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-05-26 14:39:22
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-05-26 19:08:52
+ * @FilePath: /CasaOS/model/notify/message.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package notify
+
+import (
+	f "github.com/ambelovsky/gosf"
+)
+
+type Message struct {
+	Path string    `json:"path"`
+	Msg  f.Message `json:"msg"`
+}

model/notify/person.go

@@ -0,0 +1,16 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-05-27 18:42:42
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-05-27 18:43:08
+ * @FilePath: /CasaOS/model/notify/person.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package notify
+
+type Person struct {
+	ShareId string `json:"share_id"`
+	Type    string `json:"type"`
+}

model/notify/result.go

@@ -0,0 +1,18 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-05-26 14:21:11
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-05-27 11:15:59
+ * @FilePath: /CasaOS/model/notify/result.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+
+package notify
+
+// Notify struct for Notify
+type NotifyModel struct {
+	Data  interface{} `json:"data"`
+	State string      `json:"state"`
+}

model/person.go

@@ -0,0 +1,54 @@
+package model
+
+import "time"
+
+type PersionModel struct {
+	Token     string    `json:"token"`
+	Ips       []string  `json:"ips"`
+	CreatedAt time.Time `json:"created_at"`
+	UpdatedAt time.Time `json:"updated_at"`
+}
+
+//记录链接状态
+type ConnectState struct {
+	From      string    `json:"from"`
+	To        string    `json:"to"`
+	Type      string    `json:"type"` //current state 1:ready 2:ok
+	CreatedAt time.Time `json:"created_at"`
+	UUId      string    `json:"uuid"` //对接标识
+}
+type MessageModel struct {
+	Type string      `json:"type"`
+	Data interface{} `json:"data"`
+	UUId string      `json:"uuid"`
+	From string      `json:"from"`
+	To   string      `json:"to"`
+}
+
+type TranFileModel struct {
+	Hash   string `json:"hash"` //Verify current fragment integrity
+	Length int    `json:"length"`
+	Index  int    `json:"index"`
+}
+
+//需要获取文件详情
+type FileDetailModel struct {
+	Path string `json:"path"`
+}
+
+//返回文件详情
+type FileSummaryModel struct {
+	Hash      string `json:"hash"` //Verify file
+	Name      string `json:"name"`
+	BlockSize int    `json:"block_size"`
+	Length    int    `json:"length"`
+	Size      int64  `json:"size"`
+	Message   string `json:"message"`
+}
+
+type FriendsModel struct {
+	Id       uint   `gorm:"column:id;primary_key" json:"id"`
+	NickName string `json:"nick_name"`
+	Desc     string `json:"desc"`
+	ShareId  string `json:"share_id"`
+}

model/receive/app.go

@@ -0,0 +1 @@
+package receive

model/smartctl_model.go

@@ -0,0 +1,69 @@
+package model
+
+//
+type SmartctlA struct {
+	Smartctl struct {
+		Version      []int    `json:"version"`
+		SvnRevision  string   `json:"svn_revision"`
+		PlatformInfo string   `json:"platform_info"`
+		BuildInfo    string   `json:"build_info"`
+		Argv         []string `json:"argv"`
+		ExitStatus   int      `json:"exit_status"`
+	} `json:"smartctl"`
+	Device struct {
+		Name     string `json:"name"`
+		InfoName string `json:"info_name"`
+		Type     string `json:"type"`
+		Protocol string `json:"protocol"`
+	} `json:"device"`
+	ModelName       string `json:"model_name"`
+	SerialNumber    string `json:"serial_number"`
+	FirmwareVersion string `json:"firmware_version"`
+	UserCapacity    struct {
+		Blocks int   `json:"blocks"`
+		Bytes  int64 `json:"bytes"`
+	} `json:"user_capacity"`
+	SmartStatus struct {
+		Passed bool `json:"passed"`
+	} `json:"smart_status"`
+	AtaSmartData struct {
+		OfflineDataCollection struct {
+			Status struct {
+				Value  int    `json:"value"`
+				String string `json:"string"`
+			} `json:"status"`
+			CompletionSeconds int `json:"completion_seconds"`
+		} `json:"offline_data_collection"`
+		SelfTest struct {
+			Status struct {
+				Value  int    `json:"value"`
+				String string `json:"string"`
+				Passed bool   `json:"passed"`
+			} `json:"status"`
+			PollingMinutes struct {
+				Short      int `json:"short"`
+				Extended   int `json:"extended"`
+				Conveyance int `json:"conveyance"`
+			} `json:"polling_minutes"`
+		} `json:"self_test"`
+		Capabilities struct {
+			Values                        []int `json:"values"`
+			ExecOfflineImmediateSupported bool  `json:"exec_offline_immediate_supported"`
+			OfflineIsAbortedUponNewCmd    bool  `json:"offline_is_aborted_upon_new_cmd"`
+			OfflineSurfaceScanSupported   bool  `json:"offline_surface_scan_supported"`
+			SelfTestsSupported            bool  `json:"self_tests_supported"`
+			ConveyanceSelfTestSupported   bool  `json:"conveyance_self_test_supported"`
+			SelectiveSelfTestSupported    bool  `json:"selective_self_test_supported"`
+			AttributeAutosaveEnabled      bool  `json:"attribute_autosave_enabled"`
+			ErrorLoggingSupported         bool  `json:"error_logging_supported"`
+			GpLoggingSupported            bool  `json:"gp_logging_supported"`
+		} `json:"capabilities"`
+	} `json:"ata_smart_data"`
+	PowerOnTime struct {
+		Hours int `json:"hours"`
+	} `json:"power_on_time"`
+	PowerCycleCount int `json:"power_cycle_count"`
+	Temperature     struct {
+		Current int `json:"current"`
+	} `json:"temperature"`
+}

model/sys_common.go

@@ -1,3 +1,13 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-05-13 18:15:46
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-06-16 17:50:56
+ * @FilePath: /CasaOS/model/sys_common.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
 package model
 
 import "time"
@@ -15,25 +25,38 @@ type UserModel struct {
 	Head        string
 	Email       string
 	Description string
+	Initialized bool
+	Avatar      string
+	NickName    string
+	Public      string
 }
 
 //服务配置
 type ServerModel struct {
-	HttpPort  string
-	RunMode   string
-	ServerApi string
+	HttpPort     string
+	RunMode      string
+	ServerApi    string
+	LockAccount  bool
+	Handshake    string
+	Token        string
+	UDPPort      string
+	USBAutoMount string
+	SocketPort   string
 }
 
 //服务配置
 type APPModel struct {
-	LogSavePath    string
+	LogPath        string
 	LogSaveName    string
 	LogFileExt     string
 	DateStrFormat  string
 	DateTimeFormat string
+	UserDataPath   string
 	TimeFormat     string
 	DateFormat     string
-	ProjectPath    string
+	DBPath         string
+	ShellPath      string
+	TempPath       string
 }
 
 //公共返回模型
@@ -43,13 +66,6 @@ type Result struct {
 	Data    interface{} `json:"data" example:"返回结果"`
 }
 
-//zeritier相关
-type ZeroTierModel struct {
-	UserName string
-	PWD      string
-	Token    string
-}
-
 //redis配置文件
 type RedisModel struct {
 	Host        string
@@ -63,4 +79,16 @@ type SystemConfig struct {
 	ConfigStr  string `json:"config_str"`
 	WidgetList string `json:"widget_list"`
 	ConfigPath string `json:"config_path"`
+	SyncPort   string `json:"sync_port"`
+	SyncKey    string `json:"sync_key"`
+	Analyse    string `json:"analyse"`
+}
+
+type CasaOSGlobalVariables struct {
+	AppChange bool
+}
+
+type FileSetting struct {
+	ShareDir    []string `json:"share_dir" delim:"|"`
+	DownloadDir string   `json:"download_dir"`
 }

model/system.go

@@ -1,3 +0,0 @@
-package model
-
-

model/system_app/sync.go

@@ -0,0 +1,8 @@
+package system_app
+
+import "encoding/xml"
+
+type SyncConfig struct {
+	XMLName xml.Name `xml:"configuration"`
+	Key     string   `xml:"gui>apikey"`
+}

model/system_model/verify_information.go

@@ -0,0 +1,17 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-06-15 11:30:47
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-06-23 18:40:40
+ * @FilePath: /CasaOS/model/system_model/verify_information.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package system_model
+
+type VerifyInformation struct {
+	RefreshToken string `json:"refresh_token"`
+	AccessToken  string `json:"access_token"`
+	ExpiresAt    int64  `json:"expires_at"`
+}

model/user.go

@@ -0,0 +1,9 @@
+package model
+
+type UserInfo struct {
+	NickName string `json:"nick_name"`
+	Desc     string `json:"desc"`
+	ShareId  string `json:"share_id"`
+	Avatar   string `json:"avatar"`
+	Version  int    `json:"version,omitempty"`
+}

model/version.go

@@ -4,7 +4,7 @@ import "time"
 
 type Version struct {
 	Id        uint      `gorm:"column:id;primary_key" json:"id"`
-	ChangLog  string    `json:"chang_log"`
+	ChangeLog string    `json:"change_log"`
 	Version   string    `json:"version"`
 	CreatedAt time.Time `json:"created_at"`
 	UpdatedAt time.Time `json:"updated_at"`

model/zerotier.go

@@ -1,9 +0,0 @@
-package model
-
-type ZeroTierUpData struct {
-	Config ZeroTierConfig `json:"config"`
-}
-
-type ZeroTierConfig struct {
-	Private bool `json:"private"`
-}

model/zima.go

@@ -1,7 +1,14 @@
 package model
 
+import "time"
+
 type Path struct {
-	Name  string `json:"name"`
-	Path  string `json:"path"`
-	IsDir bool   `json:"is_dir"`
+	Name  string    `json:"name"`   //File name or document name
+	Path  string    `json:"path"`   //Full path to file or folder
+	IsDir bool      `json:"is_dir"` //Is it a folder
+	Date  time.Time `json:"date"`
+	Size  int64     `json:"size"` //File Size
+	Type  string    `json:"type,omitempty"`
+	Label string    `json:"label,omitempty"`
+	Write bool      `json:"write"`
 }

pkg/cache/cache.go

@@ -0,0 +1,11 @@
+package cache
+
+import (
+	"time"
+
+	"github.com/patrickmn/go-cache"
+)
+
+func Init() *cache.Cache {
+	return cache.New(5*time.Minute, 60*time.Second)
+}

pkg/config/config.go

@@ -1,5 +1,15 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2021-09-30 18:18:14
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-06-21 11:09:30
+ * @FilePath: /CasaOS/pkg/config/config.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
 package config
 
 const (
-	USERCONFIGURL = "conf/conf.ini"
+	USERCONFIGURL = "/etc/casaos.conf"
 )

pkg/config/init.go

@@ -1,3 +1,13 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-05-13 18:15:46
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-06-21 16:01:26
+ * @FilePath: /CasaOS/pkg/config/init.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
 package config
 
 import (
@@ -22,17 +32,17 @@ var UserInfo = &model.UserModel{}
 //用户相关
 var AppInfo = &model.APPModel{}
 
-//redis相关配置
-var RedisInfo = &model.RedisModel{}
-
-//zerotier相关
-var ZeroTierInfo = &model.ZeroTierModel{}
+//var RedisInfo = &model.RedisModel{}
 
 //server相关
 var ServerInfo = &model.ServerModel{}
 
 var SystemConfigInfo = &model.SystemConfig{}
 
+var CasaOSGlobalVariables = &model.CasaOSGlobalVariables{}
+
+var FileSettingInfo = &model.FileSetting{}
+
 var Cfg *ini.File
 
 //初始化设置，获取系统的部分信息。
@@ -42,6 +52,9 @@ func InitSetup(config string) {
 	if len(config) > 0 {
 		configDir = config
 	}
+	if runtime.GOOS == "darwin" {
+		configDir = "./conf/conf.conf"
+	}
 	var err error
 	//读取文件
 	Cfg, err = ini.Load(configDir)
@@ -52,11 +65,31 @@ func InitSetup(config string) {
 
 	mapTo("user", UserInfo)
 	mapTo("app", AppInfo)
-	mapTo("zerotier", ZeroTierInfo)
-	mapTo("redis", RedisInfo)
+	//mapTo("redis", RedisInfo)
 	mapTo("server", ServerInfo)
 	mapTo("system", SystemConfigInfo)
+	mapTo("file", FileSettingInfo)
 	SystemConfigInfo.ConfigPath = configDir
+	if len(AppInfo.DBPath) == 0 {
+		AppInfo.DBPath = "/var/lib/casaos"
+		Cfg.SaveTo(configDir)
+	}
+	if len(AppInfo.LogPath) == 0 {
+		AppInfo.LogPath = "/var/log/casaos/"
+		Cfg.SaveTo(configDir)
+	}
+	if len(AppInfo.ShellPath) == 0 {
+		AppInfo.ShellPath = "/usr/share/casaos/shell"
+		Cfg.SaveTo(configDir)
+	}
+	if len(AppInfo.UserDataPath) == 0 {
+		AppInfo.UserDataPath = "/var/lib/casaos/conf"
+		Cfg.SaveTo(configDir)
+	}
+	if len(AppInfo.TempPath) == 0 {
+		AppInfo.TempPath = "/var/lib/casaos/temp"
+		Cfg.SaveTo(configDir)
+	}
 	//	AppInfo.ProjectPath = getCurrentDirectory() //os.Getwd()
 
 }

pkg/config/update.go

@@ -1,13 +1,30 @@
 package config
 
-import "github.com/IceWhaleTech/CasaOS/pkg/utils/file"
+import (
+	"runtime"
+
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
+)
 
 //检查目录是否存在
 func mkdirDATAAll() {
-	dirArray := [7]string{"/DATA/AppData", "/DATA/Documents", "/DATA/Downloads", "/DATA/Gallery", "/DATA/Media/Movies", "/DATA/Media/TV Shows", "/DATA/Media/Music"}
+	sysType := runtime.GOOS
+	var dirArray []string
+	if sysType == "linux" {
+		dirArray = []string{"/DATA/AppData", "/DATA/Documents", "/DATA/Downloads", "/DATA/Gallery", "/DATA/Media/Movies", "/DATA/Media/TV Shows", "/DATA/Media/Music"}
+	}
+
+	if sysType == "windows" {
+		dirArray = []string{"C:\\CasaOS\\DATA\\AppData", "C:\\CasaOS\\DATA\\Documents", "C:\\CasaOS\\DATA\\Downloads", "C:\\CasaOS\\DATA\\Gallery", "C:\\CasaOS\\DATA\\Media/Movies", "C:\\CasaOS\\DATA\\Media\\TV Shows", "C:\\CasaOS\\DATA\\Media\\Music"}
+	}
+	if sysType == "darwin" {
+		dirArray = []string{"./CasaOS/DATA/AppData", "./CasaOS/DATA/Documents", "./CasaOS/DATA/Downloads", "./CasaOS/DATA/Gallery", "./CasaOS/DATA/Media/Movies", "./CasaOS/DATA/Media/TV Shows", "./CasaOS/DATA/Media/Music"}
+	}
+
 	for _, v := range dirArray {
 		file.IsNotExistMkDir(v)
 	}
+
 }
 
 func UpdateSetup() {

pkg/docker/helper.go

@@ -4,30 +4,35 @@ import (
 	"bytes"
 	json2 "encoding/json"
 	"fmt"
-	"github.com/gorilla/websocket"
-	"github.com/sirupsen/logrus"
-	"golang.org/x/crypto/ssh"
 	"io"
 	"regexp"
 	"strconv"
 	"sync"
 	"time"
+
+	"github.com/gorilla/websocket"
+	"github.com/sirupsen/logrus"
+	"golang.org/x/crypto/ssh"
 )
 
-func NewSshClient() (*ssh.Client, error) {
+func NewSshClient(user, password string) (*ssh.Client, error) {
+
+	// connet to ssh
+	// addr = fmt.Sprintf("%s:%d", host, port)
+
 	config := &ssh.ClientConfig{
 		Timeout:         time.Second * 5,
-		User:            "root",
+		User:            user,
 		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
 		//HostKeyCallback: ,
 		//HostKeyCallback: hostKeyCallBackFunc(h.Host),
 	}
 	//if h.Type == "password" {
-	config.Auth = []ssh.AuthMethod{ssh.Password("123456")}
+	config.Auth = []ssh.AuthMethod{ssh.Password(password)}
 	//} else {
 	//	config.Auth = []ssh.AuthMethod{publicKeyAuthFunc(h.Key)}
 	//}
-	addr := fmt.Sprintf("%s:%d", "192.168.2.142", 22)
+	addr := fmt.Sprintf("%s:%d", "127.0.0.1", 22)
 	c, err := ssh.Dial("tcp", addr, config)
 	if err != nil {
 		return nil, err
@@ -98,6 +103,98 @@ const (
 	wsMsgResize = "resize"
 )
 
+//ReceiveWsMsg  receive websocket msg do some handling then write into ssh.session.stdin
+func ReceiveWsMsgUser(wsConn *websocket.Conn, logBuff *bytes.Buffer) string {
+	//tells other go routine quit
+	username := ""
+	for {
+
+		//read websocket msg
+		_, wsData, err := wsConn.ReadMessage()
+		if err != nil {
+
+			return ""
+		}
+
+		msgObj := wsMsg{}
+		if err := json2.Unmarshal(wsData, &msgObj); err != nil {
+			msgObj.Type = "cmd"
+			msgObj.Cmd = string(wsData)
+		}
+		//if err := json.Unmarshal(wsData, &msgObj); err != nil {
+		//	logrus.WithError(err).WithField("wsData", string(wsData)).Error("unmarshal websocket message failed")
+		//}
+		switch msgObj.Type {
+		case wsMsgCmd:
+			//handle xterm.js stdin
+			//decodeBytes, err := base64.StdEncoding.DecodeString(msgObj.Cmd)
+			decodeBytes := []byte(msgObj.Cmd)
+			if msgObj.Cmd == "\u007f" {
+				if len(username) == 0 {
+					continue
+				}
+				wsConn.WriteMessage(websocket.TextMessage, []byte("\b\x1b[K"))
+				username = username[:len(username)-1]
+				continue
+			}
+			if msgObj.Cmd == "\r" {
+				return username
+			}
+			username += msgObj.Cmd
+
+			if err := wsConn.WriteMessage(websocket.TextMessage, decodeBytes); err != nil {
+				logrus.WithError(err).Error("ws cmd bytes write to ssh.stdin pipe failed")
+			}
+			//write input cmd to log buffer
+			if _, err := logBuff.Write(decodeBytes); err != nil {
+				logrus.WithError(err).Error("write received cmd into log buffer failed")
+			}
+		}
+
+	}
+}
+
+func ReceiveWsMsgPassword(wsConn *websocket.Conn, logBuff *bytes.Buffer) string {
+	//tells other go routine quit
+	password := ""
+	for {
+
+		//read websocket msg
+		_, wsData, err := wsConn.ReadMessage()
+		if err != nil {
+			logrus.WithError(err).Error("reading webSocket message failed")
+			return ""
+		}
+
+		msgObj := wsMsg{}
+		if err := json2.Unmarshal(wsData, &msgObj); err != nil {
+			msgObj.Type = "cmd"
+			msgObj.Cmd = string(wsData)
+		}
+		//if err := json.Unmarshal(wsData, &msgObj); err != nil {
+		//	logrus.WithError(err).WithField("wsData", string(wsData)).Error("unmarshal websocket message failed")
+		//}
+		switch msgObj.Type {
+		case wsMsgCmd:
+			//handle xterm.js stdin
+			//decodeBytes, err := base64.StdEncoding.DecodeString(msgObj.Cmd)
+			if msgObj.Cmd == "\r" {
+				return password
+			}
+
+			if msgObj.Cmd == "\u007f" {
+				if len(password) == 0 {
+					continue
+				}
+				password = password[:len(password)-1]
+				continue
+			}
+			password += msgObj.Cmd
+		}
+
+	}
+}
+
 //ReceiveWsMsg  receive websocket msg do some handling then write into ssh.session.stdin
 func (ssConn *SshConn) ReceiveWsMsg(wsConn *websocket.Conn, logBuff *bytes.Buffer, exitCh chan bool) {
 	//tells other go routine quit
@@ -187,6 +284,64 @@ func flushComboOutput(w *wsBufferWriter, wsConn *websocket.Conn) error {
 	}
 	return nil
 }
+
+//ReceiveWsMsg  receive websocket msg do some handling then write into ssh.session.stdin
+func (ssConn *SshConn) Login(wsConn *websocket.Conn, logBuff *bytes.Buffer, exitCh chan bool) {
+	//tells other go routine quit
+	defer setQuit(exitCh)
+	for {
+		select {
+		case <-exitCh:
+			return
+		default:
+			//read websocket msg
+			_, wsData, err := wsConn.ReadMessage()
+			if err != nil {
+				logrus.WithError(err).Error("reading webSocket message failed")
+				return
+			}
+			//unmashal bytes into struct
+			//msgObj := wsMsg{
+			//	Type: "cmd",
+			//	Cmd:  "",
+			//	Rows: 50,
+			//	Cols: 180,
+			//}
+			msgObj := wsMsg{}
+			if err := json2.Unmarshal(wsData, &msgObj); err != nil {
+				msgObj.Type = "cmd"
+				msgObj.Cmd = string(wsData)
+			}
+			//if err := json.Unmarshal(wsData, &msgObj); err != nil {
+			//	logrus.WithError(err).WithField("wsData", string(wsData)).Error("unmarshal websocket message failed")
+			//}
+			switch msgObj.Type {
+
+			case wsMsgResize:
+				//handle xterm.js size change
+				if msgObj.Cols > 0 && msgObj.Rows > 0 {
+					if err := ssConn.Session.WindowChange(msgObj.Rows, msgObj.Cols); err != nil {
+						logrus.WithError(err).Error("ssh pty change windows size failed")
+					}
+				}
+			case wsMsgCmd:
+				//handle xterm.js stdin
+				//decodeBytes, err := base64.StdEncoding.DecodeString(msgObj.Cmd)
+				decodeBytes := []byte(msgObj.Cmd)
+				if err != nil {
+					logrus.WithError(err).Error("websock cmd string base64 decoding failed")
+				}
+				if _, err := ssConn.StdinPipe.Write(decodeBytes); err != nil {
+					logrus.WithError(err).Error("ws cmd bytes write to ssh.stdin pipe failed")
+				}
+				//write input cmd to log buffer
+				if _, err := logBuff.Write(decodeBytes); err != nil {
+					logrus.WithError(err).Error("write received cmd into log buffer failed")
+				}
+			}
+		}
+	}
+}
 func (ssConn *SshConn) SessionWait(quitChan chan bool) {
 	if err := ssConn.Session.Wait(); err != nil {
 		logrus.WithError(err).Error("ssh session wait failed")
@@ -241,7 +396,7 @@ func WsReaderCopy(reader *websocket.Conn, writer io.Writer) {
 			if err = json2.Unmarshal(p, &msgObj); err != nil {
 				writer.Write(p)
 			} else if msgObj.Type == wsMsgResize {
-				writer.Write([]byte("stty rows " + strconv.Itoa(msgObj.Rows) + " && stty cols " + strconv.Itoa(msgObj.Cols) + " \r" ))
+				writer.Write([]byte("stty rows " + strconv.Itoa(msgObj.Rows) + " && stty cols " + strconv.Itoa(msgObj.Cols) + " \r"))
 			}
 		}
 	}

pkg/docker/volumes.go

@@ -1,12 +1,11 @@
 package docker
 
+import "strings"
+
 func GetDir(id, envName string) string {
-	var path string
-	switch envName {
-	case "/config":
-		path = "/oasis/app_data/" + id + "/"
-	default:
-		//path = "/media"
+
+	if strings.Contains(envName, "$AppID") && len(id) > 0 {
+		return strings.ReplaceAll(envName, "$AppID", id)
 	}
-	return path
+	return envName
 }

pkg/docker/volumes_test.go

@@ -0,0 +1,10 @@
+package docker
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestGetDir(t *testing.T) {
+	fmt.Println(GetDir("", "config"))
+}

pkg/github/github.go

@@ -6,11 +6,10 @@ import (
 	"golang.org/x/oauth2"
 )
 
-
 func GetGithubClient() *github.Client {
 	ctx := context.Background()
 	ts := oauth2.StaticTokenSource(
-		&oauth2.Token{AccessToken: "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"},
+		&oauth2.Token{AccessToken: ""},
 	)
 	tc := oauth2.NewClient(ctx, ts)
 	client := github.NewClient(tc)

pkg/quic_helper/config.go

@@ -0,0 +1,51 @@
+package quic_helper
+
+import (
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/tls"
+	"crypto/x509"
+	"encoding/pem"
+	"math/big"
+
+	"github.com/lucas-clemente/quic-go"
+)
+
+// Setup a bare-bones TLS config for the server
+func GetGenerateTLSConfig(token string) *tls.Config {
+	key, err := rsa.GenerateKey(rand.Reader, 1024)
+	if err != nil {
+		panic(err)
+	}
+	template := x509.Certificate{SerialNumber: big.NewInt(1)}
+	certDER, err := x509.CreateCertificate(rand.Reader, &template, &template, &key.PublicKey, key)
+	if err != nil {
+		panic(err)
+	}
+	keyPEM := pem.EncodeToMemory(&pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(key)})
+	certPEM := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: certDER})
+
+	tlsCert, err := tls.X509KeyPair(certPEM, keyPEM)
+	if err != nil {
+		panic(err)
+	}
+	return &tls.Config{
+		Certificates:           []tls.Certificate{tlsCert},
+		NextProtos:             []string{token},
+		SessionTicketsDisabled: true,
+	}
+}
+func GetClientTlsConfig(otherToken string) *tls.Config {
+	return &tls.Config{
+		InsecureSkipVerify:     true,
+		NextProtos:             []string{otherToken},
+		SessionTicketsDisabled: true,
+	}
+}
+
+func GetQUICConfig() *quic.Config {
+	return &quic.Config{
+		ConnectionIDLength: 4,
+		KeepAlive:          true,
+	}
+}

pkg/sqlite/db.go

@@ -1,38 +1,51 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-05-13 18:15:46
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-06-22 18:50:44
+ * @FilePath: /CasaOS/pkg/sqlite/db.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
 package sqlite
 
 import (
-	"fmt"
+	"time"
+
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/loger"
 	model2 "github.com/IceWhaleTech/CasaOS/service/model"
+	"go.uber.org/zap"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
-	"time"
 )
 
 var gdb *gorm.DB
 
-func GetDb(projectPath string) *gorm.DB {
+func GetDb(dbPath string) *gorm.DB {
 	if gdb != nil {
 		return gdb
 	}
-	// 参考 https://github.com/go-sql-driver/mysql#dsn-data-source-name 获取详情
+	// Refer https://github.com/go-sql-driver/mysql#dsn-data-source-name
 	//dsn := fmt.Sprintf("%v:%v@tcp(%v:%v)/%v?charset=utf8mb4&parseTime=True&loc=Local", m.User, m.PWD, m.IP, m.Port, m.DBName)
 	//db, err := gorm.Open(mysql2.Open(dsn), &gorm.Config{})
-	file.IsNotExistMkDir(projectPath + "/db/")
-	db, err := gorm.Open(sqlite.Open(projectPath+"/db/casaOS.db"), &gorm.Config{})
+	file.IsNotExistMkDir(dbPath)
+	db, err := gorm.Open(sqlite.Open(dbPath+"/casaOS.db"), &gorm.Config{})
 	c, _ := db.DB()
 	c.SetMaxIdleConns(10)
 	c.SetMaxOpenConns(100)
 	c.SetConnMaxIdleTime(time.Second * 1000)
 	if err != nil {
-		fmt.Println("连接数据失败!")
-		panic("数据库连接失败")
+		loger.Error("sqlite connect error", zap.Any("db connect error", err))
+		panic("sqlite connect error")
 		return nil
 	}
 	gdb = db
-	err = db.AutoMigrate(&model2.TaskDBModel{}, &model2.AppNotify{}, &model2.AppListDBModel{})
+	err = db.AutoMigrate(&model2.AppNotify{}, &model2.AppListDBModel{}, &model2.SerialDisk{}, model2.PersonDownloadDBModel{}, model2.FriendModel{}, model2.PersonDownRecordDBModel{}, model2.UserDBModel{})
+	db.Exec("DROP TABLE IF EXISTS o_application")
 	if err != nil {
-		fmt.Println("检查和创建数据库出错", err)
+		loger.Error("check or create db error", zap.Any("error", err))
 	}
 	return db
 }

pkg/upnp/device.go

@@ -1,89 +0,0 @@
-package upnp
-
-import (
-	"encoding/xml"
-	"io/ioutil"
-	"net/http"
-	"strings"
-)
-
-func GetCtrlUrl(host,device string) string {
-	request := ctrlUrlRequest(host, device)
-	response, _ := http.DefaultClient.Do(request)
-	resultBody, _ := ioutil.ReadAll(response.Body)
-	defer response.Body.Close()
-	if response.StatusCode == 200 {
-		return resolve(string(resultBody))
-
-	}
-	return ""
-}
-
-func ctrlUrlRequest(host string, deviceDescUrl string) *http.Request {
-	//请求头
-	header := http.Header{}
-	header.Set("Accept", "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2")
-	header.Set("User-Agent", "preston")
-	header.Set("Host", host)
-	header.Set("Connection", "keep-alive")
-	request, _ := http.NewRequest("GET", "http://"+host+deviceDescUrl, nil)
-	request.Header = header
-	return request
-}
-
-func resolve(resultStr string) string {
-	inputReader := strings.NewReader(resultStr)
-
-	// 从文件读取，如可以如下：
-	// content, err := ioutil.ReadFile("studygolang.xml")
-	// decoder := xml.NewDecoder(bytes.NewBuffer(content))
-
-	lastLabel := ""
-
-	ISUpnpServer := false
-
-	IScontrolURL := false
-	var controlURL string //`controlURL`
-	// var eventSubURL string //`eventSubURL`
-	// var SCPDURL string     //`SCPDURL`
-
-	decoder := xml.NewDecoder(inputReader)
-	for t, err := decoder.Token(); err == nil && !IScontrolURL; t, err = decoder.Token() {
-		switch token := t.(type) {
-		// 处理元素开始（标签）
-		case xml.StartElement:
-			if ISUpnpServer {
-				name := token.Name.Local
-				lastLabel = name
-			}
-
-		// 处理元素结束（标签）
-		case xml.EndElement:
-			// log.Println("结束标记：", token.Name.Local)
-		// 处理字符数据（这里就是元素的文本）
-		case xml.CharData:
-			//得到url后其他标记就不处理了
-			content := string([]byte(token))
-			//找到提供端口映射的服务
-			if content == "urn:schemas-upnp-org:service:WANIPConnection:1" {
-				ISUpnpServer = true
-				continue
-			}
-
-			if ISUpnpServer {
-				switch lastLabel {
-				case "controlURL":
-					controlURL = content
-					IScontrolURL = true
-				case "eventSubURL":
-					// eventSubURL = content
-				case "SCPDURL":
-					// SCPDURL = content
-				}
-			}
-		default:
-			// ...
-		}
-	}
-	return controlURL
-}

pkg/upnp/device_test.go

@@ -1,17 +0,0 @@
-package upnp
-
-import (
-	"testing"
-
-	ip_helper2 "github.com/IceWhaleTech/CasaOS/pkg/utils/ip_helper"
-)
-
-func TestGetCtrlUrl(t *testing.T) {
-	upnp, err := Gateway()
-	if err == nil {
-		upnp.CtrlUrl = GetCtrlUrl(upnp.GatewayHost, upnp.DeviceDescUrl)
-		upnp.LocalHost = ip_helper2.GetLoclIp()
-		upnp.AddPortMapping(8090, 8090, "TCP")
-		//upnp.DelPortMapping(9999,  "TCP")
-	}
-}

pkg/upnp/gateway.go

@@ -1,76 +0,0 @@
-package upnp
-
-import (
-	ip_helper2 "github.com/IceWhaleTech/CasaOS/pkg/utils/ip_helper"
-	"github.com/pkg/errors"
-	"net"
-	"strings"
-)
-
-func Gateway() (*Upnp, error) {
-	result, error := send()
-	if result == "" || error != nil {
-		return nil, error
-	}
-	upnp := resolvesss(result)
-	return upnp, nil
-}
-
-func send() (string, error) {
-	var str = "M-SEARCH * HTTP/1.1\r\n" +
-		"HOST: 239.255.255.250:1900\r\n" +
-		"ST: urn:schemas-upnp-org:service:WANIPConnection:1\r\n" +
-		"MAN: \"ssdp:discover\"\r\n" + "MX: 3\r\n\r\n"
-	var conn *net.UDPConn
-	remotAddr, err := net.ResolveUDPAddr("udp", "239.255.255.250:1900")
-	if err != nil {
-		return "", errors.New("组播地址格式不正确")
-	}
-	locaAddr, err := net.ResolveUDPAddr("udp", ip_helper2.GetLoclIp()+":")
-
-	if err != nil {
-		return "", errors.New("本地ip地址格式不正确")
-	}
-	conn, err = net.ListenUDP("udp", locaAddr)
-	defer conn.Close()
-	if err != nil {
-		return "", errors.New("监听udp出错")
-	}
-	_, err = conn.WriteToUDP([]byte(str), remotAddr)
-	if err != nil {
-		return "", errors.New("发送msg到组播地址出错")
-	}
-	buf := make([]byte, 1024)
-	n, _, err := conn.ReadFromUDP(buf)
-	if err != nil {
-		return "", errors.New("从组播地址接搜消息出错")
-	}
-	result := string(buf[:n])
-	return result, nil
-}
-
-func resolvesss(result string) *Upnp {
-	var upnp = &Upnp{}
-	lines := strings.Split(result, "\r\n")
-	for _, line := range lines {
-		//按照第一个冒号分为两个字符串
-		nameValues := strings.SplitAfterN(line, ":", 2)
-		if len(nameValues) < 2 {
-			continue
-		}
-		switch strings.ToUpper(strings.Trim(strings.Split(nameValues[0], ":")[0], " ")) {
-		case "ST":
-			//fmt.Println(nameValues[1])
-		case "CACHE-CONTROL":
-			//fmt.Println(nameValues[1])
-		case "LOCATION":
-			urls := strings.Split(strings.Split(nameValues[1], "//")[1], "/")
-			upnp.GatewayHost = (urls[0])
-			upnp.DeviceDescUrl = ("/" + urls[1])
-		case "SERVER":
-			upnp.GatewayName = (nameValues[1])
-		default:
-		}
-	}
-	return upnp
-}

pkg/upnp/gateway_test.go

@@ -1,8 +0,0 @@
-package upnp
-
-import "testing"
-
-func TestGateway(t *testing.T) {
-
-	Gateway()
-}

pkg/upnp/mapping.go

@@ -1,163 +0,0 @@
-package upnp
-
-import (
-	"bytes"
-	"github.com/pkg/errors"
-	"net/http"
-	"strconv"
-	"strings"
-)
-
-//
-////添加一个端口映射
-func (n *Upnp)AddPortMapping(localPort, remotePort int, protocol string) (err error) {
-	defer func(err error) {
-		if errTemp := recover(); errTemp != nil {
-			//log.Println("upnp模块报错了", errTemp)
-			err = errTemp.(error)
-		}
-	}(err)
-	if issuccess := addSend(localPort, remotePort, protocol,n.GatewayHost, n.CtrlUrl,n.LocalHost); issuccess {
-		return nil
-	} else {
-		return errors.New("添加一个端口映射失败")
-	}
-	return
-}
-
-func addSend(localPort, remotePort int, protocol, host, ctrUrl,localHost string) bool {
-	request := addRequest(localPort, remotePort, protocol, host, ctrUrl,localHost)
-	response, _ := http.DefaultClient.Do(request)
-	defer response.Body.Close()
-	//resultBody, _ := ioutil.ReadAll(response.Body)
-	//fmt.Println(string(resultBody))
-	if response.StatusCode == 200 {
-		return true
-	}
-
-	return false
-}
-
-type Node struct {
-	Name    string
-	Content string
-	Attr    map[string]string
-	Child   []Node
-}
-
-func addRequest(localPort, remotePort int, protocol string, gatewayHost, ctlUrl,localHost string) *http.Request {
-	//请求头
-	header := http.Header{}
-	header.Set("Accept", "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2")
-	header.Set("SOAPAction", `"urn:schemas-upnp-org:service:WANIPConnection:1#AddPortMapping"`)
-	header.Set("Content-Type", "text/xml")
-	header.Set("Connection", "Close")
-	header.Set("Content-Length", "")
-	//请求体
-	body := Node{Name: "SOAP-ENV:Envelope",
-		Attr: map[string]string{"xmlns:SOAP-ENV": `"http://schemas.xmlsoap.org/soap/envelope/"`,
-			"SOAP-ENV:encodingStyle": `"http://schemas.xmlsoap.org/soap/encoding/"`}}
-	childOne := Node{Name: `SOAP-ENV:Body`}
-	childTwo := Node{Name: `m:AddPortMapping`,
-		Attr: map[string]string{"xmlns:m": `"urn:schemas-upnp-org:service:WANIPConnection:1"`}}
-
-	childList1 := Node{Name: "NewExternalPort", Content: strconv.Itoa(remotePort)}
-	childList2 := Node{Name: "NewInternalPort", Content: strconv.Itoa(localPort)}
-	childList3 := Node{Name: "NewProtocol", Content: protocol}
-	childList4 := Node{Name: "NewEnabled", Content: "1"}
-	childList5 := Node{Name: "NewInternalClient", Content: localHost}
-	childList6 := Node{Name: "NewLeaseDuration", Content: "0"}
-	childList7 := Node{Name: "NewPortMappingDescription", Content: "Oasis"}
-	childList8 := Node{Name: "NewRemoteHost"}
-	childTwo.AddChild(childList1)
-	childTwo.AddChild(childList2)
-	childTwo.AddChild(childList3)
-	childTwo.AddChild(childList4)
-	childTwo.AddChild(childList5)
-	childTwo.AddChild(childList6)
-	childTwo.AddChild(childList7)
-	childTwo.AddChild(childList8)
-
-	childOne.AddChild(childTwo)
-	body.AddChild(childOne)
-	bodyStr := body.BuildXML()
-	//请求
-	request, _ := http.NewRequest("POST", "http://"+gatewayHost+ctlUrl,
-		strings.NewReader(bodyStr))
-	request.Header = header
-	request.Header.Set("Content-Length", strconv.Itoa(len([]byte(bodyStr))))
-	return request
-}
-
-func (n *Node) AddChild(node Node) {
-	n.Child = append(n.Child, node)
-}
-
-func (n *Node) BuildXML() string {
-	buf := bytes.NewBufferString("<")
-	buf.WriteString(n.Name)
-	for key, value := range n.Attr {
-		buf.WriteString(" ")
-		buf.WriteString(key + "=" + value)
-	}
-	buf.WriteString(">" + n.Content)
-
-	for _, node := range n.Child {
-		buf.WriteString(node.BuildXML())
-	}
-	buf.WriteString("</" + n.Name + ">")
-	return buf.String()
-}
-
-func (n *Upnp)DelPortMapping(remotePort int, protocol string) bool {
-	issuccess := delSendSend(remotePort, protocol,n.GatewayHost,n.CtrlUrl)
-	if issuccess {
-		//this.MappingPort.delMapping(remotePort, protocol)
-		//fmt.Println("删除了一个端口映射： remote:", remotePort)
-	}
-	return issuccess
-}
-
-func delSendSend(remotePort int, protocol,host,ctlUrl string) bool {
-	delrequest := delbuildRequest(remotePort, protocol,host,ctlUrl)
-	response, _ := http.DefaultClient.Do(delrequest)
-	//resultBody, _ := ioutil.ReadAll(response.Body)
-	defer response.Body.Close()
-	if response.StatusCode == 200 {
-		// log.Println(string(resultBody))
-		return true
-	}
-	return false
-}
-func delbuildRequest(remotePort int, protocol,host,ctlUrl string) *http.Request {
-	//请求头
-	header := http.Header{}
-	header.Set("Accept", "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2")
-	header.Set("SOAPAction", `"urn:schemas-upnp-org:service:WANIPConnection:1#DeletePortMapping"`)
-	header.Set("Content-Type", "text/xml")
-	header.Set("Connection", "Close")
-	header.Set("Content-Length", "")
-	//请求体
-	body := Node{Name: "SOAP-ENV:Envelope",
-		Attr: map[string]string{"xmlns:SOAP-ENV": `"http://schemas.xmlsoap.org/soap/envelope/"`,
-			"SOAP-ENV:encodingStyle": `"http://schemas.xmlsoap.org/soap/encoding/"`}}
-	childOne := Node{Name: `SOAP-ENV:Body`}
-	childTwo := Node{Name: `m:DeletePortMapping`,
-		Attr: map[string]string{"xmlns:m": `"urn:schemas-upnp-org:service:WANIPConnection:1"`}}
-	childList1 := Node{Name: "NewExternalPort", Content: strconv.Itoa(remotePort)}
-	childList2 := Node{Name: "NewProtocol", Content: protocol}
-	childList3 := Node{Name: "NewRemoteHost"}
-	childTwo.AddChild(childList1)
-	childTwo.AddChild(childList2)
-	childTwo.AddChild(childList3)
-	childOne.AddChild(childTwo)
-	body.AddChild(childOne)
-	bodyStr := body.BuildXML()
-
-	//请求
-	request, _ := http.NewRequest("POST", "http://"+host+ctlUrl,
-		strings.NewReader(bodyStr))
-	request.Header = header
-	request.Header.Set("Content-Length", strconv.Itoa(len([]byte(bodyStr))))
-	return request
-}

pkg/upnp/mapping_test.go

@@ -1,7 +0,0 @@
-package upnp
-
-import "testing"
-
-func TestAddPortMapping(t *testing.T) {
-	//AddPortMapping(6666,6666,"TCP","192.168.2.1：5000",)
-}

pkg/upnp/upnp.go

@@ -1,26 +0,0 @@
-package upnp
-
-import (
-	"fmt"
-	"github.com/prestonTao/upnp"
-)
-
-type Upnp struct {
-	LocalHost     string `json:"local_host"`
-	GatewayName   string `json:"gateway_name"` //网关名称
-	GatewayHost   string `json:"gateway_host"` //网关ip和端口
-	DeviceDescUrl string `json:"device_desc_url"` //设备描述url
-	CtrlUrl       string `json:"ctrl_url"` //控制请求url
-}
-
-func Testaaa() {
-	upnpMan := new(upnp.Upnp)
-	err := upnpMan.SearchGateway()
-	if err != nil {
-		fmt.Println(err.Error())
-	} else {
-		fmt.Println("local ip address: ", upnpMan.LocalHost)
-		fmt.Println("gateway ip address: ", upnpMan.Gateway.Host)
-	}
-}
-

pkg/upnp/upnp_test.go

@@ -1,9 +0,0 @@
-package upnp
-
-import (
-	"testing"
-)
-
-func TestTestaaa(t *testing.T) {
-	(Testaaa())
-}

pkg/utils/command/command_helper.go

@@ -2,9 +2,11 @@ package command
 
 import (
 	"bufio"
+	"context"
 	"fmt"
 	"io/ioutil"
 	"os/exec"
+	"time"
 )
 
 func OnlyExec(cmdStr string) {
@@ -75,6 +77,7 @@ func ExecResultStr(cmdStr string) string {
 func ExecLSBLK() []byte {
 	output, err := exec.Command("lsblk", "-O", "-J", "-b").Output()
 	if err != nil {
+		fmt.Println("lsblk", err)
 		return nil
 	}
 	return output
@@ -84,7 +87,26 @@ func ExecLSBLK() []byte {
 func ExecLSBLKByPath(path string) []byte {
 	output, err := exec.Command("lsblk", path, "-O", "-J", "-b").Output()
 	if err != nil {
+		fmt.Println("lsblk", err)
 		return nil
 	}
 	return output
 }
+
+//exec smart
+func ExecSmartCTLByPath(path string) []byte {
+	timeout := 3
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(timeout)*time.Second)
+	defer cancel()
+	output, err := exec.CommandContext(ctx, "smartctl", "-a", path, "-j").Output()
+	if err != nil {
+		fmt.Println("smartctl", err)
+		return nil
+	}
+	return output
+}
+
+func ExecEnabledSMART(path string) {
+
+	exec.Command("smartctl", "-s on", path).Output()
+}

pkg/utils/common_err/e.go

@@ -0,0 +1,127 @@
+package common_err
+
+const (
+	SUCCESS          = 200
+	ERROR            = 500
+	INVALID_PARAMS   = 400
+	ERROR_AUTH_TOKEN = 401
+
+	//user
+	PWD_INVALID              = 10001
+	PWD_IS_EMPTY             = 10002
+	PWD_INVALID_OLD          = 10003
+	ACCOUNT_LOCK             = 10004
+	PWD_IS_TOO_SIMPLE        = 10005
+	USER_NOT_EXIST           = 10006
+	USER_EXIST               = 10007
+	KEY_NOT_EXIST            = 10008
+	NOT_IMAGE                = 10009
+	IMAGE_TOO_LARGE          = 10010
+	INSUFFICIENT_PERMISSIONS = 10011
+
+	//system
+	DIR_ALREADY_EXISTS              = 20001
+	FILE_ALREADY_EXISTS             = 20002
+	FILE_OR_DIR_EXISTS              = 20003
+	PORT_IS_OCCUPIED                = 20004
+	COMMAND_ERROR_INVALID_OPERATION = 20005
+	VERIFICATION_FAILURE            = 20006
+
+	//disk
+	NAME_NOT_AVAILABLE       = 40001
+	DISK_NEEDS_FORMAT        = 40002
+	DISK_BUSYING             = 40003
+	REMOVE_MOUNT_POINT_ERROR = 40004
+	FORMAT_ERROR             = 40005
+
+	//app
+	UNINSTALL_APP_ERROR  = 50001
+	PULL_IMAGE_ERROR     = 50002
+	DEVICE_NOT_EXIST     = 50003
+	ERROR_APP_NAME_EXIST = 50004
+
+	//file
+	FILE_DOES_NOT_EXIST = 60001
+	FILE_READ_ERROR     = 60002
+	FILE_DELETE_ERROR   = 60003
+	DIR_NOT_EXISTS      = 60004
+	SOURCE_DES_SAME     = 60005
+
+	//shortcuts
+	SHORTCUTS_URL_ERROR = 70001
+
+	//person
+	PERSON_REMOTE_ERROR   = 80001
+	PERSON_DOWN_NOT_EXIST = 80002
+	PERSON_EXIST_DOWNLOAD = 80003
+	PERSON_NOT_EXIST_USER = 80004
+	PERSON_EXIST_FRIEND   = 80005
+	PERSON_MYSELF         = 80006
+)
+
+var MsgFlags = map[int]string{
+	SUCCESS:          "ok",
+	ERROR:            "fail",
+	INVALID_PARAMS:   "Parameters Error",
+	ERROR_AUTH_TOKEN: "Error auth token",
+
+	//user
+	PWD_INVALID:              "Invalid password",
+	PWD_IS_EMPTY:             "Password is empty",
+	PWD_INVALID_OLD:          "Invalid old password",
+	ACCOUNT_LOCK:             "Account is locked",
+	PWD_IS_TOO_SIMPLE:        "Password is too simple",
+	USER_NOT_EXIST:           "User does not exist",
+	USER_EXIST:               "User already exists",
+	KEY_NOT_EXIST:            "Key does not exist",
+	IMAGE_TOO_LARGE:          "Image is too large",
+	NOT_IMAGE:                "Not an image",
+	INSUFFICIENT_PERMISSIONS: "Insufficient permissions",
+
+	//system
+	DIR_ALREADY_EXISTS:   "Folder already exists",
+	FILE_ALREADY_EXISTS:  "File already exists",
+	FILE_OR_DIR_EXISTS:   "File or folder already exists",
+	PORT_IS_OCCUPIED:     "Port is occupied",
+	VERIFICATION_FAILURE: "Verification failure",
+
+	//app
+	UNINSTALL_APP_ERROR:  "Error uninstalling app",
+	PULL_IMAGE_ERROR:     "Error pulling image",
+	DEVICE_NOT_EXIST:     "Device does not exist",
+	ERROR_APP_NAME_EXIST: "App name already exists",
+
+	//disk
+	NAME_NOT_AVAILABLE:       "Name not available",
+	DISK_NEEDS_FORMAT:        "Drive needs to be formatted",
+	REMOVE_MOUNT_POINT_ERROR: "Failed to remove mount point",
+	DISK_BUSYING:             "Drive is busy",
+	FORMAT_ERROR:             "Formatting failed, please check if the directory is occupied",
+
+	//
+	SOURCE_DES_SAME:     "Source and destination cannot be the same.",
+	FILE_DOES_NOT_EXIST: "File does not exist",
+
+	DIR_NOT_EXISTS: "Directory does not exist",
+
+	FILE_READ_ERROR:     "File read error",
+	FILE_DELETE_ERROR:   "Delete error",
+	SHORTCUTS_URL_ERROR: "URL error",
+
+	PERSON_REMOTE_ERROR:             "Remote connection error",
+	PERSON_DOWN_NOT_EXIST:           "Download record does not exist",
+	PERSON_EXIST_DOWNLOAD:           "The same download task exists",
+	PERSON_EXIST_FRIEND:             "Friend already exist",
+	PERSON_NOT_EXIST_USER:           "User does not exist",
+	PERSON_MYSELF:                   "You can not add yourself",
+	COMMAND_ERROR_INVALID_OPERATION: "invalid operation",
+}
+
+//获取错误信息
+func GetMsg(code int) string {
+	msg, ok := MsgFlags[code]
+	if ok {
+		return msg
+	}
+	return MsgFlags[ERROR]
+}

pkg/utils/encryption/md5_helper.go

@@ -0,0 +1,22 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-06-14 14:33:25
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-06-14 14:33:49
+ * @FilePath: /CasaOS/pkg/utils/encryption/md5_helper.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package encryption
+
+import (
+	"crypto/md5"
+	"encoding/hex"
+)
+
+func GetMD5ByStr(str string) string {
+	h := md5.New()
+	h.Write([]byte(str))
+	return hex.EncodeToString(h.Sum(nil))
+}

pkg/utils/env_helper/env.go

@@ -0,0 +1,26 @@
+package env_helper
+
+import "strings"
+
+func ReplaceDefaultENV(key, tz string) string {
+	temp := ""
+	switch key {
+	case "$DefaultPassword":
+		temp = "casaos"
+	case "$DefaultUserName":
+		temp = "admin"
+
+	case "$PUID":
+		temp = "1000"
+	case "$PGID":
+		temp = "1000"
+	case "$TZ":
+		temp = tz
+	}
+	return temp
+}
+
+//replace env default setting
+func ReplaceStringDefaultENV(str string) string {
+	return strings.ReplaceAll(strings.ReplaceAll(str, "$DefaultPassword", ReplaceDefaultENV("$DefaultPassword", "")), "$DefaultUserName", ReplaceDefaultENV("$DefaultUserName", ""))
+}

pkg/utils/file/block.go

@@ -0,0 +1,81 @@
+package file
+
+import (
+	"crypto/md5"
+	"encoding/hex"
+	"io"
+	"math"
+	"os"
+	"strconv"
+)
+
+// Get info of block
+func GetBlockInfo(fileSize int64) (blockSize int, length int) {
+	switch {
+	case fileSize <= 1<<28: //256M
+		blockSize = 1 << 17 //128kb
+	case fileSize <= 1<<29: //512M
+		blockSize = 1 << 18 //256kb
+	case fileSize <= 1<<30: //1G
+		blockSize = 1 << 19 //512kb
+	case fileSize <= 1<<31: //2G
+		blockSize = 1 << 20 //(mb)
+	case fileSize <= 1<<32: //4G
+		blockSize = 1 << 21 //2mb
+	case fileSize <= 1<<33: //8G
+		blockSize = 1 << 22 //4mb
+	case fileSize <= 1<<34: //16g
+		blockSize = 1 << 23 //8mb
+	default:
+		blockSize = 1 << 24 //16mb
+	}
+	temp := float64(fileSize) / float64(blockSize)
+	length = int(math.Ceil(temp))
+	return
+}
+
+//get the hash of the data
+func GetHashByContent(data []byte) string {
+	sum := md5.Sum(data)
+	return hex.EncodeToString(sum[:])
+}
+
+//get the hash of the data
+func GetHashByPath(path string) string {
+	pFile, err := os.Open(path)
+	if err != nil {
+		return ""
+	}
+	defer pFile.Close()
+	md5h := md5.New()
+	io.Copy(md5h, pFile)
+	return hex.EncodeToString(md5h.Sum(nil))
+}
+
+//Comparison data hash
+func ComparisonHash(data []byte, hash string) bool {
+	sum := md5.Sum(data)
+	return hex.EncodeToString(sum[:]) == hash
+}
+
+//get prefix byte length
+func PrefixLength(byteLength int) []byte {
+	lengthByte := []byte{'0', '0', '0', '0', '0', '0'}
+	bSize := strconv.Itoa(byteLength)
+	cha := 6 - len(bSize)
+	for i := len(bSize); i > 0; i-- {
+		lengthByte[cha+i-1] = bSize[i-1]
+	}
+	return lengthByte
+}
+
+//get data byte length
+func DataLength(length int) []byte {
+	lengthByte := []byte{'0', '0', '0', '0', '0', '0', '0', '0'}
+	bSize := strconv.Itoa(length)
+	cha := 8 - len(bSize)
+	for i := len(bSize); i > 0; i-- {
+		lengthByte[cha+i-1] = bSize[i-1]
+	}
+	return lengthByte
+}

pkg/utils/file/file.go

@@ -1,11 +1,21 @@
 package file
 
 import (
+	"bufio"
+	"errors"
 	"fmt"
+	"io"
 	"io/ioutil"
+	"log"
 	"mime/multipart"
 	"os"
 	"path"
+	path2 "path"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	"github.com/mholt/archiver/v3"
 )
 
 // GetSize get the file size
@@ -35,7 +45,7 @@ func CheckPermission(src string) bool {
 
 // IsNotExistMkDir create a directory if it does not exist
 func IsNotExistMkDir(src string) error {
-	if notExist := CheckNotExist(src); notExist == true {
+	if notExist := CheckNotExist(src); notExist {
 		if err := MkDir(src); err != nil {
 			return err
 		}
@@ -50,6 +60,7 @@ func MkDir(src string) error {
 	if err != nil {
 		return err
 	}
+	os.Chmod(src, 0777)
 
 	return nil
 }
@@ -135,6 +146,21 @@ func CreateFile(path string) error {
 	return nil
 }
 
+func CreateFileAndWriteContent(path string, content string) error {
+	file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0666)
+	if err != nil {
+		return err
+	}
+
+	defer file.Close()
+	write := bufio.NewWriter(file)
+
+	write.WriteString(content)
+
+	write.Flush()
+	return nil
+}
+
 // IsNotExistMkDir create a directory if it does not exist
 func IsNotExistCreateFile(src string) error {
 	if notExist := CheckNotExist(src); notExist == true {
@@ -145,3 +171,379 @@ func IsNotExistCreateFile(src string) error {
 
 	return nil
 }
+
+func ReadFullFile(path string) []byte {
+	file, err := os.Open(path)
+	if err != nil {
+		return []byte("")
+	}
+	defer file.Close()
+	content, err := ioutil.ReadAll(file)
+	if err != nil {
+		return []byte("")
+	}
+	return content
+}
+
+// File copies a single file from src to dst
+func CopyFile(src, dst, style string) error {
+	var err error
+	var srcfd *os.File
+	var dstfd *os.File
+	var srcinfo os.FileInfo
+
+	lastPath := src[strings.LastIndex(src, "/")+1:]
+
+	if !strings.HasSuffix(dst, "/") {
+		dst += "/"
+	}
+	dst += lastPath
+	if Exists(dst) {
+		if style == "skip" {
+			return nil
+		} else {
+			os.Remove(dst)
+		}
+	}
+
+	if srcfd, err = os.Open(src); err != nil {
+		return err
+	}
+	defer srcfd.Close()
+
+	if dstfd, err = os.Create(dst); err != nil {
+		return err
+	}
+	defer dstfd.Close()
+
+	if _, err = io.Copy(dstfd, srcfd); err != nil {
+		return err
+	}
+	if srcinfo, err = os.Stat(src); err != nil {
+		return err
+	}
+	return os.Chmod(dst, srcinfo.Mode())
+}
+
+/**
+ * @description:
+ * @param {*} src
+ * @param {*} dst
+ * @param {string} style
+ * @return {*}
+ * @method:
+ * @router:
+ */
+func CopySingleFile(src, dst, style string) error {
+	var err error
+	var srcfd *os.File
+	var dstfd *os.File
+	var srcinfo os.FileInfo
+
+	if Exists(dst) {
+		if style == "skip" {
+			return nil
+		} else {
+			os.Remove(dst)
+		}
+	}
+
+	if srcfd, err = os.Open(src); err != nil {
+		return err
+	}
+	defer srcfd.Close()
+
+	if dstfd, err = os.Create(dst); err != nil {
+		return err
+	}
+	defer dstfd.Close()
+
+	if _, err = io.Copy(dstfd, srcfd); err != nil {
+		return err
+	}
+	if srcinfo, err = os.Stat(src); err != nil {
+		return err
+	}
+	return os.Chmod(dst, srcinfo.Mode())
+}
+
+//Check for duplicate file names
+func GetNoDuplicateFileName(fullPath string) string {
+	path, fileName := filepath.Split(fullPath)
+	fileSuffix := path2.Ext(fileName)
+	filenameOnly := strings.TrimSuffix(fileName, fileSuffix)
+	for i := 0; Exists(fullPath); i++ {
+		fullPath = path2.Join(path, filenameOnly+"("+strconv.Itoa(i+1)+")"+fileSuffix)
+	}
+	return fullPath
+}
+
+// Dir copies a whole directory recursively
+func CopyDir(src string, dst string, style string) error {
+	var err error
+	var fds []os.FileInfo
+	var srcinfo os.FileInfo
+
+	if srcinfo, err = os.Stat(src); err != nil {
+		return err
+	}
+	if !srcinfo.IsDir() {
+		if err = CopyFile(src, dst, style); err != nil {
+			fmt.Println(err)
+		}
+		return nil
+	}
+	//dstPath := dst
+	lastPath := src[strings.LastIndex(src, "/")+1:]
+	dst += "/" + lastPath
+	// for i := 0; Exists(dst); i++ {
+	// 	dst = dstPath + "/" + lastPath + strconv.Itoa(i+1)
+	// }
+	if Exists(dst) {
+		if style == "skip" {
+			return nil
+		} else {
+			os.Remove(dst)
+		}
+	}
+	if err = os.MkdirAll(dst, srcinfo.Mode()); err != nil {
+		return err
+	}
+	if fds, err = ioutil.ReadDir(src); err != nil {
+		return err
+	}
+	for _, fd := range fds {
+		srcfp := path.Join(src, fd.Name())
+		dstfp := dst //path.Join(dst, fd.Name())
+
+		if fd.IsDir() {
+			if err = CopyDir(srcfp, dstfp, style); err != nil {
+				fmt.Println(err)
+			}
+		} else {
+			if err = CopyFile(srcfp, dstfp, style); err != nil {
+				fmt.Println(err)
+			}
+		}
+	}
+	return nil
+}
+
+func WriteToPath(data []byte, path, name string) error {
+	fullPath := path
+	if strings.HasSuffix(path, "/") {
+		fullPath += name
+	} else {
+		fullPath += "/" + name
+	}
+	IsNotExistCreateFile(fullPath)
+	file, err := os.OpenFile(fullPath,
+		os.O_WRONLY|os.O_TRUNC|os.O_CREATE,
+		0666,
+	)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+	_, err = file.Write(data)
+
+	return err
+}
+
+//最终拼接
+func SpliceFiles(dir, path string, length int, startPoint int) error {
+
+	fullPath := path
+
+	IsNotExistCreateFile(fullPath)
+
+	file, _ := os.OpenFile(fullPath,
+		os.O_WRONLY|os.O_TRUNC|os.O_CREATE,
+		0666,
+	)
+	defer file.Close()
+	bufferedWriter := bufio.NewWriter(file)
+	for i := 0; i < length+startPoint; i++ {
+		data, err := ioutil.ReadFile(dir + "/" + strconv.Itoa(i+startPoint))
+		if err != nil {
+			return err
+		}
+		_, err = bufferedWriter.Write(data)
+		if err != nil {
+			return err
+		}
+	}
+
+	bufferedWriter.Flush()
+
+	return nil
+}
+
+func GetCompressionAlgorithm(t string) (string, archiver.Writer, error) {
+
+	switch t {
+	case "zip", "":
+		return ".zip", archiver.NewZip(), nil
+	case "tar":
+		return ".tar", archiver.NewTar(), nil
+	case "targz":
+		return ".tar.gz", archiver.NewTarGz(), nil
+	case "tarbz2":
+		return ".tar.bz2", archiver.NewTarBz2(), nil
+	case "tarxz":
+		return ".tar.xz", archiver.NewTarXz(), nil
+	case "tarlz4":
+		return ".tar.lz4", archiver.NewTarLz4(), nil
+	case "tarsz":
+		return ".tar.sz", archiver.NewTarSz(), nil
+	default:
+		return "", nil, errors.New("format not implemented")
+	}
+}
+func AddFile(ar archiver.Writer, path, commonPath string) error {
+
+	info, err := os.Stat(path)
+	if err != nil {
+		return err
+	}
+
+	if !info.IsDir() && !info.Mode().IsRegular() {
+		return nil
+	}
+
+	file, err := os.Open(path)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+
+	if path != commonPath {
+		filename := info.Name()
+		err = ar.Write(archiver.File{
+			FileInfo: archiver.FileInfo{
+				FileInfo:   info,
+				CustomName: filename,
+			},
+			ReadCloser: file,
+		})
+		if err != nil {
+			return err
+		}
+	}
+
+	if info.IsDir() {
+		names, err := file.Readdirnames(0)
+		if err != nil {
+			return err
+		}
+
+		for _, name := range names {
+			err = AddFile(ar, filepath.Join(path, name), commonPath)
+			if err != nil {
+				log.Printf("Failed to archive %v", err)
+			}
+		}
+	}
+
+	return nil
+}
+func CommonPrefix(sep byte, paths ...string) string {
+	// Handle special cases.
+	switch len(paths) {
+	case 0:
+		return ""
+	case 1:
+		return path.Clean(paths[0])
+	}
+
+	// Note, we treat string as []byte, not []rune as is often
+	// done in Go. (And sep as byte, not rune). This is because
+	// most/all supported OS' treat paths as string of non-zero
+	// bytes. A filename may be displayed as a sequence of Unicode
+	// runes (typically encoded as UTF-8) but paths are
+	// not required to be valid UTF-8 or in any normalized form
+	// (e.g. "é" (U+00C9) and "é" (U+0065,U+0301) are different
+	// file names.
+	c := []byte(path.Clean(paths[0]))
+
+	// We add a trailing sep to handle the case where the
+	// common prefix directory is included in the path list
+	// (e.g. /home/user1, /home/user1/foo, /home/user1/bar).
+	// path.Clean will have cleaned off trailing / separators with
+	// the exception of the root directory, "/" (in which case we
+	// make it "//", but this will get fixed up to "/" bellow).
+	c = append(c, sep)
+
+	// Ignore the first path since it's already in c
+	for _, v := range paths[1:] {
+		// Clean up each path before testing it
+		v = path.Clean(v) + string(sep)
+
+		// Find the first non-common byte and truncate c
+		if len(v) < len(c) {
+			c = c[:len(v)]
+		}
+		for i := 0; i < len(c); i++ {
+			if v[i] != c[i] {
+				c = c[:i]
+				break
+			}
+		}
+	}
+
+	// Remove trailing non-separator characters and the final separator
+	for i := len(c) - 1; i >= 0; i-- {
+		if c[i] == sep {
+			c = c[:i]
+			break
+		}
+	}
+
+	return string(c)
+}
+
+func GetFileOrDirSize(path string) (int64, error) {
+	fileInfo, err := os.Stat(path)
+	if err != nil {
+		return 0, err
+	}
+	if fileInfo.IsDir() {
+		return DirSizeB(path + "/")
+	}
+	return fileInfo.Size(), nil
+}
+
+//getFileSize get file size by path(B)
+func DirSizeB(path string) (int64, error) {
+	var size int64
+	err := filepath.Walk(path, func(_ string, info os.FileInfo, err error) error {
+		if !info.IsDir() {
+			size += info.Size()
+		}
+		return err
+	})
+	return size, err
+}
+
+func MoveFile(sourcePath, destPath string) error {
+	inputFile, err := os.Open(sourcePath)
+	if err != nil {
+		return fmt.Errorf("Couldn't open source file: %s", err)
+	}
+	outputFile, err := os.Create(destPath)
+	if err != nil {
+		inputFile.Close()
+		return fmt.Errorf("Couldn't open dest file: %s", err)
+	}
+	defer outputFile.Close()
+	_, err = io.Copy(outputFile, inputFile)
+	inputFile.Close()
+	if err != nil {
+		return fmt.Errorf("Writing to output file failed: %s", err)
+	}
+	err = os.Remove(sourcePath)
+	if err != nil {
+		return fmt.Errorf("Failed removing original file: %s", err)
+	}
+	return nil
+}

pkg/utils/file/image.go

@@ -0,0 +1,261 @@
+package file
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/disintegration/imaging"
+	"github.com/dsoprea/go-exif/v3"
+	exifcommon "github.com/dsoprea/go-exif/v3/common"
+)
+
+func GetImage(path string, width, height int) ([]byte, error) {
+	if thumbnail, err := GetThumbnailByOwnerPhotos(path); err == nil {
+		return thumbnail, nil
+	} else {
+		return GetThumbnailByWebPhoto(path, width, height)
+	}
+}
+func GetThumbnailByOwnerPhotos(path string) ([]byte, error) {
+	file, err := os.Open(path)
+	if err != nil {
+		return nil, err
+	}
+	buff := &bytes.Buffer{}
+
+	defer file.Close()
+	offset := 0
+	offsets := []int{12, 30}
+
+	head := make([]byte, 0xffff)
+
+	r := io.TeeReader(file, buff)
+	_, err = r.Read(head)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, offset = range offsets {
+		if _, err = exif.ParseExifHeader(head[offset:]); err == nil {
+			break
+		}
+	}
+	if err != nil {
+		return nil, err
+	}
+	im, err := exifcommon.NewIfdMappingWithStandard()
+	if err != nil {
+		return nil, err
+	}
+
+	_, index, err := exif.Collect(im, exif.NewTagIndex(), head[offset:])
+	if err != nil {
+		return nil, err
+	}
+
+	ifd := index.RootIfd.NextIfd()
+	if ifd == nil {
+		return nil, exif.ErrNoThumbnail
+	}
+	thumbnail, err := ifd.Thumbnail()
+	if err != nil {
+		return nil, err
+	}
+	return thumbnail, nil
+}
+func GetThumbnailByWebPhoto(path string, width, height int) ([]byte, error) {
+	src, err := imaging.Open(path)
+	if err != nil {
+		fmt.Println(err)
+		return nil, err
+	}
+
+	img := imaging.Resize(src, width, 0, imaging.Lanczos)
+
+	f, err := imaging.FormatFromFilename(path)
+	if err != nil {
+		return nil, err
+	}
+	buf := bytes.Buffer{}
+	imaging.Encode(&buf, img, f)
+	return buf.Bytes(), nil
+}
+
+func ImageExtArray() []string {
+
+	ext := []string{
+		"ase",
+		"art",
+		"bmp",
+		"blp",
+		"cd5",
+		"cit",
+		"cpt",
+		"cr2",
+		"cut",
+		"dds",
+		"dib",
+		"djvu",
+		"egt",
+		"exif",
+		"gif",
+		"gpl",
+		"grf",
+		"icns",
+		"ico",
+		"iff",
+		"jng",
+		"jpeg",
+		"jpg",
+		"jfif",
+		"jp2",
+		"jps",
+		"lbm",
+		"max",
+		"miff",
+		"mng",
+		"msp",
+		"nitf",
+		"ota",
+		"pbm",
+		"pc1",
+		"pc2",
+		"pc3",
+		"pcf",
+		"pcx",
+		"pdn",
+		"pgm",
+		"PI1",
+		"PI2",
+		"PI3",
+		"pict",
+		"pct",
+		"pnm",
+		"pns",
+		"ppm",
+		"psb",
+		"psd",
+		"pdd",
+		"psp",
+		"px",
+		"pxm",
+		"pxr",
+		"qfx",
+		"raw",
+		"rle",
+		"sct",
+		"sgi",
+		"rgb",
+		"int",
+		"bw",
+		"tga",
+		"tiff",
+		"tif",
+		"vtf",
+		"xbm",
+		"xcf",
+		"xpm",
+		"3dv",
+		"amf",
+		"ai",
+		"awg",
+		"cgm",
+		"cdr",
+		"cmx",
+		"dxf",
+		"e2d",
+		"egt",
+		"eps",
+		"fs",
+		"gbr",
+		"odg",
+		"svg",
+		"stl",
+		"vrml",
+		"x3d",
+		"sxd",
+		"v2d",
+		"vnd",
+		"wmf",
+		"emf",
+		"art",
+		"xar",
+		"png",
+		"webp",
+		"jxr",
+		"hdp",
+		"wdp",
+		"cur",
+		"ecw",
+		"iff",
+		"lbm",
+		"liff",
+		"nrrd",
+		"pam",
+		"pcx",
+		"pgf",
+		"sgi",
+		"rgb",
+		"rgba",
+		"bw",
+		"int",
+		"inta",
+		"sid",
+		"ras",
+		"sun",
+		"tga",
+	}
+
+	return ext
+}
+
+/**
+* @description:get a image's ext
+* @param {string} path "file path"
+* @return {string} ext "file ext"
+* @return {error} err "error info"
+ */
+func GetImageExt(p string) (string, error) {
+	file, err := os.Open(p)
+	if err != nil {
+		return "", err
+	}
+
+	buff := make([]byte, 512)
+
+	_, err = file.Read(buff)
+
+	if err != nil {
+		return "", err
+	}
+
+	filetype := http.DetectContentType(buff)
+
+	ext := ImageExtArray()
+
+	for i := 0; i < len(ext); i++ {
+		if strings.Contains(ext[i], filetype[6:]) {
+			return ext[i], nil
+		}
+	}
+
+	return "", errors.New("invalid image type")
+}
+
+func GetImageExtByName(p string) (string, error) {
+
+	extArr := ImageExtArray()
+	ext := filepath.Ext(p)
+	for i := 0; i < len(extArr); i++ {
+		if strings.Contains(ext, extArr[i]) {
+			return extArr[i], nil
+		}
+	}
+	return "", errors.New("invalid image type")
+}

pkg/utils/file/reader.go

@@ -0,0 +1,176 @@
+package file
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"os"
+)
+
+var (
+	buffSize = 1 << 20
+)
+
+// ReadLineFromEnd --
+type ReadLineFromEnd struct {
+	f *os.File
+
+	fileSize int
+	bwr      *bytes.Buffer
+	lineBuff []byte
+	swapBuff []byte
+
+	isFirst bool
+}
+
+// NewReadLineFromEnd --
+func NewReadLineFromEnd(name string) (rd *ReadLineFromEnd, err error) {
+	f, err := os.Open(name)
+	if err != nil {
+		return nil, err
+	}
+	info, err := f.Stat()
+	if info.IsDir() {
+		return nil, fmt.Errorf("not file")
+	}
+	fileSize := int(info.Size())
+	rd = &ReadLineFromEnd{
+		f:        f,
+		fileSize: fileSize,
+		bwr:      bytes.NewBuffer([]byte{}),
+		lineBuff: make([]byte, 0),
+		swapBuff: make([]byte, buffSize),
+		isFirst:  true,
+	}
+	return rd, nil
+}
+
+// ReadLine 结尾包含'\n'
+func (c *ReadLineFromEnd) ReadLine() (line []byte, err error) {
+	var ok bool
+	for {
+		ok, err = c.buff()
+		if err != nil {
+			return nil, err
+		}
+		if ok {
+			break
+		}
+	}
+	line, err = c.bwr.ReadBytes('\n')
+	if err == io.EOF && c.fileSize > 0 {
+		err = nil
+	}
+	return line, err
+}
+
+// Close --
+func (c *ReadLineFromEnd) Close() (err error) {
+	return c.f.Close()
+}
+
+func (c *ReadLineFromEnd) buff() (ok bool, err error) {
+	if c.fileSize == 0 {
+		return true, nil
+	}
+
+	if c.bwr.Len() >= buffSize {
+		return true, nil
+	}
+
+	offset := 0
+	if c.fileSize > buffSize {
+		offset = c.fileSize - buffSize
+	}
+	_, err = c.f.Seek(int64(offset), 0)
+	if err != nil {
+		return false, err
+	}
+
+	n, err := c.f.Read(c.swapBuff)
+	if err != nil && err != io.EOF {
+		return false, err
+	}
+	if c.fileSize < n {
+		n = c.fileSize
+	}
+	if n == 0 {
+		return true, nil
+	}
+
+	for {
+		m := bytes.LastIndex(c.swapBuff[:n], []byte{'\n'})
+		if m == -1 {
+			break
+		}
+		if m < n-1 {
+			err = c.writeLine(c.swapBuff[m+1 : n])
+			if err != nil {
+				return false, err
+			}
+			ok = true
+		} else if m == n-1 && !c.isFirst {
+			err = c.writeLine(nil)
+			if err != nil {
+				return false, err
+			}
+			ok = true
+		}
+		n = m
+		if n == 0 {
+			break
+		}
+	}
+	if n > 0 {
+		reverseBytes(c.swapBuff[:n])
+		c.lineBuff = append(c.lineBuff, c.swapBuff[:n]...)
+	}
+	if offset == 0 {
+		err = c.writeLine(nil)
+		if err != nil {
+			return false, err
+		}
+		ok = true
+	}
+	c.fileSize = offset
+	if c.isFirst {
+		c.isFirst = false
+	}
+	return ok, nil
+}
+
+func (c *ReadLineFromEnd) writeLine(b []byte) (err error) {
+	if len(b) > 0 {
+		_, err = c.bwr.Write(b)
+		if err != nil {
+			return err
+		}
+	}
+	if len(c.lineBuff) > 0 {
+		reverseBytes(c.lineBuff)
+		_, err = c.bwr.Write(c.lineBuff)
+		if err != nil {
+			return err
+		}
+		c.lineBuff = c.lineBuff[:0]
+	}
+	_, err = c.bwr.Write([]byte{'\n'})
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func reverseBytes(b []byte) {
+	n := len(b)
+	if n <= 1 {
+		return
+	}
+	for i := 0; i < n; i++ {
+		k := n - 1
+		if k != i {
+			b[i], b[k] = b[k], b[i]
+		}
+		n--
+	}
+}

pkg/utils/httper/httper.go

@@ -2,25 +2,62 @@ package httper
 
 import (
 	"bytes"
-	"encoding/json"
-	"github.com/IceWhaleTech/CasaOS/pkg/config"
-	"github.com/tidwall/gjson"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"time"
+
+	"github.com/IceWhaleTech/CasaOS/pkg/config"
+	"github.com/tidwall/gjson"
 )
 
 //发送GET请求
 //url:请求地址
 //response:请求返回的内容
 func Get(url string, head map[string]string) (response string) {
-	client := http.Client{Timeout: 30 * time.Second}
+	client := &http.Client{Timeout: 30 * time.Second}
 	req, err := http.NewRequest("GET", url, nil)
-	req.BasicAuth()
+
 	for k, v := range head {
 		req.Header.Add(k, v)
 	}
+	if err != nil {
+		return ""
+	}
+	resp, err := client.Do(req)
+	if err != nil {
+		fmt.Println(err)
+		//需要错误日志的处理
+		//loger.Error(error)
+		return ""
+		//panic(error)
+	}
+	defer resp.Body.Close()
+	var buffer [512]byte
+	result := bytes.NewBuffer(nil)
+	for {
+		n, err := resp.Body.Read(buffer[0:])
+		result.Write(buffer[0:n])
+		if err != nil && err == io.EOF {
+			break
+		} else if err != nil {
+			//loger.Error(err)
+			return ""
+			//	panic(err)
+		}
+	}
+	response = result.String()
+	return
+}
+
+//发送GET请求
+//url:请求地址
+//response:请求返回的内容
+func PersonGet(url string) (response string) {
+	client := &http.Client{Timeout: 5 * time.Second}
+	req, err := http.NewRequest("GET", url, nil)
+
 	if err != nil {
 		return ""
 	}
@@ -52,10 +89,13 @@ func Get(url string, head map[string]string) (response string) {
 //发送POST请求
 //url:请求地址，data:POST请求提交的数据,contentType:请求体格式，如：application/json
 //content:请求放回的内容
-func Post(url string, data interface{}, contentType string) (content string) {
-	jsonStr, _ := json.Marshal(data)
-	req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonStr))
+func Post(url string, data []byte, contentType string, head map[string]string) (content string) {
+
+	req, err := http.NewRequest("POST", url, bytes.NewBuffer(data))
 	req.Header.Add("content-type", contentType)
+	for k, v := range head {
+		req.Header.Add(k, v)
+	}
 	if err != nil {
 		panic(err)
 	}
@@ -63,7 +103,8 @@ func Post(url string, data interface{}, contentType string) (content string) {
 	client := &http.Client{Timeout: 5 * time.Second}
 	resp, error := client.Do(req)
 	if error != nil {
-		panic(error)
+		fmt.Println(error)
+		return
 	}
 	defer resp.Body.Close()
 
@@ -72,88 +113,6 @@ func Post(url string, data interface{}, contentType string) (content string) {
 	return
 }
 
-//发送POST请求
-//url:请求地址，data:POST请求提交的数据,contentType:请求体格式，如：application/json
-//content:请求放回的内容
-func ZeroTierPost(url string, data map[string]string, head map[string]string, cookies []*http.Cookie) (content string, code int) {
-	b, _ := json.Marshal(data)
-	req, err := http.NewRequest("POST", url, bytes.NewReader(b))
-	for _, cookie := range cookies {
-		req.AddCookie(cookie)
-	}
-	for k, v := range head {
-		req.Header.Add(k, v)
-	}
-	if err != nil {
-		panic(err)
-	}
-
-	client := &http.Client{Timeout: 20 * time.Second}
-	resp, error := client.Do(req)
-
-	if error != nil {
-		panic(error)
-	}
-	defer resp.Body.Close()
-	code = resp.StatusCode
-	result, _ := ioutil.ReadAll(resp.Body)
-	content = string(result)
-	return
-}
-
-//发送POST请求
-//url:请求地址，data:POST请求提交的数据,contentType:请求体格式，如：application/json
-//content:请求放回的内容
-func ZeroTierPostJson(url string, data string, head map[string]string) (content string, code int) {
-	var postData *bytes.Buffer
-
-	jsonStr := []byte(data)
-	postData = bytes.NewBuffer(jsonStr)
-
-	req, err := http.NewRequest("POST", url, postData)
-	for k, v := range head {
-		req.Header.Add(k, v)
-	}
-	if err != nil {
-		panic(err)
-	}
-
-	client := &http.Client{Timeout: 20 * time.Second}
-	resp, error := client.Do(req)
-
-	if error != nil {
-		panic(error)
-	}
-	defer resp.Body.Close()
-	result, _ := ioutil.ReadAll(resp.Body)
-	content = string(result)
-	code = resp.StatusCode
-	return
-}
-
-func ZeroTierDelete(url string, head map[string]string) (content string, code int) {
-
-	req, err := http.NewRequest("DELETE", url, nil)
-	for k, v := range head {
-		req.Header.Add(k, v)
-	}
-	if err != nil {
-		panic(err)
-	}
-
-	client := &http.Client{Timeout: 20 * time.Second}
-	resp, error := client.Do(req)
-
-	if error != nil {
-		panic(error)
-	}
-	defer resp.Body.Close()
-	result, _ := ioutil.ReadAll(resp.Body)
-	content = string(result)
-	code = resp.StatusCode
-	return
-}
-
 //发送POST请求
 //url:请求地址，data:POST请求提交的数据,contentType:请求体格式，如：application/json
 //content:请求放回的内容

pkg/utils/ini_helper.go

@@ -1 +0,0 @@
-package utils

pkg/utils/ip_helper/ip.go

@@ -1,9 +1,10 @@
 package ip_helper
 
 import (
-	httper2 "github.com/IceWhaleTech/CasaOS/pkg/utils/httper"
 	"net"
 	"strings"
+
+	httper2 "github.com/IceWhaleTech/CasaOS/pkg/utils/httper"
 )
 
 func IsIPv4(address string) bool {
@@ -39,3 +40,35 @@ func GetLoclIp() string {
 	}
 	return "127.0.0.1"
 }
+func GetDeviceAllIP(port string) []string {
+	var address []string
+	addrs, err := net.InterfaceAddrs()
+	if err != nil {
+		return address
+	}
+	for _, a := range addrs {
+		if ipNet, ok := a.(*net.IPNet); ok && !ipNet.IP.IsLoopback() {
+			if ipNet.IP.To16() != nil {
+				address = append(address, ipNet.IP.String()+":"+port)
+			}
+		}
+	}
+	return address
+}
+
+func HasLocalIP(ip net.IP) bool {
+	if ip.IsLoopback() {
+		return true
+	}
+	ip.String()
+
+	ip4 := ip.To4()
+	if ip4 == nil {
+		return false
+	}
+
+	return ip4[0] == 10 || // 10.0.0.0/8
+		(ip4[0] == 172 && ip4[1] >= 16 && ip4[1] <= 31) || // 172.16.0.0/12
+		(ip4[0] == 169 && ip4[1] == 254) || // 169.254.0.0/16
+		(ip4[0] == 192 && ip4[1] == 168) // 192.168.0.0/16
+}

pkg/utils/ip_helper/ip_test.go

@@ -2,6 +2,7 @@ package ip_helper
 
 import (
 	"fmt"
+	"net"
 	"testing"
 )
 
@@ -20,3 +21,7 @@ func TestGetExternalIPV6(t *testing.T) {
 func TestGetLoclIp(t *testing.T) {
 	fmt.Println(GetLoclIp())
 }
+func TestHasLocalIP(t *testing.T) {
+	fmt.Println("dddd")
+	fmt.Println(HasLocalIP(net.ParseIP("192.168.2.10")))
+}

pkg/utils/jwt/jwt.go

@@ -1,11 +1,65 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2021-09-30 18:18:14
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-06-24 10:02:46
+ * @FilePath: /CasaOS/pkg/utils/jwt/jwt.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
 package jwt
 
 import (
 	"time"
 
-	jwt "github.com/golang-jwt/jwt"
+	jwt "github.com/golang-jwt/jwt/v4"
 )
 
+// type Claims struct {
+// 	UserName string `json:"username"`
+// 	PassWord string `json:"password"`
+// 	Id       int    `json:"id"`
+// 	jwt.RegisteredClaims
+// }
+
+// var jwtSecret []byte
+
+// //创建token
+// func GenerateToken(username, password string, id int, issuer string, t time.Duration) (string, error) {
+// 	clims := Claims{
+// 		username,
+// 		password,
+// 		id,
+// 		jwt.RegisteredClaims{
+// 			ExpiresAt: jwt.NewNumericDate(time.Now().Add(t)),
+// 			IssuedAt:  jwt.NewNumericDate(time.Now()),
+// 			NotBefore: jwt.NewNumericDate(time.Now()),
+// 			Issuer:    issuer,
+// 		},
+// 	}
+
+// 	tokenClaims := jwt.NewWithClaims(jwt.SigningMethodHS256, clims)
+// 	token, err := tokenClaims.SignedString(jwtSecret)
+// 	return token, err
+
+// }
+
+// //解析token
+// func ParseToken(token string) (*Claims, error) {
+// 	tokenClaims, err := jwt.ParseWithClaims(token, &Claims{}, func(token *jwt.Token) (interface{}, error) {
+// 		return jwtSecret, nil
+// 	})
+// 	if tokenClaims != nil {
+// 		if clims, ok := tokenClaims.Claims.(*Claims); ok && tokenClaims.Valid {
+// 			return clims, nil
+// 		}
+// 	}
+// 	return nil, err
+// }
+
+//****************** soon to be removed ******************
+
 type Claims struct {
 	UserName string `json:"username"`
 	PassWord string `json:"password"`

pkg/utils/jwt/jwt_helper.go

@@ -1,39 +1,99 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-06-17 14:01:25
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-07-04 16:26:22
+ * @FilePath: /CasaOS/pkg/utils/jwt/jwt_helper.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
 package jwt
 
 import (
-	"fmt"
-	"github.com/IceWhaleTech/CasaOS/model"
-	loger2 "github.com/IceWhaleTech/CasaOS/pkg/utils/loger"
-	oasis_err2 "github.com/IceWhaleTech/CasaOS/pkg/utils/oasis_err"
-	"github.com/gin-gonic/gin"
 	"net/http"
+
+	"github.com/IceWhaleTech/CasaOS/model"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/common_err"
+	"github.com/gin-gonic/gin"
 )
 
-func JWT(swagHandler gin.HandlerFunc) gin.HandlerFunc {
+// func JWT() gin.HandlerFunc {
+// 	return func(c *gin.Context) {
+// 		var code int
+// 		code = common_err.SUCCESS
+// 		token := c.GetHeader("Authorization")
+// 		if len(token) == 0 {
+// 			token = c.Query("token")
+// 		}
+// 		if token == "" {
+// 			code = common_err.INVALID_PARAMS
+// 		}
+
+// 		claims, err := ParseToken(token)
+// 		//_, err := ParseToken(token)
+// 		if err != nil {
+// 			code = common_err.ERROR_AUTH_TOKEN
+// 		} else if !claims.VerifyExpiresAt(time.Now(), true) || !claims.VerifyIssuer("casaos", true) {
+// 			code = common_err.ERROR_AUTH_TOKEN
+// 		}
+// 		if code != common_err.SUCCESS {
+// 			c.JSON(code, model.Result{Success: code, Message: common_err.GetMsg(code)})
+// 			c.Abort()
+// 			return
+// 		}
+// 		c.Request.Header.Add("user_id", strconv.Itoa(claims.Id))
+// 		c.Next()
+// 	}
+// }
+
+// //get AccessToken
+// func GetAccessToken(username, pwd string, id int) string {
+// 	token, err := GenerateToken(username, pwd, id, "casaos", 3*time.Hour*time.Duration(1))
+// 	if err == nil {
+// 		return token
+// 	} else {
+// 		loger2.Error(fmt.Sprintf("Get Token Fail: %V", err))
+// 		return ""
+// 	}
+// }
+
+// func GetRefreshToken(username, pwd string, id int) string {
+// 	token, err := GenerateToken(username, pwd, id, "fresh", 7*24*time.Hour*time.Duration(1))
+// 	if err == nil {
+// 		return token
+// 	} else {
+// 		loger2.Error(fmt.Sprintf("Get Token Fail: %V", err))
+// 		return ""
+// 	}
+// }
+
+//*************** soon to be removed *****************
+
+func JWT() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		var code int
-		code = oasis_err2.SUCCESS
+		code = common_err.SUCCESS
 		token := c.GetHeader("Authorization")
 		if len(token) == 0 {
 			token = c.Query("token")
 		}
 		if token == "" {
-			code = oasis_err2.INVALID_PARAMS
-		}
-		if swagHandler == nil {
-			//claims, err := ParseToken(token)
-			_, err := ParseToken(token)
-			if err != nil {
-				code = oasis_err2.ERROR_AUTH_TOKEN
-
-			}
-			//else if time.Now().Unix() > claims.ExpiresAt {
-			//	code = oasis_err2.ERROR_AUTH_TOKEN
-			//}
+			code = common_err.INVALID_PARAMS
 		}
 
-		if code != oasis_err2.SUCCESS {
-			c.JSON(http.StatusOK, model.Result{Success: code, Message: oasis_err2.GetMsg(code)})
+		//claims, err := ParseToken(token)
+		_, err := ParseToken(token)
+		if err != nil {
+			code = common_err.ERROR_AUTH_TOKEN
+
+		}
+		//else if time.Now().Unix() > claims.ExpiresAt {
+		//	code = oasis_err2.ERROR_AUTH_TOKEN
+		//}
+
+		if code != common_err.SUCCESS {
+			c.JSON(http.StatusOK, model.Result{Success: code, Message: common_err.GetMsg(code)})
 			c.Abort()
 			return
 		}
@@ -47,7 +107,7 @@ func GetToken(username, pwd string) string {
 	if err == nil {
 		return token
 	} else {
-		loger2.NewOLoger().Fatal(fmt.Sprintf("Get Token Fail: %V", err))
+		//loger2.NewOLoger().Fatal(fmt.Sprintf("Get Token Fail: %V", err))
 		return ""
 	}
 }

pkg/utils/loger/log.go

@@ -1,102 +1,92 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-06-02 15:09:38
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-06-27 15:47:49
+ * @FilePath: /CasaOS/pkg/utils/loger/log.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
 package loger
 
 import (
 	"fmt"
-	"github.com/IceWhaleTech/CasaOS/pkg/config"
-	file2 "github.com/IceWhaleTech/CasaOS/pkg/utils/file"
-	"log"
 	"os"
+	"path"
 	"path/filepath"
 	"runtime"
-	"time"
+
+	"github.com/IceWhaleTech/CasaOS/pkg/config"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+	"gopkg.in/natefinch/lumberjack.v2"
 )
 
-//定义一个int的别名
-type Level int
+var loggers *zap.Logger
 
-type OLog interface {
-	Debug(v ...interface{})
-	Info(v ...interface{})
-	Warn(v ...interface{})
-	Error(v ...interface{})
-	Fatal(v ...interface{})
+func getFileLogWriter() (writeSyncer zapcore.WriteSyncer) {
+	// 使用 lumberjack 实现 log rotate
+	lumberJackLogger := &lumberjack.Logger{
+		Filename: filepath.Join(config.AppInfo.LogPath, fmt.Sprintf("%s.%s",
+			config.AppInfo.LogSaveName,
+			config.AppInfo.LogFileExt,
+		)),
+		MaxSize:    10,
+		MaxBackups: 60,
+		MaxAge:     1,
+		Compress:   true,
+	}
+
+	return zapcore.AddSync(lumberJackLogger)
 }
 
-type oLog struct {
-}
-
-var (
-	F                  *os.File
-	DefaultPrefix      = ""
-	DefaultCallerDepth = 2
-	logger             *log.Logger
-	logPrefix          = ""
-	levelFlags         = []string{"DEBUG", "INFO", "WARN", "ERROR", "FATAL"}
-)
-
-//iota在const关键字出现时将被重置为0(const内部的第一行之前)，const中每新增一行常量声明将使iota计数一次(iota可理解为const语句块中的行索引)。
-const (
-	DEBUG Level = iota
-	INFO
-	WARN
-	ERROR
-	FATAL
-)
-
-//日志初始化
-func LogSetup() {
-	var err error
-	filePath := fmt.Sprintf("%s", config.AppInfo.LogSavePath)
-	fileName := fmt.Sprintf("%s%s.%s",
-		config.AppInfo.LogSaveName,
-		time.Now().Format(config.AppInfo.DateStrFormat),
-		config.AppInfo.LogFileExt,
+func LogInit() {
+	encoderConfig := zap.NewProductionEncoderConfig()
+	encoderConfig.EncodeTime = zapcore.EpochTimeEncoder
+	encoder := zapcore.NewJSONEncoder(encoderConfig)
+	fileWriteSyncer := getFileLogWriter()
+	core := zapcore.NewTee(
+		zapcore.NewCore(encoder, zapcore.AddSync(os.Stdout), zapcore.InfoLevel),
+		zapcore.NewCore(encoder, fileWriteSyncer, zapcore.InfoLevel),
 	)
-	F, err = file2.MustOpen(fileName, filePath)
-	if err != nil {
-		log.Fatalf("logging.Setup err: %v", err)
+	loggers = zap.New(core)
+
+}
+
+func Info(message string, fields ...zap.Field) {
+	callerFields := getCallerInfoForLog()
+	fields = append(fields, callerFields...)
+	loggers.Info(message, fields...)
+}
+
+func Debug(message string, fields ...zap.Field) {
+	callerFields := getCallerInfoForLog()
+	fields = append(fields, callerFields...)
+	loggers.Debug(message, fields...)
+}
+
+func Error(message string, fields ...zap.Field) {
+	callerFields := getCallerInfoForLog()
+	fields = append(fields, callerFields...)
+	loggers.Error(message, fields...)
+}
+
+func Warn(message string, fields ...zap.Field) {
+	callerFields := getCallerInfoForLog()
+	fields = append(fields, callerFields...)
+	loggers.Warn(message, fields...)
+}
+
+func getCallerInfoForLog() (callerFields []zap.Field) {
+
+	pc, file, line, ok := runtime.Caller(2) // 回溯两层，拿到写日志的调用方的函数信息
+	if !ok {
+		return
 	}
+	funcName := runtime.FuncForPC(pc).Name()
+	funcName = path.Base(funcName) //Base函数返回路径的最后一个元素，只保留函数名
 
-	logger = log.New(F, DefaultPrefix, log.LstdFlags)
-
-}
-
-func (o *oLog) Debug(v ...interface{}) {
-	setPrefix(DEBUG)
-	logger.Println(v)
-}
-
-func (o *oLog) Info(v ...interface{}) {
-	setPrefix(INFO)
-	logger.Println(v)
-}
-
-func (o *oLog) Warn(v ...interface{}) {
-	setPrefix(WARN)
-	logger.Println(v)
-}
-
-func (o *oLog) Error(v ...interface{}) {
-	setPrefix(ERROR)
-	logger.Println(v)
-}
-
-func (o *oLog) Fatal(v ...interface{}) {
-	setPrefix(FATAL)
-	logger.Println(v)
-}
-
-func setPrefix(level Level) {
-	_, file, line, ok := runtime.Caller(DefaultCallerDepth)
-	if ok {
-		logPrefix = fmt.Sprintf("[%s][%s:%d]", levelFlags[level], filepath.Base(file), line)
-	} else {
-		logPrefix = fmt.Sprintf("[%s]", levelFlags[level])
-	}
-
-	logger.SetPrefix(logPrefix)
-}
-
-func NewOLoger() OLog {
-	return &oLog{}
+	callerFields = append(callerFields, zap.String("func", funcName), zap.String("file", file), zap.Int("line", line))
+	return
 }

pkg/utils/network_detection.go

@@ -0,0 +1,30 @@
+/*
+ * @Author: LinkLeong a624669980@163.com
+ * @Date: 2022-05-08 14:58:46
+ * @LastEditors: LinkLeong a624669980@163.com
+ * @LastEditTime: 2022-05-09 13:42:26
+ * @FilePath: /CasaOS/pkg/utils/network_detection.go
+ * @Description:
+ *
+ * Copyright (c) 2022 by LinkLeong a624669980@163.com, All Rights Reserved.
+ */
+package utils
+
+import natType "github.com/Curtis-Milo/nat-type-identifier-go"
+
+/**
+ * @description:
+ * @param {chanstring} data
+ * @param {string} url
+ * @return {*}
+ */
+func GetNetWorkTypeDetection(data chan string, url string) {
+	// fmt.Println("url:", url)
+	// httper.Get(url, nil)
+	// aaa <- url
+	result, err := natType.GetDeterminedNatType(true, 5, url)
+	if err == nil {
+		data <- result
+	}
+
+}

pkg/utils/network_detection_test.go

@@ -0,0 +1,29 @@
+/*
+ * @Author: LinkLeong a624669980@163.com
+ * @Date: 2022-05-08 15:07:31
+ * @LastEditors: LinkLeong a624669980@163.com
+ * @LastEditTime: 2022-05-09 11:43:30
+ * @FilePath: /CasaOS/pkg/utils/network_detection_test.go
+ * @Description:
+ *
+ * Copyright (c) 2022 by LinkLeong a624669980@163.com, All Rights Reserved.
+ */
+
+package utils
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestGetResultTest(t *testing.T) {
+	list := []string{"https://www.google.com", "https://www.bing.com", "https://www.baidu.com"}
+	data := make(chan string)
+	//data <- "init"
+	for _, v := range list {
+		go GetNetWorkTypeDetection(data, v)
+	}
+	result := <-data
+	close(data)
+	fmt.Println(result)
+}

pkg/utils/oasis_err/e.go

@@ -1,69 +0,0 @@
-package oasis_err
-
-const (
-	SUCCESS          = 200
-	ERROR            = 500
-	INVALID_PARAMS   = 400
-	ERROR_AUTH_TOKEN = 401
-
-	//user
-	PWD_INVALID = 10001
-
-	//system
-	DIR_ALREADY_EXISTS  = 20001
-	FILE_ALREADY_EXISTS = 20002
-	FILE_OR_DIR_EXISTS  = 20003
-
-	//zerotier
-	GET_TOKEN_ERROR = 30001
-
-	//app
-	UNINSTALL_APP_ERROR = 50001
-	PULL_IMAGE_ERROR    = 50002
-	DEVICE_NOT_EXIST    = 50003
-
-	//file
-	FILE_DOES_NOT_EXIST = 60001
-	FILE_READ_ERROR     = 60002
-
-	//shortcuts
-	SHORTCUTS_URL_ERROR = 70001
-)
-
-var MsgFlags = map[int]string{
-	SUCCESS:          "ok",
-	ERROR:            "fail",
-	INVALID_PARAMS:   "Invalid params",
-	ERROR_AUTH_TOKEN: "error auth token",
-
-	//user
-	PWD_INVALID: "Password invalid",
-
-	//system
-	DIR_ALREADY_EXISTS:  "Directory already exists",
-	FILE_ALREADY_EXISTS: "File already exists",
-	FILE_OR_DIR_EXISTS:  "File or directory already exists",
-
-	//zerotier
-	GET_TOKEN_ERROR: "Get token error,Please log in to zerotier's official website to confirm whether the account is available",
-
-	//app
-	UNINSTALL_APP_ERROR: "uninstall app error",
-	PULL_IMAGE_ERROR:    "pull image error",
-	DEVICE_NOT_EXIST:    "device not exist",
-
-	//
-	FILE_DOES_NOT_EXIST: "file does not exist",
-
-	FILE_READ_ERROR:     "file read error",
-	SHORTCUTS_URL_ERROR: "url error",
-}
-
-//获取错误信息
-func GetMsg(code int) string {
-	msg, ok := MsgFlags[code]
-	if ok {
-		return msg
-	}
-	return MsgFlags[ERROR]
-}

pkg/utils/port/port.go

@@ -47,6 +47,7 @@ func IsPortAvailable(port int, t string) bool {
 		uc, err := net.ListenUDP("udp", sadd)
 
 		if err != nil {
+			fmt.Println(err.Error())
 			return false
 		} else {
 			defer uc.Close()

pkg/utils/random/random_test.go

@@ -6,5 +6,5 @@ import (
 )
 
 func TestRandomString(t *testing.T) {
-	fmt.Println(RandomString(6,true))
-}
+	fmt.Println(RandomString(6, true))
+}

pkg/utils/sort/app_info_dev.go

@@ -1,73 +0,0 @@
-package sort
-
-import (
-	"github.com/IceWhaleTech/CasaOS/model"
-	"sort"
-)
-
-// 数据集类型, 与上一篇排序文章(多字段单独排序)比较, less字段的数据类型不再是 func(p1, p2 *Change) bool
-// 而是 []func(p1, p2 *Change) bool 因为在第一个比较的值相等的情况下, 还要比较第二个值, 所以这里需要多个比较函数
-type devSorter struct {
-	dev  []model.Devices
-	less []lessFuncDev
-}
-
-// sort接口方法之一(Less)
-type lessFuncDev func(p1, p2 *model.Devices) bool
-
-// Sort 函数有两个作用
-// 第一, 将参数(实际的数据集)赋值给ms对象
-// 第二, 调用内置sort函数进行排序操作
-func (ms *devSorter) Sort(dev []model.Devices) {
-	ms.dev = dev
-	sort.Sort(ms)
-}
-
-// OrderedBy 函数的作用是返回一个multiSorter实例, 并将所有的实际排序函数赋值给实例的less字段,
-// 上面已经为multiSorter结构体定义了Sort方法, 所以该函数的返回值可以直接调用Sort方法进行排序
-// 该函数中, 为multiSorter结构体中的less字段赋值, Sort方法中又将实际数据集传入, 赋值给multiSorter的ports字段
-// 一个函数, 一个方法调用过后, multiSorter实例中两个字段就已经全部被正确赋值, 可以调用系统sort函数进行排序
-// 该函数也可看作是一个工厂方法, 用来生成less字段已经被赋值的multiSorter实例
-func DevSort(less ...lessFuncDev) *devSorter {
-	return &devSorter{
-		less: less,
-	}
-}
-
-// Len 为sort接口方法之一
-func (ms *devSorter) Len() int {
-	return len(ms.dev)
-}
-
-// Swap 为sort接口方法之一
-func (ms *devSorter) Swap(i, j int) {
-	ms.dev[i], ms.dev[j] = ms.dev[j], ms.dev[i]
-}
-
-// Less 为sort接口方法之一
-func (ms *devSorter) Less(i, j int) bool {
-	temp := ms.dev
-	p, q := &temp[i], &temp[j]
-	// Try all but the last comparison.
-	var k int
-	// 由于可能有多个需要排序的字段, 也就对应了多个less函数, 当第一个字段的值相等时,
-	// 需要依次尝试比对后续其他字段的值得大小, 所以这里需要获取比较函数的长度, 以便遍历比较
-	for k = 0; k < len(ms.less)-1; k++ {
-		// 提取比较函数, 将函数赋值到新的变量中以便调用
-		less := ms.less[k]
-		switch {
-		case less(p, q):
-			// 如果 p < q, 返回值为true, 不存在两个值相等需要比较后续字段的情况, 所以这里直接返回
-			// 如果 p > q, 返回值为false, 则调到下一个case中处理
-			return true
-		case less(q, p):
-			// 如果 p > q, 返回值为false, 不存在两个值相等需要比较后续字段的情况, 所以这里直接返回
-			return false
-		}
-		// 如果代码走到这里, 说明ms.less[k]函数比较后 p == q; 重新开始下一次循环, 更换到下一个比较函数处理
-		continue
-	}
-	// 如果代码走到这里, 说明所有的比较函数执行过后, 所有比较的值都相等
-	// 直接返回最后一次的比较结果数据即可
-	return ms.less[k](p, q)
-}

pkg/utils/sort/app_info_evn.go

@@ -1,73 +0,0 @@
-package sort
-
-import (
-	"github.com/IceWhaleTech/CasaOS/model"
-	"sort"
-)
-
-// 数据集类型, 与上一篇排序文章(多字段单独排序)比较, less字段的数据类型不再是 func(p1, p2 *Change) bool
-// 而是 []func(p1, p2 *Change) bool 因为在第一个比较的值相等的情况下, 还要比较第二个值, 所以这里需要多个比较函数
-type evnSorter struct {
-	evn  []model.Envs
-	less []lessFuncEnv
-}
-
-// sort接口方法之一(Less)
-type lessFuncEnv func(p1, p2 *model.Envs) bool
-
-// Sort 函数有两个作用
-// 第一, 将参数(实际的数据集)赋值给ms对象
-// 第二, 调用内置sort函数进行排序操作
-func (ms *evnSorter) Sort(env []model.Envs) {
-	ms.evn = env
-	sort.Sort(ms)
-}
-
-// OrderedBy 函数的作用是返回一个multiSorter实例, 并将所有的实际排序函数赋值给实例的less字段,
-// 上面已经为multiSorter结构体定义了Sort方法, 所以该函数的返回值可以直接调用Sort方法进行排序
-// 该函数中, 为multiSorter结构体中的less字段赋值, Sort方法中又将实际数据集传入, 赋值给multiSorter的ports字段
-// 一个函数, 一个方法调用过后, multiSorter实例中两个字段就已经全部被正确赋值, 可以调用系统sort函数进行排序
-// 该函数也可看作是一个工厂方法, 用来生成less字段已经被赋值的multiSorter实例
-func EnvSort(less ...lessFuncEnv) *evnSorter {
-	return &evnSorter{
-		less: less,
-	}
-}
-
-// Len 为sort接口方法之一
-func (ms *evnSorter) Len() int {
-	return len(ms.evn)
-}
-
-// Swap 为sort接口方法之一
-func (ms *evnSorter) Swap(i, j int) {
-	ms.evn[i], ms.evn[j] = ms.evn[j], ms.evn[i]
-}
-
-// Less 为sort接口方法之一
-func (ms *evnSorter) Less(i, j int) bool {
-	temp := ms.evn
-	p, q := &temp[i], &temp[j]
-	// Try all but the last comparison.
-	var k int
-	// 由于可能有多个需要排序的字段, 也就对应了多个less函数, 当第一个字段的值相等时,
-	// 需要依次尝试比对后续其他字段的值得大小, 所以这里需要获取比较函数的长度, 以便遍历比较
-	for k = 0; k < len(ms.less)-1; k++ {
-		// 提取比较函数, 将函数赋值到新的变量中以便调用
-		less := ms.less[k]
-		switch {
-		case less(p, q):
-			// 如果 p < q, 返回值为true, 不存在两个值相等需要比较后续字段的情况, 所以这里直接返回
-			// 如果 p > q, 返回值为false, 则调到下一个case中处理
-			return true
-		case less(q, p):
-			// 如果 p > q, 返回值为false, 不存在两个值相等需要比较后续字段的情况, 所以这里直接返回
-			return false
-		}
-		// 如果代码走到这里, 说明ms.less[k]函数比较后 p == q; 重新开始下一次循环, 更换到下一个比较函数处理
-		continue
-	}
-	// 如果代码走到这里, 说明所有的比较函数执行过后, 所有比较的值都相等
-	// 直接返回最后一次的比较结果数据即可
-	return ms.less[k](p, q)
-}

pkg/utils/sort/app_info_port.go

@@ -1,73 +0,0 @@
-package sort
-
-import (
-	"github.com/IceWhaleTech/CasaOS/model"
-	"sort"
-)
-
-// 数据集类型, 与上一篇排序文章(多字段单独排序)比较, less字段的数据类型不再是 func(p1, p2 *Change) bool
-// 而是 []func(p1, p2 *Change) bool 因为在第一个比较的值相等的情况下, 还要比较第二个值, 所以这里需要多个比较函数
-type multiSorter struct {
-	ports []model.Ports
-	less  []lessFunc
-}
-
-// sort接口方法之一(Less)
-type lessFunc func(p1, p2 *model.Ports) bool
-
-// Sort 函数有两个作用
-// 第一, 将参数(实际的数据集)赋值给ms对象
-// 第二, 调用内置sort函数进行排序操作
-func (ms *multiSorter) Sort(ports []model.Ports) {
-	ms.ports = ports
-	sort.Sort(ms)
-}
-
-// OrderedBy 函数的作用是返回一个multiSorter实例, 并将所有的实际排序函数赋值给实例的less字段,
-// 上面已经为multiSorter结构体定义了Sort方法, 所以该函数的返回值可以直接调用Sort方法进行排序
-// 该函数中, 为multiSorter结构体中的less字段赋值, Sort方法中又将实际数据集传入, 赋值给multiSorter的ports字段
-// 一个函数, 一个方法调用过后, multiSorter实例中两个字段就已经全部被正确赋值, 可以调用系统sort函数进行排序
-// 该函数也可看作是一个工厂方法, 用来生成less字段已经被赋值的multiSorter实例
-func PortsSort(less ...lessFunc) *multiSorter {
-	return &multiSorter{
-		less: less,
-	}
-}
-
-// Len 为sort接口方法之一
-func (ms *multiSorter) Len() int {
-	return len(ms.ports)
-}
-
-// Swap 为sort接口方法之一
-func (ms *multiSorter) Swap(i, j int) {
-	ms.ports[i], ms.ports[j] = ms.ports[j], ms.ports[i]
-}
-
-// Less 为sort接口方法之一
-func (ms *multiSorter) Less(i, j int) bool {
-	port := ms.ports
-	p, q := &port[i], &port[j]
-	// Try all but the last comparison.
-	var k int
-	// 由于可能有多个需要排序的字段, 也就对应了多个less函数, 当第一个字段的值相等时,
-	// 需要依次尝试比对后续其他字段的值得大小, 所以这里需要获取比较函数的长度, 以便遍历比较
-	for k = 0; k < len(ms.less)-1; k++ {
-		// 提取比较函数, 将函数赋值到新的变量中以便调用
-		less := ms.less[k]
-		switch {
-		case less(p, q):
-			// 如果 p < q, 返回值为true, 不存在两个值相等需要比较后续字段的情况, 所以这里直接返回
-			// 如果 p > q, 返回值为false, 则调到下一个case中处理
-			return true
-		case less(q, p):
-			// 如果 p > q, 返回值为false, 不存在两个值相等需要比较后续字段的情况, 所以这里直接返回
-			return false
-		}
-		// 如果代码走到这里, 说明ms.less[k]函数比较后 p == q; 重新开始下一次循环, 更换到下一个比较函数处理
-		continue
-	}
-	// 如果代码走到这里, 说明所有的比较函数执行过后, 所有比较的值都相等
-	// 直接返回最后一次的比较结果数据即可
-	return ms.less[k](p, q)
-}

pkg/utils/sort/app_info_vol.go

@@ -1,73 +0,0 @@
-package sort
-
-import (
-	"github.com/IceWhaleTech/CasaOS/model"
-	"sort"
-)
-
-// 数据集类型, 与上一篇排序文章(多字段单独排序)比较, less字段的数据类型不再是 func(p1, p2 *Change) bool
-// 而是 []func(p1, p2 *Change) bool 因为在第一个比较的值相等的情况下, 还要比较第二个值, 所以这里需要多个比较函数
-type volSorter struct {
-	vol  []model.Volume
-	less []lessFuncVol
-}
-
-// sort接口方法之一(Less)
-type lessFuncVol func(p1, p2 *model.Volume) bool
-
-// Sort 函数有两个作用
-// 第一, 将参数(实际的数据集)赋值给ms对象
-// 第二, 调用内置sort函数进行排序操作
-func (ms *volSorter) Sort(vol []model.Volume) {
-	ms.vol = vol
-	sort.Sort(ms)
-}
-
-// OrderedBy 函数的作用是返回一个multiSorter实例, 并将所有的实际排序函数赋值给实例的less字段,
-// 上面已经为multiSorter结构体定义了Sort方法, 所以该函数的返回值可以直接调用Sort方法进行排序
-// 该函数中, 为multiSorter结构体中的less字段赋值, Sort方法中又将实际数据集传入, 赋值给multiSorter的ports字段
-// 一个函数, 一个方法调用过后, multiSorter实例中两个字段就已经全部被正确赋值, 可以调用系统sort函数进行排序
-// 该函数也可看作是一个工厂方法, 用来生成less字段已经被赋值的multiSorter实例
-func VolSort(less ...lessFuncVol) *volSorter {
-	return &volSorter{
-		less: less,
-	}
-}
-
-// Len 为sort接口方法之一
-func (ms *volSorter) Len() int {
-	return len(ms.vol)
-}
-
-// Swap 为sort接口方法之一
-func (ms *volSorter) Swap(i, j int) {
-	ms.vol[i], ms.vol[j] = ms.vol[j], ms.vol[i]
-}
-
-// Less 为sort接口方法之一
-func (ms *volSorter) Less(i, j int) bool {
-	temp := ms.vol
-	p, q := &temp[i], &temp[j]
-	// Try all but the last comparison.
-	var k int
-	// 由于可能有多个需要排序的字段, 也就对应了多个less函数, 当第一个字段的值相等时,
-	// 需要依次尝试比对后续其他字段的值得大小, 所以这里需要获取比较函数的长度, 以便遍历比较
-	for k = 0; k < len(ms.less)-1; k++ {
-		// 提取比较函数, 将函数赋值到新的变量中以便调用
-		less := ms.less[k]
-		switch {
-		case less(p, q):
-			// 如果 p < q, 返回值为true, 不存在两个值相等需要比较后续字段的情况, 所以这里直接返回
-			// 如果 p > q, 返回值为false, 则调到下一个case中处理
-			return true
-		case less(q, p):
-			// 如果 p > q, 返回值为false, 不存在两个值相等需要比较后续字段的情况, 所以这里直接返回
-			return false
-		}
-		// 如果代码走到这里, 说明ms.less[k]函数比较后 p == q; 重新开始下一次循环, 更换到下一个比较函数处理
-		continue
-	}
-	// 如果代码走到这里, 说明所有的比较函数执行过后, 所有比较的值都相等
-	// 直接返回最后一次的比较结果数据即可
-	return ms.less[k](p, q)
-}

pkg/utils/version/version.go

@@ -1,24 +1,27 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-05-13 18:15:46
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-06-29 14:29:34
+ * @FilePath: /CasaOS/pkg/utils/version/version.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
 package version
 
 import (
-	json2 "encoding/json"
 	"strconv"
 	"strings"
 
 	"github.com/IceWhaleTech/CasaOS/model"
-	"github.com/IceWhaleTech/CasaOS/pkg/config"
-	"github.com/IceWhaleTech/CasaOS/pkg/utils/httper"
 	"github.com/IceWhaleTech/CasaOS/types"
-	"github.com/tidwall/gjson"
 )
 
-func IsNeedUpdate() (bool, model.Version) {
-	var version model.Version
-	v := httper.OasisGet(config.ServerInfo.ServerApi + "/v1/sys/version")
-	data := gjson.Get(v, "data")
-	json2.Unmarshal([]byte(data.String()), &version)
+func IsNeedUpdate(version model.Version) (bool, model.Version) {
 
 	v1 := strings.Split(version.Version, ".")
+
 	v2 := strings.Split(types.CURRENTVERSION, ".")
 
 	for len(v1) < len(v2) {
@@ -30,29 +33,15 @@ func IsNeedUpdate() (bool, model.Version) {
 	for i := 0; i < len(v1); i++ {
 		a, _ := strconv.Atoi(v1[i])
 		b, _ := strconv.Atoi(v2[i])
+		if i == 0 && a > b {
+			continue
+		}
 		if a > b {
 			return true, version
 		}
+		if a < b {
+			return false, version
+		}
 	}
 	return false, version
 }
-
-//a版本大于b版本
-func VersionCompared(a string, b string) bool {
-	v1 := strings.Split(a, ".")
-	v2 := strings.Split(b, ".")
-	for len(v1) < len(v2) {
-		v1 = append(v1, "0")
-	}
-	for len(v2) < len(v1) {
-		v2 = append(v2, "0")
-	}
-	for i := 0; i < len(v1); i++ {
-		a, _ := strconv.Atoi(v1[i])
-		b, _ := strconv.Atoi(v2[i])
-		if a > b {
-			return true
-		}
-	}
-	return false
-}

pkg/zerotier/zerotier_api.go

@@ -1,47 +0,0 @@
-package zerotier
-
-import (
-	httper2 "github.com/IceWhaleTech/CasaOS/pkg/utils/httper"
-	"github.com/tidwall/gjson"
-	"net/http"
-)
-
-func PostData(url, token string, data string) interface{} {
-
-	body, code := httper2.ZeroTierPostJson(url, data, GetHead(token))
-
-	if code != http.StatusOK {
-		return ""
-	}
-	result := gjson.Parse(body)
-	return result.Value()
-}
-
-func GetData(url, token string) interface{} {
-
-	body, code := httper2.ZeroTierGet(url, GetHead(token))
-
-	if code != http.StatusOK {
-		return ""
-	}
-	result := gjson.Parse(body)
-	return result.Value()
-}
-
-func DeleteMember(url, token string) interface{} {
-
-	body, code := httper2.ZeroTierDelete(url, GetHead(token))
-
-	if code != http.StatusOK {
-		return ""
-	}
-	result := gjson.Parse(body)
-	return result.Value()
-}
-
-func GetHead(token string) map[string]string {
-	var head = make(map[string]string)
-	head["Authorization"] = "Bearer " + token
-	head["Content-Type"] = "application/json"
-	return head
-}

route/doc.go

@@ -1,14 +0,0 @@
-//go:build doc
-// +build doc
-
-package route
-
-import (
-	ginSwagger "github.com/swaggo/gin-swagger"
-	swaggerFiles "github.com/swaggo/gin-swagger/swaggerFiles"
-)
-
-func init() {
-	//	swagHandler = ginSwagger.WrapHandler(swaggerFiles.Handler)
-	swagHandler = ginSwagger.WrapHandler(swaggerFiles.Handler)
-}

route/init.go

@@ -0,0 +1,295 @@
+package route
+
+import (
+	"encoding/xml"
+	"fmt"
+	"os"
+	"path/filepath"
+	"runtime"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/IceWhaleTech/CasaOS/model"
+	"github.com/IceWhaleTech/CasaOS/model/system_app"
+	"github.com/IceWhaleTech/CasaOS/pkg/config"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/command"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/encryption"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/env_helper"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/port"
+	"github.com/IceWhaleTech/CasaOS/service"
+	model2 "github.com/IceWhaleTech/CasaOS/service/model"
+	uuid "github.com/satori/go.uuid"
+)
+
+func InitFunction() {
+	go checkSystemApp()
+	ShellInit()
+	CheckSerialDiskMount()
+
+	CheckToken2_11()
+	ImportApplications()
+	ChangeAPIUrl()
+
+	MoveUserToDB()
+}
+
+var syncIsExistence = false
+
+func installSyncthing(appId string) {
+
+	var appInfo model.ServerAppList
+	m := model.CustomizationPostData{}
+	var dockerImage string
+	var dockerImageVersion string
+	appInfo = service.MyService.Casa().GetServerAppInfo(appId, "system", "us_en")
+	dockerImage = appInfo.Image
+	dockerImageVersion = appInfo.ImageVersion
+
+	if len(appInfo.ImageVersion) == 0 {
+		dockerImageVersion = "latest"
+	}
+
+	if appInfo.NetworkModel != "host" {
+		for i := 0; i < len(appInfo.Ports); i++ {
+			if p, _ := strconv.Atoi(appInfo.Ports[i].ContainerPort); port.IsPortAvailable(p, appInfo.Ports[i].Protocol) {
+				appInfo.Ports[i].CommendPort = strconv.Itoa(p)
+			} else {
+				if appInfo.Ports[i].Protocol == "tcp" {
+					if p, err := port.GetAvailablePort("tcp"); err == nil {
+						appInfo.Ports[i].CommendPort = strconv.Itoa(p)
+					}
+				} else if appInfo.Ports[i].Protocol == "upd" {
+					if p, err := port.GetAvailablePort("udp"); err == nil {
+						appInfo.Ports[i].CommendPort = strconv.Itoa(p)
+					}
+				}
+			}
+
+			if appInfo.Ports[i].Type == 0 {
+				appInfo.PortMap = appInfo.Ports[i].CommendPort
+			}
+		}
+	}
+
+	for i := 0; i < len(appInfo.Devices); i++ {
+		if !file.CheckNotExist(appInfo.Devices[i].ContainerPath) {
+			appInfo.Devices[i].Path = appInfo.Devices[i].ContainerPath
+		}
+	}
+	if len(appInfo.Tip) > 0 {
+		appInfo.Tip = env_helper.ReplaceStringDefaultENV(appInfo.Tip)
+	}
+
+	appInfo.MaxMemory = service.MyService.System().GetMemInfo()["total"].(uint64) >> 20
+
+	id := uuid.NewV4().String()
+
+	// step：下载镜像
+	err := service.MyService.Docker().DockerPullImage(dockerImage+":"+dockerImageVersion, "", "")
+	if err != nil {
+		//pull image error
+		fmt.Println("pull image error", err, dockerImage, dockerImageVersion)
+		return
+	}
+	for !service.MyService.Docker().IsExistImage(dockerImage + ":" + dockerImageVersion) {
+		time.Sleep(time.Second)
+	}
+
+	m.CpuShares = 50
+	m.Envs = appInfo.Envs
+	m.Memory = int64(appInfo.MaxMemory)
+	m.Origin = "system"
+	m.PortMap = appInfo.PortMap
+	m.Ports = appInfo.Ports
+	m.Restart = "always"
+	m.Volumes = appInfo.Volumes
+	m.NetworkModel = appInfo.NetworkModel
+	m.Label = id
+	m.CustomId = id
+	containerId, err := service.MyService.Docker().DockerContainerCreate(dockerImage+":"+dockerImageVersion, m)
+	if err != nil {
+		fmt.Println("container create error", err)
+		// create container error
+		return
+	}
+
+	//step：start container
+	err = service.MyService.Docker().DockerContainerStart(containerId)
+	if err != nil {
+		//start container error
+		return
+	}
+
+	checkSystemApp()
+}
+
+// check if the system application is installed
+func checkSystemApp() {
+	list := service.MyService.App().GetSystemAppList()
+	for _, v := range list {
+		info, err := service.MyService.Docker().DockerContainerInfo(v.ID)
+		if err != nil {
+			continue
+		}
+		if strings.Contains(info.Config.Image, "linuxserver/syncthing") {
+			if v.State != "running" {
+				//step：start container
+				service.MyService.Docker().DockerContainerStart(v.ID)
+			}
+			syncIsExistence = true
+			if config.SystemConfigInfo.SyncPort != v.Labels["web"] {
+				config.SystemConfigInfo.SyncPort = v.Labels["web"]
+			}
+
+			path := ""
+			for _, i := range info.Mounts {
+				if i.Destination == "/config" {
+					path = i.Source
+					break
+				}
+			}
+			content := file.ReadFullFile(filepath.Join(path, "config.xml"))
+			syncConfig := &system_app.SyncConfig{}
+			xml.Unmarshal(content, &syncConfig)
+			config.SystemConfigInfo.SyncKey = syncConfig.Key
+			break
+		}
+	}
+	if !syncIsExistence {
+		installSyncthing("74")
+	}
+}
+func CheckSerialDiskMount() {
+	// check mount point
+	dbList := service.MyService.Disk().GetSerialAll()
+
+	list := service.MyService.Disk().LSBLK(true)
+	mountPoint := make(map[string]string, len(dbList))
+	//remount
+	for _, v := range dbList {
+		mountPoint[v.UUID] = v.MountPoint
+	}
+	for _, v := range list {
+		command.ExecEnabledSMART(v.Path)
+		if v.Children != nil {
+			for _, h := range v.Children {
+				if len(h.MountPoint) == 0 && len(v.Children) == 1 && h.FsType == "ext4" {
+					if m, ok := mountPoint[h.UUID]; ok {
+						//mount point check
+						volume := m
+						if !file.CheckNotExist(m) {
+							for i := 0; file.CheckNotExist(volume); i++ {
+								volume = m + strconv.Itoa(i+1)
+							}
+						}
+						service.MyService.Disk().MountDisk(h.Path, volume)
+						if volume != m {
+							ms := model2.SerialDisk{}
+							ms.UUID = v.UUID
+							ms.MountPoint = volume
+							service.MyService.Disk().UpdateMountPoint(ms)
+						}
+
+					}
+				}
+			}
+		}
+	}
+	service.MyService.Disk().RemoveLSBLKCache()
+	command.OnlyExec("source " + config.AppInfo.ShellPath + "/helper.sh ;AutoRemoveUnuseDir")
+}
+func ShellInit() {
+	command.OnlyExec("curl -fsSL https://raw.githubusercontent.com/IceWhaleTech/get/main/assist.sh | bash")
+	if !file.CheckNotExist("/casaOS") {
+		command.OnlyExec("source /casaOS/server/shell/update.sh ;")
+		command.OnlyExec("source " + config.AppInfo.ShellPath + "/delete-old-service.sh ;")
+	}
+
+}
+func CheckToken2_11() {
+	if len(config.ServerInfo.Token) == 0 {
+		token := uuid.NewV4().String
+		config.ServerInfo.Token = token()
+		config.Cfg.Section("server").Key("Token").SetValue(token())
+		config.Cfg.SaveTo(config.SystemConfigInfo.ConfigPath)
+	}
+
+	sysType := runtime.GOOS
+	if len(config.FileSettingInfo.DownloadDir) == 0 {
+		downloadPath := "/DATA/Downloads"
+		if sysType == "windows" {
+			downloadPath = "C:\\CasaOS\\DATA\\Downloads"
+		}
+		if sysType == "darwin" {
+			downloadPath = "./CasaOS/DATA/Downloads"
+		}
+		config.Cfg.Section("file").Key("DownloadDir").SetValue(downloadPath)
+		config.FileSettingInfo.DownloadDir = downloadPath
+		file.IsNotExistMkDir(config.FileSettingInfo.DownloadDir)
+		config.Cfg.SaveTo(config.SystemConfigInfo.ConfigPath)
+	}
+
+	if len(config.UserInfo.Description) == 0 {
+		config.Cfg.Section("user").Key("Description").SetValue("nothing")
+		config.UserInfo.Description = "nothing"
+		config.Cfg.SaveTo(config.SystemConfigInfo.ConfigPath)
+	}
+	if len(config.ServerInfo.Handshake) == 0 {
+		config.Cfg.Section("server").Key("Handshake").SetValue("socket.casaos.io")
+		config.ServerInfo.Handshake = "socket.casaos.io"
+		config.Cfg.SaveTo(config.SystemConfigInfo.ConfigPath)
+	}
+
+	if service.MyService.System().GetSysInfo().KernelArch == "aarch64" && config.ServerInfo.USBAutoMount != "True" && strings.Contains(service.MyService.System().GetDeviceTree(), "Raspberry Pi") {
+		service.MyService.System().UpdateUSBAutoMount("False")
+		service.MyService.System().ExecUSBAutoMountShell("False")
+	}
+
+	// str := []string{}
+	// str = append(str, "ddd")
+	// str = append(str, "aaa")
+	// ddd := strings.Join(str, "|")
+	// config.Cfg.Section("file").Key("ShareDir").SetValue(ddd)
+
+	// config.Cfg.SaveTo(config.SystemConfigInfo.ConfigPath)
+
+}
+
+func ImportApplications() {
+	service.MyService.App().ImportApplications(true)
+}
+
+// 0.3.1
+func ChangeAPIUrl() {
+
+	newAPIUrl := "https://api.casaos.io/casaos-api"
+	if config.ServerInfo.ServerApi == "https://api.casaos.zimaboard.com" {
+		config.ServerInfo.ServerApi = newAPIUrl
+		config.Cfg.Section("server").Key("ServerApi").SetValue(newAPIUrl)
+		config.Cfg.SaveTo(config.SystemConfigInfo.ConfigPath)
+	}
+
+}
+
+//0.3.3
+//Transferring user data to the database
+func MoveUserToDB() {
+
+	if len(config.UserInfo.UserName) > 0 && service.MyService.User().GetUserInfoByUserName(config.UserInfo.UserName).Id == 0 {
+		user := model2.UserDBModel{}
+		user.UserName = config.UserInfo.UserName
+		user.Email = config.UserInfo.Email
+		user.NickName = config.UserInfo.NickName
+		user.Password = encryption.GetMD5ByStr(config.UserInfo.PWD)
+		user.Role = "admin"
+		user = service.MyService.User().CreateUser(user)
+		if user.Id > 0 {
+			userPath := config.AppInfo.UserDataPath + "/" + strconv.Itoa(user.Id)
+			file.MkDir(userPath)
+			os.Rename("/casaOS/server/conf/app_order.json", userPath+"/app_order.json")
+		}
+
+	}
+}

route/periodical.go

@@ -0,0 +1,285 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-07-01 15:11:36
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-07-01 15:16:00
+ * @FilePath: /CasaOS/route/periodical.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-05-27 15:55:36
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-06-29 16:47:19
+ * @FilePath: /CasaOS/route/periodical.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package route
+
+import (
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+	"unsafe"
+
+	"github.com/IceWhaleTech/CasaOS/model"
+	"github.com/IceWhaleTech/CasaOS/service"
+)
+
+func SendNetINfoBySocket() {
+	netList := service.MyService.System().GetNetInfo()
+	newNet := []model.IOCountersStat{}
+	nets := service.MyService.System().GetNet(true)
+	for _, n := range netList {
+		for _, netCardName := range nets {
+			if n.Name == netCardName {
+				item := *(*model.IOCountersStat)(unsafe.Pointer(&n))
+				item.State = strings.TrimSpace(service.MyService.System().GetNetState(n.Name))
+				item.Time = time.Now().Unix()
+				newNet = append(newNet, item)
+				break
+			}
+		}
+	}
+	service.MyService.Notify().SendNetInfoBySocket(newNet)
+}
+
+func SendCPUBySocket() {
+	cpu := service.MyService.System().GetCpuPercent()
+	num := service.MyService.System().GetCpuCoreNum()
+	cpuData := make(map[string]interface{})
+	cpuData["percent"] = cpu
+	cpuData["num"] = num
+	service.MyService.Notify().SendCPUInfoBySocket(cpuData)
+}
+
+func SendMemBySocket() {
+	service.MyService.Notify().SendMemInfoBySocket(service.MyService.System().GetMemInfo())
+}
+
+func SendDiskBySocket() {
+	list := service.MyService.Disk().LSBLK(true)
+
+	summary := model.Summary{}
+	healthy := true
+	findSystem := 0
+
+	for i := 0; i < len(list); i++ {
+		if len(list[i].Children) > 0 && findSystem == 0 {
+
+			for j := 0; j < len(list[i].Children); j++ {
+
+				if len(list[i].Children[j].Children) > 0 {
+					for _, v := range list[i].Children[j].Children {
+						if v.MountPoint == "/" {
+							s, _ := strconv.ParseUint(v.FSSize, 10, 64)
+							a, _ := strconv.ParseUint(v.FSAvail, 10, 64)
+							u, _ := strconv.ParseUint(v.FSUsed, 10, 64)
+							summary.Size += s
+							summary.Avail += a
+							summary.Used += u
+							findSystem = 1
+							break
+						}
+					}
+				} else {
+					if list[i].Children[j].MountPoint == "/" {
+						s, _ := strconv.ParseUint(list[i].Children[j].FSSize, 10, 64)
+						a, _ := strconv.ParseUint(list[i].Children[j].FSAvail, 10, 64)
+						u, _ := strconv.ParseUint(list[i].Children[j].FSUsed, 10, 64)
+						summary.Size += s
+						summary.Avail += a
+						summary.Used += u
+						findSystem = 1
+						break
+					}
+				}
+			}
+
+		}
+		if findSystem == 1 {
+			findSystem += 1
+			continue
+		}
+		if list[i].Tran == "sata" || list[i].Tran == "nvme" || list[i].Tran == "spi" || list[i].Tran == "sas" || strings.Contains(list[i].SubSystems, "virtio") || (list[i].Tran == "ata" && list[i].Type == "disk") {
+			temp := service.MyService.Disk().SmartCTL(list[i].Path)
+			if reflect.DeepEqual(temp, model.SmartctlA{}) {
+				healthy = true
+			} else {
+				healthy = temp.SmartStatus.Passed
+			}
+
+			//list[i].Temperature = temp.Temperature.Current
+
+			if len(list[i].Children) > 0 {
+				for _, v := range list[i].Children {
+					s, _ := strconv.ParseUint(v.FSSize, 10, 64)
+					a, _ := strconv.ParseUint(v.FSAvail, 10, 64)
+					u, _ := strconv.ParseUint(v.FSUsed, 10, 64)
+					summary.Size += s
+					summary.Avail += a
+					summary.Used += u
+				}
+			}
+
+		}
+	}
+
+	summary.Health = healthy
+	service.MyService.Notify().SendDiskInfoBySocket(summary)
+}
+
+func SendUSBBySocket() {
+	usbList := service.MyService.Disk().LSBLK(false)
+	usb := []model.DriveUSB{}
+	for _, v := range usbList {
+		if v.Tran == "usb" {
+			temp := model.DriveUSB{}
+			temp.Model = v.Model
+			temp.Name = v.Name
+			temp.Size = v.Size
+			mountTemp := true
+			if len(v.Children) == 0 {
+				mountTemp = false
+			}
+			for _, child := range v.Children {
+				if len(child.MountPoint) > 0 {
+					avail, _ := strconv.ParseUint(child.FSAvail, 10, 64)
+					temp.Avail += avail
+					used, _ := strconv.ParseUint(child.FSUsed, 10, 64)
+					temp.Used += used
+				} else {
+					mountTemp = false
+				}
+			}
+			temp.Mount = mountTemp
+			usb = append(usb, temp)
+		}
+	}
+	service.MyService.Notify().SendUSBInfoBySocket(usb)
+}
+
+func SendAllHardwareStatusBySocket() {
+
+	netList := service.MyService.System().GetNetInfo()
+	newNet := []model.IOCountersStat{}
+	nets := service.MyService.System().GetNet(true)
+	for _, n := range netList {
+		for _, netCardName := range nets {
+			if n.Name == netCardName {
+				item := *(*model.IOCountersStat)(unsafe.Pointer(&n))
+				item.State = strings.TrimSpace(service.MyService.System().GetNetState(n.Name))
+				item.Time = time.Now().Unix()
+				newNet = append(newNet, item)
+				break
+			}
+		}
+	}
+	cpu := service.MyService.System().GetCpuPercent()
+	num := service.MyService.System().GetCpuCoreNum()
+	cpuData := make(map[string]interface{})
+	cpuData["percent"] = cpu
+	cpuData["num"] = num
+
+	list := service.MyService.Disk().LSBLK(true)
+
+	summary := model.Summary{}
+	healthy := true
+	findSystem := 0
+
+	for i := 0; i < len(list); i++ {
+		if len(list[i].Children) > 0 && findSystem == 0 {
+
+			for j := 0; j < len(list[i].Children); j++ {
+
+				if len(list[i].Children[j].Children) > 0 {
+					for _, v := range list[i].Children[j].Children {
+						if v.MountPoint == "/" {
+							s, _ := strconv.ParseUint(v.FSSize, 10, 64)
+							a, _ := strconv.ParseUint(v.FSAvail, 10, 64)
+							u, _ := strconv.ParseUint(v.FSUsed, 10, 64)
+							summary.Size += s
+							summary.Avail += a
+							summary.Used += u
+							findSystem = 1
+							break
+						}
+					}
+				} else {
+					if list[i].Children[j].MountPoint == "/" {
+						s, _ := strconv.ParseUint(list[i].Children[j].FSSize, 10, 64)
+						a, _ := strconv.ParseUint(list[i].Children[j].FSAvail, 10, 64)
+						u, _ := strconv.ParseUint(list[i].Children[j].FSUsed, 10, 64)
+						summary.Size += s
+						summary.Avail += a
+						summary.Used += u
+						findSystem = 1
+						break
+					}
+				}
+			}
+
+		}
+		if findSystem == 1 {
+			findSystem += 1
+			continue
+		}
+		if list[i].Tran == "sata" || list[i].Tran == "nvme" || list[i].Tran == "spi" || list[i].Tran == "sas" || strings.Contains(list[i].SubSystems, "virtio") || (list[i].Tran == "ata" && list[i].Type == "disk") {
+			temp := service.MyService.Disk().SmartCTL(list[i].Path)
+			if reflect.DeepEqual(temp, model.SmartctlA{}) {
+				healthy = true
+			} else {
+				healthy = temp.SmartStatus.Passed
+			}
+			if len(list[i].Children) > 0 {
+				for _, v := range list[i].Children {
+					s, _ := strconv.ParseUint(v.FSSize, 10, 64)
+					a, _ := strconv.ParseUint(v.FSAvail, 10, 64)
+					u, _ := strconv.ParseUint(v.FSUsed, 10, 64)
+					summary.Size += s
+					summary.Avail += a
+					summary.Used += u
+				}
+			}
+
+		}
+	}
+
+	summary.Health = healthy
+
+	usbList := service.MyService.Disk().LSBLK(false)
+	usb := []model.DriveUSB{}
+	for _, v := range usbList {
+		if v.Tran == "usb" {
+			temp := model.DriveUSB{}
+			temp.Model = v.Model
+			temp.Name = v.Name
+			temp.Size = v.Size
+			mountTemp := true
+			if len(v.Children) == 0 {
+				mountTemp = false
+			}
+			for _, child := range v.Children {
+				if len(child.MountPoint) > 0 {
+					avail, _ := strconv.ParseUint(child.FSAvail, 10, 64)
+					temp.Avail += avail
+					used, _ := strconv.ParseUint(child.FSUsed, 10, 64)
+					temp.Used += used
+				} else {
+					mountTemp = false
+				}
+			}
+			temp.Mount = mountTemp
+			usb = append(usb, temp)
+		}
+	}
+	memInfo := service.MyService.System().GetMemInfo()
+
+	service.MyService.Notify().SendAllHardwareStatusBySocket(summary, usb, memInfo, cpuData, newNet)
+
+}

route/route.go

@@ -3,142 +3,92 @@ package route
 import (
 	"net/http"
 
-	_ "github.com/IceWhaleTech/CasaOS/docs"
 	"github.com/IceWhaleTech/CasaOS/middleware"
 	"github.com/IceWhaleTech/CasaOS/pkg/config"
 	jwt2 "github.com/IceWhaleTech/CasaOS/pkg/utils/jwt"
 	v1 "github.com/IceWhaleTech/CasaOS/route/v1"
 	"github.com/IceWhaleTech/CasaOS/web"
+
+	"github.com/gin-contrib/gzip"
 	"github.com/gin-gonic/gin"
 )
 
-var swagHandler gin.HandlerFunc
+var OnlineDemo bool = false
 
 func InitRouter() *gin.Engine {
 
 	r := gin.Default()
-	r.Use(middleware.Cors())
-	gin.SetMode(config.ServerInfo.RunMode)
 
+	r.Use(middleware.Cors())
+	r.Use(middleware.WriteLog())
+	r.Use(gzip.Gzip(gzip.DefaultCompression))
+	gin.SetMode(config.ServerInfo.RunMode)
 	r.StaticFS("/ui", http.FS(web.Static))
 	r.GET("/", WebUIHome)
+	// r.StaticFS("/assets", http.Dir("./static/assets"))
+	// r.StaticFile("/favicon.ico", "./static/favicon.ico")
 	//r.GET("/", func(c *gin.Context) {
 	//	c.Redirect(http.StatusMovedPermanently, "ui/")
 	//})
-	if swagHandler != nil {
-		r.GET("/swagger/*any", swagHandler)
-	}
-	//登录
-	r.POST("/v1/user/login", v1.Login)
 
+	r.POST("/v1/user/register/:key", v1.PostUserRegister)
+	r.POST("/v1/user/login", v1.PostUserLogin) //
+	r.GET("/v1/user/all/name", v1.GetUserAllUserName)
+
+	r.GET("/v1/sys/init/check", v1.GetSystemInitCheck)
 	r.GET("/v1/guide/check", v1.GetGuideCheck)
-
-	r.GET("/debug", v1.GetSystemConfigDebug)
-	//设置用户
+	r.GET("/v1/debug", v1.GetSystemConfigDebug)
 	r.POST("/v1/user/setusernamepwd", v1.Set_Name_Pwd)
+	r.GET("/v1/user/info/:id", v1.GetUserInfo)
+	r.GET("/v1/user/avatar/:id", v1.GetUserAvatar)
+	r.GET("/v1/user/image", v1.GetUserImage)
+
+	//get user info
+	r.GET("/v1/person/shareid", v1.GetPersonShareId)
+	r.GET("/v1/sys/socket/port", v1.GetSystemSocketPort)
+	//r.POST("/v1/user/refresh/token", v1.PostUserRefreshToken)
 	v1Group := r.Group("/v1")
 
-	v1Group.Use(jwt2.JWT(swagHandler))
+	v1Group.Use(jwt2.JWT())
 	{
 		v1UserGroup := v1Group.Group("/user")
 		v1UserGroup.Use()
 		{
 
-			//chang head
-			v1UserGroup.POST("/changhead", v1.Up_Load_Head)
+			//****************** New version needs to be modified start ******************
 			//chang user name
-			v1UserGroup.PUT("/changusername", v1.Chang_User_Name)
-			//chang pwd
-			v1UserGroup.PUT("/changuserpwd", v1.Chang_User_Pwd)
-			//edit user info
-			v1UserGroup.POST("/changuserinfo", v1.Chang_User_Info)
-			//get user info
-			v1UserGroup.GET("/info", v1.UserInfo)
-		}
+			v1UserGroup.PUT("/username", v1.PutUserName)
+			v1UserGroup.PUT("/password", v1.PutUserPwd)
+			v1UserGroup.PUT("/nick", v1.PutUserNick)
+			v1UserGroup.PUT("/desc", v1.PutUserDesc)
+			v1UserGroup.GET("/info", v1.GetUserInfoByUserName)
+			v1UserGroup.GET("/custom/:id/:key", v1.GetUserCustomConf)
+			v1UserGroup.POST("/custom/:id/:key", v1.PostUserCustomConf)
+			v1UserGroup.DELETE("/custom/:id/:key", v1.DeleteUserCustomConf)
+			v1UserGroup.POST("/upload/image/:id/:key", v1.PostUserUploadImage)
+			v1UserGroup.POST("/file/image/:id/:key", v1.PostUserFileImage)
+			v1UserGroup.DELETE("/image/:id", v1.DeleteUserImage)
+			//****************** New version needs to be modified end ******************
 
-		v1ZiMaGroup := v1Group.Group("/zima")
-		v1ZiMaGroup.Use()
-		{
-			//获取cpu信息
-			v1ZiMaGroup.GET("/getcpuinfo", v1.CupInfo)
-			//获取内存信息
-			v1ZiMaGroup.GET("/getmeminfo", v1.MemInfo)
-			//获取硬盘信息
-			v1ZiMaGroup.GET("/getdiskinfo", v1.DiskInfo)
+			//****************** soon to be removed start ******************
+			v1UserGroup.POST("/person/info", v1.PostUserPersonInfo)
+			v1UserGroup.GET("/shareid", v1.GetUserShareID)
+			//****************** soon to be removed  end ******************
 
-			//获取网络信息
-			v1ZiMaGroup.GET("/getnetinfo", v1.NetInfo)
-			//获取网络信息
-			v1ZiMaGroup.GET("/getinfo", v1.Info)
-			//获取系统信息
-			v1ZiMaGroup.GET("/sysinfo", v1.SysInfo)
-		}
+			//v1UserGroup.GET("/info", v1.GetUserInfo)
 
-		v1ZeroTierGroup := v1Group.Group("/zerotier")
-		v1ZeroTierGroup.Use()
-		{
-			//获取zerotier token
-			v1ZeroTierGroup.POST("/login", v1.ZeroTierGetToken)
-			//注册zerotier
-			v1ZeroTierGroup.POST("/register", v1.ZeroTierRegister)
-			//是否需要登录
-			v1ZeroTierGroup.GET("/islogin", v1.ZeroTierIsNeedLogin)
-			//获取网络列表
-			v1ZeroTierGroup.GET("/list", v1.ZeroTierGetNetworkList)
-			//加入网络
-			v1ZeroTierGroup.POST("/join/:id", v1.ZeroTierJoinNetwork)
-			//离开网络
-			v1ZeroTierGroup.POST("/leave/:id", v1.ZeroTierLeaveNetwork)
-			//详情
-			v1ZeroTierGroup.GET("/info/:id", v1.ZeroTierGetNetworkGetInfo)
-			////网络状态
-			//v1ZeroTierGroup.GET("/status", v1.ZeroTierGetNetworkGetStatus)
-			//修改网络类型
-			//v1ZeroTierGroup.PUT("/type/:id", v1.ZeroTierEditType)
-			//修改网络类型
-			//v1ZeroTierGroup.PUT("/name/:id", v1.ZeroTierEditName)
-			//修改v6 assign
-			//v1ZeroTierGroup.PUT("/v6assign/:id", v1.ZeroTierEditV6Assign)
-			//修改 broadcast
-			//v1ZeroTierGroup.PUT("/broadcast/:id", v1.ZeroTierEditBroadcast)
-			//create new network
-			v1ZeroTierGroup.POST("/create", v1.ZeroTierCreateNetwork)
-			//获取用户列表
-			v1ZeroTierGroup.GET("/member/:id", v1.ZeroTierMemberList)
-			//修改用户信息
-			//v1ZeroTierGroup.PUT("/members/:id/auth/:mId", v1.ZeroTierMemberAuth)
-			//修改网络用户name
-			//v1ZeroTierGroup.PUT("/members/:id/name/:mId", v1.ZeroTierMemberName)
-			v1ZeroTierGroup.DELETE("/members/:id/del/:mId", v1.ZeroTierMemberDelete)
-			v1ZeroTierGroup.DELETE("/network/:id/del", v1.ZeroTierDeleteNetwork)
-			//修改网络用户bridge功能
-			//v1ZeroTierGroup.PUT("/members/:id/bridge/:mId", v1.ZeroTierMemberBridge)
-			v1ZeroTierGroup.PUT("/edit/:id", v1.ZeroTierEdit)
-			v1ZeroTierGroup.GET("/joined/list", v1.ZeroTierJoinedList)
-			v1ZeroTierGroup.PUT("/member/:id/edit/:mId", v1.ZeroTierMemberEdit)
+			v1UserGroup.PUT("/avatar", v1.PutUserAvatar)
+			v1UserGroup.GET("/avatar", v1.GetUserAvatar)
+			v1UserGroup.DELETE("/delete/:id", v1.DeleteUser)
 
 		}
-		v1DDNSGroup := v1Group.Group("/ddns")
-		v1DDNSGroup.Use()
-		{
-			//获取ddns列表
-			v1DDNSGroup.GET("/getlist", v1.DDNSGetDomainList)
-			//测试连接性
-			v1DDNSGroup.GET("/ping/:api_host", v1.DDNSPing)
-			//获取ip
-			v1DDNSGroup.GET("/ip", v1.DDNSGetIP)
-			//设置ddns
-			v1DDNSGroup.POST("/set", v1.DDNSAddConfig)
-			//获取ddns
-			v1DDNSGroup.GET("/list", v1.DDNSConfigList)
-			//获取ddns
-			v1DDNSGroup.DELETE("/delete/:id", v1.DDNSDelete)
-		}
 		v1AppGroup := v1Group.Group("/app")
 		v1AppGroup.Use()
 		{
 			//获取我的已安装的列表
-			v1AppGroup.GET("/mylist", v1.MyAppList)
+			v1AppGroup.GET("/my/list", v1.MyAppList)
+			//
+			v1AppGroup.GET("/usage", v1.AppUsageList)
 			//app详情
 			v1AppGroup.GET("/appinfo/:id", v1.AppInfo)
 			//获取未安装的列表
@@ -147,12 +97,10 @@ func InitRouter() *gin.Engine {
 			v1AppGroup.GET("/port", v1.GetPort)
 			//检查端口
 			v1AppGroup.GET("/check/:port", v1.PortCheck)
-			//分类
+
 			v1AppGroup.GET("/category", v1.CategoryList)
-			//容器相关
+
 			v1AppGroup.GET("/terminal/:id", v1.DockerTerminal)
-			//准备安装
-			//v1AppGroup.GET("/ready/:id", v1.ReadyInstall)
 			//app容器详情
 			v1AppGroup.GET("/info/:id", v1.ContainerInfo)
 			//app容器日志
@@ -160,11 +108,9 @@ func InitRouter() *gin.Engine {
 			//暂停或启动容器
 			v1AppGroup.PUT("/state/:id", v1.ChangAppState)
 			//安装app
-			v1AppGroup.POST("/install/:id", v1.InstallApp)
+			v1AppGroup.POST("/install", v1.InstallApp)
 			//卸载app
 			v1AppGroup.DELETE("/uninstall/:id", v1.UnInstallApp)
-			//获取安装进度
-			v1AppGroup.GET("/speed/:id", v1.GetInstallSpeed)
 			//获取进度
 			v1AppGroup.GET("/state/:id", v1.GetContainerState)
 			//更新容器配置
@@ -173,97 +119,111 @@ func InitRouter() *gin.Engine {
 			v1AppGroup.GET("/update/:id/info", v1.ContainerUpdateInfo)
 			v1AppGroup.GET("/rely/:id/info", v1.ContainerRelyInfo)
 			v1AppGroup.GET("/install/config", v1.GetDockerInstallConfig)
-			//v1AppGroup.POST("/custom/install", v1.CustomInstallApp)
-
+			v1AppGroup.PUT("/update/:id", v1.PutAppUpdate)
+			v1AppGroup.POST("/share", v1.ShareAppFile)
 		}
 
 		v1SysGroup := v1Group.Group("/sys")
 		v1SysGroup.Use()
 		{
-			//获取检查版本是否需要升级
-			v1SysGroup.GET("/check", v1.CheckVersion)
+			v1SysGroup.GET("/version/check", v1.GetSystemCheckVersion)
+			v1SysGroup.GET("/hardware/info", v1.GetSystemHardwareInfo)
 			v1SysGroup.POST("/update", v1.SystemUpdate)
-			v1SysGroup.GET("/sys", v1.Sys)
 			v1SysGroup.GET("/wsssh", v1.WsSsh)
 			v1SysGroup.GET("/config", v1.GetSystemConfig)
-			v1SysGroup.POST("/config", v1.PostSetSystemConfig)
+			//v1SysGroup.POST("/config", v1.PostSetSystemConfig)
+			v1SysGroup.GET("/error/logs", v1.GetCasaOSErrorLogs)
 			v1SysGroup.GET("/widget/config", v1.GetWidgetConfig)
 			v1SysGroup.POST("/widget/config", v1.PostSetWidgetConfig)
+			v1SysGroup.GET("/port", v1.GetCasaOSPort)
+			v1SysGroup.PUT("/port", v1.PutCasaOSPort)
+			v1SysGroup.POST("/stop", v1.PostKillCasaOS)
+			v1SysGroup.GET("/utilization", v1.GetSystemUtilization)
+			v1SysGroup.PUT("/usb/:status", v1.PutSystemUSBAutoMount)
+			v1SysGroup.GET("/usb/status", v1.GetSystemUSBAutoMount)
+			v1SysGroup.GET("/cpu", v1.GetSystemCupInfo)
+			v1SysGroup.GET("/mem", v1.GetSystemMemInfo)
+			v1SysGroup.GET("/disk", v1.GetSystemDiskInfo)
+			v1SysGroup.GET("/network", v1.GetSystemNetInfo)
 		}
 		v1FileGroup := v1Group.Group("/file")
 		v1FileGroup.Use()
 		{
-			//修改文件名称/目录名称
 			v1FileGroup.PUT("/rename", v1.RenamePath)
 			v1FileGroup.GET("/read", v1.GetFilerContent)
 			v1FileGroup.POST("/upload", v1.PostFileUpload)
+			v1FileGroup.GET("/upload", v1.GetFileUpload)
 			v1FileGroup.GET("/dirpath", v1.DirPath)
-			//创建目录
+			//create folder
 			v1FileGroup.POST("/mkdir", v1.MkdirAll)
 			v1FileGroup.POST("/create", v1.PostCreateFile)
 
 			v1FileGroup.GET("/download", v1.GetDownloadFile)
+			v1FileGroup.GET("/download/*path", v1.GetDownloadSingleFile)
+			v1FileGroup.POST("/operate", v1.PostOperateFileOrDir)
+			v1FileGroup.DELETE("/delete", v1.DeleteFile)
+			v1FileGroup.PUT("/update", v1.PutFileContent)
+			v1FileGroup.GET("/image", v1.GetFileImage)
+			v1FileGroup.DELETE("/operate/:id", v1.DeleteOperateFileOrDir)
 			//v1FileGroup.GET("/download", v1.UserFileDownloadCommonService)
 		}
 		v1DiskGroup := v1Group.Group("/disk")
 		v1DiskGroup.Use()
 		{
-			//获取磁盘列表
-			v1DiskGroup.GET("/list", v1.GetPlugInDisk)
+			v1DiskGroup.GET("/check", v1.GetDiskCheck)
+
+			v1DiskGroup.GET("/list", v1.GetDiskList)
 
 			//获取磁盘详情
 			v1DiskGroup.GET("/info", v1.GetDiskInfo)
 
-			//格式化磁盘
-			v1DiskGroup.POST("/format", v1.FormatDisk)
+			//format storage
+			v1DiskGroup.POST("/format", v1.PostDiskFormat)
 
-			//添加分区
-			v1DiskGroup.POST("/addpart", v1.AddPartition)
+			// add storage
+			v1DiskGroup.POST("/storage", v1.PostDiskAddPartition)
+
+			//mount SATA disk
+			v1DiskGroup.POST("/mount", v1.PostMountDisk)
+
+			//umount sata disk
+			v1DiskGroup.POST("/umount", v1.PostDiskUmount)
 
 			//获取可以格式化的内容
 			v1DiskGroup.GET("/type", v1.FormatDiskType)
 
 			//删除分区
 			v1DiskGroup.DELETE("/delpart", v1.RemovePartition)
+			v1DiskGroup.GET("/usb", v1.GetUSBList)
 
 		}
-		v1ShareGroup := v1Group.Group("/share")
-		v1ShareGroup.Use()
+		v1PersonGroup := v1Group.Group("/person")
+		v1PersonGroup.Use()
 		{
-			v1ShareGroup.POST("/add", v1.PostShareDirAdd)
-			v1ShareGroup.DELETE("/del/:id", v1.DeleteShareDirDel)
-			v1ShareGroup.GET("/list", v1.GetShareDirList)
-			v1ShareGroup.GET("/info/:id", v1.GetShareDirInfo)
-			v1ShareGroup.PUT("/update/:id", v1.PutShareDirEdit)
-		}
-		v1TaskGroup := v1Group.Group("/task")
-		v1TaskGroup.Use()
-		{
-			v1TaskGroup.GET("/list", v1.GetTaskList)
-			v1TaskGroup.PUT("/update", v1.PutTaskUpdate)
-			v1TaskGroup.POST("/add", v1.PostTaskAdd)
-			v1TaskGroup.PUT("/completion/:id", v1.PutTaskMarkerCompletion)
+			v1PersonGroup.GET("/detection", v1.GetPersonDetection)
+			v1PersonGroup.GET("/users", v1.GetPersonFriend)
+			v1PersonGroup.POST("/user/:shareids", v1.PostAddPersonFriend)
+			v1PersonGroup.DELETE("/user/:shareid", v1.DeletePersonFriend)
+			v1PersonGroup.GET("/directory", v1.GetPersonDirectory)
+			v1PersonGroup.GET("/file", v1.GetPersonFile)
+			v1PersonGroup.GET("/refile/:uuid", v1.GetPersonReFile)
+			v1PersonGroup.PUT("/remarks/:shareid", v1.PutPersonRemarks)
+			v1PersonGroup.GET("/list", v1.GetPersonDownloadList)
+			v1PersonGroup.DELETE("/file/:uuid", v1.DeletePersonDownloadFile)
+
+			v1PersonGroup.POST("/share", v1.PostPersonShare)
+			v1PersonGroup.POST("/file/:shareid", v1.PostPersonFile)
+			v1PersonGroup.GET("/share", v1.GetPersonShare)
+			v1PersonGroup.POST("/down/dir", v1.PostPersonDownDir)
+			v1PersonGroup.GET("/down/dir", v1.GetPersonDownDir)
+			v1PersonGroup.PUT("/block/:shareid", v1.PutPersonBlock)
+			v1PersonGroup.GET("/public", v1.GetPersonPublic)
+			v1PersonGroup.PUT("/friend/:shareid", v1.PutPersonAgreeFriend)
+			v1PersonGroup.PUT("/write/:shareid", v1.PutPersonWrite)
+			v1PersonGroup.GET("/image/thumbnail/:shareid", v1.GetPersonImageThumbnail)
 
 		}
-		v1ShortcutsGroup := v1Group.Group("/shortcuts")
-		v1ShortcutsGroup.Use()
-		{
-			v1ShortcutsGroup.GET("/list", v1.GetShortcutsList)
-			v1ShortcutsGroup.POST("/add", v1.PostShortcutsAdd)
-			v1ShortcutsGroup.PUT("/edit", v1.PutShortcutsEdit)
-			v1ShortcutsGroup.DELETE("/del/:id", v1.DeleteShortcutsDelete)
-		}
-		v1NotifyGroup := v1Group.Group("/notify")
-		v1NotifyGroup.Use()
-		{
-			v1NotifyGroup.GET("/ws", v1.NotifyWS)
-			v1NotifyGroup.PUT("/read/:id", v1.PutNotifyRead)
-		}
-		v1SearchGroup := v1Group.Group("/search")
-		v1SearchGroup.Use()
-		{
-			v1SearchGroup.GET("/search", v1.GetSearchList)
-		}
+		v1Group.GET("/sync/config", v1.GetSyncConfig)
 	}
 	return r
 }

route/socket.go

@@ -0,0 +1,60 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-05-23 17:18:56
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-06-09 21:48:10
+ * @FilePath: /CasaOS/route/socket.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package route
+
+import (
+	"strconv"
+	"time"
+
+	"github.com/IceWhaleTech/CasaOS/model/notify"
+	"github.com/IceWhaleTech/CasaOS/pkg/config"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/port"
+	"github.com/IceWhaleTech/CasaOS/service"
+	f "github.com/ambelovsky/gosf"
+)
+
+func SocketInit(msg chan notify.Message) {
+
+	// set socket port
+	socketPort := 0
+	if len(config.ServerInfo.SocketPort) == 0 {
+		socketPort, _ = port.GetAvailablePort("tcp")
+		config.ServerInfo.SocketPort = strconv.Itoa(socketPort)
+		config.Cfg.Section("server").Key("SocketPort").SetValue(strconv.Itoa(socketPort))
+		config.Cfg.SaveTo(config.SystemConfigInfo.ConfigPath)
+	} else {
+		socketPort, _ = strconv.Atoi(config.ServerInfo.SocketPort)
+		if !port.IsPortAvailable(socketPort, "tcp") {
+			socketPort, _ := port.GetAvailablePort("tcp")
+			config.ServerInfo.SocketPort = strconv.Itoa(socketPort)
+			config.Cfg.Section("server").Key("SocketPort").SetValue(strconv.Itoa(socketPort))
+			config.Cfg.SaveTo(config.SystemConfigInfo.ConfigPath)
+		}
+	}
+
+	f.OnConnect(func(c *f.Client, request *f.Request) {
+		service.ClientCount += 1
+	})
+	f.OnDisconnect(func(c *f.Client, request *f.Request) {
+		service.ClientCount -= 1
+	})
+	go func(msg chan notify.Message) {
+		for v := range msg {
+			f.Broadcast("", v.Path, &v.Msg)
+			time.Sleep(time.Millisecond * 100)
+		}
+
+	}(msg)
+
+	f.Startup(map[string]interface{}{
+		"port": socketPort})
+
+}

route/ui.go

@@ -1,9 +1,20 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-06-23 17:27:43
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-06-23 17:27:48
+ * @FilePath: /CasaOS/route/ui.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
 package route
 
 import (
+	"html/template"
+
 	"github.com/IceWhaleTech/CasaOS/web"
 	"github.com/gin-gonic/gin"
-	"html/template"
 )
 
 func WebUIHome(c *gin.Context) {

route/v1/app.go

@@ -1,15 +1,18 @@
 package v1
 
 import (
-	"github.com/IceWhaleTech/CasaOS/model"
-	"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
-	oasis_err2 "github.com/IceWhaleTech/CasaOS/pkg/utils/oasis_err"
-	port2 "github.com/IceWhaleTech/CasaOS/pkg/utils/port"
-	"github.com/IceWhaleTech/CasaOS/pkg/utils/sort"
-	"github.com/IceWhaleTech/CasaOS/service"
-	"github.com/gin-gonic/gin"
+	"encoding/json"
+	"io/ioutil"
 	"net/http"
 	"strconv"
+
+	"github.com/IceWhaleTech/CasaOS/model"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/common_err"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
+
+	port2 "github.com/IceWhaleTech/CasaOS/pkg/utils/port"
+	"github.com/IceWhaleTech/CasaOS/service"
+	"github.com/gin-gonic/gin"
 )
 
 // @Summary 获取远程列表
@@ -29,22 +32,39 @@ func AppList(c *gin.Context) {
 	//service.MyService.Docker().DockerContainerCommit("test2")
 
 	index := c.DefaultQuery("index", "1")
-	size := c.DefaultQuery("size", "10")
+	size := c.DefaultQuery("size", "10000")
 	t := c.DefaultQuery("type", "rank")
 	categoryId := c.DefaultQuery("category_id", "0")
 	key := c.DefaultQuery("key", "")
-	list, count := service.MyService.OAPI().GetServerList(index, size, t, categoryId, key)
-	for i := 0; i < len(list); i++ {
-		ct, _ := service.MyService.Docker().DockerListByImage(list[i].Image, list[i].ImageVersion)
-		if ct != nil {
-			list[i].State = ct.State
-		}
+	if len(index) == 0 || len(size) == 0 || len(t) == 0 || len(categoryId) == 0 {
+		c.JSON(http.StatusOK, &model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)})
+		return
 	}
-	data := make(map[string]interface{}, 2)
-	data["count"] = count
-	data["items"] = list
+	collection := service.MyService.Casa().GetServerList(index, size, t, categoryId, key)
+	// for i := 0; i < len(recommend); i++ {
+	// 	ct, _ := service.MyService.Docker().DockerListByImage(recommend[i].Image, recommend[i].ImageVersion)
+	// 	if ct != nil {
+	// 		recommend[i].State = ct.State
+	// 	}
+	// }
+	// for i := 0; i < len(list); i++ {
+	// 	ct, _ := service.MyService.Docker().DockerListByImage(list[i].Image, list[i].ImageVersion)
+	// 	if ct != nil {
+	// 		list[i].State = ct.State
+	// 	}
+	// }
+	// for i := 0; i < len(community); i++ {
+	// 	ct, _ := service.MyService.Docker().DockerListByImage(community[i].Image, community[i].ImageVersion)
+	// 	if ct != nil {
+	// 		community[i].State = ct.State
+	// 	}
+	// }
+	data := make(map[string]interface{}, 3)
+	data["recommend"] = collection.Recommend
+	data["list"] = collection.List
+	data["community"] = collection.Community
 
-	c.JSON(http.StatusOK, &model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: data})
+	c.JSON(http.StatusOK, &model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: data})
 }
 
 // @Summary 获取一个可用端口
@@ -63,7 +83,7 @@ func GetPort(c *gin.Context) {
 		p, _ = port2.GetAvailablePort(t)
 		ok = !port2.IsPortAvailable(p, t)
 	}
-	c.JSON(http.StatusOK, &model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: p})
+	c.JSON(http.StatusOK, &model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: p})
 }
 
 // @Summary 检查端口是否可用
@@ -78,7 +98,7 @@ func GetPort(c *gin.Context) {
 func PortCheck(c *gin.Context) {
 	p, _ := strconv.Atoi(c.Param("port"))
 	t := c.DefaultQuery("type", "tcp")
-	c.JSON(http.StatusOK, &model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: port2.IsPortAvailable(p, t)})
+	c.JSON(http.StatusOK, &model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: port2.IsPortAvailable(p, t)})
 }
 
 // @Summary 我的应用列表
@@ -90,13 +110,29 @@ func PortCheck(c *gin.Context) {
 // @Param  size query int false "size"
 // @Param  position query bool false "是否是首页应用"
 // @Success 200 {string} string "ok"
-// @Router /app/mylist [get]
+// @Router /app/my/list [get]
 func MyAppList(c *gin.Context) {
 	index, _ := strconv.Atoi(c.DefaultQuery("index", "1"))
 	size, _ := strconv.Atoi(c.DefaultQuery("size", "0"))
 	position, _ := strconv.ParseBool(c.DefaultQuery("position", "true"))
-	list := service.MyService.App().GetMyList(index, size, position)
-	c.JSON(http.StatusOK, &model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: list})
+	list, unTranslation := service.MyService.App().GetMyList(index, size, position)
+	data := make(map[string]interface{}, 2)
+	data["list"] = list
+	data["local"] = unTranslation
+
+	c.JSON(http.StatusOK, &model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: data})
+}
+
+// @Summary my app hardware usage list
+// @Produce  application/json
+// @Accept application/json
+// @Tags app
+// @Security ApiKeyAuth
+// @Success 200 {string} string "ok"
+// @Router /app/usage [get]
+func AppUsageList(c *gin.Context) {
+	list := service.MyService.App().GetHardwareUsage()
+	c.JSON(http.StatusOK, &model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: list})
 }
 
 // @Summary 应用详情
@@ -110,55 +146,75 @@ func MyAppList(c *gin.Context) {
 func AppInfo(c *gin.Context) {
 
 	id := c.Param("id")
-	info := service.MyService.App().GetServerAppInfo(id)
+	language := c.GetHeader("Language")
+	info := service.MyService.Casa().GetServerAppInfo(id, "", language)
 	if info.NetworkModel != "host" {
-		port, _ := port2.GetAvailablePort("tcp")
-		info.PortMap = uint(port)
-		for i := 0; i < len(info.Configures.TcpPorts); i++ {
-			info.Configures.TcpPorts[i].CommendPort, _ = port2.GetAvailablePort("tcp")
-		}
-		for i := 0; i < len(info.Configures.UdpPorts); i++ {
-			info.Configures.UdpPorts[i].CommendPort, _ = port2.GetAvailablePort("udp")
+		for i := 0; i < len(info.Ports); i++ {
+			if p, _ := strconv.Atoi(info.Ports[i].ContainerPort); port2.IsPortAvailable(p, info.Ports[i].Protocol) {
+				info.Ports[i].CommendPort = strconv.Itoa(p)
+			} else {
+				if info.Ports[i].Protocol == "tcp" {
+					if p, err := port2.GetAvailablePort("tcp"); err == nil {
+						info.Ports[i].CommendPort = strconv.Itoa(p)
+					}
+				} else if info.Ports[i].Protocol == "upd" {
+					if p, err := port2.GetAvailablePort("udp"); err == nil {
+						info.Ports[i].CommendPort = strconv.Itoa(p)
+					}
+				}
+			}
+
+			if info.Ports[i].Type == 0 {
+				info.PortMap = info.Ports[i].CommendPort
+			}
 		}
 	} else {
-		info.PortMap = info.TcpPort
-	}
-
-	for i := 0; i < len(info.Configures.Devices); i++ {
-		if !file.CheckNotExist(info.Configures.Devices[i].ContainerPath) {
-			info.Configures.Devices[i].Path = info.Configures.Devices[i].ContainerPath
+		for i := 0; i < len(info.Ports); i++ {
+			if info.Ports[i].Type == 0 {
+				info.PortMap = info.Ports[i].ContainerPort
+				break
+			}
 		}
 	}
 
-	portOrder := func(c1, c2 *model.Ports) bool {
-		return c1.Type < c2.Type
+	for i := 0; i < len(info.Devices); i++ {
+		if !file.CheckNotExist(info.Devices[i].ContainerPath) {
+			info.Devices[i].Path = info.Devices[i].ContainerPath
+		}
 	}
+	// if len(info.Tip) > 0 {
+	// 	info.Tip = env_helper.ReplaceStringDefaultENV(info.Tip)
+	// }
 
-	envOrder := func(c1, c2 *model.Envs) bool {
-		return c1.Type < c2.Type
-	}
+	// portOrder := func(c1, c2 *model.Ports) bool {
+	// 	return c1.Type < c2.Type
+	// }
 
-	volOrder := func(c1, c2 *model.Volume) bool {
-		return c1.Type < c2.Type
-	}
+	// envOrder := func(c1, c2 *model.Envs) bool {
+	// 	return c1.Type < c2.Type
+	// }
 
-	devOrder := func(c1, c2 *model.Devices) bool {
-		return c1.Type < c2.Type
-	}
+	// volOrder := func(c1, c2 *model.Volume) bool {
+	// 	return c1.Type < c2.Type
+	// }
+
+	// devOrder := func(c1, c2 *model.Devices) bool {
+	// 	return c1.Type < c2.Type
+	// }
 
 	//sort
-	if info.NetworkModel != "host" {
-		sort.PortsSort(portOrder).Sort(info.Configures.TcpPorts)
-		sort.PortsSort(portOrder).Sort(info.Configures.UdpPorts)
-	}
+	// if info.NetworkModel != "host" {
+	// 	sort.PortsSort(portOrder).Sort(info.Configures.TcpPorts)
+	// 	sort.PortsSort(portOrder).Sort(info.Configures.UdpPorts)
+	// }
 
-	sort.EnvSort(envOrder).Sort(info.Configures.Envs)
-	sort.VolSort(volOrder).Sort(info.Configures.Volumes)
-	sort.DevSort(devOrder).Sort(info.Configures.Devices)
+	// sort.EnvSort(envOrder).Sort(info.Envs)
+	// sort.VolSort(volOrder).Sort(info.Volumes.([]model.PathMap))
+	// sort.DevSort(devOrder).Sort(info.Devices)
 
-	info.MaxMemory = service.MyService.ZiMa().GetMemInfo().Total >> 20
+	info.MaxMemory = (service.MyService.System().GetMemInfo()["total"]).(uint64) >> 20
 
-	c.JSON(http.StatusOK, &model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: info})
+	c.JSON(http.StatusOK, &model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: info})
 }
 
 // @Summary 获取远程分类列表
@@ -169,14 +225,27 @@ func AppInfo(c *gin.Context) {
 // @Success 200 {string} string "ok"
 // @Router /app/category [get]
 func CategoryList(c *gin.Context) {
-	list := service.MyService.OAPI().GetServerCategoryList()
+	list := service.MyService.Casa().GetServerCategoryList()
 	var count uint = 0
 	for _, category := range list {
 		count += category.Count
 	}
 
-	rear := append([]model.ServerCategoryList{}, list[0:]...)
-	list = append(list[:0], model.ServerCategoryList{Count: count, Name: "All"})
+	rear := append([]model.CategoryList{}, list[0:]...)
+	list = append(list[:0], model.CategoryList{Count: count, Name: "All", Font: "apps"})
 	list = append(list, rear...)
-	c.JSON(http.StatusOK, &model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: list})
+	c.JSON(http.StatusOK, &model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: list})
+}
+
+// @Summary 分享该应用配置
+// @Produce  application/json
+// @Accept application/json
+// @Tags app
+// @Security ApiKeyAuth
+// @Success 200 {string} string "ok"
+// @Router /app/share [post]
+func ShareAppFile(c *gin.Context) {
+	str, _ := ioutil.ReadAll(c.Request.Body)
+	content := service.MyService.Casa().ShareAppFile(str)
+	c.JSON(http.StatusOK, json.RawMessage(content))
 }

route/v1/ddns.go

@@ -1,174 +0,0 @@
-package v1
-
-import (
-	"fmt"
-	"github.com/IceWhaleTech/CasaOS/model"
-	ip_helper2 "github.com/IceWhaleTech/CasaOS/pkg/utils/ip_helper"
-	oasis_err2 "github.com/IceWhaleTech/CasaOS/pkg/utils/oasis_err"
-	"github.com/IceWhaleTech/CasaOS/service"
-	model2 "github.com/IceWhaleTech/CasaOS/service/model"
-	"github.com/forease/gotld"
-	"github.com/gin-gonic/gin"
-	"net/http"
-	"os/exec"
-	"strconv"
-	"strings"
-)
-
-// @Summary 获取可以设置的ddns列表
-// @Produce  application/json
-// @Accept application/json
-// @Tags ddns
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /ddns/getlist [get]
-func DDNSGetDomainList(c *gin.Context) {
-
-	host, domain, tld := gotld.GetSubdomain("bbb.aaa.liru-05.com.cn", 3)
-	fmt.Println(strings.Replace(host, "."+domain, "", 1))
-	fmt.Println(domain)
-	fmt.Println(tld)
-
-	data := make(map[string]interface{}, 2)
-	t, api := service.MyService.DDNS().GetType("godaddy")
-	data["godaddy"] = &model.GoDaddyModel{Type: t, ApiHost: api}
-	c.JSON(http.StatusOK,
-		model.Result{
-			Success: oasis_err2.SUCCESS,
-			Message: oasis_err2.GetMsg(oasis_err2.SUCCESS),
-			Data:    data,
-		})
-	return
-}
-
-// @Summary 添加新的ddns（按给定模型返回内容）
-// @Produce  application/json
-// @Accept multipart/form-data
-// @Tags ddns
-// @Param type formData string true "类型"
-// @Param host formData string true "host"
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /ddns/set [post]
-func DDNSAddConfig(c *gin.Context) {
-	t, _ := strconv.Atoi(c.PostForm("type"))
-	host := c.PostForm("host")
-	_, domain, _ := gotld.GetSubdomain("host", 3)
-	sub := strings.ReplaceAll(host, "."+domain, "")
-
-	if service.MyService.DDNS().IsExis(t, domain, sub) {
-		c.JSON(http.StatusOK,
-			model.Result{
-				Success: oasis_err2.ERROR,
-				Message: "Repeat add",
-			})
-		return
-	}
-	var m model2.DDNSUpdataDBModel
-	c.Bind(&m)
-	if err := service.MyService.DDNS().SaveConfig(m); err != nil {
-		c.JSON(http.StatusOK,
-			model.Result{
-				Success: oasis_err2.ERROR,
-				Message: oasis_err2.GetMsg(oasis_err2.ERROR),
-				Data:    err.Error(),
-			})
-		return
-	}
-	c.JSON(http.StatusOK,
-		model.Result{
-			Success: oasis_err2.SUCCESS,
-			Message: oasis_err2.GetMsg(oasis_err2.SUCCESS),
-		})
-}
-
-// @Summary 获取ip,仅做展示使用
-// @Produce  application/json
-// @Accept application/json
-// @Tags ddns
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /ddns/ip [get]
-func DDNSGetIP(c *gin.Context) {
-	ipv4, ipv6 := service.MyService.DDNS().GetExternalIP()
-	var ipjson = make(map[string]string, 2)
-	ipjson["ipv4"] = ipv4
-	ipjson["ipv6"] = ipv6
-	c.JSON(http.StatusOK, &model.Result{
-		Success: oasis_err2.SUCCESS,
-		Message: oasis_err2.GetMsg(oasis_err2.SUCCESS),
-		Data:    ipjson,
-	})
-}
-
-// @Summary 测试网址是否可以ping通
-// @Produce  application/json
-// @Accept application/json
-// @Tags ddns
-// @Param  api_host path int true "api地址"
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /ddns/ping/{api_host} [get]
-func DDNSPing(c *gin.Context) {
-	url := c.Param("api_host")
-	url = strings.ReplaceAll(url, "https://", "")
-	url = strings.ReplaceAll(url, "http://", "")
-	cmd := exec.Command("ping", url, "-c", "1", "-W", "5")
-	err := cmd.Run()
-	if err != nil {
-		c.JSON(http.StatusOK, &model.Result{
-			Success: oasis_err2.ERROR,
-			Message: err.Error(),
-			Data:    false,
-		})
-	} else {
-		c.JSON(http.StatusOK, &model.Result{
-			Success: oasis_err2.SUCCESS,
-			Message: oasis_err2.GetMsg(oasis_err2.SUCCESS),
-			Data:    true,
-		})
-	}
-}
-
-// @Summary 获取已设置的列表
-// @Produce  application/json
-// @Accept application/json
-// @Tags ddns
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /ddns/list [get]
-func DDNSConfigList(c *gin.Context) {
-	j := service.MyService.DDNS().GetConfigList()
-	ip4 := ip_helper2.GetExternalIPV4()
-	ip6 := ip_helper2.GetExternalIPV6()
-	for i := 0; i < len(*j); i++ {
-		(*j)[i].IPV6 = ip6
-		(*j)[i].IPV4 = ip4
-		cmd := exec.Command("ping", (*j)[i].Host+"."+(*j)[i].Domain, "-c", "1", "-W", "3")
-		err := cmd.Run()
-		if err != nil {
-			(*j)[i].State = false
-		} else {
-			(*j)[i].State = true
-		}
-	}
-	c.JSON(http.StatusOK, &model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: j})
-}
-
-// @Summary 删除ddns
-// @Produce  application/json
-// @Accept application/json
-// @Tags ddns
-// @Param id path int true "ID"
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /ddns/delete/{id} [delete]
-func DDNSDelete(c *gin.Context) {
-	id, err := strconv.ParseUint(c.Param("id"), 10, 32)
-	if err != nil {
-		c.JSON(http.StatusOK, &model.Result{Success: oasis_err2.ERROR, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-		return
-	}
-	isok := service.MyService.DDNS().DeleteConfig(uint(id))
-	c.JSON(http.StatusOK, &model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: isok})
-}

route/v1/disk.go

@@ -1,65 +1,163 @@
 package v1
 
 import (
+	"fmt"
+	"net/http"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+
 	"github.com/IceWhaleTech/CasaOS/model"
-	"github.com/IceWhaleTech/CasaOS/pkg/utils/oasis_err"
+	"github.com/IceWhaleTech/CasaOS/pkg/config"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/common_err"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
 	"github.com/IceWhaleTech/CasaOS/service"
+	model2 "github.com/IceWhaleTech/CasaOS/service/model"
 	"github.com/gin-gonic/gin"
 	"github.com/shirou/gopsutil/v3/disk"
-	"net/http"
-	"strconv"
 )
 
-// @Summary 获取磁盘列表
+var diskMap = make(map[string]string)
+
+// @Summary disk list
 // @Produce  application/json
 // @Accept application/json
 // @Tags disk
 // @Security ApiKeyAuth
 // @Success 200 {string} string "ok"
 // @Router /disk/list [get]
-func GetPlugInDisk(c *gin.Context) {
+func GetDiskList(c *gin.Context) {
+	list := service.MyService.Disk().LSBLK(false)
+	dbList := service.MyService.Disk().GetSerialAll()
+	part := make(map[string]int64, len(dbList))
+	for _, v := range dbList {
+		part[v.MountPoint] = v.CreatedAt
+	}
+	findSystem := 0
 
-	//ls := service.MyService.Disk().GetPlugInDisk()
-	//fmt.Println(ls)
-	//dd, _ := disk.Partitions(true)
-	//fmt.Println(dd)
-	//
-	//dir, err := ioutil.ReadDir("/sys/block")
-	//if err != nil {
-	//	panic(err)
-	//}
-	//
-	//files := make([]string, 0)
-	//
-	////fmt.Println(regexp.MatchString("sd[a-z]*[0-9]", "sda"))
-	//
-	//for _, f := range dir {
-	//	if match, _ := regexp.MatchString("sd[a-z]", f.Name()); match {
-	//		files = append(files, f.Name())
-	//	}
-	//}
-	//fmt.Println(files)
-	//filess := make([]string, 0)
-	//for _, file := range files {
-	//	dirs, _ := ioutil.ReadDir("/sys/block/" + file)
-	//
-	//	for _, f := range dirs {
-	//		if match, _ := regexp.MatchString("sd[a-z]*[0-9]", f.Name()); match {
-	//			filess = append(filess, f.Name())
-	//		}
-	//	}
-	//}
-	//fmt.Println(filess)
-	//
-	//for _, s := range filess {
-	//	fmt.Println(disk.Usage("/dev/" + s))
-	//}
+	disks := []model.Drive{}
+	storage := []model.Storage{}
+	avail := []model.Drive{}
+	for i := 0; i < len(list); i++ {
+		disk := model.Drive{}
+		if list[i].Rota {
+			disk.DiskType = "HDD"
+		} else {
+			disk.DiskType = "SSD"
+		}
+		disk.Serial = list[i].Serial
+		disk.Name = list[i].Name
+		disk.Size = list[i].Size
+		disk.Path = list[i].Path
+		disk.Model = list[i].Model
 
-	lst := service.MyService.Disk().LSBLK()
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err.SUCCESS, Message: oasis_err.GetMsg(oasis_err.SUCCESS), Data: lst})
+		if len(list[i].Children) > 0 && findSystem == 0 {
+			for j := 0; j < len(list[i].Children); j++ {
+				if len(list[i].Children[j].Children) > 0 {
+					for _, v := range list[i].Children[j].Children {
+						if v.MountPoint == "/" {
+							stor := model.Storage{}
+							stor.Name = "System"
+							stor.MountPoint = v.MountPoint
+							stor.Size = v.FSSize
+							stor.Avail = v.FSAvail
+							stor.Path = v.Path
+							stor.Type = v.FsType
+							stor.DriveName = "System"
+							disk.Model = "System"
+							if strings.Contains(v.SubSystems, "mmc") {
+								disk.DiskType = "MMC"
+							} else if strings.Contains(v.SubSystems, "usb") {
+								disk.DiskType = "USB"
+							}
+							disk.Health = "true"
+
+							disks = append(disks, disk)
+							storage = append(storage, stor)
+							findSystem = 1
+							break
+						}
+					}
+				} else {
+					if list[i].Children[j].MountPoint == "/" {
+						stor := model.Storage{}
+						stor.Name = "System"
+						stor.MountPoint = list[i].Children[j].MountPoint
+						stor.Size = list[i].Children[j].FSSize
+						stor.Avail = list[i].Children[j].FSAvail
+						stor.Path = list[i].Children[j].Path
+						stor.Type = list[i].Children[j].FsType
+						stor.DriveName = "System"
+						disk.Model = "System"
+						if strings.Contains(list[i].Children[j].SubSystems, "mmc") {
+							disk.DiskType = "MMC"
+						} else if strings.Contains(list[i].Children[j].SubSystems, "usb") {
+							disk.DiskType = "USB"
+						}
+						disk.Health = "true"
+
+						disks = append(disks, disk)
+						storage = append(storage, stor)
+						findSystem = 1
+						break
+					}
+				}
+
+			}
+		}
+		if findSystem == 1 {
+			findSystem += 1
+			continue
+		}
+
+		if list[i].Tran == "sata" || list[i].Tran == "nvme" || list[i].Tran == "spi" || list[i].Tran == "sas" || strings.Contains(list[i].SubSystems, "virtio") || (list[i].Tran == "ata" && list[i].Type == "disk") {
+			temp := service.MyService.Disk().SmartCTL(list[i].Path)
+			if reflect.DeepEqual(temp, model.SmartctlA{}) {
+				temp.SmartStatus.Passed = true
+			}
+			if len(list[i].Children) == 1 && len(list[i].Children[0].MountPoint) > 0 {
+				stor := model.Storage{}
+				stor.MountPoint = list[i].Children[0].MountPoint
+				stor.Size = list[i].Children[0].FSSize
+				stor.Avail = list[i].Children[0].FSAvail
+				stor.Path = list[i].Children[0].Path
+				stor.Type = list[i].Children[0].FsType
+				stor.DriveName = list[i].Name
+				pathArr := strings.Split(list[i].Children[0].MountPoint, "/")
+				if len(pathArr) == 3 {
+					stor.Name = pathArr[2]
+				}
+				if t, ok := part[list[i].Children[0].MountPoint]; ok {
+					stor.CreatedAt = t
+				}
+				storage = append(storage, stor)
+			} else {
+				//todo   长度有问题
+				if len(list[i].Children) == 1 && list[i].Children[0].FsType == "ext4" {
+					disk.NeedFormat = false
+					avail = append(avail, disk)
+				} else {
+					disk.NeedFormat = true
+					avail = append(avail, disk)
+				}
+			}
+
+			disk.Temperature = temp.Temperature.Current
+			disk.Health = strconv.FormatBool(temp.SmartStatus.Passed)
+
+			disks = append(disks, disk)
+		}
+	}
+	data := make(map[string]interface{}, 3)
+	data["drive"] = disks
+	data["storage"] = storage
+	data["avail"] = avail
+
+	c.JSON(http.StatusOK, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: data})
 }
 
-// @Summary 获取磁盘列表
+// @Summary get disk list
 // @Produce  application/json
 // @Accept application/json
 // @Tags disk
@@ -68,57 +166,72 @@ func GetPlugInDisk(c *gin.Context) {
 // @Router /disk/lists [get]
 func GetPlugInDisks(c *gin.Context) {
 
-	list := service.MyService.Disk().LSBLK()
+	list := service.MyService.Disk().LSBLK(true)
 	var result []*disk.UsageStat
 	for _, item := range list {
 		result = append(result, service.MyService.Disk().GetDiskInfoByPath(item.Path))
 	}
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err.SUCCESS, Message: oasis_err.GetMsg(oasis_err.SUCCESS), Data: result})
+	c.JSON(http.StatusOK, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: result})
 }
 
-// @Summary 磁盘详情
+// @Summary disk detail
 // @Produce  application/json
 // @Accept application/json
 // @Tags disk
 // @Security ApiKeyAuth
-// @Param  path query string true "要获取的磁盘详情 例如/dev/sda"
+// @Param  path query string true "for example /dev/sda"
 // @Success 200 {string} string "ok"
 // @Router /disk/info [get]
 func GetDiskInfo(c *gin.Context) {
 	path := c.Query("path")
 	if len(path) == 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err.INVALID_PARAMS, Message: oasis_err.GetMsg(oasis_err.INVALID_PARAMS)})
+		c.JSON(http.StatusOK, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)})
 	}
 	m := service.MyService.Disk().GetDiskInfo(path)
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err.SUCCESS, Message: oasis_err.GetMsg(oasis_err.SUCCESS), Data: m})
+	c.JSON(http.StatusOK, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: m})
 }
 
-// @Summary 磁盘详情
+// @Summary format storage
 // @Produce  application/json
 // @Accept multipart/form-data
 // @Tags disk
 // @Security ApiKeyAuth
-// @Param  path formData string true "磁盘路径 例如/dev/sda1"
+// @Param  path formData string true "e.g. /dev/sda1"
+// @Param  pwd formData string true "user password"
+// @Param  volume formData string true "mount point"
 // @Success 200 {string} string "ok"
 // @Router /disk/format [post]
-func FormatDisk(c *gin.Context) {
+func PostDiskFormat(c *gin.Context) {
 	path := c.PostForm("path")
+	t := "ext4"
+	pwd := c.PostForm("pwd")
+	volume := c.PostForm("volume")
 
-	t := c.PostForm("type")
-
-	if len(path) == 0 || len(t) == 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err.INVALID_PARAMS, Message: oasis_err.GetMsg(oasis_err.INVALID_PARAMS)})
+	if pwd != config.UserInfo.PWD {
+		c.JSON(http.StatusOK, model.Result{Success: common_err.PWD_INVALID, Message: common_err.GetMsg(common_err.PWD_INVALID)})
+		return
 	}
 
-	//删除挂载点
+	if len(path) == 0 || len(t) == 0 {
+		c.JSON(http.StatusOK, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)})
+		return
+	}
+	if _, ok := diskMap[path]; ok {
+		c.JSON(http.StatusOK, model.Result{Success: common_err.DISK_BUSYING, Message: common_err.GetMsg(common_err.DISK_BUSYING)})
+		return
+	}
+	diskMap[path] = "busying"
 	service.MyService.Disk().UmountPointAndRemoveDir(path)
-
-	//格式化磁盘
-	service.MyService.Disk().FormatDisk(path, t)
-
-	//重新挂载
-
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err.SUCCESS, Message: oasis_err.GetMsg(oasis_err.SUCCESS)})
+	format := service.MyService.Disk().FormatDisk(path, t)
+	if len(format) == 0 {
+		c.JSON(http.StatusOK, model.Result{Success: common_err.FORMAT_ERROR, Message: common_err.GetMsg(common_err.FORMAT_ERROR)})
+		delete(diskMap, path)
+		return
+	}
+	service.MyService.Disk().MountDisk(path, volume)
+	service.MyService.Disk().RemoveLSBLKCache()
+	delete(diskMap, path)
+	c.JSON(http.StatusOK, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS)})
 }
 
 // @Summary 获取支持的格式
@@ -130,7 +243,7 @@ func FormatDisk(c *gin.Context) {
 // @Router /disk/type [get]
 func FormatDiskType(c *gin.Context) {
 	var strArr = [4]string{"fat32", "ntfs", "ext4", "exfat"}
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err.SUCCESS, Message: oasis_err.GetMsg(oasis_err.SUCCESS), Data: strArr})
+	c.JSON(http.StatusOK, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: strArr})
 
 }
 
@@ -146,33 +259,241 @@ func RemovePartition(c *gin.Context) {
 	path := c.PostForm("path")
 
 	if len(path) == 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err.INVALID_PARAMS, Message: oasis_err.GetMsg(oasis_err.INVALID_PARAMS)})
+		c.JSON(http.StatusOK, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)})
 	}
 	var p = path[:len(path)-1]
 	var n = path[len(path)-1:]
 	service.MyService.Disk().DelPartition(p, n)
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err.SUCCESS, Message: oasis_err.GetMsg(oasis_err.SUCCESS)})
+	c.JSON(http.StatusOK, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS)})
 }
 
-// @Summary 添加分区
+// @Summary  add storage
 // @Produce  application/json
 // @Accept multipart/form-data
 // @Tags disk
 // @Security ApiKeyAuth
-// @Param  path formData string true "磁盘路径 例如/dev/sda"
-// @Param  size formData string true "需要分区容量大小(MB)"
-// @Param  num formData string true "磁盘符号"
+// @Param  path formData string true "disk path  e.g. /dev/sda"
+// @Param  serial formData string true "serial"
+// @Param  name formData string true "name"
+// @Param  format formData bool true "need format(true)"
 // @Success 200 {string} string "ok"
-// @Router /disk/addpart [post]
-func AddPartition(c *gin.Context) {
+// @Router /disk/storage [post]
+func PostDiskAddPartition(c *gin.Context) {
+
+	name := c.PostForm("name")
 	path := c.PostForm("path")
-	size, _ := strconv.Atoi(c.DefaultPostForm("size", "0"))
-	num := c.DefaultPostForm("num", "9")
-	if len(path) == 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err.INVALID_PARAMS, Message: oasis_err.GetMsg(oasis_err.INVALID_PARAMS)})
+	format, _ := strconv.ParseBool(c.PostForm("format"))
+
+	if len(name) == 0 || len(path) == 0 {
+		c.JSON(http.StatusOK, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)})
+		return
+	}
+	if _, ok := diskMap[path]; ok {
+		c.JSON(http.StatusOK, model.Result{Success: common_err.DISK_BUSYING, Message: common_err.GetMsg(common_err.DISK_BUSYING)})
+		return
+	}
+	if !file.CheckNotExist("/DATA/" + name) {
+		// /mnt/name exist
+		c.JSON(http.StatusOK, model.Result{Success: common_err.NAME_NOT_AVAILABLE, Message: common_err.GetMsg(common_err.NAME_NOT_AVAILABLE)})
+		return
+	}
+	diskMap[path] = "busying"
+	currentDisk := service.MyService.Disk().GetDiskInfo(path)
+	if !format {
+		if len(currentDisk.Children) != 1 || !(len(currentDisk.Children) > 0 && currentDisk.Children[0].FsType == "ext4") {
+			c.JSON(http.StatusOK, model.Result{Success: common_err.DISK_NEEDS_FORMAT, Message: common_err.GetMsg(common_err.DISK_NEEDS_FORMAT)})
+			delete(diskMap, path)
+			return
+		}
+	} else {
+		service.MyService.Disk().AddPartition(path)
 	}
 
-	//size*1024*1024/512
-	service.MyService.Disk().AddPartition(path, num, uint64(size*1024*2))
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err.SUCCESS, Message: oasis_err.GetMsg(oasis_err.SUCCESS)})
+	formatBool := true
+	for formatBool {
+		currentDisk = service.MyService.Disk().GetDiskInfo(path)
+		fmt.Println(currentDisk.Children)
+		if len(currentDisk.Children) > 0 {
+			formatBool = false
+			break
+		}
+		time.Sleep(time.Second)
+	}
+	currentDisk = service.MyService.Disk().GetDiskInfo(path)
+	if len(currentDisk.Children) != 1 {
+		c.JSON(http.StatusOK, model.Result{Success: common_err.DISK_NEEDS_FORMAT, Message: common_err.GetMsg(common_err.DISK_NEEDS_FORMAT)})
+		return
+	}
+
+	mountPath := "/DATA/" + name
+	m := model2.SerialDisk{}
+	m.MountPoint = mountPath
+	m.Path = currentDisk.Children[0].Path
+	m.UUID = currentDisk.Children[0].UUID
+	m.State = 0
+	m.CreatedAt = time.Now().Unix()
+	service.MyService.Disk().SaveMountPoint(m)
+
+	//mount dir
+	service.MyService.Disk().MountDisk(currentDisk.Children[0].Path, mountPath)
+
+	service.MyService.Disk().RemoveLSBLKCache()
+
+	delete(diskMap, path)
+	c.JSON(http.StatusOK, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS)})
+}
+
+// @Summary add mount point
+// @Produce  application/json
+// @Accept multipart/form-data
+// @Tags disk
+// @Security ApiKeyAuth
+// @Param  path formData string true "for example: /dev/sda1"
+// @Param  serial formData string true "disk id"
+// @Success 200 {string} string "ok"
+// @Router /disk/mount [post]
+func PostMountDisk(c *gin.Context) {
+	// for example: path=/dev/sda1
+	path := c.PostForm("path")
+	serial := c.PostForm("serial")
+
+	mountPath := "/DATA/volume"
+	var list = service.MyService.Disk().GetSerialAll()
+	var pathMapList = make(map[string]string, len(list))
+	for _, v := range list {
+		pathMapList[v.MountPoint] = "1"
+	}
+
+	for i := 0; i < len(list)+1; i++ {
+		if _, ok := pathMapList[mountPath+strconv.Itoa(i)]; !ok {
+			mountPath = mountPath + strconv.Itoa(i)
+			break
+		}
+	}
+
+	//mount dir
+	service.MyService.Disk().MountDisk(path, mountPath)
+
+	m := model2.SerialDisk{}
+	m.MountPoint = mountPath
+	m.Path = path
+	m.UUID = serial
+	m.State = 0
+	//service.MyService.Disk().SaveMountPoint(m)
+	c.JSON(http.StatusOK, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS)})
+}
+
+// @Summary remove mount point
+// @Produce  application/json
+// @Accept multipart/form-data
+// @Tags disk
+// @Security ApiKeyAuth
+// @Param  path formData string true "e.g. /dev/sda1"
+// @Param  mount_point formData string true "e.g. /mnt/volume1"
+// @Param  pwd formData string true "user password"
+// @Success 200 {string} string "ok"
+// @Router /disk/umount [post]
+func PostDiskUmount(c *gin.Context) {
+
+	path := c.PostForm("path")
+	mountPoint := c.PostForm("volume")
+	pwd := c.PostForm("pwd")
+
+	if len(path) == 0 || len(mountPoint) == 0 {
+		c.JSON(http.StatusOK, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)})
+		return
+	}
+	if pwd != config.UserInfo.PWD {
+		c.JSON(http.StatusOK, model.Result{Success: common_err.PWD_INVALID, Message: common_err.GetMsg(common_err.PWD_INVALID)})
+		return
+	}
+
+	if _, ok := diskMap[path]; ok {
+		c.JSON(http.StatusOK, model.Result{Success: common_err.DISK_BUSYING, Message: common_err.GetMsg(common_err.DISK_BUSYING)})
+		return
+	}
+
+	service.MyService.Disk().UmountPointAndRemoveDir(path)
+	//delete data
+	service.MyService.Disk().DeleteMountPoint(path, mountPoint)
+	service.MyService.Disk().RemoveLSBLKCache()
+	c.JSON(http.StatusOK, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS)})
+}
+
+// @Summary confirm delete disk
+// @Produce  application/json
+// @Accept application/json
+// @Tags disk
+// @Security ApiKeyAuth
+// @Param  id path string true "id"
+// @Success 200 {string} string "ok"
+// @Router /disk/remove/{id} [delete]
+func DeleteDisk(c *gin.Context) {
+	id := c.Param("id")
+	service.MyService.Disk().DeleteMount(id)
+	c.JSON(http.StatusOK, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS)})
+}
+
+// @Summary check mount point
+// @Produce  application/json
+// @Accept application/json
+// @Tags disk
+// @Security ApiKeyAuth
+// @Success 200 {string} string "ok"
+// @Router /disk/init [get]
+func GetDiskCheck(c *gin.Context) {
+
+	dbList := service.MyService.Disk().GetSerialAll()
+	list := service.MyService.Disk().LSBLK(true)
+
+	mapList := make(map[string]string)
+
+	for _, v := range list {
+		mapList[v.Serial] = "1"
+	}
+
+	for _, v := range dbList {
+		if _, ok := mapList[v.UUID]; !ok {
+			//disk undefind
+			c.JSON(http.StatusOK, model.Result{Success: common_err.ERROR, Message: common_err.GetMsg(common_err.ERROR), Data: "disk undefind"})
+			return
+		}
+	}
+
+	c.JSON(http.StatusOK, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS)})
+}
+
+// @Summary check mount point
+// @Produce  application/json
+// @Accept application/json
+// @Tags disk
+// @Security ApiKeyAuth
+// @Success 200 {string} string "ok"
+// @Router /disk/usb [get]
+func GetUSBList(c *gin.Context) {
+	list := service.MyService.Disk().LSBLK(false)
+	data := []model.DriveUSB{}
+	for _, v := range list {
+		if v.Tran == "usb" {
+			temp := model.DriveUSB{}
+			temp.Model = v.Model
+			temp.Name = v.Name
+			temp.Size = v.Size
+			mountTemp := true
+			if len(v.Children) == 0 {
+				mountTemp = false
+			}
+			for _, child := range v.Children {
+				if len(child.MountPoint) > 0 {
+					avail, _ := strconv.ParseUint(child.FSAvail, 10, 64)
+					temp.Avail += avail
+				} else {
+					mountTemp = false
+				}
+			}
+			temp.Mount = mountTemp
+			data = append(data, temp)
+		}
+	}
+	c.JSON(http.StatusOK, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: data})
 }