New App Store

Add App Store for installation
Fix favicon display in dark mode

.github/workflows/casa.yml

@@ -0,0 +1,148 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Build CasaOS
+
+on:
+  repository_dispatch:
+  workflow_dispatch:
+    inputs:
+      ssh:
+        description: 'SSH connection to Actions'
+        required: false
+        default: 'false'
+
+#on:
+#  push:
+#    branches:
+#      - 'main'
+#    tags:
+#      - 'v*'
+env:
+  REPO_URL: https://github.com/IceWhaleTech/CasaOS.git
+  REPO_BRANCH: main
+  PACK_SH_URL: https://raw.githubusercontent.com/jerrykuku/actions-casa/main/pack.sh
+  PACK_SH: pack.sh
+  TZ: Asia/Shanghai
+
+jobs:
+  xgo:
+    strategy:
+      fail-fast: false
+      matrix:
+        go_version:
+          - 1.17.1
+    runs-on: ubuntu-latest
+    steps:
+
+      #      - name: Get release
+      #        id: get_release
+      #        uses: bruceadams/get-release@v1.2.3
+      #        env:
+      #          GITHUB_TOKEN: ${{ github.token }}
+
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: true
+#      - name: Initialization environment
+#        env:
+#          DEBIAN_FRONTEND: noninteractive
+#        run: |
+#          sudo timedatectl set-timezone "$TZ"
+#          sudo mkdir -p /workdir
+#          sudo chown $USER:$GROUPS /workdir
+
+
+
+
+
+      #      - name: Clone source code
+      #        working-directory: /workdir
+      #        run: |
+      #          df -hT $PWD
+      #          git clone $REPO_URL -b $REPO_BRANCH --recursive casa
+      #          ln -sf /workdir/casa $GITHUB_WORKSPACE/casa
+      #          ls
+
+
+      - name: Set enviroment for github-release
+        run: |
+          echo "VERSION=$(cat types/system.go | grep CURRENTVERSION | awk '$2 == "CURRENTVERSION"{print $4}' | sed 's/"//g')" >>$GITHUB_ENV
+          echo "BODY=$(cat types/system.go | grep BODY | awk -F= '{print $2}' | sed 's/"//g')" >>$GITHUB_ENV
+
+
+
+      - name: Use Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+
+      - name: Build frontend with nodejs and yarn
+        run: |
+          cd UI
+          ls
+          yarn install
+          yarn build
+
+      - name: list work
+        run: pwd
+
+      - name: Build with xgo
+        uses: crazy-max/ghaction-xgo@v1
+        with:
+          xgo_version: latest
+          go_version: ${{ matrix.go_version }}
+          dest: build
+          prefix: casa
+          targets: linux/amd64,linux/arm64,linux/arm-7
+          v: true
+          x: false
+          race: false
+          ldflags: -s -w
+          buildmode: default
+#
+#      - name: List Files
+#        run: |
+#          ls
+#          mkdir build
+#          ls
+#          echo "::set-output name=status::success"
+
+      - name: Pack builds
+        run: |
+          wget $PACK_SH_URL
+          chmod +x $PACK_SH
+          ./$PACK_SH
+          echo "::set-output name=status::success"
+      - name: list work
+        run: ls
+
+
+      - name: Update release
+        uses: meeDamian/github-release@2.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          files: >
+            linux-amd64-casaos.tar.gz
+            linux-arm64-casaos.tar.gz
+            linux-arm-7-casaos.tar.gz
+          tag: v${{ env.VERSION }}
+          body: >
+            ${{ env.BODY }}
+          name: v${{ env.VERSION }}
+          gzip: false
+          allow_override: false
+          prerelease: true
+#      - name: Upload linux-amd64-casaos.tar.gz
+#        id: upload_assets_amd64
+#        uses: shogo82148/actions-upload-release-asset@v1
+#        with:
+#          upload_url: ${{ steps.get_release.outputs.upload_url }}
+#          asset_path: /workdir/casa/upload/linux-amd64-casaos.tar.gz
+#
+#      - name: Upload linux-arm64-casaos.tar.gz
+#        id: upload_assets_arm64
+#        uses: shogo82148/actions-upload-release-asset@v1
+#        with:
+#          upload_url: ${{ steps.get_release.outputs.upload_url }}
+#          asset_path: /workdir/casa/upload/linux-arm64-casaos.tar.gz

.gitignore

@@ -20,6 +20,7 @@
 
 # IntelliJ project files
 .idea
+.vscode
 *.iml
 out
 gen
@@ -27,3 +28,8 @@ gen
 /sql/
 /out/
 /db/
+/docs/
+/conf/conf.ini
+__debug_bin
+main
+CasaOS

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "UI"]
 	path = UI
-	url = https://github.com/ZimaBoard/CasaOS-UI.git
+	url = https://github.com/IceWhaleTech/CasaOS-UI.git
+	branch = main

Makefile

@@ -4,10 +4,10 @@ build: build-ui build-backend
 
 
 build-ui:
-	cd UI && yarn install && yarn build
+	cd CasaOS-UI && yarn install && yarn build
 
 build-backend:
-	export CGO_ENABLED=1;export CGO_LDFLAGS=-static;go mod tidy;go build -o ./casa main.go;upx --lzma --best casa
+	export CGO_ENABLED=1;export CGO_LDFLAGS=-static;go build -o ./casa main.go;upx --lzma --best casa
 
 help:
 	@echo "call john"

README-ZH.md

@@ -1,7 +0,0 @@
-## 目录结构
-
-- conf  配置文件
-- route 路由
-- service 方法的具体实现
-- utils 工具
-- main.go 入口

README.md

@@ -1,2 +1,86 @@
-# Oasis
+# CasaOS - A simple, easy-to-use, elegant open-source home server system.
 
