diff --git a/backend/app/api/v1/file.go b/backend/app/api/v1/file.go index e46a62271..3d63fd619 100644 --- a/backend/app/api/v1/file.go +++ b/backend/app/api/v1/file.go @@ -3,6 +3,14 @@ package v1 import ( "errors" "fmt" + "io/ioutil" + "net/http" + "os" + "path" + "path/filepath" + "strconv" + "strings" + "github.com/1Panel-dev/1Panel/backend/app/api/v1/helper" "github.com/1Panel-dev/1Panel/backend/app/dto" "github.com/1Panel-dev/1Panel/backend/app/dto/request" @@ -14,13 +22,6 @@ import ( websocket2 "github.com/1Panel-dev/1Panel/backend/utils/websocket" "github.com/gin-gonic/gin" "github.com/gorilla/websocket" - "io/ioutil" - "net/http" - "os" - "path" - "path/filepath" - "strconv" - "strings" ) // @Tags File @@ -584,7 +585,6 @@ func (b *BaseApi) UploadChunkFiles(c *gin.Context) { if chunkIndex+1 == chunkCount { err = mergeChunks(filename, fileDir, c.PostForm("path"), chunkCount) if err != nil { - fmt.Println(err.Error()) helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrAppDelete, err) return } diff --git a/backend/app/service/backup.go b/backend/app/service/backup.go index 06062a623..fcca836e8 100644 --- a/backend/app/service/backup.go +++ b/backend/app/service/backup.go @@ -134,7 +134,7 @@ func (u *BackupService) DownloadRecord(info dto.DownloadRecord) (string, error) tempPath := fmt.Sprintf("%sdownload%s", constant.DataDir, info.FileDir) if _, err := os.Stat(tempPath); err != nil && os.IsNotExist(err) { if err = os.MkdirAll(tempPath, os.ModePerm); err != nil { - fmt.Println(err) + global.LOG.Errorf("mkdir %s failed, err: %v", tempPath, err) } } targetPath := tempPath + info.FileName diff --git a/backend/app/service/container_volume.go b/backend/app/service/container_volume.go index 50a6f50e5..492a85e09 100644 --- a/backend/app/service/container_volume.go +++ b/backend/app/service/container_volume.go @@ -2,7 +2,6 @@ package service import ( "context" - "fmt" "sort" "strings" "time" @@ -122,12 +121,8 @@ func (u *ContainerService) CreateVolume(req dto.VolumeCreat) error { DriverOpts: stringsToMap(req.Options), Labels: stringsToMap(req.Labels), } - stat, err := client.VolumeCreate(context.TODO(), options) - if err != nil { + if _, err := client.VolumeCreate(context.TODO(), options); err != nil { return err } - // if len(stat.CreatedAt) != 0 { - fmt.Println(stat) - // } return nil } diff --git a/backend/app/service/cornjob.go b/backend/app/service/cornjob.go index cc012b2ed..712d07217 100644 --- a/backend/app/service/cornjob.go +++ b/backend/app/service/cornjob.go @@ -122,7 +122,7 @@ func (u *CronjobService) Download(down dto.CronjobDownload) (string, error) { tempPath := fmt.Sprintf("%s/download/%s", constant.DataDir, commonDir) if _, err := os.Stat(tempPath); err != nil && os.IsNotExist(err) { if err = os.MkdirAll(tempPath, os.ModePerm); err != nil { - fmt.Println(err) + global.LOG.Errorf("mkdir %s failed, err: %v", tempPath, err) } } diff --git a/backend/init/app/app.go b/backend/init/app/app.go index d3780f7a7..03a963284 100644 --- a/backend/init/app/app.go +++ b/backend/init/app/app.go @@ -1,7 +1,6 @@ package app import ( - "fmt" "path" "github.com/1Panel-dev/1Panel/backend/constant" @@ -35,12 +34,12 @@ func createDir(fileOp files.FileOp, dirPath string) { func createDefaultDockerNetwork() { cli, err := docker.NewClient() if err != nil { - fmt.Println("init docker client error", err.Error()) + global.LOG.Errorf("init docker client error", err.Error()) return } if !cli.NetworkExist("1panel-network") { if err := cli.CreateNetwork("1panel-network"); err != nil { - fmt.Println("init docker client error", err.Error()) + global.LOG.Errorf("init docker client error", err.Error()) return } } diff --git a/backend/init/business/business.go b/backend/init/business/business.go index 35bc0f33a..79567ea23 100644 --- a/backend/init/business/business.go +++ b/backend/init/business/business.go @@ -1,7 +1,6 @@ package business import ( - "fmt" "github.com/1Panel-dev/1Panel/backend/app/service" "github.com/1Panel-dev/1Panel/backend/global" ) @@ -13,7 +12,6 @@ func Init() { return } if setting.AppStoreVersion != "" { - fmt.Println(setting.AppStoreVersion) global.LOG.Info("do not sync") return } diff --git a/backend/log/writer.go b/backend/log/writer.go index 974482af4..9d028b7a5 100644 --- a/backend/log/writer.go +++ b/backend/log/writer.go @@ -1,9 +1,6 @@ package log import ( - "fmt" - "github.com/1Panel-dev/1Panel/backend/global" - "github.com/1Panel-dev/1Panel/backend/utils/files" "io/ioutil" "log" "os" @@ -14,6 +11,9 @@ import ( "sync/atomic" "time" "unsafe" + + "github.com/1Panel-dev/1Panel/backend/global" + "github.com/1Panel-dev/1Panel/backend/utils/files" ) type Writer struct { @@ -261,7 +261,6 @@ func (w *Writer) CompressFile(logFile string) error { comFileName := path.Base(logFile) + ".gz" filePath := path.Dir(logFile) - fmt.Println(path.Dir(logFile)) if err := op.Compress([]string{logFile}, filePath, comFileName, files.Gz); err != nil { return err } diff --git a/backend/middleware/operation.go b/backend/middleware/operation.go index 0fcf5916a..3332f7f44 100644 --- a/backend/middleware/operation.go +++ b/backend/middleware/operation.go @@ -96,7 +96,6 @@ func OperationLog() gin.HandlerFunc { var names []string if funcs.IsList { sql := fmt.Sprintf("SELECT %s FROM %s where %s in (?);", funcs.OutputColume, funcs.DB, funcs.InputColume) - fmt.Println(value) _ = global.DB.Raw(sql, value).Scan(&names) } else { _ = global.DB.Raw(fmt.Sprintf("select %s from %s where %s = ?;", funcs.OutputColume, funcs.DB, funcs.InputColume), value).Scan(&names) diff --git a/frontend/src/components/complex-table/index.vue b/frontend/src/components/complex-table/index.vue index e1c78a4a5..14abf5d74 100644 --- a/frontend/src/components/complex-table/index.vue +++ b/frontend/src/components/complex-table/index.vue @@ -53,7 +53,6 @@ defineProps({ const emit = defineEmits(['search', 'update:selects']); const condition = ref({}); function search(conditions: any, e: any) { - console.log(conditions); if (conditions) { condition.value = conditions; } diff --git a/frontend/src/components/file-list/index.vue b/frontend/src/components/file-list/index.vue index 485ef4c85..09ab96d98 100644 --- a/frontend/src/components/file-list/index.vue +++ b/frontend/src/components/file-list/index.vue @@ -100,7 +100,6 @@ const props = defineProps({ const em = defineEmits(['choose']); const checkFile = (row: any) => { - console.log(row.path); rowName.value = row.name; em('choose', row.path); popoverVisible.value = false; diff --git a/frontend/src/views/app-store/installed/detail/index.vue b/frontend/src/views/app-store/installed/detail/index.vue index 62218cb2f..d15ff4c9e 100644 --- a/frontend/src/views/app-store/installed/detail/index.vue +++ b/frontend/src/views/app-store/installed/detail/index.vue @@ -101,7 +101,6 @@ const get = async () => { if (res.data && res.data.length > 0) { res.data.forEach((d) => { if (d.edit) { - console.log(d.edit); canEdit.value = true; } let value = d.value; diff --git a/frontend/src/views/container/container/index.vue b/frontend/src/views/container/container/index.vue index 4c009f402..5980ca20c 100644 --- a/frontend/src/views/container/container/index.vue +++ b/frontend/src/views/container/container/index.vue @@ -306,7 +306,6 @@ const buttons = [ { label: i18n.global.t('container.rename'), click: (row: Container.ContainerInfo) => { - console.log(row.name); dialogReNameRef.value!.acceptParams({ container: row.name }); }, disabled: (row: any) => { diff --git a/frontend/src/views/container/setting/index.vue b/frontend/src/views/container/setting/index.vue index cfb4b706b..1fe647c36 100644 --- a/frontend/src/views/container/setting/index.vue +++ b/frontend/src/views/container/setting/index.vue @@ -272,7 +272,6 @@ const onSubmitSave = async () => { const loadDockerConf = async () => { const res = await loadDaemonJsonFile(); if (res.data === 'daemon.json is not find in path') { - console.log(res.data); showDaemonJsonAlert.value = true; } else { dockerConf.value = res.data; diff --git a/frontend/src/views/cronjob/operate/index.vue b/frontend/src/views/cronjob/operate/index.vue index a5a063841..39cc6b45b 100644 --- a/frontend/src/views/cronjob/operate/index.vue +++ b/frontend/src/views/cronjob/operate/index.vue @@ -401,7 +401,6 @@ function hasScript() { function checkScript() { let row = dialogData.value.rowData; - console.log(row.specType, row.week, row.day, row.hour, row.minute); switch (row.specType) { case 'perMonth': return row.day > 0 && row.day < 32 && row.hour >= 0 && row.hour < 24 && row.minute >= 0 && row.minute < 60; diff --git a/frontend/src/views/database/redis/setting/index.vue b/frontend/src/views/database/redis/setting/index.vue index 8a71244b9..7426666ba 100644 --- a/frontend/src/views/database/redis/setting/index.vue +++ b/frontend/src/views/database/redis/setting/index.vue @@ -244,7 +244,6 @@ const onChangePort = async (formEl: FormInstance | undefined) => { if (!formEl) return; const result = await formEl.validateField('port', callback); if (!result) { - console.log('daqdwq'); return; } let params = { diff --git a/frontend/src/views/website/website/check/index.vue b/frontend/src/views/website/website/check/index.vue index 35f8f71b3..825adada3 100644 --- a/frontend/src/views/website/website/check/index.vue +++ b/frontend/src/views/website/website/check/index.vue @@ -44,7 +44,6 @@ let items = ref([]); const acceptParams = async (props: InstallRrops) => { items.value = props.items; open.value = true; - console.log(items); }; const handleClose = () => { diff --git a/frontend/src/views/website/website/create/index.vue b/frontend/src/views/website/website/create/index.vue index 3d8c12b7e..6fe663a37 100644 --- a/frontend/src/views/website/website/create/index.vue +++ b/frontend/src/views/website/website/create/index.vue @@ -261,7 +261,6 @@ const changeType = (type: string) => { if (type == 'deployemnt') { if (appInstalles.value && appInstalles.value.length > 0) { website.value.appInstallId = appInstalles.value[0].id; - console.log(website.value); } } else { website.value.appInstallId = undefined;