diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 5ca720d..8459891 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -18,5 +18,5 @@ jobs: uses: golangci/golangci-lint-action@v2 with: # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version - version: v1.29 + version: latest args: --timeout=5m diff --git a/.golangci.yml b/.golangci.yml index fe27639..9afa411 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,6 +1,6 @@ linters-settings: goimports: - local-prefixes: uqingtech.com + local-prefixes: next-terminal linters: disable-all: true @@ -19,8 +19,5 @@ linters: - varcheck run: - skip-dirs: - - api/ - - module/ skip-files: - test_ssh.go diff --git a/pkg/log/logger.go b/pkg/log/logger.go index 1f6225d..497dcc5 100644 --- a/pkg/log/logger.go +++ b/pkg/log/logger.go @@ -3,12 +3,13 @@ package log import ( "fmt" "io" - "next-terminal/server/global" "os" "path" "strconv" "time" + "next-terminal/pkg/global" + "github.com/labstack/echo/v4" "github.com/sirupsen/logrus" )