[chore] package renaming

This commit is contained in:
Aleksandr Soloshenko 2024-11-24 20:47:48 +07:00 committed by Aleksandr
parent 87e95abfb2
commit 4ff3a10394
37 changed files with 104 additions and 104 deletions

View File

@ -4,7 +4,7 @@ tmp_dir = "tmp"
[build]
bin = "tmp/main.exe"
cmd = "go build -ldflags='-X github.com/capcom6/sms-gateway/internal/version.AppVersion=dev -X github.com/capcom6/sms-gateway/internal/version.AppRelease=1' -o ./tmp/main.exe ./cmd/sms-gateway"
cmd = "go build -ldflags='-X github.com/android-sms-gateway/server/internal/version.AppVersion=dev -X github.com/android-sms-gateway/server/internal/version.AppRelease=1' -o ./tmp/main.exe ./cmd/sms-gateway"
delay = 1000
exclude_dir = ["api", "assets", "tmp", "vendor", "testdata", "tmp", "web"]
exclude_file = []

View File

@ -81,13 +81,13 @@ Distributed under the Apache-2.0 license. See [LICENSE](LICENSE) for more inform
Android is a trademark of Google LLC.
[contributors-shield]: https://img.shields.io/github/contributors/capcom6/sms-gateway.svg?style=for-the-badge
[contributors-url]: https://github.com/capcom6/sms-gateway/graphs/contributors
[forks-shield]: https://img.shields.io/github/forks/capcom6/sms-gateway.svg?style=for-the-badge
[forks-url]: https://github.com/capcom6/sms-gateway/network/members
[stars-shield]: https://img.shields.io/github/stars/capcom6/sms-gateway.svg?style=for-the-badge
[stars-url]: https://github.com/capcom6/sms-gateway/stargazers
[issues-shield]: https://img.shields.io/github/issues/capcom6/sms-gateway.svg?style=for-the-badge
[issues-url]: https://github.com/capcom6/sms-gateway/issues
[license-shield]: https://img.shields.io/github/license/capcom6/sms-gateway.svg?style=for-the-badge
[license-url]: https://github.com/capcom6/sms-gateway/blob/master/LICENSE
[contributors-shield]: https://img.shields.io/github/contributors/android-sms-gateway/server.svg?style=for-the-badge
[contributors-url]: https://github.com/android-sms-gateway/server/graphs/contributors
[forks-shield]: https://img.shields.io/github/forks/android-sms-gateway/server.svg?style=for-the-badge
[forks-url]: https://github.com/android-sms-gateway/server/network/members
[stars-shield]: https://img.shields.io/github/stars/android-sms-gateway/server.svg?style=for-the-badge
[stars-url]: https://github.com/android-sms-gateway/server/stargazers
[issues-shield]: https://img.shields.io/github/issues/android-sms-gateway/server.svg?style=for-the-badge
[issues-url]: https://github.com/android-sms-gateway/server/issues
[license-shield]: https://img.shields.io/github/license/android-sms-gateway/server.svg?style=for-the-badge
[license-url]: https://github.com/android-sms-gateway/server/blob/master/LICENSE

View File

@ -1,7 +1,7 @@
package main
import (
smsgateway "github.com/capcom6/sms-gateway/internal/sms-gateway"
smsgateway "github.com/android-sms-gateway/server/internal/sms-gateway"
)
// @securitydefinitions.basic ApiAuth

2
go.mod
View File

@ -1,4 +1,4 @@
module github.com/capcom6/sms-gateway
module github.com/android-sms-gateway/server
go 1.22.0

View File

@ -3,14 +3,14 @@ package config
import (
"time"
"github.com/android-sms-gateway/server/internal/sms-gateway/handlers"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/auth"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/devices"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/messages"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/push"
"github.com/capcom6/go-infra-fx/config"
"github.com/capcom6/go-infra-fx/db"
"github.com/capcom6/go-infra-fx/http"
"github.com/capcom6/sms-gateway/internal/sms-gateway/handlers"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/auth"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/devices"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/messages"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push"
"go.uber.org/fx"
"go.uber.org/zap"
)

View File

