CPU temp support for other platforms (fix #661) (#677)

Signed-off-by: link <a624669980@163.com>
Co-authored-by: link <a624669980@163.com>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -28,5 +28,19 @@ If applicable, add screenshots to help explain your problem.
  - Browser [e.g. chrome, safari]
  - Version [e.g. 22]
 
+**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.service
+```
+
+
+
+
 **Additional context**
 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/workflows/release.yml

@@ -63,4 +63,9 @@ jobs:
             dist/linux-arm-7-casaos-${{ steps.get_version.outputs.VERSION }}.tar.gz:/IceWhaleTech/CasaOS/releases/download/${{ steps.get_version.outputs.VERSION }}/linux-arm-7-casaos-${{ steps.get_version.outputs.VERSION }}.tar.gz
             dist/linux-arm64-casaos-${{ steps.get_version.outputs.VERSION }}.tar.gz:/IceWhaleTech/CasaOS/releases/download/${{ steps.get_version.outputs.VERSION }}/linux-arm64-casaos-${{ steps.get_version.outputs.VERSION }}.tar.gz
             dist/linux-amd64-casaos-${{ steps.get_version.outputs.VERSION }}.tar.gz:/IceWhaleTech/CasaOS/releases/download/${{ steps.get_version.outputs.VERSION }}/linux-amd64-casaos-${{ steps.get_version.outputs.VERSION }}.tar.gz
+            dist/linux-arm-7-casaos-migration-tool-${{ steps.get_version.outputs.VERSION }}.tar.gz:/IceWhaleTech/CasaOS/releases/download/${{ steps.get_version.outputs.VERSION }}/linux-arm-7-casaos-migration-tool-${{ steps.get_version.outputs.VERSION }}.tar.gz
+            dist/linux-arm64-casaos-migration-tool-${{ steps.get_version.outputs.VERSION }}.tar.gz:/IceWhaleTech/CasaOS/releases/download/${{ steps.get_version.outputs.VERSION }}/linux-arm64-casaos-migration-tool-${{ steps.get_version.outputs.VERSION }}.tar.gz
+            dist/linux-amd64-casaos-migration-tool-${{ steps.get_version.outputs.VERSION }}.tar.gz:/IceWhaleTech/CasaOS/releases/download/${{ steps.get_version.outputs.VERSION }}/linux-amd64-casaos-migration-tool-${{ steps.get_version.outputs.VERSION }}.tar.gz
+
+
 

.gitignore

@@ -37,3 +37,6 @@ github.com
 .all-contributorsrc
 dist
 CasaOS
+
+# System Files
+.DS_Store

CHANGELOG.md

@@ -18,7 +18,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-## [0.3.7]
+
+## [0.3.8-alpha.1] 2022-11-16
+
+### Added
+- [System] Add system announcement
+- [App] Allow to turn off the display of "Existing Docker Apps" in the settings.
+
+### Changed
+- [System] Improve the feedback function, you can submit feedback in the bottom right corner of WebUI.
+
+### Fixed
+- [System] Fix CPU Temp for other platforms ([#661](https://github.com/IceWhaleTech/CasaOS/issues/661))
+
+## [0.3.7.1] 2022-11-04
+
+### Fixed
+
+- Fix memory leak issue ([#658](https://github.com/IceWhaleTech/CasaOS/issues/658)[#646](https://github.com/IceWhaleTech/CasaOS/issues/646))
+- Solve the problem of local application import failure ([#490](https://github.com/IceWhaleTech/CasaOS/issues/490))
+
+## [0.3.7] 2022-10-28
 
 ### Added
 - [Storage] Disk merge (Beta), you can merge multiple disks into a single storage space (currently you need to enable this feature from the command line)

README.md

@@ -120,13 +120,13 @@ Community Support
 Freshly install a system from the list above and run this command:
 
 ```sh
-wget -qO- https://get.casaos.io | bash
+wget -qO- https://get.casaos.io | sudo bash
 ```
 
 or
 
 ```sh
-curl -fsSL https://get.casaos.io | bash
+curl -fsSL https://get.casaos.io | sudo bash
 ```
 
 ### Uninstall CasaOS
@@ -141,7 +141,7 @@ casaos-uninstall
 Before v0.3.3
 
 ```sh
-curl -fsSL https://get.icewhale.io/casaos-uninstall.sh | bash
+curl -fsSL https://get.icewhale.io/casaos-uninstall.sh | sudo bash
 ```
 
 ## Community 
@@ -162,38 +162,8 @@ We believes that through community-driven collaborative innovation and open comm
 
 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!
 
-<details>
-  <summary><b>How can I get involved? 🧐</b></summary>
-  <p>
-
-### Coding 💻 (WIP)
-
-We are refining documentation that can be used for effective community collaboration. Feel free to start a discussion if you have a good idea.
-
-### Helping Users 💬
-
-If you have extensive knowledge of CasaOS and related areas. We highly encourage you to help others as much as you can in Discord and Discussions.
-
-Discord: [https://discord.gg/knqAbbBbeX](https://discord.gg/knqAbbBbeX)
-
-GitHub Discussions: [https://github.com/IceWhaleTech/CasaOS/discussions](https://github.com/IceWhaleTech/CasaOS/discussions)
-
-### Helping with Translations 🌍 (WIP)
-
-CasaOS officially supports English and Chinese. You are welcome to help make CasaOS available in more languages.
-
-### Performing Alpha Testing ⚠️
-
-Alpha testing is quality assurance testing that is engaged and driven by the community. It's a great way to get involved in contributing and experiencing the latest features before a new release.
-
-The documentation is being refined and you can contact @JohnGuan via [Discord](https://discord.gg/knqAbbBbeX). Ask to join the #casaos-alpha channel.
-
-### Writing Documentation 📖 (WIP)
-
-Help make our documentation better by writing new content for the CasaOS Wiki, correcting existing material, or translating content into new languages.
-
-  </p>
-</details>
+- 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 specificially
 
 ## Credits
 

build/sysroot/usr/share/casaos/cleanup/script.d/03-cleanup-casaos.sh

@@ -1,4 +1,14 @@
 #!/bin/bash
+###
+ # @Author: LinkLeong link@icewhale.org
+ # @Date: 2022-11-15 15:51:44
+ # @LastEditors: LinkLeong
+ # @LastEditTime: 2022-11-15 15:53:37
+ # @FilePath: /CasaOS/build/sysroot/usr/share/casaos/cleanup/script.d/03-cleanup-casaos.sh
+ # @Description: 
+ # @Website: https://www.casaos.io
+ # Copyright (c) 2022 by icewhale, All Rights Reserved. 
+### 
 
 set -e
 
@@ -44,4 +54,3 @@ readonly SETUP_SCRIPT_FILEPATH="${SETUP_SCRIPT_DIRECTORY}/${SETUP_SCRIPT_FILENAM
 
 echo "🟩 Running ${SETUP_SCRIPT_FILENAME}..."
 $SHELL "${SETUP_SCRIPT_FILEPATH}" "${BUILD_PATH}"
-

go.mod

@@ -4,7 +4,7 @@ go 1.16
 
 require (
 	github.com/Curtis-Milo/nat-type-identifier-go v0.0.0-20220215191915-18d42168c63d
-	github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220929035515-b1287110d6d8
+	github.com/IceWhaleTech/CasaOS-Common v0.3.7-5
 	github.com/IceWhaleTech/CasaOS-Gateway v0.3.6
 	github.com/Microsoft/go-winio v0.5.0 // indirect
 	github.com/ambelovsky/go-structs v1.1.0 // indirect

go.sum

@@ -84,8 +84,8 @@ github.com/Curtis-Milo/nat-type-identifier-go v0.0.0-20220215191915-18d42168c63d
 github.com/Curtis-Milo/nat-type-identifier-go v0.0.0-20220215191915-18d42168c63d/go.mod h1:lW9x+yEjqKdPbE3+cf2fGPJXCw/hChX3Omi9QHTLFsQ=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220901034123-ca130f6b5ce9/go.mod h1:2MiivEMzvh41codhEKUcn46WK3Ffesop/04qa9jsvQk=
-github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220929035515-b1287110d6d8 h1:r8nhgQ6tnrn6ikXN9aLH/K4H4H64Nc0hZ6jyW2B22x0=
-github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220929035515-b1287110d6d8/go.mod h1:2MiivEMzvh41codhEKUcn46WK3Ffesop/04qa9jsvQk=
+github.com/IceWhaleTech/CasaOS-Common v0.3.7-5 h1:CLPeUaFoGCA3WNnOWxtdFbBmLIg7odCQglZJ/c878uU=
+github.com/IceWhaleTech/CasaOS-Common v0.3.7-5/go.mod h1:2MiivEMzvh41codhEKUcn46WK3Ffesop/04qa9jsvQk=
 github.com/IceWhaleTech/CasaOS-Gateway v0.3.6 h1:2tQQo85+jzbbjqIsKKn77QlAA73bc7vZsVCFvWnK4mg=
 github.com/IceWhaleTech/CasaOS-Gateway v0.3.6/go.mod h1:hnZwGUzcOyiufMpVO7l3gu2gAm6Ws4TY4Nlj3kMshXA=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=

main.go

@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/IceWhaleTech/CasaOS-Gateway/common"
+	"github.com/IceWhaleTech/CasaOS-Common/model"
 	"github.com/IceWhaleTech/CasaOS/model/notify"
 	"github.com/IceWhaleTech/CasaOS/pkg/cache"
 	"github.com/IceWhaleTech/CasaOS/pkg/config"
@@ -56,6 +56,7 @@ func init() {
 	service.Cache = cache.Init()
 
 	service.GetToken()
+	service.GetCPUThermalZone()
 
 	service.NewVersionApp = make(map[string]string)
 	route.InitFunction()
@@ -112,7 +113,7 @@ func main() {
 	}
 	routers := []string{"sys", "apps", "container", "app-categories", "port", "file", "folder", "batch", "image", "samba", "notify"}
 	for _, v := range routers {
-		err = service.MyService.Gateway().CreateRoute(&common.Route{
+		err = service.MyService.Gateway().CreateRoute(&model.Route{
 			Path:   "/v1/" + v,
 			Target: "http://" + listener.Addr().String(),
 		})
@@ -126,7 +127,7 @@ func main() {
 		time.Sleep(time.Second * 2)
 		// v0.3.6
 		if config.ServerInfo.HttpPort != "" {
-			changePort := common.ChangePortRequest{}
+			changePort := model.ChangePortRequest{}
 			changePort.Port = config.ServerInfo.HttpPort
 			err := service.MyService.Gateway().ChangePort(&changePort)
 			if err == nil {

model/sys_common.go

@@ -74,3 +74,8 @@ type FileSetting struct {
 	ShareDir    []string `json:"share_dir" delim:"|"`
 	DownloadDir string   `json:"download_dir"`
 }
+type BaseInfo struct {
+	Hash    string `json:"i"`
+	Version string `json:"v"`
+	Channel string `json:"c,omitempty"`
+}

route/init.go

@@ -1,21 +1,65 @@
+/*
+ * @Author: LinkLeong link@icewhale.org
+ * @Date: 2022-11-15 15:51:44
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-11-15 15:55:16
+ * @FilePath: /CasaOS/route/init.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
 package route
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
 	"strings"
 	"time"
 
+	"github.com/IceWhaleTech/CasaOS/model"
+	"github.com/IceWhaleTech/CasaOS/pkg/config"
 	"github.com/IceWhaleTech/CasaOS/pkg/samba"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/encryption"
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/loger"
 	"github.com/IceWhaleTech/CasaOS/service"
+	"github.com/IceWhaleTech/CasaOS/types"
 	"go.uber.org/zap"
 )
 
 func InitFunction() {
 	go InitNetworkMount()
+	go InitInfo()
 }
+
+func InitInfo() {
+	mb := model.BaseInfo{}
+	if file.Exists(config.AppInfo.DBPath + "/baseinfo.conf") {
+		err := json.Unmarshal(file.ReadFullFile(config.AppInfo.DBPath+"/baseinfo.conf"), &mb)
+		if err != nil {
+			loger.Error("baseinfo.conf", zap.String("error", err.Error()))
+		}
+	}
+	if file.Exists("/etc/CHANNEL") {
+		channel := file.ReadFullFile("/etc/CHANNEL")
+		mb.Channel = string(channel)
+	}
+	mac, err := service.MyService.System().GetMacAddress()
+	if err != nil {
+		loger.Error("GetMacAddress", zap.String("error", err.Error()))
+	}
+	mb.Hash = encryption.GetMD5ByStr(mac)
+	mb.Version = types.CURRENTVERSION
+	os.Remove(config.AppInfo.DBPath + "/baseinfo.conf")
+	by, err := json.Marshal(mb)
+	if err != nil {
+		loger.Error("init info err", zap.Any("err", err))
+		return
+	}
+	file.WriteToFullPath(by, config.AppInfo.DBPath+"/baseinfo.conf", 0o666)
+}
+
 func InitNetworkMount() {
 	time.Sleep(time.Second * 10)
 	connections := service.MyService.Connections().GetConnectionsList()

route/v1/system.go

@@ -12,6 +12,7 @@ import (
 	"time"
 	"unsafe"
 
+	http2 "github.com/IceWhaleTech/CasaOS-Common/utils/http"
 	"github.com/IceWhaleTech/CasaOS/model"
 	"github.com/IceWhaleTech/CasaOS/pkg/config"
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/common_err"
@@ -342,7 +343,7 @@ func GetSystemNetInfo(c *gin.Context) {
 
 func GetSystemProxy(c *gin.Context) {
 	url := c.Query("url")
-	resp, err := http.Get(url)
+	resp, err := http2.Get(url, 30*time.Second)
 	if err != nil {
 		return
 	}

service/docker.go

@@ -560,6 +560,7 @@ func (ds *dockerService) DockerContainerCreate(m model.CustomizationPostData, id
 	//container, err := cli.ContainerCreate(context.Background(), info.Config, info.HostConfig, &network.NetworkingConfig{info.NetworkSettings.Networks}, nil, info.Name)
 
 	hostConfig.Mounts = volumes
+	hostConfig.Binds = []string{}
 	hostConfig.Privileged = m.Privileged
 	hostConfig.CapAdd = m.CapAdd
 	hostConfig.NetworkMode = container.NetworkMode(m.NetworkModel)

service/service.go

@@ -11,7 +11,7 @@
 package service
 
 import (
-	gateway "github.com/IceWhaleTech/CasaOS-Gateway/common"
+	"github.com/IceWhaleTech/CasaOS-Common/external"
 	"github.com/gorilla/websocket"
 	"github.com/patrickmn/go-cache"
 	"gorm.io/gorm"
@@ -35,12 +35,12 @@ type Repository interface {
 	System() SystemService
 	Shares() SharesService
 	Connections() ConnectionsService
-	Gateway() gateway.ManagementService
+	Gateway() external.ManagementService
 }
 
 func NewService(db *gorm.DB, RuntimePath string) Repository {
 
-	gatewayManagement, err := gateway.NewManagementService(RuntimePath)
+	gatewayManagement, err := external.NewManagementService(RuntimePath)
 	if err != nil && len(RuntimePath) > 0 {
 		panic(err)
 	}
@@ -68,10 +68,10 @@ type store struct {
 	system      SystemService
 	shares      SharesService
 	connections ConnectionsService
-	gateway     gateway.ManagementService
+	gateway     external.ManagementService
 }
 
-func (c *store) Gateway() gateway.ManagementService {
+func (c *store) Gateway() external.ManagementService {
 	return c.gateway
 }
 func (s *store) Connections() ConnectionsService {

service/system.go

@@ -16,6 +16,7 @@ import (
 	command2 "github.com/IceWhaleTech/CasaOS/pkg/utils/command"
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/common_err"
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/loger"
 	"github.com/shirou/gopsutil/v3/cpu"
 	"github.com/shirou/gopsutil/v3/disk"
 	"github.com/shirou/gopsutil/v3/host"
@@ -50,9 +51,18 @@ type SystemService interface {
 	IsServiceRunning(name string) bool
 	GetCPUTemperature() int
 	GetCPUPower() map[string]string
+	GetMacAddress() (string, error)
 }
 type systemService struct{}
 
+func (c *systemService) GetMacAddress() (string, error) {
+	interfaces, err := net.Interfaces()
+	if err != nil {
+		return "", err
+	}
+	inter := interfaces[0]
+	return inter.HardwareAddr, nil
+}
 func (c *systemService) MkdirAll(path string) (int, error) {
 	_, err := os.Stat(path)
 	if err == nil {
@@ -291,12 +301,46 @@ func (s *systemService) IsServiceRunning(name string) bool {
 	return strings.TrimSpace(status) == "running"
 }
 
+// find thermal_zone of cpu.
+// assertions:
+// * thermal_zone "type" and "temp" are required fields
+//   (https://www.kernel.org/doc/Documentation/ABI/testing/sysfs-class-thermal)
+func GetCPUThermalZone() string {
+	keyName := "cpu_thermal_zone"
+
+	var path string
+	if result, ok := Cache.Get(keyName); ok {
+		path, ok = result.(string)
+		if ok {
+			return path
+		}
+	}
+
+	for i := 0; i < 100; i++ {
+		path := "/sys/devices/virtual/thermal/thermal_zone" + strconv.Itoa(i)
+		if _, err := os.Stat(path); !os.IsNotExist(err) {
+			name := strings.TrimSuffix(string(file.ReadFullFile(path + "/type")), "\n")
+			cpu_types := []string{"x86_pkg_temp", "cpu", "CPU", "soc"}
+			for _, s := range cpu_types {
+				if strings.HasPrefix(name, s) {
+					loger.Info(fmt.Sprintf("CPU thermal zone found: %s, path: %s.", name, path))
+					Cache.SetDefault(keyName, path)
+					return path
+				}
+			}
+		} else {
+			loger.Error("CPUThermalZone not found. CPU Temp will not be displayed.")
+			break
+		}
+	}
+	return ""
+}
+
 func (s *systemService) GetCPUTemperature() int {
 	outPut := ""
-	if file.Exists("/sys/class/thermal/thermal_zone0/temp") {
-		outPut = string(file.ReadFullFile("/sys/class/thermal/thermal_zone0/temp"))
-	} else if file.Exists("/sys/class/hwmon/hwmon0/temp1_input") {
-		outPut = string(file.ReadFullFile("/sys/class/hwmon/hwmon0/temp1_input"))
+	path := GetCPUThermalZone()
+	if len(path)>0 {
+		outPut = string(file.ReadFullFile(path + "/temp"))
 	} else {
 		outPut = "0"
 	}

types/system.go

@@ -1,3 +1,13 @@
+/*
+ * @Author: LinkLeong link@icewhale.org
+ * @Date: 2022-11-15 15:51:44
+ * @LastEditors: LinkLeong
+ * @LastEditTime: 2022-11-15 15:56:03
+ * @FilePath: /CasaOS/types/system.go
+ * @Description:
+ * @Website: https://www.casaos.io
+ * Copyright (c) 2022 by icewhale, All Rights Reserved.
+ */
 /*@Author: LinkLeong link@icewhale.com
  *@Date: 2022-02-17 18:53:22
  *@LastEditors: LinkLeong
@@ -9,6 +19,6 @@
  */
 package types
 
-const CURRENTVERSION = "0.3.7"
+const CURRENTVERSION = "0.3.8"
 
 const BODY = " "