+![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/Gx4BCEtHjx)
+
+CasaOS is an open-source home server system based on the Docker ecosystem and designed for home scenarios. It is committed to building the world's most simple, easy-to-use, and elegant home server system.
+
+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.
+
+
+## Key Features
+
+ - UI designed for home scenarios - simple, elegant, and easy-to-use
+ - Quick Docker app installation with only three steps, plus automatic management
+ - App Store for private cloud 🚧
+ - 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.
+
+After looking at many systems and software on the market, the team found no server system designed for home scenarios, sadly true.
+
+So, we set out to build this open source project to develop CasaOS with our own hands, everyone in the community, and you.
+
+> A warm welcome for you to share and discuss your great ideas in the [Discord server](https://discord.gg/Gx4BCEtHjx)!
+
+[![Discord Card](https://discordapp.com/api/guilds/884667213326463016/widget.png?style=banner2)](https://discord.gg/Gx4BCEtHjx)
+
+
+## Getting Started
+
+> ⚠️ Note: 
+> 
+> CasaOS is still in the early development stage and may vary significantly with the final release. Feel free to test run and share your feedback in the [Discord server](https://discord.gg/Gx4BCEtHjx)!
+
+### System Compatibility
+
+ - Ubuntu Server 20.04 amd64 (✅ Recommend, Tested)
+ - Debian 11 amd64 (⚠️ Not Fully Tested Yet)
+ - OpenWrt 21.02 amd64 (⚠️ Not Fully Tested Yet)
+ - Raspberry Pi OS aarch64/arm64 (🚧 Under Planning)
+ - OpenWrt 21.02 aarch64/arm64 (🚧 Under Planning)
+
+### Quick Setup CasaOS
+
+Fresh install a system from the above list and run the below command:
+
+```sh
+curl -fsSL https://get.icewhale.io/casaos.sh | bash
+```
+
+
+## To Do
+
+**v 0.1.x**
+
+ - [x] An elegant UI for home scenarios
+ - [x] Custom installation of Docker Apps
+ - [x] Update, stop, uninstall, restart, etc. of Docker apps
+ - [x] Docker CLI parser
+ - [x] System Update
+ - [ ] Getting Started tutorial
+ - [ ] Docker Compose parser
+ - [ ] App config file import and export
+ - [ ] macvlan network mode
+
+
+## Maintainers
+ - Jerry Liu
+ - Link Liang
+ - Ober Zhang
+ - Zyaire Ann
+ - John Guan
+ - Right here, waiting for YOU!

UI/.browserslistrc

@@ -1,3 +0,0 @@
-> 1%
-last 2 versions
-not dead

UI/.env.dev

@@ -1,2 +0,0 @@
-// .env.dev
-NODE_ENV='dev' 

UI/.env.production

@@ -1,2 +0,0 @@
-// .env.production
-NODE_ENV='prod'  

UI/.eslintrc.js

@@ -1,18 +0,0 @@
-module.exports = {
-  root: true,
-  env: {
-    node: true
-  },
-  'extends': [
-    'plugin:vue/essential',
-    'eslint:recommended'
-  ],
-  parserOptions: {
-    parser: 'babel-eslint'
-  },
-  rules: {
-    'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
-    'vue/no-unused-vars':'off'
-  }
-}

UI/.gitignore

@@ -1,23 +0,0 @@
-.DS_Store
-node_modules
-/dist
-
-
-# local env files
-.env.local
-.env.*.local
-
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?

UI/README.md

@@ -1,32 +0,0 @@
-<!--
- * @Author: JerryK
- * @Date: 2021-09-22 14:24:43
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-22 14:44:31
- * @Description: 
- * @FilePath: /CasaOS-UI/README.md
--->
-# CasaOS-UI
-
-The front-end of CasaOs,build with VueJS
-
-## Project setup
-```
-yarn install
-```
-
-### Compiles and hot-reloads for development
-```
-yarn serve
-```
-
-### Compiles and minifies for production
-```
-yarn build
-```
-Will be output to the ../web folder
-
-### Lints and fixes files
-```
-yarn lint
-```

UI/babel.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-  presets: [
-    '@vue/cli-plugin-babel/preset'
-  ]
-}

UI/package.json

@@ -1,43 +0,0 @@
-{
-  "name": "CasaOS",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "serve": "vue-cli-service serve --mode dev",
-    "build": "vue-cli-service build --no-clean --dest ../web --mode production",
-    "lint": "vue-cli-service lint"
-  },
-  "dependencies": {
-    "axios": "^0.21.4",
-    "buefy": "^0.9.0",
-    "core-js": "^3.6.5",
-    "easy-affix": "^1.0.8",
-    "lodash.debounce": "^4.0.8",
-    "lottie-vuejs": "^0.4.0",
-    "moment": "^2.29.1",
-    "nth-check": "^2.0.1",
-    "qs": "^6.10.1",
-    "vee-validate": "^3.4.12",
-    "vue": "^2.6.11",
-    "vue-router": "^3.2.0",
-    "vue-slider-component": "^3.2.14",
-    "vuex": "^3.4.0",
-    "vuex-persistedstate": "^4.0.0",
-    "yargs-parser": "^20.2.9"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-eslint": "~4.5.0",
-    "@vue/cli-plugin-router": "~4.5.0",
-    "@vue/cli-plugin-vuex": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
-    "babel-eslint": "^10.1.0",
-    "compression-webpack-plugin": "^9.0.0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-vue": "^6.2.2",
-    "node-sass": "^4.9.0",
-    "sass-loader": "^7.0.1",
-    "vue-cli-plugin-buefy": "~0.3.8",
-    "vue-template-compiler": "^2.6.11"
-  }
-}

UI/public/browserconfig.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-    <msapplication>
-        <tile>
-            <square150x150logo src="/ui/img/icon/mstile-150x150.png"/>
-            <TileColor>#da532c</TileColor>
-        </tile>
-    </msapplication>
-</browserconfig>

UI/public/index.html

@@ -1,42 +0,0 @@
-<!--
- * @Author: JerryK
- * @Date: 2021-09-22 14:24:43
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-24 18:03:02
- * @Description: 
- * @FilePath: /CasaOS-UI/public/index.html
--->
-
-<!DOCTYPE html>
-<html lang="">
-
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <link rel="apple-touch-icon" sizes="180x180" href="<%= BASE_URL %>img/icon/apple-touch-icon.png">
-  <link rel="icon" type="image/png" sizes="32x32" href="<%= BASE_URL %>img/icon/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="<%= BASE_URL %>img/icon/favicon-16x16.png">
-  <link rel="manifest" href="<%= BASE_URL %>site.webmanifest">
-  <link rel="mask-icon" href="<%= BASE_URL %>img/icon/safari-pinned-tab.svg" color="#5bbad5">
-  <meta name="msapplication-TileColor" content="#da532c">
-  <meta name="theme-color" content="#ffffff">
-  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-  <link rel="stylesheet" href="//cdn.materialdesignicons.com/2.0.46/css/materialdesignicons.min.css">
-  <script src="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/js/all.js"
-    integrity="sha256-GaerX2a/DuOnPrxn/4vH13dobiFUe/27LO6gCZDNauA=" crossorigin="anonymous"></script>
-  <title>
-    <%= htmlWebpackPlugin.options.title %>
-  </title>
-</head>
-
-<body>
-  <noscript>
-    <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
-        Please enable it to continue.</strong>
-  </noscript>
-  <div id="app"></div>
-  <!-- built files will be auto injected -->
-</body>
-
-</html>

UI/public/site.webmanifest

@@ -1,14 +0,0 @@
-{
-    "name": "",
-    "short_name": "",
-    "icons": [
-        {
-            "src": "/ui/img/icon/android-chrome-192x192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        }
-    ],
-    "theme_color": "#ffffff",
-    "background_color": "#ffffff",
-    "display": "standalone"
-}

UI/src/App.vue

@@ -1,110 +0,0 @@
-<!--
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-23 16:42:14
- * @Description: Main entry of application
- * @FilePath: /CasaOS-UI/src/App.vue
--->
-
-<template>
-  <!-- <div id="app" class="is-flex is-flex-direction-column" :style="{'background-image': 'url(' + require('./assets/background/AbstractShapes.jpg') + ')'}"> -->
-  <div id="app" class="is-flex is-flex-direction-column" :style="{'background-image': 'url(https://www.bing.com/th?id=OHR.Aldeyjarfoss_ZH-CN0106567013_1920x1080.jpg&rf=LaDigue_1920x1080.jpg&pid=hp)'}">
-    <!-- NavBar Start -->
-    <top-bar></top-bar>
-    <!-- NavBar End -->
-
-    <!-- Content Start -->
-    <div class="contents  pt-55 pb-6">
-      <div class="container">
-        <div class="is-flex">
-          <!-- SideBar Start -->
-          <side-bar></side-bar>
-          <!-- SideBar End -->
-
-          <!-- MainContent Start -->
-          <div class="main-content">
-            <!-- SearchBar Start -->
-            <section>
-              <search-bar></search-bar>
-            </section>
-            <!-- SearchBar End -->
-
-            <!-- Suggestions For You Start -->
-            <section>
-              <suggestion></suggestion>
-            </section>
-            <!-- Suggestions For You End -->
-
-            <!-- Apps Start -->
-            <section>
-              <apps></apps>
-            </section>
-            <!-- Apps End -->
-
-            <!-- Shortcuts Start -->
-            <!-- <section>
-              <shortcuts></shortcuts>
-            </section> -->
-            <!-- Shortcuts End -->
-          </div>
-          <!-- MainContent End -->
-        </div>
-      </div>
-    </div>
-    <!-- Content End -->
-
-    <!-- BrandBar Start -->
-    <brand-bar></brand-bar>
-    <!-- BrandBar End -->
-
-    <!-- ContactBar Start -->
-    <contact-bar></contact-bar>
-    <!-- ContactBar End -->
-  </div>
-</template>
-
-<script>
-import Apps from './components/Apps.vue'
-import BrandBar from './components/BrandBar.vue'
-import ContactBar from './components/ContactBar.vue'
-import SearchBar from './components/SearchBar.vue'
-import SideBar from './components/SideBar.vue'
-import Suggestion from './components/Suggestion.vue'
-import TopBar from './components/TopBar.vue'
-//import Shortcuts from './components/Shortcuts.vue'
-export default {
-  components: {
-    BrandBar,
-    ContactBar,
-    SideBar,
-    SearchBar,
-    Suggestion,
-    Apps,
-    TopBar,
-    //Shortcuts
-  },
-  created() {
-    // Check if not login then login and get token
-    if (!localStorage.getItem("user_token")) {
-      this.login()
-    }
-  },
-  methods: {
-    login() {
-      /**
-       * @description: Login
-       * @return void
-       */
-      // this.$api.user.login({
-      //   username: "admin",
-      //   pwd: "admin"
-      // }).then((res) => {
-      //   if (res.data.success == 200) {
-      //     localStorage.setItem("user_token", res.data.data)
-      //   }
-      // })
-    }
-  },
-}
-</script>

UI/src/assets/img/casa.svg

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;stroke:#FFFFFF;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:2;}
-</style>
-<path class="st0" d="M12,22c5.5,0,10-4.5,10-10S17.5,2,12,2S2,6.5,2,12S6.5,22,12,22z"/>
-<path class="st0" d="M12,22c3.9,0,7-3.1,7-7s-3.1-7-7-7s-7,3.1-7,7S8.1,22,12,22z"/>
-<path class="st0" d="M12,22c2.2,0,4-1.8,4-4s-1.8-4-4-4s-4,1.8-4,4S9.8,22,12,22z"/>
-</svg>

UI/src/assets/img/wuji.svg

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg width="24" height="24" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"><rect width="48" height="48" fill="white" fill-opacity="0.01"/><path d="M24 44C35.0457 44 44 35.0457 44 24C44 12.9543 35.0457 4 24 4C12.9543 4 4 12.9543 4 24C4 35.0457 12.9543 44 24 44Z" stroke="#333" stroke-width="4" stroke-linejoin="round"/><path d="M24 44C31.732 44 38 37.732 38 30C38 22.268 31.732 16 24 16C16.268 16 10 22.268 10 30C10 37.732 16.268 44 24 44Z" stroke="#333" stroke-width="4" stroke-linejoin="round"/><path d="M24 44C28.4183 44 32 40.4183 32 36C32 31.5817 28.4183 28 24 28C19.5817 28 16 31.5817 16 36C16 40.4183 19.5817 44 24 44Z" fill="none" stroke="#333" stroke-width="4" stroke-linejoin="round"/></svg>

UI/src/assets/scss/_variables.scss

@@ -1,152 +0,0 @@
-// Included below are all the defined variables from Bulma
-// Modify as needed, removing the !default attribute.
-
-// Colors
-
-$black:        hsl(0, 0%, 4%) !default;
-$black-bis:    hsl(0, 0%, 7%) !default;
-$black-ter:    hsl(0, 0%, 14%) !default;
-
-$grey-darker:  hsl(0, 0%, 21%) !default;
-$grey-dark:    hsl(0, 0%, 29%) !default;
-$grey:         hsl(0, 0%, 48%) !default;
-$grey-light:   hsl(0, 0%, 71%) !default;
-$grey-lighter: hsl(0, 0%, 86%) !default;
-
-$white-ter:    hsl(0, 0%, 96%) !default;
-$white-bis:    hsl(0, 0%, 98%) !default;
-$white:        hsl(0, 0%, 100%) !default;
-
-$orange:       hsl(14,  100%, 53%) !default;
-$yellow:       hsl(48,  100%, 67%) !default;
-$green:        hsl(141, 71%,  48%) !default;
-$turquoise:    hsl(171, 100%, 41%) !default;
-$cyan:         hsl(204, 86%,  53%) !default;
-$blue:         hsl(217, 71%,  53%) !default;
-$purple:       hsl(271, 100%, 71%) !default;
-$red:          hsl(348, 100%, 61%) !default;
-
-// Typography
-
-$family-sans-serif: BlinkMacSystemFont, -apple-system, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif !default;
-$family-monospace: monospace !default;
-$render-mode: optimizeLegibility !default;
-
-$size-1: 3rem !default;
-$size-2: 2.5rem !default;
-$size-3: 2rem !default;
-$size-4: 1.5rem !default;
-$size-5: 1.25rem !default;
-$size-6: 1rem !default;
-$size-7: 0.75rem !default;
-
-$weight-light: 300 !default;
-$weight-normal: 400 !default;
-$weight-medium: 500 !default;
-$weight-semibold: 600 !default;
-$weight-bold: 700 !default;
-
-// Responsiveness
-
-// The container horizontal gap, which acts as the offset for breakpoints
-$gap: 32px !default;
-// 960, 1152, and 1344 have been chosen because they are divisible by both 12 and 16
-$tablet: 769px !default;
-// 960px container + 4rem
-$desktop: 960px + (2 * $gap) !default;
-// 1152px container + 4rem
-$widescreen: 1152px + (2 * $gap) !default;
-// 1344px container + 4rem;
-$fullhd: 1344px + (2 * $gap) !default;
-
-// Miscellaneous
-
-$easing: ease-out !default;
-$radius-small: 2px !default;
-$radius: 3px !default;
-$radius-large: 5px !default;
-$radius-rounded: 290486px !default;
-$speed: 86ms !default;
-
-// Flags
-
-$variable-columns: true !default;
-
-
-// The default Bulma derived variables are declared below
-
-$primary: $turquoise !default;
-
-$info: $cyan !default;
-$success: $green !default;
-$warning: $yellow !default;
-$danger: $red !default;
-
-$light: $white-ter !default;
-$dark: $grey-darker !default;
-
-// Invert colors
-
-$orange-invert: findColorInvert($orange) !default;
-$yellow-invert: findColorInvert($yellow) !default;
-$green-invert: findColorInvert($green) !default;
-$turquoise-invert: findColorInvert($turquoise) !default;
-$cyan-invert: findColorInvert($cyan) !default;
-$blue-invert: findColorInvert($blue) !default;
-$purple-invert: findColorInvert($purple) !default;
-$red-invert: findColorInvert($red) !default;
-
-$primary-invert: $turquoise-invert !default;
-$info-invert: $cyan-invert !default;
-$success-invert: $green-invert !default;
-$warning-invert: $yellow-invert !default;
-$danger-invert: $red-invert !default;
-$light-invert: $dark !default;
-$dark-invert: $light !default;
-
-// General colors
-
-$background: $white-ter !default;
-
-$border: $grey-lighter !default;
-$border-hover: $grey-light !default;
-
-// Text colors
-
-$text: $grey-dark !default;
-$text-invert: findColorInvert($text) !default;
-$text-light: $grey !default;
-$text-strong: $grey-darker !default;
-
-// Code colors
-
-$code: $red !default;
-$code-background: $background !default;
-
-$pre: $text !default;
-$pre-background: $background !default;
-
-// Link colors
-
-$link: $blue !default;
-$link-invert: $blue-invert !default;
-$link-visited: $purple !default;
-
-$link-hover: $grey-darker !default;
-$link-hover-border: $grey-light !default;
-
-$link-focus: $grey-darker !default;
-$link-focus-border: $blue !default;
-
-$link-active: $grey-darker !default;
-$link-active-border: $grey-dark !default;
-
-// Typography
-
-$family-primary: $family-sans-serif !default;
-$family-code: $family-monospace !default;
-
-$size-small: $size-7 !default;
-$size-normal: $size-6 !default;
-$size-medium: $size-5 !default;
-$size-large: $size-4 !default;

UI/src/assets/scss/app.scss

@@ -1,429 +0,0 @@
-@import "~bulma/sass/utilities/initial-variables";
-@import "~bulma/sass/utilities/functions";
-// 1. Set your own initial variables and derived
-//    variables in _variables.scss
-@import "variables";
-@import url("https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;1,100;1,300;1,400;1,500;1,700&display=swap");
-
-// 2. Setup your Custom Colors
-$linkedin: #0077b5;
-$linkedin-invert: findColorInvert($linkedin);
-$twitter: #55acee;
-$twitter-invert: findColorInvert($twitter);
-$github: #333;
-$github-invert: findColorInvert($github);
-
-@import "~bulma/sass/utilities/derived-variables";
-
-// 3. Add new color variables to the color map.
-$addColors: (
-  "twitter": (
-    $twitter,
-    $twitter-invert,
-  ),
-  "linkedin": (
-    $linkedin,
-    $linkedin-invert,
-  ),
-  "github": (
-    $github,
-    $github-invert,
-  ),
-);
-$colors: map-merge($colors, $addColors);
-
-@import "~bulma";
-@import "~buefy/src/scss/buefy";
-
-$backDropColor: rgba(123, 123, 123, 0.16);
-$backDropBlur: blur(1rem);
-$backDropBorderRadius: 0.5rem;
-
-// 4. Provide custom buefy overrides and site styles here
-body,
-html {
-  overflow: hidden;
-  font-family: "Roboto", sans-serif;
-}
-
-#app {
-  width: 100vw;
-  height: 100vh;
-  font-family: Avenir, Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-align: center;
-  color: #2c3e50;
-  background-size: cover;
-  background-repeat: no-repeat;
-  background-position: center center;
-}
-
-.top-bar {
-  position: relative;
-  z-index: 10;
-
-  height: 3rem;
-  background: rgba(255, 255, 255, 0.22);
-  backdrop-filter: blur(180.282px);
-  .navbar-brand {
-    .dropdown-menu {
-      margin-top: 0.5rem;
-      min-width: 20rem;
-      .dropdown-content {
-        .dropdown-item {
-          padding: 1.25rem;
-          text-align: left;
-          .item {
-            height: 2rem;
-          }
-        }
-      }
-    }
-  }
-  .field {
-    line-height: 1rem;
-  }
-  .switch {
-    &.is-flex-direction-row-reverse {
-      .control-label {
-        padding-left: 0;
-        padding-right: calc(0.75em - 1px);
-      }
-    }
-  }
-  .update-container {
-    .button.is-rounded {
-      border-radius: 9999px !important;
-      padding-left: calc(1em + 0.25em);
-      padding-right: calc(1em + 0.25em);
-    }
-  }
-  .button{
-    &.is-small{
-      height: 2em;
-    }
-  }
-}
-
-.brand-bar {
-  position: fixed;
-  left: 2rem;
-  bottom: 2rem;
-}
-
-.contact-bar {
-  position: fixed;
-  right: 2rem;
-  bottom: 2rem;
-  height: 3.5rem;
-  background: rgba(0, 0, 0, 0.16);
-  backdrop-filter: blur(24px);
-  border-radius: 4px;
-  font-size: 1.5rem;
-  a {
-    color: $white;
-    margin: 0.5rem;
-    display: flex;
-    align-items: center;
-    &:hover {
-      color: #0077b5;
-    }
-  }
-}
-
-.contents {
-  flex: 1;
-  overflow: auto;
-}
-
-.side-bar {
-  width: 16rem;
-  position: fixed;
-}
-
-.main-content {
-  flex: 1;
-  margin-left: 17.5rem;
-}
-
-.pt-7 {
-  padding-top: 4rem;
-}
-
-.pt-55 {
-  padding-top: 2rem;
-}
-.p-55 {
-  padding: 2rem !important;
-}
-.button.is-light {
-  background-color: #a6afb9;
-  color: white;
-}
-.label {
-  font-size: 0.875rem;
-  margin-bottom: 0.5rem;
-}
-
-.button,
-.input,
-.textarea,
-.taginput .taginput-container.is-focusable,
-.select select,
-.file-cta,
-.file-name,
-.pagination-previous,
-.pagination-next,
-.pagination-link,
-.pagination-ellipsis {
-  &:focus {
-    box-shadow: none;
-  }
-}
-.image.is-72x72 {
-  height: 72px;
-  width: 72px;
-}
-
-// widgets
-.widget {
-  background: $backDropColor;
-  backdrop-filter: $backDropBlur;
-  border-radius: $backDropBorderRadius;
-  padding: 0.875rem 1.5rem;
-  margin-bottom: 0.75rem;
-}
-
-// Cards
-.wuji-card {
-  background: $backDropColor;
-  backdrop-filter: $backDropBlur;
-  border-radius: $backDropBorderRadius;
-  padding: 1.5rem;
-  color: $white;
-  position: relative;
-
-  .info {
-    flex: 1;
-    margin-right: 1rem;
-    color: white;
-  }
-
-  .simg {
-    img {
-      border-radius: 4px;
-    }
-  }
-  .icon-img {
-    position: relative;
-    &.stop::after {
-      position: absolute;
-      content: "";
-      width: 0.75rem;
-      height: 0.75rem;
-      background-color: #ff1616;
-      border-radius: 50%;
-      right: -0.375rem;
-      top: -0.375rem;
-    }
-    img {
-      border-radius: 8px;
-      margin: 0 auto;
-    }
-  }
-  .b-image-wrapper {
-    position: relative;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    &.stop::after {
-      position: absolute;
-      content: "";
-      width: 0.75rem;
-      height: 0.75rem;
-      background-color: #ff1616;
-      border-radius: 50%;
-      right: -0.375rem;
-      top: -0.375rem;
-    }
-    img {
-      border-radius: 8px;
-      margin: 0 auto;
-    }
-  }
-  .action-btn {
-    position: absolute;
-    right: 0.5rem;
-    top: 1rem;
-    visibility: hidden;
-    opacity: 0;
-    transition: all 0.2s;
-  }
-  p {
-    font-weight: 500;
-  }
-  .one-line {
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 1;
-    overflow: hidden;
-  }
-  .two-line {
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    overflow: hidden;
-  }
-  &:hover {
-    .action-btn {
-      visibility: visible;
-      opacity: 1;
-    }
-  }
-  a {
-    color: white;
-    p {
-      color: white;
-    }
-  }
-}
-.flex1 {
-  flex: 1;
-}
-.title-bar {
-  margin-bottom: 1.5rem;
-  .title {
-    flex: 1;
-    margin-bottom: 0;
-  }
-}
-.ii {
-  .dropdown-menu {
-    background: rgba(255, 255, 255, 0.88);
-    backdrop-filter: $backDropBlur;
-    border-radius: $backDropBorderRadius;
-    overflow: hidden;
-    padding-top: 0;
-
-    .dropdown-content {
-      background: none;
-      padding: 0;
-      .button {
-        border-radius: 0;
-        padding-left: 1.5rem;
-        padding-right: 1.5rem;
-        &.is-text {
-          text-decoration: none;
-          justify-content: flex-start;
-          outline: none;
-          transition: all 0.2s;
-          border: none !important;
-          &.running {
-            color: #779e2a !important;
-          }
-          &.exited {
-            color: #ff1616 !important;
-          }
-        }
-        &:active {
-          background: none;
-          outline: none;
-        }
-        &:focus {
-          background: none;
-          box-shadow: none;
-          outline: none;
-        }
-      }
-      .bbor {
-        overflow: hidden;
-        border-top: #2c3e50 1px solid;
-        .is-text {
-          text-decoration: none;
-          justify-content: center !important ;
-        }
-        .column:first-child {
-          border-right: #2c3e50 1px solid;
-        }
-      }
-    }
-  }
-}
-//Panel
-.modal-background {
-  background: rgba(0, 0, 0, 0.8);
-}
-.modal-card {
-  background: rgba(255, 255, 255, 0.88);
-  backdrop-filter: $backDropBlur;
-  border-radius: $backDropBorderRadius;
-  .modal-card-head,
-  .modal-card-body,
-  .modal-card-foot {
-    background-color: transparent;
-    border: none;
-  }
-  .modal-card-head {
-    padding: 3rem;
-  }
-  .modal-card-body {
-    padding: 0 3rem;
-    .button.is-static,
-    .input,
-    .textarea,
-    .taginput .taginput-container.is-focusable,
-    .select select,
-    .file-cta,
-    .file-name,
-    .pagination-previous,
-    .pagination-next,
-    .pagination-link,
-    .pagination-ellipsis {
-      font-size: 0.875rem;
-      height: 2.714em;
-      border: 1px solid #cfcfcf !important;
-      border-radius: 4px;
-      &:focus {
-        box-shadow: none;
-      }
-    }
-    .media {
-      padding: 0rem;
-    }
-    .field:last-child {
-      margin-bottom: 0.5rem;
-    }
-    .field-body {
-      .field:last-child {
-        margin-bottom: 0rem;
-      }
-    }
-
-    .port-item:not(:last-child) {
-      .field {
-        margin-bottom: 0;
-      }
-    }
-  }
-  .modal-card-foot {
-    padding: 1rem 3rem 2rem 3rem;
-    .button {
-      border-radius: 9999px;
-      padding-left: calc(1em + 0.25em);
-      padding-right: calc(1em + 0.25em);
-    }
-  }
-}
-
-.import-area .textarea {
-  max-height: 40em;
-  min-height: 16em;
-}
-
-.app-card {
-  .loading-background {
-    background: none !important;
-    border-radius: $backDropBorderRadius;
-  }
-}

UI/src/assets/widgets/Clock.vue

@@ -1,53 +0,0 @@
-<template>
-  <div class="widget has-text-white clock">
-    <div class="time">{{timeText}}</div>
-    <div class="data">{{dateText}}</div>
-  </div>
-</template>
-
-<script>
-import moment from 'moment'
-export default {
-  data() {
-    return {
-      timer: 0,
-      timeText:"",
-      dateText:""
-    }
-  },
-  mounted() {
-    if (this.timer) {
-      clearInterval(this.timer)
-    }
-    this.updateClock()
-    this.timer = setInterval(() => {
-      this.updateClock()
-    }, 1000)
-  },
-  methods: {
-    updateClock() {
-        
-        this.timeText = moment().format('LT');
-        this.dateText = moment().format('dddd, MMMM Do')
-    }
-  },
-}
-</script>
-
-<style lang="scss">
-.clock {
-  font-family: Roboto;
-  font-style: normal;
-  font-weight: 300;
-  text-align: left;
-  .time {
-    font-size: 2.75rem;
-    line-height: 4.25rem;
-    opacity: 0.9;
-  }
-  .data {
-    line-height: 1.5rem;
-    opacity: 0.9;
-  }
-}
-</style>

UI/src/assets/widgets/Weather.vue

@@ -1,16 +0,0 @@
-<template>
-  <div class="widget has-text-white clock">
-    <div class="time">09:40</div>
-    <div class="data">Wednesday，September 15</div>
-  </div>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style>
-
-</style>

UI/src/components/Apps.vue

@@ -1,128 +0,0 @@
-<!--
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-18 23:01:19
- * @Description: App module
- * @FilePath: \CasaOS-UI\src\components\Apps.vue
--->
-
-<template>
-  <div class="has-text-left mt-6">
-    <!-- Title Bar Start -->
-    <div class="title-bar is-flex is-align-items-center">
-      <h1 class="title is-4  has-text-white is-flex-shrink-1">Apps</h1>
-      <div class="buttons ">
-        <b-button icon-left="plus" type="is-dark" size="is-small" rounded @click="showInstall">New App</b-button>
-      </div>
-    </div>
-    <!-- Title Bar End -->
-
-    <!-- App List Start -->
-    <div class="columns is-variable is-2 is-multiline ">
-      <div class="column is-narrow is-3" v-for="(item,index) in appList" :key="'app-'+index">
-        <app-card :item="item" @updateState="getList" @configApp="showConfigPanel"></app-card>
-      </div>
-    </div>
-    <!-- Title Bar End -->
-  </div>
-</template>
-
-<script>
-import AppCard from './Apps/AppCard.vue'
-import Panel from './Panel.vue'
-export default {
-  data() {
-    return {
-      appList: [],
-      appConfig: {}
-    }
-  },
-  components: {
-    AppCard,
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-
-    /**
-     * @description: Fetch the list of installed apps
-     * @return {*} void
-     */
-    getList() {
-      this.$api.app.myAppList().then(res => {
-        this.appList = res.data.data;
-      })
-    },
-
-    /**
-     * @description: Show Install Panel Programmatic
-     * @return {*} void
-     */
-    showInstall() {
-      this.$api.app.appConfig().then(res => {
-        if (res.data.success == 200) {
-          this.$buefy.modal.open({
-            parent: this,
-            component: Panel,
-            hasModalCard: true,
-            customClass: '',
-            trapFocus: true,
-            canCancel: ['escape'],
-            scroll: "keep",
-            animation: "zoom-out",
-            events: {
-              'updateState': () => {
-                this.getList()
-              }
-            },
-            props: {
-              id: "0",
-              state: "install",
-              configData: res.data.data
-            }
-          })
-        }
-      })
-    },
-
-    /**
-     * @description: Show Settings Panel Programmatic
-     * @return {*} void
-     */
-    showConfigPanel(id) {
-      this.$api.app.getContainerSettingdata(id).then(ret => {
-        this.$api.app.appConfig().then(res => {
-          if (res.data.success == 200) {
-            this.$buefy.modal.open({
-              parent: this,
-              component: Panel,
-              hasModalCard: true,
-              customClass: '',
-              trapFocus: true,
-              canCancel: ['escape'],
-              scroll: "keep",
-              animation: "zoom-out",
-              events: {
-                'updateState': () => {
-                  this.getList()
-                }
-              },
-              props: {
-                id: id,
-                state: "update",
-                configData: res.data.data,
-                initDatas: ret.data.data
-              }
-            })
-          }
-        })
-      })
-    }
-  }
-}
-</script>
-
-<style>
-</style>

UI/src/components/Apps/AppCard.vue

@@ -1,202 +0,0 @@
-<!--
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-18 23:12:57
- * @Description: App Card item
- * @FilePath: \CasaOS-UI\src\components\Apps\AppCard.vue
--->
-
-<template>
-  <div class="wuji-card is-flex is-align-items-center is-justify-content-center p-55 app-card" @mouseover="hover = true" @mouseleave="hover = false">
-    <!-- Action Button Start -->
-    <div class="action-btn">
-      <b-dropdown aria-role="list" position="is-bottom-left" class="ii" ref="dro" @active-change="setDropState">
-        <template #trigger>
-          <p role="button">
-            <b-icon pack="fas" icon="ellipsis-v" size="is-small">
-            </b-icon>
-          </p>
-        </template>
-
-        <b-dropdown-item aria-role="menu-item" :focusable="false" custom paddingless>
-          <b-button type="is-text" tag="a" :target="(item.state == 'running') ?'_blank':'_self'" :href="(item.state == 'running') ? siteUrl(item.port,item.index) :'javascript:void(0)'" expanded>Open</b-button>
-          <b-button type="is-text" @click="configApp" expanded>Setting</b-button>
-          <b-button type="is-text" expanded @click="uninstallConfirm" :loading="isUninstalling">Unistall</b-button>
-          <div class="columns is-gapless bbor">
-            <div class="column is-flex is-justify-content-center is-align-items-center">
-              <b-button icon-pack="fas" icon-left="sync" type="is-text" expanded :loading="isRestarting" @click="restartApp"></b-button>
-            </div>
-            <div class="column is-flex is-justify-content-center is-align-items-center">
-              <b-button icon-pack="fas" icon-left="power-off" type="is-text" expanded @click="toggle(item)" :loading="isStarting" :class="item.state"></b-button>
-            </div>
-          </div>
-        </b-dropdown-item>
-      </b-dropdown>
-    </div>
-    <!-- Action Button End -->
-
-    <!-- Card Content Start -->
-    <div class="has-text-centered is-flex is-justify-content-center is-flex-direction-column pt-3 pb-3">
-      <a :target="(item.state == 'running') ?'_blank':'_self'" class="is-flex is-justify-content-center" :href="(item.state == 'running') ? siteUrl(item.port,item.index) :'javascript:void(0)'">
-        <b-image :src="item.icon" :src-fallback="require('@/assets/img/default.png')" webp-fallback=".jpg" class="is-72x72" :class="item.state | dotClass"></b-image>
-      </a>
-      <p class="mt-4 one-line">
-        <a class="one-line" :target="(item.state == 'running') ?'_blank':'_self'" :href="(item.state == 'running') ? siteUrl(item.port,item.index) :'javascript:void(0)'">
-          {{item.name}}
-        </a>
-      </p>
-
-    </div>
-    <!-- Card Content End -->
-
-    <!-- Loading Bar Start -->
-    <b-loading :is-full-page="false" v-model="isUninstalling" :can-cancel="false"></b-loading>
-    <!-- Loading Bar End -->
-  </div>
-
-</template>
-
-<script>
-export default {
-  name: "app-card",
-  data() {
-    return {
-      hover: false,
-      dropState: false,
-      isUninstalling: false,
-      isRestarting: false,
-      isStarting: false,
-      isStoping: false,
-      isSaving: false,
-    }
-  },
-  props: {
-    item: {
-      type: Object
-    },
-  },
-  methods: {
-    /**
-     * @description: Create application access link
-     * @param {String} port App access port
-     * @param {String} index App access index page
-     * @return {String}
-     */    
-    siteUrl(port, index) {
-      return (process.env.NODE_ENV === "'dev'") ? `http://${this.$store.state.devIp}:${port}${index}` : `http://${document.domain}:${port}${index}`
-    },
-
-    /**
-     * @description: Set drop-down menu status
-     * @param {Boolean} e
-     * @return {*} void
-     */    
-    setDropState(e) {
-      this.dropState = e
-    },
-
-    /**
-     * @description: Restart Application
-     * @return {*} void
-     */    
-    restartApp() {
-      this.isRestarting = true
-      this.$api.app.startContainer(this.item.custom_id, { state: "restart" }).then((res) => {
-        console.log(res.data);
-        if (res.data.success == 200) {
-          this.updateState()
-        }
-        this.isRestarting = false;
-      })
-    },
-
-    /**
-     * @description: Confirm before uninstall
-     * @return {*} void
-     */    
-    uninstallConfirm() {
-      let _this = this
-      this.$buefy.dialog.confirm({
-        title: 'Attention',
-        message: 'Data cannot be recovered after deletion! <br>Continue on to uninstall this application?',
-        type: 'is-dark',
-        confirmText: 'Uninstall',
-        onConfirm: () => {
-          _this.isUninstalling = true
-          _this.uninstallApp()
-        }
-      })
-    },
-
-    /**
-     * @description: Uninstall app
-     * @return {*} void
-     */    
-    uninstallApp() {
-      this.isUninstalling = true
-      this.$api.app.uninstall(this.item.custom_id).then((res) => {
-        if (res.data.success == 200) {
-          console.log(res.data.data);
-          this.updateState()
-        }
-        this.isUninstalling = false;
-      })
-    },
-
-    /**
-     * @description: Emit the event that the app has been updated
-     * @return {*} void
-     */    
-    updateState() {
-      this.$emit("updateState")
-    },
-
-    /**
-     * @description: Emit the event that the app has been updated with custom_id
-     * @return {*} void
-     */    
-    configApp() {
-      this.$emit("configApp", this.item.custom_id)
-    },
-
-    /**
-     * @description: Start or Stop a App
-     * @param {Object} item the app info object
-     * @return {*} void
-     */    
-    toggle(item) {
-      this.isStarting = true;
-      let data = {
-        state: item.state == "running" ? "stop" : "start"
-      }
-      this.$api.app.startContainer(item.custom_id, data).then((res) => {
-        console.log(res.data);
-        item.state = res.data.data
-        this.isStarting = false
-        this.updateState()
-      })
-    },
-
-  },
-  watch: {
-    hover(val) {
-      if (!val && this.dropState)
-        this.$refs.dro.toggle();
-    }
-  },
-  filters: {
-    /**
-     * @description: Format Dot Class
-     * @param {String} state
-     * @return {String}
-     */    
-    dotClass(state) {
-      return state == 'running' ? 'start' : 'stop'
-    },
-  }
-}
-</script>
-
-<style>
-</style>

UI/src/components/BrandBar.vue

@@ -1,27 +0,0 @@
-<!--
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-18 23:13:58
- * @Description: The left bottom brand bar
- * @FilePath: \CasaOS-UI\src\components\BrandBar.vue
--->
-
-<template>
-  <div class="brand-bar is-flex is-align-items-center has-text-white">
-    <figure class="image is-32x32">
-      <img :src="require('@/assets/img/casa.svg')">
-    </figure>
-    <span class="is-size-4 mr-3 ml-3">CasaOS</span>
-    <span>Made by IceWhale with ❤ and you !️</span>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "brand-bar"
-}
-</script>
-
-<style>
-</style>

UI/src/components/ContactBar.vue

@@ -1,28 +0,0 @@
-<!--
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-18 23:14:33
- * @Description: The right bottom contact bar
- * @FilePath: \CasaOS-UI\src\components\ContactBar.vue
--->
-
-<template>
-  <div class="contact-bar is-flex is-align-items-center has-text-white pl-3 pr-3">
-    <a href="#">
-      <b-icon pack="fas" icon="map-signs" size=""></b-icon>
-    </a>
-    <a href="https://discord.gg/Gx4BCEtHjx" target="_blank">
-      <b-icon pack="fab" icon="discord" size=""></b-icon>
-    </a>
-    <a href="https://github.com/ZimaBoard/CasaOS" target="_blank">
-      <b-icon pack="fab" icon="github" size=""></b-icon>
-    </a>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "contact-bar"
-}
-</script>

