update upgrade script address

Signed-off-by: John Guan <Guan.Ningchuan@gmail.com>

.all-contributorsrc

@@ -0,0 +1,197 @@
+{
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "badgeTemplate": "<a href=\"#credits\"><img alt=\"All Contributors\" src=\"https://img.shields.io/static/v1?label=All%20Contributors&message=<%= contributors.length %>&color=162453&style=flat-square&logo=Handshake&logoColor=fff\" /></a>",
+  "commit": false,
+  "contributors": [
+    {
+      "login": "jerrykuku",
+      "name": "老竭力",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9485680?v=4",
+      "profile": "https://github.com/jerrykuku",
+      "contributions": [
+        "code",
+        "doc",
+        "ideas",
+        "infra",
+        "maintenance",
+        "platform",
+        "question",
+        "review"
+      ]
+    },
+    {
+      "login": "LinkLeong",
+      "name": "link",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13556972?v=4",
+      "profile": "https://github.com/LinkLeong",
+      "contributions": [
+        "code",
+        "doc",
+        "ideas",
+        "infra",
+        "maintenance",
+        "question",
+        "review"
+      ]
+    },
+    {
+      "login": "tigerinus",
+      "name": "Tiger Wang (王豫)",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7172560?v=4",
+      "profile": "https://github.com/tigerinus",
+      "contributions": [
+        "code",
+        "doc",
+        "ideas",
+        "infra",
+        "maintenance",
+        "mentoring",
+        "security",
+        "question",
+        "review"
+      ]
+    },
+    {
+      "login": "Lauren-ED209",
+      "name": "Lauren",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8243355?v=4",
+      "profile": "https://github.com/Lauren-ED209",
+      "contributions": [
+        "ideas",
+        "fundingFinding",
+        "projectManagement",
+        "question",
+        "test"
+      ]
+    },
+    {
+      "login": "JohnGuan",
+      "name": "John Guan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3358477?v=4",
+      "profile": "https://JohnGuan.Cn",
+      "contributions": [
+        "blog",
+        "content",
+        "doc",
+        "ideas",
+        "eventOrganizing",
+        "mentoring",
+        "question",
+        "review"
+      ]
+    },
+    {
+      "login": "dtaivpp",
+      "name": "David Tippett",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17506770?v=4",
+      "profile": "https://blog.tippybits.com",
+      "contributions": [
+        "doc",
+        "ideas",
+        "question"
+      ]
+    },
+    {
+      "login": "zarevskaya",
+      "name": "Skaya",
+      "avatar_url": "https://avatars.githubusercontent.com/u/60230221?v=4",
+      "profile": "https://github.com/zarevskaya",
+      "contributions": [
+        "mentoring",
+        "question",
+        "tutorial",
+        "translation"
+      ]
+    },
+    {
+      "login": "AuthorShin",
+      "name": "AuthorShin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4959043?v=4",
+      "profile": "https://github.com/AuthorShin",
+      "contributions": [
+        "test",
+        "bug",
+        "question",
+        "ideas"
+      ]
+    },
+    {
+      "login": "baptiste313",
+      "name": "baptiste313",
+      "avatar_url": "https://avatars.githubusercontent.com/u/93325157?v=4",
+      "profile": "https://github.com/baptiste313",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "DrMxrcy",
+      "name": "DrMxrcy",
+      "avatar_url": "https://avatars.githubusercontent.com/u/58747968?v=4",
+      "profile": "https://github.com/DrMxrcy",
+      "contributions": [
+        "test",
+        "ideas",
+        "question"
+      ]
+    },
+    {
+      "login": "Joooost",
+      "name": "Joooost",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12090673?v=4",
+      "profile": "https://github.com/Joooost",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "sio",
+      "name": "Vitaly Potyarkin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/334908?v=4",
+      "profile": "https://potyarkin.ml",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "bearfrieze",
+      "name": "Bjørn Friese",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1023813?v=4",
+      "profile": "https://github.com/bearfrieze",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "Protektor-Desura",
+      "name": "Protektor",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1195496?v=4",
+      "profile": "https://github.com/Protektor-Desura",
+      "contributions": [
+        "bug",
+        "ideas",
+        "question"
+      ]
+    },
+    {
+      "login": "llwaini",
+      "name": "llwaini",
+      "avatar_url": "https://avatars.githubusercontent.com/u/59589857?v=4",
+      "profile": "https://github.com/llwaini",
+      "contributions": [
+        "projectManagement",
+        "test",
+        "tutorial"
+      ]
+    }
+  ],
+  "contributorsPerLine": 7,
+  "projectName": "CasaOS",
+  "projectOwner": "IceWhaleTech",
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "skipCi": true
+}

.github/ISSUE_TEMPLATE/alpha_bug_report.yaml

