diff --git a/Dockerfile b/Dockerfile index 880ffcec..d04b9afa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,10 +38,9 @@ RUN apk update && apk add --no-cache ca-certificates && update-ca-certificates WORKDIR /app/paopao-ce COPY --from=backend /paopao-ce/release/paopao-ce . -COPY assets ./assets COPY configs ./configs -VOLUME ["/app/paopao-ce/assets", "/app/paopao-ce/configs"] +VOLUME ["/app/paopao-ce/configs"] EXPOSE 8008 HEALTHCHECK --interval=5s --timeout=3s --retries=3 CMD ps -ef | grep paopao-ce || exit 1 ENTRYPOINT ["/app/paopao-ce/paopao-ce"] diff --git a/Makefile b/Makefile index 5997b45c..a364bcc0 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ TARGET = paopao-ce RELEASE_ROOT = release -RELEASE_FILES = LICENSE README.md config.yaml.sample scripts assets configs +RELEASE_FILES = LICENSE README.md config.yaml.sample scripts configs RELEASE_LINUX_AMD64 = $(RELEASE_ROOT)/linux-amd64/$(TARGET) RELEASE_DARWIN_AMD64 = $(RELEASE_ROOT)/darwin-amd64/$(TARGET) RELEASE_DARWIN_ARM64 = $(RELEASE_ROOT)/darwin-arm64/$(TARGET) diff --git a/assets/comic.ttf b/internal/routers/api/assets/comic.ttf similarity index 100% rename from assets/comic.ttf rename to internal/routers/api/assets/comic.ttf diff --git a/internal/routers/api/home.go b/internal/routers/api/home.go index 65b2ca2e..d8fc878d 100644 --- a/internal/routers/api/home.go +++ b/internal/routers/api/home.go @@ -2,6 +2,7 @@ package api import ( "bytes" + _ "embed" "encoding/base64" "image/color" "image/png" @@ -19,6 +20,9 @@ import ( "github.com/rocboss/paopao-ce/pkg/util" ) +//go:embed assets/comic.ttf +var comic []byte + const MAX_PHONE_CAPTCHA = 10 func Version(c *gin.Context) { @@ -43,7 +47,7 @@ func SyncSearchIndex(c *gin.Context) { func GetCaptcha(c *gin.Context) { cap := captcha.New() - if err := cap.SetFont("assets/comic.ttf"); err != nil { + if err := cap.AddFontFromBytes(comic); err != nil { panic(err.Error()) }