Update goreleaser

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,57 +8,39 @@ assignees: ''
 ---
 
 **Describe the bug**
-
+A clear and concise description of what the bug is.
-> A clear and concise description of what the bug is.
 
 **To Reproduce**
-
+Steps to reproduce the behavior:
-> Steps to reproduce the behavior:
-
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
 **Expected behavior**
-
+A clear and concise description of what you expected to happen.
-> A clear and concise description of what you expected to happen.
 
 **Screenshots**
-
+If applicable, add screenshots to help explain your problem.
-> If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
-
-```
  - OS: [e.g. iOS]
  - Browser [e.g. chrome, safari]
  - Version [e.g. 22]
-```
-
-**System Time**
-
-> Run `timedatectl` and share the output
-
-```
-(timedatectl output here)
-```
 
 **Logs**
 
-> Run following command to collect corresponding logs:
+run following command to collect corresponding logs:
 
 ```bash
 sudo journalctl -xef -u casaos-gateway
 sudo journalctl -xef -u casaos-user-service
 sudo journalctl -xef -u casaos-local-storage
-sudo journalctl -xef -u casaos-app-management
 sudo journalctl -xef -u casaos.service
 ```
 
 
-**Additional context**
 
-> Add any other context about the problem here.
+
-> 
+**Additional context**
-> If you are a Zimaboard user, make it explicit with when you got your Zimaboard.
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feedback.yml

@@ -0,0 +1,23 @@
+name: "Feedback"
+description: Feedback, showcases, thoughts, needs and questions, etc.
+title: "[Feedback] "
+labels: ["feedback"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ### ❤️ Thanks for your feedback!
+        > Come join our [Discord community](https://discord.gg/knqAbbBbeX) and paint the ideal home cloud with us.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      placeholder: What do you want to tell us?
+    validations:
+      required: true
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Information
+      description: Please add logs/files/screenshots if you have them to help us better understanding.
+

.github/ISSUE_TEMPLATE/submit-application.md

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

.github/workflows/casa.yml

@@ -65,7 +65,7 @@ jobs:
       #          ls
       
 
-      - name: Set environment for github-release
+      - 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

.github/workflows/demo.yml

@@ -33,9 +33,8 @@ jobs:
           
       - name: Get old instance and snapshot name, create new instance name
         run: | 
-          echo "OLD_INSTANCE_SNAPSHOT_NAME=updateto_to_0.4.4-1684926517" >> $GITHUB_ENV
+          echo "OLD_INSTANCE_SNAPSHOT_NAME=$(aws lightsail get-instance-snapshots | grep '"name": "updateto_to_0.4.1-1676285322' | sed 's/ //g' | sed 's/"//g' | sed 's/,//g' | sed 's/name://g')" >> $GITHUB_ENV
-          echo "OLD_INSTANCE_NAME=$(aws lightsail get-instances | grep '"name": "CasaOS-Demo-[0-9]' | tail -1 | sed 's/ //g' | sed 's/"//g' | sed 's/,//g' | sed 's/name://g')" >> $GITHUB_ENV
+          echo "OLD_INSTANCE_NAME=$(aws lightsail get-instances | grep '"name": "CasaOS-Demo-[0-9]' | sed 's/ //g' | sed 's/"//g' | sed 's/,//g' | sed 's/name://g')" >> $GITHUB_ENV
-          # echo "OLD_INSTANCE_NAME=CasaOS-Demo-1687680295" >> $GITHUB_ENV
           echo "NEW_INSTANCE_NAME= CasaOS-Demo-$(date +%s)" >> $GITHUB_ENV
           
       - name: Create instances from snapshot
@@ -76,9 +75,5 @@ jobs:
         run: | 
           aws lightsail delete-instance \
             --instance-name ${{ env.OLD_INSTANCE_NAME }}
-      - name: Demo Reset Error Handling
-        if: ${{ failure() }}
-        run: |
-          curl -X POST -H "Content-Type: application/json" -d '{"msg_type":"text","content":{"text":"Demo Reset Error"}}' ${{ secrets.SSH_ROBOT_URL }} 
             
             

.github/workflows/publish_npm.yaml

@@ -1,46 +0,0 @@
-name: publish npm
-
-on:
-  push:
-    tags:
-      - v*.*.*
-  workflow_dispatch:
-
-permissions:
-  contents: write
-
-jobs:
-  publish-npm:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-          registry-url: https://registry.npmjs.org/
-          
-      - run: git tag --sort=-creatordate | head -n 1
-      - name: Get version
-        id: get_version
-        run: echo "VERSION=$(git tag --sort=-creatordate | head -n 1)" >> $GITHUB_OUTPUT
-      - name: Get commit id
-        id: get_commit_id
-        run: echo "COMMIT_ID=$( git rev-parse --short "$GITHUB_SHA" )" >> $GITHUB_OUTPUT
-        
-      - run: echo "${{ steps.get_version.outputs.VERSION }}-${{ steps.get_commit_id.outputs.COMMIT_ID }}"
-      - name: Set version
-        run: |
-          sudo apt-get install jq
-          jq '.version="${{ steps.get_version.outputs.VERSION }}-${{ steps.get_commit_id.outputs.COMMIT_ID }}"' package.json > package.json.new
-          mv package.json.new package.json
-      - name: Generate SDK
-        run: |
-          npm cache clean --force
-          npm install @openapitools/openapi-generator-cli -g
-      - run: npm i
-      - run: npm run start
-      - run: npm publish --access public
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.npm_token}}

.github/workflows/push_test_server.yml

@@ -2,9 +2,7 @@ name: Auto Publish Website
 on:
   push:
     branches:
-      - main
+      - community
-  workflow_dispatch:
-    
 permissions:
   contents: write
 jobs:
@@ -46,16 +44,10 @@ jobs:
         with:
           # either 'goreleaser' (default) or 'goreleaser-pro'
           distribution: goreleaser
-          version: 1.14.1
+          version: latest
           args: release --rm-dist --snapshot
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GoogleID: ${{ secrets.GoogleID }} 
-          GoogleSecret: ${{ secrets.GoogleSecret }}
-          DropboxKey: ${{ secrets.DropboxKey }}
-          DropboxSecret: ${{ secrets.DropboxSecret }}
-          OneDriveID: ${{ secrets.OneDriveID }}
-          OneDriveSecret: ${{ secrets.OneDriveSecret }}
           # Your GoReleaser Pro key, if you are using the 'goreleaser-pro' distribution
           # GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
        

.github/workflows/release.yml

@@ -38,16 +38,10 @@ jobs:
         with:
           # either 'goreleaser' (default) or 'goreleaser-pro'
           distribution: goreleaser
-          version: latest
+          version: 1.14.1
           args: release --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GoogleID: ${{ secrets.GoogleID }} 
-          GoogleSecret: ${{ secrets.GoogleSecret }}
-          DropboxKey: ${{ secrets.DropboxKey }}
-          DropboxSecret: ${{ secrets.DropboxSecret }}
-          OneDriveID: ${{ secrets.OneDriveID }}
-          OneDriveSecret: ${{ secrets.OneDriveSecret }}
           # Your GoReleaser Pro key, if you are using the 'goreleaser-pro' distribution
           # GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
 

.goreleaser.debug.yaml

@@ -113,22 +113,24 @@ builds:
     goarm:
       - "7"
 archives:
-  - name_template: >-
+  - name_template: "{{ .Os }}-{{ .Arch }}-{{ .ProjectName }}-v{{ .Version }}"
-      {{ .Os }}-{{- if eq .Arch "arm" }}arm-7{{- else }}{{ .Arch }}{{- end }}-{{ .ProjectName }}-v{{ .Version }}
     id: casaos
     builds:
       - casaos-amd64
       - casaos-arm64
       - casaos-arm-7
+    replacements:
+      arm: arm-7
     files:
       - build/**/*
-  - name_template: >-
+  - name_template: "{{ .Os }}-{{ .Arch }}-{{ .ProjectName }}-migration-tool-v{{ .Version }}"
-      {{ .Os }}-{{- if eq .Arch "arm" }}arm-7{{- else }}{{ .Arch }}{{- end }}-{{ .ProjectName }}-migration-tool-v{{ .Version }}
     id: casaos-migration-tool
     builds:
       - casaos-migration-tool-amd64
       - casaos-migration-tool-arm64
       - casaos-migration-tool-arm-7
+    replacements:
+      arm: arm-7
     files:
       - build/sysroot/etc/**/*
 checksum:

.goreleaser.yaml

@@ -21,8 +21,8 @@ builds:
       - -X main.date={{.Date}}
       - -X github.com/IceWhaleTech/CasaOS/drivers/google_drive.client_id={{.Env.GoogleID}}
       - -X github.com/IceWhaleTech/CasaOS/drivers/google_drive.client_secret={{.Env.GoogleSecret}}
-      - -X github.com/IceWhaleTech/CasaOS/drivers/onedrive.client_id={{.Env.OneDriveID}}
+      - -X github.com/IceWhaleTech/CasaOS/drivers/onedrive.client_id={{.Env.OneDreiveID}}
-      - -X github.com/IceWhaleTech/CasaOS/drivers/onedrive.client_secret={{.Env.OneDriveSecret}}
+      - -X github.com/IceWhaleTech/CasaOS/drivers/onedrive.client_secret={{.Env.OneDeriveSecret}}
       - -X github.com/IceWhaleTech/CasaOS/drivers/dropbox.app_key={{.Env.DropboxKey}}
       - -X github.com/IceWhaleTech/CasaOS/drivers/dropbox.app_secret={{.Env.DropboxSecret}}
       - -s
@@ -48,8 +48,8 @@ builds:
       - -X main.date={{.Date}}
       - -X github.com/IceWhaleTech/CasaOS/drivers/google_drive.client_id={{.Env.GoogleID}}
       - -X github.com/IceWhaleTech/CasaOS/drivers/google_drive.client_secret={{.Env.GoogleSecret}}