UI/src/components/Panel.vue

@@ -1,453 +0,0 @@
-<!--
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-22 16:27:00
- * @Description: Install Panel of Docker
- * @FilePath: /CasaOS-UI/src/components/Panel.vue
--->
-
-<template>
-  <div class="modal-card">
-    <!-- Modal-Card Header Start -->
-    <header class="modal-card-head">
-      <div class="flex1">
-        <h3 class="title is-4 has-text-weight-normal">Create a new App manually</h3>
-      </div>
-      <b-button icon-left="file-import" type="is-dark" size="is-small" rounded @click="showImportPanel" v-if="currentSlide == 1 && state == 'install'">Import</b-button>
-    </header>
-    <!-- Modal-Card Header End -->
-    <!-- Modal-Card Body Start -->
-    <section class="modal-card-body">
-
-      <section v-show="currentSlide == 1">
-        <ValidationObserver ref="ob1">
-          <ValidationProvider rules="required" name="Image" v-slot="{ errors, valid }">
-            <b-field label="Docker Image *" :type="{ 'is-danger': errors[0], 'is-success': valid }" :message="errors">
-              <b-input v-model="initData.image" placeholder="e.g.,hello-world:latest" :readonly="state == 'update'"></b-input>
-              <!-- <b-autocomplete :data="data" placeholder="e.g. hello-world:latest" field="image" :loading="isFetching" @typing="getAsyncData" @select="option => selected = option" v-model="initData.image" :readonly="state == 'update'"></b-autocomplete> -->
-            </b-field>
-          </ValidationProvider>
-          <ValidationProvider rules="required" name="Name" v-slot="{ errors, valid }">
-            <b-field label="App name *" :type="{ 'is-danger': errors[0], 'is-success': valid }" :message="errors">
-              <b-input value="" v-model="initData.label" placeholder="Your custom App Name"></b-input>
-            </b-field>
-          </ValidationProvider>
-
-          <b-field label="Icon URL">
-            <b-input value="" v-model="initData.icon" placeholder="Your custom icon URL"></b-input>
-          </b-field>
-
-          <b-field label="Web UI">
-            <p class="control">
-              <span class="button is-static">{{baseUrl}}</span>
-            </p>
-            <b-input v-model="webui" placeholder="8080/web/index.html" expanded></b-input>
-          </b-field>
-
-          <b-field label="Network">
-            <b-select v-model="initData.network_model" placeholder="Select" expanded>
-              <optgroup v-for="net in networks" :key="net.driver" :label="net.driver">
-                <option v-for="(option,index) in net.networks" :value="option.id" :key="option.name+index">
-                  {{ option.name}}
-                </option>
-              </optgroup>
-            </b-select>
-          </b-field>
-
-          <ports v-model="initData.ports" :showHostPost="showHostPort" v-if="showPorts"></ports>
-          <input-group v-model="initData.volumes" label="Data Volumes" message="No App Data Volumes now, Click “+” to add one."></input-group>
-          <input-group v-model="initData.envs" label="Environment Variables" message="No environment variables now, Click “+” to add one." name1="Key" name2="Value"></input-group>
-          <input-group v-model="initData.devices" label="Devices" message="No devices now, Click “+” to add one."></input-group>
-          <b-field label="Memory Limit">
-            <vue-slider :min="256" :max="totalMemory" v-model="initData.memory"></vue-slider>
-          </b-field>
-
-          <b-field label="CPU Shares">
-            <b-select v-model="initData.cpu_shares" placeholder="Select" expanded>
-              <option value="10">Low</option>
-              <option value="50">Medium</option>
-              <option value="90">High</option>
-            </b-select>
-          </b-field>
-
-          <b-field label="Restart Policy">
-            <b-select v-model="initData.restart" placeholder="Select" expanded>
-              <option value="on-failure">on-failure</option>
-              <option value="always">always</option>
-              <option value="unless-stopped">unless-stopped</option>
-            </b-select>
-          </b-field>
-          <b-field label="App Description">
-            <b-input v-model="initData.description"></b-input>
-          </b-field>
-          <b-loading :is-full-page="false" v-model="isLoading" :can-cancel="false"></b-loading>
-        </ValidationObserver>
-      </section>
-      <section v-show="currentSlide == 2">
-        <div class="installing-warpper">
-          <lottie-animation path="./ui/img/ani/rocket-launching.json" :autoPlay="true" :width="200" :height="200"></lottie-animation>
-          <h3 class="title is-6 has-text-centered" :class="{'has-text-danger':errorType == 3,'has-text-black':errorType != 3}" v-html="installText"></h3>
-        </div>
-      </section>
-
-    </section>
-    <!-- Modal-Card Body End -->
-
-    <!-- Modal-Card Footer Start-->
-    <footer class="modal-card-foot is-flex is-align-items-center">
-      <div class="flex1"></div>
-      <div>
-        <b-button v-if="currentSlide == 1" :label="cancelButtonText" @click="$emit('close')" rounded />
-        <b-button v-if="currentSlide == 2 && errorType == 3 " label="Back" @click="prevStep" rounded />
-        <b-button v-if="currentSlide == 1 && state == 'install'" label="Install" type="is-dark" @click="installApp()" rounded />
-        <b-button v-if="currentSlide == 1 && state == 'update'" label="Update" type="is-dark" @click="updateApp()" rounded />
-        <b-button v-if="currentSlide == 2" :label="cancelButtonText" type="is-dark" @click="$emit('close')" rounded />
-      </div>
-    </footer>
-    <!-- Modal-Card Footer End -->
-  </div>
-</template>
-
-<script>
-import axios from 'axios'
-import InputGroup from './forms/InputGroup.vue';
-import Ports from './forms/Ports.vue'
-import ImportPanel from './forms/ImportPanel.vue'
-import LottieAnimation from "lottie-vuejs/src/LottieAnimation.vue";
-import VueSlider from 'vue-slider-component'
-import 'vue-slider-component/theme/default.css'
-import { ValidationObserver, ValidationProvider } from "vee-validate";
-import "@/plugins/vee-validate";
-import debounce from 'lodash/debounce'
-
-export default {
-  components: {
-    Ports,
-    InputGroup,
-    ValidationObserver,
-    ValidationProvider,
-    LottieAnimation,
-    VueSlider
-  },
-  data() {
-    return {
-      timer: 0,
-      data: [],
-      isLoading: false,
-      isFetching: false,
-      errorType: 1,
-      currentSlide: 1,
-      cancelButtonText: "Cancel",
-      webui: "",
-      baseUrl: "",
-      totalMemory: 0,
-      networks: [],
-      tempNetworks: [],
-      networkModes: [],
-      installPercent: 0,
-      installText: "",
-
-      initData: {
-        port_map: "",
-        cpu_shares: 10,
-        memory: 300,
-        restart: "always",
-        label: "",
-        position: true,
-        index: "",
-        icon: "",
-        network_model: "",
-        image: "",
-        description: "",
-        origin: "custom",
-        ports: [],
-        volumes: [],
-        envs: [],
-        devices: [],
-      }
-
-    }
-  },
-  props: {
-    id: String,
-    state: String,
-    configData: Object,
-    initDatas: {
-      type: Object
-    }
-  },
-
-  created() {
-    //If it is edit, Init data
-    if (this.initDatas != undefined) {
-      this.initData = this.initDatas
-      this.webui = this.initDatas.port_map + this.initDatas.index
-    }
-
-    //Get Max memory info form device
-    this.totalMemory = Math.floor(this.configData.memory.total / 1048576);
-    this.initData.memory = this.totalMemory
-
-    //Handling network types
-    this.tempNetworks = this.configData.networks;
-    this.networkModes = this.unique(this.tempNetworks.map(item => {
-      return item.driver
-    }))
-    this.networks = this.networkModes.map(item => {
-      let tempitem = {}
-      tempitem.driver = item
-      tempitem.networks = this.tempNetworks.filter(net => {
-        return net.driver == item
-      })
-      return tempitem
-    })
-
-    let gg = this.tempNetworks.filter(item => {
-      if (item.driver == "bridge") {
-        return item
-      }
-    })
-
-    this.initData.network_model = gg[0].id
-
-    // Set Front-end base url
-    this.baseUrl = `${window.location.protocol}//${document.domain}:`;
-  },
-  computed: {
-
-    showPorts() {
-      if (this.initData.network_model.indexOf("macvlan") > -1) {
-        return false
-      } else {
-        return true
-      }
-    },
-    showHostPort() {
-      if (this.initData.network_model.indexOf("host") > -1) {
-        return false
-      } else {
-        return true
-      }
-    }
-  },
-  methods: {
-
-    /**
-     * @description: Process the datas before submit
-     * @param {*}
-     * @return {*} void
-     */
-    processData() {
-      // GET port map and index
-      if (this.webui != "") {
-        let slashArr = this.webui.split("/")
-        this.initData.port_map = slashArr[0]
-        this.initData.index = "/" + slashArr.slice(1).join("/");
-      }
-
-      let model = this.initData.network_model.split("-");
-      this.initData.network_model = model[0]
-    },
-
-    /**
-     * @description: Array deduplication
-     * @param {Array} arr
-     * @return {Array}
-     */
-    unique(arr) {
-      for (var i = 0; i < arr.length; i++) {
-        for (var j = i + 1; j < arr.length; j++) {
-          if (arr[i] == arr[j]) {
-            arr.splice(j, 1);
-            j--;
-          }
-        }
-      }
-      return arr;
-    },
-
-    /**
-     * @description: Back to prev Step
-     * @param {*}
-     * @return {*} void
-     */
-    prevStep() {
-      this.currentSlide--;
-    },
-
-    /**
-     * @description: Validate form async
-     * @param {Object} ref ref of component
-     * @return {Boolean} 
-     */
-    async checkStep(ref) {
-      let isValid = await ref.validate()
-      return isValid
-    },
-
-    /**
-     * @description: Submit datas after valid
-     * @param {*}
-     * @return {*} void
-     */
-    installApp() {
-      this.checkStep(this.$refs.ob1).then(val => {
-        if (val) {
-          this.processData();
-          this.isLoading = true;
-          this.$api.app.install(this.id, this.initData).then((res) => {
-            this.isLoading = false;
-            if (res.data.success == 200) {
-              this.currentSlide = 2;
-              this.cancelButtonText = "Continue in background"
-              this.checkInstallState(res.data.data)
-            } else {
-              //this.currentSlide = 1;
-              this.$buefy.toast.open({
-                message: res.data.message,
-                type: 'is-warning'
-              })
-            }
-          })
-        }
-      })
-    },
-
-    /**
-     * @description: Check the installation process every 250 milliseconds
-     * @param {String} appId
-     * @return {*} void
-     */
-    checkInstallState(appId) {
-      this.timer = setInterval(() => {
-        this.updateInstallState(appId)
-      }, 250)
-    },
-
-    /**
-     * @description: Update the installation status to the UI
-     * @param {String} appId
-     * @return {*} void
-     */
-    updateInstallState(appId) {
-      this.$api.app.state(appId).then((res) => {
-        let resData = res.data.data;
-        this.installPercent = resData.speed;
-        this.errorType = resData.type;
-        if (this.errorType == 4) {
-          try {
-            let info = JSON.parse(resData.message)
-            let id = (info.id != undefined) ? info.id : "";
-            let progress = ""
-            if (info.progressDetail != undefined) {
-              let progressDetail = info.progressDetail
-              if (!isNaN(progressDetail.current / progressDetail.total)) {
-                progress = "<br>Progress:" + String(Math.floor((progressDetail.current / progressDetail.total) * 100)) + "%"
-              }
-            }
-            let status = info.status
-            this.installText = status + ":" + id + " " + progress
-          } catch (error) {
-            console.log(error);
-          }
-        } else {
-          this.installText = resData.message
-        }
-
-        if (resData.speed == 100 || this.errorType == 3) {
-          clearInterval(this.timer)
-        }
-        let _this = this
-        if (resData.speed == 100) {
-          setTimeout(() => {
-            _this.$emit('updateState')
-            _this.$emit('close')
-          }, 1000)
-        }
-      })
-    },
-
-    /**
-     * @description: Save edit update
-     * @return {*} void
-     */
-    updateApp() {
-      this.processData();
-      this.isLoading = true;
-      this.$api.app.updateContainerSetting(this.id, this.initData).then((res) => {
-        if (res.data.success == 200) {
-          this.isLoading = false;
-          this.$emit('updateState')
-        } else {
-          this.$buefy.toast.open({
-            message: res.data.message,
-            type: 'is-warning'
-          })
-        }
-        this.$emit('close')
-      })
-    },
-
-    /**
-     * @description: Show import panel
-     * @return {*} void
-     */
-    showImportPanel() {
-      this.$buefy.modal.open({
-        parent: this,
-        component: ImportPanel,
-        hasModalCard: true,
-        customClass: '',
-        trapFocus: true,
-        canCancel: ['escape'],
-        scroll: "keep",
-        animation: "zoom-out",
-        events: {
-          'update': (e) => {
-            this.initData = e
-            this.$buefy.dialog.alert({
-              title: 'Attention',
-              message: 'AutoFill only helps you to complete most of the configuration. Some of the configuration information still needs to be confirmed by you.',
-              type: 'is-dark'
-            })
-          }
-        },
-        props: {
-          initData: this.initData,
-          netWorks: this.networks
-        }
-      })
-    },
-
-    /**
-     * @description: Get remote synchronization information
-     * @param {*} function
-     * @return {*} void
-     */
-    getAsyncData: debounce(function (name) {
-      if (!name.length) {
-        this.data = []
-        return
-      }
-      this.isFetching = true
-      axios.get(`https://hub.docker.com/api/content/v1/products/search?source=community&q=${name}&page=1&page_size=4`)
-        .then(({ data }) => {
-          this.data = []
-          data.summaries.forEach((item) => this.data.push(item.name))
-        })
-        .catch((error) => {
-          this.data = []
-          throw error
-        })
-        .finally(() => {
-          this.isFetching = false
-        })
-    }, 500)
-
-  },
-  destroyed() {
-    clearInterval(this.timer)
-  },
-}
-</script>

