beenull/CasaOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Up json (#1186)

Browse source
This commit is contained in:
link 2023-06-14 11:32:04 +08:00 committed by GitHub
parent 23ce3487e1
commit f48cddf924
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
model/sys_common.go
View file

@ -70,7 +70,8 @@ type FileSetting struct {
DownloadDir string `json:"download_dir"` DownloadDir string `json:"download_dir"`
} }
type BaseInfo struct { type BaseInfo struct {
Hash string `json:"i"` Hash string `json:"i"`
Version string `json:"v"` Version string `json:"v"`
Channel string `json:"c,omitempty"` Channel string `json:"c,omitempty"`
DriveModel string `json:"m,omitempty"`
} }

7
route/init.go
View file

@ -17,6 +17,7 @@ import (
"strings" "strings"
"time" "time"
file1 "github.com/IceWhaleTech/CasaOS-Common/utils/file"
"github.com/IceWhaleTech/CasaOS-Common/utils/logger" "github.com/IceWhaleTech/CasaOS-Common/utils/logger"
"github.com/IceWhaleTech/CasaOS/common" "github.com/IceWhaleTech/CasaOS/common"
"github.com/IceWhaleTech/CasaOS/model" "github.com/IceWhaleTech/CasaOS/model"
@ -53,6 +54,12 @@ func InitInfo() {
} }
mb.Hash = encryption.GetMD5ByStr(mac) mb.Hash = encryption.GetMD5ByStr(mac)
mb.Version = common.VERSION 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") os.Remove(config.AppInfo.DBPath + "/baseinfo.conf")
by, err := json.Marshal(mb) by, err := json.Marshal(mb)
if err != nil { if err != nil {