2
0
mirror of https://github.com/acepanel/panel.git synced 2026-02-04 05:31:44 +08:00

fix: lint

This commit is contained in:
耗子
2024-12-15 23:31:08 +08:00
parent fe4f0d6dea
commit 1fdc86cc0a
37 changed files with 75 additions and 54 deletions

View File

@@ -3,13 +3,13 @@
package main
import (
"github.com/TheTNB/panel/internal/http/middleware"
"github.com/TheTNB/panel/internal/job"
"github.com/google/wire"
"github.com/TheTNB/panel/internal/app"
"github.com/TheTNB/panel/internal/bootstrap"
"github.com/TheTNB/panel/internal/data"
"github.com/TheTNB/panel/internal/http/middleware"
"github.com/TheTNB/panel/internal/job"
"github.com/TheTNB/panel/internal/route"
"github.com/TheTNB/panel/internal/service"
)

View File

@@ -1,12 +1,12 @@
package biz
import (
"github.com/TheTNB/panel/internal/app"
"github.com/go-rat/utils/crypt"
"time"
"github.com/go-rat/utils/crypt"
"gorm.io/gorm"
"github.com/TheTNB/panel/internal/app"
"github.com/TheTNB/panel/internal/http/request"
)

View File

@@ -1,12 +1,12 @@
package biz
import (
"github.com/TheTNB/panel/internal/app"
"github.com/go-rat/utils/crypt"
"time"
"github.com/go-rat/utils/crypt"
"gorm.io/gorm"
"github.com/TheTNB/panel/internal/app"
"github.com/TheTNB/panel/internal/http/request"
)

View File

@@ -1,12 +1,12 @@
package biz
import (
"github.com/TheTNB/panel/internal/app"
"github.com/go-rat/utils/crypt"
"time"
"github.com/go-rat/utils/crypt"
"gorm.io/gorm"
"github.com/TheTNB/panel/internal/app"
"github.com/TheTNB/panel/internal/http/request"
"github.com/TheTNB/panel/pkg/ssh"
)

View File

@@ -1,12 +1,12 @@
package bootstrap
import (
"github.com/TheTNB/panel/internal/job"
"log/slog"
"github.com/knadh/koanf/v2"
"github.com/robfig/cron/v3"
"github.com/TheTNB/panel/internal/job"
pkgcron "github.com/TheTNB/panel/pkg/cron"
)

View File