UI/src/components/SearchBar.vue

@@ -1,105 +0,0 @@
-<!--
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-19 09:23:01
- * @Description: Top Search bar
- * @FilePath: \CasaOS-UI\src\components\SearchBar.vue
--->
-
-<template>
-  <b-field position="is-centered " class="search-bar has-text-white">
-    <b-input placeholder="Google Search..." v-model="keyText" icon="magnify" icon-right="magnify" icon-right-clickable @icon-right-click="gotoSearch" @keyup.enter.native="gotoSearch" size="is-large" :class="['ovh',isFocus?'fo':'']" expanded @focus="onFocus" @blur="onBlur">
-    </b-input>
-  </b-field>
-</template>
-
-<script>
-export default {
-  name: "search-bar",
-  data() {
-    return {
-      isFocus: false,
-      keyText: ""
-    }
-  },
-  methods: {
-    /**
-     * @description: Handle Focus event
-     * @return {*} void
-     */
-    onFocus() {
-      this.isFocus = true;
-    },
-
-    /**
-     * @description: Handle Blur event
-     * @return {*} void
-     */
-    onBlur() {
-      if (this.keyText == "")
-        this.isFocus = false;
-    },
-
-    /**
-     * @description: Pop up a new window and jump to google search
-     * @return {*} void
-     */
-    gotoSearch() {
-      window.open("https://www.google.com/search?q=" + this.keyText, '_blank')
-    }
-  },
-}
-</script>
-
-<style lang="scss">
-.search-bar {
-  input {
-    transition: all 0.2s;
-    appearance: none;
-    background: rgba(123, 123, 123, 0.16);
-    backdrop-filter: blur(0.875rem);
-    border-radius: 8px;
-    border: none;
-    outline: none;
-    font-size: 1.5rem;
-    color: white;
-    &:focus {
-      border: none;
-      box-shadow: none;
-    }
-    &::placeholder {
-      color: white;
-    }
-  }
-  .ovh {
-    overflow: hidden;
-    .icon.is-left {
-      transition: all 0.2s;
-      left: 0;
-    }
-    .icon.is-right {
-      transition: all 0.2s;
-      right: -3rem !important;
-      color: white !important;
-    }
-    input {
-      padding-left: 2.5em !important;
-      padding-right: 1em !important;
-    }
-  }
-  .fo {
-    .icon.is-left {
-      left: -3rem !important;
-    }
-    .icon.is-right {
-      transition: all 0.2s;
-      right: 0 !important;
-    }
-    input {
-      padding-right: 2.5em !important;
-      padding-left: 1em !important;
-    }
-  }
-}
-</style>

UI/src/components/Shortcuts.vue

@@ -1,56 +0,0 @@
-<!--
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-19 09:23:49
- * @Description: 
- * @FilePath: \CasaOS-UI\src\components\Shortcuts.vue
--->
-<template>
-  <div class="has-text-left mt-6">
-    <div class="title-bar is-flex is-align-items-center">
-      <h1 class="title is-4  has-text-white is-flex-shrink-1">Shortcuts</h1>
-      <div class="buttons ">
-        <b-button icon-left="plus" type="is-dark" size="is-small" rounded>Add shortcut</b-button>
-      </div>
-    </div>
-
-    <div class="columns is-variable is-2 is-multiline ">
-      <div class="column is-narrow is-3" v-for="n in 10" :key="n">
-        <div class="wuji-card is-flex is-align-items-center ">
-
-          <figure class="image is-32x32 simg">
-            <img :src="require('@/assets/img/icon.png')">
-          </figure>
-          <p class="ml-4 flex1 one-line">Test</p>
-          <div class="action-btn1">
-            <b-dropdown aria-role="list" position="is-bottom-left" append-to-body>
-              <template #trigger>
-                <p role="button">
-                  <b-icon pack="fas" icon="ellipsis-v" size="is-small">
-                  </b-icon>
-                </p>
-              </template>
-
-              <b-dropdown-item aria-role="listitem">Action</b-dropdown-item>
-              <b-dropdown-item aria-role="listitem">Another action</b-dropdown-item>
-              <b-dropdown-item aria-role="listitem">Something else</b-dropdown-item>
-            </b-dropdown>
-          </div>
-
-        </div>
-      </div>
-
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'shortcuts'
-
-}
-</script>
-
-<style>
-</style>

UI/src/components/SideBar.vue

@@ -1,27 +0,0 @@
-<!--
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-18 23:20:56
- * @Description: 
- * @FilePath: \CasaOS-UI\src\components\SideBar.vue
--->
-<template>
-  <div class="side-bar mr-5">
-    <clock></clock>
-  </div>
-</template>
-
-<script>
-import Clock from '../assets/widgets/Clock.vue'
-
-
-export default {
-  name: 'side-bar',
-  components: { Clock },
-
-}
-</script>
-
-<style>
-</style>

UI/src/components/Suggestion.vue

@@ -1,55 +0,0 @@
-<!--
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-18 23:20:19
- * @Description: 
- * @FilePath: \CasaOS-UI\src\components\Suggestion.vue
--->
-<template>
-  <div class="has-text-left ">
-    <h1 class="title is-4 mt-6 has-text-white">Suggestions</h1>
-    <div class="columns is-variable is-2 is-multiline">
-      <div class="column is-one-third" v-for="(item,index) in list" :key="'ss'+index">
-        <a :href="item.url" target="_blank">
-          <div class="wuji-card is-flex is-align-items-center">
-            <div class="info ">
-              <div class="two-line ">
-                {{item.title}}
-              </div>
-              <div class="des two-line">
-                {{item.content}}
-              </div>
-            </div>
-
-            <figure class="image is-48x48 simg is-flex">
-              <img :src="item.image_url">
-            </figure>
-          </div>
-        </a>
-      </div>
-    </div>
-  </div>
-
-</template>
-
-<script>
-export default {
-  name:'suggestion',
-  data() {
-    return {
-      list: []
-    }
-  },
-  mounted() {
-    this.$api.task.list().then(res => {
-      if (res.data.success == 200) {
-        this.list = res.data.data
-      }
-    })
-  },
-}
-</script>
-
-<style>
-</style>

UI/src/components/TopBar.vue

@@ -1,161 +0,0 @@
-<!--
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-23 18:21:13
- * @Description: Top bar 
- * @FilePath: /CasaOS-UI/src/components/TopBar.vue
--->
-
-<template>
-  <div class="navbar top-bar is-flex is-align-items-center">
-    <div class="navbar-brand ml-3">
-      <b-dropdown aria-role="list" class="navbar-item" @active-change="onOpen">
-        <template #trigger>
-          <p role="button">
-            <b-icon pack="fas" icon="sliders-h">
-            </b-icon>
-          </p>
-        </template>
-
-        <b-dropdown-item aria-role="menu-item" :focusable="false" custom>
-          <h2 class="title is-4">CasaOS Setting</h2>
-          <div class="is-flex is-align-items-center item">
-            <div class="is-flex is-align-items-center flex1">
-              <b-icon pack="fas" icon="sync-alt" class="mr-1"></b-icon> <b>Update</b>
-            </div>
-            <div>
-              v{{updateInfo.current_version}}
-            </div>
-            <!-- <b-field>
-              <b-switch v-model="barData.auto_update" type="is-dark" size="is-small" class="is-flex-direction-row-reverse mr-0" @input="saveData">
-                Auto-Check
-              </b-switch>
-            </b-field> -->
-          </div>
-
-          <div class="is-flex is-align-items-center pl-5" v-if="!updateInfo.is_need">
-            {{latestText}}
-            <b-icon type="is-success" pack="fas" icon="check" class="ml-1"></b-icon>
-          </div>
-          <div class="is-flex is-align-items-center is-justify-content-end update-container pl-5" v-if="updateInfo.is_need">
-            <div class="flex1">{{updateText}}</div>
-            <b-button type="is-dark" size="is-small" class="ml-2" :loading="isUpdating" rounded @click="updateSystem">Update</b-button>
-          </div>
-
-        </b-dropdown-item>
-      </b-dropdown>
-
-    </div>
-
-    <div class="navbar-menu">
-      <div class="navbar-end mr-3">
-        <!-- <b-icon pack="far" icon="comment-alt"></b-icon> -->
-      </div>
-    </div>
-
-  </div>
-</template>
-
-<script>
-export default {
-  name: "top-bar",
-  data() {
-    return {
-      timer: 0,
-      barData: {
-        auto_update: false,
-        background: "",
-        background_type: "d",
-        search_engine: "google",
-        search_switch: false,
-        shortcuts_switch: false,
-        widgets_switch: false
-      },
-      updateInfo: {
-        current_version: '0',
-        is_need: false,
-        version: Object
-      },
-      isUpdating: false,
-      latestText: "Currently the latest version",
-      updateText: "A new version is available!"
-    }
-  },
-  created() {
-    this.getConfig();
-  },
-
-  methods: {
-    /**
-     * @description: Get CasaOs Configs
-     * @return {*} void
-     */
-    getConfig() {
-      this.$api.info.systemConfig().then(res => {
-        if (res.data.success == 200) {
-          this.barData = res.data.data
-        }
-      })
-    },
-
-    /**
-     * @description: Save CasaOs Configs
-     * @return {*} void
-     */
-    saveData() {
-      this.$api.info.saveSystemConfig(this.barData).then(res => {
-        if (res.data.success == 200) {
-          console.log(res);
-        }
-      })
-    },
-
-    /**
-     * @description: Handle Dropmenu state
-     * @param {Boolean} isOpen
-     * @return {*} void
-     */
-    onOpen(isOpen) {
-      if (isOpen) {
-        this.$api.info.checkVersion().then(res => {
-          if (res.data.success == 200) {
-            this.updateInfo = res.data.data
-          }
-        })
-      }
-    },
-
-    /**
-     * @description: Update System Version and check update state
-     * @return {*} void
-     */
-    updateSystem() {
-      this.isUpdating = true;
-      this.$api.info.updateSystem().then(res => {
-        if (res.data.success == 200) {
-          console.log(res.data.data);
-        }
-      });
-      this.checkUpdateState();
-    },
-    /**
-     * @description: check update state if is_need is false then reload page
-     * @return {*} void
-     */
-    checkUpdateState() {
-      this.timer = setInterval(() => {
-        this.$api.info.checkVersion().then(res => {
-          if (res.data.success == 200) {
-            if (!res.data.data.is_need) {
-              clearInterval(this.timer);
-              location.reload();
-            }
-          }
-        })
-      }, 3000)
-    }
-  },
-
-}
-</script>

UI/src/components/forms/ImportPanel.vue