@@ -0,0 +1,26 @@
+name: "[Alpha Only] Bug Report"
+description: CasaOS Alpha Testing specific bug report form.
+title: "[Alpha][Bug] "
+labels: ["alpha", "bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+        > If you haven't joined CasaOS Alpha Team yet.
+        > Please join first on [Discord](https://discord.gg/knqAbbBbeX) to be updated on the Alpha test plan and test scope.
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: If applicable, add screenshots to help explain your problem.
+      placeholder: Screenshots would be very helpful!
+

.github/ISSUE_TEMPLATE/app_request.yaml

@@ -0,0 +1,53 @@
+name: "App Request"
+description: "Request to add an app to the app store."
+title: "[App Request] AppName"
+labels: ["App Request"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ### ❤ Thanks for taking the time to fill out this app request!
+        > Before proceeding, please make sure that this app is not in App Store and no one has [requested](https://github.com/IceWhaleTech/CasaOS/labels/App%20Request) the same app before.
+        > If you have already requested the app, please ask your friends to help add a 👍 to this issue. Then be patient and wait for the developers to work on it.
+        > If you have any questions, please ask them on [Discord](https://discord.gg/knqAbbBbeX) or [Github Discussions](https://github.com/IceWhaleTech/CasaOS/discussions).
+
+  - type: textarea
+    id: app-info
+    attributes:
+      label: "App Information"
+      description: "The formal information of this app, as detailed as possible."
+      value: |
+        - Name: <!-- eg. Nextcloud -->
+        - Short Description: <!-- eg. Personal cloud and file sharing solution -->
+        - Official Website: <!-- If available. eg. https://nextcloud.com -->
+        - GitHub Repository: <!-- If available. eg. https://github.com/nextcloud/server -->
+        - Docker Image: <!-- If available. eg. nextcloud/server:latest, ghcr.io/nextcloud/server:latest -->
+    validations:
+      required: true
+
+  - type: textarea
+    id: why
+    attributes:
+      label: "Why do you want this app?"
+      description: "Detailed notes can help developers and others understand the importance of this app."
+      placeholder: |
+        As a [what role], it helps me solve [what problem], and especially [what function] is great!
+        or
+        It solves [what problem] and especially [what feature] works well, which is hard to do with other app.
+        or
+        This is the app that [some device/service] must use and will not work without it.
+        or 
+        others
+
+  - type: textarea
+    id: additional-info
+    attributes:
+      label: "Additional information?"
+      description: "Anything else you want to share with the developers and others?"
+      placeholder: |
+        Example:
+        - Noteworthy matters.
+        - Recommended Docker image.
+        - Validated Docker deployment instructions.
+        - Notable Docker setup details.
+        - Recommended config files, user data, accessible directory settings.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,8 +1,8 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
-labels: ''
+title: '[Bug] '
+labels: 'bug'
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Feature/Enhancement Ideas
+    url: https://github.com/IceWhaleTech/CasaOS/discussions/164
+    about: Have an idea for a new feature/enhancement?
+  - name: Questions, Discussions
+    url: https://github.com/IceWhaleTech/CasaOS/discussions
+    about: Ask questions, propose ideas, or discuss anything related to CasaOS
+  - name: Discord
+    url: https://discord.gg/knqAbbBbeX
+    about: Get help or share great ideas on Discord!

.github/workflows/add_issues_to_projects.yml

@@ -0,0 +1,33 @@
+name: Add Issues To Projects
+
+on:
+  issues:
+    types: 
+      - opened
+
+jobs:
+  add-issues:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate token
+        id: generate_token
+        uses: tibdex/github-app-token@36464acb844fc53b9b8b2401da68844f6b05ebb0
+        with:
+          app_id: ${{ secrets.ALPHA_BOT_ID }}
+          private_key: ${{ secrets.ALPHA_BOT_PEM }}
+
+      - name: Add Alpha Bug Issue To project
+        uses: actions/add-to-project@v0.3.0
+        with:
+          github-token: ${{ steps.generate_token.outputs.token }}
+          project-url: https://github.com/orgs/IceWhaleTech/projects/5
+          labeled: alpha, bug
+          label-operator: AND
+          
+      - name: Add App Request Issue To project
+        uses: actions/add-to-project@v0.3.0
+        with:
+          github-token: ${{ steps.generate_token.outputs.token }}
+          project-url: https://github.com/orgs/IceWhaleTech/projects/8
+          labeled: "App Request"
+          label-operator: AND

.github/workflows/demo.yml

@@ -33,7 +33,7 @@ jobs:
           
       - 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-[0-9]' | sed 's/ //g' | sed 's/"//g' | sed 's/,//g' | sed 's/name://g')" >> $GITHUB_ENV
+          echo "OLD_INSTANCE_SNAPSHOT_NAME=$(aws lightsail get-instance-snapshots | grep '"name": "0.3.3-demo-1658402149' | 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
           
@@ -43,7 +43,7 @@ jobs:
               --instance-snapshot-name ${{ env.OLD_INSTANCE_SNAPSHOT_NAME }} \
               --instance-names ${{ env.NEW_INSTANCE_NAME }} \
               --availability-zone us-west-2a \
-              --bundle-id large_2_0
+              --bundle-id medium_2_0
               
       - name: Wait for new instance running
         run: |

.github/workflows/move_alpha_bug_to_project.yml

@@ -0,0 +1,27 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Move alpha bug to project
+
+on:
+  issues:
+    types: 
+      - opened
+
+jobs:
+  track_issue:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate token
+        id: generate_token
+        uses: tibdex/github-app-token@36464acb844fc53b9b8b2401da68844f6b05ebb0
+        with:
+          app_id: ${{ secrets.ALPHA_BOT_ID }}
+          private_key: ${{ secrets.ALPHA_BOT_PEM }}
+
+      - name: Add Issue To GitHub Projects Beta
+        uses: actions/add-to-project@v0.1.0
+        with:
+          project-url: https://github.com/orgs/IceWhaleTech/projects/5
+          github-token: ${{ steps.generate_token.outputs.token }}
+          labeled: alpha, bug
+          label-operator: AND

.github/workflows/push_events_to_discord.yml

@@ -0,0 +1,48 @@
+name: Push Events to Discord
+
+on:
+  issues:
+    types:
+      - opened
+  issue_comment:
+    types:
+      - created
+  discussion:
+    types:
+      - created
+      - transferred
+      - answered
+  discussion_comment:
+    types:
+      - created
+
+jobs:
+  push-events:
+  
+    runs-on: ubuntu-latest
+    
+    steps:
+      
+      - name: General Discussions & Comments
+        if: ${{ ( github.event_name == 'discussion' || github.event_name == 'discussion_comment' ) && github.event.discussion.category.name == 'General' }}
+        uses: joseph-montanez/forward-event-action@v3.0.0
+        with:
+          webhook: ${{ secrets.Discord_CasaOS_General_Webhook }}
+    
+      - name: App Request Issues & Comments
+        if: ${{ ( github.event_name == 'issues' || github.event_name == 'issue_comment' ) && contains(github.event.issue.labels.*.name, 'App Request') }}
+        uses: joseph-montanez/forward-event-action@v3.0.0
+        with:
+          webhook: ${{ secrets.Discord_CasaOS_App_Request_Webhook }}
+          
+      - name: Bug Issues & Comments
+        if: ${{ ( github.event_name == 'issues' || github.event_name == 'issue_comment' ) && contains(github.event.issue.labels.*.name, 'bug') && !contains(github.event.issue.labels.*.name, 'alpha') }}
+        uses: joseph-montanez/forward-event-action@v3.0.0
+        with:
+          webhook: ${{ secrets.Discord_CasaOS_Bug_Webhook }}
+          
+      - name: Alpha Issues & Comments
+        if: ${{ ( github.event_name == 'issues' || github.event_name == 'issue_comment' ) && contains(github.event.issue.labels.*.name, 'alpha') }}
+        uses: joseph-montanez/forward-event-action@v3.0.0
+        with:
+          webhook: ${{ secrets.Discord_CasaOS_Alpha_Webhook }}

.github/workflows/release.yml

@@ -0,0 +1,47 @@
+name: goreleaser
+
+on:
+  push:
+    tags:
+      - v*.*.*
+
+permissions:
+  contents: write
+
+jobs:
+  goreleaser:
+    runs-on: ubuntu-22.04
+    steps:
+      -
+        name: Install dependencies for cross-compiling
+        run: |
+          sudo apt update 
+          sudo apt-get --no-install-recommends --yes install \
+            libc6-dev-amd64-cross \
+            gcc-aarch64-linux-gnu libc6-dev-arm64-cross \
+            gcc-arm-linux-gnueabihf libc6-dev-armhf-cross
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      -
+        name: Fetch all tags
+        run: git fetch --force --tags
+      -
+        name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.19
+      -
+        name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v2
+        with:
+          # either 'goreleaser' (default) or 'goreleaser-pro'
+          distribution: goreleaser
+          version: latest
+          args: release --rm-dist
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # Your GoReleaser Pro key, if you are using the 'goreleaser-pro' distribution
+          # GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}

.gitignore

@@ -28,9 +28,11 @@ gen
 /sql/
 /out/
 /db/
-/docs/
 /conf/conf.ini
+/conf/conf.conf
+/conf/conf.json
 __debug_bin
 main
-CasaOS
 github.com
+.all-contributorsrc
+dist

.goreleaser.yaml

@@ -0,0 +1,167 @@
+# This is an example .goreleaser.yml file with some sensible defaults.
+# Make sure to check the documentation at https://goreleaser.com
+project_name: casaos
+before:
+  hooks:
+    # You may remove this if you don't use go modules.
+    - go mod tidy
+builds:
+  - id: casaos-amd64
+    binary: build/sysroot/usr/bin/casaos
+    env:
+      - CGO_ENABLED=1
+      - CC=x86_64-linux-gnu-gcc
+    ldflags:
+      - -s
+      - -w
+      - -extldflags "-static"
+    tags:
+      - musl
+      - netgo
+    goos:
+      - linux
+    goarch:
+      - amd64
+    hooks:
+      post:
+        - find build/sysroot -type f | xargs -L 1 realpath --relative-to=build/sysroot > build/sysroot.manifest
+  - id: casaos-arm64
+    binary: build/sysroot/usr/bin/casaos
+    env:
+      - CGO_ENABLED=1
+      - CC=aarch64-linux-gnu-gcc
+    ldflags:
+      - -s
+      - -w
+      - -extldflags "-static"
+    tags:
+      - musl
+      - netgo
+    goos:
+      - linux
+    goarch:
+      - arm64
+    hooks:
+      post:
+        - find build/sysroot -type f | xargs -L 1 realpath --relative-to=build/sysroot > build/sysroot.manifest
+  - id: casaos-arm-7
+    binary: build/sysroot/usr/bin/casaos
+    env:
+      - CGO_ENABLED=1
+      - CC=arm-linux-gnueabihf-gcc
+    ldflags:
+      - -s
+      - -w
+      - -extldflags "-static"
+    tags:
+      - musl
+      - netgo
+    goos:
+      - linux
+    goarch:
+      - arm
+    goarm:
+      - "7"
+    hooks:
+      post:
+        - find build/sysroot -type f | xargs -L 1 realpath --relative-to=build/sysroot > build/sysroot.manifest
+  - id: casaos-migration-tool-amd64
+    binary: build/sysroot/usr/bin/casaos-migration-tool
+    main: ./cmd/migration-tool
+    env:
+      - CGO_ENABLED=1
+      - CC=x86_64-linux-gnu-gcc
+    ldflags:
+      - -s
+      - -w
+      - -extldflags "-static"
+    tags:
+      - musl
+      - netgo
+    goos:
+      - linux
+    goarch:
+      - amd64
+  - id: casaos-migration-tool-arm64
+    binary: build/sysroot/usr/bin/casaos-migration-tool
+    main: ./cmd/migration-tool
+    env:
+      - CGO_ENABLED=1
+      - CC=aarch64-linux-gnu-gcc
+    ldflags:
+      - -s
+      - -w
+      - -extldflags "-static"
+    tags:
+      - musl
+      - netgo
+    goos:
+      - linux
+    goarch:
+      - arm64
+  - id: casaos-migration-tool-arm-7
+    binary: build/sysroot/usr/bin/casaos-migration-tool
+    main: ./cmd/migration-tool
+    env:
+      - CGO_ENABLED=1
+      - CC=arm-linux-gnueabihf-gcc
+    ldflags:
+      - -s
+      - -w
+      - -extldflags "-static"
+    tags:
+      - musl
+      - netgo
+    goos:
+      - linux
+    goarch:
+      - arm
+    goarm:
+      - "7"    
+archives:
+  - name_template: "{{ .Os }}-{{ .Arch }}-{{ .ProjectName }}-v{{ .Version }}"
+    id: casaos
+    builds:
+      - casaos-amd64
+      - casaos-arm64
+      - casaos-arm-7
+    replacements:
+      arm: arm-7
+    files:
+      - build/**/*
+  - name_template: "{{ .Os }}-{{ .Arch }}-{{ .ProjectName }}-migration-tool-v{{ .Version }}"
+    id: casaos-migration-tool
+    builds:
+      - casaos-migration-tool-amd64
+      - casaos-migration-tool-arm64
+      - casaos-migration-tool-arm-7
+    replacements:
+      arm: arm-7
+    files:
+      - build/sysroot/etc/**/*
+checksum:
+  name_template: "checksums.txt"
+snapshot:
+  name_template: "{{ incpatch .Version }}"
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - "^docs:"
+      - "^test:"
+# release:
+#   github:
+#     owner: IceWhaleTech
+#     name: CasaOS
+#   draft: true
+#   prerelease: auto
+#   mode: replace
+#   name_template: "v{{ .Version }}"
+release:
+  github:
+    owner: LinkLeong
+    name: casaos-alpha
+  draft: true
+  prerelease: auto
+  mode: replace
+  name_template: "v{{ .Version }}"

CHANGELOG.md

@@ -11,12 +11,142 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+
 ### Removed
 
 ### Security
 
 ### Fixed
 
+
+## [0.3.6-alpha.1] - 2022-09-06
+
+###  Added
+- [System] Added power and temperature info to performance widget (Intel)
+- [Apps] Custom links can be added to Apps section
+
+### Fixed
+- [Apps] Fixed the problem of not being able to modify some App settings ([#510](https://github.com/IceWhaleTech/CasaOS/issues/510))
+
+### Changed
+- [System] Architecture optimization. Improved performance.
+
+## [0.3.5] - 2022-08-23
+
+### Added
+
+- [File] Mount the shared samba
+- [File] File sharing via Samba
+- [System] You can share casaos on Twitter, facebook, reddit
+
+### Changed
+
+- [Disk] Support for mounting existing data disks
+
+### Fixed
+
+- [App] fixed uninstalling imported docker container apps results in wiping ALL your config data from them ([#360](https://github.com/IceWhaleTech/CasaOS/issues/360))
+
+## [0.3.4] - 2022-07-29(UTC)
+
+### Added
+
+- SSH adds port-side options and prompts for connection status. ([#286](https://github.com/IceWhaleTech/CasaOS/issues/286))
+
+### Changed
+
+- Normalize all routes
+- Application names now support spaces ([#211](https://github.com/IceWhaleTech/CasaOS/issues/211))
+
+### Removed
+
+- Removed  casaos connect
+
+### Security
+
+- Adjustment of authentication method
+
+### Fixed
+
+- Fixed storage format and remove password error issues ([#344](https://github.com/IceWhaleTech/CasaOS/issues/344) [#357](https://github.com/IceWhaleTech/CasaOS/issues/357))
+
+## [0.3.3] - 2022-07-08(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

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`  

README.md

@@ -1,71 +1,149 @@
-# CasaOS - A simple, easy-to-use, elegant open-source Home Cloud system.
+# CasaOS - Your Home Cloud OS
 
-![CasaOS](https://raw.githubusercontent.com/IceWhaleTech/logo/main/casaos/casaos_banner_aldeyjarfoss.png)
 
-[![Version](https://img.shields.io/github/v/release/IceWhaleTech/CasaOS?color=162453&label=CasaOS&style=flat-square)](https://github.com/IceWhaleTech/CasaOS)
-[![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/knqAbbBbeX)
+<!-- Readme i18n links -->
+<!-- > English | [中文](#) | [Français](#) -->
 
-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.
+<p align="center">
+    <!-- CasaOS Banner -->
+    <picture>
+        <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/IceWhaleTech/logo/main/casaos/casaos_banner_dark_night_800px.png">
+        <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/IceWhaleTech/logo/main/casaos/casaos_banner_twilight_blue_800px.png">
+        <img alt="CasaOS" src="https://raw.githubusercontent.com/IceWhaleTech/logo/main/casaos/casaos_banner_twilight_blue_800px.png">
+    </picture>
+    <br/>
+    <i>Connect with the community developing HOME CLOUD, creating self-sovereign, and defining the future of the distributed cloud.</i>
+    <br/>
+    <br/>
+    <!-- CasaOS Badges -->
+    <a href="https://github.com/IceWhaleTech/CasaOS" target="_blank">
+        <img alt="CasaOS Version" src="https://img.shields.io/github/v/release/IceWhaleTech/CasaOS?color=162453&style=flat-square&label=CasaOS" />
+    </a>
+    <a href="https://github.com/IceWhaleTech/CasaOS/blob/main/LICENSE" target="_blank">
+        <img alt="CasaOS License" src="https://img.shields.io/github/license/IceWhaleTech/CasaOS?color=162453&style=flat-square&label=License" />
+    </a>
+    <a href="https://github.com/IceWhaleTech/CasaOS/pulls" target="_blank">
+        <img alt="CasaOS Pull Requests" src="https://img.shields.io/github/issues-pr/IceWhaleTech/CasaOS?color=162453&style=flat-square&label=PRs" />
+    </a>
+    <a href="https://github.com/IceWhaleTech/CasaOS/issues" target="_blank">
+        <img alt="CasaOS Issues" src="https://img.shields.io/github/issues/IceWhaleTech/CasaOS?color=162453&style=flat-square&label=Issues" />
+    </a>
+    <a href="https://github.com/IceWhaleTech/CasaOS/stargazers" target="_blank">
+        <img alt="CasaOS Stargazers" src="https://img.shields.io/github/stars/IceWhaleTech/CasaOS?color=162453&style=flat-square&label=Stars" />
+    </a>
+    <!-- <a href="https://github.com/IceWhaleTech/CasaOS/releases" target="_blank">
+    <img alt="CasaOS Downloads" src="https://img.shields.io/github/downloads/IceWhaleTech/CasaOS/total?color=162453&style=flat-square" />
+    </a> -->
+    <br/>
+    <!-- CasaOS Community -->
+    <a href="https://discord.gg/knqAbbBbeX" target="_blank">
+        <img alt="IceWhale Discord" src="https://img.shields.io/discord/884667213326463016?color=162453&style=flat-square&label=Discord&logo=discord&logoColor=fff" />
+    </a>
+    <a href="https://github.com/IceWhaleTech/CasaOS/discussions" target="_blank">
+        <img alt="CasaOS GitHub Discussions" src="https://img.shields.io/github/discussions/IceWhaleTech/CasaOS?color=162453&style=flat-square&label=Discussions&logo=github" />
+    </a>
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+<a href="#credits"><img alt="All Contributors" src="https://img.shields.io/static/v1?label=All%20Contributors&message=15&color=162453&style=flat-square&logo=Handshake&logoColor=fff" /></a>
+<!-- ALL-CONTRIBUTORS-BADGE:END -->
+    <br/>
+    <!-- CasaOS Links -->
+    <a href="https://www.casaos.io" target="_blank">Website</a> |
+    <a href="http://demo.casaos.io" target="_blank">Demo</a> |
+    <a href="https://github.com/IceWhaleTech/CasaOS" target="_blank">GitHub</a>
+    <br/>
+    <br/>
+    <!-- CasaOS Snapshots -->
+    <kbd>
+      <picture>
+          <source media="(prefers-color-scheme: dark)" srcset="snapshot-dark.jpg">
+          <source media="(prefers-color-scheme: light)" srcset="snapshot-light.jpg">
+          <img alt="CasaOS Snapshot" src="snapshot-light.jpg">
+      </picture>
+    </kbd>
+</p>
 
-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.
+## Why do we need Home Cloud?
 
-![CasaOS Snapshot](snapshot.png)
-![CasaOS Snapshot Mobile](snapshot-mobile.png)
+Think about it seriously. Is control of our data, smart devices and digital assets now only in the hands of some big company?
+
+- Is your photo album saved in their cloud service?
+- Do your thermostats, monitors, lamps need to be used through their cloud services?
+- Do your personal documents, memos, contacts, passwords, etc. reside in their cloud storage services?
+- Are you just going to have to accept their decisions when they decide to change prices, review content or even discontinue services?
+
+It sounds ridiculous, doesn't it? We are losing control of our own data!
+
+Our ideal home cloud is one where you can manage all your data, devices and data assets very easily. In your own home, you have absolute control.
+
+> If you think what we are doing is valuable. Please **give us a star ⭐** and **fork it 🤞**!
+
+## Features
+
+- Friendly UI designed for home scenarios
+  - No code, no forms, intuitive, design for humanity
+- Multiple hardware and base system support
+  - ZimaBoard, NUC, RPi, old computers, whatever is available.
+- Selected apps in the app store, one-click installation
+  - Nextcloud, HomeAssiant, AdGuard, Jellyfin, *arr and more!
+- Easily install numerous Docker apps
+  - Over 100,000 apps from the Docker ecosystem can be easily installed
+- Elegant drive and file management
+  - What you see is what you get. No technical background required.
+- Well-designed system/app widgets
+  - What you care about, at a glance. Resource usage, app status, and more!
 
 ## 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)!
+CasaOS fully supports ZimaBoard, Intel NUC, and Raspberry Pi. Also, more computers and development boards and fully compatible with Ubuntu, Debian, Raspberry Pi OS, and CentOS with one-liner installation.
+
+### Hardware Compatibility
+
+- amd64 / x86-64
+- arm64
+- armv7
+
+### System Compatibility
+
+Official Support
+- Debian 11 (✅ Tested, Recommended)
+- Ubuntu Server 20.04 (✅ Tested)
+- Raspberry Pi OS (✅ Tested)
+
+Community Support
+- Elementary 6.1 (✅ Tested)
+- Armbian 22.04 (✅ Tested)
+- Alpine (🚧 Not Fully Tested Yet)
+- OpenWrt (🚧 Not Fully Tested Yet)
 
 ### Quick Setup CasaOS
 
-Fresh install a system from the list below and run the this command:
+Freshly install a system from the list above and run this command:
 
 ```sh
-wget -qO- https://get.icewhale.io/casaos.sh | bash
+wget -qO- https://get.casaos.io | bash
 ```
 
 or
 
 ```sh
-curl -fsSL https://get.icewhale.io/casaos.sh | bash
+curl -fsSL https://get.casaos.io | bash
 ```
 
 ### Uninstall CasaOS
 
+
+v0.3.3 or newer
+
+```sh
+casaos-uninstall
+```
+
+Before v0.3.3
+
 ```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 Home Cloud 🚧
- - Home data/digital asset management 🚧
- - Smart home manager 🚧
-
-🚧 is under development.
-
-We are actively moving forward with development, and you are more than welcome to share any idea with us!
-
-
 ## Community 
 
 The word Casa comes from the Spanish word for "home". Project CasaOS originated as a pre-installed system for crowdfunded product [ZimaBoard](https://www.zimaboard.com) on Kickstarter.
@@ -74,16 +152,97 @@ 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/knqAbbBbeX)!
+We believes that through community-driven collaborative innovation and open communication with global developers, we can reshape the digital home experience like never before.
+
+**A warm welcome for you to get help or share great ideas in the [Discord](https://discord.gg/knqAbbBbeX)!**
 
 [![Discord Card](https://discordapp.com/api/guilds/884667213326463016/widget.png?style=banner2)](https://discord.gg/knqAbbBbeX)
 
+## Contributing
 
+CasaOS is a community-driven open source project and the people involved are CasaOS users. That means CasaOS will always need contributions from community members just like you!
 
-## Maintainers
- - Jerry Liu
- - Link Liang
- - Ober Zhang
- - Zyaire Ann
- - John Guan
- - Right here, waiting for YOU!
+<details>
+  <summary><b>How can I get involved? 🧐</b></summary>
+  <p>
+
+### Coding 💻 (WIP)
+
+We are refining documentation that can be used for effective community collaboration. Feel free to start a discussion if you have a good idea.
+
+### Helping Users 💬
+
+If you have extensive knowledge of CasaOS and related areas. We highly encourage you to help others as much as you can in Discord and Discussions.
+
+Discord: [https://discord.gg/knqAbbBbeX](https://discord.gg/knqAbbBbeX)
+
+GitHub Discussions: [https://github.com/IceWhaleTech/CasaOS/discussions](https://github.com/IceWhaleTech/CasaOS/discussions)
+
+### Helping with Translations 🌍 (WIP)
+
+CasaOS officially supports English and Chinese. You are welcome to help make CasaOS available in more languages.
+
+### Performing Alpha Testing ⚠️
+
+Alpha testing is quality assurance testing that is engaged and driven by the community. It's a great way to get involved in contributing and experiencing the latest features before a new release.
+
+The documentation is being refined and you can contact @JohnGuan via [Discord](https://discord.gg/knqAbbBbeX). Ask to join the #casaos-alpha channel.
+
+### Writing Documentation 📖 (WIP)
+
+Help make our documentation better by writing new content for the CasaOS Wiki, correcting existing material, or translating content into new languages.
+
+  </p>
+</details>
+
+## Credits
+
+Many thanks to everyone who has helped CasaOS so far!
+
+Everyone's contribution is greatly appreciated. ([Emoji Key](https://allcontributors.org/docs/en/emoji-key))
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="https://github.com/jerrykuku"><img src="https://avatars.githubusercontent.com/u/9485680?v=4?s=100" width="100px;" alt=""/><br /><sub><b>老竭力</b></sub></a><br /><a href="https://github.com/IceWhaleTech/CasaOS/commits?author=jerrykuku" title="Code">💻</a> <a href="https://github.com/IceWhaleTech/CasaOS/commits?author=jerrykuku" title="Documentation">📖</a> <a href="#ideas-jerrykuku" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-jerrykuku" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-jerrykuku" title="Maintenance">🚧</a> <a href="#platform-jerrykuku" title="Packaging/porting to new platform">📦</a> <a href="#question-jerrykuku" title="Answering Questions">💬</a> <a href="https://github.com/IceWhaleTech/CasaOS/pulls?q=is%3Apr+reviewed-by%3Ajerrykuku" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/LinkLeong"><img src="https://avatars.githubusercontent.com/u/13556972?v=4?s=100" width="100px;" alt=""/><br /><sub><b>link</b></sub></a><br /><a href="https://github.com/IceWhaleTech/CasaOS/commits?author=LinkLeong" title="Code">💻</a> <a href="https://github.com/IceWhaleTech/CasaOS/commits?author=LinkLeong" title="Documentation">📖</a> <a href="#ideas-LinkLeong" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-LinkLeong" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-LinkLeong" title="Maintenance">🚧</a> <a href="#question-LinkLeong" title="Answering Questions">💬</a> <a href="https://github.com/IceWhaleTech/CasaOS/pulls?q=is%3Apr+reviewed-by%3ALinkLeong" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/tigerinus"><img src="https://avatars.githubusercontent.com/u/7172560?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tiger Wang (王豫)</b></sub></a><br /><a href="https://github.com/IceWhaleTech/CasaOS/commits?author=tigerinus" title="Code">💻</a> <a href="https://github.com/IceWhaleTech/CasaOS/commits?author=tigerinus" title="Documentation">📖</a> <a href="#ideas-tigerinus" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-tigerinus" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-tigerinus" title="Maintenance">🚧</a> <a href="#mentoring-tigerinus" title="Mentoring">🧑‍🏫</a> <a href="#security-tigerinus" title="Security">🛡️</a> <a href="#question-tigerinus" title="Answering Questions">💬</a> <a href="https://github.com/IceWhaleTech/CasaOS/pulls?q=is%3Apr+reviewed-by%3Atigerinus" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/Lauren-ED209"><img src="https://avatars.githubusercontent.com/u/8243355?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lauren</b></sub></a><br /><a href="#ideas-Lauren-ED209" title="Ideas, Planning, & Feedback">🤔</a> <a href="#fundingFinding-Lauren-ED209" title="Funding Finding">🔍</a> <a href="#projectManagement-Lauren-ED209" title="Project Management">📆</a> <a href="#question-Lauren-ED209" title="Answering Questions">💬</a> <a href="https://github.com/IceWhaleTech/CasaOS/commits?author=Lauren-ED209" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://JohnGuan.Cn"><img src="https://avatars.githubusercontent.com/u/3358477?v=4?s=100" width="100px;" alt=""/><br /><sub><b>John Guan</b></sub></a><br /><a href="#blog-JohnGuan" title="Blogposts">📝</a> <a href="#content-JohnGuan" title="Content">🖋</a> <a href="https://github.com/IceWhaleTech/CasaOS/commits?author=JohnGuan" title="Documentation">📖</a> <a href="#ideas-JohnGuan" title="Ideas, Planning, & Feedback">🤔</a> <a href="#eventOrganizing-JohnGuan" title="Event Organizing">📋</a> <a href="#mentoring-JohnGuan" title="Mentoring">🧑‍🏫</a> <a href="#question-JohnGuan" title="Answering Questions">💬</a> <a href="https://github.com/IceWhaleTech/CasaOS/pulls?q=is%3Apr+reviewed-by%3AJohnGuan" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://blog.tippybits.com"><img src="https://avatars.githubusercontent.com/u/17506770?v=4?s=100" width="100px;" alt=""/><br /><sub><b>David Tippett</b></sub></a><br /><a href="https://github.com/IceWhaleTech/CasaOS/commits?author=dtaivpp" title="Documentation">📖</a> <a href="#ideas-dtaivpp" title="Ideas, Planning, & Feedback">🤔</a> <a href="#question-dtaivpp" title="Answering Questions">💬</a></td>
+    <td align="center"><a href="https://github.com/zarevskaya"><img src="https://avatars.githubusercontent.com/u/60230221?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Skaya</b></sub></a><br /><a href="#mentoring-zarevskaya" title="Mentoring">🧑‍🏫</a> <a href="#question-zarevskaya" title="Answering Questions">💬</a> <a href="#tutorial-zarevskaya" title="Tutorials">✅</a> <a href="#translation-zarevskaya" title="Translation">🌍</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/AuthorShin"><img src="https://avatars.githubusercontent.com/u/4959043?v=4?s=100" width="100px;" alt=""/><br /><sub><b>AuthorShin</b></sub></a><br /><a href="https://github.com/IceWhaleTech/CasaOS/commits?author=AuthorShin" title="Tests">⚠️</a> <a href="https://github.com/IceWhaleTech/CasaOS/issues?q=author%3AAuthorShin" title="Bug reports">🐛</a> <a href="#question-AuthorShin" title="Answering Questions">💬</a> <a href="#ideas-AuthorShin" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/baptiste313"><img src="https://avatars.githubusercontent.com/u/93325157?v=4?s=100" width="100px;" alt=""/><br /><sub><b>baptiste313</b></sub></a><br /><a href="#translation-baptiste313" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/DrMxrcy"><img src="https://avatars.githubusercontent.com/u/58747968?v=4?s=100" width="100px;" alt=""/><br /><sub><b>DrMxrcy</b></sub></a><br /><a href="https://github.com/IceWhaleTech/CasaOS/commits?author=DrMxrcy" title="Tests">⚠️</a> <a href="#ideas-DrMxrcy" title="Ideas, Planning, & Feedback">🤔</a> <a href="#question-DrMxrcy" title="Answering Questions">💬</a></td>
+    <td align="center"><a href="https://github.com/Joooost"><img src="https://avatars.githubusercontent.com/u/12090673?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joooost</b></sub></a><br /><a href="#ideas-Joooost" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://potyarkin.ml"><img src="https://avatars.githubusercontent.com/u/334908?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitaly Potyarkin</b></sub></a><br /><a href="#ideas-sio" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/bearfrieze"><img src="https://avatars.githubusercontent.com/u/1023813?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bjørn Friese</b></sub></a><br /><a href="#ideas-bearfrieze" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/Protektor-Desura"><img src="https://avatars.githubusercontent.com/u/1195496?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Protektor</b></sub></a><br /><a href="https://github.com/IceWhaleTech/CasaOS/issues?q=author%3AProtektor-Desura" title="Bug reports">🐛</a> <a href="#ideas-Protektor-Desura" title="Ideas, Planning, & Feedback">🤔</a> <a href="#question-Protektor-Desura" title="Answering Questions">💬</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/llwaini"><img src="https://avatars.githubusercontent.com/u/59589857?v=4?s=100" width="100px;" alt=""/><br /><sub><b>llwaini</b></sub></a><br /><a href="#projectManagement-llwaini" title="Project Management">📆</a> <a href="https://github.com/IceWhaleTech/CasaOS/commits?author=llwaini" title="Tests">⚠️</a> <a href="#tutorial-llwaini" title="Tutorials">✅</a></td>
+  </tr>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
+
+## Changelog
+
+Detailed changes for each release are documented in the [release notes](https://github.com/IceWhaleTech/CasaOS/releases).
+
+---
+
+<p align="center">
+    <a href="https://dashboard.trackgit.com/token/l5q8egi92tfhlxd70l2l">
+        <img src="https://us-central1-trackgit-analytics.cloudfunctions.net/token/ping/l5q8egi92tfhlxd70l2l" alt="trackgit-views" />
+    </a>
+</p>

build/scripts/migration/script.d/03-migrate-casaos.sh

@@ -0,0 +1,180 @@
+#!/bin/bash
+
+set -e
+
+# functions
+__info() {
+    echo -e "🟩 ${1}"
+}
+
+__info_done() {
+    echo -e "✅ ${1}"
+}
+
+__warning() {
+    echo -e "🟨 ${1}"
+}
+
+__error() {
+    echo "🟥 ${1}"
+    exit 1
+}
+
+__is_version_gt() {
+    test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"
+}
+__normalize_version() {
+    local version
+    if [ "${1::1}" = "v" ]; then
+        version="${1:1}"
+    else
+        version="${1}"
+    fi
+
+    echo "$version"
+}
+
+__is_migration_needed() {
+    local version1
+    local version2
+
+    version1=$(__normalize_version "${1}")
+    version2=$(__normalize_version "${2}")
+
+    if [ "${version1}" = "${version2}" ]; then
+        return 1
+    fi
+
+    if [ "CURRENT_VERSION_NOT_FOUND" = "${version1}" ]; then
+        return 1
+    fi
+
+    if [ "LEGACY_WITHOUT_VERSION" = "${version1}" ]; then
+        return 0
+    fi
+
+    __is_version_gt "${version2}" "${version1}"
+}
+
+BUILD_PATH=$(dirname "${BASH_SOURCE[0]}")/../../..
+SOURCE_ROOT=${BUILD_PATH}/sysroot
+
+APP_NAME="casaos"
+# APP_NAME_FORMAL="CasaOS"
+APP_NAME_FORMAL="casaos-alpha"
+
+# check if migration is needed
+SOURCE_BIN_PATH=${SOURCE_ROOT}/usr/bin
+SOURCE_BIN_FILE=${SOURCE_BIN_PATH}/${APP_NAME}
+
+CURRENT_BIN_PATH=/usr/bin
+CURRENT_BIN_PATH_LEGACY=/usr/local/bin
+CURRENT_BIN_FILE=${CURRENT_BIN_PATH}/${APP_NAME}
+CURRENT_BIN_FILE_LEGACY=$(realpath -e ${CURRENT_BIN_PATH_LEGACY}/${APP_NAME} || which ${APP_NAME} || echo CURRENT_BIN_FILE_LEGACY_NOT_FOUND)
+
+SOURCE_VERSION="$(${SOURCE_BIN_FILE} -v)"
+CURRENT_VERSION="$(${CURRENT_BIN_FILE} -v || ${CURRENT_BIN_FILE_LEGACY} -v || (stat "${CURRENT_BIN_FILE_LEGACY}" > /dev/null && echo LEGACY_WITHOUT_VERSION) || echo CURRENT_VERSION_NOT_FOUND)"
+
+__info_done "CURRENT_VERSION: ${CURRENT_VERSION}"
+__info_done "SOURCE_VERSION: ${SOURCE_VERSION}"
+
+NEED_MIGRATION=$(__is_migration_needed "${CURRENT_VERSION}" "${SOURCE_VERSION}" && echo "true" || echo "false")
+
+if [ "${NEED_MIGRATION}" = "false" ]; then
+    __info_done "Migration is not needed."
+    exit 0
+fi
+
+MIGRATION_SERVICE_DIR=${1}
+
+if [ -z "${MIGRATION_SERVICE_DIR}" ]; then
+    MIGRATION_SERVICE_DIR=${BUILD_PATH}/scripts/migration/service.d/${APP_NAME}
+fi
+MIGRATION_LIST_FILE=${MIGRATION_SERVICE_DIR}/migration.list
+MIGRATION_PATH=()
+
+CURRENT_VERSION_FOUND="false"
+
+# a VERSION_PAIR looks like "v0.3.5 v0.3.6-alpha2"
+#
+# - "v0.3.5" is the current version installed on this host
+# - "v0.3.6-alpha2" is the version of the migration tool from GitHub
+while read -r VERSION_PAIR; do
+    if [ -z "${VERSION_PAIR}" ]; then
+        continue
+    fi
+
+    # obtain "v0.3.5" from "v0.3.5 v0.3.6-alpha2"
+    VER1=$(echo "${VERSION_PAIR}" | cut -d' ' -f1)
+
+    # obtain "v0.3.6-alpha2" from "v0.3.5 v0.3.6-alpha2"
+    VER2=$(echo "${VERSION_PAIR}" | cut -d' ' -f2)
+
+    if [ "${CURRENT_VERSION}" = "${VER1// /}" ] || [ "${CURRENT_VERSION}" = "LEGACY_WITHOUT_VERSION" ]; then
+        CURRENT_VERSION_FOUND="true"
+    fi
+
+    if [ "${CURRENT_VERSION_FOUND}" = "true" ]; then
+        MIGRATION_PATH+=("${VER2// /}")
+    fi
+done < "${MIGRATION_LIST_FILE}"
+
+if [ ${#MIGRATION_PATH[@]} -eq 0 ]; then
+    __warning "No migration path found from ${CURRENT_VERSION} to ${SOURCE_VERSION}"
+    exit 0
+fi
+
+ARCH="unknown"
+
+case $(uname -m) in
+    x86_64)
+        ARCH="amd64"
+        ;;
+    aarch64)
+        ARCH="arm64"
+        ;;
+    armv7l)
+        ARCH="arm-7"
+        ;;
+    *)
+        __error "Unsupported architecture"
+        ;;
+esac
+
+pushd "${MIGRATION_SERVICE_DIR}"
+
+{ for VER2 in "${MIGRATION_PATH[@]}"; do
+
+
+        MIGRATION_TOOL_FILE=linux-"${ARCH}"-"${APP_NAME}"-migration-tool-"${VER2}".tar.gz
+
+        if [ -f "${MIGRATION_TOOL_FILE}" ]; then
+            __info "Migration tool ${MIGRATION_TOOL_FILE} exists. Skip downloading."
+            continue
+        fi
+
+        MIGRATION_TOOL_URL=https://github.com/LinkLeong/"${APP_NAME_FORMAL}"/releases/download/"${VER2}"/linux-"${ARCH}"-"${APP_NAME}"-migration-tool-"${VER2}".tar.gz
+        echo "Dowloading ${MIGRATION_TOOL_URL}..."
+        curl -sL -O "${MIGRATION_TOOL_URL}"
+    done
+} || {
+    popd
+    __error "Failed to download migration tools"
+}
+
+{
+    for VER2 in "${MIGRATION_PATH[@]}"; do
+        MIGRATION_TOOL_FILE=linux-"${ARCH}"-"${APP_NAME}"-migration-tool-"${VER2}".tar.gz
+        __info "Extracting ${MIGRATION_TOOL_FILE}..."
+        tar zxvf "${MIGRATION_TOOL_FILE}" || __error "Failed to extract ${MIGRATION_TOOL_FILE}"
+
+        MIGRATION_TOOL_PATH=build/sysroot/usr/bin/${APP_NAME}-migration-tool
+        __info "Running ${MIGRATION_TOOL_PATH}..."
+        ${MIGRATION_TOOL_PATH}
+    done
+} || {
+    popd
+    __error "Failed to extract and run migration tools"
+}
+
+popd

build/scripts/migration/service.d/casaos/migration.list

@@ -0,0 +1,3 @@
+LEGACY_WITHOUT_VERSION v0.3.6
+v0.3.5 v0.3.6
+v0.3.5.1 v0.3.6

build/scripts/setup/script.d/03-setup-casaos.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+set -e
+
+BUILD_PATH=$(dirname "${BASH_SOURCE[0]}")/../../..
+
+APP_NAME_SHORT=casaos
+
+__get_setup_script_directory_by_os_release() {
+	pushd "$(dirname "${BASH_SOURCE[0]}")/../service.d/${APP_NAME_SHORT}" >/dev/null
+
+	{
+		# shellcheck source=/dev/null
+		{
+			source /etc/os-release
+			{
+				pushd "${ID}"/"${VERSION_CODENAME}" >/dev/null
+			} || {
+				pushd "${ID}" >/dev/null
+			} || {
+				pushd "${ID_LIKE}" >/dev/null
+			} || {
+				echo "Unsupported OS: ${ID} ${VERSION_CODENAME} (${ID_LIKE})"
+				exit 1
+			}
+
+			pwd
+
+			popd >/dev/null
+
+		} || {
+			echo "Unsupported OS: unknown"
+			exit 1
+		}
+
+	}
+
+	popd >/dev/null
+}
+
+SETUP_SCRIPT_DIRECTORY=$(__get_setup_script_directory_by_os_release)
+SETUP_SCRIPT_FILENAME="setup-${APP_NAME_SHORT}.sh"
+
+SETUP_SCRIPT_FILEPATH="${SETUP_SCRIPT_DIRECTORY}/${SETUP_SCRIPT_FILENAME}"
+
+{
+    echo "🟩 Running ${SETUP_SCRIPT_FILENAME}..."
+    $SHELL "${SETUP_SCRIPT_FILEPATH}" "${BUILD_PATH}"
+} || {
+    echo "🟥 ${SETUP_SCRIPT_FILENAME} failed."
+    exit 1
+}
+
+echo "✅ ${SETUP_SCRIPT_FILENAME} finished."

build/scripts/setup/service.d/casaos/debian/bullseye/setup-casaos.sh

@@ -0,0 +1 @@
+../setup-casaos.sh

build/scripts/setup/service.d/casaos/debian/setup-casaos.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+###
+# @Author: LinkLeong link@icewhale.org
+# @Date: 2022-08-25 11:41:22
+ # @LastEditors: LinkLeong
+ # @LastEditTime: 2022-08-31 17:54:17
+ # @FilePath: /CasaOS/build/scripts/setup/service.d/casaos/debian/setup-casaos.sh
+# @Description:
+
+# @Website: https://www.casaos.io
+# Copyright (c) 2022 by icewhale, All Rights Reserved.
+###
+
+set -e
+
+APP_NAME="casaos"
+
+# copy config files
+CONF_PATH=/etc/casaos
+OLD_CONF_PATH=/etc/casaos.conf
+CONF_FILE=${CONF_PATH}/${APP_NAME}.conf
+CONF_FILE_SAMPLE=${CONF_PATH}/${APP_NAME}.conf.sample
+
+
+if [ -f "${OLD_CONF_PATH}" ]; then
+    echo "copy old conf"
+    cp "${OLD_CONF_PATH}" "${CONF_FILE}"
+fi
+if [ ! -f "${CONF_FILE}" ]; then
+    echo "Initializing config file..."
+    cp -v "${CONF_FILE_SAMPLE}" "${CONF_FILE}"
+fi
+
+if systemctl is-active "${APP_NAME}.service" &>/dev/null ;then
+    echo "server started"
+else
+    # enable and start service
+    systemctl daemon-reload
+
+    echo "Enabling service..."
+    systemctl enable --force --no-ask-password "${APP_NAME}.service"
+
+    echo "Starting service..."
+    systemctl start --force --no-ask-password "${APP_NAME}.service"
+fi

build/scripts/setup/service.d/casaos/ubuntu/jammy/setup-casaos.sh

@@ -0,0 +1 @@
+../setup-casaos.sh

build/scripts/setup/service.d/casaos/ubuntu/setup-casaos.sh

@@ -0,0 +1 @@
+../debian/setup-casaos.sh

build/sysroot/etc/casaos/casaos.conf.sample

@@ -0,0 +1,23 @@
+[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]
+RunMode = release
+ServerApi = https://api.casaos.io/casaos-api
+Handshake = socket.casaos.io
+Token = 
+USBAutoMount =
+
+[system]

build/sysroot/usr/lib/systemd/system/casaos.service

@@ -0,0 +1,12 @@
+[Unit]
+After=casaos-gateway.service
+ConditionFileNotEmpty=/etc/casaos/casaos.conf
+Description=CasaOS Service
+
+[Service]
+ExecStart=/usr/bin/casaos -c /etc/casaos/casaos.conf
+PIDFile=/var/run/casaos/casaos.pid
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

build/sysroot/usr/share/casaos/shell/assist.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+

build/sysroot/usr/share/casaos/shell/delete-old-service.sh

@@ -0,0 +1,105 @@
+#!/bin/bash
+###
+ # @Author:  LinkLeong link@icewhale.com
+ # @Date: 2022-06-30 10:08:33
+ # @LastEditors: LinkLeong
+ # @LastEditTime: 2022-07-01 11:17:54
+ # @FilePath: /CasaOS/shell/delete-old-service.sh
+ # @Description:
+### 
+
+((EUID)) && sudo_cmd="sudo"
+
+# SYSTEM INFO
+readonly UNAME_M="$(uname -m)"
+
+# CasaOS PATHS
+readonly CASA_REPO=IceWhaleTech/CasaOS
+readonly CASA_UNZIP_TEMP_FOLDER=/tmp/casaos
+readonly CASA_BIN=casaos
+readonly CASA_BIN_PATH=/usr/bin/casaos
+readonly CASA_CONF_PATH=/etc/casaos.conf
+readonly CASA_SERVICE_PATH=/etc/systemd/system/casaos.service
+readonly CASA_HELPER_PATH=/usr/share/casaos/shell/
+readonly CASA_USER_CONF_PATH=/var/lib/casaos/conf/
+readonly CASA_DB_PATH=/var/lib/casaos/db/
+readonly CASA_TEMP_PATH=/var/lib/casaos/temp/
+readonly CASA_LOGS_PATH=/var/log/casaos/
+readonly CASA_PACKAGE_EXT=".tar.gz"
+readonly CASA_RELEASE_API="https://api.github.com/repos/${CASA_REPO}/releases"
+readonly CASA_OPENWRT_DOCS="https://github.com/IceWhaleTech/CasaOS-OpenWrt"
+
+readonly COLOUR_RESET='\e[0m'
+readonly aCOLOUR=(
+    '\e[38;5;154m' # green  	| Lines, bullets and separators
+    '\e[1m'        # Bold white	| Main descriptions
+    '\e[90m'       # Grey		| Credits
+    '\e[91m'       # Red		| Update notifications Alert
+    '\e[33m'       # Yellow		| Emphasis
+)
+
+Target_Arch=""
+Target_Distro="debian"
+Target_OS="linux"
+Casa_Tag=""
+
+
+#######################################
+# Custom printing function
+# Globals:
+#   None
+# Arguments:
+#   $1 0:OK   1:FAILED  2:INFO  3:NOTICE
+#   message
+# Returns:
+#   None
+#######################################
+
+Show() {
+    # OK
+    if (($1 == 0)); then
+        echo -e "${aCOLOUR[2]}[$COLOUR_RESET${aCOLOUR[0]}  OK  $COLOUR_RESET${aCOLOUR[2]}]$COLOUR_RESET $2"
+    # FAILED
+    elif (($1 == 1)); then
+        echo -e "${aCOLOUR[2]}[$COLOUR_RESET${aCOLOUR[3]}FAILED$COLOUR_RESET${aCOLOUR[2]}]$COLOUR_RESET $2"
+    # INFO
+    elif (($1 == 2)); then
+        echo -e "${aCOLOUR[2]}[$COLOUR_RESET${aCOLOUR[0]} INFO $COLOUR_RESET${aCOLOUR[2]}]$COLOUR_RESET $2"
+    # NOTICE
+    elif (($1 == 3)); then
+        echo -e "${aCOLOUR[2]}[$COLOUR_RESET${aCOLOUR[4]}NOTICE$COLOUR_RESET${aCOLOUR[2]}]$COLOUR_RESET $2"
+    fi
+}
+
+Warn() {
+    echo -e "${aCOLOUR[3]}$1$COLOUR_RESET"
+}
+
+# 0 Check_exist
+Check_Exist() {
+    #Create Dir
+    Show 2 "Create Folders."
+    ${sudo_cmd} mkdir -p ${CASA_HELPER_PATH}
+    ${sudo_cmd} mkdir -p ${CASA_LOGS_PATH}
+    ${sudo_cmd} mkdir -p ${CASA_USER_CONF_PATH}
+    ${sudo_cmd} mkdir -p ${CASA_DB_PATH}
+    ${sudo_cmd} mkdir -p ${CASA_TEMP_PATH}
+
+   
+    Show 2 "Start cleaning up the old version."
+    
+    ${sudo_cmd} rm -rf /usr/lib/systemd/system/casaos.service
+    
+    ${sudo_cmd} rm -rf /lib/systemd/system/casaos.service
+    
+    ${sudo_cmd} rm -rf /usr/local/bin/${CASA_BIN}
+    
+    #Clean
+    if [[ -d "/casaOS" ]]; then
+        ${sudo_cmd} rm -rf /casaOS
+    fi
+    Show 0 "Clearance completed."    
+
+    $sudo_cmd systemctl restart ${CASA_BIN}
+}
+Check_Exist

build/sysroot/usr/share/casaos/shell/helper.sh

@@ -330,19 +330,59 @@ TarFolder() {
   du -sh /DATA
 }
 
-USB_Move_File() {
+USB_Start_Auto() {
   ((EUID)) && sudo_cmd="sudo"
-  $sudo_cmd cp -rf /casaOS/server/shell/11-usb-mount.rules /etc/udev/rules.d/
-  $sudo_cmd chmod +x /casaOS/server/shell/usb-mount.sh
-  $sudo_cmd cp -rf /casaOS/server/shell/usb-mount@.service /etc/systemd/system/
+  $sudo_cmd systemctl enable devmon@devmon
+  $sudo_cmd systemctl start devmon@devmon
 }
 
-USB_Remove_File() {
+USB_Stop_Auto() {
   ((EUID)) && sudo_cmd="sudo"
-  $sudo_cmd rm -fr /etc/udev/rules.d/11-usb-mount.rules
-  $sudo_cmd rm -fr /etc/systemd/system/usb-mount@.service
+  $sudo_cmd systemctl stop devmon@devmon
+  $sudo_cmd systemctl disable devmon@devmon
+  $sudo_cmd udevil clean
 }
 
 GetDeviceTree(){  
   cat /proc/device-tree/model
 }
+
+# restart samba service
+RestartSMBD(){
+  $sudo_cmd systemctl restart smbd
+}
+
+# edit user password $1:username
+EditSmabaUserPassword(){
+  $sudo_cmd smbpasswd $1
+}
+
+AddSmabaUser(){
+  $sudo_cmd useradd $1
+  $sudo_cmd smbpasswd -a $1 <<EOF
+    $2
+    $2
+EOF
+}
+
+# $1:username $2:host $3:share $4:port $5:mountpoint $6:password 
+MountCIFS(){
+ $sudo_cmd mount -t cifs -o username=$1,password=$6,port=$4 //$2/$3 $5
+}
+
+# $1:service name
+CheckServiceStatus(){
+  rs="`systemctl status  $1 |grep -E  'Active|PID'`"
+#echo "$rs"
+  run="`echo "$rs" |grep -B 2 'running'`"
+  fai="`echo "$rs" |grep  -E -B 2 'failed|inactive|dead'`"
+  if [  "$run" == "" ]
+   then
+	    echo "failed" 
+   else
+      echo "running"
+   fi
+}
+UDEVILUmount(){
+  $sudo_cmd udevil umount -f $1
+}

build/sysroot/usr/share/casaos/shell/update.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+###
+ # @Author:  LinkLeong link@icewhale.com
+ # @Date: 2022-06-30 10:08:33
+ # @LastEditors: LinkLeong
+ # @LastEditTime: 2022-09-01 22:33:06
+ # @FilePath: /CasaOS/build/sysroot/usr/share/casaos/shell/update.sh
+ # @Description:
+### 
+
+
+curl -fsSL https://raw.githubusercontent.com/IceWhaleTech/get/main/upgrade.sh | bash

cmd/migration-tool/log.go

@@ -0,0 +1,47 @@
+/*
+ * @Author: LinkLeong link@icewhale.org
+ * @Date: 2022-08-30 22:15:30
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-08-30 22:15:47
+ * @FilePath: /CasaOS/cmd/migration-tool/log.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package main
+
+import (
+	"log"
+	"os"
+)
+
+type Logger struct {
+	DebugMode bool
+
+	_debug *log.Logger
+	_info  *log.Logger
+	_error *log.Logger
+}
+
+func NewLogger() *Logger {
+	return &Logger{
+		DebugMode: false,
+		_debug:    log.New(os.Stdout, "DEBUG: ", 0),
+		_info:     log.New(os.Stdout, "", 0),
+		_error:    log.New(os.Stderr, "ERROR: ", 0),
+	}
+}
+
+func (l *Logger) Debug(format string, v ...interface{}) {
+	if l.DebugMode {
+		l._debug.Printf(format, v...)
+	}
+}
+
+func (l *Logger) Info(format string, v ...interface{}) {
+	l._info.Printf(format, v...)
+}
+
+func (l *Logger) Error(format string, v ...interface{}) {
+	l._error.Printf(format, v...)
+}

cmd/migration-tool/main.go

@@ -0,0 +1,117 @@
+/*
+ * @Author: LinkLeong link@icewhale.org
+ * @Date: 2022-08-23 18:09:11
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-08-31 14:17:51
+ * @FilePath: /CasaOS/cmd/migration-tool/main.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package main
+
+import (
+	"flag"
+	"fmt"
+	"os"
+
+	interfaces "github.com/IceWhaleTech/CasaOS-Common"
+	"github.com/IceWhaleTech/CasaOS-Common/utils/systemctl"
+	"github.com/IceWhaleTech/CasaOS-Gateway/common"
+	"github.com/IceWhaleTech/CasaOS/pkg/config"
+	"github.com/IceWhaleTech/CasaOS/pkg/sqlite"
+	"github.com/IceWhaleTech/CasaOS/service"
+	"gorm.io/gorm"
+)
+
+const (
+	casaosServiceName = "casaos.service"
+)
+
+var _logger *Logger
+var sqliteDB *gorm.DB
+
+var configFlag = ""
+var dbFlag = ""
+
+func init() {
+	config.InitSetup(configFlag)
+	config.UpdateSetup()
+
+	if len(dbFlag) == 0 {
+		dbFlag = config.AppInfo.DBPath + "/db"
+	}
+
+	sqliteDB = sqlite.GetDb(dbFlag)
+	//gredis.GetRedisConn(config.RedisInfo),
+
+	service.MyService = service.NewService(sqliteDB, "")
+}
+func main() {
+	versionFlag := flag.Bool("v", false, "version")
+	debugFlag := flag.Bool("d", true, "debug")
+	forceFlag := flag.Bool("f", true, "force")
+	flag.Parse()
+	_logger = NewLogger()
+	if *versionFlag {
+		fmt.Println(common.Version)
+		os.Exit(0)
+	}
+
+	if os.Getuid() != 0 {
+		os.Exit(1)
+	}
+
+	if *debugFlag {
+		_logger.DebugMode = true
+	}
+
+	if !*forceFlag {
+		serviceEnabled, err := systemctl.IsServiceEnabled(casaosServiceName)
+		if err != nil {
+			panic(err)
+		}
+
+		if serviceEnabled {
+			_logger.Info("%s is already enabled. If migration is still needed, try with -f.", casaosServiceName)
+			os.Exit(1)
+		}
+	}
+
+	migrationTools := []interfaces.MigrationTool{
+		NewMigrationToolFor_035(),
+	}
+
+	var selectedMigrationTool interfaces.MigrationTool
+
+	// look for the right migration tool matching current version
+	for _, tool := range migrationTools {
+		migrationNeeded, err := tool.IsMigrationNeeded()
+		if err != nil {
+			panic(err)
+		}
+
+		if migrationNeeded {
+			selectedMigrationTool = tool
+			break
+		}
+	}
+
+	if selectedMigrationTool == nil {
+		_logger.Error("selectedMigrationTool is null")
+		return
+	}
+
+	if err := selectedMigrationTool.PreMigrate(); err != nil {
+		panic(err)
+	}
+
+	if err := selectedMigrationTool.Migrate(); err != nil {
+		panic(err)
+	}
+
+	selectedMigrationTool.PostMigrate()
+	_logger.Info("casaos migration ok")
+	//panic(err)
+
+}

cmd/migration-tool/migration-034-035.go

@@ -0,0 +1,182 @@
+/*
+ * @Author: LinkLeong link@icewhale.org
+ * @Date: 2022-08-24 17:36:00
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-09-05 11:24:27
+ * @FilePath: /CasaOS/cmd/migration-tool/migration-034-035.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package main
+
+import (
+	"io"
+	"io/ioutil"
+	"os"
+	"path"
+	"strings"
+
+	interfaces "github.com/IceWhaleTech/CasaOS-Common"
+	"github.com/IceWhaleTech/CasaOS-Common/utils/version"
+	"github.com/IceWhaleTech/CasaOS/pkg/config"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/command"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
+	"github.com/IceWhaleTech/CasaOS/service"
+)
+
+type migrationTool struct{}
+
+func (u *migrationTool) IsMigrationNeeded() (bool, error) {
+
+	majorVersion, minorVersion, patchVersion, err := version.DetectLegacyVersion()
+	if err != nil {
+		if err == version.ErrLegacyVersionNotFound {
+			return false, nil
+		}
+
+		return false, err
+	}
+
+	if majorVersion > 0 {
+		return false, nil
+	}
+
+	if minorVersion > 3 {
+		return false, nil
+	}
+
+	if minorVersion == 3 && patchVersion > 5 {
+		return false, nil
+	}
+
+	_logger.Info("Migration is needed for a CasaOS version 0.3.5 and older...")
+	return true, nil
+
+}
+
+func (u *migrationTool) PreMigrate() error {
+
+	return nil
+}
+
+func (u *migrationTool) Migrate() error {
+
+	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")
+	}
+	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)
+	}
+	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 ;")
+	}
+
+	service.MyService.App().ImportApplications(true)
+
+	src := "/casaOS/server/conf/conf.ini"
+	if file.Exists(src) {
+		dst := "/etc/casaos/casaos.conf"
+		source, err := os.Open(src)
+		if err != nil {
+			return err
+		}
+		defer source.Close()
+
+		destination, err := os.Create(dst)
+		if err != nil {
+			return err
+		}
+		defer destination.Close()
+		_, err = io.Copy(destination, source)
+		if err != nil {
+			return err
+		}
+
+	}
+
+	if file.Exists("/casaOS/server/db") {
+		var fds []os.FileInfo
+		var err error
+		to := "/var/lib/casaos/db"
+		file.IsNotExistMkDir(to)
+		from := "/casaOS/server/db"
+		if fds, err = ioutil.ReadDir(from); err != nil {
+			return err
+		}
+
+		for _, fd := range fds {
+			srcfp := path.Join(from, fd.Name())
+			dstfp := path.Join(to, fd.Name())
+			source, err := os.Open(srcfp)
+			if err != nil {
+				return err
+			}
+			defer source.Close()
+
+			destination, err := os.Create(dstfp)
+			if err != nil {
+				return err
+			}
+			defer destination.Close()
+			_, err = io.Copy(destination, source)
+			if err != nil {
+				return err
+			}
+		}
+
+	}
+
+	if file.Exists("/casaOS/server/conf") {
+		var fds []os.FileInfo
+		var err error
+		to := "/var/lib/casaos/conf"
+		file.IsNotExistMkDir(to)
+		from := "/casaOS/server/conf"
+		if fds, err = ioutil.ReadDir(from); err != nil {
+			return err
+		}
+
+		for _, fd := range fds {
+			fExt := path.Ext(fd.Name())
+			if fExt != ".json" {
+				continue
+			}
+			srcfp := path.Join(from, fd.Name())
+			dstfp := path.Join(to, fd.Name())
+			source, err := os.Open(srcfp)
+			if err != nil {
+				return err
+			}
+			defer source.Close()
+
+			destination, err := os.Create(dstfp)
+			if err != nil {
+				return err
+			}
+			defer destination.Close()
+			_, err = io.Copy(destination, source)
+			if err != nil {
+				return err
+			}
+		}
+
+	}
+
+	_logger.Info("update done")
+	return nil
+}
+
+func (u *migrationTool) PostMigrate() error {
+	return nil
+}
+
+func NewMigrationToolFor_035() interfaces.MigrationTool {
+	return &migrationTool{}
+}

conf/conf.conf.sample

@@ -1,42 +1,26 @@
 [app]
 PAGE_SIZE = 10
 RuntimeRootPath = runtime/
-LogSavePath = /casaOS/logs/server/
+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
-ProjectPath = /casaOS/server
-RootPath = /casaOS
-
+DBPath     = /var/lib/casaos
+ShellPath  = /usr/share/casaos/shell
+UserDataPath = /var/lib/casaos/conf
+TempPath    = /var/lib/casaos/temp
 
 [server]
-HttpPort = 8089
-UDPPort = 
 RunMode = release
 ServerApi = https://api.casaos.io/casaos-api
 Handshake = socket.casaos.io
 Token = 
 USBAutoMount =
 
-[user]
-UserName = 
-PWD = 
-Email = user@gmail.com
-Description = description
-Initialized = false
-Avatar = 
-NickName = 
-PublicKey =
-
 [system]
-ConfigStr = 
-WidgetList =
-Analyse =
 
-
-[file]
-ShareDir =
-DownloadDir =
+[common]
+RuntimePath=/var/run/casaos

go.mod

@@ -4,76 +4,53 @@ go 1.16
 
 require (
 	github.com/Curtis-Milo/nat-type-identifier-go v0.0.0-20220215191915-18d42168c63d
+	github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220901034123-ca130f6b5ce9
+	github.com/IceWhaleTech/CasaOS-Gateway v0.3.6
 	github.com/Microsoft/go-winio v0.5.0 // indirect
-	github.com/Microsoft/hcsshim v0.8.22 // indirect
-	github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // 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/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/containerd/containerd v1.5.7 // 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
-	github.com/gin-gonic/gin v1.7.2
+	github.com/gin-contrib/gzip v0.0.6
+	github.com/gin-gonic/gin v1.8.1
 	github.com/go-ini/ini v1.62.0
-	github.com/go-ole/go-ole v1.2.5 // indirect
-	github.com/go-openapi/spec v0.20.4 // 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/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/mock v1.6.0
 	github.com/gomodule/redigo v1.8.5
 	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/hirochachacha/go-smb2 v1.1.0
 	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-isatty v0.0.14 // 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/image-spec v1.0.2 // indirect
-	github.com/opencontainers/selinux v1.8.5 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible
+	github.com/pilebones/go-udev v0.9.0
 	github.com/pkg/errors v0.9.1
-	github.com/prestonTao/upnp v0.0.0-20150206124352-f4370df5e109
-	github.com/prometheus/procfs v0.7.3 // indirect
 	github.com/robfig/cron v1.2.0
 	github.com/satori/go.uuid v1.2.0
-	github.com/shirou/gopsutil/v3 v3.21.5
+	github.com/shirou/gopsutil/v3 v3.22.7
 	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/afero v1.2.2
-	github.com/swaggo/gin-swagger v1.3.0
-	github.com/swaggo/swag v1.7.3
+	github.com/stretchr/testify v1.8.0
 	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
-	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
+	go.uber.org/zap v1.21.0
+	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
 	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/oauth2 v0.0.0-20220411215720-9780585627b5
 	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
-	google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0 // indirect
-	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/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gorm.io/driver/sqlite v1.2.6
 	gorm.io/gorm v1.22.5
 )

interfaces/migrationTool.go

@@ -0,0 +1,18 @@
+/*
+ * @Author: LinkLeong link@icewhale.org
+ * @Date: 2022-08-24 17:37:36
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-08-24 17:38:48
+ * @FilePath: /CasaOS/interfaces/migrationTool.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package interfaces
+
+type MigrationTool interface {
+	IsMigrationNeeded() (bool, error)
+	PostMigrate() error
+	Migrate() error
+	PreMigrate() error
+}

main.go

@@ -3,52 +3,58 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net"
 	"net/http"
 	"time"
 
+	"github.com/IceWhaleTech/CasaOS-Gateway/common"
+	"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/loger"
 	"github.com/IceWhaleTech/CasaOS/route"
 	"github.com/IceWhaleTech/CasaOS/service"
-	model2 "github.com/IceWhaleTech/CasaOS/service/model"
 	"github.com/IceWhaleTech/CasaOS/types"
 
 	"github.com/robfig/cron"
 	"gorm.io/gorm"
 )
 
+const LOCALHOST = "127.0.0.1"
+
 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 versionFlag = flag.Bool("v", false, "version")
 
 func init() {
 	flag.Parse()
+	if *versionFlag {
+		fmt.Println("v" + types.CURRENTVERSION)
+		return
+	}
 	config.InitSetup(*configFlag)
 	config.UpdateSetup()
-	loger2.LogSetup()
+
+	loger.LogInit()
 	if len(*dbFlag) == 0 {
-		*dbFlag = config.AppInfo.ProjectPath + "/db"
+		*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, config.CommonInfo.RuntimePath)
+
 	service.Cache = cache.Init()
 
-	go service.UDPService()
+	service.GetToken()
 
-	fmt.Println("token", 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.SendIPToServer()
 	// go service.LoopFriend()
 	// go service.MyService.App().CheckNewImage()
 
@@ -66,52 +72,77 @@ func init() {
 // @name Authorization
 // @BasePath /v1
 func main() {
-	if *showUserInfo {
-		fmt.Println("CasaOS User Info")
-		fmt.Println("UserName:" + config.UserInfo.UserName)
-		fmt.Println("Password:" + config.UserInfo.PWD)
+	service.NotifyMsg = make(chan notify.Message, 10)
+	if *versionFlag {
 		return
 	}
+	go route.SocketInit(service.NotifyMsg)
+	go route.MonitoryUSB()
 	//model.Setup()
 	//gredis.Setup()
+
 	r := route.InitRouter()
 	//service.SyncTask(sqliteDB)
 	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/1 * * * * *", func() {
-		notify := model2.AppNotify{}
-		notify.CustomId = ""
-		notify.Type = types.NOTIFY_TYPE_HEALTH_CHECK
-
-		go service.MyService.Notify().SendText(notify)
 
+	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{
-		Addr:           fmt.Sprintf(":%v", config.ServerInfo.HttpPort),
-		Handler:        r,
-		ReadTimeout:    60 * time.Second,
-		WriteTimeout:   60 * time.Second,
-		MaxHeaderBytes: 1 << 20,
+
+	listener, err := net.Listen("tcp", net.JoinHostPort(LOCALHOST, "0"))
+	if err != nil {
+		panic(err)
 	}
+	routers := []string{"sys", "apps", "container", "app-categories", "port", "file", "folder", "batch", "image", "disks", "storage", "samba"}
+	for _, v := range routers {
+		err = service.MyService.Gateway().CreateRoute(&common.Route{
+			Path:   "/v1/" + v,
+			Target: "http://" + listener.Addr().String(),
+		})
 
-	s.ListenAndServe()
+		if err != nil {
+			fmt.Println("err", err)
+			panic(err)
+		}
+	}
+	go func() {
+		time.Sleep(time.Second * 2)
+		//v0.3.6
+		if config.ServerInfo.HttpPort != "" {
+			changePort := common.ChangePortRequest{}
+			changePort.Port = config.ServerInfo.HttpPort
+			err := service.MyService.Gateway().ChangePort(&changePort)
+			if err == nil {
+				config.Cfg.Section("server").Key("HttpPort").SetValue("")
+				config.Cfg.SaveTo(config.SystemConfigInfo.ConfigPath)
+			}
+		}
+	}()
 
+	// s := &http.Server{
+	// 	Addr:           listener.Addr().String(), //fmt.Sprintf(":%v", config.ServerInfo.HttpPort),
+	// 	Handler:        r,
+	// 	ReadTimeout:    60 * time.Second,
+	// 	WriteTimeout:   60 * time.Second,
+	// 	MaxHeaderBytes: 1 << 20,
+	// }
+	// s.ListenAndServe()
+	err = http.Serve(listener, r)
+	if err != nil {
+		panic(err)
+	}
 }

middleware/gin.go

@@ -1,31 +1,40 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2021-10-08 10:29:08
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-07-22 11:06:07
+ * @FilePath: /CasaOS/middleware/gin.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
 package middleware
 
 import (
 	"fmt"
 	"net/http"
+	"strings"
 
+	"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,Language")
+		c.Header("Access-Control-Allow-Headers", "Authorization, Content-Length, X-CSRF-Token, Token,session,Language,Content-Type,Access-Control-Allow-Origin,Access-Control-Allow-Headers,Access-Control-Allow-Methods,Connection,Host,Origin,Referer,User-Agent,X-Requested-With")
 		// 允许浏览器（客户端）可以解析的头部 （重要）
 		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")
+		c.Set("Content-Type", "application/json")
 		//}
 
 		//允许类型校验
@@ -42,3 +51,12 @@ func Cors() gin.HandlerFunc {
 		c.Next()
 	}
 }
+func WriteLog() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		if !strings.Contains(c.Request.URL.String(), "password") {
+			loger.Info("request:", zap.Any("path", c.Request.URL.String()), zap.Any("param", c.Params), zap.Any("query", c.Request.URL.Query()), zap.Any("method", c.Request.Method))
+			c.Next()
+		}
+
+	}
+}

model/app-analyse.go

@@ -1,27 +0,0 @@
-/*
- * @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,6 +6,22 @@ import (
 	"time"
 )
 
+type ServerAppListCollection struct {
+	List      []ServerAppList `json:"list"`
+	Recommend []ServerAppList `json:"recommend"`
+	Community []ServerAppList `json:"community"`
+	Version   string          `json:"version"`
+}
+
+// @tiger - 对于用于出参的数据结构，静态信息（例如 title）和
+//          动态信息（例如 state、query_count）应该划分到不同的数据结构中
+//
+//          这样的好处是
+//          1 - 多次获取动态信息时可以减少出参复杂度，因为静态信息只获取一次就好
+//          2 - 在未来的迭代中，可以降低维护成本（所有字段都展开放在一个层级维护成本略高）
+//
+//          另外，一些针对性字段，例如 Docker 相关的，可以用 map 来保存。
+//          这样在未来增加多态 App，例如 Snap，不需要维护多个结构，或者一个结构保存不必要的字段
 type ServerAppList struct {
 	Id             uint      `gorm:"column:id;primary_key" json:"id"`
 	Title          string    `json:"title"`
@@ -15,6 +31,7 @@ type ServerAppList struct {
 	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"`
@@ -28,7 +45,7 @@ type ServerAppList struct {
 	Index          string    `json:"index"`
 	CreatedAt      time.Time `json:"created_at"`
 	UpdatedAt      time.Time `json:"updated_at"`
-	State          string    `json:"state"`
+	State          int       `json:"state"`
 	Author         string    `json:"author"`
 	MinMemory      int       `json:"min_memory"`
 	MinDisk        int       `json:"min_disk"`
@@ -38,6 +55,7 @@ type ServerAppList struct {
 	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"`

model/category.go

@@ -1,11 +1,23 @@
+/*
+ * @Author: link a624669980@163.com
+ * @Date: 2022-05-16 17:37:08
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-07-13 10:46:38
+ * @FilePath: /CasaOS/model/category.go
+ * @Description:
+ */
 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"`
+	Font  string `json:"font"` // @tiger - 如果这个和前端有关，应该不属于后端的出参范围，而是前端去界定
 	Name  string `json:"name"`
-	Count uint   `json:"count"`
+	Count uint   `json:"count"` // @tiger - count 属于动态信息，应该单独放在一个出参结构中（原因见另外一个关于 静态/动态 出参的注释）
 }

model/connections.go

@@ -0,0 +1,20 @@
+/*
+ * @Author: LinkLeong link@icewhale.org
+ * @Date: 2022-07-27 10:30:43
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-08-04 20:06:04
+ * @FilePath: /CasaOS/model/connections.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package model
+
+type Connections struct {
+	ID         uint   `json:"id"`
+	Username   string `json:"username"`
+	Password   string `json:"password,omitempty"`
+	Host       string `json:"host"`
+	Port       string `json:"port"`
+	MountPoint string `json:"mount_point"`
+}

model/disk.go

@@ -1,3 +1,13 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-07-13 10:43:45
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-08-03 14:45:35
+ * @FilePath: /CasaOS/model/disk.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
 package model
 
 type LSBLKModel struct {
@@ -29,6 +39,7 @@ type LSBLKModel struct {
 	Serial      string       `json:"serial"`
 	Children    []LSBLKModel `json:"children"`
 	SubSystems  string       `json:"subsystems"`
+	Label       string       `json:"label"`
 	//详情特有
 	StartSector uint64 `json:"start_sector,omitempty"`
 	Rota        bool   `json:"rota"` //true(hhd) false(ssd)
@@ -37,35 +48,46 @@ type LSBLKModel struct {
 }
 
 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"`
+	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"`
+	ChildrenNumber int    `json:"children_number"`
 }
 
 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"` //可用空间
+	Name     string        `json:"name"`
+	Size     uint64        `json:"size"`
+	Model    string        `json:"model"`
+	Avail    uint64        `json:"avail"`
+	Children []USBChildren `json:"children"`
+}
+type USBChildren struct {
+	Name       string `json:"name"`
+	Size       uint64 `json:"size"`
+	Avail      uint64 `json:"avail"`
+	MountPoint string `json:"mount_point"`
 }
 
 type Storage struct {
-	Name       string `json:"name"`
-	MountPoint string `json:"mountpoint"`
+	MountPoint string `json:"mount_point"`
 	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"`
+	Label      string `json:"label"`
+}
+type Storages struct {
+	DiskName string    `json:"disk_name"`
+	Size     uint64    `json:"size"`
+	Path     string    `json:"path"`
+	Children []Storage `json:"children"`
 }
 
 type Summary struct {

model/docker.go

@@ -1,8 +1,18 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2021-12-08 18:10:25
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-07-13 10:49:16
+ * @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"`
+	Icon     string      `json:"icon"`
+	Title    string      `json:"title"`
+	Data     interface{} `json:"data"`
+	Previous interface{} `json:"previous"`
 }

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/manifest.go

@@ -104,16 +104,17 @@ func (p *PathArray) 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         EnvArray  `json:"envs"`
-	Ports        PortArray `json:"ports"`
-	Volumes      PathArray `json:"volumes"`
-	Devices      PathArray `json:"devices"`
+	ContainerName string    `json:"container_name"`
+	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          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"`
@@ -127,4 +128,6 @@ type CustomizationPostData struct {
 	Privileged  bool     `json:"privileged"`
 	CapAdd      []string `json:"cap_add"`
 	Cmd         []string `json:"cmd"`
+	Protocol    string   `json:"protocol"`
+	Host        string   `json:"host"`
 }

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/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/notify/storage.go

@@ -0,0 +1,19 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-07-15 10:43:00
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-07-15 10:56:17
+ * @FilePath: /CasaOS/model/notify/storage.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package notify
+
+type StorageMessage struct {
+	Type   string `json:"type"`   //sata,usb
+	Action string `json:"action"` //remove add
+	Path   string `json:"path"`
+	Volume string `json:"volume"`
+	Size   uint64 `json:"size"`
+}

model/person.go

@@ -1,54 +0,0 @@
-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/share.go

@@ -0,0 +1,17 @@
+/*
+ * @Author: LinkLeong link@icewhale.org
+ * @Date: 2022-07-26 11:12:12
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-07-27 14:58:55
+ * @FilePath: /CasaOS/model/share.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package model
+
+type Shares struct {
+	ID        uint   `json:"id"`
+	Anonymous bool   `json:"anonymous"`
+	Path      string `json:"path"`
+}

model/sys_common.go

@@ -1,3 +1,13 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-05-13 18:15:46
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-09-02 22:12:34
+ * @FilePath: /CasaOS/model/sys_common.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
 package model
 
 import "time"
@@ -7,43 +17,33 @@ type SysInfoModel struct {
 	Name string //系统名称
 }
 
-//用户相关
-type UserModel struct {
-	UserName    string
-	PWD         string
-	Token       string
-	Head        string
-	Email       string
-	Description string
-	Initialized bool
-	Avatar      string
-	NickName    string
-	Public      string
-}
-
 //服务配置
 type ServerModel struct {
 	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
-	RootPath       string
+	DBPath         string
+	ShellPath      string
+	TempPath       string
+}
+type CommonModel struct {
+	RuntimePath string
 }
 
 //公共返回模型
@@ -63,12 +63,7 @@ type RedisModel struct {
 }
 
 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 {

model/system.go

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

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/zima.go

@@ -1,14 +1,25 @@
+/*
+ * @Author: LinkLeong link@icewhale.org
+ * @Date: 2022-05-13 18:15:46
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-08-01 18:32:57
+ * @FilePath: /CasaOS/model/zima.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
 package model
 
 import "time"
 
 type Path struct {
-	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"`
+	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"`
+	Extensions map[string]interface{} `json:"extensions"`
 }

pkg/config/config.go

@@ -1,5 +1,15 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2021-09-30 18:18:14
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-08-31 17:04:02
+ * @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/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-09-05 11:58:02
+ * @FilePath: /CasaOS/pkg/config/init.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
 package config
 
 import (
@@ -16,12 +26,11 @@ import (
 //系统配置
 var SysInfo = &model.SysInfoModel{}
 
-//用户相关
-var UserInfo = &model.UserModel{}
-
 //用户相关
 var AppInfo = &model.APPModel{}
 
+var CommonInfo = &model.CommonModel{}
+
 //var RedisInfo = &model.RedisModel{}
 
 //server相关
@@ -42,21 +51,48 @@ 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)
 	if err != nil {
-		fmt.Printf("Fail to read file: %v", err)
-		os.Exit(1)
+		Cfg, err = ini.Load("/etc/casaos.conf")
+		if err != nil {
+			Cfg, err = ini.Load("/casaOS/server/conf/conf.ini")
+			if err != nil {
+				fmt.Printf("Fail to read file: %v", err)
+				os.Exit(1)
+			}
+		}
 	}
-
-	mapTo("user", UserInfo)
 	mapTo("app", AppInfo)
 	//mapTo("redis", RedisInfo)
 	mapTo("server", ServerInfo)
 	mapTo("system", SystemConfigInfo)
 	mapTo("file", FileSettingInfo)
+	mapTo("common", CommonInfo)
 	SystemConfigInfo.ConfigPath = configDir
+	if len(AppInfo.DBPath) == 0 {
+		AppInfo.DBPath = "/var/lib/casaos"
+	}
+	if len(AppInfo.LogPath) == 0 {
+		AppInfo.LogPath = "/var/log/casaos/"
+	}
+	if len(AppInfo.ShellPath) == 0 {
+		AppInfo.ShellPath = "/usr/share/casaos/shell"
+	}
+	if len(AppInfo.UserDataPath) == 0 {
+		AppInfo.UserDataPath = "/var/lib/casaos/conf"
+	}
+	if len(AppInfo.TempPath) == 0 {
+		AppInfo.TempPath = "/var/lib/casaos/temp"
+	}
+	if len(CommonInfo.RuntimePath) == 0 {
+		CommonInfo.RuntimePath = "/var/run/casaos"
+	}
+	Cfg.SaveTo(configDir)
 	//	AppInfo.ProjectPath = getCurrentDirectory() //os.Getwd()
 
 }

pkg/docker/helper.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"io"
 	"regexp"
-	"strconv"
 	"sync"
 	"time"
 
@@ -15,7 +14,7 @@ import (
 	"golang.org/x/crypto/ssh"
 )
 
-func NewSshClient(user, password string) (*ssh.Client, error) {
+func NewSshClient(user, password string, port string) (*ssh.Client, error) {
 
 	// connet to ssh
 	// addr = fmt.Sprintf("%s:%d", host, port)
@@ -32,7 +31,7 @@ func NewSshClient(user, password string) (*ssh.Client, error) {
 	//} else {
 	//	config.Auth = []ssh.AuthMethod{publicKeyAuthFunc(h.Key)}
 	//}
-	addr := fmt.Sprintf("%s:%d", "127.0.0.1", 22)
+	addr := fmt.Sprintf("%s:%s", "127.0.0.1", port)
 	c, err := ssh.Dial("tcp", addr, config)
 	if err != nil {
 		return nil, err
@@ -396,7 +395,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/samba/smaba.go

@@ -0,0 +1,75 @@
+/*
+ * @Author: LinkLeong link@icewhale.org
+ * @Date: 2022-07-27 10:35:29
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-08-01 13:56:44
+ * @FilePath: /CasaOS/pkg/samba/smaba.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package samba
+
+import (
+	"errors"
+	"net"
+
+	"github.com/hirochachacha/go-smb2"
+)
+
+func ConnectSambaService(host, port, username, password, directory string) error {
+	conn, err := net.Dial("tcp", host+":"+port)
+	if err != nil {
+		return err
+	}
+	defer conn.Close()
+	d := &smb2.Dialer{
+		Initiator: &smb2.NTLMInitiator{
+			User:     username,
+			Password: password,
+		},
+	}
+
+	s, err := d.Dial(conn)
+	if err != nil {
+		return err
+	}
+	defer s.Logoff()
+	names, err := s.ListSharenames()
+	if err != nil {
+		return err
+	}
+
+	for _, name := range names {
+		if name == directory {
+			return nil
+		}
+	}
+	return errors.New("directory not found")
+}
+
+//get share name list
+func GetSambaSharesList(host, port, username, password string) ([]string, error) {
+	conn, err := net.Dial("tcp", host+":"+port)
+	if err != nil {
+		return nil, err
+	}
+	defer conn.Close()
+	d := &smb2.Dialer{
+		Initiator: &smb2.NTLMInitiator{
+			User:     username,
+			Password: password,
+		},
+	}
+
+	s, err := d.Dial(conn)
+	if err != nil {
+		return nil, err
+	}
+	defer s.Logoff()
+	names, err := s.ListSharenames()
+	if err != nil {
+		return nil, err
+	}
+	return names, err
+}

pkg/sqlite/db.go

@@ -1,11 +1,22 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-05-13 18:15:46
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-08-31 13:39:24
+ * @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"
 )
@@ -16,7 +27,7 @@ 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(dbPath)
@@ -26,14 +37,19 @@ func GetDb(dbPath string) *gorm.DB {
 	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{}, &model2.SerialDisk{}, model2.PersonDownloadDBModel{}, model2.FriendModel{}, model2.PersonDownRecordDBModel{}, model2.ApplicationModel{})
+
+	err = db.AutoMigrate(&model2.AppNotify{}, &model2.AppListDBModel{}, &model2.SerialDisk{}, model2.SharesDBModel{}, model2.ConnectionsDBModel{})
+	db.Exec("DROP TABLE IF EXISTS o_application")
+	db.Exec("DROP TABLE IF EXISTS o_friend")
+	db.Exec("DROP TABLE IF EXISTS o_person_download")
+	db.Exec("DROP TABLE IF EXISTS o_person_down_record")
 	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
-	remoteAddr, err := net.ResolveUDPAddr("udp", "239.255.255.250:1900")
-	if err != nil {
-		return "", errors.New("组播地址格式不正确")
-	}
-	localAddr, err := net.ResolveUDPAddr("udp", ip_helper2.GetLoclIp()+":")
-
-	if err != nil {
-		return "", errors.New("本地ip地址格式不正确")
-	}
-	conn, err = net.ListenUDP("udp", localAddr)
-	defer conn.Close()
-	if err != nil {
-		return "", errors.New("监听udp出错")
-	}
-	_, err = conn.WriteToUDP([]byte(str), remoteAddr)
-	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,158 +0,0 @@
-package upnp
-
-import (
-	"bytes"
-	"net/http"
-	"strconv"
-	"strings"
-
-	loger2 "github.com/IceWhaleTech/CasaOS/pkg/utils/loger"
-	"github.com/pkg/errors"
-)
-
-//
-////添加一个端口映射
-func (n *Upnp) AddPortMapping(localPort, remotePort int, protocol string) (err error) {
-	defer func() {
-		if errTemp := recover(); errTemp != nil {
-			loger2.NewOLoger().Error("upnp模块报错了", errTemp)
-		}
-	}()
-
-	if isSuccess := addSend(localPort, remotePort, protocol, n.GatewayHost, n.CtrlUrl, n.LocalHost); isSuccess {
-		return nil
-	} else {
-		return errors.New("添加一个端口映射失败")
-	}
-}
-
-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))
-	return response.StatusCode == 200
-}
-
-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()
-
-	return response.StatusCode == 200
-}
-
-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,25 +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/common_err/e.go

@@ -0,0 +1,123 @@
+package common_err
+
+const (
+	SUCCESS          = 200
+	SERVICE_ERROR    = 500
+	CLIENT_ERROR     = 400
+	ERROR_AUTH_TOKEN = 401
+
+	INVALID_PARAMS = 4000
+	//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
+	Record_NOT_EXIST                = 20007
+	Record_ALREADY_EXIST            = 20008
+	SERVICE_NOT_RUNNING             = 20009
+
+	//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
+
+	//share
+	SHARE_ALREADY_EXISTS      = 70001
+	SHARE_NAME_ALREADY_EXISTS = 70002
+)
+
+var MsgFlags = map[int]string{
+	SUCCESS:          "ok",
+	SERVICE_ERROR:    "Fail",
+	CLIENT_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",
+	Record_ALREADY_EXIST: "Record already exists",
+	Record_NOT_EXIST:     "Record does not exist",
+	SERVICE_NOT_RUNNING:  "Service is not running",
+
+	//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",
+	//share
+	SHARE_ALREADY_EXISTS:      "Share already exists",
+	SHARE_NAME_ALREADY_EXISTS: "Share name already exists",
+	//
+	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",
+
+	COMMAND_ERROR_INVALID_OPERATION: "invalid operation",
+}
+
+//获取错误信息
+func GetMsg(code int) string {
+	msg, ok := MsgFlags[code]
+	if ok {
+		return msg
+	}
+	return MsgFlags[SERVICE_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/file/file.go

@@ -2,9 +2,11 @@ package file
 
 import (
 	"bufio"
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
+	"log"
 	"mime/multipart"
 	"os"
 	"path"
@@ -12,6 +14,8 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
+
+	"github.com/mholt/archiver/v3"
 )
 
 // GetSize get the file size
@@ -182,7 +186,7 @@ func ReadFullFile(path string) []byte {
 }
 
 // File copies a single file from src to dst
-func CopyFile(src, dst string) error {
+func CopyFile(src, dst, style string) error {
 	var err error
 	var srcfd *os.File
 	var dstfd *os.File
@@ -193,20 +197,55 @@ func CopyFile(src, dst string) error {
 	if !strings.HasSuffix(dst, "/") {
 		dst += "/"
 	}
-	dstPath := dst
 	dst += lastPath
-	for i := 0; Exists(dst); i++ {
-		name := strings.Split(lastPath, ".")
-		nameIndex := 0
-		if len(name) > 2 {
-			nameIndex = len(name) - 2
+	if Exists(dst) {
+		if style == "skip" {
+			return nil
+		} else {
+			os.Remove(dst)
 		}
-		name[nameIndex] = name[nameIndex] + "(Copy)"
-		dst = dstPath
-		for _, v := range name {
-			dst += v + "."
+	}
+
+	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)
 		}
-		dst = strings.TrimSuffix(dst, ".")
 	}
 
 	if srcfd, err = os.Open(src); err != nil {
@@ -240,7 +279,7 @@ func GetNoDuplicateFileName(fullPath string) string {
 }
 
 // Dir copies a whole directory recursively
-func CopyDir(src string, dst string) error {
+func CopyDir(src string, dst string, style string) error {
 	var err error
 	var fds []os.FileInfo
 	var srcinfo os.FileInfo
@@ -249,16 +288,23 @@ func CopyDir(src string, dst string) error {
 		return err
 	}
 	if !srcinfo.IsDir() {
-		if err = CopyFile(src, dst); err != nil {
+		if err = CopyFile(src, dst, style); err != nil {
 			fmt.Println(err)
 		}
 		return nil
 	}
-	dstPath := dst
+	//dstPath := dst
 	lastPath := src[strings.LastIndex(src, "/")+1:]
 	dst += "/" + lastPath
-	for i := 0; Exists(dst); i++ {
-		dst = dstPath + "/" + lastPath + strconv.Itoa(i+1)
+	// 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
@@ -271,11 +317,11 @@ func CopyDir(src string, dst string) error {
 		dstfp := dst //path.Join(dst, fd.Name())
 
 		if fd.IsDir() {
-			if err = CopyDir(srcfp, dstfp); err != nil {
+			if err = CopyDir(srcfp, dstfp, style); err != nil {
 				fmt.Println(err)
 			}
 		} else {
-			if err = CopyFile(srcfp, dstfp); err != nil {
+			if err = CopyFile(srcfp, dstfp, style); err != nil {
 				fmt.Println(err)
 			}
 		}
@@ -332,3 +378,189 @@ func SpliceFiles(dir, path string, length int, startPoint int) error {
 
 	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
+}
+
+func ReadLine(lineNumber int, path string) string {
+	file, err := os.Open(path)
+	if err != nil {
+		return ""
+	}
+	fileScanner := bufio.NewScanner(file)
+	lineCount := 1
+	for fileScanner.Scan() {
+		if lineCount == lineNumber {
+			return fileScanner.Text()
+		}
+		lineCount++
+	}
+	defer file.Close()
+	return ""
+}

pkg/utils/file/image.go

@@ -2,9 +2,13 @@ package file
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"io"
+	"net/http"
 	"os"
+	"path/filepath"
+	"strings"
 
 	"github.com/disintegration/imaging"
 	"github.com/dsoprea/go-exif/v3"
@@ -82,3 +86,176 @@ func GetThumbnailByWebPhoto(path string, width, height int) ([]byte, error) {
 	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/jwt/jwt.go

@@ -1,46 +0,0 @@
-package jwt
-
-import (
-	"time"
-
-	jwt "github.com/golang-jwt/jwt"
-)
-
-type Claims struct {
-	UserName string `json:"username"`
-	PassWord string `json:"password"`
-	jwt.StandardClaims
-}
-
-var jwtSecret []byte
-
-//创建token
-func GenerateToken(username, password string) (string, error) {
-	expireTime := time.Now().AddDate(999, 0, 0)
-	clims := Claims{
-		username,
-		password,
-		jwt.StandardClaims{
-			ExpiresAt: expireTime.Unix(),
-			Issuer:    "gin-blog",
-		},
-	}
-
-	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
-}

pkg/utils/jwt/jwt_helper.go

@@ -1,54 +0,0 @@
-package jwt
-
-import (
-	"fmt"
-	"net/http"
-
-	"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"
-)
-
-func JWT(swagHandler gin.HandlerFunc) gin.HandlerFunc {
-	return func(c *gin.Context) {
-		var code int
-		code = oasis_err2.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
-			//}
-		}
-
-		if code != oasis_err2.SUCCESS {
-			c.JSON(http.StatusOK, model.Result{Success: code, Message: oasis_err2.GetMsg(code)})
-			c.Abort()
-			return
-		}
-		c.Next()
-	}
-}
-
-//获取token
-func GetToken(username, pwd string) string {
-	token, err := GenerateToken(username, pwd)
-	if err == nil {
-		return token
-	} else {
-		loger2.NewOLoger().Fatal(fmt.Sprintf("Get Token Fail: %V", err))
-		return ""
-	}
-}

pkg/utils/loger/log.go

@@ -1,109 +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"
-	"log"
 	"os"
+	"path"
 	"path/filepath"
 	"runtime"
 
 	"github.com/IceWhaleTech/CasaOS/pkg/config"
-	file2 "github.com/IceWhaleTech/CasaOS/pkg/utils/file"
+	"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{})
-	Path() string
-}
-
-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",
-		config.AppInfo.LogSaveName,
-		config.AppInfo.LogFileExt,
-	)
-	F, err = file2.MustOpen(fileName, filePath)
-	if err != nil {
-		log.Fatalf("logging.Setup err: %v", err)
+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,
 	}
 
-	logger = log.New(F, DefaultPrefix, log.LstdFlags)
-
+	return zapcore.AddSync(lumberJackLogger)
 }
-func (o *oLog) Path() string {
-	filePath := fmt.Sprintf("%s", config.AppInfo.LogSavePath)
-	fileName := fmt.Sprintf("%s.%s",
-		config.AppInfo.LogSaveName,
-		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),
 	)
-	return filePath + fileName
-}
-func (o *oLog) Debug(v ...interface{}) {
-	setPrefix(DEBUG)
-	logger.Println(v)
+	loggers = zap.New(core)
+
 }
 
-func (o *oLog) Info(v ...interface{}) {
-	setPrefix(INFO)
-	logger.Println(v)
+func Info(message string, fields ...zap.Field) {
+	callerFields := getCallerInfoForLog()
+	fields = append(fields, callerFields...)
+	loggers.Info(message, fields...)
 }
 
-func (o *oLog) Warn(v ...interface{}) {
-	setPrefix(WARN)
-	logger.Println(v)
+func Debug(message string, fields ...zap.Field) {
+	callerFields := getCallerInfoForLog()
+	fields = append(fields, callerFields...)
+	loggers.Debug(message, fields...)
 }
 
-func (o *oLog) Error(v ...interface{}) {
-	setPrefix(ERROR)
-	logger.Println(v)
+func Error(message string, fields ...zap.Field) {
+	callerFields := getCallerInfoForLog()
+	fields = append(fields, callerFields...)
+	loggers.Error(message, fields...)
 }
 
-func (o *oLog) Fatal(v ...interface{}) {
-	setPrefix(FATAL)
-	logger.Println(v)
+func Warn(message string, fields ...zap.Field) {
+	callerFields := getCallerInfoForLog()
+	fields = append(fields, callerFields...)
+	loggers.Warn(message, fields...)
 }
 
-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])
+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.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/oasis_err/e.go

@@ -1,115 +0,0 @@
-package oasis_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
-	//system
-	DIR_ALREADY_EXISTS              = 20001
-	FILE_ALREADY_EXISTS             = 20002
-	FILE_OR_DIR_EXISTS              = 20003
-	PORT_IS_OCCUPIED                = 20004
-	COMMAND_ERROR_INVALID_OPERATION = 20005
-
-	//zerotier
-	GET_TOKEN_ERROR = 30001
-
-	//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
-
-	//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",
-
-	//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",
-
-	//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:  "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",
-
-	//
-	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/udev_helper.go

@@ -0,0 +1,33 @@
+/*
+ * @Author: LinkLeong link@icewhale.org
+ * @Date: 2022-08-10 16:06:12
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-08-10 16:11:37
+ * @FilePath: /CasaOS/pkg/utils/udev_helper.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package utils
+
+// func getOptionnalMatcher() (matcher netlink.Matcher, err error) {
+// 	if filePath == nil || *filePath == "" {
+// 		return nil, nil
+// 	}
+
+// 	stream, err := ioutil.ReadFile(*filePath)
+// 	if err != nil {
+// 		return nil, err
+// 	}
+
+// 	if stream == nil {
+// 		return nil, fmt.Errorf("Empty, no rules provided in \"%s\", err: %w", *filePath, err)
+// 	}
+
+// 	var rules netlink.RuleDefinitions
+// 	if err := json.Unmarshal(stream, &rules); err != nil {
+// 		return nil, fmt.Errorf("Wrong rule syntax, err: %w", err)
+// 	}
+
+// 	return &rules, nil
+// }

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-07-21 15:27:53
+ * @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) {
@@ -33,51 +36,9 @@ func IsNeedUpdate() (bool, model.Version) {
 		if a > b {
 			return true, version
 		}
-	}
-	return false, version
-}
-
-func IsClientNeedUpdate() (bool, model.Version) {
-	var version model.Version
-	v := httper.OasisGet(config.ServerInfo.ServerApi + "/v1/sys/client/version")
-	data := gjson.Get(v, "data")
-	json2.Unmarshal([]byte(data.String()), &version)
-
-	v1 := strings.Split(version.Version, ".")
-	v2 := strings.Split(types.CURRENTVERSION, ".")
-
-	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, 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
-}

route/darwin.go

@@ -0,0 +1,25 @@
+//go:build darwin
+// +build darwin
+
+/*
+ * @Author: LinkLeong link@icewhale.org
+ * @Date: 2022-08-12 14:22:28
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-09-05 16:27:55
+ * @FilePath: /CasaOS/route/darwin.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+
+package route
+
+func MonitoryUSB() {
+
+}
+func SendAllHardwareStatusBySocket() {
+
+}
+func SendUSBBySocket() {
+
+}

route/doc.go

@@ -1,15 +0,0 @@
-//go:build doc
-// +build doc
-
-package route
-
-import (
-	_ "github.com/IceWhaleTech/CasaOS/docs"
-	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

@@ -1,165 +1,27 @@
 package route
 
 import (
-	"encoding/xml"
 	"fmt"
-	"runtime"
+	"os"
 	"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/samba"
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/command"
-	"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/pkg/utils/loger"
 	"github.com/IceWhaleTech/CasaOS/service"
 	model2 "github.com/IceWhaleTech/CasaOS/service/model"
-	uuid "github.com/satori/go.uuid"
+	"go.uber.org/zap"
 )
 
 func InitFunction() {
-	go checkSystemApp()
-	Update2_3()
 	CheckSerialDiskMount()
-
-	CheckToken2_11()
-	ImportApplications()
-	ChangeAPIUrl()
-	InitSystemApplication()
-
+	go InitNetworkMount()
 }
 
-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.ZiMa().GetMemInfo().Total >> 20
-
-	id := uuid.NewV4().String()
-
-	installLog := model2.AppNotify{}
-
-	// step：下载镜像
-	err := service.MyService.Docker().DockerPullImage(dockerImage+":"+dockerImageVersion, installLog)
-	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.Label = id
-	m.CustomId = id
-	containerId, err := service.MyService.Docker().DockerContainerCreate(dockerImage+":"+dockerImageVersion, m, appInfo.NetworkModel)
-	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.HostConfig.Mounts {
-				if i.Target == "/config" {
-					path = i.Source
-
-					break
-				}
-			}
-			content := file.ReadFullFile(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()
@@ -174,125 +36,59 @@ func CheckSerialDiskMount() {
 		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)
-							}
+				//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().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.ProjectPath + "/shell/helper.sh ;AutoRemoveUnuseDir")
+	command.OnlyExec("source " + config.AppInfo.ShellPath + "/helper.sh ;AutoRemoveUnuseDir")
 }
-func Update2_3() {
-	command.OnlyExec("source " + config.AppInfo.ProjectPath + "/shell/assist.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)
-	}
-	if len(config.AppInfo.RootPath) == 0 {
-		config.Cfg.Section("app").Key("RootPath").SetValue("/casaOS")
-		config.AppInfo.RootPath = "/casaOS"
-		config.Cfg.SaveTo(config.SystemConfigInfo.ConfigPath)
-	}
-	// if len(config.ServerInfo.Handshake) == 0 {
-	// 	config.Cfg.Section("app").Key("RootPath").SetValue("/casaOS")
-	// 	config.AppInfo.RootPath = "/casaOS"
-	// 	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"
+func InitNetworkMount() {
+	time.Sleep(time.Second * 10)
+	connections := service.MyService.Connections().GetConnectionsList()
+	for _, v := range connections {
+		connection := service.MyService.Connections().GetConnectionByID(fmt.Sprint(v.ID))
+		directories, err := samba.GetSambaSharesList(connection.Host, connection.Port, connection.Username, connection.Password)
+		if err != nil {
+			service.MyService.Connections().DeleteConnection(fmt.Sprint(connection.ID))
+			loger.Error("mount samba err", zap.Any("err", err), zap.Any("info", connection))
+			continue
 		}
-		if sysType == "darwin" {
-			downloadPath = "./CasaOS/DATA/Downloads"
+		baseHostPath := "/mnt/" + connection.Host
+
+		mountPointList := service.MyService.System().GetDirPath(baseHostPath)
+		for _, v := range mountPointList {
+			service.MyService.Connections().UnmountSmaba(v.Path)
 		}
-		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)
-	}
+		os.RemoveAll(baseHostPath)
 
-	if service.MyService.ZiMa().GetSysInfo().KernelArch == "aarch64" && config.ServerInfo.USBAutoMount != "True" && strings.Contains(service.MyService.ZiMa().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.1
-func InitSystemApplication() {
-	list := service.MyService.App().GetApplicationList()
-	if len(list) != 2 {
-		application := model2.ApplicationModel{}
-		application.Name = "Files"
-		application.Icon = "/ui/img/Files.svg"
-		application.Type = "system"
-		application.Order = 0
-		service.MyService.App().CreateApplication(application)
-
-		application.Name = "CasaConnect"
-		application.Icon = "/ui/img/CasaConnect.svg"
-		application.Type = "system"
-		application.Order = 0
-
-		service.MyService.App().CreateApplication(application)
+		file.IsNotExistMkDir(baseHostPath)
+		for _, v := range directories {
+			mountPoint := baseHostPath + "/" + v
+			file.IsNotExistMkDir(mountPoint)
+			service.MyService.Connections().MountSmaba(connection.Username, connection.Host, v, connection.Port, mountPoint, connection.Password)
+		}
+		connection.Directories = strings.Join(directories, ",")
+		service.MyService.Connections().UpdateConnection(&connection)
 	}
 }

route/periodical.go

@@ -0,0 +1,313 @@
+//go:build !darwin
+// +build !darwin
+
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-07-01 15:11:36
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-09-05 16:28:46
+ * @FilePath: /CasaOS/route/periodical.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package route
+
+import (
+	"os"
+	"os/signal"
+	"reflect"
+	"strconv"
+	"strings"
+	"syscall"
+	"time"
+	"unsafe"
+
+	"github.com/IceWhaleTech/CasaOS/model"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/loger"
+	"github.com/IceWhaleTech/CasaOS/service"
+	"github.com/pilebones/go-udev/netlink"
+	"go.uber.org/zap"
+)
+
+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" {
+			isMount := false
+			temp := model.DriveUSB{}
+			temp.Model = v.Model
+			temp.Name = v.Name
+			temp.Size = v.Size
+			for _, child := range v.Children {
+				if len(child.MountPoint) > 0 {
+					isMount = true
+					avail, _ := strconv.ParseUint(child.FSAvail, 10, 64)
+					temp.Avail += avail
+
+				}
+			}
+			if isMount {
+				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
+	cpuData["temperature"] = service.MyService.System().GetCPUTemperature()
+	cpuData["power"] = service.MyService.System().GetCPUPower()
+
+	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" {
+			isMount := false
+			temp := model.DriveUSB{}
+			temp.Model = v.Model
+			temp.Name = v.Name
+			temp.Size = v.Size
+			for _, child := range v.Children {
+				if len(child.MountPoint) > 0 {
+					isMount = true
+					avail, _ := strconv.ParseUint(child.FSAvail, 10, 64)
+					temp.Avail += avail
+				}
+			}
+			if isMount {
+				usb = append(usb, temp)
+			}
+
+		}
+	}
+	memInfo := service.MyService.System().GetMemInfo()
+
+	service.MyService.Notify().SendAllHardwareStatusBySocket(summary, usb, memInfo, cpuData, newNet)
+
+}
+func MonitoryUSB() {
+	var matcher netlink.Matcher
+
+	conn := new(netlink.UEventConn)
+	if err := conn.Connect(netlink.UdevEvent); err != nil {
+		loger.Error("udev err", zap.Any("Unable to connect to Netlink Kobject UEvent socket", err))
+	}
+	defer conn.Close()
+
+	queue := make(chan netlink.UEvent)
+	errors := make(chan error)
+	quit := conn.Monitor(queue, errors, matcher)
+
+	signals := make(chan os.Signal, 1)
+	signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
+	go func() {
+		<-signals
+		close(quit)
+		os.Exit(0)
+	}()
+
+	for {
+		select {
+		case uevent := <-queue:
+			if uevent.Env["DEVTYPE"] == "disk" {
+				time.Sleep(time.Microsecond * 500)
+				SendUSBBySocket()
+				continue
+			}
+		case err := <-errors:
+			loger.Error("udev err", zap.Any("err", err))
+		}
+	}
+
+}

route/route.go

@@ -1,281 +1,243 @@
 package route
 
 import (
-	"net/http"
-
+	jwt2 "github.com/IceWhaleTech/CasaOS-Common/utils/jwt"
 	"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())
+	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("/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/users/register", v1.PostUserRegister)
+	// r.POST("/v1/users/login", v1.PostUserLogin)
+	// r.GET("/v1/users/name", v1.GetUserAllUsername) //all/name
+	// r.POST("/v1/users/refresh", v1.PostUserRefreshToken)
+	// // No short-term modifications
+	// r.GET("/v1/users/image", v1.GetUserImage)
 
-	r.GET("/v1/guide/check", v1.GetGuideCheck)
+	// r.GET("/v1/users/status", v1.GetUserStatus) //init/check
+	//r.GET("/v1/guide/check", v1.GetGuideCheck)         // /v1/sys/guide_check
+	r.GET("/v1/sys/debug", v1.GetSystemConfigDebug) // //debug
+
+	r.GET("/v1/sys/socket-port", v1.GetSystemSocketPort) //sys/socket_port
+	r.GET("/v1/sys/version/check", v1.GetSystemCheckVersion)
 
-	r.GET("/v1/debug", v1.GetSystemConfigDebug)
-	//set user
-	r.POST("/v1/user/setusernamepwd", v1.Set_Name_Pwd)
-	//get user info
-	r.GET("/v1/user/info", v1.GetUserInfo)
-	//get user info
-	r.GET("/v1/person/shareid", v1.GetPersonShareId)
 	v1Group := r.Group("/v1")
 
-	v1Group.Use(jwt2.JWT(swagHandler))
+	v1Group.Use(jwt2.JWT())
 	{
-		v1UserGroup := v1Group.Group("/user")
-		v1UserGroup.Use()
+		// v1UsersGroup := v1Group.Group("/users")
+		// v1UsersGroup.Use()
+		// {
+		// 	v1UsersGroup.GET("/current", v1.GetUserInfo)
+		// 	v1UsersGroup.PUT("/current", v1.PutUserInfo)
+		// 	v1UsersGroup.PUT("/current/password", v1.PutUserPassword)
+
+		// 	v1UsersGroup.GET("/current/custom/:key", v1.GetUserCustomConf)
+		// 	v1UsersGroup.POST("/current/custom/:key", v1.PostUserCustomConf)
+		// 	v1UsersGroup.DELETE("/current/custom/:key", v1.DeleteUserCustomConf)
+
+		// 	v1UsersGroup.POST("/current/image/:key", v1.PostUserUploadImage)
+		// 	v1UsersGroup.PUT("/current/image/:key", v1.PutUserImage)
+		// 	//v1UserGroup.POST("/file/image/:key", v1.PostUserFileImage)
+		// 	v1UsersGroup.DELETE("/current/image", v1.DeleteUserImage)
+
+		// 	//v1UserGroup.PUT("/avatar", v1.PutUserAvatar)
+		// 	//v1UserGroup.GET("/avatar", v1.GetUserAvatar)
+		// 	v1UsersGroup.DELETE("/:id", v1.DeleteUser)
+		// 	v1UsersGroup.GET("/:username", v1.GetUserInfoByUsername)
+		// 	v1UsersGroup.DELETE("", v1.DeleteUserAll)
+		// }
+
+		v1AppsGroup := v1Group.Group("/apps")
+		v1AppsGroup.Use()
 		{
+			v1AppsGroup.GET("", v1.AppList) //list
+			v1AppsGroup.GET("/:id", v1.AppInfo)
+		}
+		v1ContainerGroup := v1Group.Group("/container")
+		v1ContainerGroup.Use()
+		{
+			v1ContainerGroup.GET("", v1.MyAppList) ///my/list
+			v1ContainerGroup.GET("/usage", v1.AppUsageList)
+			v1ContainerGroup.GET("/:id", v1.ContainerUpdateInfo)    ///update/:id/info
+			v1ContainerGroup.GET("/:id/logs", v1.ContainerLog)      // /app/logs/:id
+			v1ContainerGroup.GET("/networks", v1.GetDockerNetworks) //app/install/config
 
-			//chang head
-			v1UserGroup.POST("/head", v1.PostUserHead)
-			//chang user name
-			v1UserGroup.PUT("/username", v1.PutUserName)
-			//chang pwd
-			v1UserGroup.PUT("/password", v1.PutUserPwd)
-			//edit user info
-			v1UserGroup.POST("/info", v1.PostUserChangeInfo)
-			v1UserGroup.PUT("/nick", v1.PutUserChangeNick)
-			v1UserGroup.PUT("/desc", v1.PutUserChangeDesc)
-			v1UserGroup.POST("/person/info", v1.PostUserPersonInfo)
+			v1ContainerGroup.GET("/:id/state", v1.GetContainerState) //app/state/:id ?state=install_progress
+			// there are problems, temporarily do not deal with
+			v1ContainerGroup.GET("/:id/terminal", v1.DockerTerminal) //app/terminal/:id
+			v1ContainerGroup.POST("", v1.InstallApp)                 //app/install
+			//v1ContainerGroup.GET("/:id", v1.ContainerInfo) // /app/info/:id
 
-			v1UserGroup.GET("/shareid", v1.GetUserShareID)
+			v1ContainerGroup.PUT("/:id", v1.UpdateSetting) ///update/:id/setting
+
+			v1ContainerGroup.PUT("/:id/state", v1.ChangAppState) // /app/state/:id
+			v1ContainerGroup.DELETE("/:id", v1.UnInstallApp)     //app/uninstall/:id
+			//Not used
+			v1ContainerGroup.PUT("/:id/latest", v1.PutAppUpdate)
+			//Not used
+			v1ContainerGroup.POST("/share", v1.ShareAppFile)
 
 		}
-
-		v1ZiMaGroup := v1Group.Group("/zima")
-		v1ZiMaGroup.Use()
+		v1AppCategoriesGroup := v1Group.Group("/app-categories")
+		v1AppCategoriesGroup.Use()
 		{
-			//获取cpu信息
-			v1ZiMaGroup.GET("/getcpuinfo", v1.CupInfo)
-			//获取内存信息
-			v1ZiMaGroup.GET("/getmeminfo", v1.MemInfo)
-			//获取硬盘信息
-			v1ZiMaGroup.GET("/getdiskinfo", v1.DiskInfo)
-
-			//获取网络信息
-			v1ZiMaGroup.GET("/getnetinfo", v1.NetInfo)
-
-			//获取系统信息
-			v1ZiMaGroup.GET("/sysinfo", v1.SysInfo)
-		}
-		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("/my/list", v1.MyAppList)
-			//
-			v1AppGroup.GET("/usage", v1.AppUsageList)
-			//app详情
-			v1AppGroup.GET("/appinfo/:id", v1.AppInfo)
-			//获取未安装的列表
-			v1AppGroup.GET("/list", v1.AppList)
-			//获取端口
-			v1AppGroup.GET("/port", v1.GetPort)
-			//检查端口
-			v1AppGroup.GET("/check/:port", v1.PortCheck)
-			//分类
-			v1AppGroup.GET("/category", v1.CategoryList)
-			//容器相关
-			v1AppGroup.GET("/terminal/:id", v1.DockerTerminal)
-			v1AppGroup.GET("/order", v1.GetAppOrder)
-			v1AppGroup.POST("/order", v1.PostAppOrder)
-			//app容器详情
-			v1AppGroup.GET("/info/:id", v1.ContainerInfo)
-			//app容器日志
-			v1AppGroup.GET("/logs/:id", v1.ContainerLog)
-			//暂停或启动容器
-			v1AppGroup.PUT("/state/:id", v1.ChangAppState)
-			//安装app
-			v1AppGroup.POST("/install/:id", v1.InstallApp)
-			//卸载app
-			v1AppGroup.DELETE("/uninstall/:id", v1.UnInstallApp)
-			//获取安装进度
-			v1AppGroup.GET("/speed/:id", v1.GetInstallSpeed)
-			//获取进度
-			v1AppGroup.GET("/state/:id", v1.GetContainerState)
-			//更新容器配置
-			v1AppGroup.PUT("/update/:id/setting", v1.UpdateSetting)
-			//获取可能新数据
-			v1AppGroup.GET("/update/:id/info", v1.ContainerUpdateInfo)
-			v1AppGroup.GET("/rely/:id/info", v1.ContainerRelyInfo)
-			v1AppGroup.GET("/install/config", v1.GetDockerInstallConfig)
-			v1AppGroup.PUT("/update/:id", v1.PutAppUpdate)
-			v1AppGroup.POST("/share", v1.ShareAppFile)
+			v1AppCategoriesGroup.GET("", v1.CategoryList)
 		}
 
 		v1SysGroup := v1Group.Group("/sys")
 		v1SysGroup.Use()
 		{
-			v1SysGroup.GET("/check", v1.CheckVersion)
-			v1SysGroup.GET("/hardware/info", v1.GetSystemHardwareInfo)
-			v1SysGroup.GET("/client/version", v1.GetClientVersion)
+			v1SysGroup.GET("/version", v1.GetSystemCheckVersion) //version/check
+
 			v1SysGroup.POST("/update", v1.SystemUpdate)
+
+			v1SysGroup.GET("/hardware", v1.GetSystemHardwareInfo) //hardware/info
+
 			v1SysGroup.GET("/wsssh", v1.WsSsh)
-			v1SysGroup.GET("/config", v1.GetSystemConfig)
-			v1SysGroup.GET("/error/logs", v1.GetCasaOSErrorLogs)
-			v1SysGroup.POST("/config", v1.PostSetSystemConfig)
-			v1SysGroup.GET("/widget/config", v1.GetWidgetConfig)
-			v1SysGroup.POST("/widget/config", v1.PostSetWidgetConfig)
-			v1SysGroup.GET("/port", v1.GetCasaOSPort)
-			v1SysGroup.PUT("/port", v1.PutCasaOSPort)
-			v1SysGroup.POST("/kill", v1.PostKillCasaOS)
-			v1SysGroup.GET("/info", v1.Info)
-			v1SysGroup.PUT("/usb/off", v1.PutSystemOffUSBAutoMount)
-			v1SysGroup.PUT("/usb/on", v1.PutSystemOnUSBAutoMount)
-			v1SysGroup.GET("/usb", v1.GetSystemUSBAutoMount)
+			v1SysGroup.POST("/ssh-login", v1.PostSshLogin)
+			//v1SysGroup.GET("/config", v1.GetSystemConfig) //delete
+			//v1SysGroup.POST("/config", v1.PostSetSystemConfig)
+			v1SysGroup.GET("/logs", v1.GetCasaOSErrorLogs) //error/logs
+			//v1SysGroup.GET("/widget/config", v1.GetWidgetConfig)//delete
+			//v1SysGroup.POST("/widget/config", v1.PostSetWidgetConfig)//delete
+
+			v1SysGroup.POST("/stop", v1.PostKillCasaOS)
+
+			v1SysGroup.GET("/utilization", v1.GetSystemUtilization)
+			// v1SysGroup.GET("/cpu", v1.GetSystemCupInfo)
+			// v1SysGroup.GET("/mem", v1.GetSystemMemInfo)
+			// v1SysGroup.GET("/disk", v1.GetSystemDiskInfo)
+			// v1SysGroup.GET("/network", v1.GetSystemNetInfo)
+
+			v1SysGroup.PUT("/usb-auto-mount", v1.PutSystemUSBAutoMount) ///sys/usb/:status
+			v1SysGroup.GET("/usb-auto-mount", v1.GetSystemUSBAutoMount) ///sys/usb/status
+
+			v1SysGroup.GET("/server-info", nil)
+			v1SysGroup.PUT("/server-info", nil)
+			v1SysGroup.GET("/apps-state", v1.GetSystemAppsStatus)
+			//v1SysGroup.GET("/port", v1.GetCasaOSPort)
+			//v1SysGroup.PUT("/port", v1.PutCasaOSPort)
+			v1SysGroup.GET("/proxy", v1.GetSystemProxy)
 		}
+		v1PortGroup := v1Group.Group("/port")
+		v1PortGroup.Use()
+		{
+			v1PortGroup.GET("/", v1.GetPort)              //app/port
+			v1PortGroup.GET("/state/:port", v1.PortCheck) //app/check/:port
+		}
+
 		v1FileGroup := v1Group.Group("/file")
 		v1FileGroup.Use()
 		{
-			v1FileGroup.PUT("/rename", v1.RenamePath)
-			v1FileGroup.GET("/read", v1.GetFilerContent)
+			v1FileGroup.GET("", v1.GetDownloadSingleFile) //download/:path
+			v1FileGroup.POST("", v1.PostCreateFile)
+			v1FileGroup.PUT("", v1.PutFileContent)
+			v1FileGroup.PUT("/name", v1.RenamePath)
+			//file/rename
+			v1FileGroup.GET("/content", v1.GetFilerContent) //file/read
+
+			//File uploads need to be handled separately, and will not be modified here
 			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("/new/download", v1.GetFileDownloadNew)
-			v1FileGroup.POST("/operate", v1.PostOperateFileOrDir)
-			v1FileGroup.DELETE("/delete", v1.DeleteFile)
-			v1FileGroup.PUT("/update", v1.PutFileContent)
-			v1FileGroup.GET("/image", v1.GetFileImage)
-
 			//v1FileGroup.GET("/download", v1.UserFileDownloadCommonService)
 		}
-		v1DiskGroup := v1Group.Group("/disk")
-		v1DiskGroup.Use()
+		v1FolderGroup := v1Group.Group("/folder")
+		v1FolderGroup.Use()
 		{
-			v1DiskGroup.GET("/check", v1.GetDiskCheck)
-
-			v1DiskGroup.GET("/list", v1.GetDiskList)
-
-			//获取磁盘详情
-			v1DiskGroup.GET("/info", v1.GetDiskInfo)
-
-			//format storage
-			v1DiskGroup.POST("/format", v1.FormatDisk)
-
-			// add storage
-			v1DiskGroup.POST("/storage", v1.AddPartition)
-
-			//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)
-
+			v1FolderGroup.PUT("/name", v1.RenamePath)
+			v1FolderGroup.GET("", v1.DirPath)   ///file/dirpath
+			v1FolderGroup.POST("", v1.MkdirAll) ///file/mkdir
 		}
-		v1ShareGroup := v1Group.Group("/share")
-		v1ShareGroup.Use()
+		v1BatchGroup := v1Group.Group("/batch")
+		v1BatchGroup.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)
 
+			v1BatchGroup.DELETE("", v1.DeleteFile) //file/delete
+			v1BatchGroup.DELETE("/:id/task", v1.DeleteOperateFileOrDir)
+			v1BatchGroup.POST("/task", v1.PostOperateFileOrDir) //file/operate
+			v1BatchGroup.GET("", v1.GetDownloadFile)
+		}
+		v1ImageGroup := v1Group.Group("/image")
+		v1ImageGroup.Use()
+		{
+			v1ImageGroup.GET("", v1.GetFileImage)
 		}
 
-		v1NotifyGroup := v1Group.Group("/notify")
-		v1NotifyGroup.Use()
+		v1DisksGroup := v1Group.Group("/disks")
+		v1DisksGroup.Use()
 		{
-			v1NotifyGroup.GET("/ws", v1.NotifyWS)
-			v1NotifyGroup.PUT("/read/:id", v1.PutNotifyRead)
+			//v1DiskGroup.GET("/check", v1.GetDiskCheck) //delete
+			//v1DisksGroup.GET("", v1.GetDiskInfo)
+
+			//v1DisksGroup.POST("", v1.PostMountDisk)
+			v1DisksGroup.GET("", v1.GetDiskList)
+			v1DisksGroup.GET("/usb", v1.GetDisksUSBList)
+			v1DisksGroup.DELETE("/usb", v1.DeleteDiskUSB)
+			v1DisksGroup.DELETE("", v1.DeleteDisksUmount)
+			// //format storage
+			// v1DiskGroup.POST("/format", v1.PostDiskFormat)
+
+			// //mount SATA disk
+			// v1DiskGroup.POST("/mount", v1.PostMountDisk)
+
+			// //umount sata disk
+			// v1DiskGroup.POST("/umount", v1.PostDiskUmount)
+
+			//v1DiskGroup.GET("/type", v1.FormatDiskType)//delete
+
+			v1DisksGroup.DELETE("/part", v1.RemovePartition) //disk/delpart
 		}
 
-		v1PersonGroup := v1Group.Group("/person")
-		v1PersonGroup.Use()
+		v1StorageGroup := v1Group.Group("/storage")
+		v1StorageGroup.Use()
 		{
-			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)
+			v1StorageGroup.POST("", v1.PostDiskAddPartition)
 
-			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)
+			v1StorageGroup.PUT("", v1.PostDiskFormat)
 
+			v1StorageGroup.DELETE("", v1.PostDiskUmount)
+			v1StorageGroup.GET("", v1.GetStorageList)
 		}
-		v1AnalyseGroup := v1Group.Group("/analyse")
-		v1AnalyseGroup.Use()
+		v1SambaGroup := v1Group.Group("/samba")
+		v1SambaGroup.Use()
 		{
-			v1AnalyseGroup.POST("/app", v1.PostAppAnalyse)
+			v1ConnectionsGroup := v1SambaGroup.Group("/connections")
+			v1ConnectionsGroup.Use()
+			{
+				v1ConnectionsGroup.GET("", v1.GetSambaConnectionsList)
+				v1ConnectionsGroup.POST("", v1.PostSambaConnectionsCreate)
+				v1ConnectionsGroup.DELETE("/:id", v1.DeleteSambaConnections)
+			}
+			v1SharesGroup := v1SambaGroup.Group("/shares")
+			v1SharesGroup.Use()
+			{
+				v1SharesGroup.GET("", v1.GetSambaSharesList)
+				v1SharesGroup.POST("", v1.PostSambaSharesCreate)
+				v1SharesGroup.DELETE("/:id", v1.DeleteSambaShares)
+				v1SharesGroup.GET("/status", v1.GetSambaStatus)
+			}
 		}
-		v1Group.GET("/sync/config", v1.GetSyncConfig)
-		v1Group.Any("/syncthing/*url", v1.SyncToSyncthing)
-
 	}
 	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,14 +0,0 @@
-package route
-
-import (
-	"github.com/IceWhaleTech/CasaOS/web"
-	"github.com/gin-gonic/gin"
-	"html/template"
-)
-
-func WebUIHome(c *gin.Context) {
-	c.Writer.Header().Set("Content-Type", "text/html; charset=utf-8")
-	index, _ := template.ParseFS(web.Static, "index.html")
-	index.Execute(c.Writer, nil)
-	return
-}

route/v1/analyse.go

@@ -1,38 +0,0 @@
-package v1
-
-import (
-	"net/http"
-
-	"github.com/IceWhaleTech/CasaOS/model"
-	"github.com/IceWhaleTech/CasaOS/pkg/config"
-	oasis_err2 "github.com/IceWhaleTech/CasaOS/pkg/utils/oasis_err"
-	"github.com/IceWhaleTech/CasaOS/service"
-	"github.com/gin-gonic/gin"
-)
-
-// @Summary post app analyse
-// @Produce  application/json
-// @Accept multipart/form-data
-// @Tags analyse
-// @Param name formData string true "app name"
-// @Param type formData string true "action" Enums(open,delete)
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /analyse/app [post]
-func PostAppAnalyse(c *gin.Context) {
-	if config.SystemConfigInfo.Analyse == "False" {
-		c.JSON(http.StatusOK, &model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
-		return
-	}
-	name := c.PostForm("name")
-	t := c.PostForm("type")
-	language := c.GetHeader("Language")
-
-	if len(name) == 0 || len(t) == 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-		return
-	}
-
-	service.MyService.Casa().PushAppAnalyse(config.ServerInfo.Token, t, name, language)
-	c.JSON(http.StatusOK, &model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
-}

route/v1/app.go

@@ -3,12 +3,12 @@ package v1
 import (
 	"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"
-	oasis_err2 "github.com/IceWhaleTech/CasaOS/pkg/utils/oasis_err"
+
 	port2 "github.com/IceWhaleTech/CasaOS/pkg/utils/port"
 	"github.com/IceWhaleTech/CasaOS/service"
 	"github.com/gin-gonic/gin"
@@ -35,8 +35,15 @@ func AppList(c *gin.Context) {
 	t := c.DefaultQuery("type", "rank")
 	categoryId := c.DefaultQuery("category_id", "0")
 	key := c.DefaultQuery("key", "")
-	language := c.GetHeader("Language")
-	recommend, list, community := service.MyService.Casa().GetServerList(index, size, t, categoryId, key, language)
+	if len(index) == 0 || len(size) == 0 || len(t) == 0 || len(categoryId) == 0 {
+		c.JSON(common_err.CLIENT_ERROR, &model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)})
+		return
+	}
+	collection, err := service.MyService.Casa().GetServerList(index, size, t, categoryId, key)
+	if err != nil {
+		c.JSON(common_err.SERVICE_ERROR, &model.Result{Success: common_err.SERVICE_ERROR, Message: common_err.GetMsg(common_err.SERVICE_ERROR), Data: err.Error()})
+		return
+	}
 	// for i := 0; i < len(recommend); i++ {
 	// 	ct, _ := service.MyService.Docker().DockerListByImage(recommend[i].Image, recommend[i].ImageVersion)
 	// 	if ct != nil {
@@ -56,11 +63,11 @@ func AppList(c *gin.Context) {
 	// 	}
 	// }
 	data := make(map[string]interface{}, 3)
-	data["recommend"] = recommend
-	data["list"] = list
-	data["community"] = community
+	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(common_err.SUCCESS, &model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: data})
 }
 
 // @Summary 获取一个可用端口
@@ -79,7 +86,8 @@ 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})
+	// @tiger 这里最好封装成 {'port': ...} 的形式，来体现出参的上下文
+	c.JSON(common_err.SUCCESS, &model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: p})
 }
 
 // @Summary 检查端口是否可用
@@ -94,7 +102,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(common_err.SUCCESS, &model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: port2.IsPortAvailable(p, t)})
 }
 
 // @Summary 我的应用列表
@@ -112,12 +120,11 @@ func MyAppList(c *gin.Context) {
 	size, _ := strconv.Atoi(c.DefaultQuery("size", "0"))
 	position, _ := strconv.ParseBool(c.DefaultQuery("position", "true"))
 	list, unTranslation := service.MyService.App().GetMyList(index, size, position)
-
 	data := make(map[string]interface{}, 2)
-	data["list"] = list
-	data["local"] = unTranslation
+	data["casaos_apps"] = list
+	data["local_apps"] = unTranslation
 
-	c.JSON(http.StatusOK, &model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: data})
+	c.JSON(common_err.SUCCESS, &model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: data})
 }
 
 // @Summary my app hardware usage list
@@ -129,7 +136,8 @@ func MyAppList(c *gin.Context) {
 // @Router /app/usage [get]
 func AppUsageList(c *gin.Context) {
 	list := service.MyService.App().GetHardwareUsage()
-	c.JSON(http.StatusOK, &model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: list})
+	c.JSON(common_err.SUCCESS, &model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: list})
+	//c.JSON(common_err.SUCCESS, &model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: nil})
 }
 
 // @Summary 应用详情
@@ -144,7 +152,11 @@ func AppInfo(c *gin.Context) {
 
 	id := c.Param("id")
 	language := c.GetHeader("Language")
-	info := service.MyService.Casa().GetServerAppInfo(id, "", language)
+	info, err := service.MyService.Casa().GetServerAppInfo(id, "", language)
+	if err != nil {
+		c.JSON(common_err.SERVICE_ERROR, &model.Result{Success: common_err.SERVICE_ERROR, Message: common_err.GetMsg(common_err.SERVICE_ERROR), Data: err.Error()})
+		return
+	}
 	if info.NetworkModel != "host" {
 		for i := 0; i < len(info.Ports); i++ {
 			if p, _ := strconv.Atoi(info.Ports[i].ContainerPort); port2.IsPortAvailable(p, info.Ports[i].Protocol) {
@@ -208,10 +220,10 @@ func AppInfo(c *gin.Context) {
 	// sort.EnvSort(envOrder).Sort(info.Envs)
 	// sort.VolSort(volOrder).Sort(info.Volumes.([]model.PathMap))
 	// sort.DevSort(devOrder).Sort(info.Devices)
+	info.Image += ":" + info.ImageVersion
+	info.MaxMemory = (service.MyService.System().GetMemInfo()["total"]).(uint64) >> 20
 
-	info.MaxMemory = service.MyService.ZiMa().GetMemInfo().Total >> 20
-
-	c.JSON(http.StatusOK, &model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: info})
+	c.JSON(common_err.SUCCESS, &model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: info})
 }
 
 // @Summary 获取远程分类列表
@@ -222,16 +234,20 @@ func AppInfo(c *gin.Context) {
 // @Success 200 {string} string "ok"
 // @Router /app/category [get]
 func CategoryList(c *gin.Context) {
-	list := service.MyService.Casa().GetServerCategoryList()
+	list, err := service.MyService.Casa().GetServerCategoryList()
+	if err != nil {
+		c.JSON(common_err.SERVICE_ERROR, &model.Result{Success: common_err.SERVICE_ERROR, Message: common_err.GetMsg(common_err.SERVICE_ERROR), Data: err.Error()})
+		return
+	}
 	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", Font: "apps"})
+	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(common_err.SUCCESS, &model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: list})
 }
 
 // @Summary 分享该应用配置
@@ -244,5 +260,5 @@ func CategoryList(c *gin.Context) {
 func ShareAppFile(c *gin.Context) {
 	str, _ := ioutil.ReadAll(c.Request.Body)
 	content := service.MyService.Casa().ShareAppFile(str)
-	c.JSON(http.StatusOK, json.RawMessage(content))
+	c.JSON(common_err.SUCCESS, 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.DDNSUpdateDBModel
-	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

@@ -3,15 +3,19 @@ package v1
 import (
 	"fmt"
 	"net/http"
+	"path/filepath"
 	"reflect"
 	"strconv"
 	"strings"
 	"time"
 
 	"github.com/IceWhaleTech/CasaOS/model"
-	"github.com/IceWhaleTech/CasaOS/pkg/config"
+	"github.com/IceWhaleTech/CasaOS/model/notify"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/common_err"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/encryption"
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
-	"github.com/IceWhaleTech/CasaOS/pkg/utils/oasis_err"
+
+	"github.com/IceWhaleTech/CasaOS-Common/utils/jwt"
 	"github.com/IceWhaleTech/CasaOS/service"
 	model2 "github.com/IceWhaleTech/CasaOS/service/model"
 	"github.com/gin-gonic/gin"
@@ -28,7 +32,35 @@ var diskMap = make(map[string]string)
 // @Success 200 {string} string "ok"
 // @Router /disk/list [get]
 func GetDiskList(c *gin.Context) {
+	path := c.Query("path")
+	if len(path) > 0 {
+		m := service.MyService.Disk().GetDiskInfo(path)
+		c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: m})
+		return
+	}
+	t := c.DefaultQuery("type", "")
 	list := service.MyService.Disk().LSBLK(false)
+	if t == "usb" {
+		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
+				for _, child := range v.Children {
+					if len(child.MountPoint) > 0 {
+						avail, _ := strconv.ParseUint(child.FSAvail, 10, 64)
+						temp.Avail += avail
+					}
+				}
+				data = append(data, temp)
+			}
+		}
+		c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: data})
+		return
+	}
+
 	dbList := service.MyService.Disk().GetSerialAll()
 	part := make(map[string]int64, len(dbList))
 	for _, v := range dbList {
@@ -51,14 +83,13 @@ func GetDiskList(c *gin.Context) {
 		disk.Size = list[i].Size
 		disk.Path = list[i].Path
 		disk.Model = list[i].Model
-
+		disk.ChildrenNumber = len(list[i].Children)
 		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
@@ -82,7 +113,6 @@ func GetDiskList(c *gin.Context) {
 				} 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
@@ -111,38 +141,36 @@ func GetDiskList(c *gin.Context) {
 			continue
 		}
 
-		if list[i].Tran == "sata" || list[i].Tran == "nvme" || list[i].Tran == "spi" || list[i].Tran == "sas" {
+		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)
+			isAvail := true
+			for _, v := range list[i].Children {
+				if v.MountPoint != "" {
+					stor := model.Storage{}
+					stor.MountPoint = v.MountPoint
+					stor.Size = v.FSSize
+					stor.Avail = v.FSAvail
+					stor.Path = v.Path
+					stor.Type = v.FsType
+					stor.DriveName = list[i].Name
+					storage = append(storage, stor)
+					isAvail = false
 				}
 			}
 
+			if isAvail {
+				//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)
 
@@ -154,7 +182,117 @@ func GetDiskList(c *gin.Context) {
 	data["storage"] = storage
 	data["avail"] = avail
 
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err.SUCCESS, Message: oasis_err.GetMsg(oasis_err.SUCCESS), Data: data})
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: data})
+}
+
+// @Summary disk list
+// @Produce  application/json
+// @Accept application/json
+// @Tags disk
+// @Security ApiKeyAuth
+// @Success 200 {string} string "ok"
+// @Router /disk/list [get]
+func GetDisksUSBList(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.Label
+			if temp.Name == "" {
+				temp.Name = v.Name
+			}
+			temp.Size = v.Size
+			children := []model.USBChildren{}
+			for _, child := range v.Children {
+
+				if len(child.MountPoint) > 0 {
+					tempChildren := model.USBChildren{}
+					tempChildren.MountPoint = child.MountPoint
+					tempChildren.Size, _ = strconv.ParseUint(child.FSSize, 10, 64)
+					tempChildren.Avail, _ = strconv.ParseUint(child.FSAvail, 10, 64)
+					tempChildren.Name = child.Label
+					if len(tempChildren.Name) == 0 {
+						tempChildren.Name = filepath.Base(child.MountPoint)
+					}
+					avail, _ := strconv.ParseUint(child.FSAvail, 10, 64)
+					children = append(children, tempChildren)
+					temp.Avail += avail
+				}
+			}
+
+			temp.Children = children
+			data = append(data, temp)
+		}
+	}
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: data})
+
+}
+
+func DeleteDisksUmount(c *gin.Context) {
+	js := make(map[string]string)
+	c.ShouldBind(&js)
+
+	path := js["path"]
+	pwd := js["password"]
+
+	if len(path) == 0 {
+		c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)})
+		return
+	}
+	token := c.GetHeader("Authorization")
+	if len(token) == 0 {
+		token = c.Query("token")
+	}
+	claims, err := jwt.ParseToken(token, true)
+	if err != nil {
+		c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.PWD_INVALID, Message: common_err.GetMsg(common_err.PWD_INVALID)})
+		return
+	}
+
+	if encryption.GetMD5ByStr(pwd) != claims.Password {
+		c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.PWD_INVALID, Message: common_err.GetMsg(common_err.PWD_INVALID)})
+		return
+	}
+
+	if _, ok := diskMap[path]; ok {
+		c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.DISK_BUSYING, Message: common_err.GetMsg(common_err.DISK_BUSYING)})
+		return
+	}
+
+	diskInfo := service.MyService.Disk().GetDiskInfo(path)
+	for _, v := range diskInfo.Children {
+		service.MyService.Disk().UmountPointAndRemoveDir(v.Path)
+		//delete data
+		service.MyService.Disk().DeleteMountPoint(v.Path, v.MountPoint)
+
+		service.MyService.Shares().DeleteShareByPath(v.MountPoint)
+	}
+
+	service.MyService.Disk().RemoveLSBLKCache()
+
+	//send notify to client
+	msg := notify.StorageMessage{}
+	msg.Action = "REMOVED"
+	msg.Path = path
+	msg.Volume = ""
+	msg.Size = 0
+	msg.Type = ""
+	service.MyService.Notify().SendStorageBySocket(msg)
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: path})
+}
+
+func DeleteDiskUSB(c *gin.Context) {
+	js := make(map[string]string)
+	c.ShouldBind(&js)
+	mountPoint := js["mount_point"]
+	if file.CheckNotExist(mountPoint) {
+		c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.DIR_NOT_EXISTS, Message: common_err.GetMsg(common_err.DIR_NOT_EXISTS)})
+		return
+	}
+	service.MyService.Disk().UmountUSB(mountPoint)
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: mountPoint})
 }
 
 // @Summary get disk list
@@ -171,7 +309,7 @@ func GetPlugInDisks(c *gin.Context) {
 	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 disk detail
@@ -185,53 +323,10 @@ func GetPlugInDisks(c *gin.Context) {
 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})
-}
-
-// @Summary format storage
-// @Produce  application/json
-// @Accept multipart/form-data
-// @Tags disk
-// @Security ApiKeyAuth
-// @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) {
-	path := c.PostForm("path")
-	t := "ext4"
-	pwd := c.PostForm("pwd")
-	volume := c.PostForm("volume")
-
-	if pwd != config.UserInfo.PWD {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err.PWD_INVALID, Message: oasis_err.GetMsg(oasis_err.PWD_INVALID)})
-		return
-	}
-
-	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)})
-		return
-	}
-	if _, ok := diskMap[path]; ok {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err.DISK_BUSYING, Message: oasis_err.GetMsg(oasis_err.DISK_BUSYING)})
-		return
-	}
-	diskMap[path] = "busying"
-	service.MyService.Disk().UmountPointAndRemoveDir(path)
-	format := service.MyService.Disk().FormatDisk(path, t)
-	if len(format) == 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err.FORMAT_ERROR, Message: oasis_err.GetMsg(oasis_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: 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), Data: m})
 }
 
 // @Summary 获取支持的格式
@@ -243,7 +338,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})
 
 }
 
@@ -256,15 +351,17 @@ func FormatDiskType(c *gin.Context) {
 // @Success 200 {string} string "ok"
 // @Router /disk/delpart [delete]
 func RemovePartition(c *gin.Context) {
-	path := c.PostForm("path")
+	js := make(map[string]string)
+	c.ShouldBind(&js)
+	path := js["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(common_err.CLIENT_ERROR, 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(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS)})
 }
 
 // @Summary  add storage
@@ -278,107 +375,149 @@ func RemovePartition(c *gin.Context) {
 // @Param  format formData bool true "need format(true)"
 // @Success 200 {string} string "ok"
 // @Router /disk/storage [post]
-func AddPartition(c *gin.Context) {
-	name := c.PostForm("name")
-	path := c.PostForm("path")
-	format, _ := strconv.ParseBool(c.PostForm("format"))
-	if len(name) == 0 || len(path) == 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err.INVALID_PARAMS, Message: oasis_err.GetMsg(oasis_err.INVALID_PARAMS)})
+func PostDiskAddPartition(c *gin.Context) {
+
+	js := make(map[string]interface{})
+	c.ShouldBind(&js)
+	path := js["path"].(string)
+	name := js["name"].(string)
+	format := js["format"].(bool)
+
+	if len(path) == 0 {
+		c.JSON(common_err.CLIENT_ERROR, 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: oasis_err.DISK_BUSYING, Message: oasis_err.GetMsg(oasis_err.DISK_BUSYING)})
-		return
-	}
-	if !file.CheckNotExist("/DATA/" + name) {
-		// /mnt/name exist
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err.NAME_NOT_AVAILABLE, Message: oasis_err.GetMsg(oasis_err.NAME_NOT_AVAILABLE)})
+		c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.DISK_BUSYING, Message: common_err.GetMsg(common_err.DISK_BUSYING)})
 		return
 	}
+
+	//diskInfo := service.MyService.Disk().GetDiskInfo(path)
+
+	// if !file.CheckNotExist("/DATA/" + name) {
+	// 	// /mnt/name exist
+	// 	c.JSON(common_err.SERVICE_ERROR, 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: oasis_err.DISK_NEEDS_FORMAT, Message: oasis_err.GetMsg(oasis_err.DISK_NEEDS_FORMAT)})
-			delete(diskMap, path)
-			return
-		}
-	} else {
+	if format {
+		// format := service.MyService.Disk().FormatDisk(path+"1", "ext4")
+		// if len(format) == 0 {
+		// 	delete(diskMap, path)
+		// 	c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.FORMAT_ERROR, Message: common_err.GetMsg(common_err.FORMAT_ERROR)})
+		// 	return
+		// }
 		service.MyService.Disk().AddPartition(path)
 	}
 
-	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)
-	}
+	// formatBool := true
+	// for formatBool {
+	// 	currentDisk = service.MyService.Disk().GetDiskInfo(path)
+	// 	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: oasis_err.DISK_NEEDS_FORMAT, Message: oasis_err.GetMsg(oasis_err.DISK_NEEDS_FORMAT)})
-		return
+	// if len(currentDisk.Children) != 1 {
+	// 	c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.DISK_NEEDS_FORMAT, Message: common_err.GetMsg(common_err.DISK_NEEDS_FORMAT)})
+	// 	return
+	// }
+	fmt.Println(name)
+	if len(name) == 0 {
+		name = "Storage"
+	}
+	fmt.Println(name)
+	for i := 0; i < len(currentDisk.Children); i++ {
+		childrenName := currentDisk.Children[i].Label
+		if len(childrenName) == 0 {
+			//childrenName = name + "_" + currentDisk.Children[i].Name
+			childrenName = name + "_" + strconv.Itoa(i+1)
+		}
+		mountPath := "/DATA/" + childrenName
+		if !file.CheckNotExist(mountPath) {
+			ls := service.MyService.System().GetDirPath(mountPath)
+			if len(ls) > 0 {
+				// exist
+				c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.NAME_NOT_AVAILABLE, Message: common_err.GetMsg(common_err.NAME_NOT_AVAILABLE)})
+				return
+			}
+		}
+		m := model2.SerialDisk{}
+		m.MountPoint = mountPath
+		m.Path = currentDisk.Children[i].Path
+		m.UUID = currentDisk.Children[i].UUID
+		m.State = 0
+		m.CreatedAt = time.Now().Unix()
+		service.MyService.Disk().SaveMountPoint(m)
+		//mount dir
+		service.MyService.Disk().MountDisk(currentDisk.Children[i].Path, mountPath)
 	}
-
-	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: oasis_err.SUCCESS, Message: oasis_err.GetMsg(oasis_err.SUCCESS)})
+
+	//send notify to client
+	msg := notify.StorageMessage{}
+	msg.Action = "ADDED"
+	msg.Path = currentDisk.Children[0].Path
+	msg.Volume = "/DATA/"
+	msg.Size = currentDisk.Children[0].Size
+	msg.Type = currentDisk.Children[0].Tran
+	service.MyService.Notify().SendStorageBySocket(msg)
+
+	c.JSON(common_err.SUCCESS, 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"
+// @Param  pwd formData string true "user password"
+// @Param  volume formData string true "mount point"
 // @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"
+// @Router /disk/format [post]
+func PostDiskFormat(c *gin.Context) {
+	js := make(map[string]string)
+	c.ShouldBind(&js)
+	path := js["path"]
+	t := "ext4"
+	pwd := js["password"]
+	volume := js["volume"]
+	token := c.GetHeader("Authorization")
+	if len(token) == 0 {
+		token = c.Query("token")
+	}
+	claims, err := jwt.ParseToken(token, true)
+	if err != nil {
+		c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.PWD_INVALID, Message: common_err.GetMsg(common_err.PWD_INVALID)})
+		return
 	}
 
-	for i := 0; i < len(list)+1; i++ {
-		if _, ok := pathMapList[mountPath+strconv.Itoa(i)]; !ok {
-			mountPath = mountPath + strconv.Itoa(i)
-			break
-		}
+	if encryption.GetMD5ByStr(pwd) != claims.Password {
+		c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.PWD_INVALID, Message: common_err.GetMsg(common_err.PWD_INVALID)})
+		return
 	}
 
-	//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: oasis_err.SUCCESS, Message: oasis_err.GetMsg(oasis_err.SUCCESS)})
+	if len(path) == 0 || len(t) == 0 {
+		c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)})
+		return
+	}
+	if _, ok := diskMap[path]; ok {
+		c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.DISK_BUSYING, Message: common_err.GetMsg(common_err.DISK_BUSYING)})
+		return
+	}
+	diskMap[path] = "busying"
+	service.MyService.Disk().UmountPointAndRemoveDir(path)
+	format := service.MyService.Disk().FormatDisk(path, t)
+	if len(format) == 0 {
+		delete(diskMap, path)
+		c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.FORMAT_ERROR, Message: common_err.GetMsg(common_err.FORMAT_ERROR)})
+		return
+	}
+	service.MyService.Disk().MountDisk(path, volume)
+	service.MyService.Disk().RemoveLSBLKCache()
+	delete(diskMap, path)
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS)})
 }
 
 // @Summary remove mount point
@@ -392,22 +531,34 @@ func PostMountDisk(c *gin.Context) {
 // @Success 200 {string} string "ok"
 // @Router /disk/umount [post]
 func PostDiskUmount(c *gin.Context) {
+	js := make(map[string]string)
+	c.ShouldBind(&js)
 
-	path := c.PostForm("path")
-	mountPoint := c.PostForm("volume")
-	pwd := c.PostForm("pwd")
+	path := js["path"]
+	mountPoint := js["volume"]
+	pwd := js["password"]
 
 	if len(path) == 0 || len(mountPoint) == 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err.INVALID_PARAMS, Message: oasis_err.GetMsg(oasis_err.INVALID_PARAMS)})
+		c.JSON(common_err.CLIENT_ERROR, 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: oasis_err.PWD_INVALID, Message: oasis_err.GetMsg(oasis_err.PWD_INVALID)})
+	token := c.GetHeader("Authorization")
+	if len(token) == 0 {
+		token = c.Query("token")
+	}
+	claims, err := jwt.ParseToken(token, true)
+	if err != nil {
+		c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.PWD_INVALID, Message: common_err.GetMsg(common_err.PWD_INVALID)})
+		return
+	}
+
+	if encryption.GetMD5ByStr(pwd) != claims.Password {
+		c.JSON(common_err.CLIENT_ERROR, 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: oasis_err.DISK_BUSYING, Message: oasis_err.GetMsg(oasis_err.DISK_BUSYING)})
+		c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.DISK_BUSYING, Message: common_err.GetMsg(common_err.DISK_BUSYING)})
 		return
 	}
 
@@ -415,7 +566,16 @@ func PostDiskUmount(c *gin.Context) {
 	//delete data
 	service.MyService.Disk().DeleteMountPoint(path, mountPoint)
 	service.MyService.Disk().RemoveLSBLKCache()
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err.SUCCESS, Message: oasis_err.GetMsg(oasis_err.SUCCESS)})
+
+	//send notify to client
+	msg := notify.StorageMessage{}
+	msg.Action = "REMOVED"
+	msg.Path = path
+	msg.Volume = mountPoint
+	msg.Size = 0
+	msg.Type = ""
+	service.MyService.Notify().SendStorageBySocket(msg)
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS)})
 }
 
 // @Summary confirm delete disk
@@ -429,7 +589,7 @@ func PostDiskUmount(c *gin.Context) {
 func DeleteDisk(c *gin.Context) {
 	id := c.Param("id")
 	service.MyService.Disk().DeleteMount(id)
-	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 check mount point
@@ -453,45 +613,10 @@ func GetDiskCheck(c *gin.Context) {
 	for _, v := range dbList {
 		if _, ok := mapList[v.UUID]; !ok {
 			//disk undefind
-			c.JSON(http.StatusOK, model.Result{Success: oasis_err.ERROR, Message: oasis_err.GetMsg(oasis_err.ERROR), Data: "disk undefind"})
+			c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.SERVICE_ERROR, Message: common_err.GetMsg(common_err.SERVICE_ERROR), Data: "disk undefind"})
 			return
 		}
 	}
 
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err.SUCCESS, Message: oasis_err.GetMsg(oasis_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: oasis_err.SUCCESS, Message: oasis_err.GetMsg(oasis_err.SUCCESS), Data: data})
+	c.JSON(http.StatusOK, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS)})
 }

route/v1/file.go

@@ -1,71 +1,29 @@
 package v1
 
 import (
-	"bufio"
-	"encoding/csv"
 	"fmt"
 	"io"
 	"io/ioutil"
+	"log"
 	"net/http"
+	"net/url"
 	url2 "net/url"
 	"os"
 	"path"
+	"path/filepath"
 	"strconv"
 	"strings"
+	"sync"
 
 	"github.com/IceWhaleTech/CasaOS/model"
 	"github.com/IceWhaleTech/CasaOS/pkg/config"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/common_err"
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
-	oasis_err2 "github.com/IceWhaleTech/CasaOS/pkg/utils/oasis_err"
 	"github.com/IceWhaleTech/CasaOS/service"
 	"github.com/gin-gonic/gin"
-	"github.com/spf13/afero"
+	uuid "github.com/satori/go.uuid"
 )
 
-func downloadReadFile(c *gin.Context) {
-	//http下载地址 csv
-	csvFileUrl := c.PostForm("file_name")
-	res, err := http.Get(csvFileUrl)
-	if err != nil {
-		c.String(400, err.Error())
-		return
-	}
-	defer res.Body.Close()
-	//读取csv
-	reader := csv.NewReader(bufio.NewReader(res.Body))
-	for {
-		line, err := reader.Read()
-		if err == io.EOF {
-			break
-		} else if err != nil {
-			c.String(400, err.Error())
-			return
-		}
-		//line 就是每一行的内容
-		fmt.Println(line)
-		//line[0] 就是第几列
-		fmt.Println(line[0])
-	}
-}
-
-func downloadWriteFile(c *gin.Context) {
-	//写文件
-	var filename = "./output1.csv"
-
-	file, err := os.Create(filename) //创建文件
-	if err != nil {
-		c.String(400, err.Error())
-		return
-	}
-	buf := bufio.NewWriter(file) //创建新的 Writer 对象
-	buf.WriteString("test")
-	buf.Flush()
-	defer file.Close()
-
-	//返回文件流
-	c.File(filename)
-}
-
 // @Summary 读取文件
 // @Produce  application/json
 // @Accept application/json
@@ -77,35 +35,34 @@ func downloadWriteFile(c *gin.Context) {
 func GetFilerContent(c *gin.Context) {
 	filePath := c.Query("path")
 	if len(filePath) == 0 {
-		c.JSON(http.StatusOK, model.Result{
-			Success: oasis_err2.INVALID_PARAMS,
-			Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS),
+		c.JSON(common_err.CLIENT_ERROR, model.Result{
+			Success: common_err.INVALID_PARAMS,
+			Message: common_err.GetMsg(common_err.INVALID_PARAMS),
 		})
 		return
 	}
 	if !file.Exists(filePath) {
-		c.JSON(http.StatusOK, model.Result{
-			Success: oasis_err2.FILE_DOES_NOT_EXIST,
-			Message: oasis_err2.GetMsg(oasis_err2.FILE_DOES_NOT_EXIST),
+		c.JSON(common_err.SERVICE_ERROR, model.Result{
+			Success: common_err.FILE_DOES_NOT_EXIST,
+			Message: common_err.GetMsg(common_err.FILE_DOES_NOT_EXIST),
 		})
 		return
 	}
 	//文件读取任务是将文件内容读取到内存中。
 	info, err := ioutil.ReadFile(filePath)
 	if err != nil {
-		c.JSON(http.StatusOK, model.Result{
-			Success: oasis_err2.FILE_READ_ERROR,
-			Message: oasis_err2.GetMsg(oasis_err2.FILE_READ_ERROR),
+		c.JSON(common_err.SERVICE_ERROR, model.Result{
+			Success: common_err.FILE_READ_ERROR,
+			Message: common_err.GetMsg(common_err.FILE_READ_ERROR),
 			Data:    err.Error(),
 		})
 		return
 	}
 	result := string(info)
 
-	//返回结果
-	c.JSON(http.StatusOK, model.Result{
-		Success: oasis_err2.SUCCESS,
-		Message: oasis_err2.GetMsg(oasis_err2.SUCCESS),
+	c.JSON(common_err.SUCCESS, model.Result{
+		Success: common_err.SUCCESS,
+		Message: common_err.GetMsg(common_err.SUCCESS),
 		Data:    result,
 	})
 }
@@ -114,15 +71,15 @@ func GetLocalFile(c *gin.Context) {
 	path := c.Query("path")
 	if len(path) == 0 {
 		c.JSON(http.StatusOK, model.Result{
-			Success: oasis_err2.INVALID_PARAMS,
-			Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS),
+			Success: common_err.INVALID_PARAMS,
+			Message: common_err.GetMsg(common_err.INVALID_PARAMS),
 		})
 		return
 	}
 	if !file.Exists(path) {
 		c.JSON(http.StatusOK, model.Result{
-			Success: oasis_err2.FILE_DOES_NOT_EXIST,
-			Message: oasis_err2.GetMsg(oasis_err2.FILE_DOES_NOT_EXIST),
+			Success: common_err.FILE_DOES_NOT_EXIST,
+			Message: common_err.GetMsg(common_err.FILE_DOES_NOT_EXIST),
 		})
 		return
 	}
@@ -135,82 +92,120 @@ func GetLocalFile(c *gin.Context) {
 // @Accept application/json
 // @Tags file
 // @Security ApiKeyAuth
-// @Param path query string true "path of file"
+// @Param format query string false "Compression format" Enums(zip,tar,targz)
+// @Param files query string true "file list eg: filename1,filename2,filename3 "
 // @Success 200 {string} string "ok"
 // @Router /file/download [get]
 func GetDownloadFile(c *gin.Context) {
-	filePath := c.Query("path")
-	if len(filePath) == 0 {
-		c.JSON(http.StatusOK, model.Result{
-			Success: oasis_err2.INVALID_PARAMS,
-			Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS),
+
+	t := c.Query("format")
+
+	files := c.Query("files")
+
+	if len(files) == 0 {
+		c.JSON(common_err.CLIENT_ERROR, model.Result{
+			Success: common_err.INVALID_PARAMS,
+			Message: common_err.GetMsg(common_err.INVALID_PARAMS),
 		})
 		return
 	}
-	if !file.Exists(filePath) {
-		c.JSON(http.StatusOK, model.Result{
-			Success: oasis_err2.FILE_DOES_NOT_EXIST,
-			Message: oasis_err2.GetMsg(oasis_err2.FILE_DOES_NOT_EXIST),
-		})
-		return
+	list := strings.Split(files, ",")
+	for _, v := range list {
+		if !file.Exists(v) {
+			c.JSON(common_err.SERVICE_ERROR, model.Result{
+				Success: common_err.FILE_DOES_NOT_EXIST,
+				Message: common_err.GetMsg(common_err.FILE_DOES_NOT_EXIST),
+			})
+			return
+		}
 	}
-	//打开文件
-	fileTmp, _ := os.Open(filePath)
-	defer fileTmp.Close()
-	//获取文件的名称
-	fileName := path.Base(filePath)
 	c.Header("Content-Type", "application/octet-stream")
-	c.Header("Content-Disposition", "attachment; filename*=utf-8''"+url2.PathEscape(fileName))
 	c.Header("Content-Transfer-Encoding", "binary")
 	c.Header("Cache-Control", "no-cache")
+	// handles only single files not folders and multiple files
+	if len(list) == 1 {
+
+		filePath := list[0]
+		info, err := os.Stat(filePath)
+		if err != nil {
+			c.JSON(http.StatusOK, model.Result{
+				Success: common_err.FILE_DOES_NOT_EXIST,
+				Message: common_err.GetMsg(common_err.FILE_DOES_NOT_EXIST),
+			})
+			return
+		}
+		if !info.IsDir() {
+
+			//打开文件
+			fileTmp, _ := os.Open(filePath)
+			defer fileTmp.Close()
+
+			//获取文件的名称
+			fileName := path.Base(filePath)
+			c.Header("Content-Disposition", "attachment; filename*=utf-8''"+url2.PathEscape(fileName))
+			c.File(filePath)
+			return
+		}
+	}
+
+	extension, ar, err := file.GetCompressionAlgorithm(t)
+	if err != nil {
+		c.JSON(common_err.CLIENT_ERROR, model.Result{
+			Success: common_err.INVALID_PARAMS,
+			Message: common_err.GetMsg(common_err.INVALID_PARAMS),
+		})
+		return
+	}
+
+	err = ar.Create(c.Writer)
+	if err != nil {
+		c.JSON(common_err.SERVICE_ERROR, model.Result{
+			Success: common_err.SERVICE_ERROR,
+			Message: common_err.GetMsg(common_err.SERVICE_ERROR),
+			Data:    err.Error(),
+		})
+		return
+	}
+	defer ar.Close()
+	commonDir := file.CommonPrefix(filepath.Separator, list...)
+
+	currentPath := filepath.Base(commonDir)
+
+	name := "_" + currentPath
+	name += extension
+	c.Header("Content-Disposition", "attachment; filename*=utf-8''"+url.PathEscape(name))
+	for _, fname := range list {
+		err = file.AddFile(ar, fname, commonDir)
+		if err != nil {
+			log.Printf("Failed to archive %s: %v", fname, err)
+		}
+	}
 
-	c.File(filePath)
 }
 
-// @Summary download
-// @Produce  application/json
-// @Accept application/json
-// @Tags file
-// @Security ApiKeyAuth
-// @Param path query string true "path of file"
-// @Success 200 {string} string "ok"
-// @Router /file/new/download [get]
-func GetFileDownloadNew(c *gin.Context) {
+func GetDownloadSingleFile(c *gin.Context) {
 	filePath := c.Query("path")
 	if len(filePath) == 0 {
-		c.JSON(http.StatusOK, model.Result{
-			Success: oasis_err2.INVALID_PARAMS,
-			Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS),
+		c.JSON(service.ClientCount, model.Result{
+			Success: common_err.INVALID_PARAMS,
+			Message: common_err.GetMsg(common_err.INVALID_PARAMS),
 		})
 		return
 	}
-	if !file.Exists(filePath) {
-		c.JSON(http.StatusOK, model.Result{
-			Success: oasis_err2.FILE_DOES_NOT_EXIST,
-			Message: oasis_err2.GetMsg(oasis_err2.FILE_DOES_NOT_EXIST),
+	fileTmp, err := os.Open(filePath)
+	if err != nil {
+		c.JSON(common_err.SERVICE_ERROR, model.Result{
+			Success: common_err.FILE_DOES_NOT_EXIST,
+			Message: common_err.GetMsg(common_err.FILE_DOES_NOT_EXIST),
 		})
 		return
 	}
-	//打开文件
-	fileStat, _ := os.Stat(filePath)
-	var AppFs = afero.NewOsFs()
-	fileT, _ := AppFs.Open(filePath)
-	//fileTmp, _ := os.Open(filePath)
-	//defer fileTmp.Close()
-	//获取文件的名称
-	//fileName := path.Base(filePath)
+	defer fileTmp.Close()
 
-	//c.Header("Content-Disposition", "attachment; filename*=utf-8''"+url2.PathEscape(fileName))
-	//在线
+	fileName := path.Base(filePath)
 	//c.Header("Content-Disposition", "inline")
-	// extraHeaders := map[string]string{
-	// 	"Content-Disposition": `attachment; filename="` + url2.PathEscape(fileName) + `"`,
-	// }
-
-	//c.Header("Cache-Control", "private")
-	//c.Header("Content-Type", "application/octet-stream")
-
-	http.ServeContent(c.Writer, c.Request, fileStat.Name(), fileStat.ModTime(), fileT)
+	c.Header("Content-Disposition", "attachment; filename*=utf-8''"+url2.PathEscape(fileName))
+	c.File(filePath)
 }
 
 // @Summary 获取目录列表
@@ -223,7 +218,12 @@ func GetFileDownloadNew(c *gin.Context) {
 // @Router /file/dirpath [get]
 func DirPath(c *gin.Context) {
 	path := c.DefaultQuery("path", "")
-	info := service.MyService.ZiMa().GetDirPath(path)
+	info := service.MyService.System().GetDirPath(path)
+	shares := service.MyService.Shares().GetSharesList()
+	sharesMap := make(map[string]string)
+	for _, v := range shares {
+		sharesMap[v.Path] = fmt.Sprint(v.ID)
+	}
 	if path == "/DATA/AppData" {
 		list := service.MyService.Docker().DockerContainerList()
 		apps := make(map[string]string, len(list))
@@ -263,8 +263,41 @@ func DirPath(c *gin.Context) {
 			}
 		}
 	}
+	for i := 0; i < len(info); i++ {
+		if v, ok := sharesMap[info[i].Path]; ok {
+			ex := make(map[string]interface{})
 
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: info})
+			shareEx := make(map[string]string)
+			shareEx["shared"] = "true"
+			shareEx["id"] = v
+			ex["share"] = shareEx
+			info[i].Extensions = ex
+		}
+	}
+	//Hide the files or folders in operation
+	fileQueue := make(map[string]string)
+	if len(service.OpStrArr) > 0 {
+		for _, v := range service.OpStrArr {
+			v, ok := service.FileQueue.Load(v)
+			if !ok {
+				continue
+			}
+			vt := v.(model.FileOperate)
+			for _, i := range vt.Item {
+				lastPath := i.From[strings.LastIndex(i.From, "/")+1:]
+				fileQueue[vt.To+"/"+lastPath] = i.From
+			}
+		}
+	}
+
+	pathList := []model.Path{}
+	for i := 0; i < len(info); i++ {
+		if _, ok := fileQueue[info[i].Path]; !ok {
+			pathList = append(pathList, info[i])
+		}
+	}
+
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: pathList})
 }
 
 // @Summary rename file or dir
@@ -272,62 +305,78 @@ func DirPath(c *gin.Context) {
 // @Accept application/json
 // @Tags file
 // @Security ApiKeyAuth
-// @Param oldpath formData string true "path of old"
-// @Param newpath formData string true "path of new"
+// @Param oldpath body string true "path of old"
+// @Param newpath body string true "path of new"
 // @Success 200 {string} string "ok"
 // @Router /file/rename [put]
 func RenamePath(c *gin.Context) {
-	op := c.PostForm("oldpath")
-	np := c.PostForm("newpath")
+	json := make(map[string]string)
+	c.ShouldBind(&json)
+	op := json["old_path"]
+	np := json["new_path"]
 	if len(op) == 0 || len(np) == 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
+		c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)})
 		return
 	}
-	success, err := service.MyService.ZiMa().RenameFile(op, np)
-	c.JSON(http.StatusOK, model.Result{Success: success, Message: oasis_err2.GetMsg(success), Data: err})
+	success, err := service.MyService.System().RenameFile(op, np)
+	c.JSON(common_err.SUCCESS, model.Result{Success: success, Message: common_err.GetMsg(success), Data: err})
 }
 
 // @Summary create folder
 // @Produce  application/json
-// @Accept  multipart/form-data
+// @Accept  application/json
 // @Tags file
 // @Security ApiKeyAuth
-// @Param path formData string true "path of folder"
+// @Param path body string true "path of folder"
 // @Success 200 {string} string "ok"
 // @Router /file/mkdir [post]
 func MkdirAll(c *gin.Context) {
-	path := c.PostForm("path")
+	json := make(map[string]string)
+	c.ShouldBind(&json)
+	path := json["path"]
 	var code int
 	if len(path) == 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
+		c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)})
 		return
 	}
-	code, _ = service.MyService.ZiMa().MkdirAll(path)
-	c.JSON(http.StatusOK, model.Result{Success: code, Message: oasis_err2.GetMsg(code)})
+	// decodedPath, err := url.QueryUnescape(path)
+	// if err != nil {
+	// 	c.JSON(http.StatusOK, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)})
+	// 	return
+	// }
+	code, _ = service.MyService.System().MkdirAll(path)
+	c.JSON(common_err.SUCCESS, model.Result{Success: code, Message: common_err.GetMsg(code)})
 }
 
 // @Summary create file
 // @Produce  application/json
-// @Accept  multipart/form-data
+// @Accept  application/json
 // @Tags file
 // @Security ApiKeyAuth
-// @Param path formData string false "路径"
+// @Param path body string true "path of folder (path need to url encode)"
 // @Success 200 {string} string "ok"
 // @Router /file/create [post]
 func PostCreateFile(c *gin.Context) {
-	path := c.PostForm("path")
+	json := make(map[string]string)
+	c.ShouldBind(&json)
+	path := json["path"]
 	var code int
 	if len(path) == 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
+		c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)})
 		return
 	}
-	code, _ = service.MyService.ZiMa().CreateFile(path)
-	c.JSON(http.StatusOK, model.Result{Success: code, Message: oasis_err2.GetMsg(code)})
+	// decodedPath, err := url.QueryUnescape(path)
+	// if err != nil {
+	// 	c.JSON(http.StatusOK, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)})
+	// 	return
+	// }
+	code, _ = service.MyService.System().CreateFile(path)
+	c.JSON(common_err.SUCCESS, model.Result{Success: code, Message: common_err.GetMsg(code)})
 }
 
 // @Summary upload file
 // @Produce  application/json
-// @Accept  multipart/form-data
+// @Accept  application/json
 // @Tags file
 // @Security ApiKeyAuth
 // @Param path formData string false "file path"
@@ -343,7 +392,7 @@ func GetFileUpload(c *gin.Context) {
 	path := c.Query("path")
 	dirPath := ""
 	hash := file.GetHashByContent([]byte(fileName))
-	tempDir := config.AppInfo.RootPath + "/temp/" + hash + strconv.Itoa(totalChunks) + "/"
+	tempDir := config.AppInfo.TempPath + "/" + hash + strconv.Itoa(totalChunks) + "/"
 	if fileName != relative {
 		dirPath = strings.TrimSuffix(relative, fileName)
 		tempDir += dirPath
@@ -351,11 +400,11 @@ func GetFileUpload(c *gin.Context) {
 	}
 	tempDir += chunkNumber
 	if !file.CheckNotExist(tempDir) {
-		c.JSON(200, model.Result{Success: 200, Message: oasis_err2.GetMsg(oasis_err2.FILE_ALREADY_EXISTS)})
+		c.JSON(200, model.Result{Success: 200, Message: common_err.GetMsg(common_err.FILE_ALREADY_EXISTS)})
 		return
 	}
 
-	c.JSON(204, model.Result{Success: 204, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
+	c.JSON(204, model.Result{Success: 204, Message: common_err.GetMsg(common_err.SUCCESS)})
 }
 
 // @Summary upload file
@@ -379,10 +428,10 @@ func PostFileUpload(c *gin.Context) {
 	hash := file.GetHashByContent([]byte(fileName))
 
 	if len(path) == 0 {
-		c.JSON(oasis_err2.INVALID_PARAMS, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
+		c.JSON(common_err.INVALID_PARAMS, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)})
 		return
 	}
-	tempDir := config.AppInfo.RootPath + "/temp/" + hash + strconv.Itoa(totalChunks) + "/"
+	tempDir := config.AppInfo.TempPath + "/" + hash + strconv.Itoa(totalChunks) + "/"
 
 	if fileName != relative {
 		dirPath = strings.TrimSuffix(relative, fileName)
@@ -403,7 +452,7 @@ func PostFileUpload(c *gin.Context) {
 		defer out.Close()
 		_, err := io.Copy(out, f)
 		if err != nil {
-			c.JSON(oasis_err2.ERROR, model.Result{Success: oasis_err2.ERROR, Message: oasis_err2.GetMsg(oasis_err2.ERROR), Data: err.Error()})
+			c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.SERVICE_ERROR, Message: common_err.GetMsg(common_err.SERVICE_ERROR), Data: err.Error()})
 			return
 		}
 	} else {
@@ -411,15 +460,15 @@ func PostFileUpload(c *gin.Context) {
 		defer out.Close()
 		_, err := io.Copy(out, f)
 		if err != nil {
-			c.JSON(oasis_err2.ERROR, model.Result{Success: oasis_err2.ERROR, Message: oasis_err2.GetMsg(oasis_err2.ERROR), Data: err.Error()})
+			c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.SERVICE_ERROR, Message: common_err.GetMsg(common_err.SERVICE_ERROR), Data: err.Error()})
 			return
 		}
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
+		c.JSON(http.StatusOK, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS)})
 		return
 	}
 	fileNum, err := ioutil.ReadDir(tempDir)
 	if err != nil {
-		c.JSON(oasis_err2.ERROR, model.Result{Success: oasis_err2.ERROR, Message: oasis_err2.GetMsg(oasis_err2.ERROR), Data: err.Error()})
+		c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.SERVICE_ERROR, Message: common_err.GetMsg(common_err.SERVICE_ERROR), Data: err.Error()})
 		return
 	}
 	if totalChunks == len(fileNum) {
@@ -427,101 +476,122 @@ func PostFileUpload(c *gin.Context) {
 		file.RMDir(tempDir)
 	}
 
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS)})
 }
 
 // @Summary copy or move file
 // @Produce  application/json
-// @Accept  multipart/form-data
+// @Accept  application/json
 // @Tags file
 // @Security ApiKeyAuth
-// @Param from formData string true "from path"
-// @Param to formData string true "to path"
-// @Param type formData string true "action" Enums(move,copy)
+// @Param body body model.FileOperate true "type:move,copy"
 // @Success 200 {string} string "ok"
 // @Router /file/operate [post]
 func PostOperateFileOrDir(c *gin.Context) {
-	from := c.PostForm("from")
-	to := c.PostForm("to")
-	t := c.PostForm("type")
-	if len(from) == 0 || len(t) == 0 || len(to) == 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
+
+	list := model.FileOperate{}
+	c.ShouldBind(&list)
+
+	if len(list.Item) == 0 {
+		c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)})
 		return
 	}
-	if t == "move" {
-		lastPath := from[strings.LastIndex(from, "/")+1:]
-		if !file.CheckNotExist(to + "/" + lastPath) {
-			c.JSON(http.StatusOK, model.Result{Success: oasis_err2.FILE_OR_DIR_EXISTS, Message: oasis_err2.GetMsg(oasis_err2.FILE_ALREADY_EXISTS)})
-			return
-		}
-		err := os.Rename(from, to+"/"+lastPath)
-		if err != nil {
-			c.JSON(http.StatusOK, model.Result{Success: oasis_err2.ERROR, Message: oasis_err2.GetMsg(oasis_err2.ERROR), Data: err.Error()})
-			return
-		}
-	} else if t == "copy" {
-		err := file.CopyDir(from, to)
-		if err != nil {
-			c.JSON(http.StatusOK, model.Result{Success: oasis_err2.ERROR, Message: oasis_err2.GetMsg(oasis_err2.ERROR), Data: err.Error()})
-			return
-		}
-	} else {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
+	if list.To == list.Item[0].From[:strings.LastIndex(list.Item[0].From, "/")] {
+		c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.SOURCE_DES_SAME, Message: common_err.GetMsg(common_err.SOURCE_DES_SAME)})
 		return
 	}
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
+
+	var total int64 = 0
+	for i := 0; i < len(list.Item); i++ {
+
+		size, err := file.GetFileOrDirSize(list.Item[i].From)
+		if err != nil {
+			continue
+		}
+		list.Item[i].Size = size
+		total += size
+	}
+
+	list.TotalSize = total
+	list.ProcessedSize = 0
+
+	uid := uuid.NewV4().String()
+	service.FileQueue.Store(uid, list)
+	service.OpStrArr = append(service.OpStrArr, uid)
+	if len(service.OpStrArr) == 1 {
+		go service.ExecOpFile()
+		go service.CheckFileStatus()
+
+		go service.MyService.Notify().SendFileOperateNotify(false)
+
+	}
+
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS)})
 }
 
 // @Summary delete file
 // @Produce  application/json
-// @Accept  multipart/form-data
+// @Accept  application/json
 // @Tags file
 // @Security ApiKeyAuth
-// @Param path query string true "path"
+// @Param body body string true "paths eg ["/a/b/c","/d/e/f"]"
 // @Success 200 {string} string "ok"
 // @Router /file/delete [delete]
 func DeleteFile(c *gin.Context) {
-	path := c.Query("path")
-	//err := os.Remove(path)
-	err := os.RemoveAll(path)
-	if err != nil {
-		fmt.Println(err)
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.FILE_DELETE_ERROR, Message: oasis_err2.GetMsg(oasis_err2.FILE_DELETE_ERROR), Data: err})
+
+	paths := []string{}
+	c.ShouldBind(&paths)
+	if len(paths) == 0 {
+		c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)})
 		return
 	}
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
+	//	path := c.Query("path")
+
+	//	paths := strings.Split(path, ",")
+
+	for _, v := range paths {
+		err := os.RemoveAll(v)
+		if err != nil {
+			c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.FILE_DELETE_ERROR, Message: common_err.GetMsg(common_err.FILE_DELETE_ERROR), Data: err})
+			return
+		}
+	}
+
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS)})
 }
 
 // @Summary update file
 // @Produce  application/json
-// @Accept  multipart/form-data
+// @Accept  application/json
 // @Tags file
 // @Security ApiKeyAuth
-// @Param path formData string true "path"
-// @Param content formData string true "content"
+// @Param path body string true "path"
+// @Param content body string true "content"
 // @Success 200 {string} string "ok"
 // @Router /file/update [put]
 func PutFileContent(c *gin.Context) {
-	path := c.PostForm("path")
-	content := c.PostForm("content")
-	if !file.Exists(path) {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.FILE_ALREADY_EXISTS, Message: oasis_err2.GetMsg(oasis_err2.FILE_ALREADY_EXISTS)})
+
+	fi := model.FileUpdate{}
+	c.ShouldBind(&fi)
+
+	// path := c.PostForm("path")
+	// content := c.PostForm("content")
+	if !file.Exists(fi.FilePath) {
+		c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.FILE_ALREADY_EXISTS, Message: common_err.GetMsg(common_err.FILE_ALREADY_EXISTS)})
 		return
 	}
 	//err := os.Remove(path)
-	err := os.RemoveAll(path)
+	err := os.RemoveAll(fi.FilePath)
 	if err != nil {
-		fmt.Println(err)
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.FILE_DELETE_ERROR, Message: oasis_err2.GetMsg(oasis_err2.FILE_DELETE_ERROR), Data: err})
+		c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.FILE_DELETE_ERROR, Message: common_err.GetMsg(common_err.FILE_DELETE_ERROR), Data: err})
 		return
 	}
-	err = file.CreateFileAndWriteContent(path, content)
+	err = file.CreateFileAndWriteContent(fi.FilePath, fi.FileContent)
 	if err != nil {
-		fmt.Println(err)
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.ERROR, Message: oasis_err2.GetMsg(oasis_err2.ERROR), Data: err})
+		c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.SERVICE_ERROR, Message: common_err.GetMsg(common_err.SERVICE_ERROR), Data: err.Error()})
 		return
 	}
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS)})
 }
 
 // @Summary image thumbnail/original image
@@ -537,13 +607,13 @@ func GetFileImage(c *gin.Context) {
 	t := c.Query("type")
 	path := c.Query("path")
 	if !file.Exists(path) {
-		c.JSON(http.StatusInternalServerError, model.Result{Success: oasis_err2.FILE_ALREADY_EXISTS, Message: oasis_err2.GetMsg(oasis_err2.FILE_ALREADY_EXISTS)})
+		c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.FILE_ALREADY_EXISTS, Message: common_err.GetMsg(common_err.FILE_ALREADY_EXISTS)})
 		return
 	}
 	if t == "thumbnail" {
 		f, err := file.GetImage(path, 100, 0)
 		if err != nil {
-			c.JSON(http.StatusInternalServerError, model.Result{Success: oasis_err2.ERROR, Message: oasis_err2.GetMsg(oasis_err2.ERROR), Data: err.Error()})
+			c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.SERVICE_ERROR, Message: common_err.GetMsg(common_err.SERVICE_ERROR), Data: err.Error()})
 			return
 		}
 		c.Writer.WriteString(string(f))
@@ -551,14 +621,36 @@ func GetFileImage(c *gin.Context) {
 	}
 	f, err := os.Open(path)
 	if err != nil {
-		c.JSON(http.StatusInternalServerError, model.Result{Success: oasis_err2.ERROR, Message: oasis_err2.GetMsg(oasis_err2.ERROR), Data: err.Error()})
+		c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.SERVICE_ERROR, Message: common_err.GetMsg(common_err.SERVICE_ERROR), Data: err.Error()})
 		return
 	}
 	defer f.Close()
 	data, err := ioutil.ReadAll(f)
 	if err != nil {
-		c.JSON(http.StatusInternalServerError, model.Result{Success: oasis_err2.ERROR, Message: oasis_err2.GetMsg(oasis_err2.ERROR), Data: err.Error()})
+		c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.SERVICE_ERROR, Message: common_err.GetMsg(common_err.SERVICE_ERROR), Data: err.Error()})
 		return
 	}
 	c.Writer.WriteString(string(data))
 }
+
+func DeleteOperateFileOrDir(c *gin.Context) {
+	id := c.Param("id")
+	if id == "0" {
+		service.FileQueue = sync.Map{}
+		service.OpStrArr = []string{}
+	} else {
+
+		service.FileQueue.Delete(id)
+		tempList := []string{}
+		for _, v := range service.OpStrArr {
+			if v != id {
+				tempList = append(tempList, v)
+			}
+		}
+		service.OpStrArr = tempList
+
+	}
+
+	go service.MyService.Notify().SendFileOperateNotify(true)
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS)})
+}

route/v1/person.go

@@ -1,803 +0,0 @@
-package v1
-
-import (
-	"bytes"
-	"encoding/base64"
-	"encoding/gob"
-	"encoding/json"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"os"
-	"reflect"
-	"strconv"
-	"strings"
-	"time"
-
-	natType "github.com/Curtis-Milo/nat-type-identifier-go"
-	"github.com/IceWhaleTech/CasaOS/model"
-	"github.com/IceWhaleTech/CasaOS/pkg/config"
-	"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
-	"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/IceWhaleTech/CasaOS/types"
-	"github.com/gin-gonic/gin"
-	uuid "github.com/satori/go.uuid"
-)
-
-// @Summary Retry the file that failed to download
-// @Produce  application/json
-// @Accept application/json
-// @Tags person
-// @Param  uui path string true "download uuid"
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /person/refile/{uuid} [get]
-func GetPersonReFile(c *gin.Context) {
-
-	uid := c.Param("uuid")
-	_, err := uuid.FromString(uid)
-	if err != nil {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-		return
-	}
-
-	task := service.MyService.Download().GetDownloadById(uid)
-	if reflect.DeepEqual(task, model2.PersonDownloadDBModel{}) {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.PERSON_REMOTE_ERROR, Message: oasis_err2.GetMsg(oasis_err2.PERSON_REMOTE_ERROR)})
-		return
-	}
-	token := task.From
-	if _, ok := service.UDPAddressMap[token]; !ok {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.PERSON_REMOTE_ERROR, Message: oasis_err2.GetMsg(oasis_err2.PERSON_REMOTE_ERROR)})
-		return
-	}
-
-	m := model.MessageModel{}
-	m.Data = task.Path
-	m.From = config.ServerInfo.Token
-	m.To = token
-	m.Type = types.PERSONDOWNLOAD
-	m.UUId = uid
-	go service.Dial(m, false)
-
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
-}
-
-// @Summary download file
-// @Produce  application/json
-// @Accept application/json
-// @Tags person
-// @Param  share_id query string true "opponent share_id"
-// @Param  path query string true "file path"
-// @Param  file_name query string true "file name"
-// @Param  local_path query string true "local_path"
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /person/file [get]
-func GetPersonFile(c *gin.Context) {
-
-	path := c.Query("path")
-	localPath := c.Query("local_path")
-	token := c.Query("share_id")
-	fileName := c.Query("file_name")
-	_, err := uuid.FromString(token)
-	if len(path) == 0 || err != nil || len(localPath) == 0 || len(fileName) == 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-		return
-	}
-	if file.CheckNotExist(localPath) {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.DIR_NOT_EXISTS, Message: oasis_err2.GetMsg(oasis_err2.DIR_NOT_EXISTS)})
-		return
-	}
-	if _, ok := service.UDPAddressMap[token]; !ok {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.PERSON_REMOTE_ERROR, Message: oasis_err2.GetMsg(oasis_err2.PERSON_REMOTE_ERROR)})
-		return
-	}
-
-	if _, ok := service.UDPAddressMap[token]; !ok {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.PERSON_REMOTE_ERROR, Message: oasis_err2.GetMsg(oasis_err2.PERSON_REMOTE_ERROR)})
-		return
-	}
-
-	// task id
-	uuid := uuid.NewV4().String()
-
-	task := model2.PersonDownloadDBModel{}
-	task.UUID = uuid
-	task.Name = fileName
-	task.Length = 0
-	task.From = token
-	task.Path = path
-	task.Size = 0
-	task.State = types.DOWNLOADAWAIT
-	task.Created = time.Now().Unix()
-	task.Type = types.PERSONFILEDOWNLOAD
-	task.LocalPath = localPath
-	if service.MyService.Download().GetDownloadListByPath(task) > 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.PERSON_EXIST_DOWNLOAD, Message: oasis_err2.GetMsg(oasis_err2.PERSON_EXIST_DOWNLOAD)})
-		return
-	}
-	service.MyService.Download().AddDownloadTask(task)
-
-	m := model.MessageModel{}
-	m.Data = path
-	m.From = config.ServerInfo.Token
-	m.To = token
-	m.Type = types.PERSONDOWNLOAD
-	m.UUId = uuid
-	go service.Dial(m, false)
-
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
-}
-
-// @Summary delete download file records
-// @Produce  application/json
-// @Accept application/json
-// @Tags person
-// @Param  uuid path string true "download uuid"
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /person/file/{uuid} [delete]
-func DeletePersonDownloadFile(c *gin.Context) {
-
-	id := c.Param("uuid")
-	_, err := uuid.FromString(id)
-	if err != nil {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-		return
-	}
-
-	task := service.MyService.Download().GetDownloadById(id)
-	if task.State == types.DOWNLOADING {
-		m := model.MessageModel{}
-		m.Data = ""
-		m.From = config.ServerInfo.Token
-		m.To = task.From
-		m.Type = types.PERSONCANCEL
-		m.UUId = task.UUID
-		service.CancelList[task.UUID] = task.UUID
-		service.Dial(m, false)
-	}
-	service.MyService.Download().DelDownload(id)
-
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
-}
-
-// @Summary Get file download list
-// @Produce  application/json
-// @Accept application/json
-// @Tags person
-// @Param  state query int false "wait:0,downloading:1,pause:2,finish:3,error:4,finished:5" Enums(0,1,2,3,4,5)
-// @Security ApiKeyAuth
-// @Success 200 {object} []model2.PersonDownloadDBModel
-// @Router /person/list [get]
-func GetPersonDownloadList(c *gin.Context) {
-	state := c.DefaultQuery("state", "")
-	list := service.MyService.Download().GetDownloadListByState(state, types.PERSONFILEDOWNLOAD)
-	//if it is  downloading, it need to add 'already'
-	for i := 0; i < len(list); i++ {
-		if list[i].State == types.DOWNLOADING {
-			tempDir := config.AppInfo.RootPath + "/temp" + "/" + list[i].UUID
-			files, err := ioutil.ReadDir(tempDir)
-			if err == nil {
-				list[i].Already = len(files)
-			}
-		}
-		list[i].Duration = time.Now().Unix() - list[i].Created
-	}
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: list})
-}
-
-// @Summary edit friend's remarks
-// @Produce  application/json
-// @Accept application/json
-// @Tags person
-// @Param remarks formData string true "remarks name"
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /person/remarks/{shareid} [put]
-func PutPersonRemarks(c *gin.Context) {
-	token := c.Param("shareid")
-	_, err := uuid.FromString(token)
-	mark := c.PostForm("remarks")
-	if err != nil || len(mark) == 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-		return
-	}
-	friend := model2.FriendModel{}
-	friend.Token = token
-	friend.Mark = mark
-	service.MyService.Friend().EditFriendMark(friend)
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
-}
-
-// @Summary edit friend's
-// @Produce  application/json
-// @Accept application/json
-// @Tags person
-// @Param write formData bool true "write"
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /person/write/{shareid} [put]
-func PutPersonWrite(c *gin.Context) {
-	token := c.Param("shareid")
-	_, err := uuid.FromString(token)
-	if err != nil {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-		return
-	}
-	write, _ := strconv.ParseBool(c.PostForm("write"))
-	friend := model2.FriendModel{}
-	friend.Token = token
-	friend.Write = write
-	service.MyService.Friend().EditFriendMark(friend)
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
-}
-
-// @Summary image thumbnail
-// @Produce  application/json
-// @Accept application/json
-// @Tags person
-// @Param write formData bool true "write"
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /person/image/thumbnail/{shareid} [get]
-func GetPersonImageThumbnail(c *gin.Context) {
-	token := c.Param("shareid")
-	path := c.Query("path")
-	_, err := uuid.FromString(token)
-	if err != nil || len(path) == 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-		return
-	}
-	uuid := uuid.NewV4().String()
-	m := model.MessageModel{}
-	m.Data = path
-	m.From = config.ServerInfo.Token
-	m.To = token
-	m.Type = types.PERSONIMAGETHUMBNAIL
-	m.UUId = uuid
-
-	img, err := service.Dial(m, false)
-	if err != nil {
-		c.JSON(http.StatusInternalServerError, model.Result{Success: oasis_err2.ERROR, Message: oasis_err2.GetMsg(oasis_err2.ERROR), Data: err.Error()})
-		return
-	}
-
-	//	var buf bytes.Buffer
-	//err = gob.NewEncoder(&buf).Encode(img.Data)
-
-	if err != nil {
-		c.JSON(http.StatusInternalServerError, model.Result{Success: oasis_err2.ERROR, Message: oasis_err2.GetMsg(oasis_err2.ERROR), Data: err.Error()})
-		return
-	}
-	var buf bytes.Buffer
-	err = gob.NewEncoder(&buf).Encode(img.Data)
-	if err != nil {
-		c.JSON(http.StatusInternalServerError, model.Result{Success: oasis_err2.ERROR, Message: oasis_err2.GetMsg(oasis_err2.ERROR), Data: err.Error()})
-		return
-	}
-
-	imageBuffer, _ := base64.StdEncoding.DecodeString(img.Data.(string))
-	c.Writer.WriteString(string(imageBuffer))
-	//	c.String(http.StatusOK, "data:image/"+filesuffix+";base64,"+img.Data.(string))
-	//c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: img.Data.(string)})
-}
-
-// @Summary get my friend list
-// @Produce  application/json
-// @Accept application/json
-// @Tags person
-// @Security ApiKeyAuth
-// @Success 200 {object}  []model2.FriendModel
-// @Router /person/users [get]
-func GetPersonFriend(c *gin.Context) {
-	list := service.MyService.Friend().GetFriendList()
-	for i := 0; i < len(list); i++ {
-		if v, ok := service.UDPAddressMap[list[i].Token]; ok && len(v) > 0 {
-			list[i].OnLine = true
-			if ip_helper.HasLocalIP(net.ParseIP(strings.Split(v, ":")[0])) {
-				list[i].LocalIP = strings.Split(v, ":")[0]
-			}
-		}
-	}
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: list})
-}
-
-// @Summary network type detection
-// @Produce application/json
-// @Accept application/json
-// @Tags person
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /person/detection [get]
-func GetPersonDetection(c *gin.Context) {
-	// - Blocked
-	// - Open Internet
-	// - Full Cone
-	// - Symmetric UDP Firewall
-	// - Restric NAT
-	// - Restric Port NAT
-	// - Symmetric NAT
-
-	result, err := natType.GetDeterminedNatType(true, 5, "stun.l.google.com")
-	if err != nil {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.ERROR, Message: oasis_err2.GetMsg(oasis_err2.ERROR), Data: err.Error()})
-		return
-	}
-	//result := service.MyService.Person().GetPersionNetWorkTypeDetection()
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: result})
-}
-
-// @Summary add friend
-// @Produce  application/json
-// @Accept application/json
-// @Tags person
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /person/user/{shareids} [post]
-func PostAddPersonFriend(c *gin.Context) {
-	token := c.Param("shareids")
-	tokenList := strings.Split(token, ",")
-
-	for _, v := range tokenList {
-		_, err := uuid.FromString(v)
-		if err != nil {
-			c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-			return
-		}
-
-		if v == config.ServerInfo.Token {
-			c.JSON(http.StatusOK, model.Result{Success: oasis_err2.PERSON_MYSELF, Message: oasis_err2.GetMsg(oasis_err2.PERSON_MYSELF)})
-			return
-		}
-
-		udb := service.MyService.Friend().GetFriendById(model2.FriendModel{Token: v})
-		if !reflect.DeepEqual(udb, model2.FriendModel{Token: v}) {
-			c.JSON(http.StatusOK, model.Result{Success: oasis_err2.PERSON_EXIST_FRIEND, Message: oasis_err2.GetMsg(oasis_err2.PERSON_EXIST_FRIEND)})
-			return
-		}
-
-		user := service.MyService.Casa().GetUserInfoByShareId(v)
-		if reflect.DeepEqual(user, model.UserInfo{}) {
-			c.JSON(http.StatusOK, model.Result{Success: oasis_err2.PERSON_NOT_EXIST_USER, Message: oasis_err2.GetMsg(oasis_err2.PERSON_NOT_EXIST_USER)})
-			return
-		}
-
-		message := model.MessageModel{}
-		message.Type = types.PERSONCONNECTION
-		message.Data = v
-		message.From = config.ServerInfo.Token
-		message.To = v
-		message.UUId = uuid.NewV4().String()
-
-		go service.Dial(message, true)
-
-		msg := model.MessageModel{}
-		msg.Type = types.PERSONGETIP
-		msg.Data = ""
-		msg.From = config.ServerInfo.Token
-		msg.To = v
-		msg.UUId = uuid.NewV4().String()
-
-		service.Dial(msg, true)
-
-		friend := model2.FriendModel{}
-		friend.Token = v
-		friend.Avatar = user.Avatar
-		friend.Block = false
-		friend.State = types.FRIENDSTATEWAIT
-		friend.NickName = user.NickName
-		friend.Profile = user.Desc
-		friend.Version = user.Version
-		service.MyService.Friend().AddFriend(friend)
-	}
-
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
-}
-
-// @Summary Get a list of directories
-// @Produce  application/json
-// @Accept application/json
-// @Tags person
-// @Param  share_id query string true "Opponent share_id"
-// @Param  path query string true "dir path"
-// @Security ApiKeyAuth
-// @Success 200 {object}  []model.Path
-// @Router /person/directory [get]
-func GetPersonDirectory(c *gin.Context) {
-	path := c.Query("path")
-	token := c.Query("share_id")
-	_, err := uuid.FromString(token)
-	if len(path) == 0 || err != nil {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-		return
-	}
-	if _, ok := service.UDPAddressMap[token]; !ok {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.PERSON_REMOTE_ERROR, Message: oasis_err2.GetMsg(oasis_err2.PERSON_REMOTE_ERROR)})
-		return
-	}
-	uuid := uuid.NewV4().String()
-	m := model.MessageModel{}
-	m.Data = path
-	m.From = config.ServerInfo.Token
-	m.To = token
-	m.Type = types.PERSONDIRECTORY
-	m.UUId = uuid
-	result, err := service.Dial(m, false)
-	if err != nil {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.ERROR, Message: oasis_err2.GetMsg(oasis_err2.ERROR), Data: err.Error()})
-		return
-	}
-	dataModel := []model.Path{}
-	if uuid == m.UUId {
-		dataModelByte, _ := json.Marshal(result.Data)
-		err := json.Unmarshal(dataModelByte, &dataModel)
-		if 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), Data: dataModel})
-}
-
-// @Summary Modify the download storage directory
-// @Produce  application/json
-// @Accept  multipart/form-data
-// @Tags person
-// @Security ApiKeyAuth
-// @Param path formData string true "path"
-// @Success 200 {string} string "ok"
-// @Router /person/down/dir [post]
-func PostPersonDownDir(c *gin.Context) {
-
-	downPath := c.PostForm("path")
-
-	if len(downPath) == 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-		return
-	}
-	if file.CheckNotExist(downPath) {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.DIR_NOT_EXISTS, Message: oasis_err2.GetMsg(oasis_err2.DIR_NOT_EXISTS)})
-		return
-	}
-	config.Cfg.Section("file").Key("DownloadDir").SetValue(downPath)
-	config.Cfg.SaveTo(config.SystemConfigInfo.ConfigPath)
-	config.FileSettingInfo.DownloadDir = downPath
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
-}
-
-// @Summary Get the download storage directory
-// @Produce  application/json
-// @Accept application/json
-// @Tags person
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /person/down/dir [get]
-func GetPersonDownDir(c *gin.Context) {
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: config.FileSettingInfo.DownloadDir})
-}
-
-// @Summary Modify the shared directory
-// @Produce  application/json
-// @Accept  multipart/form-data
-// @Tags person
-// @Security ApiKeyAuth
-// @Param share formData string true "share"
-// @Success 200 {string} string "ok"
-// @Router /person/share [post]
-func PostPersonShare(c *gin.Context) {
-
-	share := c.PostForm("share")
-
-	if len(share) == 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-		return
-	}
-
-	var list []string
-	json.Unmarshal([]byte(share), &list)
-
-	if len(list) == 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-		return
-	}
-	for _, v := range list {
-		if !file.Exists(v) {
-			c.JSON(http.StatusOK, model.Result{Success: oasis_err2.FILE_ALREADY_EXISTS, Message: oasis_err2.GetMsg(oasis_err2.FILE_ALREADY_EXISTS)})
-			return
-		}
-	}
-
-	config.Cfg.Section("file").Key("ShareDir").SetValue(strings.Join(list, "|"))
-	config.Cfg.SaveTo(config.SystemConfigInfo.ConfigPath)
-	config.FileSettingInfo.ShareDir = list
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
-}
-
-// @Summary Get the shared directory
-// @Produce  application/json
-// @Accept application/json
-// @Tags person
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /person/share [get]
-func GetPersonShare(c *gin.Context) {
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: config.FileSettingInfo.ShareDir})
-}
-
-// @Summary Get the shareid
-// @Produce  application/json
-// @Accept application/json
-// @Tags person
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /person/shareid [get]
-func GetPersonShareId(c *gin.Context) {
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: config.ServerInfo.Token})
-}
-
-// @Summary Modify disabled status
-// @Produce  application/json
-// @Accept application/json
-// @Tags person
-// @Param block formData bool false "Disable or not,Default:false "
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /person/block/{shareid} [put]
-func PutPersonBlock(c *gin.Context) {
-	token := c.Param("shareid")
-	_, err := uuid.FromString(token)
-	block, _ := strconv.ParseBool(c.PostForm("block"))
-	if err != nil {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-		return
-	}
-	friend := model2.FriendModel{}
-	friend.Token = token
-	friend.Block = block
-	service.MyService.Friend().EditFriendBlock(friend)
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
-}
-
-// @Summary Delete my friend
-// @Produce  application/json
-// @Accept application/json
-// @Tags person
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /person/user/{shareid} [delete]
-func DeletePersonFriend(c *gin.Context) {
-	token := c.Param("shareid")
-	_, err := uuid.FromString(token)
-	if err != nil {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-		return
-	}
-	friend := model2.FriendModel{}
-	friend.Token = token
-
-	service.MyService.Friend().DeleteFriend(friend)
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
-}
-
-// @Summary Get public person
-// @Produce  application/json
-// @Accept application/json
-// @Tags person
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /person/public [get]
-func GetPersonPublic(c *gin.Context) {
-	list := service.MyService.Casa().GetPersonPublic()
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: list})
-}
-
-// @Summary upload file to friend
-// @Produce  application/json
-// @Accept application/json
-// @Tags person
-// @Security ApiKeyAuth
-// @Param path formData string true "Destination path"
-// @Param local_path formData string true "Full path of the file to be uploaded"
-// @Success 200 {string} string "ok"
-// @Router /person/file/{shareid} [post]
-func PostPersonFile(c *gin.Context) {
-	token := c.Param("shareid")
-	_, err := uuid.FromString(token)
-	path := c.PostForm("path")
-	localPath := c.PostForm("local_path")
-	if err != nil {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-		return
-	}
-	if !file.Exists(localPath) {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.FILE_DOES_NOT_EXIST, Message: oasis_err2.GetMsg(oasis_err2.FILE_DOES_NOT_EXIST)})
-		return
-	}
-	uuid := uuid.NewV4().String()
-	m := model.MessageModel{}
-	m.Data = path
-	m.From = config.ServerInfo.Token
-	m.To = token
-	m.Type = types.PERSONUPLOAD
-	m.UUId = uuid
-	go service.UDPSendData(m, localPath)
-
-	f, _ := os.Stat(localPath)
-
-	task := model2.PersonDownloadDBModel{}
-	task.UUID = uuid
-	task.Name = f.Name()
-	task.Length = 0
-	task.From = token
-	task.Path = path
-	task.Size = f.Size()
-	task.State = types.DOWNLOADFINISHED
-	task.Created = time.Now().Unix()
-	task.Type = types.PERSONFILEUPLOAD
-	task.LocalPath = localPath
-	if service.MyService.Download().GetDownloadListByPath(task) > 0 {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.PERSON_EXIST_DOWNLOAD, Message: oasis_err2.GetMsg(oasis_err2.PERSON_EXIST_DOWNLOAD)})
-		return
-	}
-	service.MyService.Download().AddDownloadTask(task)
-
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
-}
-
-// @Summary agree add friend
-// @Produce  application/json
-// @Accept application/json
-// @Tags person
-// @Security ApiKeyAuth
-// @Success 200 {string} string "ok"
-// @Router /person/friend/{shareid} [put]
-func PutPersonAgreeFriend(c *gin.Context) {
-	token := c.Param("shareid")
-	_, err := uuid.FromString(token)
-	if err != nil {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-		return
-	}
-
-	user := service.MyService.Friend().GetFriendById(model2.FriendModel{Token: token})
-
-	if user.State != types.FRIENDSTATEREQUEST {
-		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.COMMAND_ERROR_INVALID_OPERATION, Message: oasis_err2.GetMsg(oasis_err2.COMMAND_ERROR_INVALID_OPERATION)})
-		return
-	}
-	service.MyService.Friend().AgreeFrined(user.Token)
-
-	uuid := uuid.NewV4().String()
-	m := model.MessageModel{}
-	m.Data = ""
-	m.From = config.ServerInfo.Token
-	m.To = token
-	m.Type = types.PERSONAGREEFRIEND
-	m.UUId = uuid
-	go service.Dial(m, true)
-
-	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
-}
-
-// // @Summary upload file
-// // @Produce  application/json
-// // @Accept  multipart/form-data
-// // @Tags person
-// // @Security ApiKeyAuth
-// // @Param path formData string false "file path"
-// // @Param file formData file true "file"
-// // @Success 200 {string} string "ok"
-// // @Router /person/upload/{shareid} [get]
-// func GetPersonFileUpload(c *gin.Context) {
-
-// 	token := c.Param("shareid")
-// 	_, err := uuid.FromString(token)
-// 	path := c.Query("path")
-// 	if err != nil {
-// 		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-// 		return
-// 	}
-
-// 	relative := c.Query("relativePath")
-// 	fileName := c.Query("filename")
-// 	chunkNumber := c.Query("chunkNumber")
-// 	totalChunks, _ := strconv.Atoi(c.DefaultQuery("totalChunks", "0"))
-// 	dirPath := ""
-// 	hash := file.GetHashByContent([]byte(fileName))
-// 	tempDir := "/casaOS/temp/" + hash + strconv.Itoa(totalChunks) + "/"
-// 	if fileName != relative {
-// 		dirPath = strings.TrimSuffix(relative, fileName)
-// 		tempDir += dirPath
-// 		file.MkDir(path + "/" + dirPath)
-// 	}
-// 	tempDir += chunkNumber
-// 	if !file.CheckNotExist(tempDir) {
-// 		c.JSON(200, model.Result{Success: 200, Message: oasis_err2.GetMsg(oasis_err2.FILE_ALREADY_EXISTS)})
-// 		return
-// 	}
-
-// 	c.JSON(204, model.Result{Success: 204, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
-// }
-
-// // @Summary upload file
-// // @Produce  application/json
-// // @Accept  multipart/form-data
-// // @Tags person
-// // @Security ApiKeyAuth
-// // @Param path formData string false "file path"
-// // @Param file formData file true "file"
-// // @Success 200 {string} string "ok"
-// // @Router /person/upload [post]
-// func PostPersonFileUpload(c *gin.Context) {
-// 	token := c.Param("shareid")
-// 	_, err := uuid.FromString(token)
-// 	if err != nil {
-// 		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-// 		return
-// 	}
-// 	f, _, _ := c.Request.FormFile("file")
-// 	relative := c.PostForm("relativePath")
-// 	fileName := c.PostForm("filename")
-// 	totalChunks, _ := strconv.Atoi(c.DefaultPostForm("totalChunks", "0"))
-// 	chunkNumber := c.PostForm("chunkNumber")
-// 	dirPath := ""
-// 	path := c.PostForm("path")
-
-// 	hash := file.GetHashByContent([]byte(fileName))
-
-// 	if len(path) == 0 {
-// 		c.JSON(oasis_err2.INVALID_PARAMS, model.Result{Success: oasis_err2.INVALID_PARAMS, Message: oasis_err2.GetMsg(oasis_err2.INVALID_PARAMS)})
-// 		return
-// 	}
-// 	tempDir := "/casaOS/temp/" + hash + strconv.Itoa(totalChunks) + "/"
-
-// 	if fileName != relative {
-// 		dirPath = strings.TrimSuffix(relative, fileName)
-// 		tempDir += dirPath
-// 		file.MkDir(path + "/" + dirPath)
-// 	}
-
-// 	path += "/" + relative
-
-// 	if !file.CheckNotExist(tempDir + chunkNumber) {
-// 		file.RMDir(tempDir + chunkNumber)
-// 	}
-
-// 	if totalChunks > 1 {
-// 		file.IsNotExistMkDir(tempDir)
-
-// 		out, _ := os.OpenFile(tempDir+chunkNumber, os.O_WRONLY|os.O_CREATE, 0644)
-// 		defer out.Close()
-// 		_, err := io.Copy(out, f)
-// 		if err != nil {
-// 			c.JSON(oasis_err2.ERROR, model.Result{Success: oasis_err2.ERROR, Message: oasis_err2.GetMsg(oasis_err2.ERROR), Data: err.Error()})
-// 			return
-// 		}
-// 	} else {
-// 		out, _ := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0644)
-// 		defer out.Close()
-// 		_, err := io.Copy(out, f)
-// 		if err != nil {
-// 			c.JSON(oasis_err2.ERROR, 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)})
-// 		return
-// 	}
-
-// 	fileNum, err := ioutil.ReadDir(tempDir)
-// 	if err != nil {
-// 		c.JSON(oasis_err2.ERROR, model.Result{Success: oasis_err2.ERROR, Message: oasis_err2.GetMsg(oasis_err2.ERROR), Data: err.Error()})
-// 		return
-// 	}
-// 	if totalChunks == len(fileNum) {
-// 		file.RMDir(tempDir)
-// 	}
-
-// 	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS)})
-// }

route/v1/samba.go

@@ -0,0 +1,181 @@
+/*
+ * @Author: LinkLeong link@icewhale.com
+ * @Date: 2022-07-26 11:08:48
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-08-17 18:25:42
+ * @FilePath: /CasaOS/route/v1/samba.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package v1
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/IceWhaleTech/CasaOS/model"
+	"github.com/IceWhaleTech/CasaOS/pkg/samba"
+	"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"
+)
+
+// service
+
+func GetSambaStatus(c *gin.Context) {
+	status := service.MyService.System().IsServiceRunning("smbd")
+
+	if !status {
+		c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.SERVICE_NOT_RUNNING, Message: common_err.GetMsg(common_err.SERVICE_NOT_RUNNING)})
+		return
+	}
+	needInit := true
+	if file.Exists("/etc/samba/smb.conf") {
+		str := file.ReadLine(1, "/etc/samba/smb.conf")
+		if strings.Contains(str, "# Copyright (c) 2021-2022 CasaOS Inc. All rights reserved.") {
+			needInit = false
+		}
+	}
+	data := make(map[string]string, 1)
+	data["need_init"] = fmt.Sprintf("%v", needInit)
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: data})
+}
+
+func GetSambaSharesList(c *gin.Context) {
+	shares := service.MyService.Shares().GetSharesList()
+	shareList := []model.Shares{}
+	for _, v := range shares {
+		shareList = append(shareList, model.Shares{
+			Anonymous: v.Anonymous,
+			Path:      v.Path,
+			ID:        v.ID,
+		})
+	}
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: shareList})
+}
+
+func PostSambaSharesCreate(c *gin.Context) {
+	shares := []model.Shares{}
+	c.ShouldBindJSON(&shares)
+	for _, v := range shares {
+		if v.Path == "" {
+			c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.INSUFFICIENT_PERMISSIONS, Message: common_err.GetMsg(common_err.INSUFFICIENT_PERMISSIONS)})
+			return
+		}
+		if !file.Exists(v.Path) {
+			c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.DIR_NOT_EXISTS, Message: common_err.GetMsg(common_err.DIR_NOT_EXISTS)})
+			return
+		}
+		if len(service.MyService.Shares().GetSharesByPath(v.Path)) > 0 {
+			c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.SHARE_ALREADY_EXISTS, Message: common_err.GetMsg(common_err.SHARE_ALREADY_EXISTS)})
+			return
+		}
+		if len(service.MyService.Shares().GetSharesByPath(filepath.Base(v.Path))) > 0 {
+			c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.SHARE_NAME_ALREADY_EXISTS, Message: common_err.GetMsg(common_err.SHARE_NAME_ALREADY_EXISTS)})
+			return
+		}
+	}
+	for _, v := range shares {
+		shareDBModel := model2.SharesDBModel{}
+		shareDBModel.Anonymous = true
+		shareDBModel.Path = v.Path
+		shareDBModel.Name = filepath.Base(v.Path)
+		os.Chmod(v.Path, 0777)
+		service.MyService.Shares().CreateShare(shareDBModel)
+	}
+
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: shares})
+}
+func DeleteSambaShares(c *gin.Context) {
+	id := c.Param("id")
+	if id == "" {
+		c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.INSUFFICIENT_PERMISSIONS, Message: common_err.GetMsg(common_err.INSUFFICIENT_PERMISSIONS)})
+		return
+	}
+	service.MyService.Shares().DeleteShare(id)
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: id})
+}
+
+//client
+
+func GetSambaConnectionsList(c *gin.Context) {
+	connections := service.MyService.Connections().GetConnectionsList()
+	connectionList := []model.Connections{}
+	for _, v := range connections {
+		connectionList = append(connectionList, model.Connections{
+			ID:         v.ID,
+			Username:   v.Username,
+			Port:       v.Port,
+			Host:       v.Host,
+			MountPoint: v.MountPoint,
+		})
+	}
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: connectionList})
+}
+
+func PostSambaConnectionsCreate(c *gin.Context) {
+	connection := model.Connections{}
+	c.ShouldBindJSON(&connection)
+	if connection.Port == "" {
+		connection.Port = "445"
+	}
+	if connection.Username == "" || connection.Host == "" {
+		c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.INVALID_PARAMS, Message: common_err.GetMsg(common_err.INVALID_PARAMS)})
+		return
+	}
+	connection.Host = strings.Split(connection.Host, "/")[0]
+	// check is exists
+	connections := service.MyService.Connections().GetConnectionByHost(connection.Host)
+	if len(connections) > 0 {
+		c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.Record_ALREADY_EXIST, Message: common_err.GetMsg(common_err.Record_ALREADY_EXIST), Data: common_err.GetMsg(common_err.Record_ALREADY_EXIST)})
+		return
+	}
+	// check connect is ok
+	directories, err := samba.GetSambaSharesList(connection.Host, connection.Port, connection.Username, connection.Password)
+	if err != nil {
+		c.JSON(common_err.SERVICE_ERROR, model.Result{Success: common_err.SERVICE_ERROR, Message: common_err.GetMsg(common_err.SERVICE_ERROR), Data: err.Error()})
+		return
+	}
+
+	connectionDBModel := model2.ConnectionsDBModel{}
+	connectionDBModel.Username = connection.Username
+	connectionDBModel.Password = connection.Password
+	connectionDBModel.Host = connection.Host
+	connectionDBModel.Port = connection.Port
+	connectionDBModel.Directories = strings.Join(directories, ",")
+	baseHostPath := "/mnt/" + connection.Host
+	connectionDBModel.MountPoint = baseHostPath
+	connection.MountPoint = baseHostPath
+	file.IsNotExistMkDir(baseHostPath)
+	for _, v := range directories {
+		mountPoint := baseHostPath + "/" + v
+		file.IsNotExistMkDir(mountPoint)
+		service.MyService.Connections().MountSmaba(connectionDBModel.Username, connectionDBModel.Host, v, connectionDBModel.Port, mountPoint, connectionDBModel.Password)
+	}
+
+	service.MyService.Connections().CreateConnection(&connectionDBModel)
+
+	connection.ID = connectionDBModel.ID
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: connection})
+}
+
+func DeleteSambaConnections(c *gin.Context) {
+	id := c.Param("id")
+	connection := service.MyService.Connections().GetConnectionByID(id)
+	if connection.Username == "" {
+		c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.Record_NOT_EXIST, Message: common_err.GetMsg(common_err.Record_NOT_EXIST)})
+		return
+	}
+	mountPointList := service.MyService.System().GetDirPath(connection.MountPoint)
+	for _, v := range mountPointList {
+		service.MyService.Connections().UnmountSmaba(v.Path)
+	}
+	os.RemoveAll(connection.MountPoint)
+	service.MyService.Connections().DeleteConnection(id)
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: id})
+}

route/v1/samba_test.go

@@ -0,0 +1,73 @@
+/*
+ * @Author: LinkLeong link@icewhale.org
+ * @Date: 2022-08-02 15:10:56
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-08-02 16:58:42
+ * @FilePath: /CasaOS/route/v1/samba_test.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
+package v1
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/gin-gonic/gin"
+	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/assert"
+)
+
+func performRequest(r http.Handler, method, path string) *httptest.ResponseRecorder {
+	req, _ := http.NewRequest(method, path, nil)
+	w := httptest.NewRecorder()
+	r.ServeHTTP(w, req)
+	return w
+}
+
+// func TestHelloWorld(t *testing.T) {
+// 	// Build our expected body
+// 	body := gin.H{
+// 		"hello": "world",
+// 	}
+// 	// Grab our router
+// 	router := "SetupRouter()"
+// 	// Perform a GET request with that handler.
+// 	w := performRequest(router, "GET", "/")
+// 	// Assert we encoded correctly,
+// 	// the request gives a 200
+// 	assert.Equal(t, http.StatusOK, w.Code)
+// 	// Convert the JSON response to a map
+// 	var response map[string]string
+// 	err := json.Unmarshal([]byte(w.Body.String()), &response)
+// 	// Grab the value & whether or not it exists
+// 	value, exists := response["hello"]
+// 	// Make some assertions on the correctness of the response.
+// 	assert.Nil(t, err)
+// 	assert.True(t, exists)
+// 	assert.Equal(t, body["hello"], value)
+// }
+
+func TestGetSambaSharesList(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+	executeWithContext := func() *httptest.ResponseRecorder {
+		response := httptest.NewRecorder()
+		con, ginEngine := gin.CreateTestContext(response)
+
+		requestUrl := "/v1/samba/shares"
+		httpRequest, _ := http.NewRequest("GET", requestUrl, nil)
+		GetSambaSharesList(con)
+		ginEngine.ServeHTTP(response, httpRequest)
+		return response
+	}
+
+	t.Run("Happy", func(t *testing.T) {
+		res := executeWithContext()
+		assert.Equal(t, http.StatusOK, res.Code)
+	})
+
+}