@@ -1,12 +1,12 @@
package bootstrap
import (
"github.com/knadh/koanf/v2"
"log/slog"
"path/filepath"
"github.com/glebarez/sqlite"
"github.com/go-gormigrate/gormigrate/v2"
"github.com/knadh/koanf/v2"
slogGorm "github.com/orandin/slog-gorm"
"gorm.io/gorm"

View File

@@ -2,13 +2,14 @@ package bootstrap
import (
"crypto/tls"
"log/slog"
"net/http"
"github.com/bddjr/hlfhr"
"github.com/go-chi/chi/v5"
"github.com/go-rat/sessions"
"github.com/knadh/koanf/v2"
"gorm.io/gorm"
"log/slog"
"net/http"
"github.com/TheTNB/panel/internal/http/middleware"
"github.com/TheTNB/panel/internal/route"

View File

@@ -1,12 +1,13 @@
package bootstrap
import (
"github.com/knadh/koanf/v2"
"log/slog"
"path/filepath"
"github.com/TheTNB/panel/internal/app"
"github.com/knadh/koanf/v2"
"gopkg.in/natefinch/lumberjack.v2"
"github.com/TheTNB/panel/internal/app"
)
func NewLog(conf *koanf.Koanf) *slog.Logger {

View File

@@ -4,13 +4,13 @@ import (
"encoding/json"
"errors"
"fmt"
"gorm.io/gorm"
"slices"
"github.com/expr-lang/expr"
"github.com/go-rat/utils/collect"
"github.com/hashicorp/go-version"
"github.com/spf13/cast"
"gorm.io/gorm"
"github.com/TheTNB/panel/internal/app"
"github.com/TheTNB/panel/internal/biz"

View File

@@ -3,7 +3,6 @@ package data
import (
"errors"
"fmt"
"gorm.io/gorm"
"os"
"path/filepath"
"slices"
@@ -11,6 +10,7 @@ import (
"time"
"github.com/shirou/gopsutil/disk"
"gorm.io/gorm"
"github.com/TheTNB/panel/internal/app"
"github.com/TheTNB/panel/internal/biz"

View File

@@ -4,11 +4,12 @@ import (
"context"
"errors"
"fmt"
"gorm.io/gorm"
"slices"
"strings"
"time"
"gorm.io/gorm"
"github.com/TheTNB/panel/internal/app"
"github.com/TheTNB/panel/internal/biz"
"github.com/TheTNB/panel/internal/http/request"

View File

@@ -4,14 +4,15 @@ import (
"context"
"errors"
"fmt"
"gorm.io/gorm"
"time"
"github.com/go-resty/resty/v2"
"gorm.io/gorm"
"github.com/TheTNB/panel/internal/biz"
"github.com/TheTNB/panel/internal/http/request"
"github.com/TheTNB/panel/pkg/acme"
"github.com/TheTNB/panel/pkg/cert"
"github.com/go-resty/resty/v2"
)
type certAccountRepo struct {

View File

@@ -6,12 +6,13 @@ import (
"strings"
"time"
"github.com/go-resty/resty/v2"
"github.com/TheTNB/panel/internal/biz"
"github.com/TheTNB/panel/internal/http/request"
"github.com/TheTNB/panel/pkg/shell"
"github.com/TheTNB/panel/pkg/types"
"github.com/TheTNB/panel/pkg/types/docker/container"
"github.com/go-resty/resty/v2"
)
type containerRepo struct {

View File

@@ -6,13 +6,14 @@ import (
"strings"
"time"
"github.com/go-resty/resty/v2"
"github.com/TheTNB/panel/internal/biz"
"github.com/TheTNB/panel/internal/http/request"
"github.com/TheTNB/panel/pkg/shell"
"github.com/TheTNB/panel/pkg/tools"
"github.com/TheTNB/panel/pkg/types"
"github.com/TheTNB/panel/pkg/types/docker/image"
"github.com/go-resty/resty/v2"
)
type containerImageRepo struct {

View File

@@ -6,12 +6,13 @@ import (
"strings"
"time"
"github.com/go-resty/resty/v2"
"github.com/TheTNB/panel/internal/biz"
"github.com/TheTNB/panel/internal/http/request"
"github.com/TheTNB/panel/pkg/shell"
"github.com/TheTNB/panel/pkg/types"
"github.com/TheTNB/panel/pkg/types/docker/network"
"github.com/go-resty/resty/v2"
)
type containerNetworkRepo struct {

View File

@@ -6,13 +6,14 @@ import (
"strings"
"time"
"github.com/go-resty/resty/v2"
"github.com/TheTNB/panel/internal/biz"
"github.com/TheTNB/panel/internal/http/request"
"github.com/TheTNB/panel/pkg/shell"
"github.com/TheTNB/panel/pkg/tools"
"github.com/TheTNB/panel/pkg/types"
"github.com/TheTNB/panel/pkg/types/docker/volume"
"github.com/go-resty/resty/v2"
)
type containerVolumeRepo struct {

View File

@@ -3,11 +3,13 @@ package data
import (
"errors"
"fmt"
"gorm.io/gorm"
"path/filepath"
"strconv"
"time"
"github.com/go-rat/utils/str"
"gorm.io/gorm"
"github.com/TheTNB/panel/internal/app"
"github.com/TheTNB/panel/internal/biz"
"github.com/TheTNB/panel/internal/http/request"
@@ -15,7 +17,6 @@ import (
"github.com/TheTNB/panel/pkg/os"
"github.com/TheTNB/panel/pkg/shell"
"github.com/TheTNB/panel/pkg/systemctl"
"github.com/go-rat/utils/str"
)
type cronRepo struct {

View File

@@ -2,11 +2,12 @@ package data
import (
"fmt"
"github.com/TheTNB/panel/internal/app"
"gorm.io/gorm"
"log/slog"
"slices"
"gorm.io/gorm"
"github.com/TheTNB/panel/internal/app"
"github.com/TheTNB/panel/internal/biz"
"github.com/TheTNB/panel/internal/http/request"
"github.com/TheTNB/panel/pkg/db"

View File

@@ -2,10 +2,10 @@ package data
import (
"errors"
"gorm.io/gorm"
"time"
"github.com/spf13/cast"
"gorm.io/gorm"
"github.com/TheTNB/panel/internal/app"
"github.com/TheTNB/panel/internal/biz"

View File

@@ -2,13 +2,13 @@ package data
import (
"fmt"
"github.com/TheTNB/panel/pkg/os"
"strings"
"github.com/spf13/cast"
"github.com/TheTNB/panel/internal/biz"
"github.com/TheTNB/panel/pkg/firewall"
"github.com/TheTNB/panel/pkg/os"
"github.com/TheTNB/panel/pkg/shell"
"github.com/TheTNB/panel/pkg/systemctl"
)

View File

@@ -4,12 +4,13 @@ import (
"context"
"errors"
"fmt"
"path/filepath"
"github.com/go-rat/utils/hash"
"github.com/knadh/koanf/v2"
"github.com/spf13/cast"
"gopkg.in/yaml.v3"
"gorm.io/gorm"
"path/filepath"
"github.com/TheTNB/panel/internal/app"
"github.com/TheTNB/panel/internal/biz"

View File

@@ -2,6 +2,7 @@ package data
import (
"fmt"
"gorm.io/gorm"
"github.com/TheTNB/panel/internal/biz"

View File

@@ -2,13 +2,14 @@ package data
import (
"fmt"
"github.com/TheTNB/panel/pkg/queue"
"gorm.io/gorm"
"log/slog"
"gorm.io/gorm"
"github.com/TheTNB/panel/internal/app"
"github.com/TheTNB/panel/internal/biz"
"github.com/TheTNB/panel/internal/queuejob"
"github.com/TheTNB/panel/pkg/queue"
)
type taskRepo struct {

View File

@@ -5,7 +5,6 @@ import (
"encoding/json"
"errors"
"fmt"
"gorm.io/gorm"
"path/filepath"
"slices"
"strings"
@@ -13,6 +12,7 @@ import (
"github.com/samber/lo"
"github.com/spf13/cast"
"gorm.io/gorm"
"github.com/TheTNB/panel/internal/app"
"github.com/TheTNB/panel/internal/biz"

View File

@@ -1,12 +1,12 @@
package middleware
import (
"github.com/go-rat/sessions"
"github.com/knadh/koanf/v2"
"net/http"
"strings"
"github.com/go-rat/chix"
"github.com/go-rat/sessions"
"github.com/knadh/koanf/v2"
"github.com/spf13/cast"
)

View File

@@ -1,17 +1,18 @@
package middleware
import (
"github.com/TheTNB/panel/internal/biz"
"github.com/go-chi/chi/v5"
"github.com/go-rat/sessions"
"github.com/google/wire"
"github.com/knadh/koanf/v2"
"log/slog"
"net/http"
"github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware"
"github.com/go-rat/sessions"
sessionmiddleware "github.com/go-rat/sessions/middleware"
"github.com/golang-cz/httplog"
"github.com/google/wire"
"github.com/knadh/koanf/v2"
"github.com/TheTNB/panel/internal/biz"
)
var ProviderSet = wire.NewSet(NewMiddlewares)

View File

@@ -2,11 +2,12 @@ package middleware
import (
"fmt"
"github.com/TheTNB/panel/internal/biz"
"net/http"
"strings"
"github.com/go-rat/chix"
"github.com/TheTNB/panel/internal/biz"
)
// MustInstall 确保已安装应用
@@ -33,7 +34,7 @@ func MustInstall(app biz.AppRepo) func(next http.Handler) http.Handler {
flag := false
for _, s := range slugs {
if installed, _ := app.IsInstalled("slug = ?", s); installed { // TODO 优化实现
if installed, _ := app.IsInstalled("slug = ?", s); installed {
flag = true
break
}

View File

@@ -4,13 +4,13 @@ import (
"context"
"crypto/sha256"
"fmt"
"github.com/go-rat/sessions"
"net"
"net/http"
"slices"
"strings"
"github.com/go-rat/chix"
"github.com/go-rat/sessions"
"github.com/spf13/cast"
)

View File

@@ -1,10 +1,11 @@
package job
import (
"gorm.io/gorm"
"log/slog"
"time"
"gorm.io/gorm"
"github.com/TheTNB/panel/internal/app"
"github.com/TheTNB/panel/internal/biz"
pkgcert "github.com/TheTNB/panel/pkg/cert"

View File

@@ -1,11 +1,13 @@
package job
import (
"github.com/TheTNB/panel/internal/biz"
"log/slog"
"github.com/google/wire"
"github.com/robfig/cron/v3"
"gorm.io/gorm"
"log/slog"
"github.com/TheTNB/panel/internal/biz"
)
var ProviderSet = wire.NewSet(NewJobs)

View File

@@ -1,11 +1,11 @@
package job
import (
"gorm.io/gorm"
"log/slog"
"time"
"github.com/spf13/cast"
"gorm.io/gorm"
"github.com/TheTNB/panel/internal/app"
"github.com/TheTNB/panel/internal/biz"

View File

@@ -1,13 +1,14 @@
package job
import (
"gorm.io/gorm"
"log/slog"
"math/rand/v2"
"runtime"
"runtime/debug"
"time"
"gorm.io/gorm"
"github.com/TheTNB/panel/internal/app"
"github.com/TheTNB/panel/internal/biz"
)

View File

@@ -4,13 +4,13 @@ import (
"context"
"errors"
"fmt"
"github.com/knadh/koanf/v2"
"path/filepath"
"time"
"github.com/go-rat/utils/collect"
"github.com/go-rat/utils/hash"
"github.com/go-rat/utils/str"
"github.com/knadh/koanf/v2"
"github.com/spf13/cast"
"github.com/urfave/cli/v3"
"gopkg.in/yaml.v3"

View File

@@ -2,7 +2,6 @@ package service
import (
"fmt"
"github.com/knadh/koanf/v2"
"net"
"net/http"
"regexp"
@@ -11,6 +10,7 @@ import (
"github.com/go-rat/chix"
"github.com/go-rat/utils/collect"
"github.com/hashicorp/go-version"
"github.com/knadh/koanf/v2"
"github.com/shirou/gopsutil/disk"
"github.com/shirou/gopsutil/host"
"github.com/spf13/cast"

View File

@@ -4,13 +4,13 @@ import (
"crypto/rsa"
"encoding/gob"
"fmt"
"github.com/go-rat/sessions"
"github.com/knadh/koanf/v2"
"net"
"net/http"
"strings"
"github.com/go-rat/chix"
"github.com/go-rat/sessions"
"github.com/knadh/koanf/v2"
"github.com/spf13/cast"
"golang.org/x/crypto/sha3"

View File

@@ -3,11 +3,11 @@ package service
import (
"bufio"
"context"
"github.com/knadh/koanf/v2"
"net/http"
"sync"
"github.com/gorilla/websocket"
"github.com/knadh/koanf/v2"
"github.com/TheTNB/panel/internal/biz"
"github.com/TheTNB/panel/internal/http/request"

View File

@@ -4,5 +4,7 @@ package tools
type NoopLogger struct{}
func (NoopLogger) Errorf(format string, v ...any) {}
func (NoopLogger) Warnf(format string, v ...any) {}
func (NoopLogger) Warnf(format string, v ...any) {}
func (NoopLogger) Debugf(format string, v ...any) {}