@@ -1,154 +0,0 @@
-<template>
-  <div class="modal-card">
-    <!-- Modal-Card Header Start -->
-    <header class="modal-card-head"> 
-      <div class="flex1">
-        <h3 class="title is-4 has-text-weight-normal">Import From Docker CLI</h3>
-      </div>
-    </header>
-    <!-- Modal-Card Header End -->
-    <!-- Modal-Card Body Start -->
-    <section class="modal-card-body">
-      <b-field label="Command Line" :type="{ 'is-danger': parseError}" :message="errors">
-        <b-input maxlength="800" type="textarea" class="import-area" v-model="dockerCliCommands"></b-input>
-      </b-field>
-    </section>
-    <!-- Modal-Card Body End -->
-    <!-- Modal-Card Footer Start-->
-    <footer class="modal-card-foot is-flex is-align-items-center">
-      <div class="flex1"></div>
-      <div>
-        <b-button label="Cancel" @click="$emit('close')" rounded />
-        <b-button label="Sumbit" type="is-dark" @click="emitSubmit" rounded />
-      </div>
-    </footer>
-    <!-- Modal-Card Footer End -->
-  </div>
-</template>
-
-<script>
-import parser from 'yargs-parser'
-export default {
-  data() {
-    return {
-      dockerCliCommands: "",
-      parseError: false,
-      errors: "",
-    }
-  },
-  props: {
-    initData: Object,
-    netWorks: Array
-  },
-  created() {
-    console.log(this.netWorks);
-  },
-  methods: {
-
-    /**
-     * @description: Emit Event to tell parent Update
-     * @param {*}
-     * @return {*} void
-     */
-    emitSubmit() {
-      if (this.parseCli()) {
-        this.errors = ""
-        this.$emit('update', this.initData)
-        this.$emit('close')
-      } else {
-        this.errors = "Please fill correct command line"
-        this.parseError = true;
-      }
-
-    },
-
-    /**
-     * @description: Parse Import Docker Cli Commands
-     * @return {Boolean} 
-     */
-    parseCli() {
-      const formattedInput = this.dockerCliCommands.replace(/\<[^\>]*\>/g, 'Custom_data').replace(/[\r\n]/g, "").replace(/\\/g, "\\ ").trim();
-      const parsedInput = parser(formattedInput)
-      console.log(parsedInput);
-      const { _: command, ...params } = parsedInput;
-      if (command[0] !== 'docker' || (command[1] !== 'run' && command[1] !== 'create')) {
-        return false
-      } else {
-        //Envs
-        this.initData.envs = this.makeArray(parsedInput.e).map(item => {
-          let ii = item.split("=");
-          return {
-            container: ii[0],
-            host: ii[1]
-          }
-        })
-        //Ports
-        this.initData.ports = this.makeArray(parsedInput.p).map(item => {
-          let pArray = item.split(":")
-          let endArray = pArray[1].split("/")
-          let protocol = (endArray[1]) ? endArray[1] : 'tcp';
-          return {
-            container: endArray[0],
-            host: pArray[0],
-            protocol: protocol
-          }
-        })
-        //Volume
-        this.initData.volumes = this.makeArray(parsedInput.v).map(item => {
-          let ii = item.split(":");
-          return {
-            container: ii[1],
-            host: ii[0]
-          }
-        })
-        // Devices
-        this.initData.devices = this.makeArray(parsedInput.device).map(item => {
-          let ii = item.split(":");
-          return {
-            container: ii[1],
-            host: ii[0]
-          }
-        })
-
-        //Network
-        if (parsedInput.network != undefined) {
-          let network = (parsedInput.network == 'physical') ? 'macvlan' : parsedInput.network;
-          let seletNetworks = this.netWorks.filter(item => {
-            if (item.driver == network) {
-              return true
-            }
-          })
-          if (seletNetworks.length > 0) {
-            this.initData.network_model = seletNetworks[0].networks[0].id;
-          }
-        }
-
-        //Image
-        this.initData.image = [...command].pop()
-        //Label
-        if (parsedInput.name != undefined) {
-          this.initData.label = parsedInput.name.replace(/^\S/, s => s.toUpperCase())
-        }
-        //Restart
-        if (parsedInput.restart != undefined) {
-          this.initData.restart = parsedInput.restart
-        }
-        return true
-      }
-    },
-
-    /**
-     * @description: Make String to Array
-     * @param {*}
-     * @return {Array}
-     */
-    makeArray(foo) {
-      let newArray = (typeof (foo) == "string") ? [foo] : foo
-      return (newArray == undefined) ? [] : newArray
-    }
-  },
-}
-</script>
-
-<style>
-</style>

UI/src/components/forms/InputGroup.vue

@@ -1,108 +0,0 @@
-<template>
-  <div class="mb-5">
-    <div class="field is-flex is-align-items-center mb-2">
-      <label class="label mb-0 flex1">{{label}}</label>
-      <b-button icon-left="plus" type="is-dark" size="is-small" rounded @click="addItem">Add</b-button>
-    </div>
-    <div class="is-flex is-align-items-center mb-5 info" v-if="vdata.length == 0">
-      <b-icon pack="fas" icon="info-circle" size="is-small" class="mr-2 "></b-icon>
-      <span>
-        {{message}}
-      </span>
-
-    </div>
-
-    <div class="port-item" v-for="(item,index) in vdata" :key="'port'+index">
-      <b-icon pack="fas" icon="times" size="is-small" class="is-clickable" @click.native="removeItem(index)"></b-icon>
-      <template v-if="index < 1">
-        <b-field grouped>
-          <b-field :label="name1" expanded>
-            <b-input :placeholder="name1" v-model="item.container" expanded @input="handleInput"></b-input>
-          </b-field>
-          <b-field :label="name2" expanded>
-            <b-input :placeholder="name2" v-model="item.host" expanded @input="handleInput"></b-input>
-          </b-field>
-
-        </b-field>
-      </template>
-      <template v-else>
-
-        <b-field grouped>
-            <b-input :placeholder="name1" v-model="item.container" expanded @input="handleInput"></b-input>
-            <b-input :placeholder="name2" v-model="item.host" expanded @input="handleInput"></b-input>
-        </b-field>
-
-      </template>
-    </div>
-
-  </div>
-</template>
-
-<script>
-export default {
-  name:'input-group',
-  data() {
-    return {
-      isLoading: false,
-      items: [],
-      min: 0
-    }
-  },
-  model: {
-    prop: 'vdata',
-    event: 'change'
-  },
-  props: {
-    vdata: Array,
-    label: String,
-    message: String,
-    name1: {
-      type: String,
-      default: "Container"
-    },
-    name2: {
-      type: String,
-      default: "Host"
-    },
-
-  },
-  created() {
-    //this.items = this.vdata;
-  },
-  watch: {
-
-  },
-  mounted() {
-    //this.addItem()
-  },
-  methods: {
-    addItem() {
-      let itemObj = {
-        container: "",
-        host: ""
-      }
-      this.vdata.push(itemObj)
-    },
-
-    removeItem(index) {
-      this.vdata.splice(index, 1)
-      this.filterArray()
-    },
-    handleInput() {
-      this.filterArray()
-    },
-    filterArray() {
-      // let newArray = this.items.filter(item => {
-      //   if (item.container != "" && item.host != "") {
-      //     return true
-      //   } else {
-      //     return false
-      //   }
-      // })
-      this.$emit('change', this.vdata)
-      
-    }
-  },
-}
-</script>
-

UI/src/components/forms/Ports.vue

@@ -1,134 +0,0 @@
-<template>
-  <div class="mb-5">
-    <div class="field is-flex is-align-items-center mb-2">
-      <label class="label mb-0 flex1">Ports</label>
-      <b-button icon-left="plus" type="is-dark" size="is-small" rounded @click="addItem">Add</b-button>
-    </div>
-    <div class="is-flex is-align-items-center mb-5 info" v-if="vdata.length == 0">
-      <b-icon pack="fas" icon="info-circle" size="is-small" class="mr-2 "></b-icon>
-      <span>
-        No App Ports now, Click “+” to add one.
-      </span>
-
-    </div>
-    <div class="port-item" v-for="(item,index) in vdata" :key="'port'+index">
-      <b-icon pack="fas" icon="times" size="is-small" class="is-clickable" @click.native="removeItem(index)"></b-icon>
-      <template v-if="index < 1">
-        <b-field grouped>
-          <b-field label="Container" expanded>
-            <b-input placeholder="Container" type="number" v-model="item.container" expanded @input="handleInput"></b-input>
-          </b-field>
-          <b-field label="Host" expanded>
-            <b-input placeholder="Host" type="number" v-model="item.host" expanded @input="handleInput" v-if="showHostPost"></b-input>
-          </b-field>
-          <b-field label="Protocol" expanded>
-            <b-select placeholder="Protocol" v-model="item.protocol" expanded @input="handleInput">
-              <option value="tcp">TCP</option>
-              <option value="udp">UDP</option>
-              <option value="both">TCP + UDP</option>
-            </b-select>
-          </b-field>
-        </b-field>
-      </template>
-      <template v-else>
-
-        <b-field grouped>
-          <b-input placeholder="Container" type="number" v-model="item.container" expanded @input="handleInput"></b-input>
-          <b-input placeholder="Host" type="number" v-model="item.host" expanded @input="handleInput" v-if="showHostPost"></b-input>
-          <b-select placeholder="Protocol" v-model="item.protocol" expanded @input="handleInput">
-            <option value="tcp">TCP</option>
-            <option value="udp">UDP</option>
-            <option value="both">TCP + UDP</option>
-          </b-select>
-        </b-field>
-
-      </template>
-    </div>
-
-  </div>
-</template>
-
-<script>
- 
-export default {
-  name: 'ports',
-  data() {
-    return {
-      isLoading: false,
-      items: [],
-      min: 0
-    }
-  },
-  model: {
-    prop: 'vdata',
-    event: 'change'
-  },
-  props: {
-    vdata: Array,
-    showHostPost: Boolean
-  },
-  created() {
-    //this.items = this.vdata;
-  },
-  mounted() {
-    if (this.vdata.length == 0) {
-      //this.addItem()
-    }
-  },
-  methods: {
-    addItem() {
-      let itemObj = {
-        container: "",
-        host: "",
-        protocol: "tcp"
-      }
-      this.vdata.push(itemObj)
-    },
-
-    removeItem(index) {
-      this.vdata.splice(index, 1)
-      this.filterArray()
-    },
-    handleInput() {
-      this.filterArray()
-    },
-    filterArray() {
-      // let newArray = this.items.filter(item => {
-      //   if (item.container != "" && item.host != "") {
-      //     return true
-      //   } else {
-      //     return false
-      //   }
-      // })
-
-      this.$emit('change', this.vdata)
-
-
-    }
-  },
-}
-</script>
-
-<style lang="scss">
-.info {
-  font-size: 0.875rem;
-  color: #5a5a5a;
-}
-.port-item {
-  position: relative;
-  .icon {
-    position: absolute;
-    right: -1.5rem;
-    bottom: 0.825rem;
-  }
-  &:not(:last-child) {
-    margin-bottom: 0.5rem;
-  }
-  .field.is-expanded {
-    .label {
-      text-align: center;
-      font-weight: normal;
-    }
-  }
-}
-</style>

UI/src/main.js

@@ -1,17 +0,0 @@
-import Vue from 'vue'
-import App from '@/App.vue'
-import router from '@/router'
-import store from '@/store'
-import api from '@/service/api.js'
-import Buefy from 'buefy'
-import '@/assets/scss/app.scss'
-
-Vue.use(Buefy)
-
-Vue.config.productionTip = false
-Vue.prototype.$api = api;
-new Vue({
-  router,
-  store,
-  render: h => h(App)
-}).$mount('#app')

UI/src/plugins/vee-validate.js

@@ -1,28 +0,0 @@
-import { required, confirmed, length, email, min } from "vee-validate/dist/rules";
-import { extend } from "vee-validate";
-
-extend("required", {
-    ...required,
-    message: "This field is required"
-});
-
-extend("email", {
-    ...email,
-    message: "This field must be a valid email"
-});
-
-extend("confirmed", {
-    ...confirmed,
-    message: "This field confirmation does not match"
-});
-
-extend("length", {
-    ...length,
-    message: "This field must have 2 options"
-});
-
-extend("min", {
-    ...min,
-    message: "This field must have more than {length} characters"
-});
-

UI/src/router/index.js

@@ -1,24 +0,0 @@
-/*
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-18 23:19:27
- * @Description: 
- * @FilePath: \CasaOS-UI\src\router\index.js
- */
-import Vue from 'vue'
-import VueRouter from 'vue-router'
-
-Vue.use(VueRouter)
-
-const routes = [
-
-]
-
-const router = new VueRouter({
-  mode: 'history',
-  base: process.env.BASE_URL,
-  routes
-})
-
-export default router

UI/src/service/api.js

@@ -1,19 +0,0 @@
-/*
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-23 15:59:52
- * @Description: 
- * @FilePath: /CasaOS-UI/src/service/api.js
- */
-import user from "./user.js";
-import app from './app.js';
-import task from './task.js';
-import info from './info.js';
-
-export default {
-    app,
-    info,
-    user, 
-    task
-}

UI/src/service/app.js

@@ -1,79 +0,0 @@
-/*
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-19 09:26:20
- * @Description: Application API
- * @FilePath: \CasaOS-UI\src\service\app.js
- */
-import { api } from "./service.js";
-
-const app = {
-    //Get Install Info
-    appConfig() {
-        return api.get("/app/install/config");
-    },
-    //Store List
-    storeList(data) {
-        return api.get("/app/list", data);
-    },
-    //Store App Info
-    storeAppInfo(id) {
-        return api.get("/app/appinfo/" + id);
-    },
-    //Store Category List
-    storeCategoryList() {
-        return api.get("/app/category");
-    },
-    //Check Port
-    checkPort(port, type) { 
-        let data = {
-            type: type
-        }
-        return api.get('/app/check/' + port, data);
-    },
-    // Get a free port
-    getPort() {
-        return api.get('/app/getport');
-    },
-    // Get app Running State
-    getState(id, data) {
-        return api.get('/app/state/' + id, data);
-    },
-    //Install App
-    install(id, data) {
-        return api.post('/app/install/' + id, data);
-    },
-    //Install Info
-    state(id) {
-        return api.get('/app/speed/' + id);
-    },
-    // Uninstall App
-    uninstall(id) {
-        return api.delete('/app/uninstall/' + id);
-    },
-    //My App List
-    myAppList(data) {
-        return api.get('/app/mylist', data);
-    },
-    //Container info
-    getContainerInfo(id) {
-        return api.get('/app/info/' + id);
-    },
-    //Container Log
-    getContainerLogs(id) {
-        return api.get('/app/logs/' + id)
-    },
-    //Start Or Stop Or Restart A Container with ID
-    startContainer(id, data) {
-        return api.put('/app/state/' + id, data)
-    },
-    getContainerSettingdata(id) {
-        return api.get(`/app/update/${id}/info`)
-    },
-    //Update Container Settings
-    updateContainerSetting(id, data) {
-        return api.put(`/app/update/${id}/setting`, data);
-    }
-}
-export default app;

UI/src/service/ddns.js

@@ -1,37 +0,0 @@
-/*
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-19 09:26:08
- * @Description: DDNS Service API
- * @FilePath: \CasaOS-UI\src\service\ddns.js
- */
-import { api } from "./service.js";
-
-const ddns = {
-    //Add New DDNS
-    add(data) {
-        return api.post("/ddns/set", data);
-    },
-    //Delete a DDNS Item
-    delete(id) {
-        return api.delete("/ddns/delete/" + id);
-    },
-    //Get DDNS List
-    get_list() {
-        return api.get('/ddns/list');
-    },
-    //Ger DDNS Provider List
-    get_provider_list() {
-        return api.get('/ddns/getlist');
-    },
-    //Get Public Internet IP address (IPv4)
-    get_ipv4() {
-        return api.get('/ddns/ip');
-    },
-    // Ping Host 
-    ping(host) {
-        return api.get('/ddns/ping/' + host);
-    }
-}
-export default ddns;

UI/src/service/disk.js

@@ -1,35 +0,0 @@
-/*
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-19 09:26:02
- * @Description: Disk API
- * @FilePath: \CasaOS-UI\src\service\disk.js
- */
-import { api } from "./service.js";
-
-const disk = {
-    // get Path list
-    diskInfo() {
-        return api.get('/disk/info');
-    },
-    diskList() {
-        return api.get('/disk/list');
-    },
-    // System path
-    renamePath(oldpath, path) {
-        let data = {
-            oldpath: oldpath,
-            newpath: path
-        }
-        return api.get('/zima/rename', data);
-    },
-    // Make a new Dir
-    mkdir(path) {
-        let data = {
-            path: path
-        }
-        return api.get('/zima/mkdir', data)
-    }
-}
-export default disk;

UI/src/service/file.js

@@ -1,36 +0,0 @@
-/*
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-19 09:25:53
- * @Description: File API
- * @FilePath: \CasaOS-UI\src\service\file.js
- */
-import { api } from "./service.js";
-
-const file = {
-    // get Path list
-    dirPath(path) {
-        let data = {
-            path: path
-        }
-        return api.get('/file/dirpath', data);
-    },
-    // System path
-    renamePath(oldpath, path) {
-        let data = {
-            oldpath: oldpath,
-            newpath: path
-        }
-        return api.get('/file/rename', data);
-    },
-    // Make a new Dir
-    mkdir(path) {
-        let data = { 
-            path: path
-        }
-        return api.post('/file/mkdir', data)
-    }
-}
-
-export default file;

UI/src/service/info.js

