diff --git a/Dockerfile b/Dockerfile index 8e7c22c..4f0462e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,19 +5,19 @@ FROM golang:1.24.4-alpine AS builder RUN apk add --no-cache git # Set working directory -WORKDIR /app +WORKDIR /build -# Copy go mod files from src directory -COPY src/go.mod src/go.sum ./ +# Copy go mod files from root directory +COPY go.mod go.sum ./ # Download dependencies RUN go mod download -# Copy source code from src directory -COPY src/ . +# Copy the entire app directory to maintain the module structure +COPY app/ ./app/ -# Build the application -RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o serverstatistics serverstatistics.go +# Build the application from the app directory +RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o serverstatistics ./app/serverstatistics.go # Production stage FROM alpine:latest @@ -28,13 +28,13 @@ RUN apk --no-cache add ca-certificates WORKDIR /root/ # Copy binary from builder -COPY --from=builder /app/serverstatistics . +COPY --from=builder /build/serverstatistics . # Copy config file -COPY --from=builder /app/etc/serverstatistics.yaml ./etc/ +COPY app/etc/serverstatistics.yaml ./etc/ # Expose port EXPOSE 8888 # Run the application -CMD ["./serverstatistics", "-f", "etc/serverstatistics.yaml"] +CMD ["./serverstatistics", "-f", "etc/serverstatistics.yaml"] \ No newline at end of file diff --git a/src/etc/serverstatistics.yaml b/app/etc/serverstatistics.yaml similarity index 100% rename from src/etc/serverstatistics.yaml rename to app/etc/serverstatistics.yaml diff --git a/src/internal/config/config.go b/app/internal/config/config.go similarity index 100% rename from src/internal/config/config.go rename to app/internal/config/config.go diff --git a/src/internal/handler/pinghandler.go b/app/internal/handler/pinghandler.go similarity index 74% rename from src/internal/handler/pinghandler.go rename to app/internal/handler/pinghandler.go index 465f298..7317054 100644 --- a/src/internal/handler/pinghandler.go +++ b/app/internal/handler/pinghandler.go @@ -3,10 +3,10 @@ package handler import ( "net/http" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/logic" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/rest/httpx" - "src/internal/logic" - "src/internal/svc" - "src/internal/types" ) // Ping the server to check if it's alive diff --git a/src/internal/handler/recentchatmessagehandler.go b/app/internal/handler/recentchatmessagehandler.go similarity index 76% rename from src/internal/handler/recentchatmessagehandler.go rename to app/internal/handler/recentchatmessagehandler.go index 881ef09..73f7900 100644 --- a/src/internal/handler/recentchatmessagehandler.go +++ b/app/internal/handler/recentchatmessagehandler.go @@ -3,10 +3,10 @@ package handler import ( "net/http" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/logic" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/rest/httpx" - "src/internal/logic" - "src/internal/svc" - "src/internal/types" ) // Get recent chat messages within a specified time range diff --git a/src/internal/handler/recentjoinplayerhandler.go b/app/internal/handler/recentjoinplayerhandler.go similarity index 76% rename from src/internal/handler/recentjoinplayerhandler.go rename to app/internal/handler/recentjoinplayerhandler.go index 39dd4ff..b9537ee 100644 --- a/src/internal/handler/recentjoinplayerhandler.go +++ b/app/internal/handler/recentjoinplayerhandler.go @@ -3,10 +3,10 @@ package handler import ( "net/http" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/logic" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/rest/httpx" - "src/internal/logic" - "src/internal/svc" - "src/internal/types" ) // Get recent players who joined within a specified time range diff --git a/src/internal/handler/recentplayerjoinhandler.go b/app/internal/handler/recentplayerjoinhandler.go similarity index 76% rename from src/internal/handler/recentplayerjoinhandler.go rename to app/internal/handler/recentplayerjoinhandler.go index d0b02ef..fbe170f 100644 --- a/src/internal/handler/recentplayerjoinhandler.go +++ b/app/internal/handler/recentplayerjoinhandler.go @@ -3,10 +3,10 @@ package handler import ( "net/http" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/logic" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/rest/httpx" - "src/internal/logic" - "src/internal/svc" - "src/internal/types" ) // Get recent player joins within a specified time range diff --git a/src/internal/handler/recentplayhandler.go b/app/internal/handler/recentplayhandler.go similarity index 75% rename from src/internal/handler/recentplayhandler.go rename to app/internal/handler/recentplayhandler.go index e2cab21..3bc5fa6 100644 --- a/src/internal/handler/recentplayhandler.go +++ b/app/internal/handler/recentplayhandler.go @@ -3,10 +3,10 @@ package handler import ( "net/http" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/logic" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/rest/httpx" - "src/internal/logic" - "src/internal/svc" - "src/internal/types" ) // Get recent players who played within a specified time range diff --git a/src/internal/handler/routes.go b/app/internal/handler/routes.go similarity index 97% rename from src/internal/handler/routes.go rename to app/internal/handler/routes.go index 84fe658..b3568b1 100644 --- a/src/internal/handler/routes.go +++ b/app/internal/handler/routes.go @@ -6,7 +6,7 @@ package handler import ( "net/http" - "src/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" "github.com/zeromicro/go-zero/rest" ) diff --git a/src/internal/handler/serverlisthandler.go b/app/internal/handler/serverlisthandler.go similarity index 75% rename from src/internal/handler/serverlisthandler.go rename to app/internal/handler/serverlisthandler.go index 78a3ded..2ce6c02 100644 --- a/src/internal/handler/serverlisthandler.go +++ b/app/internal/handler/serverlisthandler.go @@ -3,10 +3,10 @@ package handler import ( "net/http" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/logic" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/rest/httpx" - "src/internal/logic" - "src/internal/svc" - "src/internal/types" ) // Get the list of monitored game servers diff --git a/src/internal/handler/topkillerhandler.go b/app/internal/handler/topkillerhandler.go similarity index 75% rename from src/internal/handler/topkillerhandler.go rename to app/internal/handler/topkillerhandler.go index 3f29f88..5a413cf 100644 --- a/src/internal/handler/topkillerhandler.go +++ b/app/internal/handler/topkillerhandler.go @@ -3,10 +3,10 @@ package handler import ( "net/http" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/logic" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/rest/httpx" - "src/internal/logic" - "src/internal/svc" - "src/internal/types" ) // Get top players by kill count within a specified time range diff --git a/src/internal/handler/topplaytimehandler.go b/app/internal/handler/topplaytimehandler.go similarity index 75% rename from src/internal/handler/topplaytimehandler.go rename to app/internal/handler/topplaytimehandler.go index 400caaa..185f2c0 100644 --- a/src/internal/handler/topplaytimehandler.go +++ b/app/internal/handler/topplaytimehandler.go @@ -3,10 +3,10 @@ package handler import ( "net/http" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/logic" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/rest/httpx" - "src/internal/logic" - "src/internal/svc" - "src/internal/types" ) // Get top players by playtime within a specified time range diff --git a/src/internal/handler/totalchatmessagecounthandler.go b/app/internal/handler/totalchatmessagecounthandler.go similarity index 76% rename from src/internal/handler/totalchatmessagecounthandler.go rename to app/internal/handler/totalchatmessagecounthandler.go index a70936a..f709d5a 100644 --- a/src/internal/handler/totalchatmessagecounthandler.go +++ b/app/internal/handler/totalchatmessagecounthandler.go @@ -3,10 +3,10 @@ package handler import ( "net/http" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/logic" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/rest/httpx" - "src/internal/logic" - "src/internal/svc" - "src/internal/types" ) // Get total chat message count within a specified time range diff --git a/src/internal/handler/totalconnectcounthandler.go b/app/internal/handler/totalconnectcounthandler.go similarity index 76% rename from src/internal/handler/totalconnectcounthandler.go rename to app/internal/handler/totalconnectcounthandler.go index 67d8a0d..6895428 100644 --- a/src/internal/handler/totalconnectcounthandler.go +++ b/app/internal/handler/totalconnectcounthandler.go @@ -3,10 +3,10 @@ package handler import ( "net/http" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/logic" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/rest/httpx" - "src/internal/logic" - "src/internal/svc" - "src/internal/types" ) // Get total connect count within a specified time range diff --git a/src/internal/handler/totaldamagecounthandler.go b/app/internal/handler/totaldamagecounthandler.go similarity index 76% rename from src/internal/handler/totaldamagecounthandler.go rename to app/internal/handler/totaldamagecounthandler.go index d54fde5..6cb0a5c 100644 --- a/src/internal/handler/totaldamagecounthandler.go +++ b/app/internal/handler/totaldamagecounthandler.go @@ -3,10 +3,10 @@ package handler import ( "net/http" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/logic" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/rest/httpx" - "src/internal/logic" - "src/internal/svc" - "src/internal/types" ) // Get total damage count within a specified time range diff --git a/src/internal/handler/totalkillcounthandler.go b/app/internal/handler/totalkillcounthandler.go similarity index 75% rename from src/internal/handler/totalkillcounthandler.go rename to app/internal/handler/totalkillcounthandler.go index 5596472..1db252b 100644 --- a/src/internal/handler/totalkillcounthandler.go +++ b/app/internal/handler/totalkillcounthandler.go @@ -3,10 +3,10 @@ package handler import ( "net/http" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/logic" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/rest/httpx" - "src/internal/logic" - "src/internal/svc" - "src/internal/types" ) // Get total kill count within a specified time range diff --git a/src/internal/handler/totalplayercounthandler.go b/app/internal/handler/totalplayercounthandler.go similarity index 76% rename from src/internal/handler/totalplayercounthandler.go rename to app/internal/handler/totalplayercounthandler.go index 7daa791..dc2ab47 100644 --- a/src/internal/handler/totalplayercounthandler.go +++ b/app/internal/handler/totalplayercounthandler.go @@ -3,10 +3,10 @@ package handler import ( "net/http" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/logic" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/rest/httpx" - "src/internal/logic" - "src/internal/svc" - "src/internal/types" ) // Get total player count within a specified time range diff --git a/src/internal/handler/totalplaytimehandler.go b/app/internal/handler/totalplaytimehandler.go similarity index 75% rename from src/internal/handler/totalplaytimehandler.go rename to app/internal/handler/totalplaytimehandler.go index 25906bf..55c7d0c 100644 --- a/src/internal/handler/totalplaytimehandler.go +++ b/app/internal/handler/totalplaytimehandler.go @@ -3,10 +3,10 @@ package handler import ( "net/http" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/logic" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/rest/httpx" - "src/internal/logic" - "src/internal/svc" - "src/internal/types" ) // Get total playtime within a specified time range diff --git a/src/internal/logic/pinglogic.go b/app/internal/logic/pinglogic.go similarity index 79% rename from src/internal/logic/pinglogic.go rename to app/internal/logic/pinglogic.go index 993b400..59a1804 100644 --- a/src/internal/logic/pinglogic.go +++ b/app/internal/logic/pinglogic.go @@ -3,8 +3,8 @@ package logic import ( "context" - "src/internal/svc" - "src/internal/types" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/src/internal/logic/recentchatmessagelogic.go b/app/internal/logic/recentchatmessagelogic.go similarity index 92% rename from src/internal/logic/recentchatmessagelogic.go rename to app/internal/logic/recentchatmessagelogic.go index 0bd2aa2..551dd09 100644 --- a/src/internal/logic/recentchatmessagelogic.go +++ b/app/internal/logic/recentchatmessagelogic.go @@ -3,8 +3,8 @@ package logic import ( "context" - "src/internal/svc" - "src/internal/types" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/src/internal/logic/recentjoinplayerlogic.go b/app/internal/logic/recentjoinplayerlogic.go similarity index 92% rename from src/internal/logic/recentjoinplayerlogic.go rename to app/internal/logic/recentjoinplayerlogic.go index 1e35b0e..88335d9 100644 --- a/src/internal/logic/recentjoinplayerlogic.go +++ b/app/internal/logic/recentjoinplayerlogic.go @@ -3,8 +3,8 @@ package logic import ( "context" - "src/internal/svc" - "src/internal/types" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/src/internal/logic/recentplayerjoinlogic.go b/app/internal/logic/recentplayerjoinlogic.go similarity index 89% rename from src/internal/logic/recentplayerjoinlogic.go rename to app/internal/logic/recentplayerjoinlogic.go index 73a81bd..2bca65e 100644 --- a/src/internal/logic/recentplayerjoinlogic.go +++ b/app/internal/logic/recentplayerjoinlogic.go @@ -3,8 +3,8 @@ package logic import ( "context" - "src/internal/svc" - "src/internal/types" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/src/internal/logic/recentplaylogic.go b/app/internal/logic/recentplaylogic.go similarity index 91% rename from src/internal/logic/recentplaylogic.go rename to app/internal/logic/recentplaylogic.go index 32e304d..5a646ee 100644 --- a/src/internal/logic/recentplaylogic.go +++ b/app/internal/logic/recentplaylogic.go @@ -3,8 +3,8 @@ package logic import ( "context" - "src/internal/svc" - "src/internal/types" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/src/internal/logic/serverlistlogic.go b/app/internal/logic/serverlistlogic.go similarity index 91% rename from src/internal/logic/serverlistlogic.go rename to app/internal/logic/serverlistlogic.go index a23f769..57911c4 100644 --- a/src/internal/logic/serverlistlogic.go +++ b/app/internal/logic/serverlistlogic.go @@ -3,8 +3,8 @@ package logic import ( "context" - "src/internal/svc" - "src/internal/types" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/src/internal/logic/topkillerlogic.go b/app/internal/logic/topkillerlogic.go similarity index 91% rename from src/internal/logic/topkillerlogic.go rename to app/internal/logic/topkillerlogic.go index 7f0709c..e3bd23a 100644 --- a/src/internal/logic/topkillerlogic.go +++ b/app/internal/logic/topkillerlogic.go @@ -3,8 +3,8 @@ package logic import ( "context" - "src/internal/svc" - "src/internal/types" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/src/internal/logic/topplaytimelogic.go b/app/internal/logic/topplaytimelogic.go similarity index 91% rename from src/internal/logic/topplaytimelogic.go rename to app/internal/logic/topplaytimelogic.go index f81724c..14021e1 100644 --- a/src/internal/logic/topplaytimelogic.go +++ b/app/internal/logic/topplaytimelogic.go @@ -3,8 +3,8 @@ package logic import ( "context" - "src/internal/svc" - "src/internal/types" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/src/internal/logic/totalchatmessagecountlogic.go b/app/internal/logic/totalchatmessagecountlogic.go similarity index 91% rename from src/internal/logic/totalchatmessagecountlogic.go rename to app/internal/logic/totalchatmessagecountlogic.go index 072c51e..f472edd 100644 --- a/src/internal/logic/totalchatmessagecountlogic.go +++ b/app/internal/logic/totalchatmessagecountlogic.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "src/internal/svc" - "src/internal/types" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/src/internal/logic/totalconnectcountlogic.go b/app/internal/logic/totalconnectcountlogic.go similarity index 89% rename from src/internal/logic/totalconnectcountlogic.go rename to app/internal/logic/totalconnectcountlogic.go index 60cd4c3..2626ad7 100644 --- a/src/internal/logic/totalconnectcountlogic.go +++ b/app/internal/logic/totalconnectcountlogic.go @@ -3,8 +3,8 @@ package logic import ( "context" - "src/internal/svc" - "src/internal/types" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/src/internal/logic/totaldamagecountlogic.go b/app/internal/logic/totaldamagecountlogic.go similarity index 92% rename from src/internal/logic/totaldamagecountlogic.go rename to app/internal/logic/totaldamagecountlogic.go index 1405852..d059c17 100644 --- a/src/internal/logic/totaldamagecountlogic.go +++ b/app/internal/logic/totaldamagecountlogic.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "src/internal/svc" - "src/internal/types" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/src/internal/logic/totalkillcountlogic.go b/app/internal/logic/totalkillcountlogic.go similarity index 93% rename from src/internal/logic/totalkillcountlogic.go rename to app/internal/logic/totalkillcountlogic.go index 93323fd..2439d56 100644 --- a/src/internal/logic/totalkillcountlogic.go +++ b/app/internal/logic/totalkillcountlogic.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "src/internal/svc" - "src/internal/types" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/src/internal/logic/totalplayercountlogic.go b/app/internal/logic/totalplayercountlogic.go similarity index 88% rename from src/internal/logic/totalplayercountlogic.go rename to app/internal/logic/totalplayercountlogic.go index b79eb00..271e466 100644 --- a/src/internal/logic/totalplayercountlogic.go +++ b/app/internal/logic/totalplayercountlogic.go @@ -3,8 +3,8 @@ package logic import ( "context" - "src/internal/svc" - "src/internal/types" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/src/internal/logic/totalplaytimelogic.go b/app/internal/logic/totalplaytimelogic.go similarity index 89% rename from src/internal/logic/totalplaytimelogic.go rename to app/internal/logic/totalplaytimelogic.go index 08001f3..d7fffa0 100644 --- a/src/internal/logic/totalplaytimelogic.go +++ b/app/internal/logic/totalplaytimelogic.go @@ -3,8 +3,8 @@ package logic import ( "context" - "src/internal/svc" - "src/internal/types" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/src/internal/svc/servicecontext.go b/app/internal/svc/servicecontext.go similarity index 95% rename from src/internal/svc/servicecontext.go rename to app/internal/svc/servicecontext.go index a36778f..2ff5306 100644 --- a/src/internal/svc/servicecontext.go +++ b/app/internal/svc/servicecontext.go @@ -4,7 +4,7 @@ import ( "database/sql" "log" - "src/internal/config" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/config" _ "github.com/lib/pq" // PostgreSQL driver ) diff --git a/src/internal/types/types.go b/app/internal/types/types.go similarity index 100% rename from src/internal/types/types.go rename to app/internal/types/types.go diff --git a/src/serverstatistics.go b/app/serverstatistics.go similarity index 72% rename from src/serverstatistics.go rename to app/serverstatistics.go index 343dc19..410aafc 100644 --- a/src/serverstatistics.go +++ b/app/serverstatistics.go @@ -4,9 +4,9 @@ import ( "flag" "fmt" - "src/internal/config" - "src/internal/handler" - "src/internal/svc" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/config" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/handler" + "git.cialloo.com/CiallooWeb/ServerStatistics/app/internal/svc" "github.com/zeromicro/go-zero/core/conf" "github.com/zeromicro/go-zero/rest" diff --git a/src/go.mod b/go.mod similarity index 96% rename from src/go.mod rename to go.mod index a60164d..2d4ea0f 100644 --- a/src/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ -module src +module git.cialloo.com/CiallooWeb/ServerStatistics go 1.24.4 require ( github.com/lib/pq v1.10.9 - github.com/zeromicro/go-zero v1.9.1 + github.com/zeromicro/go-zero v1.9.2 ) require ( diff --git a/src/go.sum b/go.sum similarity index 98% rename from src/go.sum rename to go.sum index 00d6652..1933adf 100644 --- a/src/go.sum +++ b/go.sum @@ -76,8 +76,8 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/zeromicro/go-zero v1.9.1 h1:GZCl4jun/ZgZHnSvX3SSNDHf+tEGmEQ8x2Z23xjHa9g= -github.com/zeromicro/go-zero v1.9.1/go.mod h1:bHOl7Xr7EV/iHZWEqsUNJwFc/9WgAMrPpPagYvOaMtY= +github.com/zeromicro/go-zero v1.9.2 h1:ZXOXBIcazZ1pWAMiHyVnDQ3Sxwy7DYPzjE89Qtj9vqM= +github.com/zeromicro/go-zero v1.9.2/go.mod h1:k8YBMEFZKjTd4q/qO5RCW+zDgUlNyAs5vue3P4/Kmn0= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/jaeger v1.17.0 h1:D7UpUy2Xc2wsi1Ras6V40q806WM07rqoCWzXu7Sqy+4=