-      - -X github.com/IceWhaleTech/CasaOS/drivers/onedrive.client_id={{.Env.OneDriveID}}
+      - -X github.com/IceWhaleTech/CasaOS/drivers/onedrive.client_id={{.Env.OneDreiveID}}
-      - -X github.com/IceWhaleTech/CasaOS/drivers/onedrive.client_secret={{.Env.OneDriveSecret}}
+      - -X github.com/IceWhaleTech/CasaOS/drivers/onedrive.client_secret={{.Env.OneDeriveSecret}}
       - -X github.com/IceWhaleTech/CasaOS/drivers/dropbox.app_key={{.Env.DropboxKey}}
       - -X github.com/IceWhaleTech/CasaOS/drivers/dropbox.app_secret={{.Env.DropboxSecret}}
       - -s
@@ -75,8 +75,8 @@ builds:
       - -X main.date={{.Date}}
       - -X github.com/IceWhaleTech/CasaOS/drivers/google_drive.client_id={{.Env.GoogleID}}
       - -X github.com/IceWhaleTech/CasaOS/drivers/google_drive.client_secret={{.Env.GoogleSecret}}
-      - -X github.com/IceWhaleTech/CasaOS/drivers/onedrive.client_id={{.Env.OneDriveID}}
+      - -X github.com/IceWhaleTech/CasaOS/drivers/onedrive.client_id={{.Env.OneDreiveID}}
-      - -X github.com/IceWhaleTech/CasaOS/drivers/onedrive.client_secret={{.Env.OneDriveSecret}}
+      - -X github.com/IceWhaleTech/CasaOS/drivers/onedrive.client_secret={{.Env.OneDeriveSecret}}
       - -X github.com/IceWhaleTech/CasaOS/drivers/dropbox.app_key={{.Env.DropboxKey}}
       - -X github.com/IceWhaleTech/CasaOS/drivers/dropbox.app_secret={{.Env.DropboxSecret}}
       - -s

README.md

@@ -83,7 +83,7 @@ Furthermore, the personal cloud could combine personal data to train personalize
 - Multiple hardware and base system support
   - ZimaBoard, NUC, RPi, old computers, whatever is available.
 - Selected apps in the app store, one-click installation
-  - Nextcloud, HomeAssistant, AdGuard, Jellyfin, *arr and more!
+  - Nextcloud, HomeAssiant, AdGuard, Jellyfin, *arr and more!
 - Easily install numerous Docker apps
   - Over 100,000 apps from the Docker ecosystem can be easily installed
 - Elegant drive and file management
@@ -104,7 +104,7 @@ CasaOS fully supports ZimaBoard, Intel NUC, and Raspberry Pi. Also, more compute
 ### System Compatibility
 
 Official Support
-- Debian 12 (✅ Tested, Recommended)
+- Debian 11 (✅ Tested, Recommended)
 - Ubuntu Server 20.04 (✅ Tested)
 - Raspberry Pi OS (✅ Tested)
 
@@ -146,13 +146,13 @@ curl -fsSL https://get.icewhale.io/casaos-uninstall.sh | sudo bash
 
 ## Community 
 