@ -4,22 +4,22 @@ import (
"context"
"sync"
appconfig "github.com/android-sms-gateway/server/internal/config"
"github.com/android-sms-gateway/server/internal/sms-gateway/handlers"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/auth"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/cleaner"
appdb "github.com/android-sms-gateway/server/internal/sms-gateway/modules/db"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/devices"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/health"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/messages"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/metrics"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/push"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/webhooks"
"github.com/capcom6/go-infra-fx/cli"
"github.com/capcom6/go-infra-fx/db"
"github.com/capcom6/go-infra-fx/http"
"github.com/capcom6/go-infra-fx/logger"
"github.com/capcom6/go-infra-fx/validator"
appconfig "github.com/capcom6/sms-gateway/internal/config"
"github.com/capcom6/sms-gateway/internal/sms-gateway/handlers"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/auth"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/cleaner"
appdb "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/db"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/devices"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/health"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/messages"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/metrics"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/webhooks"
"go.uber.org/fx"
"go.uber.org/fx/fxevent"
"go.uber.org/zap"

View File

@ -5,14 +5,14 @@ import (
"fmt"
"github.com/android-sms-gateway/client-go/smsgateway"
"github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/base"
devicesCtrl "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/devices"
"github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/logs"
"github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/webhooks"
"github.com/capcom6/sms-gateway/internal/sms-gateway/models"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/auth"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/devices"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/messages"
"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/base"
devicesCtrl "github.com/android-sms-gateway/server/internal/sms-gateway/handlers/devices"
"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/logs"
"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/webhooks"
"github.com/android-sms-gateway/server/internal/sms-gateway/models"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/auth"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/devices"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/messages"
"github.com/go-playground/validator/v10"
"github.com/gofiber/fiber/v2"
"github.com/gofiber/fiber/v2/middleware/basicauth"

View File

@ -2,7 +2,7 @@ package converters
import (
"github.com/android-sms-gateway/client-go/smsgateway"
"github.com/capcom6/sms-gateway/internal/sms-gateway/models"
"github.com/android-sms-gateway/server/internal/sms-gateway/models"
)
func DeviceToDTO(device *models.Device) *smsgateway.Device {

View File

@ -5,9 +5,9 @@ import (
"time"
"github.com/android-sms-gateway/client-go/smsgateway"
"github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/converters"
"github.com/capcom6/sms-gateway/internal/sms-gateway/models"
"github.com/capcom6/sms-gateway/pkg/types"
"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/converters"
"github.com/android-sms-gateway/server/internal/sms-gateway/models"
"github.com/android-sms-gateway/server/pkg/types"
"github.com/go-playground/assert/v2"
)

View File

@ -4,12 +4,12 @@ import (
"fmt"
"github.com/android-sms-gateway/client-go/smsgateway"
"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/base"
"github.com/android-sms-gateway/server/internal/sms-gateway/models"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/auth"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/devices"
"github.com/android-sms-gateway/server/pkg/types"
"github.com/capcom6/go-helpers/slices"
"github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/base"
"github.com/capcom6/sms-gateway/internal/sms-gateway/models"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/auth"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/devices"
"github.com/capcom6/sms-gateway/pkg/types"
"github.com/gofiber/fiber/v2"
"go.uber.org/fx"
"go.uber.org/zap"

View File

@ -2,10 +2,10 @@ package handlers
import (
"github.com/android-sms-gateway/client-go/smsgateway"
"github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/base"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/health"
"github.com/capcom6/sms-gateway/internal/version"
"github.com/capcom6/sms-gateway/pkg/maps"
"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/base"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/health"
"github.com/android-sms-gateway/server/internal/version"
"github.com/android-sms-gateway/server/pkg/maps"
"github.com/gofiber/fiber/v2"
"go.uber.org/fx"
"go.uber.org/zap"

View File

@ -1,9 +1,9 @@
package logs
import (
"github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/base"
"github.com/capcom6/sms-gateway/internal/sms-gateway/models"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/auth"
"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/base"
"github.com/android-sms-gateway/server/internal/sms-gateway/models"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/auth"
"github.com/go-playground/validator/v10"
"github.com/gofiber/fiber/v2"
"go.uber.org/fx"

View File

@ -6,14 +6,14 @@ import (
"strings"
"github.com/android-sms-gateway/client-go/smsgateway"
"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/base"
"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/converters"
"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/webhooks"
"github.com/android-sms-gateway/server/internal/sms-gateway/models"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/auth"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/devices"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/messages"
"github.com/capcom6/go-infra-fx/http/apikey"
"github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/base"
"github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/converters"
"github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/webhooks"
"github.com/capcom6/sms-gateway/internal/sms-gateway/models"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/auth"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/devices"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/messages"
"github.com/go-playground/validator/v10"
"github.com/gofiber/fiber/v2"
"github.com/gofiber/fiber/v2/middleware/limiter"

View File

@ -1,10 +1,10 @@
package handlers
import (
"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/devices"
"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/logs"
"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/webhooks"
"github.com/capcom6/go-infra-fx/http"
"github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/devices"
"github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/logs"
"github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/webhooks"
"go.uber.org/fx"
"go.uber.org/zap"
)

View File

@ -3,7 +3,7 @@ package handlers
import (
"net/http"
"github.com/capcom6/sms-gateway/pkg/swagger"
"github.com/android-sms-gateway/server/pkg/swagger"
"github.com/gofiber/fiber/v2"
"github.com/gofiber/fiber/v2/middleware/filesystem"
)

View File

@ -4,9 +4,9 @@ import (
"time"
"github.com/android-sms-gateway/client-go/smsgateway"
"github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/base"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push"
"github.com/capcom6/sms-gateway/pkg/types"
"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/base"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/push"
"github.com/android-sms-gateway/server/pkg/types"
"github.com/go-playground/validator/v10"
"github.com/gofiber/fiber/v2"
"github.com/gofiber/fiber/v2/middleware/limiter"

View File

@ -4,10 +4,10 @@ import (
"fmt"
"github.com/android-sms-gateway/client-go/smsgateway"
"github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/base"
"github.com/capcom6/sms-gateway/internal/sms-gateway/models"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/auth"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/webhooks"
"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/base"
"github.com/android-sms-gateway/server/internal/sms-gateway/models"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/auth"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/webhooks"
"github.com/go-playground/validator/v10"
"github.com/gofiber/fiber/v2"
"go.uber.org/fx"

View File

@ -3,10 +3,10 @@ package webhooks
import (
"fmt"
"github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/base"
"github.com/capcom6/sms-gateway/internal/sms-gateway/models"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/auth"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/webhooks"
"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/base"
"github.com/android-sms-gateway/server/internal/sms-gateway/models"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/auth"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/webhooks"
"github.com/gofiber/fiber/v2"
"go.uber.org/fx"
"go.uber.org/zap"

View File

@ -3,7 +3,7 @@ package models_test
import (
"testing"
"github.com/capcom6/sms-gateway/internal/sms-gateway/models"
"github.com/android-sms-gateway/server/internal/sms-gateway/models"
)
func TestDevice_IsEmpty(t *testing.T) {

View File

@ -1,7 +1,7 @@
package auth
import (
"github.com/capcom6/sms-gateway/internal/sms-gateway/models"
"github.com/android-sms-gateway/server/internal/sms-gateway/models"
"github.com/gofiber/fiber/v2"
)

View File

@ -1,7 +1,7 @@
package auth
import (
"github.com/capcom6/sms-gateway/internal/sms-gateway/models"
"github.com/android-sms-gateway/server/internal/sms-gateway/models"
"gorm.io/gorm"
)

View File

@ -6,10 +6,10 @@ import (
"fmt"
"time"
"github.com/capcom6/sms-gateway/internal/sms-gateway/models"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/devices"
"github.com/capcom6/sms-gateway/pkg/crypto"
"github.com/capcom6/sms-gateway/pkg/types/cache"
"github.com/android-sms-gateway/server/internal/sms-gateway/models"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/devices"
"github.com/android-sms-gateway/server/pkg/crypto"
"github.com/android-sms-gateway/server/pkg/types/cache"
"github.com/jaevor/go-nanoid"
"go.uber.org/fx"
"go.uber.org/zap"

View File

@ -1,7 +1,7 @@
package devices
import (
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/cleaner"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/cleaner"
"go.uber.org/fx"
"go.uber.org/zap"
)

View File

@ -5,7 +5,7 @@ import (
"errors"
"time"
"github.com/capcom6/sms-gateway/internal/sms-gateway/models"
"github.com/android-sms-gateway/server/internal/sms-gateway/models"
"gorm.io/gorm"
)

View File

@ -4,8 +4,8 @@ import (
"context"
"time"
"github.com/capcom6/sms-gateway/internal/sms-gateway/models"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/db"
"github.com/android-sms-gateway/server/internal/sms-gateway/models"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/db"
"go.uber.org/fx"
"go.uber.org/zap"
)

View File

@ -1,7 +1,7 @@
package messages
import (
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/cleaner"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/cleaner"
"go.uber.org/fx"
"go.uber.org/zap"
)

View File

@ -6,7 +6,7 @@ import (
"errors"
"time"
"github.com/capcom6/sms-gateway/internal/sms-gateway/models"
"github.com/android-sms-gateway/server/internal/sms-gateway/models"
"github.com/go-sql-driver/mysql"
"gorm.io/gorm"
"gorm.io/gorm/clause"

View File

@ -8,11 +8,11 @@ import (
"time"
"github.com/android-sms-gateway/client-go/smsgateway"
"github.com/android-sms-gateway/server/internal/sms-gateway/models"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/db"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/push"
"github.com/android-sms-gateway/server/pkg/types"
"github.com/capcom6/go-helpers/slices"
"github.com/capcom6/sms-gateway/internal/sms-gateway/models"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/db"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push"
"github.com/capcom6/sms-gateway/pkg/types"
"github.com/nyaruka/phonenumbers"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"

View File

@ -5,7 +5,7 @@ import (
"testing"
"github.com/android-sms-gateway/client-go/smsgateway"
"github.com/capcom6/sms-gateway/internal/sms-gateway/models"
"github.com/android-sms-gateway/server/internal/sms-gateway/models"
)
func TestService_recipientsStateToModel(t *testing.T) {

View File

@ -8,7 +8,7 @@ import (
firebase "firebase.google.com/go/v4"
"firebase.google.com/go/v4/messaging"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push/domain"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/push/domain"
"google.golang.org/api/option"
)

View File

@ -4,8 +4,8 @@ import (
"context"
"errors"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push/fcm"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push/upstream"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/push/fcm"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/push/upstream"
"go.uber.org/fx"
"go.uber.org/zap"
)

View File

@ -5,7 +5,7 @@ import (
"fmt"
"time"
"github.com/capcom6/sms-gateway/pkg/types/cache"
"github.com/android-sms-gateway/server/pkg/types/cache"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"
"go.uber.org/fx"

View File

@ -4,7 +4,7 @@ import (
"context"
"github.com/android-sms-gateway/client-go/smsgateway"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push/domain"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/push/domain"
)
type Mode string

View File

@ -10,7 +10,7 @@ import (
"sync"
"github.com/android-sms-gateway/client-go/smsgateway"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push/domain"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/push/domain"
)
const BASE_URL = "https://api.sms-gate.app/upstream/v1"

View File

@ -2,7 +2,7 @@ package webhooks
import (
"github.com/android-sms-gateway/client-go/smsgateway"
"github.com/capcom6/sms-gateway/internal/sms-gateway/models"
"github.com/android-sms-gateway/server/internal/sms-gateway/models"
"gorm.io/gorm"
)

View File

@ -4,10 +4,10 @@ import (
"fmt"
"github.com/android-sms-gateway/client-go/smsgateway"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/db"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/devices"
"github.com/android-sms-gateway/server/internal/sms-gateway/modules/push"
"github.com/capcom6/go-helpers/slices"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/db"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/devices"
"github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push"
"go.uber.org/fx"
"go.uber.org/zap"
)

View File

@ -5,7 +5,7 @@ import (
"testing"
"time"
"github.com/capcom6/sms-gateway/pkg/types/cache"
"github.com/android-sms-gateway/server/pkg/types/cache"
)
func TestCache_Set(t *testing.T) {