diff --git a/apps/ai.go b/apps/ai.go index 1d0c0fe..fdb2f91 100644 --- a/apps/ai.go +++ b/apps/ai.go @@ -6,7 +6,6 @@ import ( "ai-gateway/common/utils" "ai-gateway/infrastructure/remote_http" "ai-gateway/infrastructure/repository" - "code.freebrio.com/fb-go/lib/fbl" "github.com/labstack/echo/v4" "net/http" ) diff --git a/common/config/init.go b/common/config/init.go index 373f029..1078757 100644 --- a/common/config/init.go +++ b/common/config/init.go @@ -3,7 +3,6 @@ package config import ( "ai-gateway/common/utils" "bytes" - "code.freebrio.com/fb-go/lib/fbl" "embed" "fmt" "github.com/spf13/viper" diff --git a/common/utils/result.go b/common/utils/result.go index 08d723f..0680410 100644 --- a/common/utils/result.go +++ b/common/utils/result.go @@ -1,8 +1,8 @@ package utils import ( - "code.freebrio.com/fb-go/lib/errors" - "code.freebrio.com/fb-go/lib/fbl" + "code.mylomen.com/syj/lib/errors" + "gorm.io/gorm/utils" ) type Result struct { @@ -42,8 +42,8 @@ func OkEmptyPageResult(anchor any) Result { return Result{ Code: ok.ToInt(), Data: PageResult[interface{}]{ - Anchor: utils.ToString(anchor), - End: fbl.ToPtr(true), + Anchor: ToString(anchor), + End: ToPtr(true), List: emptyList, }, } diff --git a/common/utils/to_ptr.go b/common/utils/to_ptr.go index d4b585b..b057c42 100644 --- a/common/utils/to_ptr.go +++ b/common/utils/to_ptr.go @@ -1 +1,5 @@ package utils + +func ToPtr[T any](data T) *T { + return &data +} diff --git a/go.mod b/go.mod index 3b686a7..0efe72b 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module ai-gateway go 1.20 require ( - code.freebrio.com/fb-go/lib v0.4.1 + code.mylomen.com/syj/lib v0.0.3 github.com/go-playground/validator v9.31.0+incompatible github.com/go-redis/redis/v8 v8.11.5 github.com/google/uuid v1.3.0 diff --git a/go.sum b/go.sum index 7013b9a..a7aab55 100644 --- a/go.sum +++ b/go.sum @@ -45,8 +45,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= -code.freebrio.com/fb-go/lib v0.4.1 h1:eu7vpXOGL7pErH85H/smh7WMjumX/e3YHY5+PnpgWQo= -code.freebrio.com/fb-go/lib v0.4.1/go.mod h1:w3vdqKmQIGcJSR6x0+Uza0R8mI/PR8WAuDk2vDZSXas= +code.mylomen.com/syj/lib v0.0.3 h1:haq4eBhYq6Zep29ksjLpspzjng0oBxzQhmJB2jMdjjQ= +code.mylomen.com/syj/lib v0.0.3/go.mod h1:fM8H0KebN5D0GJN9/tf1++s64DsyFvqpUsduN8gpy3o= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= diff --git a/infrastructure/remote_http/ai-api-impl.go b/infrastructure/remote_http/ai-api-impl.go index a06a6d7..12eca2c 100644 --- a/infrastructure/remote_http/ai-api-impl.go +++ b/infrastructure/remote_http/ai-api-impl.go @@ -3,7 +3,7 @@ package remote_http import ( "ai-gateway/common/dto" "ai-gateway/common/utils" - "code.freebrio.com/fb-go/lib/context" + "code.mylomen.com/syj/lib/context" "fmt" ) diff --git a/infrastructure/remote_http/ai-api.go b/infrastructure/remote_http/ai-api.go index 58e4b50..51830f0 100644 --- a/infrastructure/remote_http/ai-api.go +++ b/infrastructure/remote_http/ai-api.go @@ -2,7 +2,7 @@ package remote_http import ( "ai-gateway/common/dto" - "code.freebrio.com/fb-go/lib/context" + "code.mylomen.com/syj/lib/context" ) type aiApi interface { diff --git a/infrastructure/repository/as_db.go b/infrastructure/repository/as_db.go index 743787c..efc4a36 100644 --- a/infrastructure/repository/as_db.go +++ b/infrastructure/repository/as_db.go @@ -3,14 +3,15 @@ package repository import ( "ai-gateway/common/config" "ai-gateway/common/constant" + "code.mylomen.com/syj/lib/fbl" "database/sql" "github.com/google/uuid" "github.com/labstack/echo/v4" "os" "time" - fbcontext "code.freebrio.com/fb-go/lib/context" - "code.freebrio.com/fb-go/lib/gorm/logger" + fbcontext "code.mylomen.com/syj/lib/context" + "code.mylomen.com/syj/lib/gorm/logger" _ "github.com/spf13/viper/remote" "gorm.io/driver/mysql" @@ -40,7 +41,7 @@ func getInstance() *gorm.DB { }) if instanceErr != nil { - utils.Log().Sugar().Errorf("mysql_getInstance instanceErr: %v", instanceErr) + fbl.Log().Sugar().Errorf("mysql_getInstance instanceErr: %v", instanceErr) os.Exit(-1) } diff --git a/infrastructure/repository/third_agent_corp_relation.go b/infrastructure/repository/third_agent_corp_relation.go index 53e0b1d..359608e 100644 --- a/infrastructure/repository/third_agent_corp_relation.go +++ b/infrastructure/repository/third_agent_corp_relation.go @@ -1,6 +1,6 @@ package repository -import "code.freebrio.com/fb-go/lib/context" +import "code.mylomen.com/syj/lib/context" type thirdAgentCorpRepository interface { QueryPage(ctx context.GormWithZap, page, size int) *[]FThirdAgentCorpRelationDO diff --git a/infrastructure/repository/third_agent_corp_relation_repository.go b/infrastructure/repository/third_agent_corp_relation_repository.go index 470ca30..68f284d 100644 --- a/infrastructure/repository/third_agent_corp_relation_repository.go +++ b/infrastructure/repository/third_agent_corp_relation_repository.go @@ -2,7 +2,7 @@ package repository import ( "ai-gateway/common/utils" - "code.freebrio.com/fb-go/lib/context" + "code.mylomen.com/syj/lib/context" "time" ) diff --git a/infrastructure/repository/third_agent_info.go b/infrastructure/repository/third_agent_info.go index 42a1477..8328745 100644 --- a/infrastructure/repository/third_agent_info.go +++ b/infrastructure/repository/third_agent_info.go @@ -1,6 +1,6 @@ package repository -import "code.freebrio.com/fb-go/lib/context" +import "code.mylomen.com/syj/lib/context" type thirdAgentInfoRepository interface { QueryPage(ctx context.GormWithZap, page, size int) *[]FThirdAgentInfoDO diff --git a/infrastructure/repository/third_agent_info_repository.go b/infrastructure/repository/third_agent_info_repository.go index 56ac6fb..2b1f1af 100644 --- a/infrastructure/repository/third_agent_info_repository.go +++ b/infrastructure/repository/third_agent_info_repository.go @@ -2,7 +2,7 @@ package repository import ( "ai-gateway/common/utils" - "code.freebrio.com/fb-go/lib/context" + "code.mylomen.com/syj/lib/context" "time" ) diff --git a/infrastructure/repository/third_corp_info.go b/infrastructure/repository/third_corp_info.go index c907647..7cfab3d 100644 --- a/infrastructure/repository/third_corp_info.go +++ b/infrastructure/repository/third_corp_info.go @@ -1,6 +1,6 @@ package repository -import "code.freebrio.com/fb-go/lib/context" +import "code.mylomen.com/syj/lib/context" type thirdCorpInfoRepository interface { QueryPage(ctx context.GormWithZap, page, size int) *[]FThirdCorpInfoDO diff --git a/infrastructure/repository/third_corp_info_repository.go b/infrastructure/repository/third_corp_info_repository.go index 891980c..7170369 100644 --- a/infrastructure/repository/third_corp_info_repository.go +++ b/infrastructure/repository/third_corp_info_repository.go @@ -2,7 +2,7 @@ package repository import ( "ai-gateway/common/utils" - "code.freebrio.com/fb-go/lib/context" + "code.mylomen.com/syj/lib/context" "time" ) diff --git a/infrastructure/repository/third_corp_user_account.go b/infrastructure/repository/third_corp_user_account.go index 888ad1e..8fbaca0 100644 --- a/infrastructure/repository/third_corp_user_account.go +++ b/infrastructure/repository/third_corp_user_account.go @@ -1,6 +1,6 @@ package repository -import "code.freebrio.com/fb-go/lib/context" +import "code.mylomen.com/syj/lib/context" type thirdCorpUserAccountRepository interface { QueryPage(ctx context.GormWithZap, page, size int) *[]FThirdCorpUserAccountDO diff --git a/infrastructure/repository/third_corp_user_account_repository.go b/infrastructure/repository/third_corp_user_account_repository.go index d53ab8f..515575c 100644 --- a/infrastructure/repository/third_corp_user_account_repository.go +++ b/infrastructure/repository/third_corp_user_account_repository.go @@ -2,7 +2,7 @@ package repository import ( "ai-gateway/common/utils" - "code.freebrio.com/fb-go/lib/context" + "code.mylomen.com/syj/lib/context" "time" ) diff --git a/infrastructure/repository/third_corp_user_log.go b/infrastructure/repository/third_corp_user_log.go index 4da4990..a78fa09 100644 --- a/infrastructure/repository/third_corp_user_log.go +++ b/infrastructure/repository/third_corp_user_log.go @@ -1,6 +1,6 @@ package repository -import "code.freebrio.com/fb-go/lib/context" +import "code.mylomen.com/syj/lib/context" type thirdCorpUserLogRepository interface { QueryList(ctx context.GormWithZap, id uint64, size int) *[]FThirdCorpUserLogDO diff --git a/infrastructure/repository/third_corp_user_log_repository.go b/infrastructure/repository/third_corp_user_log_repository.go index a9eb2ce..d1156aa 100644 --- a/infrastructure/repository/third_corp_user_log_repository.go +++ b/infrastructure/repository/third_corp_user_log_repository.go @@ -1,7 +1,7 @@ package repository import ( - "code.freebrio.com/fb-go/lib/context" + "code.mylomen.com/syj/lib/context" "time" ) diff --git a/infrastructure/repository/third_user_token.go b/infrastructure/repository/third_user_token.go index 698f845..103444f 100644 --- a/infrastructure/repository/third_user_token.go +++ b/infrastructure/repository/third_user_token.go @@ -1,6 +1,6 @@ package repository -import "code.freebrio.com/fb-go/lib/context" +import "code.mylomen.com/syj/lib/context" type thirdUserTokenRepository interface { FindByToken(ctx context.GormWithZap, token string) *FThirdUserTokenDO diff --git a/infrastructure/repository/third_user_token_repository.go b/infrastructure/repository/third_user_token_repository.go index efd9c55..9753de3 100644 --- a/infrastructure/repository/third_user_token_repository.go +++ b/infrastructure/repository/third_user_token_repository.go @@ -1,7 +1,7 @@ package repository import ( - "code.freebrio.com/fb-go/lib/context" + "code.mylomen.com/syj/lib/context" "gorm.io/gorm/clause" "time" ) diff --git a/service/third_api_limit.go b/service/third_api_limit.go index d144878..e92f7db 100644 --- a/service/third_api_limit.go +++ b/service/third_api_limit.go @@ -1,6 +1,6 @@ package service -import "code.freebrio.com/fb-go/lib/context" +import "code.mylomen.com/syj/lib/context" type limit struct { } diff --git a/service/third_login.go b/service/third_login.go index 3570ed0..c00bf92 100644 --- a/service/third_login.go +++ b/service/third_login.go @@ -6,7 +6,7 @@ import ( "ai-gateway/common/utils" "ai-gateway/infrastructure/redis" "ai-gateway/infrastructure/repository" - "code.freebrio.com/fb-go/lib/context" + "code.mylomen.com/syj/lib/context" "crypto/sha256" "encoding/hex" "encoding/json"