-The word Casa comes from the Spanish word for "home". Project CasaOS originated as a pre-installed system for the crowdfunded product [ZimaBoard](https://www.zimaboard.com) on Kickstarter.
+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.
+So, we set out to build this open source project to develop CasaOS with our own hands, everyone in the community, and you.
 
-We believe that through community-driven collaborative innovation and open communication with global developers, we can reshape the digital home experience like never before.
+We believes that through community-driven collaborative innovation and open communication with global developers, we can reshape the digital home experience like never before.
 
 **A warm welcome for you to get help or share great ideas in the [Discord](https://discord.gg/knqAbbBbeX)!**
 
@@ -162,8 +162,8 @@ We believe that through community-driven collaborative innovation and open commu
 
 CasaOS is a community-driven open source project and the people involved are CasaOS users. That means CasaOS will always need contributions from community members just like you!
 
-- See <https://wiki.casaos.io/en/contribute> for ways of contributing to CasaOS
+- See <https://wiki.casaos.io/en/contribute> for ways of contribution to CasaOS
-- See <https://wiki.casaos.io/en/contribute/development> if you want to be involved in code contribution specifically
+- See <https://wiki.casaos.io/en/contribute/development> if you want to be involved in code contribution specificially
 
 ## Donate
 <p ><a href="https://www.buymeacoffee.com/icewhaletech"> <img align="center" src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" height="50" width="210" alt="bappi2097" target="_blank" /></a></p>
@@ -199,8 +199,6 @@ Everyone's contribution is greatly appreciated. ([Emoji Key](https://allcontribu
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/llwaini"><img src="https://avatars.githubusercontent.com/u/59589857?v=4?s=100" width="100px;" alt=""/><br /><sub><b>llwaini</b></sub></a><br /><a href="#projectManagement-llwaini" title="Project Management">📆</a> <a href="https://github.com/IceWhaleTech/CasaOS/commits?author=llwaini" title="Tests">⚠️</a> <a href="#tutorial-llwaini" title="Tutorials">✅</a></td>
-    <td align="center"><a href="https://github.com/CorrectRoadH"><img src="https://avatars.githubusercontent.com/u/29306285?v=4?s=100" width="100px;" alt=""/><br /><sub><b>CorrectRoadH</b></sub></a><br /><a href="https://github.com/IceWhaleTech/CasaOS/commits?author=correctroadh" title="Code">💻</a> <a href="https://github.com/IceWhaleTech/CasaOS/commits?author=correctroadh" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/zhanghengxin"><img src="https://avatars.githubusercontent.com/u/24197448?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zhanghengxin</b></sub></a><br /><a href="https://github.com/IceWhaleTech/CasaOS/commits?author=zhanghengxin" title="Code">💻</a> <a href="https://github.com/IceWhaleTech/CasaOS/commits?author=zhanghengxin" title="Documentation">📖</a></td>
   </tr>
 </table>
 
@@ -209,7 +207,7 @@ Everyone's contribution is greatly appreciated. ([Emoji Key](https://allcontribu
 
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
-This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind are welcome!
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
 
 ## Changelog
 

api/casaos/openapi.yaml

@@ -59,6 +59,7 @@ paths:
           $ref: "#/components/responses/GetHealthPortsOK"
         "500":
           $ref: "#/components/responses/ResponseInternalServerError"
+
   /health/logs:
     get:
       tags:
@@ -75,7 +76,6 @@ paths:
                 format: binary
         "500":
           $ref: "#/components/responses/ResponseInternalServerError"
-
   /file/test:
     get:
       tags:
@@ -89,52 +89,6 @@ paths:
           $ref: "#/components/responses/ResponseOK"
         "500":
           $ref: "#/components/responses/ResponseInternalServerError"
-  /zt/info:
-    get:
-      tags:
-        - Zerotier methods
-      summary: Get Zerotier info
-      description: |-
-        Get Zerotier info.
-      operationId: getZerotierInfo
-      responses:
-        "200":
-          $ref: "#/components/responses/GetZTInfoOK"
-        "500":
-          $ref: "#/components/responses/ResponseInternalServerError"
-  /zt/{network_id}/status:
-    put:  
-      tags:
-        - Zerotier methods
-      summary: Set Zerotier network status
-      description: |-
-        Set Zerotier network status.
-      operationId: setZerotierNetworkStatus
-      parameters:
-        - name: network_id
-          in: path
-          description: network id
-          required: true
-          schema:
-            type: string
-      requestBody:
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                status:
-                  enum:
-                    - online
-                    - offline
-                  type: string
-                  example: "online"
-      responses:
-        "200":
-          $ref: "#/components/responses/GetZTInfoOK"
-        "500":
-          $ref: "#/components/responses/ResponseInternalServerError"
-
 components:
   securitySchemes:
     access_token:
@@ -178,13 +132,6 @@ components:
               - properties:
                   data:
                     $ref: "#/components/schemas/HealthPorts"
-    GetZTInfoOK:
-      description: OK
-      content:
-        application/json:
-          schema:
-            $ref: "#/components/schemas/ZTInfo"
-
 
   schemas:
     BaseResponse:
@@ -222,14 +169,3 @@ components:
             type: integer
             example: 53
           x-go-name: UDP
-    ZTInfo:
-      properties:
-        id:
-          type: string
-          example: "1234567890"
-        name:
-          type: string
-          example: "CasaOS"
-        status:
-          type: string
-          example: "online"

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

@@ -1,6 +1,7 @@
 [Unit]
 After=casaos-message-bus.service
 After=rclone.service
+ConditionFileNotEmpty=/etc/casaos/casaos.conf
 Description=CasaOS Main Service
 
 [Service]

cmd/message-bus-docgen/main.go

@@ -1,28 +0,0 @@
-package main
-
-import (
-	"github.com/IceWhaleTech/CasaOS-Common/external"
-	"github.com/IceWhaleTech/CasaOS/codegen/message_bus"
-	"github.com/IceWhaleTech/CasaOS/common"
-	"github.com/samber/lo"
-)
-
-func main() {
-	eventTypes := lo.Map(common.EventTypes, func(item message_bus.EventType, index int) external.EventType {
-		return external.EventType{
-			Name:     item.Name,
-			SourceID: item.SourceID,
-			PropertyTypeList: lo.Map(
-				item.PropertyTypeList, func(item message_bus.PropertyType, index int) external.PropertyType {
-					return external.PropertyType{
-						Name:        item.Name,
-						Description: item.Description,
-						Example:     item.Example,
-					}
-				},
-			),
-		}
-	})
-
-	external.PrintEventTypesAsMarkdown(common.SERVICENAME, common.VERSION, eventTypes)
-}

cmd/migration-tool/main.go

@@ -77,7 +77,7 @@ func init() {
 		}
 	}
 
-	config.InitSetup(configFlag, "")
+	config.InitSetup(configFlag)
 
 	if len(dbFlag) == 0 {
 		dbFlag = config.AppInfo.DBPath + "/db"

codegen/casaos_api.go

@@ -8,12 +8,10 @@ import (
 	"compress/gzip"
 	"encoding/base64"
 	"fmt"
-	"net/http"
 	"net/url"
 	"path"
 	"strings"
 
-	"github.com/deepmap/oapi-codegen/pkg/runtime"
 	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/labstack/echo/v4"
 )
@@ -22,12 +20,6 @@ const (
 	Access_tokenScopes = "access_token.Scopes"
 )
 
-// Defines values for SetZerotierNetworkStatusJSONBodyStatus.
-const (
-	Offline SetZerotierNetworkStatusJSONBodyStatus = "offline"
-	Online  SetZerotierNetworkStatusJSONBodyStatus = "online"
-)
-
 // BaseResponse defines model for BaseResponse.
 type BaseResponse struct {
 	// Message message returned by server side if there is any
@@ -46,13 +38,6 @@ type HealthServices struct {
 	Running    *[]string `json:"running,omitempty"`
 }
 
-// ZTInfo defines model for ZTInfo.
-type ZTInfo struct {
-	Id     *string `json:"id,omitempty"`
-	Name   *string `json:"name,omitempty"`
-	Status *string `json:"status,omitempty"`
-}
-
 // GetHealthPortsOK defines model for GetHealthPortsOK.
 type GetHealthPortsOK struct {
 	Data *HealthPorts `json:"data,omitempty"`
@@ -69,26 +54,12 @@ type GetHealthServicesOK struct {
 	Message *string `json:"message,omitempty"`
 }
 
-// GetZTInfoOK defines model for GetZTInfoOK.
-type GetZTInfoOK = ZTInfo
-
 // ResponseInternalServerError defines model for ResponseInternalServerError.
 type ResponseInternalServerError = BaseResponse
 
 // ResponseOK defines model for ResponseOK.
 type ResponseOK = BaseResponse
 
-// SetZerotierNetworkStatusJSONBody defines parameters for SetZerotierNetworkStatus.
-type SetZerotierNetworkStatusJSONBody struct {
-	Status *SetZerotierNetworkStatusJSONBodyStatus `json:"status,omitempty"`
-}
-
-// SetZerotierNetworkStatusJSONBodyStatus defines parameters for SetZerotierNetworkStatus.
-type SetZerotierNetworkStatusJSONBodyStatus string
-
-// SetZerotierNetworkStatusJSONRequestBody defines body for SetZerotierNetworkStatus for application/json ContentType.
-type SetZerotierNetworkStatusJSONRequestBody SetZerotierNetworkStatusJSONBody
-
 // ServerInterface represents all server handlers.
 type ServerInterface interface {
 	// Test file methods
@@ -103,12 +74,6 @@ type ServerInterface interface {
 	// Get service status
 	// (GET /health/services)
 	GetHealthServices(ctx echo.Context) error
-	// Get Zerotier info
-	// (GET /zt/info)
-	GetZerotierInfo(ctx echo.Context) error
-	// Set Zerotier network status
-	// (PUT /zt/{network_id}/status)
-	SetZerotierNetworkStatus(ctx echo.Context, networkId string) error
 }
 
 // ServerInterfaceWrapper converts echo contexts to parameters.
@@ -160,35 +125,6 @@ func (w *ServerInterfaceWrapper) GetHealthServices(ctx echo.Context) error {
 	return err
 }
 
-// GetZerotierInfo converts echo context to params.
-func (w *ServerInterfaceWrapper) GetZerotierInfo(ctx echo.Context) error {
-	var err error
-
-	ctx.Set(Access_tokenScopes, []string{""})
-
-	// Invoke the callback with all the unmarshalled arguments
-	err = w.Handler.GetZerotierInfo(ctx)
-	return err
-}
-
-// SetZerotierNetworkStatus converts echo context to params.
-func (w *ServerInterfaceWrapper) SetZerotierNetworkStatus(ctx echo.Context) error {
-	var err error
-	// ------------- Path parameter "network_id" -------------
-	var networkId string
-
-	err = runtime.BindStyledParameterWithLocation("simple", false, "network_id", runtime.ParamLocationPath, ctx.Param("network_id"), &networkId)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid format for parameter network_id: %s", err))
-	}
-
-	ctx.Set(Access_tokenScopes, []string{""})
-
-	// Invoke the callback with all the unmarshalled arguments
-	err = w.Handler.SetZerotierNetworkStatus(ctx, networkId)
-	return err
-}
-
 // This is a simple interface which specifies echo.Route addition functions which
 // are present on both echo.Echo and echo.Group, since we want to allow using
 // either of them for path registration
@@ -221,36 +157,31 @@ func RegisterHandlersWithBaseURL(router EchoRouter, si ServerInterface, baseURL
 	router.GET(baseURL+"/health/logs", wrapper.GetHealthlogs)
 	router.GET(baseURL+"/health/ports", wrapper.GetHealthPorts)
 	router.GET(baseURL+"/health/services", wrapper.GetHealthServices)
-	router.GET(baseURL+"/zt/info", wrapper.GetZerotierInfo)
-	router.PUT(baseURL+"/zt/:network_id/status", wrapper.SetZerotierNetworkStatus)
 
 }
 
 // Base64 encoded, gzipped, json marshaled Swagger object
 var swaggerSpec = []string{
 
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"8qmt1jJjbCCRvPZhhxiNLTriw8Td48Xahw/DUMfvd+DPJ3dgxjIUEJ3uVxSiClRuRoUbWVWHtcvXF+FE",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"5FQbh7z3YO7zWV9ZrwNgkdu0o5Ln2q9TufAItwvlrcSXrI2t28XjMHY8hDaiIrgnc+qYi97GcWlbTyD8",
+	"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",
-	"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",
+	"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",
-	"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",
+	"DgAA",
-	"qxMZeBfnzo+Vh1vhbebgU6URksXtYrXBbW5nYx8MxC9tMn/QNWzdBnfMqqkKJ+7SqtrZrPk3Du5jZJcj",
-	"dvoRYm6t7be2qm6Z8zvWV8enN9O87tDPxm5K/EXSL4MKcxnJ8GKv9WXSBbQFNhfJk9Oj10c7q0Wx0fV1",
-	"cNcHa2exK3S1yyo9QFuVvl4b9/vWKb61wYzrfwMAAP//9tkexLESAAA=",
 }
 
 // GetSwagger returns the content of the embedded swagger specification file

common/constants.go

@@ -2,7 +2,6 @@ package common
 
 const (
 	SERVICENAME = "casaos"
-	VERSION     = "0.4.4.2"
+	VERSION     = "0.4.4.1"
 	BODY        = " "
-	RANW_NAME   = "IceWhale-RemoteAccess"
 )

common/message.go

@@ -1,12 +1,23 @@
 package common
 
 import (
+	"fmt"
+
 	"github.com/IceWhaleTech/CasaOS/codegen/message_bus"
 )
 
-// devtype -> action -> event
+var (
-var EventTypes = []message_bus.EventType{
+	// devtype -> action -> event
-	{Name: "casaos:system:utilization", SourceID: SERVICENAME, PropertyTypeList: []message_bus.PropertyType{}},
+	EventTypes map[string]map[string]message_bus.EventType
-	{Name: "casaos:file:recover", SourceID: SERVICENAME, PropertyTypeList: []message_bus.PropertyType{}},
+
-	{Name: "casaos:file:operate", SourceID: SERVICENAME, PropertyTypeList: []message_bus.PropertyType{}},
+	PropertyNameLookupMaps = map[string]map[string]string{
-}
+		"system": {
+			fmt.Sprintf("%s:%s", SERVICENAME, "utilization"): "ID_BUS",
+		},
+	}
+
+	ActionPastTense = map[string]string{
+		"add":    "added",
+		"remove": "removed",
+	}
+)

drivers/dropbox/meta.go

@@ -2,6 +2,7 @@ package dropbox
 
 import (
 	"github.com/IceWhaleTech/CasaOS/internal/driver"
+	"github.com/IceWhaleTech/CasaOS/internal/op"
 )
 
 const ICONURL = "./img/driver/Dropbox.svg"
@@ -22,3 +23,10 @@ var config = driver.Config{
 	OnlyProxy:   true,
 	DefaultRoot: "root",
 }
+
+func init() {
+	op.RegisterDriver(func() driver.Driver {
+		dropbox := GetConfig()
+		return &dropbox
+	})
+}

drivers/dropbox/util.go

@@ -108,7 +108,7 @@ func (d *Dropbox) getFiles(path string) ([]File, error) {
 func GetConfig() Dropbox {
 	dp := Dropbox{}
 	dp.RootFolderID = ""
-	dp.AuthUrl = "https://www.dropbox.com/oauth2/authorize?client_id=" + app_key + "&redirect_uri=https://cloudoauth.files.casaos.app&response_type=code&token_access_type=offline&state=${HOST}%2Fv1%2Frecover%2FDropbox&&force_reapprove=true&force_reauthentication=true"
+	dp.AuthUrl = "https://www.dropbox.com/oauth2/authorize?client_id=" + app_key + "&redirect_uri=https://cloudoauth.files.casaos.app&response_type=code&token_access_type=offline&state=${HOST}%2Fv2%2Frecover%2FDropbox&&force_reapprove=true&force_reauthentication=true"
 	dp.AppKey = app_key
 	dp.AppSecret = app_secret
 	dp.Icon = "./img/driver/Dropbox.svg"

drivers/google_drive/meta.go

@@ -2,6 +2,7 @@ package google_drive
 
 import (
 	"github.com/IceWhaleTech/CasaOS/internal/driver"
+	"github.com/IceWhaleTech/CasaOS/internal/op"
 )
 
 const ICONURL = "./img/driver/GoogleDrive.svg"
@@ -24,3 +25,10 @@ var config = driver.Config{
 	OnlyProxy:   true,
 	DefaultRoot: "root",
 }
+
+func init() {
+	op.RegisterDriver(func() driver.Driver {
+		google := GetConfig()
+		return &google
+	})
+}

drivers/google_drive/util.go

@@ -160,7 +160,7 @@ func GetConfig() GoogleDrive {
 	config.ClientID = client_id
 	config.ClientSecret = client_secret
 	config.RootFolderID = "root"
-	config.AuthUrl = "https://accounts.google.com/o/oauth2/auth/oauthchooseaccount?response_type=code&client_id=" + client_id + "&redirect_uri=https%3A%2F%2Fcloudoauth.files.casaos.app&scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fdrive&access_type=offline&approval_prompt=force&state=${HOST}%2Fv1%2Frecover%2FGoogleDrive&service=lso&o2v=1&flowName=GeneralOAuthFlow"
+	config.AuthUrl = "https://accounts.google.com/o/oauth2/auth/oauthchooseaccount?response_type=code&client_id=" + client_id + "&redirect_uri=https%3A%2F%2Fcloudoauth.files.casaos.app&scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fdrive&access_type=offline&approval_prompt=force&state=${HOST}%2Fv2%2Frecover%2FGoogleDrive&service=lso&o2v=1&flowName=GeneralOAuthFlow"
 	config.Icon = "./img/driver/GoogleDrive.svg"
 
 	return config

drivers/onedrive/meta.go

@@ -2,10 +2,9 @@ package onedrive
 
 import (
 	"github.com/IceWhaleTech/CasaOS/internal/driver"
+	"github.com/IceWhaleTech/CasaOS/internal/op"
 )
 
-const ICONURL = "./img/driver/OneDrive.svg"
-
 type Host struct {
 	Oauth string
 	Api   string
@@ -67,3 +66,10 @@ var config = driver.Config{
 	LocalSort:   true,
 	DefaultRoot: "/",
 }
+
+func init() {
+	op.RegisterDriver(func() driver.Driver {
+		one := GetConfig()
+		return &one
+	})
+}

drivers/onedrive/util.go

@@ -13,6 +13,7 @@ import (
 
 var (
 	client_id = "private build"
+
 	client_secret = "private build"
 )
 var onedriveHostMap = map[string]Host{
@@ -173,7 +174,7 @@ func GetConfig() Onedrive {
 	config.ClientID = client_id
 	config.ClientSecret = client_secret
 	config.RootFolderID = "/"
-	config.AuthUrl = "https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=" + client_id + "&response_type=code&redirect_uri=https%3A%2F%2Fcloudoauth.files.casaos.app&scope=offline_access+files.readwrite.all&state=${HOST}%2Fv1%2Frecover%2FOnedrive"
+	config.AuthUrl = "https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=" + client_id + "&response_type=code&redirect_uri=http%3A%2F%2Flocalhost%2Fcallback&scope=offline_access+files.readwrite.all&state=${HOST}%2Fv2%2Frecover%2FOnedrive"
 	config.Icon = "./img/driver/OneDrive.svg"
 	config.Region = "global"
 	config.RedirectUri = "https://cloudoauth.files.casaos.app"

go.mod

@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/Curtis-Milo/nat-type-identifier-go v0.0.0-20220215191915-18d42168c63d
-	github.com/IceWhaleTech/CasaOS-Common v0.4.7-alpha4
+	github.com/IceWhaleTech/CasaOS-Common v0.4.4-alpha8
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
 	github.com/deckarep/golang-set/v2 v2.3.0
 	github.com/deepmap/oapi-codegen v1.12.4
@@ -33,7 +33,6 @@ require (
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pkg/errors v0.9.1
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/samber/lo v1.38.1
 	github.com/satori/go.uuid v1.2.0
 	github.com/shirou/gopsutil/v3 v3.23.2
 	github.com/sirupsen/logrus v1.9.0
@@ -107,6 +106,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	github.com/samber/lo v1.38.1 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/tklauser/go-sysconf v0.3.11 // indirect

go.sum

@@ -1,7 +1,7 @@
 github.com/Curtis-Milo/nat-type-identifier-go v0.0.0-20220215191915-18d42168c63d h1:62lEBImTxZ83pgzywgDNIrPPuQ+j4ep9QjqrWBn1hrU=
 github.com/Curtis-Milo/nat-type-identifier-go v0.0.0-20220215191915-18d42168c63d/go.mod h1:lW9x+yEjqKdPbE3+cf2fGPJXCw/hChX3Omi9QHTLFsQ=
-github.com/IceWhaleTech/CasaOS-Common v0.4.7-alpha4 h1:bsVQ+kdVkmPsqX6lxxETaShiMb9I8OgiR4xrEQ/vyss=
+github.com/IceWhaleTech/CasaOS-Common v0.4.4-alpha8 h1:UhCg3d9Cxhx7KVmqh8oUrUl1qFmFdcHee3Zkk4+P2JA=
-github.com/IceWhaleTech/CasaOS-Common v0.4.7-alpha4/go.mod h1:2IuYyy5qW1BE6jqC6M+tOU+WtUec1K565rLATBJ9p/0=
+github.com/IceWhaleTech/CasaOS-Common v0.4.4-alpha8/go.mod h1:2IuYyy5qW1BE6jqC6M+tOU+WtUec1K565rLATBJ9p/0=
 github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk=
 github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
 github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=

main.go

@@ -18,6 +18,7 @@ import (
 
 	util_http "github.com/IceWhaleTech/CasaOS-Common/utils/http"
 
+	"github.com/IceWhaleTech/CasaOS/codegen/message_bus"
 	"github.com/IceWhaleTech/CasaOS/common"
 	"github.com/IceWhaleTech/CasaOS/pkg/cache"
 	"github.com/IceWhaleTech/CasaOS/pkg/config"
@@ -47,9 +48,6 @@ var (
 	//go:embed api/casaos/openapi.yaml
 	_docYAML string
 
-	//go:embed build/sysroot/etc/casaos/casaos.conf.sample
-	_confSample string
-
 	configFlag  = flag.String("c", "", "config address")
 	dbFlag      = flag.String("db", "", "db path")
 	versionFlag = flag.Bool("v", false, "version")
@@ -65,7 +63,7 @@ func init() {
 	println("git commit:", commit)
 	println("build date:", date)
 
-	config.InitSetup(*configFlag, _confSample)
+	config.InitSetup(*configFlag)
 
 	logger.LogInit(config.AppInfo.LogPath, config.AppInfo.LogSaveName, config.AppInfo.LogFileExt)
 	if len(*dbFlag) == 0 {
@@ -83,7 +81,6 @@ func init() {
 
 	route.InitFunction()
 
-	//service.MyService.System().GenreateSystemEntry()
 	///
 	//service.MountLists = make(map[string]*mountlib.MountPoint)
 	//configfile.Install()
@@ -104,17 +101,20 @@ func main() {
 	if *versionFlag {
 		return
 	}
+
 	v1Router := route.InitV1Router()
 
 	v2Router := route.InitV2Router()
 	v2DocRouter := route.InitV2DocRouter(_docHTML, _docYAML)
-	v3File := route.InitFile()
+	v3file := route.InitFile()
+	v4dir := route.InitDir()
 	mux := &util_http.HandlerMultiplexer{
 		HandlerMap: map[string]http.Handler{
 			"v1":  v1Router,
 			"v2":  v2Router,
-			"v3":  v3File,
 			"doc": v2DocRouter,
+			"v3":  v3file,
+			"v4":  v4dir,
 		},
 	}
 
@@ -143,8 +143,6 @@ func main() {
 		"/v1/cloud",
 		"/v1/recover",
 		"/v1/other",
-		"/v1/zt",
-		"/v1/test",
 		route.V2APIPath,
 		route.V2DocPath,
 		route.V3FilePath,
@@ -160,10 +158,13 @@ func main() {
 			panic(err)
 		}
 	}
-
+	var events []message_bus.EventType
+	events = append(events, message_bus.EventType{Name: "casaos:system:utilization", SourceID: common.SERVICENAME, PropertyTypeList: []message_bus.PropertyType{}})
+	events = append(events, message_bus.EventType{Name: "casaos:file:recover", SourceID: common.SERVICENAME, PropertyTypeList: []message_bus.PropertyType{}})
+	events = append(events, message_bus.EventType{Name: "casaos:file:operate", SourceID: common.SERVICENAME, PropertyTypeList: []message_bus.PropertyType{}})
 	// register at message bus
 	for i := 0; i < 10; i++ {
-		response, err := service.MyService.MessageBus().RegisterEventTypesWithResponse(context.Background(), common.EventTypes)
+		response, err := service.MyService.MessageBus().RegisterEventTypesWithResponse(context.Background(), events)
 		if err != nil {
 			logger.Error("error when trying to register one or more event types - some event type will not be discoverable", zap.Error(err))
 		}

model/drive.go

@@ -1,7 +0,0 @@
-package model
-
-type Drive struct {
-	Name    string `json:"name"`
-	Icon    string `json:"icon"`
-	AuthUrl string `json:"auth_url"`
-}

model/sys_common.go

@@ -73,5 +73,4 @@ type BaseInfo struct {
 	Hash    string `json:"i"`
 	Version string `json:"v"`
 	Channel string `json:"c,omitempty"`
-	DriveModel string `json:"m,omitempty"`
 }

model/zima.go

@@ -23,14 +23,3 @@ type Path struct {
 	Write      bool                   `json:"write"`
 	Extensions map[string]interface{} `json:"extensions"`
 }
-
-type DeviceInfo struct {
-	LanIpv4     []string `json:"lan_ipv4"`
-	Port        int      `json:"port"`
-	DeviceName  string   `json:"device_name"`
-	DeviceModel string   `json:"device_model"`
-	DeviceSN    string   `json:"device_sn"`
-	Initialized bool     `json:"initialized"`
-	OS_Version  string   `json:"os_version"`
-	Hash        string   `json:"hash"`
-}

package.json

@@ -1,39 +0,0 @@
-{
-  "name": "@icewhale/casaos-openapi",
-  "version": "0.0.1",
-  
-  "scripts": {
-    "clean": "rm -rf generate",
-    "build": "rm -rf dist && tsc && yarn clean",
-    "generate:local": "openapi-generator-cli generate -g typescript-axios -i ./api/casaos/openapi.yaml -o ./generate",
-    "generate:npx": "npx @openapitools/openapi-generator-cli generate -g typescript-axios -i ./api/casaos/openapi.yaml -o ./generate",
-    "generate:ts": "npx openapi-typescript-codegen --input ./api/casaos/openapi.yaml --output ./generate",
-    "start": "yarn generate:local && yarn build"
-  },
-  "homepage": "https://github.com/IceWhaleTech/CasaOS#readme",
-  "description": "Casaos Typescript+Axios SDK",
-  "keywords": [
-    "CasaOS",
-    "SDK",
-    "CasaOS Axios"
-  ],
-  "main": "dist/index.js",
-  "files": [
-    "LICENSE",
-    "README.md",
-    "dist",
-    "generate"
-  ],
-  "dependencies": {
-    "axios": "^1.1.0"
-  },
-  "devDependencies": {
-    "all-contributors-cli": "^6.24.0",
-    "@openapitools/openapi-generator-cli": "2.5.2",
-    "@types/node": "^18.8.3",
-    "openapi-typescript-codegen": "^0.23.0",
-    "typescript": "^4.9.5"
-  },
-  "author": "casaos",
-  "license": "Apache-2.0"
-}

pkg/config/config.go

@@ -10,10 +10,6 @@
  */
 package config
 
-import (
+const (
-	"path/filepath"
+	USERCONFIGURL = "/etc/casaos/casaos.conf"
-
-	"github.com/IceWhaleTech/CasaOS-Common/utils/constants"
 )
-
-var CasaOSConfigFilePath = filepath.Join(constants.DefaultConfigPath, "casaos.conf")

pkg/config/init.go

@@ -14,72 +14,80 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"path"
 	"path/filepath"
+	"runtime"
+	"strings"
 
-	"github.com/IceWhaleTech/CasaOS-Common/utils/constants"
-	"github.com/IceWhaleTech/CasaOS/common"
 	"github.com/IceWhaleTech/CasaOS/model"
 	"github.com/go-ini/ini"
 )
 
-var (
+// 系统配置
-	SysInfo = &model.SysInfoModel{}
+var SysInfo = &model.SysInfoModel{}
-	AppInfo = &model.APPModel{
-		DBPath:       constants.DefaultDataPath,
-		LogPath:      constants.DefaultLogPath,
-		LogSaveName:  common.SERVICENAME,
-		LogFileExt:   "log",
-		ShellPath:    "/usr/share/casaos/shell",
-		UserDataPath: filepath.Join(constants.DefaultDataPath, "conf"),
-	}
-	CommonInfo = &model.CommonModel{
-		RuntimePath: constants.DefaultRuntimePath,
-	}
-	ServerInfo       = &model.ServerModel{}
-	SystemConfigInfo = &model.SystemConfig{}
-	FileSettingInfo  = &model.FileSetting{}
 
-	Cfg            *ini.File
+// 用户相关
-	ConfigFilePath string
+var AppInfo = &model.APPModel{}
-)
+
+var CommonInfo = &model.CommonModel{}
+
+// var RedisInfo = &model.RedisModel{}
+
+// server相关
+var ServerInfo = &model.ServerModel{}
+
+var SystemConfigInfo = &model.SystemConfig{}
+
+var FileSettingInfo = &model.FileSetting{}
+
+var Cfg *ini.File
 
 // 初始化设置，获取系统的部分信息。
-func InitSetup(config string, sample string) {
+func InitSetup(config string) {
-	ConfigFilePath = CasaOSConfigFilePath
+	configDir := USERCONFIGURL
 	if len(config) > 0 {
-		ConfigFilePath = config
+		configDir = config
 	}
-
+	if runtime.GOOS == "darwin" {
-	// create default config file if not exist
+		configDir = "./conf/conf.conf"
-	if _, err := os.Stat(ConfigFilePath); os.IsNotExist(err) {
-		fmt.Println("config file not exist, create it")
-		// create config file
-		file, err := os.Create(ConfigFilePath)
-		if err != nil {
-			panic(err)
 	}
-		defer file.Close()
-
-		// write default config
-		_, err = file.WriteString(sample)
-		if err != nil {
-			panic(err)
-		}
-	}
-
 	var err error
-
 	// 读取文件
-	Cfg, err = ini.Load(ConfigFilePath)
+	Cfg, err = ini.Load(configDir)
 	if err != nil {
-		panic(err)
+		Cfg, err = ini.Load("/etc/casaos.conf")
+		if err != nil {
+			Cfg, err = ini.Load("/casaOS/server/conf/conf.ini")
+			if err != nil {
+				fmt.Printf("Fail to read file: %v", err)
+				os.Exit(1)
+			}
+		}
 	}
-
 	mapTo("app", AppInfo)
+	// mapTo("redis", RedisInfo)
 	mapTo("server", ServerInfo)
 	mapTo("system", SystemConfigInfo)
 	mapTo("file", FileSettingInfo)
 	mapTo("common", CommonInfo)
+	SystemConfigInfo.ConfigPath = configDir
+	if len(AppInfo.DBPath) == 0 {
+		AppInfo.DBPath = "/var/lib/casaos"
+	}
+	if len(AppInfo.LogPath) == 0 {
+		AppInfo.LogPath = "/var/log/casaos/"
+	}
+	if len(AppInfo.ShellPath) == 0 {
+		AppInfo.ShellPath = "/usr/share/casaos/shell"
+	}
+	if len(AppInfo.UserDataPath) == 0 {
+		AppInfo.UserDataPath = "/var/lib/casaos/conf"
+	}
+	if len(CommonInfo.RuntimePath) == 0 {
+		CommonInfo.RuntimePath = "/var/run/casaos"
+	}
+	Cfg.SaveTo(configDir)
+	//	AppInfo.ProjectPath = getCurrentDirectory() //os.Getwd()
 }
 
 // 映射
@@ -89,3 +97,21 @@ func mapTo(section string, v interface{}) {
 		log.Fatalf("Cfg.MapTo %s err: %v", section, err)
 	}
 }
+
+// 获取当前执行文件绝对路径（go run）
+func getCurrentAbPathByCaller() string {
+	var abPath string
+	_, filename, _, ok := runtime.Caller(0)
+	if ok {
+		abPath = path.Dir(filename)
+	}
+	return abPath
+}
+
+func getCurrentDirectory() string {
+	dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
+	if err != nil {
+		log.Fatal(err)
+	}
+	return strings.Replace(dir, "\\", "/", -1)
+}

pkg/utils/httper/zerotier.go

@@ -1,78 +0,0 @@
-package httper
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-)
-
-func ZTGet(url string) ([]byte, error) {
-	port, err := ioutil.ReadFile("/var/lib/zerotier-one/zerotier-one.port")
-	if err != nil {
-		return nil, err
-	}
-
-	// Build the target URL
-	targetURL := fmt.Sprintf("http://localhost:%s%s", strings.TrimSpace(string(port)), url)
-
-	// Create a new request
-	req, err := http.NewRequest("GET", targetURL, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// Add the X-ZT1-AUTH header
-	authToken, err := ioutil.ReadFile("/var/lib/zerotier-one/authtoken.secret")
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("X-ZT1-AUTH", strings.TrimSpace(string(authToken)))
-
-	client := http.Client{}
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	respBody, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-	return respBody, nil
-}
-func ZTPost(url string, body string) ([]byte, error) {
-	port, err := ioutil.ReadFile("/var/lib/zerotier-one/zerotier-one.port")
-	if err != nil {
-		return nil, err
-	}
-	// Build the target URL
-	targetURL := fmt.Sprintf("http://localhost:%s%s", strings.TrimSpace(string(port)), url)
-
-	// Create a new request
-	req, err := http.NewRequest("POST", targetURL, strings.NewReader(body))
-	if err != nil {
-		return nil, err
-	}
-
-	// Add the X-ZT1-AUTH header
-	authToken, err := ioutil.ReadFile("/var/lib/zerotier-one/authtoken.secret")
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("X-ZT1-AUTH", strings.TrimSpace(string(authToken)))
-
-	client := http.Client{}
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	respBody, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-	return respBody, nil
-}

pkg/utils/ip_helper/ip.go

@@ -1,7 +1,6 @@
 package ip_helper
 
 import (
-	"fmt"
 	"net"
 	"strings"
 
@@ -57,30 +56,7 @@ func GetDeviceAllIP(port string) []string {
 	}
 	return address
 }
-func GetDeviceAllIPv4() map[string]string {
-	address := make(map[string]string)
-	addrs, err := net.Interfaces()
-	if err != nil {
-		return address
-	}
-	for _, a := range addrs {
-		if a.Flags&net.FlagLoopback != 0 || a.Flags&net.FlagUp == 0 {
-			continue
-		}
-		addrs, err := a.Addrs()
-		if err != nil {
-			fmt.Println("Error:", err)
-			continue
-		}
 
-		for _, addr := range addrs {
-			if ipnet, ok := addr.(*net.IPNet); ok && !ipnet.IP.IsLoopback() && ipnet.IP.To4() != nil {
-				address[a.Name] = ipnet.IP.String()
-			}
-		}
-	}
-	return address
-}
 func HasLocalIP(ip net.IP) bool {
 	if ip.IsLoopback() {
 		return true

route/init.go

@@ -17,7 +17,6 @@ import (
 	"strings"
 	"time"
 
-	file1 "github.com/IceWhaleTech/CasaOS-Common/utils/file"
 	"github.com/IceWhaleTech/CasaOS-Common/utils/logger"
 	"github.com/IceWhaleTech/CasaOS/common"
 	"github.com/IceWhaleTech/CasaOS/model"
@@ -25,7 +24,6 @@ import (
 	"github.com/IceWhaleTech/CasaOS/pkg/samba"
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/encryption"
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
-	v1 "github.com/IceWhaleTech/CasaOS/route/v1"
 	"github.com/IceWhaleTech/CasaOS/service"
 	"go.uber.org/zap"
 )
@@ -33,7 +31,6 @@ import (
 func InitFunction() {
 	go InitNetworkMount()
 	go InitInfo()
-	//go InitZerotier()
 }
 
 func InitInfo() {
@@ -54,12 +51,6 @@ func InitInfo() {
 	}
 	mb.Hash = encryption.GetMD5ByStr(mac)
 	mb.Version = common.VERSION
-	osRelease, _ := file1.ReadOSRelease()
-
-	mb.DriveModel = osRelease["MODEL"]
-	if len(mb.DriveModel) == 0 {
-		mb.DriveModel = "Casa"
-	}
 	os.Remove(config.AppInfo.DBPath + "/baseinfo.conf")
 	by, err := json.Marshal(mb)
 	if err != nil {
@@ -107,6 +98,3 @@ func InitNetworkMount() {
 		logger.Error("mount storage err", zap.Any("err", err))
 	}
 }
-func InitZerotier() {
-	v1.CheckNetwork()
-}

route/v1.go

@@ -7,7 +7,6 @@ import (
 	"github.com/IceWhaleTech/CasaOS-Common/external"
 	"github.com/IceWhaleTech/CasaOS-Common/middleware"
 	"github.com/IceWhaleTech/CasaOS-Common/utils/jwt"
-	"github.com/IceWhaleTech/CasaOS/common"
 	"github.com/IceWhaleTech/CasaOS/pkg/config"
 	v1 "github.com/IceWhaleTech/CasaOS/route/v1"
 
@@ -36,16 +35,17 @@ func InitV1Router() *gin.Engine {
 	r.GET("/v1/sys/debug", v1.GetSystemConfigDebug) // //debug
 
 	r.GET("/v1/sys/version/check", v1.GetSystemCheckVersion)
-	r.GET("/v1/sys/version/current", func(ctx *gin.Context) {
-		ctx.String(200, common.VERSION)
-	})
 	r.GET("/ping", func(ctx *gin.Context) {
 		ctx.String(200, "pong")
 	})
 	r.GET("/v1/recover/:type", v1.GetRecoverStorage)
 	v1Group := r.Group("/v1")
-	//	r.Any("/v1/test", v1.CheckNetwork)
+
-	v1Group.Use(jwt.ExceptLocalhost(func() (*ecdsa.PublicKey, error) { return external.GetPublicKey(config.CommonInfo.RuntimePath) }))
+	v1Group.Use(jwt.ExceptLocalhost(
+		func() (*ecdsa.PublicKey, error) {
+			return external.GetPublicKey(config.CommonInfo.RuntimePath)
+		},
+	))
 	{
 
 		v1SysGroup := v1Group.Group("/sys")
@@ -79,7 +79,6 @@ func InitV1Router() *gin.Engine {
 			// v1SysGroup.PUT("/port", v1.PutCasaOSPort)
 			v1SysGroup.GET("/proxy", v1.GetSystemProxy)
 			v1SysGroup.PUT("/state/:state", v1.PutSystemState)
-			v1SysGroup.GET("/entry", v1.GetSystemEntry)
 		}
 		v1PortGroup := v1Group.Group("/port")
 		v1PortGroup.Use()
@@ -87,6 +86,7 @@ func InitV1Router() *gin.Engine {
 			v1PortGroup.GET("/", v1.GetPort)              // app/port
 			v1PortGroup.GET("/state/:port", v1.PortCheck) // app/check/:port
 		}
+
 		v1FileGroup := v1Group.Group("/file")
 		v1FileGroup.Use()
 		{
@@ -173,11 +173,6 @@ func InitV1Router() *gin.Engine {
 			v1OtherGroup.GET("/search", v1.GetSearchResult)
 
 		}
-		v1ZerotierGroup := v1Group.Group("/zt")
-		v1ZerotierGroup.Use()
-		{
-			v1ZerotierGroup.Any("/*url", v1.ZerotierProxy)
-		}
 	}
 
 	return r

route/v1/cloud.go

@@ -6,7 +6,6 @@ import (
 	"github.com/IceWhaleTech/CasaOS-Common/utils/logger"
 	"github.com/IceWhaleTech/CasaOS/drivers/dropbox"
 	"github.com/IceWhaleTech/CasaOS/drivers/google_drive"
-	"github.com/IceWhaleTech/CasaOS/drivers/onedrive"
 	"github.com/IceWhaleTech/CasaOS/model"
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/common_err"
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/httper"
@@ -52,10 +51,6 @@ func ListStorages(c *gin.Context) {
 		if dataMap["type"] == "dropbox" {
 			r.MountPoints[i].Icon = dropbox.ICONURL
 		}
-		if dataMap["type"] == "onedrive" {
-
-			r.MountPoints[i].Icon = onedrive.ICONURL
-		}
 		r.MountPoints[i].Name = dataMap["username"]
 	}
 	list := []httper.MountPoint{}

route/v1/driver.go

@@ -1,34 +1,12 @@
 package v1
 
 import (
+	"github.com/IceWhaleTech/CasaOS-Common/model"
 	"github.com/IceWhaleTech/CasaOS-Common/utils/common_err"
-	"github.com/IceWhaleTech/CasaOS/drivers/dropbox"
+	"github.com/IceWhaleTech/CasaOS/internal/op"
-	"github.com/IceWhaleTech/CasaOS/drivers/google_drive"
-	"github.com/IceWhaleTech/CasaOS/drivers/onedrive"
-	"github.com/IceWhaleTech/CasaOS/model"
 	"github.com/gin-gonic/gin"
 )
 
 func ListDriverInfo(c *gin.Context) {
-	list := []model.Drive{}
+	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: op.GetDriverInfoMap()})
-
-	google := google_drive.GetConfig()
-	list = append(list, model.Drive{
-		Name:    "Google Drive",
-		Icon:    google.Icon,
-		AuthUrl: google.AuthUrl,
-	})
-	dp := dropbox.GetConfig()
-	list = append(list, model.Drive{
-		Name:    "Dropbox",
-		Icon:    dp.Icon,
-		AuthUrl: dp.AuthUrl,
-	})
-	od := onedrive.GetConfig()
-	list = append(list, model.Drive{
-		Name:    "OneDrive",
-		Icon:    od.Icon,
-		AuthUrl: od.AuthUrl,
-	})
-	c.JSON(common_err.SUCCESS, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: list})
 }

route/v1/file.go

@@ -480,10 +480,6 @@ func GetFileUpload(c *gin.Context) {
 	path := c.Query("path")
 	dirPath := ""
 	hash := file.GetHashByContent([]byte(fileName))
-	if file.Exists(path + "/" + relative) {
-		c.JSON(http.StatusConflict, model.Result{Success: http.StatusConflict, Message: common_err.GetMsg(common_err.FILE_ALREADY_EXISTS)})
-		return
-	}
 	tempDir := filepath.Join(path, ".temp", hash+strconv.Itoa(totalChunks)) + "/"
 	if fileName != relative {
 		dirPath = strings.TrimSuffix(relative, fileName)

route/v1/recover.go

@@ -255,7 +255,7 @@ func GetRecoverStorage(c *gin.Context) {
 			a := strings.Split(username, "@")
 			username = a[0]
 		}
-		username += "_onedrive_" + strconv.FormatInt(time.Now().Unix(), 10)
+		username += "_dropbox_" + strconv.FormatInt(time.Now().Unix(), 10)
 
 		dmap["client_id"] = onedrive.ClientID
 		dmap["client_secret"] = onedrive.ClientSecret

route/v1/system.go

@@ -2,7 +2,6 @@ package v1
 
 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -25,7 +24,6 @@ import (
 	model2 "github.com/IceWhaleTech/CasaOS/service/model"
 	"github.com/IceWhaleTech/CasaOS/types"
 	"github.com/gin-gonic/gin"
-	"github.com/tidwall/gjson"
 )
 
 // @Summary check version
@@ -373,13 +371,3 @@ func PortCheck(c *gin.Context) {
 	t := c.DefaultQuery("type", "tcp")
 	c.JSON(common_err.SUCCESS, &model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: port.IsPortAvailable(p, t)})
 }
-
-func GetSystemEntry(c *gin.Context) {
-	entry := service.MyService.System().GetSystemEntry()
-	str := json.RawMessage(entry)
-	if !gjson.ValidBytes(str) {
-		c.JSON(http.StatusInternalServerError, model.Result{Success: common_err.SERVICE_ERROR, Message: entry, Data: json.RawMessage("[]")})
-		return
-	}
-	c.JSON(http.StatusOK, model.Result{Success: common_err.SUCCESS, Message: common_err.GetMsg(common_err.SUCCESS), Data: str})
-}

route/v1/zerotier.go

@@ -1,313 +0,0 @@
-package v1
-
-import (
-	"fmt"
-	"io/ioutil"
-	"math/rand"
-	"net"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/IceWhaleTech/CasaOS-Common/utils/logger"
-	"github.com/IceWhaleTech/CasaOS/common"
-	"github.com/IceWhaleTech/CasaOS/pkg/utils/httper"
-	"github.com/gin-gonic/gin"
-	"github.com/tidwall/gjson"
-	"go.uber.org/zap"
-)
-
-func ZerotierProxy(c *gin.Context) {
-	// Read the port number from the file
-	w := c.Writer
-	r := c.Request
-	port, err := ioutil.ReadFile("/var/lib/zerotier-one/zerotier-one.port")
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	// Get the request path and remove "/zt"
-	path := strings.TrimPrefix(r.URL.Path, "/v1/zt")
-	fmt.Println(path)
-
-	// Build the target URL
-	targetURL := fmt.Sprintf("http://localhost:%s%s", strings.TrimSpace(string(port)), path)
-
-	// Create a new request
-	req, err := http.NewRequest(r.Method, targetURL, r.Body)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	// Add the X-ZT1-AUTH header
-	authToken, err := ioutil.ReadFile("/var/lib/zerotier-one/authtoken.secret")
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-	req.Header.Set("X-ZT1-AUTH", strings.TrimSpace(string(authToken)))
-
-	copyHeaders(req.Header, r.Header)
-
-	client := http.Client{}
-	resp, err := client.Do(req)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-	defer resp.Body.Close()
-
-	copyHeaders(w.Header(), resp.Header)
-
-	respBody, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	// Return the response to the client
-	w.WriteHeader(resp.StatusCode)
-	w.Write(respBody)
-}
-
-func copyHeaders(destination, source http.Header) {
-	for key, values := range source {
-		for _, value := range values {
-			destination.Add(key, value)
-		}
-	}
-}
-
-func CheckNetwork() {
-	logger.Info("start check network")
-	respBody, err := httper.ZTGet("/controller/network")
-	if err != nil {
-		logger.Error("get network error", zap.Error(err))
-		return
-	}
-	networkId := ""
-	address := ""
-	networkNames := gjson.ParseBytes(respBody).Array()
-	routers := ""
-	for _, v := range networkNames {
-		res, err := httper.ZTGet("/controller/network/" + v.Str)
-		if err != nil {
-			logger.Error("get network error", zap.Error(err))
-			return
-		}
-		name := gjson.GetBytes(res, "name").Str
-		if name == common.RANW_NAME {
-			networkId = gjson.GetBytes(res, "id").Str
-			routers = gjson.GetBytes(res, "routes.0.target").Str
-			break
-		}
-	}
-	ip, s, e, c := getZTIP(routers)
-	logger.Info("ip", zap.Any("ip", ip))
-	if len(networkId) == 0 {
-		if len(address) == 0 {
-			address = GetAddress()
-		}
-		networkId = CreateNet(address, s, e, c)
-	}
-	res, err := httper.ZTGet("/network")
-	if err != nil {
-		logger.Error("get network error", zap.Error(err))
-		return
-	}
-	joined := false
-	networks := gjson.GetBytes(res, "#.id").Array()
-	for _, v := range networks {
-		if v.Str == networkId {
-			joined = true
-			break
-		}
-	}
-	logger.Info("joined", zap.Any("joined", joined))
-	if !joined {
-		JoinAndUpdateNet(address, networkId, ip)
-	}
-}
-func GetAddress() string {
-	nodeRes, err := httper.ZTGet("/status")
-	if err != nil {
-		logger.Error("get status error", zap.Error(err))
-		return ""
-	}
-	return gjson.GetBytes(nodeRes, "address").String()
-}
-func JoinAndUpdateNet(address, networkId, ip string) {
-	logger.Info("start join network", zap.Any("ip", ip))
-	_, err := httper.ZTPost("/network/"+networkId, "")
-	if err != nil {
-		logger.Error(" get network error", zap.Error(err))
-		return
-	}
-
-	if len(address) == 0 {
-		address = GetAddress()
-	}
-	b := `{
-		"authorized": true,
-		"activeBridge": true,
-		"ipAssignments": [
-		  "` + ip + `"
-		]
-	  }`
-	_, err = httper.ZTPost("/controller/network/"+networkId+"/member/"+address, b)
-	if err != nil {
-		logger.Error("join network error", zap.Error(err))
-		return
-	}
-}
-func CreateNet(address, s, e, c string) string {
-	body := `{
-		"name": "` + common.RANW_NAME + `",
-		"private": false,
-		"v4AssignMode": {
-		"zt": true
-		},
-		"ipAssignmentPools": [
-		{
-		"ipRangeStart": "` + s + `",
-		"ipRangeEnd": "` + e + `"
-		}
-		],
-		"routes": [
-		{
-		"target": "` + c + `"
-		}
-		],
-		"rules": [
-		{
-		"etherType": 2048,
-		"not": true,
-		"or": false,
-		"type": "MATCH_ETHERTYPE"
-		},
-		{
-		"etherType": 2054,
-		"not": true,
-		"or": false,
-		"type": "MATCH_ETHERTYPE"
-		},
-		{
-		"etherType": 34525,
-		"not": true,
-		"or": false,
-		"type": "MATCH_ETHERTYPE"
-		},
-		{
-		"type": "ACTION_DROP"
-		},
-		{
-		"type": "ACTION_ACCEPT"
-		}
-		],
-		"v6AssignMode": {
-			"rfc4193": true
-		   }
-		}`
-	createRes, err := httper.ZTPost("/controller/network/"+address+"______", body)
-	if err != nil {
-		logger.Error("post network error", zap.Error(err))
-		return ""
-	}
-	return gjson.GetBytes(createRes, "id").Str
-}
-
-func GetZTIPs() []gjson.Result {
-	res, err := httper.ZTGet("/network")
-	if err != nil {
-		logger.Error("get network error", zap.Error(err))
-		return []gjson.Result{}
-	}
-	a := gjson.GetBytes(res, "#.routes.0.target")
-	return a.Array()
-}
-
-func getZTIP(routes string) (ip, start, end, cidr string) {
-	excluded := GetZTIPs()
-	cidrs := []string{
-		"10.147.11.0/24",
-		"10.147.12.0/24",
-		"10.147.13.0/24",
-		"10.147.14.0/24",
-		"10.147.15.0/24",
-		"10.147.16.0/24",
-		"10.147.17.0/24",
-		"10.147.18.0/24",
-		"10.147.19.0/24",
-		"10.147.20.0/24",
-		"10.240.0.0/16",
-		"10.241.0.0/16",
-		"10.242.0.0/16",
-		"10.243.0.0/16",
-		"10.244.0.0/16",
-		"10.245.0.0/16",
-		"10.246.0.0/16",
-		"10.247.0.0/16",
-		"10.248.0.0/16",
-		"10.249.0.0/16",
-		"172.21.0.0/16",
-		"172.22.0.0/16",
-		"172.23.0.0/16",
-		"172.24.0.0/16",
-		"172.25.0.0/16",
-		"172.26.0.0/16",
-		"172.27.0.0/16",
-		"172.28.0.0/16",
-		"172.29.0.0/16",
-		"172.30.0.0/16",
-	}
-	filteredCidrs := make([]string, 0)
-	if len(routes) > 0 {
-		filteredCidrs = append(filteredCidrs, routes)
-	} else {
-		for _, cidr := range cidrs {
-			isExcluded := false
-			for _, excludedIP := range excluded {
-				if cidr == excludedIP.Str {
-					isExcluded = true
-					break
-				}
-			}
-			if !isExcluded {
-				filteredCidrs = append(filteredCidrs, cidr)
-			}
-		}
-	}
-
-	rnd := rand.New(rand.NewSource(time.Now().UnixNano()))
-	ip = ""
-	if len(filteredCidrs) > 0 {
-		randomIndex := rnd.Intn(len(filteredCidrs))
-		selectedCIDR := filteredCidrs[randomIndex]
-		_, ipNet, err := net.ParseCIDR(selectedCIDR)
-		if err != nil {
-			logger.Error("ParseCIDR error", zap.Error(err))
-			return
-		}
-		cidr = selectedCIDR
-		startIP := ipNet.IP
-		endIP := make(net.IP, len(startIP))
-		copy(endIP, startIP)
-
-		for i := range startIP {
-			endIP[i] |= ^ipNet.Mask[i]
-		}
-		startIP[3] = 1
-		start = startIP.String()
-		endIP[3] = 254
-		end = endIP.String()
-		ipt := ipNet
-		ipt.IP[3] = 1
-		ip = ipt.IP.String()
-		return
-	} else {
-		logger.Error("No available CIDR found")
-	}
-	return
-}

route/v2.go

@@ -30,6 +30,7 @@ var (
 	V2APIPath  string
 	V2DocPath  string
 	V3FilePath string
+	V4DirPath  string
 )
 
 func init() {
@@ -48,6 +49,7 @@ func init() {
 	V2APIPath = strings.TrimRight(u.Path, "/")
 	V2DocPath = "/doc" + V2APIPath
 	V3FilePath = "/v3/file"
+	V4DirPath = "/v4/dir"
 }
 
 func InitV2Router() http.Handler {
@@ -71,10 +73,13 @@ func InitV2Router() http.Handler {
 	e.Use(echo_middleware.JWTWithConfig(echo_middleware.JWTConfig{
 		Skipper: func(c echo.Context) bool {
 			return c.RealIP() == "::1" || c.RealIP() == "127.0.0.1"
-			//return true
+			// return true
-
 		},
 		ParseTokenFunc: func(token string, c echo.Context) (interface{}, error) {
+			// claims, code := jwt.Validate(token) // TODO - needs JWT validation
+			// if code != common_err.SUCCESS {
+			// 	return nil, echo.ErrUnauthorized
+			// }
 			valid, claims, err := jwt.Validate(token, func() (*ecdsa.PublicKey, error) { return external.GetPublicKey(config.CommonInfo.RuntimePath) })
 			if err != nil || !valid {
 				return nil, echo.ErrUnauthorized

route/v2/zerotier.go

@@ -1,74 +0,0 @@
-package v2
-
-import (
-	"fmt"
-	"net/http"
-
-	"github.com/IceWhaleTech/CasaOS-Common/utils"
-	"github.com/IceWhaleTech/CasaOS/codegen"
-	"github.com/IceWhaleTech/CasaOS/common"
-	"github.com/IceWhaleTech/CasaOS/pkg/utils/httper"
-	"github.com/labstack/echo/v4"
-	"github.com/tidwall/gjson"
-)
-
-func (s *CasaOS) SetZerotierNetworkStatus(ctx echo.Context, networkId string) error {
-	ip := `,"via":"10.147.19.0"`
-	m := make(map[string]string)
-	ctx.Bind(&m)
-	status := m["status"]
-	if status == "online" {
-		ip = ``
-	}
-	body := `{
-		"routes": [
-		{
-		"target": "10.147.20.0/24"` + ip + `
-		}
-		]
-		}`
-	res, err := httper.ZTPost("/controller/network/"+networkId, body)
-	if err != nil {
-		fmt.Println(err)
-		return ctx.JSON(http.StatusInternalServerError, codegen.BaseResponse{Message: utils.Ptr(err.Error())})
-	}
-	info := codegen.GetZTInfoOK{}
-	via := gjson.GetBytes(res, "routes.0.via").Str
-	info.Id = utils.Ptr(gjson.GetBytes(res, "id").Str)
-	info.Name = utils.Ptr(gjson.GetBytes(res, "name").Str)
-	if len(via) == 0 {
-		info.Status = utils.Ptr("online")
-	} else {
-		info.Status = utils.Ptr("offline")
-	}
-	return ctx.JSON(http.StatusOK, info)
-}
-func (s *CasaOS) GetZerotierInfo(ctx echo.Context) error {
-	info := codegen.GetZTInfoOK{}
-	respBody, err := httper.ZTGet("/controller/network")
-	if err != nil {
-		return ctx.JSON(http.StatusInternalServerError, codegen.BaseResponse{Message: utils.Ptr(err.Error())})
-	}
-
-	networkNames := gjson.ParseBytes(respBody).Array()
-	for _, v := range networkNames {
-		res, err := httper.ZTGet("/controller/network/" + v.Str)
-		if err != nil {
-			fmt.Println(err)
-			return ctx.JSON(http.StatusInternalServerError, codegen.BaseResponse{Message: utils.Ptr(err.Error())})
-		}
-		name := gjson.GetBytes(res, "name").Str
-		if name == common.RANW_NAME {
-			via := gjson.GetBytes(res, "routes.0.via").Str
-			info.Id = utils.Ptr(gjson.GetBytes(res, "id").Str)
-			info.Name = &name
-			if len(via) == 0 {
-				info.Status = utils.Ptr("online")
-			} else {
-				info.Status = utils.Ptr("offline")
-			}
-			break
-		}
-	}
-	return ctx.JSON(http.StatusOK, info)
-}

service/file.go

@@ -102,9 +102,7 @@ func FileOperate(k string) {
 					os.RemoveAll(temp.To + "/" + lastPath)
 				}
 			}
-			err := file.CopyDir(v.From, temp.To, temp.Style)
+			err := os.Rename(v.From, temp.To+"/"+lastPath)
-			if err == nil {
-				err = os.RemoveAll(v.From)
 			if err != nil {
 				logger.Error("file move error", zap.Any("err", err))
 				err = file.MoveFile(v.From, temp.To+"/"+lastPath)
@@ -114,8 +112,6 @@ func FileOperate(k string) {
 				}
 
 			}
-			}
-
 		} else if temp.Type == "copy" {
 			err := file.CopyDir(v.From, temp.To, temp.Style)
 			if err != nil {

service/system.go

@@ -1,7 +1,6 @@
 package service
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io/ioutil"
@@ -16,14 +15,10 @@ import (
 
 	"github.com/IceWhaleTech/CasaOS-Common/utils/file"
 	"github.com/IceWhaleTech/CasaOS-Common/utils/logger"
-	"github.com/IceWhaleTech/CasaOS/common"
 	"github.com/IceWhaleTech/CasaOS/model"
 	"github.com/IceWhaleTech/CasaOS/pkg/config"
 	command2 "github.com/IceWhaleTech/CasaOS/pkg/utils/command"
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/common_err"
-	"github.com/IceWhaleTech/CasaOS/pkg/utils/httper"
-	"github.com/IceWhaleTech/CasaOS/pkg/utils/ip_helper"
-	"github.com/tidwall/gjson"
 	"go.uber.org/zap"
 
 	"github.com/shirou/gopsutil/v3/cpu"
@@ -54,7 +49,6 @@ type SystemService interface {
 	GetDiskInfo() *disk.UsageStat
 	GetSysInfo() host.InfoStat
 	GetDeviceTree() string
-	GetDeviceInfo() model.DeviceInfo
 	CreateFile(path string) (int, error)
 	RenameFile(oldF, newF string) (int, error)
 	MkdirAll(path string) (int, error)
@@ -63,117 +57,9 @@ type SystemService interface {
 	GetMacAddress() (string, error)
 	SystemReboot() error
 	SystemShutdown() error
-	GetSystemEntry() string
-	GenreateSystemEntry()
 }
 type systemService struct{}
 
-func (c *systemService) GetDeviceInfo() model.DeviceInfo {
-	m := model.DeviceInfo{}
-	m.OS_Version = common.VERSION
-	err, portStr := MyService.Gateway().GetPort()
-	if err != nil {
-		m.Port = 80
-	} else {
-		port := gjson.Get(portStr, "data")
-		if len(port.Raw) == 0 {
-			m.Port = 80
-		} else {
-			p, err := strconv.Atoi(port.Raw)
-			if err != nil {
-				m.Port = 80
-			} else {
-				m.Port = p
-			}
-		}
-	}
-	allIpv4 := ip_helper.GetDeviceAllIPv4()
-	ip := []string{}
-	nets := MyService.System().GetNet(true)
-	for _, n := range nets {
-		if v, ok := allIpv4[n]; ok {
-			{
-				ip = append(ip, v)
-			}
-		}
-	}
-
-	m.LanIpv4 = ip
-	h, err := host.Info() /*  */
-	if err == nil {
-		m.DeviceName = h.Hostname
-	}
-	mb := model.BaseInfo{}
-
-	err = json.Unmarshal(file.ReadFullFile(config.AppInfo.DBPath+"/baseinfo.conf"), &mb)
-	if err == nil {
-		m.Hash = mb.Hash
-	}
-
-	osRelease, _ := file.ReadOSRelease()
-	m.DeviceModel = osRelease["MODEL"]
-	m.DeviceSN = osRelease["SN"]
-	res := httper.Get("http://127.0.0.1:"+strconv.Itoa(m.Port)+"/v1/users/status", nil)
-	init := gjson.Get(res, "data.initialized")
-	m.Initialized, _ = strconv.ParseBool(init.Raw)
-
-	return m
-}
-func (c *systemService) GenreateSystemEntry() {
-	modelsPath := "/var/lib/casaos/www/modules"
-	entryFileName := "entry.json"
-	entryFilePath := filepath.Join(config.AppInfo.DBPath, "db", entryFileName)
-	file.IsNotExistCreateFile(entryFilePath)
-
-	dir, err := os.ReadDir(modelsPath)
-	if err != nil {
-		logger.Error("read dir error", zap.Error(err))
-		return
-	}
-	json := "["
-	for _, v := range dir {
-		data, err := os.ReadFile(filepath.Join(modelsPath, v.Name(), entryFileName))
-		if err != nil {
-			logger.Error("read entry file error", zap.Error(err))
-			continue
-		}
-		json += string(data) + ","
-	}
-	json = strings.TrimRight(json, ",")
-	json += "]"
-	err = os.WriteFile(entryFilePath, []byte(json), 0666)
-	if err != nil {
-		logger.Error("write entry file error", zap.Error(err))
-		return
-	}
-
-}
-func (c *systemService) GetSystemEntry() string {
-
-	modelsPath := "/var/lib/casaos/www/modules"
-	entryFileName := "entry.json"
-	dir, err := os.ReadDir(modelsPath)
-	if err != nil {
-		logger.Error("read dir error", zap.Error(err))
-		return ""
-	}
-	json := "["
-	for _, v := range dir {
-		data, err := os.ReadFile(filepath.Join(modelsPath, v.Name(), entryFileName))
-		if err != nil {
-			logger.Error("read entry file error", zap.Error(err))
-			continue
-		}
-		json += string(data) + ","
-	}
-	json = strings.TrimRight(json, ",")
-	json += "]"
-	if err != nil {
-		logger.Error("write entry file error", zap.Error(err))
-		return ""
-	}
-	return json
-}
 func (c *systemService) GetMacAddress() (string, error) {
 	interfaces, err := net.Interfaces()
 	if err != nil {
@@ -473,7 +359,6 @@ func GetCPUThermalZone() string {
 			break
 		}
 	}
-
 	Cache.SetDefault(keyName, path)
 	return path
 }
@@ -484,11 +369,8 @@ func (s *systemService) GetCPUTemperature() int {
 	if len(path) > 0 {
 		outPut = string(file.ReadFullFile(path + "/temp"))
 	} else {
-		outPut = string(file.ReadFullFile("/sys/class/hwmon/hwmon0/temp1_input"))
-		if len(outPut) == 0 {
 		outPut = "0"
 	}
-	}
 
 	celsius, _ := strconv.Atoi(strings.TrimSpace(outPut))
 

tsconfig.json

@@ -1,25 +0,0 @@
-{
-    "compilerOptions": {
-        "declaration": true,
-        "lib": [
-            "es2017",
-            "DOM"
-        ],
-        "module": "commonjs",
-        "target": "es6",
-        "skipLibCheck": true,
-        "sourceMap": false,
-        "strict": true,
-        "useUnknownInCatchVariables": false,
-        "resolveJsonModule": true,
-        "esModuleInterop": true,
-        "outDir": "dist",
-        "types": [
-            "node"
-        ],
-    },
-    "exclude": [
-        "node_modules"
-    ],
-    "main": "generate/index"
-}