修复 标准版申请证书时使用 Nginx 方式不成功

修复 标准版申请证书或是上传证书列表不显示
修复 多个服务端共享 Compose 目录数据没有显示
修复 查看镜像内的文件列表数据错误及没有显示目录
修复 拉取镜像时选择仓库无效

Author: donknap

.github/workflows/download_docker_cli.yml

@@ -15,6 +15,8 @@ jobs:
           
           URL=$(curl -s https://api.github.com/repos/docker/compose/releases/latest | jq -r '.assets[] | select(.name == "docker-compose-windows-x86_64.exe") | .browser_download_url')
           wget "$URL"
+          
+          curl -L -o fnpack https://static2.fnnas.com/fnpack/fnpack-1.0.1-linux-amd64
       - name: Create Release
         if: always()
         uses: softprops/action-gh-release@v2
@@ -25,6 +27,7 @@ jobs:
           files: |
             docker-windows-x86_64.exe
             docker-compose-windows-x86_64.exe
+            fnpack
           draft: false
           prerelease: false
           make_latest: false

app/application/http/controller/image-tag.go

@@ -12,7 +12,6 @@ import (
 	"github.com/donknap/dpanel/app/application/logic"
 	"github.com/donknap/dpanel/common/function"
 	"github.com/donknap/dpanel/common/service/docker"
-	"github.com/donknap/dpanel/common/service/notice"
 	"github.com/donknap/dpanel/common/service/registry"
 	"github.com/donknap/dpanel/common/service/ws"
 	"github.com/donknap/dpanel/common/types/define"
@@ -89,10 +88,6 @@ func (self Image) TagSync(http *gin.Context) {
 		return
 	}
 
-	if params.Type == "pull" {
-		_ = notice.Message{}.Info(".imagePull", "name", imageNameDetail.Uri())
-	}
-
 	err = logic.DockerTask{}.ImageRemote(wsBuffer, out)
 	if err != nil {
 		self.JsonResponseWithError(http, err, 500)

app/application/logic/compose.go

@@ -218,14 +218,7 @@ func (self Compose) LsItem(name string) *compose.ProjectResult {
 }
 
 // FindPathTask 查询 docker 环境下 compose 目录下的所有任务
-func (self Compose) FindPathTask(dockerEnvName string) map[string]*entity.Compose {
-	var rootDir string
-	if dockerEnvName == docker.DefaultClientName {
-		rootDir = storage.Local{}.GetComposePath("")
-	} else {
-		rootDir = storage.Local{}.GetComposePath(dockerEnvName)
-	}
-
+func (self Compose) FindPathTask(rootDir string) map[string]*entity.Compose {
 	if _, err := os.Stat(rootDir); err != nil {
 		slog.Error("compose sync path not found", "error", err)
 		return make(map[string]*entity.Compose)
@@ -265,7 +258,7 @@ func (self Compose) FindPathTask(dockerEnvName string) map[string]*entity.Compos
 						Uri: []string{
 							relYamlFilePath,
 						},
-						DockerEnvName: dockerEnvName,
+						DockerEnvName: docker.Sdk.Name,
 					},
 				}
 				findComposeList[name] = findRow
@@ -278,7 +271,17 @@ func (self Compose) FindPathTask(dockerEnvName string) map[string]*entity.Compos
 
 // Sync 同步当前挂载目录中的 compose
 func (self Compose) Sync(dockerEnvName string) error {
-	findComposeList := self.FindPathTask(dockerEnvName)
+	dockerEnv, err := logic.DockerEnv{}.GetEnvByName(dockerEnvName)
+	if err != nil {
+		return err
+	}
+	var rootDir string
+	if dockerEnv.EnableComposePath {
+		rootDir = storage.Local{}.GetComposePath(dockerEnvName)
+	} else {
+		rootDir = storage.Local{}.GetComposePath("")
+	}
+	findComposeList := self.FindPathTask(rootDir)
 
 	// 循环任务，添加，清理任务
 	composeList, _ := dao.Compose.Find()

app/application/logic/docker-image-task.go

@@ -92,6 +92,9 @@ func (self DockerTask) ImageBuild(messageId string, task accessor.ImageSettingOp
 }
 
 func (self DockerTask) ImageRemote(w *ws.ProgressPip, r io.ReadCloser) error {
+	if r == nil {
+		return function.ErrorMessage(define.ErrorMessageImagePullRegistryBad)
+	}
 	lastSendTime := time.Now()
 	pg := make(map[string]*docker.PullProgress)
 

app/common/http/controller/home.go

@@ -59,7 +59,7 @@ type Home struct {
 
 func (self Home) Index(http *gin.Context) {
 	uri := http.Request.URL.String()
-	slog.Debug("http route not found", "uri", uri)
+	slog.Debug("http route not found", "ip", http.ClientIP(), "user-agent", http.Request.Header.Get("User-Agent"), "uri", uri)
 	var asset embed.FS
 	if v, ok := http.Get("asset"); !ok {
 		self.JsonResponseWithError(http, errors.New("fatal error, resource file not found, please recompile"), 500)

app/common/http/controller/store.go

@@ -207,7 +207,20 @@ func (self Store) Sync(http *gin.Context) {
 			return
 		}
 	} else if params.Type == accessor.StoreTypePortainer {
-		err = logic.Store{}.SyncByJson(storeRootPath, params.Url)
+		jsonPath := filepath.Join(storeRootPath, "template.json")
+		err = logic.Store{}.SyncByJson(jsonPath, params.Url)
+		if err != nil {
+			self.JsonResponseWithError(http, err, 500)
+			return
+		}
+	} else if params.Type == accessor.StoreTypeBaota {
+		jsonPath := filepath.Join(storeRootPath, "apps.json")
+		err = logic.Store{}.SyncByJson(jsonPath, params.Url)
+		if err != nil {
+			self.JsonResponseWithError(http, err, 500)
+			return
+		}
+		appList, err = logic.Store{}.GetAppByBaoTa(params.Name)
 		if err != nil {
 			self.JsonResponseWithError(http, err, 500)
 			return

app/common/logic/store-baota.go

@@ -0,0 +1,45 @@
+package logic
+
+import (
+	"encoding/json"
+	"os"
+	"path/filepath"
+
+	"github.com/donknap/dpanel/common/accessor"
+	"github.com/donknap/dpanel/common/function"
+	"github.com/donknap/dpanel/common/service/storage"
+	"gopkg.in/yaml.v3"
+)
+
+func (self Store) GetAppByBaoTa(storePath string) ([]accessor.StoreAppItem, error) {
+	if !filepath.IsAbs(storePath) {
+		storePath = filepath.Join(storage.Local{}.GetStorePath(), storePath)
+	}
+	content, err := os.ReadFile(filepath.Join(storePath, "apps.json"))
+	if err != nil {
+		return nil, err
+	}
+	var jsonData []interface{}
+	err = json.Unmarshal(content, &jsonData)
+	if err != nil {
+		return nil, err
+	}
+	result := make([]accessor.StoreAppItem, 0)
+	for _, item := range jsonData {
+		itemData, err := yaml.Marshal(item)
+		if err != nil {
+			continue
+		}
+		config := new(function.ConfigMap)
+		err = yaml.Unmarshal(itemData, &config)
+		if err != nil {
+			continue
+		}
+		storeItem := accessor.StoreAppItem{
+			Name:  config.GetString("appname"),
+			Title: config.GetString("apptitle"),
+		}
+		result = append(result, storeItem)
+	}
+	return result, nil
+}

app/common/logic/store.go

@@ -139,8 +139,9 @@ func (self Store) SyncByZip(path, zipUrl string, root string) error {
 	return nil
 }
 
-func (self Store) SyncByJson(path, jsonUrl string) error {
-	file, err := os.OpenFile(filepath.Join(path, "template.json"), os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0666)
+func (self Store) SyncByJson(jsonPath, jsonUrl string) error {
+	_ = os.MkdirAll(filepath.Dir(jsonPath), os.ModePerm)
+	file, err := os.OpenFile(jsonPath, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0666)
 	defer func() {
 		_ = file.Close()
 	}()