donknap
diff --git a/‎app/application/http/controller/compose.go‎
Lines changed: 4 additions & 7 deletions b/‎app/application/http/controller/compose.go‎
Lines changed: 4 additions & 7 deletions
diff --git a/‎asset/static/index.html‎
Lines changed: 1 addition & 1 deletion b/‎asset/static/index.html‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎asset/static/p__app__list.87178a3a.async.js‎
Lines changed: 1 addition & 0 deletions b/‎asset/static/p__app__list.87178a3a.async.js‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎asset/static/p__app__list.b69c5bd2.async.js‎
Lines changed: 0 additions & 1 deletion b/‎asset/static/p__app__list.b69c5bd2.async.js‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎asset/static/p__compose__create.2db45e11.async.js‎
Lines changed: 0 additions & 1 deletion b/‎asset/static/p__compose__create.2db45e11.async.js‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎asset/static/p__compose__create.b2370b71.async.js‎
Lines changed: 1 addition & 0 deletions b/‎asset/static/p__compose__create.b2370b71.async.js‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎asset/static/umi.d6bcb4cb.js‎ ‎asset/static/umi.cb4e3d67.js‎asset/static/umi.d6bcb4cb.js renamed to asset/static/umi.cb4e3d67.js
Lines changed: 4 additions & 4 deletions b/‎asset/static/umi.d6bcb4cb.js‎ ‎asset/static/umi.cb4e3d67.js‎asset/static/umi.d6bcb4cb.js renamed to asset/static/umi.cb4e3d67.js
Lines changed: 4 additions & 4 deletions
diff --git a/‎common/service/compose/task.go‎
Lines changed: 5 additions & 2 deletions b/‎common/service/compose/task.go‎
Lines changed: 5 additions & 2 deletions
@@ -144,14 +144,11 @@ func (self Compose) Create(http *gin.Context) {
 			yamlRow.Setting.Uri = append(yamlRow.Setting.Uri, overrideRelPath)
 		}
 	} else {
-		err = os.Remove(overrideYamlFilePath)
-		if err != nil {
-			self.JsonResponseWithError(http, err, 500)
-			return
+		if err = os.Remove(overrideYamlFilePath); err == nil {
+			yamlRow.Setting.Uri = slices.DeleteFunc(yamlRow.Setting.Uri, func(s string) bool {
+				return s == overrideRelPath
+			})
 		}
-		yamlRow.Setting.Uri = slices.DeleteFunc(yamlRow.Setting.Uri, func(s string) bool {
-			return s == overrideRelPath
-		})
 	}
 
 	if !function.IsEmptyArray(params.Environment) {
 
@@ -18,6 +18,6 @@
 </head>
 <body>
 <div id="root"></div>
-<script src="/dpanel/static/asset/umi.d6bcb4cb.js"></script>
+<script src="/dpanel/static/asset/umi.cb4e3d67.js"></script>
 </body>
 </html>
@@ -119,6 +119,7 @@ type ContainerResult struct {
 	Publishers []ContainerPublishersResult `json:"publishers"`
 	State      string                      `json:"state"`
 	Status     string                      `json:"status"`
+	Health     string
 }
 
 type ContainerPublishersResult struct {
@@ -169,8 +170,10 @@ func (self Task) Ps() []*ContainerResult {
 				continue
 			}
 			temp := ContainerResult{}
-			err = json.Unmarshal(line, &temp)
-			if err == nil {
+			if err = json.Unmarshal(line, &temp); err == nil {
+				if temp.Health != "" {
+					temp.State = temp.Health
+				}
 				result = append(result, &temp)
 			}
 			line = make([]byte, 0)
Original file line number	Diff line number	Diff line change
`@@ -144,14 +144,11 @@ func (self Compose) Create(http *gin.Context) {`
`144`	`144`	`yamlRow.Setting.Uri = append(yamlRow.Setting.Uri, overrideRelPath)`
`145`	`145`	`}`
`146`	`146`	`} else {`
`147`		`- err = os.Remove(overrideYamlFilePath)`
`148`		`- if err != nil {`
`149`		`- self.JsonResponseWithError(http, err, 500)`
`150`		`- return`
	`147`	`+ if err = os.Remove(overrideYamlFilePath); err == nil {`
	`148`	`+ yamlRow.Setting.Uri = slices.DeleteFunc(yamlRow.Setting.Uri, func(s string) bool {`
	`149`	`+ return s == overrideRelPath`
	`150`	`+ })`
`151`	`151`	`}`
`152`		`- yamlRow.Setting.Uri = slices.DeleteFunc(yamlRow.Setting.Uri, func(s string) bool {`
`153`		`- return s == overrideRelPath`
`154`		`- })`
`155`	`152`	`}`
`156`	`153`
`157`	`154`	`if !function.IsEmptyArray(params.Environment) {`
Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,7 @@ type ContainerResult struct {`
`119`	`119`	Publishers []ContainerPublishersResult `json:"publishers"`
`120`	`120`	State string `json:"state"`
`121`	`121`	Status string `json:"status"`
	`122`	`+ Health string`
`122`	`123`	`}`
`123`	`124`
`124`	`125`	`type ContainerPublishersResult struct {`
`@@ -169,8 +170,10 @@ func (self Task) Ps() []*ContainerResult {`
`169`	`170`	`continue`
`170`	`171`	`}`
`171`	`172`	`temp := ContainerResult{}`
`172`		`- err = json.Unmarshal(line, &temp)`
`173`		`- if err == nil {`
	`173`	`+ if err = json.Unmarshal(line, &temp); err == nil {`
	`174`	`+ if temp.Health != "" {`
	`175`	`+ temp.State = temp.Health`
	`176`	`+ }`
`174`	`177`	`result = append(result, &temp)`
`175`	`178`	`}`
`176`	`179`	`line = make([]byte, 0)`