@@ -1,53 +0,0 @@
-/*
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-23 17:41:01
- * @Description: System HardWare Info API
- * @FilePath: /CasaOS-UI/src/service/info.js
- */
-import { api } from "./service.js";
-
-const info = {
-    //CPU info
-    cpuInfo() {
-        return api.get("/zima/getcpuinfo");
-    },
-    //Memory Info
-    memoryInfo() {
-        return api.get("/zima/getmeminfo");
-    },
-    //Network Info
-    networkInfo() {
-        return api.get('/zima/getnetinfo');
-    },
-    //Disk Info
-    diskInfo() {
-        return api.get('/zima/getdiskinfo');
-    },
-    //All Info
-    allInfo() {
-        return api.get('/zima/getinfo');
-    },
-    // System Info
-    systemInfo() {
-        return api.get('/zima/sysinfo');
-    },
-    //Get CasaOS Config
-    systemConfig() {
-        return api.get('/sys/config')
-    },
-    //Save CasaOs Config
-    saveSystemConfig(data) {
-        return api.post('/sys/config', data)
-    },
-    // Check Verison
-    checkVersion() {
-        return api.get('/sys/check');
-    },
-    //Update System
-    updateSystem(){
-        return api.post('/sys/update');
-    }
-}
-export default info;

UI/src/service/service.js

@@ -1,138 +0,0 @@
-/*
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-23 17:26:31
- * @Description: 
- * @FilePath: /CasaOS-UI/src/service/service.js
- */
-import axios from 'axios'
-import qs from 'qs'
-import router from '@/router'
-import store from '@/store'
-// Set Post Headers
-axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-axios.defaults.withCredentials = false;
-if (process.env.NODE_ENV === "'dev'") {
-    axios.defaults.baseURL = `http://${store.state.devIp}:8089/v1`;
-} else {
-    axios.defaults.baseURL = `${document.location.protocol}//${document.location.host}/v1`
-}
-
-//Create a axios instance, And set timeout to 30s
-const instance = axios.create({
-    timeout: 10000,
-});
-
-
-window.isRefreshing = false
-
-let refreshSubscribers = []
-
-function subscribeTokenRefresh(cb) {
-    refreshSubscribers.push(cb)
-}
-
-function onRrefreshed(token) {
-    refreshSubscribers.map(cb => cb(token))
-}
-
-// Request interceptors
-instance.interceptors.request.use((config) => {
-    let token = ''
-    if (sessionStorage.getItem("user_token")) {
-        token = sessionStorage.getItem("user_token")
-    }
-    if (localStorage.getItem("user_token")) {
-        token = localStorage.getItem("user_token")
-    }
-    config.headers.Authorization = token
-    if (token === "" && config.url !== "user/login") {
-        if (!window.isRefreshing) {
-            window.isRefreshing = true;
-            axios.post('user/login', qs.stringify({
-                username: "admin",
-                pwd: "admin"
-            })).then(res => {
-                token = res.data.data;
-                store.commit('setToken', token)
-                localStorage.setItem("user_token", token)
-                onRrefreshed(token);
-            })
-        }
-        let retry = new Promise((resolve) => {
-            /* (token) => {...}这个函数就是回调函数 */
-            subscribeTokenRefresh((token) => {
-                config.headers.Authorization = token
-                /* 将请求挂起 */
-                resolve(config)
-            })
-        })
-        return retry
-    } else {
-        return config;
-    }
-
-
-}, (error) => {
-    // Do something with request error
-    return Promise.reject(error)
-})
-
-// 响应拦截（请求返回后拦截）
-instance.interceptors.response.use(response => {
-    //console.log("响应拦截", response);
-    return response;
-}, error => {
-    console.log('catch', error)
-    if (error.response) {
-
-        switch (error.response.status) {
-            case 401:
-                sessionStorage.removeItem('user_token') //可能是token过期，清除它
-                router.replace({ //跳转到登录页面
-                    path: '/',
-                    query: { redirect: router.currentRoute.fullPath } // 将跳转的路由path作为参数，登录成功后跳转到该路由
-                })
-                break;
-            case 404:
-                store.commit('setServiceError', true);
-                break;
-            case 500:
-                break;
-        }
-    } else {
-
-        store.commit('setServiceError', true);
-    }
-    return Promise.reject(error)
-})
-
-//按照请求类型对axios进行封装
-const api = {
-    get(url, data) {
-        return instance.get(url, { params: data })
-    },
-    post(url, data) {
-        let newData = (url.indexOf("install") > 0 || url.indexOf("sys") > 0) ? JSON.stringify(data) : qs.stringify(data)
-        if (url.indexOf("install") > 0) {
-            axios.defaults.headers.post['Content-Type'] = 'application/json';
-        } else {
-            axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-        }
-        return instance.post(url, newData)
-    },
-    put(url, data) {
-        let newData = (url.indexOf("setting") > 0) ? JSON.stringify(data) : qs.stringify(data)
-        if (url.indexOf("setting") > 0) {
-            axios.defaults.headers.post['Content-Type'] = 'application/json';
-        } else {
-            axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-        }
-        return instance.put(url, newData)
-    },
-    delete(url, data) {
-        return instance.delete(url, { params: data })
-    }
-}
-export { api }

UI/src/service/task.js

@@ -1,21 +0,0 @@
-/*
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-19 09:26:45
- * @Description: Task API
- * @FilePath: \CasaOS-UI\src\service\task.js
- */
-import { api } from "./service.js";
-
-const task = {
-    //List
-    list() {
-        return api.get("/task/list");
-    },
-    //Mark
-    completion(id) {
-        return api.put(`/task/completion/${id}`);
-    }
-}
-export default task; 

UI/src/service/user.js

@@ -1,47 +0,0 @@
-/*
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-19 09:26:47
- * @Description: User API
- * @FilePath: \CasaOS-UI\src\service\user.js
- */
-import { api } from "./service.js";
-
-const user = {
-    //login
-    login(data) {
-        return api.post("user/login", data);
-    },
-
-    // Create UserName and Password
-    createUsernameAndPaword(data) {
-        return api.post("/user/setusernamepwd", data);
-    },
-
-    // Change User Avatar
-    changeAvatar(data) {
-        return api.post("/user/changhead", data);
-    },
-
-    // Change UserName
-    changeUserName(data) {
-        return api.put("/user/changusername", data);
-    },
-
-    // Change User Password
-    changePassword(data) {
-        return api.put("/user/changuserpwd", data);
-    },
-
-    // Get user info
-    getUserInfo() {
-        return api.get("/user/info");
-    },
-    
-    // Change User Info
-    changeUserInfo(data) {
-        return api.post('/user/changuserinfo', data)
-    }
-}
-export default user;

UI/src/service/zerotier.js

@@ -1,64 +0,0 @@
-/*
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-19 09:26:50
- * @Description: Zerotier API
- * @FilePath: \CasaOS-UI\src\service\zerotier.js
- */
-import { api } from "./service.js";
-
-const zerotier = {
-    //Check if Need login to zerotier
-    isLogin() {
-        return api.get("/zerotier/islogin");
-    },
-    //Login
-    login(data) {
-        return api.post("/zerotier/login", data);
-    },
-    //Register
-    register(data) {
-        return api.post('/zerotier/register', data);
-    },
-    //networklist
-    networkLits() {
-        return api.get('/zerotier/list'); 
-    },
-    //joinNetwork
-    joinNetwork(id) {
-        return api.post(`/zerotier/join/${id}`);
-    },
-    // leaveNetwork
-    leaveNetwork(id) {
-        return api.post(`/zerotier/leave/${id}`);
-    },
-    // Get Network detial
-    networkDetail(id) {
-        return api.get(`/zerotier/info/${id}`);
-    },
-    // Edit Network
-    editNetwork(id, data) {
-        return api.put(`/zerotier/edit/${id}`, data)
-    },
-    // Delete A Network
-    delNetwork(id) {
-        return api.delete(`/zerotier/network/${id}/del`)
-    },
-    createNetwork() {
-        return api.post('/zerotier/create')
-    },
-    // Get Network member list
-    getMembers(id) {
-        return api.get(`/zerotier/member/${id}`)
-    },
-    // Edit Member
-    editMember(id, mId, data) {
-        return api.put(`/zerotier/member/${id}/edit/${mId}`, data)
-    },
-    // Delete Member
-    delMemeber(id, mId) {
-        return api.delete(`/zerotier/member/${id}/del/${mId}`)
-    }
-}
-export default zerotier;

UI/src/store/index.js

@@ -1,34 +0,0 @@
-/*
- * @Author: JerryK
- * @Date: 2021-09-18 21:32:13
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-22 16:28:16
- * @Description: 
- * @FilePath: /CasaOS-UI/src/store/index.js
- */
-import Vue from 'vue'
-import Vuex from 'vuex'
-//import createPersistedState from "vuex-persistedstate";
-
-Vue.use(Vuex)
-
-export default new Vuex.Store({
-  //plugins: [createPersistedState()],
-  state: {
-    token: "",
-    devIp: "192.168.2.217",
-    serviceError: false
-  },
-  mutations: {
-    setToken(state, val) {
-      state.token = val 
-    },
-    setServiceError(state, val) {
-      state.serviceError = val
-    }
-  },
-  actions: {
-  },
-  modules: {
-  }
-})

UI/vue.config.js

@@ -1,23 +0,0 @@
-/*
- * @Author: JerryK
- * @Date: 2021-09-22 10:10:10
- * @LastEditors: JerryK
- * @LastEditTime: 2021-09-22 15:26:47
- * @Description: 
- * @FilePath: /CasaOS-UI/vue.config.js
- */
-const webpack = require('webpack')
-
-module.exports = {
-    publicPath: '/ui/',
-    runtimeCompiler: true,
-    lintOnSave: false,
-    productionSourceMap: false,
-    pluginOptions: {
-
-    },
-    chainWebpack: config => {
-        config.plugin('ignore')
-            .use(new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/));
-    }
-}

conf/conf.ini.sample

@@ -4,46 +4,39 @@ RuntimeRootPath = runtime/
 LogSavePath = /casaOS/logs/server/
 LogSaveName = log
 LogFileExt = log
-; 必须的格式
 DateStrFormat = 20060102
 DateTimeFormat = 2006-01-02 15:04:05
 TimeFormat = 15:04:05
 DateFormat = 2006-01-02
+ProjectPath = /casaOS/server
 
 
 [server]
 HttpPort = 8089
-RunMode = debug
-;ServerApi = http://113.52.135.30:8090
-;ServerApi = https://casaos.zimaboard.com
-;ServerApi = http://192.168.2.167:8090
-ServerApi = http://192.168.2.142:8090
+RunMode = release
+ServerApi = https://api.casaos.zimaboard.com
 
 [user]
 UserName = admin
 PWD = zimaboard
-Email = aaa@222.ddd
-Description = ddddddd
+Email = user@gmail.com
+Description = description
+Initialized = false
 Token = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6ImVyZXJlIiwicGFzc3dvcmQiOiJhZHNmZGYiLCJleHAiOjE2MjQwMDU0ODEsImlzcyI6Imdpbi1ibG9nIn0.JNsCccZuFCwlSMLJg62iOIB2xymk_k7xGa11xhZ07bc
 
 [zerotier]
-UserName = ddddd
-PWD =
+UserName = user
+PWD = pwd
 Token = yBKYyavr2RdFAIVN7iTpzlsB1o6CqTgm
 
 [redis]
-Host = 192.168.2.167:6379
+Host = 127.0.0.1:6379
 Password =
 MaxIdle = 30
 MaxActive = 30
 IdleTimeout = 200
 
 [system]
-AutoUpdate = true
-SearchSwitch = true
-WidgetsSwitch = false
-ShortcutsSwitch = true
-SearchEngine = baidu
-Background = http://baidu.com1
-BackgroundType = d
+ConfigStr = 
+WidgetList =
 

go.mod

