diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index a045a07..412102b 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: - name: Detect changes id: filter run: | - SERVICES="bff product admin user ad chore express sale wecom task equipment log" + SERVICES="bff product admin user ad chore express sale wecom task equipment record" pattern_for() { case "$1" in @@ -92,7 +92,7 @@ jobs: - wecom - task - equipment - - lonelog + - record env: BUILD_LIST: ${{ needs.changes.outputs.build_list }} NAME: lone/${{ matrix.name }} diff --git a/services/lonelog/.gitignore b/services/lonelog/.gitignore deleted file mode 100644 index 925c4d2..0000000 --- a/services/lonelog/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -run.toml -tmp -etc/lonelog.yaml \ No newline at end of file diff --git a/services/record/.gitignore b/services/record/.gitignore new file mode 100644 index 0000000..0246b1d --- /dev/null +++ b/services/record/.gitignore @@ -0,0 +1,3 @@ +run.toml +tmp +etc/record.yaml \ No newline at end of file diff --git a/services/lonelog/Dockerfile b/services/record/Dockerfile similarity index 84% rename from services/lonelog/Dockerfile rename to services/record/Dockerfile index 7510cc2..01b25f0 100644 --- a/services/lonelog/Dockerfile +++ b/services/record/Dockerfile @@ -14,9 +14,9 @@ RUN --mount=type=cache,target=/go/pkg/mod \ go mod download COPY rpc/ ./rpc -COPY services/lonelog/ ./services/lonelog/ +COPY services/record/ ./services/record/ -WORKDIR /src/services/lonelog +WORKDIR /src/services/record RUN --mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/root/.cache/go-build \ @@ -34,4 +34,4 @@ RUN apk add --no-cache tzdata \ COPY --from=builder /out/main . -CMD ["./main", "-f", "etc/lonelog.yaml"] +CMD ["./main", "-f", "etc/record.yaml"] diff --git a/services/lonelog/internal/config/config.go b/services/record/internal/config/config.go similarity index 100% rename from services/lonelog/internal/config/config.go rename to services/record/internal/config/config.go diff --git a/services/lonelog/internal/dao/actionLogs.go b/services/record/internal/dao/actionLogs.go similarity index 100% rename from services/lonelog/internal/dao/actionLogs.go rename to services/record/internal/dao/actionLogs.go diff --git a/services/lonelog/internal/dao/loginLogs.go b/services/record/internal/dao/loginLogs.go similarity index 100% rename from services/lonelog/internal/dao/loginLogs.go rename to services/record/internal/dao/loginLogs.go diff --git a/services/lonelog/internal/logic/actionaddlogic.go b/services/record/internal/logic/actionaddlogic.go similarity index 92% rename from services/lonelog/internal/logic/actionaddlogic.go rename to services/record/internal/logic/actionaddlogic.go index a103d56..7215ee8 100644 --- a/services/lonelog/internal/logic/actionaddlogic.go +++ b/services/record/internal/logic/actionaddlogic.go @@ -3,7 +3,7 @@ package logic import ( "context" lonelog "lone-services/rpc/lonelog/pb" - "lone-services/services/lonelog/internal/svc" + "lone-services/services/record/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/services/lonelog/internal/logic/base.go b/services/record/internal/logic/base.go similarity index 100% rename from services/lonelog/internal/logic/base.go rename to services/record/internal/logic/base.go diff --git a/services/lonelog/internal/logic/itemslogic.go b/services/record/internal/logic/itemslogic.go similarity index 90% rename from services/lonelog/internal/logic/itemslogic.go rename to services/record/internal/logic/itemslogic.go index 5b3421f..df9ee52 100644 --- a/services/lonelog/internal/logic/itemslogic.go +++ b/services/record/internal/logic/itemslogic.go @@ -5,9 +5,9 @@ import ( "lone-services/pkg/modelbase" "lone-services/pkg/utils" lonelog "lone-services/rpc/lonelog/pb" - "lone-services/services/lonelog/internal/dao" - "lone-services/services/lonelog/internal/model" - "lone-services/services/lonelog/internal/svc" + "lone-services/services/record/internal/dao" + "lone-services/services/record/internal/model" + "lone-services/services/record/internal/svc" "strconv" "github.com/zeromicro/go-zero/core/logx" diff --git a/services/lonelog/internal/logic/loginItemsLogic.go b/services/record/internal/logic/loginItemsLogic.go similarity index 90% rename from services/lonelog/internal/logic/loginItemsLogic.go rename to services/record/internal/logic/loginItemsLogic.go index 9e82aa5..80e8448 100644 --- a/services/lonelog/internal/logic/loginItemsLogic.go +++ b/services/record/internal/logic/loginItemsLogic.go @@ -4,12 +4,12 @@ import ( "context" "lone-services/pkg/modelbase" "lone-services/pkg/utils" - "lone-services/services/lonelog/internal/dao" - "lone-services/services/lonelog/internal/model" + "lone-services/services/record/internal/dao" + "lone-services/services/record/internal/model" "strconv" "lone-services/rpc/lonelog/pb" - "lone-services/services/lonelog/internal/svc" + "lone-services/services/record/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/services/lonelog/internal/logic/loginaddlogic.go b/services/record/internal/logic/loginaddlogic.go similarity index 92% rename from services/lonelog/internal/logic/loginaddlogic.go rename to services/record/internal/logic/loginaddlogic.go index dc69a41..9bb6299 100644 --- a/services/lonelog/internal/logic/loginaddlogic.go +++ b/services/record/internal/logic/loginaddlogic.go @@ -3,7 +3,7 @@ package logic import ( "context" lonelog "lone-services/rpc/lonelog/pb" - "lone-services/services/lonelog/internal/svc" + "lone-services/services/record/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/services/lonelog/internal/model/action.go b/services/record/internal/model/action.go similarity index 88% rename from services/lonelog/internal/model/action.go rename to services/record/internal/model/action.go index 769f857..92a2a03 100644 --- a/services/lonelog/internal/model/action.go +++ b/services/record/internal/model/action.go @@ -2,7 +2,7 @@ package model import ( "lone-services/pkg/modelbase" - "lone-services/services/lonelog/internal/dao" + "lone-services/services/record/internal/dao" ) type ActionModel struct { diff --git a/services/lonelog/internal/model/login.go b/services/record/internal/model/login.go similarity index 88% rename from services/lonelog/internal/model/login.go rename to services/record/internal/model/login.go index db7c27e..3519b58 100644 --- a/services/lonelog/internal/model/login.go +++ b/services/record/internal/model/login.go @@ -2,7 +2,7 @@ package model import ( "lone-services/pkg/modelbase" - "lone-services/services/lonelog/internal/dao" + "lone-services/services/record/internal/dao" ) type LoginModel struct { diff --git a/services/lonelog/internal/server/lonelogServer.go b/services/record/internal/server/lonelogServer.go similarity index 91% rename from services/lonelog/internal/server/lonelogServer.go rename to services/record/internal/server/lonelogServer.go index ae5db35..f4eec09 100644 --- a/services/lonelog/internal/server/lonelogServer.go +++ b/services/record/internal/server/lonelogServer.go @@ -8,8 +8,8 @@ import ( "context" "lone-services/rpc/lonelog/pb" - "lone-services/services/lonelog/internal/logic" - "lone-services/services/lonelog/internal/svc" + "lone-services/services/record/internal/logic" + "lone-services/services/record/internal/svc" ) type LonelogServer struct { diff --git a/services/lonelog/internal/service/logwatcher.go b/services/record/internal/service/logwatcher.go similarity index 97% rename from services/lonelog/internal/service/logwatcher.go rename to services/record/internal/service/logwatcher.go index 37d1c78..118919b 100644 --- a/services/lonelog/internal/service/logwatcher.go +++ b/services/record/internal/service/logwatcher.go @@ -5,8 +5,8 @@ import ( "encoding/json" "lone-services/pkg/logRedis" "lone-services/pkg/utils" - "lone-services/services/lonelog/internal/dao" - "lone-services/services/lonelog/internal/model" + "lone-services/services/record/internal/dao" + "lone-services/services/record/internal/model" "sync" "time" diff --git a/services/lonelog/internal/svc/servicecontext.go b/services/record/internal/svc/servicecontext.go similarity index 86% rename from services/lonelog/internal/svc/servicecontext.go rename to services/record/internal/svc/servicecontext.go index 12ce45f..e8c3268 100644 --- a/services/lonelog/internal/svc/servicecontext.go +++ b/services/record/internal/svc/servicecontext.go @@ -2,7 +2,7 @@ package svc import ( "lone-services/pkg/utils" - "lone-services/services/lonelog/internal/config" + "lone-services/services/record/internal/config" "gorm.io/gorm" ) diff --git a/services/lonelog/lonelog.go b/services/record/lonelog.go similarity index 95% rename from services/lonelog/lonelog.go rename to services/record/lonelog.go index 343c61d..16115cb 100644 --- a/services/lonelog/lonelog.go +++ b/services/record/lonelog.go @@ -9,10 +9,10 @@ import ( "lone-services/pkg/utils" "lone-services/pkg/validate" lonelog "lone-services/rpc/lonelog/pb" - "lone-services/services/lonelog/internal/config" - "lone-services/services/lonelog/internal/server" - service2 "lone-services/services/lonelog/internal/service" - "lone-services/services/lonelog/internal/svc" + "lone-services/services/record/internal/config" + "lone-services/services/record/internal/server" + service2 "lone-services/services/record/internal/service" + "lone-services/services/record/internal/svc" "net" "os" "strconv" diff --git a/services/lonelog/lonelogClient/lonelog.go b/services/record/lonelogClient/lonelog.go similarity index 100% rename from services/lonelog/lonelogClient/lonelog.go rename to services/record/lonelogClient/lonelog.go diff --git a/services/lonelog/validator/logs.go b/services/record/validator/logs.go similarity index 100% rename from services/lonelog/validator/logs.go rename to services/record/validator/logs.go