Merge branch 'dev' of https://git.tonyandmoney.cn/tuonian/nginx-ui into dev

server/main.go → app.go

@@ -1,13 +1,10 @@
 package main
 
 import (
-	"encoding/gob"
 	"github.com/astaxie/beego"
 	_ "nginx-ui/server/init"
-	"nginx-ui/server/models"
 )
 
 func main() {
-	gob.Register(models.User{})
 	beego.Run()
 }

build-server.sh

@@ -8,7 +8,7 @@ cp -rf ./conf ./local
 
 export GOODS=linux
 export GOARCH=amd64
-go build -o local/server  server/main.go
+go build -o local/server  app.go
 
 cp -rf ./frontend/dist/* ./local/static/web/
 rm -rf ./local/static/web/config.js

docker/Dockerfile

@@ -7,7 +7,7 @@ ARG GOARCH=amd64
 RUN go env -w GOPROXY=https://goproxy.cn,direct
 
 RUN --mount=type=cache,target=/go --mount=type=cache,target=/root/.cache/go-build\
-    GOODS=${GOODS} GOARCH=${GOARCH} go build -o /app/app  server/main.go
+    GOODS=${GOODS} GOARCH=${GOARCH} go build -o /app/app  app.go
 
 FROM debian:sid-slim
 

docker/Dockerfile-with-nginx

@@ -1,20 +1,20 @@
 FROM golang:1.20 AS builder
 WORKDIR /app
-COPY server .
+COPY . .
 ARG GOODS=linux
 ARG GOARCH=amd64
 
 RUN go env -w GOPROXY=https://goproxy.cn,direct
 
 RUN --mount=type=cache,target=/go --mount=type=cache,target=/root/.cache/go-build \
-    GOODS=${GOODS} GOARCH=${GOARCH}  go build -o /app/app
+    GOODS=${GOODS} GOARCH=${GOARCH}  go build -o /app/app  app.go
 
 FROM nginx:1.25.1
 
 WORKDIR /app
 COPY --from=builder /app/app /app
-COPY server/conf /app/conf
-COPY server/data  /app/data
+COPY conf /app/conf
+COPY data  /app/data
 #COPY ../server/static  /app/static
 COPY frontend/dist  /app/static/web
 COPY docker/entrypoint.sh /entrypoint.sh