@@ -1,13 +1,15 @@
-module oasis
+module github.com/IceWhaleTech/CasaOS
 
 go 1.16
 
 require (
+	github.com/Microsoft/go-winio v0.5.0 // indirect
+	github.com/Microsoft/hcsshim v0.8.22 // indirect
 	github.com/PuerkitoBio/goquery v1.7.0
 	github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
-	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
-	github.com/containerd/containerd v1.5.2
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible
+	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/docker/docker v20.10.7+incompatible
 	github.com/docker/go-connections v0.4.0
 	github.com/forease/gotld v0.0.0-20190808124948-c50ff635576b
@@ -15,43 +17,56 @@ require (
 	github.com/gin-gonic/gin v1.7.2
 	github.com/go-ini/ini v1.62.0
 	github.com/go-ole/go-ole v1.2.5 // indirect
-	github.com/go-openapi/jsonreference v0.19.6 // indirect
-	github.com/go-openapi/spec v0.20.3 // indirect
-	github.com/go-openapi/swag v0.19.15 // indirect
+	github.com/go-openapi/spec v0.20.4 // indirect
 	github.com/go-playground/validator/v10 v10.6.1 // indirect
-	github.com/golang/protobuf v1.5.2 // 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/gomodule/redigo v1.8.5
 	github.com/google/go-github/v36 v36.0.0
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gorilla/websocket v1.4.2
 	github.com/jinzhu/copier v0.3.2
 	github.com/json-iterator/go v1.1.11 // indirect
+	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-isatty v0.0.13 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
+	github.com/opencontainers/selinux v1.8.5 // indirect
+	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pkg/errors v0.9.1
 	github.com/prestonTao/upnp v0.0.0-20150206124352-f4370df5e109
+	github.com/prometheus/procfs v0.7.3 // indirect
 	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/sirupsen/logrus v1.8.1
+	github.com/smartystreets/assertions v1.2.0 // indirect
 	github.com/smartystreets/goconvey v1.6.4 // indirect
 	github.com/swaggo/gin-swagger v1.3.0
-	github.com/swaggo/swag v1.7.0
+	github.com/swaggo/swag v1.7.3
 	github.com/tidwall/gjson v1.8.0
+	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.6 // indirect
 	github.com/ugorji/go v1.2.6 // indirect
-	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e
-	golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
-	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
-	golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect
-	golang.org/x/tools v0.1.3 // indirect
-	google.golang.org/grpc v1.39.0 // indirect
+	go.opencensus.io v0.23.0 // indirect
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
+	golang.org/x/mod v0.5.0 // indirect
+	golang.org/x/net v0.0.0-20211020060615-d418f374d309 // indirect
+	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f
+	golang.org/x/sys v0.0.0-20211020174200-9d6173849985 // indirect
+	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
+	golang.org/x/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
-	gorm.io/driver/mysql v1.1.1 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 	gorm.io/driver/sqlite v1.1.5
 	gorm.io/gorm v1.21.15
-	src.techknowlogick.com/xgo v1.4.1-0.20210909190026-ce016894db20 // indirect
 )

go.sum

@@ -1,4 +1,5 @@
 bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8=
+bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@@ -10,17 +11,27 @@ cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6T
 cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
 cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
 cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
+cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
+cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
+cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
+cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
+cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
@@ -47,16 +58,19 @@ github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod h1:XB
 github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
 github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
 github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
-github.com/Microsoft/go-winio v0.4.17 h1:iT12IBVClFevaf8PuVyi3UmZOVh4OqnaLxDTW2O6j3w=
 github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
+github.com/Microsoft/go-winio v0.5.0 h1:Elr9Wn+sGKPlkaBvwu4mTrxtmOp3F3yV9qhaHbXGjwU=
+github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
 github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
 github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
 github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ=
 github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8=
 github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg=
 github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00=
-github.com/Microsoft/hcsshim v0.8.16 h1:8/auA4LFIZFTGrqfKhGBSXwM6/4X1fHa/xniyEHu8ac=
 github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600=
+github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4=
+github.com/Microsoft/hcsshim v0.8.22 h1:CulZ3GW8sNJExknToo+RWD+U+6ZM5kkNfuxywSDPd08=
+github.com/Microsoft/hcsshim v0.8.22/go.mod h1:91uVCVzvX2QD16sMCenoxxXo6L1wJnLMX2PSufFMtF0=
 github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU=
 github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
@@ -90,6 +104,9 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
+github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
+github.com/bits-and-blooms/bitset v1.2.1 h1:M+/hrU9xlMp7t4TyTDQW97d3tRPVuKFC6zBEK16QnXY=
+github.com/bits-and-blooms/bitset v1.2.1/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
 github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
@@ -102,6 +119,7 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw=
+github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -109,10 +127,12 @@ github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod h1:MA5e5Lr8slmE
 github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLIdUjrmSXlK9pkrsDlLHbO8jiB8X8JnOc=
 github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs=
 github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
+github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
 github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
@@ -142,20 +162,23 @@ github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMX
 github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.4.9/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.5.0-beta.1/go.mod h1:5HfvG1V2FsKesEGQ17k5/T7V960Tmcumvqn8Mc+pCYQ=
 github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo/uBBoBORwEx6ardVcmKU=
 github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09ZvgqEq8EfBp/m3lcVZIvPHhI=
 github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s=
-github.com/containerd/containerd v1.5.2 h1:MG/Bg1pbmMb61j3wHCFWPxESXHieiKr2xG64px/k8zQ=
-github.com/containerd/containerd v1.5.2/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g=
+github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g=
+github.com/containerd/containerd v1.5.7 h1:rQyoYtj4KddB3bxG6SAqd4+08gePNyJjRqvOIfV3rkM=
+github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c=
 github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod h1:cECdGN1O8G9bgKTlLhuPJimka6Xb/Gg7vYzCTNVxhvo=
 github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR3BEg7bDFaEddKm54WSmrol1fKWDU1nKYkgrcgZT7Y=
 github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ=
-github.com/containerd/continuity v0.1.0 h1:UFRRY5JemiAhPZrr/uE0n8fMTLcZsUvySPr1+D7pgr8=
 github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM=
+github.com/containerd/continuity v0.2.0 h1:j/9Wnn+hrEWjLvHuIxUU1YI5JjEjVlT2AA68cse9rwY=
+github.com/containerd/continuity v0.2.0/go.mod h1:wCYX+dRqZdImhGucXOqTQn05AhX6EUDaGEMUzTFFpLg=
 github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
 github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
 github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0=
@@ -213,13 +236,13 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
 github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
+github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw=
 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
 github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ=
@@ -231,7 +254,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
 github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
@@ -263,6 +285,7 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
@@ -312,19 +335,17 @@ github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3Hfo
 github.com/go-openapi/jsonreference v0.19.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
 github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
-github.com/go-openapi/jsonreference v0.19.4/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
 github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
 github.com/go-openapi/jsonreference v0.19.6 h1:UBIxjkht+AWIgYzCDSv2GN+E/togfwXUJFRTWhl2Jjs=
 github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns=
 github.com/go-openapi/spec v0.19.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
-github.com/go-openapi/spec v0.19.14/go.mod h1:gwrgJS15eCUgjLpMjBJmbZezCsw88LmgeEip0M63doA=
-github.com/go-openapi/spec v0.20.3 h1:uH9RQ6vdyPSs2pSy9fL8QPspDF2AMIMPtmK5coSSjtQ=
 github.com/go-openapi/spec v0.20.3/go.mod h1:gG4F8wdEDN+YPBMVnzE85Rbhf+Th2DTvA9nFPQ5AYEg=
+github.com/go-openapi/spec v0.20.4 h1:O8hJrt0UMnhHcluhIdUgCLRWyM2x7QkBXRvOs7m+O1M=
+github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I=
 github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.11/go.mod h1:Uc0gKkdR+ojzsEpjh39QChyu92vPgIr72POcgHMAgSY=
 github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
 github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM=
 github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
@@ -338,16 +359,17 @@ github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GO
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
 github.com/go-playground/validator/v10 v10.6.1 h1:W6TRDXt4WcWp4c4nf/G+6BkGdhiIo0k417gfr+V6u4I=
 github.com/go-playground/validator/v10 v10.6.1/go.mod h1:xm76BBt941f7yWdGnI2DVPFFg1UK3YY04qifoXU3lOk=
-github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
-github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
 github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU=
-github.com/gogo/googleapis v1.4.0 h1:zgVt4UpGxcqVOw97aRGxT4svlcmdK35fynLNctY32zI=
 github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c=
+github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0=
+github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
@@ -355,18 +377,23 @@ github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
+github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
 github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -392,9 +419,11 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
@@ -406,17 +435,21 @@ github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg=
@@ -450,6 +483,7 @@ github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ
 github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
+github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA=
 github.com/jinzhu/copier v0.3.2 h1:QdBOCbaouLDYaIPFfi1bKv5F5tPpeTwXe4sD0jqtz5w=
@@ -480,14 +514,16 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-github.com/klauspost/compress v1.11.13 h1:eSvu8Tmq6j2psUJqJrLcWH6K3w5Dwc+qipbaA6eVEN4=
 github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
+github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
+github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
@@ -511,8 +547,8 @@ github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.13 h1:qdl+GuBjcsKKDco5BsxPJlId98mSWNKqYA+Co0SC1yA=
-github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
 github.com/mattn/go-sqlite3 v1.14.8 h1:gDp86IdQsN/xWjIEmr9MF6o9mpksUgh0fu+9ByFxzIU=
@@ -547,7 +583,6 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
@@ -577,18 +612,24 @@ github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5X
 github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
-github.com/opencontainers/runc v1.0.0-rc93 h1:x2UMpOOVf3kQ8arv/EsDGwim8PTNqzL1/EYDr/+scOM=
 github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0=
+github.com/opencontainers/runc v1.0.2 h1:opHZMaswlyxz1OuGpBE53Dwe4/xF7EZTY0A2L/FpCOg=
+github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0=
 github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d h1:pNa8metDkwZjb9g4T8s+krQ+HRgZAkqnXml+wNir/+s=
 github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 h1:3snG66yBm59tKhhSPQrQ/0bCrv1LQbKt40LnUPiUxdc=
+github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
 github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE=
-github.com/opencontainers/selinux v1.8.0 h1:+77ba4ar4jsCbL1GLbFL8fFM57w6suPfSS9PDLDY7KM=
 github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo=
+github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8=
+github.com/opencontainers/selinux v1.8.5 h1:OkT6bMHOQ1JQQO4ihjQ49sj0+wciDcjziSVTRn8VeTA=
+github.com/opencontainers/selinux v1.8.5/go.mod h1:HTvjPFoGMbpQsG886e3lQwnsRWtE4TC1OF3OUvG9FAo=
+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
@@ -629,8 +670,9 @@ github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
+github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
 github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
@@ -644,6 +686,7 @@ github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh
 github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
 github.com/shirou/gopsutil/v3 v3.21.5 h1:YUBf0w/KPLk7w1803AYBnH7BmA+1Z/Q5MEZxpREUaB4=
 github.com/shirou/gopsutil/v3 v3.21.5/go.mod h1:ghfMypLDrFSWN2c9cDYFLHyynQ+QUht0cv/18ZqVczw=
+github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
 github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
@@ -654,8 +697,9 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs=
+github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
 github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
@@ -684,14 +728,15 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14/go.mod h1:gxQT6pBGRuIGunNf/+tSOB5OHvguWi8Tbt82WOkf35E=
 github.com/swaggo/gin-swagger v1.3.0 h1:eOmp7r57oUgZPw2dJOjcGNMse9cvXcI4tTqBcnZtPsI=
 github.com/swaggo/gin-swagger v1.3.0/go.mod h1:oy1BRA6WvgtCp848lhxce7BnWH4C8Bxa0m5SkWx+cS0=
 github.com/swaggo/swag v1.5.1/go.mod h1:1Bl9F/ZBpVWh22nY0zmYyASPO1lI/zIwRDrpZU+tv8Y=
-github.com/swaggo/swag v1.7.0 h1:5bCA/MTLQoIqDXXyHfOpMeDvL9j68OY/udlK4pQoo4E=
-github.com/swaggo/swag v1.7.0/go.mod h1:BdPIL73gvS9NBsdi7M1JOxLvlbfvNRaBP8m6WT6Aajo=
+github.com/swaggo/swag v1.7.3 h1:ucB7irEdRrhjmW+Z1Ss4GjO68oPKQFjSgOR8BCAvcbU=
+github.com/swaggo/swag v1.7.3/go.mod h1:zD8h6h4SPv7t3l+4BKdRquqW1ASWjKZgT6Qv9z3kNqI=
 github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
@@ -700,8 +745,9 @@ github.com/tidwall/gjson v1.8.0 h1:Qt+orfosKn0rbNTZqHYDqBrmm3UDA4KRkv70fDzG+PQ=
 github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
 github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
 github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.1.0 h1:K3hMW5epkdAVwibsQEfR/7Zj0Qgt4DxtNumTq/VloO8=
 github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tklauser/go-sysconf v0.3.4/go.mod h1:Cl2c8ZRWfHD5IrfHo9VN+FX9kCFjIOyVklgXycLB6ek=
 github.com/tklauser/go-sysconf v0.3.6 h1:oc1sJWvKkmvIxhDHeKWvZS4f6AW+YcoguSfRF2/Hmo4=
 github.com/tklauser/go-sysconf v0.3.6/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI=
@@ -710,6 +756,7 @@ github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefld
 github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go v1.1.13/go.mod h1:jxau1n+/wyTGLQoCkjok9r5zFa/FxT6eI5HiHKQszjc=
@@ -732,16 +779,17 @@ github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmF
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
-github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE=
 github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
 github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
 github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
@@ -753,8 +801,10 @@ go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvS
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
+go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -773,8 +823,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e h1:gsTQYXdTw2Gq7RBsWvlQ91b+aEQ6bXFUngBGuR8sPpI=
-golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -805,8 +855,9 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.5.0 h1:UG21uOlmZabA4fW5i7ZX6bjw1xELEGg/ZLgZq9auk/Q=
+golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -827,6 +878,7 @@ golang.org/x/net v0.0.0-20190611141213-3f473d35a33a/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -838,6 +890,11 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
@@ -848,20 +905,23 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
-golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
-golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211020060615-d418f374d309 h1:A0lJIi+hcTR6aajJH4YqKWwohY4aW9RO7oRMcdv+HKI=
+golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f h1:Qmd2pbz05z7z6lm0DrgQVVPuBm92jqujBKMHMOlOQEw=
+golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -915,9 +975,15 @@ golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -928,6 +994,7 @@ golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210217105451-b926d437f341/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -935,12 +1002,17 @@ golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211020174200-9d6173849985 h1:LOlKVhfDyahgmqa97awczplwkjzNaELFg3zRIJ13RYo=
+golang.org/x/sys v0.0.0-20211020174200-9d6173849985/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE=
+golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -948,15 +1020,16 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 h1:Vv0JUPWTyeqUq42B2WJ1FeIDjjvGKoA2Ss+Ts0lAVbs=
-golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs=
+golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -993,12 +1066,22 @@ golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
+golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20201120155355-20be4ac4bd6e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.3 h1:L69ShwSZEyCsLKoAxDKeMvLDZkumEe8gXUZAjab0tX8=
-golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
+golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ=
+golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1014,13 +1097,21 @@ google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsb
 google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
+google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
+google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -1041,11 +1132,22 @@ google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvx
 google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
 google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a h1:pOwg4OoaRYScjmR4LlLgdtnyoHYTSAVhhqe5uPdpII8=
+google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
+google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0 h1:5Tbluzus3QxoAJx4IefGt1W0HQZW4nuMrVk684jI74Q=
+google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
@@ -1058,12 +1160,16 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.39.0 h1:Klz8I9kdtkIN6EpHHUOMLCYhTn/2WAe5a0s1hcBkdTI=
-google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
+google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.41.0 h1:f+PlOh7QV4iIJkPrx5NQ7qaNGFQ3OTse67yaDHfju4E=
+google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -1075,16 +1181,18 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
@@ -1111,13 +1219,11 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/mysql v1.1.1 h1:yr1bpyqiwuSPJ4aGGUX9nu46RHXlF8RASQVb1QQNcvo=
-gorm.io/driver/mysql v1.1.1/go.mod h1:KdrTanmfLPPyAOeYGyG+UpDys7/7eeWT1zCq+oekYnU=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/driver/sqlite v1.1.5 h1:JU8G59VyKu1x1RMQgjefQnkZjDe9wHc1kARDZPu5dZs=
 gorm.io/driver/sqlite v1.1.5/go.mod h1:NpaYMcVKEh6vLJ47VP6T7Weieu4H1Drs3dGD/K6GrGc=
-gorm.io/gorm v1.21.9/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0=
 gorm.io/gorm v1.21.15 h1:gAyaDoPw0lCyrSFWhBlahbUA1U4P5RViC1uIqoB+1Rk=
 gorm.io/gorm v1.21.15/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
@@ -1131,6 +1237,7 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo=
 k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ=
 k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8=
@@ -1165,5 +1272,3 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
 sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
-src.techknowlogick.com/xgo v1.4.1-0.20210909190026-ce016894db20 h1:kLvR3yWbtk+Gkkoqy++vULhSfn5WY93Y+mf3BtO+mUk=
-src.techknowlogick.com/xgo v1.4.1-0.20210909190026-ce016894db20/go.mod h1:31CE1YKtDOrKTk9PSnjTpe6YbO6W/0LTYZ1VskL09oU=

main.go

@@ -3,53 +3,64 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/gin-gonic/gin"
+	"net/http"
+	"time"
+
+	"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/route"
+	"github.com/IceWhaleTech/CasaOS/service"
+
 	"github.com/robfig/cron"
 	"gorm.io/gorm"
-	"net/http"
-	"oasis/pkg/config"
-	"oasis/pkg/sqlite"
-	loger2 "oasis/pkg/utils/loger"
-	"oasis/route"
-	"oasis/service"
-	"time"
 )
 
 var sqliteDB *gorm.DB
 
-var swagHandler gin.HandlerFunc
 var configFlag = flag.String("c", "", "config address")
 
+var showUserInfo = flag.Bool("show-user-info", false, "show user info")
+
 func init() {
 	flag.Parse()
 	config.InitSetup(*configFlag)
+	config.UpdateSetup()
 	loger2.LogSetup()
 	sqliteDB = sqlite.GetDb(config.AppInfo.ProjectPath)
 	//gredis.GetRedisConn(config.RedisInfo),
 	service.MyService = service.NewService(sqliteDB, loger2.NewOLoger())
+	service.Cache = cache.Init()
 }
 
-// @title Oasis API
+// @title casaOS API
 // @version 1.0.0
 // @contact.name lauren.pan
 // @contact.url https://www.zimaboard.com
 // @contact.email lauren.pan@icewhale.org
-// @description Oasis v1版本api
-// @host 192.168.2.114:8089
+// @description casaOS v1版本api
+// @host 192.168.2.217:8089
 // @securityDefinitions.apikey ApiKeyAuth
 // @in header
 // @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)
+		return
+	}
 	//model.Setup()
 	//gredis.Setup()
