diff --git a/README.md b/README.md index 7379f01..42e5d9c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # CasaOS-UserService -[![Go Reference](https://pkg.go.dev/badge/github.com/IceWhaleTech/CasaOS-UserService.svg)](https://pkg.go.dev/github.com/IceWhaleTech/CasaOS-UserService) [![Go Report Card](https://goreportcard.com/badge/github.com/IceWhaleTech/CasaOS-UserService)](https://goreportcard.com/report/github.com/IceWhaleTech/CasaOS-UserService) [![goreleaser](https://github.com/IceWhaleTech/CasaOS-UserService/actions/workflows/release.yml/badge.svg)](https://github.com/IceWhaleTech/CasaOS-UserService/actions/workflows/release.yml) [![codecov](https://codecov.io/gh/IceWhaleTech/CasaOS-UserService/branch/main/graph/badge.svg?token=4GWJIF6FDD)](https://codecov.io/gh/IceWhaleTech/CasaOS-UserService) +[![Go Reference](https://pkg.go.dev/badge/github.com/KaySar12/NextZen-UserService.svg)](https://pkg.go.dev/github.com/KaySar12/NextZen-UserService) [![Go Report Card](https://goreportcard.com/badge/github.com/KaySar12/NextZen-UserService)](https://goreportcard.com/report/github.com/KaySar12/NextZen-UserService) [![goreleaser](https://github.com/KaySar12/NextZen-UserService/actions/workflows/release.yml/badge.svg)](https://github.com/KaySar12/NextZen-UserService/actions/workflows/release.yml) [![codecov](https://codecov.io/gh/IceWhaleTech/CasaOS-UserService/branch/main/graph/badge.svg?token=4GWJIF6FDD)](https://codecov.io/gh/IceWhaleTech/CasaOS-UserService) User Service provides user management functionalities to CasaOS. diff --git a/cmd/migration-tool/main.go b/cmd/migration-tool/main.go index cbf1322..33ca2bf 100644 --- a/cmd/migration-tool/main.go +++ b/cmd/migration-tool/main.go @@ -6,9 +6,9 @@ import ( "fmt" "os" - interfaces "github.com/IceWhaleTech/CasaOS-Common" - "github.com/IceWhaleTech/CasaOS-Common/utils/systemctl" - "github.com/IceWhaleTech/CasaOS-UserService/common" + interfaces "github.com/KaySar12/NextZen-Common" + "github.com/KaySar12/NextZen-Common/utils/systemctl" + "github.com/KaySar12/NextZen-UserService/common" ) const ( diff --git a/cmd/migration-tool/migration_dummy.go b/cmd/migration-tool/migration_dummy.go index 6d08df2..131976c 100644 --- a/cmd/migration-tool/migration_dummy.go +++ b/cmd/migration-tool/migration_dummy.go @@ -1,7 +1,7 @@ package main import ( - interfaces "github.com/IceWhaleTech/CasaOS-Common" + interfaces "github.com/KaySar12/NextZen-Common" ) type migrationTool struct{} diff --git a/dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service b/dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service index a7e5075..73caed3 100644 Binary files a/dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service and b/dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service differ diff --git a/dist/metadata.json b/dist/metadata.json index c44fe19..00ebbc5 100644 --- a/dist/metadata.json +++ b/dist/metadata.json @@ -1 +1 @@ -{"project_name":"casaos-user-service","tag":"v0.4.5","previous_tag":"v0.4.4-alpha7","version":"0.4.6","commit":"4d2b65e34c6d01800273009d60756205c08cb0c3","date":"2024-02-02T15:35:39.294862443+07:00","runtime":{"goos":"linux","goarch":"amd64"}} \ No newline at end of file +{"project_name":"casaos-user-service","tag":"v1.0.1","previous_tag":"","version":"1.0.2","commit":"e002bab12a5ce37a0636709986e161f0e84f2eeb","date":"2024-02-21T12:02:47.525580972+07:00","runtime":{"goos":"linux","goarch":"amd64"}} \ No newline at end of file diff --git a/go.sum b/go.sum index 3849aaf..34a3970 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/IceWhaleTech/CasaOS-Common v0.4.8-alpha3 h1:5E5LAqi2uXpOZqcPOgQ4m6d9MagYyfhKIFXnzd8s3W4= -github.com/IceWhaleTech/CasaOS-Common v0.4.8-alpha3/go.mod h1:2IuYyy5qW1BE6jqC6M+tOU+WtUec1K565rLATBJ9p/0= +github.com/KaySar12/NextZen-Common v1.0.1 h1:w+QTKRmXJBmru3Ig4x142k6c7oD6ZTMF13Q0Fu19bGo= +github.com/KaySar12/NextZen-Common v1.0.1/go.mod h1:7AnhDlcVN9Dusql3aFy7y7TcyoKO3Pb9n/r0krTAWsw= github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk= github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= @@ -240,6 +240,7 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/gorm v1.25.0 h1:+KtYtb2roDz14EQe4bla8CbQlmb9dN3VejSai3lprfU= gorm.io/gorm v1.25.0/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= +gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= modernc.org/libc v1.22.4 h1:wymSbZb0AlrjdAVX3cjreCHTPCpPARbQXNz6BHPzdwQ= modernc.org/libc v1.22.4/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY= modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ= diff --git a/main.go b/main.go index 67a9041..5c24d5b 100644 --- a/main.go +++ b/main.go @@ -13,18 +13,18 @@ import ( "strings" "time" - "github.com/IceWhaleTech/CasaOS-Common/external" - "github.com/IceWhaleTech/CasaOS-Common/model" - util_http "github.com/IceWhaleTech/CasaOS-Common/utils/http" - "github.com/IceWhaleTech/CasaOS-Common/utils/jwt" - "github.com/IceWhaleTech/CasaOS-Common/utils/logger" - "github.com/IceWhaleTech/CasaOS-UserService/common" - "github.com/IceWhaleTech/CasaOS-UserService/pkg/config" - "github.com/IceWhaleTech/CasaOS-UserService/pkg/sqlite" - "github.com/IceWhaleTech/CasaOS-UserService/pkg/utils/encryption" - "github.com/IceWhaleTech/CasaOS-UserService/pkg/utils/random" - "github.com/IceWhaleTech/CasaOS-UserService/route" - "github.com/IceWhaleTech/CasaOS-UserService/service" + "github.com/KaySar12/NextZen-Common/external" + "github.com/KaySar12/NextZen-Common/model" + util_http "github.com/KaySar12/NextZen-Common/utils/http" + "github.com/KaySar12/NextZen-Common/utils/jwt" + "github.com/KaySar12/NextZen-Common/utils/logger" + "github.com/KaySar12/NextZen-UserService/common" + "github.com/KaySar12/NextZen-UserService/pkg/config" + "github.com/KaySar12/NextZen-UserService/pkg/sqlite" + "github.com/KaySar12/NextZen-UserService/pkg/utils/encryption" + "github.com/KaySar12/NextZen-UserService/pkg/utils/random" + "github.com/KaySar12/NextZen-UserService/route" + "github.com/KaySar12/NextZen-UserService/service" "github.com/coreos/go-systemd/daemon" "go.uber.org/zap" ) diff --git a/package.json b/package.json index 8ce77a7..6e4af21 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "publish": "npm publish --access public", "start": "yarn generate:ts && yarn build" }, - "homepage": "https://github.com/IceWhaleTech/CasaOS-UserService#readme", + "homepage": "https://github.com/KaySar12/NextZen-UserService#readme", "description": "Casaos-Localstorage Typescript+Axios SDK", "keywords": [ "CasaOS-UserService", diff --git a/pkg/config/init.go b/pkg/config/init.go index ac9b341..b83998e 100644 --- a/pkg/config/init.go +++ b/pkg/config/init.go @@ -5,8 +5,8 @@ import ( "log" "os" - "github.com/IceWhaleTech/CasaOS-Common/utils/constants" - "github.com/IceWhaleTech/CasaOS-UserService/model" + "github.com/KaySar12/NextZen-Common/utils/constants" + "github.com/KaySar12/NextZen-UserService/model" "gopkg.in/ini.v1" ) diff --git a/pkg/sqlite/db.go b/pkg/sqlite/db.go index 331d64e..9de31a7 100644 --- a/pkg/sqlite/db.go +++ b/pkg/sqlite/db.go @@ -12,10 +12,10 @@ package sqlite import ( "time" - "github.com/IceWhaleTech/CasaOS-Common/utils/logger" - "github.com/IceWhaleTech/CasaOS-UserService/model" - "github.com/IceWhaleTech/CasaOS-UserService/pkg/utils/file" - model2 "github.com/IceWhaleTech/CasaOS-UserService/service/model" + "github.com/KaySar12/NextZen-Common/utils/logger" + "github.com/KaySar12/NextZen-UserService/model" + "github.com/KaySar12/NextZen-UserService/pkg/utils/file" + model2 "github.com/KaySar12/NextZen-UserService/service/model" "github.com/glebarez/sqlite" "go.uber.org/zap" "gorm.io/gorm" diff --git a/route/event_listen.go b/route/event_listen.go index a6e851b..2e54696 100644 --- a/route/event_listen.go +++ b/route/event_listen.go @@ -7,12 +7,12 @@ import ( "strings" "time" - "github.com/IceWhaleTech/CasaOS-Common/external" - "github.com/IceWhaleTech/CasaOS-Common/utils/logger" - message_bus "github.com/IceWhaleTech/CasaOS-UserService/codegen/message_bus" - "github.com/IceWhaleTech/CasaOS-UserService/model" - "github.com/IceWhaleTech/CasaOS-UserService/pkg/config" - "github.com/IceWhaleTech/CasaOS-UserService/service" + "github.com/KaySar12/NextZen-Common/external" + "github.com/KaySar12/NextZen-Common/utils/logger" + message_bus "github.com/KaySar12/NextZen-UserService/codegen/message_bus" + "github.com/KaySar12/NextZen-UserService/model" + "github.com/KaySar12/NextZen-UserService/pkg/config" + "github.com/KaySar12/NextZen-UserService/service" "go.uber.org/zap" "golang.org/x/net/websocket" ) diff --git a/route/v1.go b/route/v1.go index 70df0a6..277f0b5 100644 --- a/route/v1.go +++ b/route/v1.go @@ -4,10 +4,10 @@ import ( "crypto/ecdsa" "os" - "github.com/IceWhaleTech/CasaOS-Common/middleware" - "github.com/IceWhaleTech/CasaOS-Common/utils/jwt" - v1 "github.com/IceWhaleTech/CasaOS-UserService/route/v1" - "github.com/IceWhaleTech/CasaOS-UserService/service" + "github.com/KaySar12/NextZen-Common/middleware" + "github.com/KaySar12/NextZen-Common/utils/jwt" + v1 "github.com/KaySar12/NextZen-UserService/route/v1" + "github.com/KaySar12/NextZen-UserService/service" "github.com/gin-contrib/gzip" "github.com/gin-gonic/gin" ) diff --git a/route/v1/user.go b/route/v1/user.go index bdc352e..612a715 100644 --- a/route/v1/user.go +++ b/route/v1/user.go @@ -17,20 +17,20 @@ import ( "strings" "time" - "github.com/IceWhaleTech/CasaOS-Common/utils/common_err" - "github.com/IceWhaleTech/CasaOS-Common/utils/jwt" - "github.com/IceWhaleTech/CasaOS-Common/utils/logger" - "github.com/IceWhaleTech/CasaOS-UserService/model" - "github.com/IceWhaleTech/CasaOS-UserService/model/system_model" - "github.com/IceWhaleTech/CasaOS-UserService/pkg/config" - "github.com/IceWhaleTech/CasaOS-UserService/pkg/utils/encryption" - "github.com/IceWhaleTech/CasaOS-UserService/pkg/utils/file" - model2 "github.com/IceWhaleTech/CasaOS-UserService/service/model" + "github.com/KaySar12/NextZen-Common/utils/common_err" + "github.com/KaySar12/NextZen-Common/utils/jwt" + "github.com/KaySar12/NextZen-Common/utils/logger" + "github.com/KaySar12/NextZen-UserService/model" + "github.com/KaySar12/NextZen-UserService/model/system_model" + "github.com/KaySar12/NextZen-UserService/pkg/config" + "github.com/KaySar12/NextZen-UserService/pkg/utils/encryption" + "github.com/KaySar12/NextZen-UserService/pkg/utils/file" + model2 "github.com/KaySar12/NextZen-UserService/service/model" uuid "github.com/satori/go.uuid" "github.com/tidwall/gjson" "go.uber.org/zap" - "github.com/IceWhaleTech/CasaOS-UserService/service" + "github.com/KaySar12/NextZen-UserService/service" "github.com/gin-gonic/gin" ) diff --git a/route/v2.go b/route/v2.go index 93c2c7a..3b723e2 100644 --- a/route/v2.go +++ b/route/v2.go @@ -7,10 +7,10 @@ import ( "strconv" "strings" - "github.com/IceWhaleTech/CasaOS-Common/utils/jwt" - codegen "github.com/IceWhaleTech/CasaOS-UserService/codegen/user_service" - v2 "github.com/IceWhaleTech/CasaOS-UserService/route/v2" - "github.com/IceWhaleTech/CasaOS-UserService/service" + "github.com/KaySar12/NextZen-Common/utils/jwt" + codegen "github.com/KaySar12/NextZen-UserService/codegen/user_service" + v2 "github.com/KaySar12/NextZen-UserService/route/v2" + "github.com/KaySar12/NextZen-UserService/service" "github.com/deepmap/oapi-codegen/pkg/middleware" "github.com/getkin/kin-openapi/openapi3" "github.com/getkin/kin-openapi/openapi3filter" diff --git a/route/v2/api_route_event.go b/route/v2/api_route_event.go index 180df2e..9ad263d 100644 --- a/route/v2/api_route_event.go +++ b/route/v2/api_route_event.go @@ -3,8 +3,8 @@ package v2 import ( "net/http" - codegen "github.com/IceWhaleTech/CasaOS-UserService/codegen/user_service" - "github.com/IceWhaleTech/CasaOS-UserService/service" + codegen "github.com/KaySar12/NextZen-UserService/codegen/user_service" + "github.com/KaySar12/NextZen-UserService/service" "github.com/labstack/echo/v4" ) diff --git a/route/v2/route.go b/route/v2/route.go index eda56fb..aeb5c05 100644 --- a/route/v2/route.go +++ b/route/v2/route.go @@ -1,6 +1,6 @@ package v2 -import codegen "github.com/IceWhaleTech/CasaOS-UserService/codegen/user_service" +import codegen "github.com/KaySar12/NextZen-UserService/codegen/user_service" type UserService struct{} diff --git a/service/event.go b/service/event.go index 8b45ba7..e1297f2 100644 --- a/service/event.go +++ b/service/event.go @@ -3,7 +3,7 @@ package service import ( "encoding/json" - "github.com/IceWhaleTech/CasaOS-UserService/model" + "github.com/KaySar12/NextZen-UserService/model" "gorm.io/gorm" ) diff --git a/service/service.go b/service/service.go index 8d29cab..c1c488e 100644 --- a/service/service.go +++ b/service/service.go @@ -1,7 +1,7 @@ package service import ( - "github.com/IceWhaleTech/CasaOS-Common/external" + "github.com/KaySar12/NextZen-Common/external" "gorm.io/gorm" ) diff --git a/service/user.go b/service/user.go index 54bed10..0d9f9cf 100644 --- a/service/user.go +++ b/service/user.go @@ -15,9 +15,9 @@ import ( "mime/multipart" "os" - "github.com/IceWhaleTech/CasaOS-Common/utils/jwt" - "github.com/IceWhaleTech/CasaOS-Common/utils/logger" - "github.com/IceWhaleTech/CasaOS-UserService/service/model" + "github.com/KaySar12/NextZen-Common/utils/jwt" + "github.com/KaySar12/NextZen-Common/utils/logger" + "github.com/KaySar12/NextZen-UserService/service/model" "go.uber.org/zap" "gorm.io/gorm" )