New App Store

Add App Store for installation
Fix favicon display in dark mode

go.mod

@@ -15,7 +15,6 @@ require (
 	github.com/forease/gotld v0.0.0-20190808124948-c50ff635576b
 	github.com/gin-contrib/gzip v0.0.2 // indirect
 	github.com/gin-gonic/gin v1.7.2
-	github.com/gliderlabs/ssh v0.3.3
 	github.com/go-ini/ini v1.62.0
 	github.com/go-ole/go-ole v1.2.5 // indirect
 	github.com/go-openapi/spec v0.20.4 // indirect
@@ -37,6 +36,7 @@ require (
 	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

go.sum

@@ -94,8 +94,6 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
 github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
 github.com/andybalholm/cascadia v1.1.0 h1:BuuO6sSfQNFRu1LppgbD25Hr2vLYW25JvxHs5zzsLTo=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
-github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
-github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
@@ -313,8 +311,6 @@ github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gin-gonic/gin v1.7.2 h1:Tg03T9yM2xa8j6I3Z3oqLaQRSmKvxPd6g/2HJ6zICFA=
 github.com/gin-gonic/gin v1.7.2/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
-github.com/gliderlabs/ssh v0.3.3 h1:mBQ8NiOgDkINJrZtoizkC3nDNYgSaWtxyem6S2XHBtA=
-github.com/gliderlabs/ssh v0.3.3/go.mod h1:ZSS+CUoKHDrqVakTfTWUlKSr9MtMFkC4UvtQKD7O914=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -632,6 +628,8 @@ github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3
 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=
@@ -825,7 +823,6 @@ 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/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=

main.go

@@ -6,11 +6,13 @@ import (
 	"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"
 )
@@ -29,6 +31,7 @@ func init() {
 	sqliteDB = sqlite.GetDb(config.AppInfo.ProjectPath)
 	//gredis.GetRedisConn(config.RedisInfo),
 	service.MyService = service.NewService(sqliteDB, loger2.NewOLoger())
+	service.Cache = cache.Init()
 }
 
 // @title casaOS API

model/app.go

@@ -15,12 +15,14 @@ type ServerAppList struct {
 	Icon           string    `json:"icon"`
 	ScreenshotLink Strings   `gorm:"type:json" json:"screenshot_link"`
 	Category       string    `json:"category"`
-	TcpPort        uint       `json:"tcp_port"`
+	PortMap        string    `json:"port_map"`
-	PortMap        uint       `json:"port_map"`
 	ImageVersion   string    `json:"image_version"`
 	Tip            string    `json:"tip"`
-	Configures     configures `gorm:"type:json" json:"configures"`
+	Envs           EnvArray  `json:"envs"`
-	NetworkModel   string     `json:"network_mode"`
+	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"`
@@ -33,6 +35,7 @@ type ServerAppList struct {
 	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"`
+	ContainerPort string `json:"container"`
-	CommendPort   string `json:"host,omitempty"`
+	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"`
+	Envs         EnvArray  `json:"envs"`
-	Ports        PortArrey `json:"ports"`
+	Ports        PortArray `json:"ports"`
-	Volumes      PathArrey `json:"volumes"`
+	Volumes      PathArray `json:"volumes"`
-	Devices      PathArrey `json:"devices"`
+	Devices      PathArray `json:"devices"`
 	//Port         string    `json:"port,omitempty"`
 	PortMap     string `json:"port_map"`
 	CpuShares   int64  `json:"cpu_shares"`

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/docker/volumes.go

@@ -1,10 +1,25 @@
 package docker
 
+import "strings"
+
 func GetDir(id, envName string) string {
 	var path string
-	switch envName {
+
-	case "/config":
+	if len(id) == 0 {
-		path = "/oasis/app_data/" + id + "/"
+		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/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
 }

pkg/utils/httper/httper.go

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

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_evn.go

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

route/v1/app.go

@@ -1,15 +1,17 @@
 package v1
 
 import (
+	"net/http"
+	"strconv"
+
 	"github.com/IceWhaleTech/CasaOS/model"
+	"github.com/IceWhaleTech/CasaOS/pkg/docker"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/env_helper"
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
 	oasis_err2 "github.com/IceWhaleTech/CasaOS/pkg/utils/oasis_err"
 	port2 "github.com/IceWhaleTech/CasaOS/pkg/utils/port"
-	"github.com/IceWhaleTech/CasaOS/pkg/utils/sort"
 	"github.com/IceWhaleTech/CasaOS/service"
 	"github.com/gin-gonic/gin"
-	"net/http"
-	"strconv"
 )
 
 // @Summary 获取远程列表
@@ -110,51 +112,66 @@ func MyAppList(c *gin.Context) {
 func AppInfo(c *gin.Context) {
 
 	id := c.Param("id")
-	info := service.MyService.App().GetServerAppInfo(id)
+	info := service.MyService.OAPI().GetServerAppInfo(id)
 	if info.NetworkModel != "host" {
-		port, _ := port2.GetAvailablePort("tcp")
+		for i := 0; i < len(info.Ports); i++ {
-		info.PortMap = uint(port)
+			if p, _ := strconv.Atoi(info.Ports[i].ContainerPort); port2.IsPortAvailable(p, info.Ports[i].Protocol) {
-		for i := 0; i < len(info.Configures.TcpPorts); i++ {
+				info.Ports[i].CommendPort = strconv.Itoa(p)
-			info.Configures.TcpPorts[i].CommendPort, _ = port2.GetAvailablePort("tcp")
-		}
-		for i := 0; i < len(info.Configures.UdpPorts); i++ {
-			info.Configures.UdpPorts[i].CommendPort, _ = port2.GetAvailablePort("udp")
-		}
 			} else {
-		info.PortMap = info.TcpPort
+				if info.Ports[i].Protocol == "tcp" {
+					if p, err := port2.GetAvailablePort("tcp"); err == nil {
+						info.Ports[i].CommendPort = strconv.Itoa(p)
+					}
+				} else if info.Ports[i].Protocol == "upd" {
+					if p, err := port2.GetAvailablePort("udp"); err == nil {
+						info.Ports[i].CommendPort = strconv.Itoa(p)
 					}
-
-	for i := 0; i < len(info.Configures.Devices); i++ {
-		if !file.CheckNotExist(info.Configures.Devices[i].ContainerPath) {
-			info.Configures.Devices[i].Path = info.Configures.Devices[i].ContainerPath
 				}
 			}
 
-	portOrder := func(c1, c2 *model.Ports) bool {
+			if info.Ports[i].Type == 0 {
-		return c1.Type < c2.Type
+				info.PortMap = info.Ports[i].CommendPort
+			}
+		}
 	}
 
-	envOrder := func(c1, c2 *model.Envs) bool {
+	for i := 0; i < len(info.Devices); i++ {
-		return c1.Type < c2.Type
+		if !file.CheckNotExist(info.Devices[i].ContainerPath) {
+			info.Devices[i].Path = info.Devices[i].ContainerPath
+		}
+	}
+	if len(info.Tip) > 0 {
+		info.Tip = env_helper.ReplaceStringDefaultENV(info.Tip)
 	}
 
-	volOrder := func(c1, c2 *model.Volume) bool {
+	for i := 0; i < len(info.Volumes); i++ {
-		return c1.Type < c2.Type
+		info.Volumes[i].Path = docker.GetDir("", info.Volumes[i].ContainerPath)
 	}
+	// portOrder := func(c1, c2 *model.Ports) bool {
+	// 	return c1.Type < c2.Type
+	// }
 
-	devOrder := func(c1, c2 *model.Devices) bool {
+	// envOrder := func(c1, c2 *model.Envs) bool {
-		return c1.Type < c2.Type
+	// 	return c1.Type < c2.Type
-	}
+	// }
+
+	// volOrder := func(c1, c2 *model.Volume) bool {
+	// 	return c1.Type < c2.Type
+	// }
+
+	// devOrder := func(c1, c2 *model.Devices) bool {
+	// 	return c1.Type < c2.Type
+	// }
 
 	//sort
-	if info.NetworkModel != "host" {
+	// if info.NetworkModel != "host" {
-		sort.PortsSort(portOrder).Sort(info.Configures.TcpPorts)
+	// 	sort.PortsSort(portOrder).Sort(info.Configures.TcpPorts)
-		sort.PortsSort(portOrder).Sort(info.Configures.UdpPorts)
+	// 	sort.PortsSort(portOrder).Sort(info.Configures.UdpPorts)
-	}
+	// }
 
-	sort.EnvSort(envOrder).Sort(info.Configures.Envs)
+	// sort.EnvSort(envOrder).Sort(info.Envs)
-	sort.VolSort(volOrder).Sort(info.Configures.Volumes)
+	// sort.VolSort(volOrder).Sort(info.Volumes.([]model.PathMap))
-	sort.DevSort(devOrder).Sort(info.Configures.Devices)
+	// sort.DevSort(devOrder).Sort(info.Devices)
 
 	info.MaxMemory = service.MyService.ZiMa().GetMemInfo().Total >> 20
 

route/v1/docker.go

@@ -25,6 +25,7 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/jinzhu/copier"
 	uuid "github.com/satori/go.uuid"
+	"github.com/tidwall/gjson"
 	"golang.org/x/crypto/ssh"
 )
 
@@ -172,7 +173,7 @@ func InstallApp(c *gin.Context) {
 		dockerImageVersion = "latest"
 	}
 	if m.Origin != "custom" {
-		appInfo = service.MyService.App().GetServerAppInfo(appId)
+		appInfo = service.MyService.OAPI().GetServerAppInfo(appId)
 
 	} else {
 
@@ -238,10 +239,9 @@ func InstallApp(c *gin.Context) {
 	var relyMap = make(map[string]string)
 	go func() {
 		installLog := model2.AppNotify{}
-		installLog.CustomId = id
 		installLog.State = 0
+		installLog.CustomId = id
 		installLog.Message = "installing rely"
-		installLog.Speed = 10
 		installLog.Type = types.NOTIFY_TYPE_UNIMPORTANT
 		installLog.CreatedAt = strconv.FormatInt(time.Now().Unix(), 10)
 		installLog.UpdatedAt = strconv.FormatInt(time.Now().Unix(), 10)
@@ -279,16 +279,13 @@ func InstallApp(c *gin.Context) {
 					} else {
 						docker_base.MysqlDelete(mysqlContainerId)
 						installLog.State = 0
-						installLog.Speed = 30
 						installLog.Message = err.Error()
 						service.MyService.Notify().UpdateLog(installLog)
 					}
 				}
 			}
-
 		}
 
-		installLog.Speed = 50
 		installLog.Message = "pulling"
 		service.MyService.Notify().UpdateLog(installLog)
 
@@ -296,7 +293,6 @@ func InstallApp(c *gin.Context) {
 		err := service.MyService.Docker().DockerPullImage(dockerImage+":"+dockerImageVersion, installLog)
 		if err != nil {
 			installLog.State = 0
-			installLog.Speed = 70
 			installLog.Message = err.Error()
 			installLog.Type = types.NOTIFY_TYPE_ERROR
 			service.MyService.Notify().UpdateLog(installLog)
@@ -323,35 +319,34 @@ func InstallApp(c *gin.Context) {
 		// 	return
 		// }
 		containerId, err := service.MyService.Docker().DockerContainerCreate(dockerImage+":"+dockerImageVersion, id, m, appInfo.NetworkModel)
-		installLog.ContainerId = containerId
+		installLog.Name = appInfo.Title
+		installLog.Icon = appInfo.Icon
 		if err != nil {
 			//service.MyService.Redis().Set(id, "{\"id\"\""+id+"\",\"state\":false,\"message\":\""+err.Error()+"\",\"speed\":80}", 100)
 			installLog.State = 0
-			installLog.Speed = 80
 			installLog.Type = types.NOTIFY_TYPE_ERROR
 			installLog.Message = err.Error()
 			service.MyService.Notify().UpdateLog(installLog)
 			return
 		} else {
 			//service.MyService.Redis().Set(id, "{\"id\":\""+id+"\",\"state\":true,\"message\":\"starting\",\"speed\":80}", 100)
-			installLog.Speed = 80
 			installLog.Message = "starting"
 			service.MyService.Notify().UpdateLog(installLog)
 		}
 
+		//		echo -e "hellow\nworld" >>
+
 		//step：启动容器
 		err = service.MyService.Docker().DockerContainerStart(id)
 		if err != nil {
 			//service.MyService.Redis().Set(id, "{\"id\"\""+id+"\",\"state\":false,\"message\":\""+err.Error()+"\",\"speed\":90}", 100)
 			installLog.State = 0
 			installLog.Type = types.NOTIFY_TYPE_ERROR
-			installLog.Speed = 90
 			installLog.Message = err.Error()
 			service.MyService.Notify().UpdateLog(installLog)
 			return
 		} else {
 			//service.MyService.Redis().Set(id, "{\"id\":\""+id+"\",\"state\":true,\"message\":\"setting upnp\",\"speed\":90}", 100)
-			installLog.Speed = 90
 			if m.Origin != CUSTOM {
 				installLog.Message = "setting upnp"
 			} else {
@@ -396,13 +391,11 @@ func InstallApp(c *gin.Context) {
 				if err != nil {
 					//service.MyService.Redis().Set(id, "{\"id\"\""+id+"\",\"state\":false,\"message\":\""+err.Error()+"\",\"speed\":95}", 100)
 					installLog.State = 0
-					installLog.Speed = 95
 					installLog.Type = types.NOTIFY_TYPE_ERROR
 					installLog.Message = err.Error()
 					service.MyService.Notify().UpdateLog(installLog)
 				} else {
 					//service.MyService.Redis().Set(id, "{\"id\":\""+id+"\",\"state\":true,\"message\":\"checking\",\"speed\":95}", 100)
-					installLog.Speed = 95
 					installLog.Message = "checking"
 					service.MyService.Notify().UpdateLog(installLog)
 				}
@@ -414,14 +407,12 @@ func InstallApp(c *gin.Context) {
 		if err != nil && container.ContainerJSONBase.State.Running {
 			//service.MyService.Redis().Set(id, "{\"id\"\""+id+"\",\"state\":false,\"message\":\""+err.Error()+"\",\"speed\":100}", 100)
 			installLog.State = 0
-			installLog.Speed = 100
 			installLog.Type = types.NOTIFY_TYPE_ERROR
 			installLog.Message = err.Error()
 			service.MyService.Notify().UpdateLog(installLog)
 			return
 		} else {
 			//service.MyService.Redis().Set(id, "{\"id\":\""+id+"\",\"state\":true,\"message\":\"installed\",\"speed\":100}", 100)
-			installLog.Speed = 100
 			installLog.Message = "installed"
 			service.MyService.Notify().UpdateLog(installLog)
 		}
@@ -697,7 +688,11 @@ func UnInstallApp(c *gin.Context) {
 	if info.Origin != "custom" {
 
 		//step: 删除文件夹
-		service.MyService.App().DelAppConfigDir(appId)
+		vol := gjson.Get(info.Volumes, "#.host")
+		for _, v := range vol.Array() {
+
+			service.MyService.App().DelAppConfigDir(appId, v.String())
+		}
 
 		//step: 删除install log
 		service.MyService.Notify().DelLog(appId)
@@ -802,7 +797,6 @@ func ContainerLog(c *gin.Context) {
 func GetInstallSpeed(c *gin.Context) {
 	id := c.Param("id")
 	b := service.MyService.Notify().GetLog(id)
-	b.Id = b.CustomId
 	c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: b})
 }
 
@@ -1132,16 +1126,16 @@ func ContainerUpdateInfo(c *gin.Context) {
 		c.JSON(http.StatusOK, model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: err.Error()})
 		return
 	}
-	var port model.PortArrey
+	var port model.PortArray
 	json2.Unmarshal([]byte(appInfo.Ports), &port)
 
-	var envs model.EnvArrey
+	var envs model.EnvArray
 	json2.Unmarshal([]byte(appInfo.Envs), &envs)
 
-	var vol model.PathArrey
+	var vol model.PathArray
 	json2.Unmarshal([]byte(appInfo.Volumes), &vol)
 
-	var dir model.PathArrey
+	var dir model.PathArray
 	json2.Unmarshal([]byte(appInfo.Devices), &dir)
 
 	//volumesStr, _ := json2.Marshal(m.Volumes)

route/v1/system.go

@@ -28,13 +28,12 @@ func CheckVersion(c *gin.Context) {
 	need, version := version.IsNeedUpdate()
 	if need {
 		installLog := model2.AppNotify{}
-		installLog.CustomId = ""
 		installLog.State = 0
 		installLog.Message = "New version " + version.Version + " is ready, ready to upgrade"
-		installLog.Speed = 100
 		installLog.Type = types.NOTIFY_TYPE_NEED_CONFIRM
 		installLog.CreatedAt = strconv.FormatInt(time.Now().Unix(), 10)
 		installLog.UpdatedAt = strconv.FormatInt(time.Now().Unix(), 10)
+		installLog.Name = "CasaOS System"
 		service.MyService.Notify().AddLog(installLog)
 	}
 	data := make(map[string]interface{}, 1)
@@ -69,7 +68,6 @@ func GetSystemConfig(c *gin.Context) {
 // @Produce  application/json
 // @Accept application/json
 // @Tags sys
-// @Param file query line false "get the number of log lines"
 // @Security ApiKeyAuth
 // @Success 200 {string} string "ok"
 // @Router /sys/error/logs [get]

service/app.go

@@ -2,35 +2,31 @@ package service
 
 import (
 	"context"
-	json2 "encoding/json"
+	"strings"
-	"github.com/IceWhaleTech/CasaOS/model"
+	"time"
+
 	"github.com/IceWhaleTech/CasaOS/pkg/config"
 	"github.com/IceWhaleTech/CasaOS/pkg/docker"
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/command"
-	httper2 "github.com/IceWhaleTech/CasaOS/pkg/utils/httper"
 	loger2 "github.com/IceWhaleTech/CasaOS/pkg/utils/loger"
 	model2 "github.com/IceWhaleTech/CasaOS/service/model"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	client2 "github.com/docker/docker/client"
 	"github.com/pkg/errors"
-	"github.com/tidwall/gjson"
 	"gorm.io/gorm"
-	"strings"
-	"time"
 )
 
 type AppService interface {
 	GetMyList(index, size int, position bool) *[]model2.MyAppList
 	SaveContainer(m model2.AppListDBModel)
-	GetServerAppInfo(id string) model.ServerAppList
 	GetUninstallInfo(id string) model2.AppListDBModel
 	RemoveContainerById(id string)
 	GetContainerInfo(name string) (types.Container, error)
 	GetAppDBInfo(id string) model2.AppListDBModel
 	UpdateApp(m model2.AppListDBModel)
 	GetSimpleContainerInfo(name string) (types.Container, error)
-	DelAppConfigDir(id string)
+	DelAppConfigDir(id, path string)
 }
 
 type appStruct struct {
@@ -155,27 +151,6 @@ func (a *appStruct) GetUninstallInfo(id string) model2.AppListDBModel {
 	return m
 }
 
-func (a *appStruct) GetServerAppInfo(id string) model.ServerAppList {
-
-	head := make(map[string]string)
-
-	t := make(chan string)
-
-	go func() {
-		str := httper2.Get(config.ServerInfo.ServerApi+"/token", nil)
-
-		t <- gjson.Get(str, "data").String()
-	}()
-	head["Authorization"] = <-t
-
-	infoS := httper2.Get(config.ServerInfo.ServerApi+"/v1/app/info/"+id, head)
-
-	info := model.ServerAppList{}
-	json2.Unmarshal([]byte(gjson.Get(infoS, "data").String()), &info)
-
-	return info
-}
-
 //创建容器成功后保存容器
 func (a *appStruct) SaveContainer(m model2.AppListDBModel) {
 	a.db.Table(model2.CONTAINERTABLENAME).Create(&m)
@@ -185,8 +160,8 @@ func (a *appStruct) UpdateApp(m model2.AppListDBModel) {
 	a.db.Table(model2.CONTAINERTABLENAME).Save(&m)
 }
 
-func (a *appStruct) DelAppConfigDir(id string) {
+func (a *appStruct) DelAppConfigDir(id, path string) {
-	command.OnlyExec("source " + config.AppInfo.ProjectPath + "/shell/helper.sh ;DelAppConfigDir " + docker.GetDir(id, "/config"))
+	command.OnlyExec("source " + config.AppInfo.ProjectPath + "/shell/helper.sh ;DelAppConfigDir " + docker.GetDir(id, path))
 }
 
 func (a *appStruct) RemoveContainerById(id string) {

service/casa.go

@@ -2,34 +2,29 @@ package service
 
 import (
 	json2 "encoding/json"
+	"strconv"
+
 	"github.com/IceWhaleTech/CasaOS/model"
 	"github.com/IceWhaleTech/CasaOS/pkg/config"
 	httper2 "github.com/IceWhaleTech/CasaOS/pkg/utils/httper"
 	model2 "github.com/IceWhaleTech/CasaOS/service/model"
 	"github.com/tidwall/gjson"
-	"strconv"
 )
 
-type OasisService interface {
+type CasaService interface {
 	GetServerList(index, size, tp, categoryId, key string) ([]model.ServerAppList, int64)
 	GetServerCategoryList() []model.ServerCategoryList
 	GetTaskList(size int) []model2.TaskDBModel
+	GetServerAppInfo(id string) model.ServerAppList
 }
 
-type oasisService struct {
+type casaService struct {
 }
 
-func (o *oasisService) GetTaskList(size int) []model2.TaskDBModel {
+func (o *casaService) GetTaskList(size int) []model2.TaskDBModel {
 	head := make(map[string]string)
 
-	t := make(chan string)
+	head["Authorization"] = GetToken()
-
-	go func() {
-		str := httper2.Get(config.ServerInfo.ServerApi+"/token", nil)
-
-		t <- gjson.Get(str, "data").String()
-	}()
-	head["Authorization"] = <-t
 
 	listS := httper2.Get(config.ServerInfo.ServerApi+"/v1/task/list/"+strconv.Itoa(size), head)
 
@@ -39,18 +34,11 @@ func (o *oasisService) GetTaskList(size int) []model2.TaskDBModel {
 	return list
 }
 
-func (o *oasisService) GetServerList(index, size, tp, categoryId, key string) ([]model.ServerAppList, int64) {
+func (o *casaService) GetServerList(index, size, tp, categoryId, key string) ([]model.ServerAppList, int64) {
 
 	head := make(map[string]string)
 
-	t := make(chan string)
+	head["Authorization"] = GetToken()
-
-	go func() {
-		str := httper2.Get(config.ServerInfo.ServerApi+"/token", nil)
-
-		t <- gjson.Get(str, "data").String()
-	}()
-	head["Authorization"] = <-t
 
 	listS := httper2.Get(config.ServerInfo.ServerApi+"/v1/app/list?index="+index+"&size="+size+"&type="+tp+"&category_id="+categoryId+"&key="+key, head)
 
@@ -62,18 +50,10 @@ func (o *oasisService) GetServerList(index, size, tp, categoryId, key string) ([
 	return list, count
 }
 
-func (o *oasisService) GetServerCategoryList() []model.ServerCategoryList {
+func (o *casaService) GetServerCategoryList() []model.ServerCategoryList {
 
 	head := make(map[string]string)
-
+	head["Authorization"] = GetToken()
-	t := make(chan string)
-
-	go func() {
-		str := httper2.Get(config.ServerInfo.ServerApi+"/token", nil)
-
-		t <- gjson.Get(str, "data").String()
-	}()
-	head["Authorization"] = <-t
 
 	listS := httper2.Get(config.ServerInfo.ServerApi+"/v1/app/category", head)
 
@@ -83,7 +63,42 @@ func (o *oasisService) GetServerCategoryList() []model.ServerCategoryList {
 
 	return list
 }
+func (o *casaService) GetServerAppInfo(id string) model.ServerAppList {
 
-func NewOasisService() OasisService {
+	head := make(map[string]string)
-	return &oasisService{}
+
+	head["Authorization"] = GetToken()
+
+	infoS := httper2.Get(config.ServerInfo.ServerApi+"/v1/app/info/"+id, head)
+
+	info := model.ServerAppList{}
+	json2.Unmarshal([]byte(gjson.Get(infoS, "data").String()), &info)
+
+	return info
+}
+func GetToken() string {
+	t := make(chan string)
+	keyName := "casa_token"
+
+	var auth string
+	if result, ok := Cache.Get(keyName); ok {
+		auth, ok = result.(string)
+		if ok {
+
+			return auth
+		}
+	}
+	go func() {
+		str := httper2.Get(config.ServerInfo.ServerApi+"/token", nil)
+
+		t <- gjson.Get(str, "data").String()
+	}()
+	auth = <-t
+
+	Cache.SetDefault(keyName, auth)
+	return auth
+}
+
+func NewOasisService() CasaService {
+	return &casaService{}
 }

service/disk.go

@@ -3,14 +3,15 @@ package service
 import (
 	json2 "encoding/json"
 	"fmt"
+	"strconv"
+	"strings"
+
 	"github.com/IceWhaleTech/CasaOS/model"
 	"github.com/IceWhaleTech/CasaOS/pkg/config"
 	command2 "github.com/IceWhaleTech/CasaOS/pkg/utils/command"
 	loger2 "github.com/IceWhaleTech/CasaOS/pkg/utils/loger"
 	"github.com/shirou/gopsutil/v3/disk"
 	"github.com/tidwall/gjson"
-	"strconv"
-	"strings"
 )
 
 type DiskService interface {

service/docker.go

@@ -20,6 +20,7 @@ import (
 	"github.com/IceWhaleTech/CasaOS/model"
 	"github.com/IceWhaleTech/CasaOS/pkg/docker"
 	command2 "github.com/IceWhaleTech/CasaOS/pkg/utils/command"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/env_helper"
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
 	loger2 "github.com/IceWhaleTech/CasaOS/pkg/utils/loger"
 
@@ -60,6 +61,7 @@ type DockerService interface {
 	DockerNetworkModelList() []types.NetworkResource
 	DockerImageInfo(image string)
 	GetNetWorkNameByNetWorkID(id string) (string, error)
+	ContainerExecShell(container_id string) string
 }
 
 type dockerService struct {
@@ -67,15 +69,20 @@ type dockerService struct {
 	log     loger2.OLog
 }
 
-func DockerPs() {
+func (ds *dockerService) ContainerExecShell(container_id string) string {
 	cli, _ := client2.NewClientWithOpts(client2.FromEnv)
-	containers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{})
+	exec, err := cli.ContainerExecCreate(context.Background(), container_id, types.ExecConfig{
+		User: "1000:1000",
+		Cmd:  []string{"echo -e \"hellow\nworld\" >> /a.txt"},
+	})
 	if err != nil {
 		os.Exit(5)
 	}
-	for _, container := range containers {
+	err = cli.ContainerExecStart(context.Background(), exec.ID, types.ExecStartCheck{})
-		fmt.Printf("%s %s\n", container.ID[:10], container.Image)
+	if err != nil {
+		fmt.Println("exec script error ", err)
 	}
+	return exec.ID
 }
 
 //创建默认网络
@@ -327,7 +334,6 @@ func (ds *dockerService) DockerPullImage(imageName string, m model2.AppNotify) e
 		}
 		m.Type = types2.NOTIFY_TYPE_INSTALL_LOG
 		m.State = 0
-		m.Speed = 70
 		m.Message = string(buf[:n])
 		MyService.Notify().UpdateLog(m)
 	}
@@ -402,6 +408,10 @@ func (ds *dockerService) DockerContainerCreate(imageName string, containerDbId s
 
 	var envArr []string
 	for _, e := range m.Envs {
+		if strings.HasPrefix(e.Value, "$") {
+			envArr = append(envArr, e.Name+"="+env_helper.ReplaceDefaultENV(e.Value))
+			continue
+		}
 		if len(e.Value) > 0 {
 			if e.Value == "port_map" {
 				envArr = append(envArr, e.Name+"="+m.PortMap)
@@ -434,6 +444,7 @@ func (ds *dockerService) DockerContainerCreate(imageName string, containerDbId s
 				continue
 			}
 		}
+		path = strings.ReplaceAll(path, "$AppID", containerDbId)
 		reg1 := regexp.MustCompile(`([^<>/\\\|:""\*\?]+\.\w+$)`)
 		result1 := reg1.FindAllStringSubmatch(path, -1)
 		if len(result1) == 0 {
@@ -476,11 +487,12 @@ func (ds *dockerService) DockerContainerCreate(imageName string, containerDbId s
 		StartPeriod: 0,
 		Retries:     1000,
 	}
+	fmt.Print(health)
 	config := &container.Config{
 		Image:  imageName,
 		Labels: map[string]string{"origin": m.Origin, m.Origin: m.Origin},
 		Env:    envArr,
-		Healthcheck: health,
+		//	Healthcheck: health,
 	}
 	hostConfig := &container.HostConfig{Resources: res, Mounts: volumes, RestartPolicy: rp, NetworkMode: container.NetworkMode(net)}
 	//if net != "host" {
@@ -817,7 +829,6 @@ func Containerd() {
 	)
 
 	if err != nil {
-		fmt.Println("333")
 		fmt.Println(err)
 	}
 	defer container.Delete(ctx, containerd.WithSnapshotCleanup)
@@ -825,7 +836,6 @@ func Containerd() {
 	// create a task from the container
 	task, err := container.NewTask(ctx, cio.NewCreator(cio.WithStdio))
 	if err != nil {
-		fmt.Println("444")
 		fmt.Println(err)
 	}
 	defer task.Delete(ctx)
@@ -838,7 +848,6 @@ func Containerd() {
 
 	// call start on the task to execute the redis server
 	if err = task.Start(ctx); err != nil {
-		fmt.Println("555")
 		fmt.Println(err)
 	}
 
@@ -848,7 +857,6 @@ func Containerd() {
 
 	// kill the process and get the exit status
 	if err = task.Kill(ctx, syscall.SIGTERM); err != nil {
-		fmt.Println("666")
 		fmt.Println(err)
 	}
 
@@ -857,7 +865,6 @@ func Containerd() {
 	status := <-exitStatusC
 	code, _, err := status.Result()
 	if err != nil {
-		fmt.Println("777")
 		fmt.Println(err)
 	}
 	fmt.Printf("redis-server exited with status: %d\n", code)

service/docker_base/common.go

@@ -3,7 +3,7 @@ package docker_base
 import "github.com/IceWhaleTech/CasaOS/model"
 
 //过滤mysql关键字
-func MysqlFilter(c MysqlConfig, envs model.EnvArrey) model.EnvArrey {
+func MysqlFilter(c MysqlConfig, envs model.EnvArray) model.EnvArray {
 	for i := 0; i < len(envs); i++ {
 		switch envs[i].Value {
 		case "$MYSQL_HOST":

service/model/o_notify.go

@@ -1,15 +1,15 @@
 package model
 
 type AppNotify struct {
-	CustomId    string `gorm:"column:custom_id;primary_key" json:"custom_id"`
-	ContainerId string `json:"container_id,omitempty"`
 	State     int    `json:"state"` //0:一直在变动的未读消息 1:未读  2:已读
 	Message   string `json:"message"`
-	CreatedAt   string `gorm:"<-:create;autoCreateTime" json:"created_at"`
+	CreatedAt string `json:"created_at"`
-	UpdatedAt   string `gorm:"<-:create;<-:update;autoUpdateTime" json:"updated_at"`
+	UpdatedAt string `json:"updated_at"`
-	Speed       int    `json:"speed"`
+	Id        string `json:"id"`
-	Id          string `gorm:"-" json:"id"`
+	Type      int    `json:"type"` // 1:显示即为已读 2:info 3:warning 4:error 5:success
-	Type        int    `json:"type"` // 1:显示即为已读 2:必须手动点掉 3:error
+	Icon      string `json:"icon"`
+	Name      string `json:"name"`
+	CustomId  string `gorm:"column:custom_id;primary_key" json:"custom_id"`
 }
 
 func (p *AppNotify) TableName() string {

service/service.go

@@ -2,9 +2,12 @@ package service
 
 import (
 	loger2 "github.com/IceWhaleTech/CasaOS/pkg/utils/loger"
+	"github.com/patrickmn/go-cache"
 	"gorm.io/gorm"
 )
 
+var Cache *cache.Cache
+
 var MyService Repository
 
 type Repository interface {
@@ -15,7 +18,7 @@ type Repository interface {
 	//Redis() RedisService
 	ZeroTier() ZeroTierService
 	ZiMa() ZiMaService
-	OAPI() OasisService
+	OAPI() CasaService
 	Disk() DiskService
 	Notify() NotifyServer
 	ShareDirectory() ShareDirService
@@ -55,7 +58,7 @@ type store struct {
 	docker         DockerService
 	zerotier       ZeroTierService
 	zima           ZiMaService
-	oapi           OasisService
+	oapi           CasaService
 	disk           DiskService
 	notify         NotifyServer
 	shareDirectory ShareDirService
@@ -102,7 +105,7 @@ func (c *store) ZeroTier() ZeroTierService {
 func (c *store) ZiMa() ZiMaService {
 	return c.zima
 }
-func (c *store) OAPI() OasisService {
+func (c *store) OAPI() CasaService {
 	return c.oapi
 }
 

service/system.go

@@ -1,14 +1,11 @@
 package service
 
 import (
-	"bufio"
+	"io/ioutil"
-	"fmt"
-	"io"
 	"os"
 
 	"github.com/IceWhaleTech/CasaOS/pkg/config"
 	command2 "github.com/IceWhaleTech/CasaOS/pkg/utils/command"
-	"github.com/IceWhaleTech/CasaOS/pkg/utils/file"
 	"github.com/IceWhaleTech/CasaOS/pkg/utils/loger"
 )
 
@@ -40,38 +37,21 @@ func (s *systemService) UpSystemConfig(str string, widget string) {
 		config.Cfg.Section("system").Key("WidgetList").SetValue(widget)
 		config.SystemConfigInfo.WidgetList = widget
 	}
-	config.Cfg.SaveTo("conf/conf.ini")
+	config.Cfg.SaveTo(config.SystemConfigInfo.ConfigPath)
 }
 
 func (s *systemService) GetCasaOSLogs(lineNumber int) string {
-
+	file, err := os.Open(s.log.Path())
-	reader, err := file.NewReadLineFromEnd(s.log.Path())
 	if err != nil {
-		return ""
+		return err.Error()
-	}
-	defer reader.Close()
-	test, err := reader.ReadLine()
-
-	fmt.Println(err)
-	fmt.Println(test)
-	return string(test)
-	file, _ := os.Open(s.log.Path())
-	fileScanner := bufio.NewReader(file)
-	lineNumber = 5
-	lineCount := 1
-	var r string
-	for i := lineCount; i < lineNumber; i++ {
-		line, _, err := fileScanner.ReadLine()
-		r += string(line)
-		if err == io.EOF {
-			return r
-		}
-		// 如下是某些业务逻辑操作
-		// 如下代码打印每次读取的文件行内容
-
 	}
 	defer file.Close()
-	return r
+	content, err := ioutil.ReadAll(file)
+	if err != nil {
+		return err.Error()
+	}
+
+	return string(content)
 }
 
 func NewSystemService(log loger.OLog) SystemService {

types/system.go

@@ -1,4 +1,4 @@
 package types
 
-const CURRENTVERSION = "0.1.8"
+const CURRENTVERSION = "0.1.10"
-const BODY = "<li>Add terminal</li><li>Improve single user management function</li><li>Experience optimization</li>"
+const BODY = "<li>Add App Store for installation</li><li>add casaOS logs</li><li>add application  terminal</li><li>add application  logs</li>"