-	r := route.InitRouter(swagHandler)
-	service.SyncTask(sqliteDB)
+	r := route.InitRouter()
+	//service.SyncTask(sqliteDB)
 	cron2 := cron.New() //创建一个cron实例
 	//执行定时任务（每5秒执行一次）
 	err := cron2.AddFunc("0 0 0 1/1 * *", func() {
 		//service.UpdataDDNSList(mysqldb)
-		service.SyncTask(sqliteDB)
+		//service.SyncTask(sqliteDB)
 	})
 	if err != nil {
 		fmt.Println(err)

model/app.go

@@ -7,32 +7,35 @@ import (
 )
 
 type ServerAppList struct {
-	Id             uint       `gorm:"column:id;primary_key" json:"id"`
-	Title          string     `json:"title"`
-	Description    string     `json:"description"`
-	Tagline        string     `json:"tagline"`
-	Tags           Strings    `gorm:"type:json" json:"tags"`
-	Icon           string     `json:"icon"`
-	ScreenshotLink Strings    `gorm:"type:json" json:"screenshot_link"`
-	Category       string     `json:"category"`
-	TcpPort        uint       `json:"tcp_port"`
-	PortMap        uint       `json:"port_map"`
-	ImageVersion   string     `json:"image_version"`
-	Tip            string     `json:"tip"`
-	Configures     configures `gorm:"type:json" json:"configures"`
-	NetworkModel   string     `json:"network_mode"`
-	Image          string     `json:"image"`
-	Index          string     `json:"index"`
-	CreatedAt      time.Time  `json:"created_at"`
-	UpdatedAt      time.Time  `json:"updated_at"`
-	State          string     `json:"state"`
-	Author         string     `json:"author"`
-	MinMemory      int        `json:"min_memory"`
-	MinDisk        int        `json:"min_disk"`
-	MaxMemory      uint64     `json:"max_memory"`
-	Thumbnail      string     `json:"thumbnail"`
-	Healthy        string     `json:"healthy"`
-	Plugins        Strings    `json:"plugins"`
+	Id             uint      `gorm:"column:id;primary_key" json:"id"`
+	Title          string    `json:"title"`
+	Description    string    `json:"description"`
+	Tagline        string    `json:"tagline"`
+	Tags           Strings   `gorm:"type:json" json:"tags"`
+	Icon           string    `json:"icon"`
+	ScreenshotLink Strings   `gorm:"type:json" json:"screenshot_link"`
+	Category       string    `json:"category"`
+	PortMap        string    `json:"port_map"`
+	ImageVersion   string    `json:"image_version"`
+	Tip            string    `json:"tip"`
+	Envs           EnvArray  `json:"envs"`
+	Ports          PortArray `json:"ports"`
+	Volumes        PathArray `json:"volumes"`
+	Devices        PathArray `json:"devices"`
+	NetworkModel   string    `json:"network_model"`
+	Image          string    `json:"image"`
+	Index          string    `json:"index"`
+	CreatedAt      time.Time `json:"created_at"`
+	UpdatedAt      time.Time `json:"updated_at"`
+	State          string    `json:"state"`
+	Author         string    `json:"author"`
+	MinMemory      int       `json:"min_memory"`
+	MinDisk        int       `json:"min_disk"`
+	MaxMemory      uint64    `json:"max_memory"`
+	Thumbnail      string    `json:"thumbnail"`
+	Healthy        string    `json:"healthy"`
+	Plugins        Strings   `json:"plugins"`
+	Origin         string    `json:"origin"`
 }
 
 type Ports struct {

model/manifest.go

@@ -17,20 +17,22 @@ type UdpPorts struct {
 /*******************使用gorm支持json************************************/
 
 type PortMap struct {
-	ContainerPort string `json:"container,omitempty"`
-	CommendPort   string `json:"host,omitempty"`
+	ContainerPort string `json:"container"`
+	CommendPort   string `json:"host"`
 	Protocol      string `json:"protocol"`
+	Desc          string `json:"desc"`
+	Type          int    `json:"type"`
 }
 
-type PortArrey []PortMap
+type PortArray []PortMap
 
 // Value 实现方法
-func (p PortArrey) Value() (driver.Value, error) {
+func (p PortArray) Value() (driver.Value, error) {
 	return json.Marshal(p)
 }
 
 // Scan 实现方法
-func (p *PortArrey) Scan(input interface{}) error {
+func (p *PortArray) Scan(input interface{}) error {
 	return json.Unmarshal(input.([]byte), p)
 }
 
@@ -41,20 +43,22 @@ func (p *PortArrey) Scan(input interface{}) error {
 type Env struct {
 	Name  string `json:"container"`
 	Value string `json:"host"`
+	Desc  string `json:"desc"`
+	Type  int    `json:"type"`
 }
 
 type JSON json.RawMessage
 
-type EnvArrey []Env
+type EnvArray []Env
 
 // Value 实现方法
-func (p EnvArrey) Value() (driver.Value, error) {
+func (p EnvArray) Value() (driver.Value, error) {
 	return json.Marshal(p)
 	//return .MarshalJSON()
 }
 
 // Scan 实现方法
-func (p *EnvArrey) Scan(input interface{}) error {
+func (p *EnvArray) Scan(input interface{}) error {
 	return json.Unmarshal(input.([]byte), p)
 }
 
@@ -65,17 +69,19 @@ func (p *EnvArrey) Scan(input interface{}) error {
 type PathMap struct {
 	ContainerPath string `json:"container"`
 	Path          string `json:"host"`
+	Type          int    `json:"type"`
+	Desc          string `json:"desc"`
 }
 
-type PathArrey []PathMap
+type PathArray []PathMap
 
 // Value 实现方法
-func (p PathArrey) Value() (driver.Value, error) {
+func (p PathArray) Value() (driver.Value, error) {
 	return json.Marshal(p)
 }
 
 // Scan 实现方法
-func (p *PathArrey) Scan(input interface{}) error {
+func (p *PathArray) Scan(input interface{}) error {
 	return json.Unmarshal(input.([]byte), p)
 }
 
@@ -103,10 +109,10 @@ type CustomizationPostData struct {
 	Index        string    `json:"index"`
 	Icon         string    `json:"icon"`
 	Image        string    `json:"image"`
-	Envs         EnvArrey  `json:"envs"`
-	Ports        PortArrey `json:"ports"`
-	Volumes      PathArrey `json:"volumes"`
-	Devices      PathArrey `json:"devices"`
+	Envs         EnvArray  `json:"envs"`
+	Ports        PortArray `json:"ports"`
+	Volumes      PathArray `json:"volumes"`
+	Devices      PathArray `json:"devices"`
 	//Port         string    `json:"port,omitempty"`
 	PortMap     string `json:"port_map"`
 	CpuShares   int64  `json:"cpu_shares"`

model/search.go

@@ -0,0 +1,7 @@
+package model
+
+type SearchFileInfo struct {
+	Path string `json:"path"`
+	Name string `json:"name"`
+	Type int    `json:"type"`
+}

model/sys_common.go

@@ -15,6 +15,7 @@ type UserModel struct {
 	Head        string
 	Email       string
 	Description string
+	Initialized bool
 }
 
 //服务配置
@@ -60,11 +61,7 @@ type RedisModel struct {
 }
 
 type SystemConfig struct {
-	SearchSwitch    bool   `json:"search_switch"` //搜索开关
-	SearchEngine    string `json:"search_engine"` //搜索引擎
-	ShortcutsSwitch bool   `json:"shortcuts_switch"`
-	WidgetsSwitch   bool   `json:"widgets_switch"`
-	BackgroundType  string `json:"background_type"`
-	Background      string `json:"background"`
-	AutoUpdate      bool   `json:"auto_update"`
+	ConfigStr  string `json:"config_str"`
+	WidgetList string `json:"widget_list"`
+	ConfigPath string `json:"config_path"`
 }

model/zima.go

@@ -1,6 +1,7 @@
 package model
 
 type Path struct {
-	Name string `json:"name"`
-	Path string `json:"path"`
+	Name  string `json:"name"`
+	Path  string `json:"path"`
+	IsDir bool   `json:"is_dir"`
 }

pkg/cache/cache.go

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

pkg/config/init.go

@@ -2,14 +2,15 @@ package config
 
 import (
 	"fmt"
-	"github.com/go-ini/ini"
 	"log"
-	"oasis/model"
 	"os"
 	"path"
 	"path/filepath"
 	"runtime"
 	"strings"
+
+	"github.com/IceWhaleTech/CasaOS/model"
+	"github.com/go-ini/ini"
 )
 
 //系统配置
@@ -55,7 +56,9 @@ func InitSetup(config string) {
 	mapTo("redis", RedisInfo)
 	mapTo("server", ServerInfo)
 	mapTo("system", SystemConfigInfo)
-	AppInfo.ProjectPath = getCurrentDirectory() //os.Getwd()
+	SystemConfigInfo.ConfigPath = configDir
+	//	AppInfo.ProjectPath = getCurrentDirectory() //os.Getwd()
+
 }
 
 //映射

pkg/config/update.go

@@ -0,0 +1,15 @@
+package config
+
+import "github.com/IceWhaleTech/CasaOS/pkg/utils/file"
+
+//检查目录是否存在
+func mkdirDATAAll() {
+	dirArray := [7]string{"/DATA/AppData", "/DATA/Documents", "/DATA/Downloads", "/DATA/Gallery", "/DATA/Media/Movies", "/DATA/Media/TV Shows", "/DATA/Media/Music"}
+	for _, v := range dirArray {
+		file.IsNotExistMkDir(v)
+	}
+}
+
+func UpdateSetup() {
+	mkdirDATAAll()
+}

pkg/docker/helper.go

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

pkg/docker/volumes.go

@@ -1,10 +1,25 @@
 package docker
 
+import "strings"
+
 func GetDir(id, envName string) string {
 	var path string
-	switch envName {
-	case "/config":
-		path = "/oasis/app_data/" + id + "/"
+
+	if len(id) == 0 {
+		id = "$AppID"
+	}
+
+	switch {
+	case strings.Contains(strings.ToLower(envName), "config"):
+		path = "/DATA/AppData/" + id + "/"
+	case strings.Contains(strings.ToLower(envName), "movie"):
+		path = "/DATA/Media/Movies/"
+	case strings.Contains(strings.ToLower(envName), "music"):
+		path = "/DATA/Media/Music/"
+	case strings.Contains(strings.ToLower(envName), "download"):
+		path = "/DATA/Downloads/"
+	case strings.Contains(strings.ToLower(envName), "photo") || strings.Contains(strings.ToLower(envName), "pictures"):
+		path = "/DATA/Downloads/"
 	default:
 		//path = "/media"
 	}

pkg/docker/volumes_test.go

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

pkg/github/github_test.go

@@ -1,7 +0,0 @@
-package github
-
-import "testing"
-
-func TestGetRepos(t *testing.T) {
-	GetRepos()
-}

pkg/gredis/redis.go

@@ -1,9 +1,10 @@
 package gredis
 
 import (
-	"github.com/gomodule/redigo/redis"
-	"oasis/model"
 	"time"
+
+	"github.com/IceWhaleTech/CasaOS/model"
+	"github.com/gomodule/redigo/redis"
 )
 
 func GetRedisConn(m *model.RedisModel) *redis.Pool {

pkg/sqlite/db.go

@@ -2,10 +2,10 @@ package sqlite
 
 import (
 	"fmt"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
+	model2 "github.com/IceWhaleTech/CasaOS/service/model"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
-	"oasis/pkg/utils/file"
-	model2 "oasis/service/model"
 	"time"
 )
 

pkg/upnp/device_test.go

@@ -1,8 +1,9 @@
 package upnp
 
 import (
-	ip_helper2 "oasis/pkg/utils/ip_helper"
 	"testing"
+
+	ip_helper2 "github.com/IceWhaleTech/CasaOS/pkg/utils/ip_helper"
 )
 
 func TestGetCtrlUrl(t *testing.T) {

pkg/upnp/gateway.go

@@ -1,9 +1,9 @@
 package upnp
 
 import (
+	ip_helper2 "github.com/IceWhaleTech/CasaOS/pkg/utils/ip_helper"
 	"github.com/pkg/errors"
 	"net"
-	ip_helper2 "oasis/pkg/utils/ip_helper"
 	"strings"
 )
 

pkg/utils/env_helper/env.go

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

pkg/utils/file/file.go

@@ -50,6 +50,7 @@ func MkDir(src string) error {
 	if err != nil {
 		return err
 	}
+	os.Chmod(src, 0777)
 
 	return nil
 }
@@ -100,10 +101,9 @@ func MustOpen(fileName, filePath string) (*os.File, error) {
 	return f, nil
 }
 
-
 // 判断所给路径文件/文件夹是否存在
 func Exists(path string) bool {
-	_, err := os.Stat(path)    //os.Stat获取文件信息
+	_, err := os.Stat(path) //os.Stat获取文件信息
 	if err != nil {
 		if os.IsExist(err) {
 			return true
@@ -126,3 +126,23 @@ func IsDir(path string) bool {
 func IsFile(path string) bool {
 	return !IsDir(path)
 }
+
+func CreateFile(path string) error {
+	file, err := os.Create(path)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+	return nil
+}
+
+// IsNotExistMkDir create a directory if it does not exist
+func IsNotExistCreateFile(src string) error {
+	if notExist := CheckNotExist(src); notExist == true {
+		if err := CreateFile(src); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

pkg/utils/file/reader.go

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

pkg/utils/httper/httper.go

@@ -3,12 +3,13 @@ package httper
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/tidwall/gjson"
 	"io"
 	"io/ioutil"
 	"net/http"
-	"oasis/pkg/config"
 	"time"
+
+	"github.com/IceWhaleTech/CasaOS/pkg/config"
+	"github.com/tidwall/gjson"
 )
 
 //发送GET请求

pkg/utils/ip_helper/ip.go

@@ -1,8 +1,8 @@
 package ip_helper
 
 import (
+	httper2 "github.com/IceWhaleTech/CasaOS/pkg/utils/httper"
 	"net"
-	httper2 "oasis/pkg/utils/httper"
 	"strings"
 )
 

pkg/utils/jwt/jwt.go

@@ -1,8 +1,9 @@
 package jwt
 
 import (
-	jwt "github.com/dgrijalva/jwt-go"
 	"time"
+
+	jwt "github.com/golang-jwt/jwt"
 )
 
 type Claims struct {
@@ -15,8 +16,7 @@ var jwtSecret []byte
 
 //创建token
 func GenerateToken(username, password string) (string, error) {
-	nowTime := time.Now()
-	expireTime := nowTime.Add(3 * time.Hour)
+	expireTime := time.Now().AddDate(999, 0, 0)
 	clims := Claims{
 		username,
 		password,

pkg/utils/jwt/jwt_helper.go

@@ -2,12 +2,12 @@ package jwt
 
 import (
 	"fmt"
-	"github.com/gin-gonic/gin"
 	"net/http"
-	"oasis/model"
-	loger2 "oasis/pkg/utils/loger"
-	oasis_err2 "oasis/pkg/utils/oasis_err"
-	"time"
+
+	"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 {
@@ -22,13 +22,15 @@ func JWT(swagHandler gin.HandlerFunc) gin.HandlerFunc {
 			code = oasis_err2.INVALID_PARAMS
 		}
 		if swagHandler == nil {
-			claims, err := ParseToken(token)
+			//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
 			}
+			//else if time.Now().Unix() > claims.ExpiresAt {
+			//	code = oasis_err2.ERROR_AUTH_TOKEN
+			//}
 		}
 
 		if code != oasis_err2.SUCCESS {

pkg/utils/loger/log.go

@@ -3,12 +3,12 @@ package loger
 import (
 	"fmt"
 	"log"
-	"oasis/pkg/config"
-	file2 "oasis/pkg/utils/file"
 	"os"
 	"path/filepath"
 	"runtime"
-	"time"
+
+	"github.com/IceWhaleTech/CasaOS/pkg/config"
+	file2 "github.com/IceWhaleTech/CasaOS/pkg/utils/file"
 )
 
 //定义一个int的别名
@@ -20,6 +20,7 @@ type OLog interface {
 	Warn(v ...interface{})
 	Error(v ...interface{})
 	Fatal(v ...interface{})
+	Path() string
 }
 
 type oLog struct {
@@ -47,9 +48,8 @@ const (
 func LogSetup() {
 	var err error
 	filePath := fmt.Sprintf("%s", config.AppInfo.LogSavePath)
-	fileName := fmt.Sprintf("%s%s.%s",
+	fileName := fmt.Sprintf("%s.%s",
 		config.AppInfo.LogSaveName,
-		time.Now().Format(config.AppInfo.DateStrFormat),
 		config.AppInfo.LogFileExt,
 	)
 	F, err = file2.MustOpen(fileName, filePath)
@@ -60,7 +60,14 @@ func LogSetup() {
 	logger = log.New(F, DefaultPrefix, log.LstdFlags)
 
 }
-
+func (o *oLog) Path() string {
+	filePath := fmt.Sprintf("%s", config.AppInfo.LogSavePath)
+	fileName := fmt.Sprintf("%s.%s",
+		config.AppInfo.LogSaveName,
+		config.AppInfo.LogFileExt,
+	)
+	return filePath + fileName
+}
 func (o *oLog) Debug(v ...interface{}) {
 	setPrefix(DEBUG)
 	logger.Println(v)

pkg/utils/oasis_err/e.go

@@ -7,10 +7,14 @@ const (
 	ERROR_AUTH_TOKEN = 401
 
 	//user
-	PWD_INVALID = 10001
+	PWD_INVALID  = 10001
+	PWD_IS_EMPTY = 10002
 
+	PWD_INVALID_OLD = 10003
 	//system
-	DIR_ALREADY_EXISTS = 20001
+	DIR_ALREADY_EXISTS  = 20001
+	FILE_ALREADY_EXISTS = 20002
+	FILE_OR_DIR_EXISTS  = 20003
 
 	//zerotier
 	GET_TOKEN_ERROR = 30001
@@ -35,11 +39,14 @@ var MsgFlags = map[int]string{
 	ERROR_AUTH_TOKEN: "error auth token",
 
 	//user
-	PWD_INVALID: "Password invalid",
+	PWD_INVALID:     "Password invalid",
+	PWD_IS_EMPTY:    "Password is empty",
+	PWD_INVALID_OLD: "Old Password invalid",
 
 	//system
-	DIR_ALREADY_EXISTS: "Directory already exists",
-
+	DIR_ALREADY_EXISTS:  "Directory already exists",
+	FILE_ALREADY_EXISTS: "File already exists",
+	FILE_OR_DIR_EXISTS:  "File or directory already exists",
 
 	//zerotier
 	GET_TOKEN_ERROR: "Get token error,Please log in to zerotier's official website to confirm whether the account is available",

pkg/utils/port/port.go

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

pkg/utils/sort/app_info_dev.go

@@ -1,7 +1,7 @@
 package sort
 
 import (
-	"oasis/model"
+	"github.com/IceWhaleTech/CasaOS/model"
 	"sort"
 )
 

pkg/utils/sort/app_info_evn.go

@@ -1,8 +1,9 @@
 package sort
 
 import (
-	"oasis/model"
 	"sort"
+
+	"github.com/IceWhaleTech/CasaOS/model"
 )
 
 // 数据集类型, 与上一篇排序文章(多字段单独排序)比较, less字段的数据类型不再是 func(p1, p2 *Change) bool

pkg/utils/sort/app_info_port.go

@@ -1,7 +1,7 @@
 package sort
 
 import (
-	"oasis/model"
+	"github.com/IceWhaleTech/CasaOS/model"
 	"sort"
 )
 

pkg/utils/sort/app_info_vol.go

@@ -1,7 +1,7 @@
 package sort
 
 import (
-	"oasis/model"
+	"github.com/IceWhaleTech/CasaOS/model"
 	"sort"
 )
 

pkg/utils/version/version.go

@@ -2,13 +2,14 @@ package version
 
 import (
 	json2 "encoding/json"
-	"github.com/tidwall/gjson"
-	"oasis/model"
-	"oasis/pkg/config"
-	"oasis/pkg/utils/httper"
-	"oasis/types"
 	"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) {
@@ -35,3 +36,23 @@ func IsNeedUpdate() (bool, model.Version) {
 	}
 	return false, version
 }
+
+//a版本大于b版本
+func VersionCompared(a string, b string) bool {
+	v1 := strings.Split(a, ".")
+	v2 := strings.Split(b, ".")
+	for len(v1) < len(v2) {
+		v1 = append(v1, "0")
+	}
+	for len(v2) < len(v1) {
+		v2 = append(v2, "0")
+	}
+	for i := 0; i < len(v1); i++ {
+		a, _ := strconv.Atoi(v1[i])
+		b, _ := strconv.Atoi(v2[i])
+		if a > b {
+			return true
+		}
+	}
+	return false
+}

pkg/zerotier/zerotier_api.go

@@ -1,13 +1,12 @@
 package zerotier
 
 import (
+	httper2 "github.com/IceWhaleTech/CasaOS/pkg/utils/httper"
 	"github.com/tidwall/gjson"
 	"net/http"
-	httper2 "oasis/pkg/utils/httper"
 )
 
-func PostData(url,token string, data string) interface{} {
-
+func PostData(url, token string, data string) interface{} {
 
 	body, code := httper2.ZeroTierPostJson(url, data, GetHead(token))