diff --git a/.golangci.yaml b/.golangci.yaml index 36f79f3..b6b98e7 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -104,7 +104,7 @@ issues: - contextcheck exclude-dirs: - - internal/logic + - gen_result/ exclude-files: - .*_test.go diff --git a/docker-compose.yml b/docker-compose.yml index 7dcf0c3..876fed7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,22 +1,22 @@ version: "3.9" services: - app: - image: igs170911/member:v1.0.4 - container_name: app-service - ports: - - "8080:8080" # 替換為您的應用服務的公開端口 - depends_on: - - mongo - - etcd - - redis - environment: - MONGO_URI: mongodb://mongo:27017/appdb - ETCD_ENDPOINT: http://etcd:2379 - REDIS_HOST: redis - REDIS_PORT: 6379 - networks: - - app-network +# app: +# image: igs170911/member:v1.0.4 +# container_name: app-service +# ports: +# - "8080:8080" # 替換為您的應用服務的公開端口 +# depends_on: +# - mongo +# - etcd +# - redis +# environment: +# MONGO_URI: mongodb://mongo:27017/appdb +# ETCD_ENDPOINT: http://etcd:2379 +# REDIS_HOST: redis +# REDIS_PORT: 6379 +# networks: +# - app-network mongo: image: mongo:8.0 @@ -27,10 +27,6 @@ services: environment: MONGO_INITDB_ROOT_USERNAME: root MONGO_INITDB_ROOT_PASSWORD: example - networks: - - app-network - volumes: - - mongo-data:/data/db etcd: image: quay.io/coreos/etcd:v3.5.5 @@ -45,27 +41,10 @@ services: ports: - "2379:2379" - "2380:2380" - networks: - - app-network - volumes: - - etcd-data:/etcd-data redis: image: redis:7.0 container_name: redis restart: always ports: - - "6379:6379" - networks: - - app-network - volumes: - - redis-data:/data - -networks: - app-network: - driver: bridge - -volumes: - mongo-data: - etcd-data: - redis-data: \ No newline at end of file + - "6379:6379" \ No newline at end of file diff --git a/go.mod b/go.mod index 2d03672..b42787d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module app-cloudep-member-server +module code.30cm.net/digimon/app-cloudep-member-server go 1.23.4 diff --git a/internal/config/config.go b/internal/config/config.go index 8d436f1..5085566 100755 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -1,10 +1,11 @@ package config import ( + "time" + "github.com/zeromicro/go-zero/core/stores/cache" "github.com/zeromicro/go-zero/core/stores/redis" "github.com/zeromicro/go-zero/zrpc" - "time" ) type Config struct { diff --git a/internal/logic/account/bind_account_logic.go b/internal/logic/account/bind_account_logic.go index eaa3184..86460ed 100644 --- a/internal/logic/account/bind_account_logic.go +++ b/internal/logic/account/bind_account_logic.go @@ -1,15 +1,16 @@ package accountlogic import ( - domain "app-cloudep-member-server/pkg/domain/member" - "app-cloudep-member-server/pkg/domain/usecase" - "code.30cm.net/digimon/library-go/errs" "context" "fmt" "math" - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/svc" + domain "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/member" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/usecase" + "code.30cm.net/digimon/library-go/errs" + + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/logic/account/bind_user_info_logic.go b/internal/logic/account/bind_user_info_logic.go index e1aed1c..a5ddf02 100644 --- a/internal/logic/account/bind_user_info_logic.go +++ b/internal/logic/account/bind_user_info_logic.go @@ -1,10 +1,11 @@ package accountlogic import ( - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/svc" "context" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" + "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/logic/account/bind_verify_email_logic.go b/internal/logic/account/bind_verify_email_logic.go index 3b264a8..ec0d721 100644 --- a/internal/logic/account/bind_verify_email_logic.go +++ b/internal/logic/account/bind_verify_email_logic.go @@ -3,8 +3,8 @@ package accountlogic import ( "context" - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/svc" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/logic/account/bind_verify_phone_logic.go b/internal/logic/account/bind_verify_phone_logic.go index 7ec68fb..458999b 100644 --- a/internal/logic/account/bind_verify_phone_logic.go +++ b/internal/logic/account/bind_verify_phone_logic.go @@ -3,8 +3,8 @@ package accountlogic import ( "context" - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/svc" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/logic/account/check_refresh_code_logic.go b/internal/logic/account/check_refresh_code_logic.go index e4f3ce5..90ea60c 100644 --- a/internal/logic/account/check_refresh_code_logic.go +++ b/internal/logic/account/check_refresh_code_logic.go @@ -3,8 +3,8 @@ package accountlogic import ( "context" - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/svc" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/logic/account/create_user_account_logic.go b/internal/logic/account/create_user_account_logic.go index 1665198..1361751 100644 --- a/internal/logic/account/create_user_account_logic.go +++ b/internal/logic/account/create_user_account_logic.go @@ -3,8 +3,8 @@ package accountlogic import ( "context" - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/svc" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/logic/account/generate_refresh_code_logic.go b/internal/logic/account/generate_refresh_code_logic.go index 593b86e..79fd31c 100644 --- a/internal/logic/account/generate_refresh_code_logic.go +++ b/internal/logic/account/generate_refresh_code_logic.go @@ -3,8 +3,8 @@ package accountlogic import ( "context" - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/svc" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/logic/account/get_u_i_d_by_account_logic.go b/internal/logic/account/get_u_i_d_by_account_logic.go index 07aacdf..c7a671f 100644 --- a/internal/logic/account/get_u_i_d_by_account_logic.go +++ b/internal/logic/account/get_u_i_d_by_account_logic.go @@ -3,8 +3,8 @@ package accountlogic import ( "context" - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/svc" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/logic/account/get_user_account_info_logic.go b/internal/logic/account/get_user_account_info_logic.go index 8fc5d17..65f8d8c 100644 --- a/internal/logic/account/get_user_account_info_logic.go +++ b/internal/logic/account/get_user_account_info_logic.go @@ -3,8 +3,8 @@ package accountlogic import ( "context" - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/svc" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/logic/account/get_user_info_logic.go b/internal/logic/account/get_user_info_logic.go index 3dfca9a..4a873cb 100644 --- a/internal/logic/account/get_user_info_logic.go +++ b/internal/logic/account/get_user_info_logic.go @@ -3,8 +3,8 @@ package accountlogic import ( "context" - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/svc" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/logic/account/line_code_to_access_token_logic.go b/internal/logic/account/line_code_to_access_token_logic.go index a36721c..4d7f5d5 100644 --- a/internal/logic/account/line_code_to_access_token_logic.go +++ b/internal/logic/account/line_code_to_access_token_logic.go @@ -3,8 +3,8 @@ package accountlogic import ( "context" - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/svc" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/logic/account/line_get_profile_by_access_token_logic.go b/internal/logic/account/line_get_profile_by_access_token_logic.go index 594b3fd..608ef48 100644 --- a/internal/logic/account/line_get_profile_by_access_token_logic.go +++ b/internal/logic/account/line_get_profile_by_access_token_logic.go @@ -3,8 +3,8 @@ package accountlogic import ( "context" - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/svc" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/logic/account/list_member_logic.go b/internal/logic/account/list_member_logic.go index fd11136..2d8a3b7 100644 --- a/internal/logic/account/list_member_logic.go +++ b/internal/logic/account/list_member_logic.go @@ -3,8 +3,8 @@ package accountlogic import ( "context" - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/svc" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/logic/account/update_status_logic.go b/internal/logic/account/update_status_logic.go index 3bc6ced..fee370f 100644 --- a/internal/logic/account/update_status_logic.go +++ b/internal/logic/account/update_status_logic.go @@ -3,8 +3,8 @@ package accountlogic import ( "context" - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/svc" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/logic/account/update_user_info_logic.go b/internal/logic/account/update_user_info_logic.go index c1a3806..5a8f08d 100644 --- a/internal/logic/account/update_user_info_logic.go +++ b/internal/logic/account/update_user_info_logic.go @@ -3,8 +3,8 @@ package accountlogic import ( "context" - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/svc" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/logic/account/update_user_token_logic.go b/internal/logic/account/update_user_token_logic.go index ad3b9be..1a30e75 100644 --- a/internal/logic/account/update_user_token_logic.go +++ b/internal/logic/account/update_user_token_logic.go @@ -3,8 +3,8 @@ package accountlogic import ( "context" - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/svc" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/logic/account/verify_google_auth_result_logic.go b/internal/logic/account/verify_google_auth_result_logic.go index 842fb04..78dc5f4 100644 --- a/internal/logic/account/verify_google_auth_result_logic.go +++ b/internal/logic/account/verify_google_auth_result_logic.go @@ -3,8 +3,8 @@ package accountlogic import ( "context" - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/svc" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/logic/account/verify_platform_auth_result_logic.go b/internal/logic/account/verify_platform_auth_result_logic.go index 2007051..9224ac6 100644 --- a/internal/logic/account/verify_platform_auth_result_logic.go +++ b/internal/logic/account/verify_platform_auth_result_logic.go @@ -3,8 +3,8 @@ package accountlogic import ( "context" - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/svc" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/logic/account/verify_refresh_code_logic.go b/internal/logic/account/verify_refresh_code_logic.go index 0cfdfa3..7490ce6 100644 --- a/internal/logic/account/verify_refresh_code_logic.go +++ b/internal/logic/account/verify_refresh_code_logic.go @@ -3,8 +3,8 @@ package accountlogic import ( "context" - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/svc" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/server/account/account_server.go b/internal/server/account/account_server.go index f08bc35..377cd82 100644 --- a/internal/server/account/account_server.go +++ b/internal/server/account/account_server.go @@ -7,9 +7,9 @@ package server import ( "context" - "app-cloudep-member-server/gen_result/pb/member" - accountlogic "app-cloudep-member-server/internal/logic/account" - "app-cloudep-member-server/internal/svc" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + accountlogic "code.30cm.net/digimon/app-cloudep-member-server/internal/logic/account" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" ) type AccountServer struct { diff --git a/internal/svc/service_context.go b/internal/svc/service_context.go index 427669b..4f7c47b 100644 --- a/internal/svc/service_context.go +++ b/internal/svc/service_context.go @@ -1,11 +1,11 @@ package svc import ( - "app-cloudep-member-server/internal/config" - cfg "app-cloudep-member-server/pkg/domain/config" - "app-cloudep-member-server/pkg/domain/usecase" - "app-cloudep-member-server/pkg/repository" - uc "app-cloudep-member-server/pkg/usecase" + "code.30cm.net/digimon/app-cloudep-member-server/internal/config" + cfg "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/config" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/usecase" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/repository" + uc "code.30cm.net/digimon/app-cloudep-member-server/pkg/usecase" "code.30cm.net/digimon/library-go/errs" "code.30cm.net/digimon/library-go/errs/code" mgo "code.30cm.net/digimon/library-go/mongo" @@ -67,24 +67,24 @@ func NewAccountUC(c *config.Config) usecase.AccountUseCase { Conf: conf, CacheConf: c.Cache, CacheOpts: cacheOpts, - DbOpts: dbOpts, + DBOpts: dbOpts, }), User: repository.NewUserRepository(repository.UserRepositoryParam{ Conf: conf, CacheConf: c.Cache, CacheOpts: cacheOpts, - DbOpts: dbOpts, + DBOpts: dbOpts, }), AccountUID: repository.NewAccountUIDRepository(repository.AccountUIDRepositoryParam{ Conf: conf, CacheConf: c.Cache, CacheOpts: cacheOpts, - DbOpts: dbOpts, + DBOpts: dbOpts, }), VerifyCodeModel: repository.NewVerifyCodeRepository(newRedis), GenerateUID: repository.NewAutoIDRepository(repository.AutoIDRepositoryParam{ Conf: conf, - DbOpts: dbOpts, + DBOpts: dbOpts, }), Config: prepareCfg(c), }) diff --git a/member.go b/member.go index ccf5344..c0797e3 100644 --- a/member.go +++ b/member.go @@ -5,10 +5,10 @@ import ( "github.com/zeromicro/go-zero/core/logx" - "app-cloudep-member-server/gen_result/pb/member" - "app-cloudep-member-server/internal/config" - accountServer "app-cloudep-member-server/internal/server/account" - "app-cloudep-member-server/internal/svc" + "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member" + "code.30cm.net/digimon/app-cloudep-member-server/internal/config" + accountServer "code.30cm.net/digimon/app-cloudep-member-server/internal/server/account" + "code.30cm.net/digimon/app-cloudep-member-server/internal/svc" "github.com/zeromicro/go-zero/core/conf" "github.com/zeromicro/go-zero/core/service" diff --git a/pkg/domain/entity/account.go b/pkg/domain/entity/account.go index d3b2fb1..ed23057 100644 --- a/pkg/domain/entity/account.go +++ b/pkg/domain/entity/account.go @@ -1,7 +1,7 @@ package entity import ( - "app-cloudep-member-server/pkg/domain/member" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/member" "go.mongodb.org/mongo-driver/bson/primitive" ) diff --git a/pkg/domain/entity/account_uid_table.go b/pkg/domain/entity/account_uid_table.go index 2183d99..7c180b6 100644 --- a/pkg/domain/entity/account_uid_table.go +++ b/pkg/domain/entity/account_uid_table.go @@ -1,7 +1,7 @@ package entity import ( - "app-cloudep-member-server/pkg/domain/member" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/member" "go.mongodb.org/mongo-driver/bson/primitive" ) diff --git a/pkg/domain/entity/user.go b/pkg/domain/entity/user.go index 2e987a1..bc4a37e 100644 --- a/pkg/domain/entity/user.go +++ b/pkg/domain/entity/user.go @@ -1,7 +1,7 @@ package entity import ( - "app-cloudep-member-server/pkg/domain/member" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/member" "go.mongodb.org/mongo-driver/bson/primitive" ) diff --git a/pkg/domain/repository/account.go b/pkg/domain/repository/account.go index af04a17..5cce164 100644 --- a/pkg/domain/repository/account.go +++ b/pkg/domain/repository/account.go @@ -1,9 +1,10 @@ package repository import ( - "app-cloudep-member-server/pkg/domain/entity" "context" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + "go.mongodb.org/mongo-driver/mongo" ) diff --git a/pkg/domain/repository/account_uid.go b/pkg/domain/repository/account_uid.go index a75de31..82a0e82 100644 --- a/pkg/domain/repository/account_uid.go +++ b/pkg/domain/repository/account_uid.go @@ -1,9 +1,10 @@ package repository import ( - "app-cloudep-member-server/pkg/domain/entity" "context" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + "go.mongodb.org/mongo-driver/mongo" ) diff --git a/pkg/domain/repository/auto_id.go b/pkg/domain/repository/auto_id.go index 407903a..5e0d078 100644 --- a/pkg/domain/repository/auto_id.go +++ b/pkg/domain/repository/auto_id.go @@ -1,9 +1,10 @@ package repository import ( - "app-cloudep-member-server/pkg/domain/entity" "context" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + "go.mongodb.org/mongo-driver/mongo" ) diff --git a/pkg/domain/repository/user.go b/pkg/domain/repository/user.go index 7c31386..0143a46 100644 --- a/pkg/domain/repository/user.go +++ b/pkg/domain/repository/user.go @@ -1,10 +1,11 @@ package repository import ( - "app-cloudep-member-server/pkg/domain/entity" - "app-cloudep-member-server/pkg/domain/member" "context" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/member" + "go.mongodb.org/mongo-driver/mongo" ) diff --git a/pkg/domain/usecase/account.go b/pkg/domain/usecase/account.go index dc939ea..94212ef 100644 --- a/pkg/domain/usecase/account.go +++ b/pkg/domain/usecase/account.go @@ -1,8 +1,9 @@ package usecase import ( - "app-cloudep-member-server/pkg/domain/member" "context" + + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/member" ) // AccountUseCase 定義了帳號服務的操作方法 diff --git a/pkg/mock/repository/account.go b/pkg/mock/repository/account.go index 38ac98e..00e6f56 100644 --- a/pkg/mock/repository/account.go +++ b/pkg/mock/repository/account.go @@ -10,10 +10,10 @@ package mock import ( - entity "app-cloudep-member-server/pkg/domain/entity" context "context" reflect "reflect" + entity "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" mongo "go.mongodb.org/mongo-driver/mongo" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/mock/repository/account_uid.go b/pkg/mock/repository/account_uid.go index 5c5b434..2ea58af 100644 --- a/pkg/mock/repository/account_uid.go +++ b/pkg/mock/repository/account_uid.go @@ -10,10 +10,10 @@ package mock import ( - entity "app-cloudep-member-server/pkg/domain/entity" context "context" reflect "reflect" + entity "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" mongo "go.mongodb.org/mongo-driver/mongo" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/mock/repository/auto_id.go b/pkg/mock/repository/auto_id.go index b722cfa..956813a 100644 --- a/pkg/mock/repository/auto_id.go +++ b/pkg/mock/repository/auto_id.go @@ -10,10 +10,10 @@ package mock import ( - entity "app-cloudep-member-server/pkg/domain/entity" context "context" reflect "reflect" + entity "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" mongo "go.mongodb.org/mongo-driver/mongo" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/mock/repository/user.go b/pkg/mock/repository/user.go index 95f9b21..0058afe 100644 --- a/pkg/mock/repository/user.go +++ b/pkg/mock/repository/user.go @@ -10,11 +10,11 @@ package mock import ( - entity "app-cloudep-member-server/pkg/domain/entity" - repository "app-cloudep-member-server/pkg/domain/repository" context "context" reflect "reflect" + entity "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + repository "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/repository" mongo "go.mongodb.org/mongo-driver/mongo" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/repository/account.go b/pkg/repository/account.go index 2eb9238..75bec4d 100644 --- a/pkg/repository/account.go +++ b/pkg/repository/account.go @@ -1,13 +1,14 @@ package repository import ( - "app-cloudep-member-server/pkg/domain" - "app-cloudep-member-server/pkg/domain/entity" - "app-cloudep-member-server/pkg/domain/repository" "context" "errors" "time" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/repository" + mgo "code.30cm.net/digimon/library-go/mongo" "github.com/zeromicro/go-zero/core/stores/cache" "github.com/zeromicro/go-zero/core/stores/mon" @@ -19,7 +20,7 @@ import ( type AccountRepositoryParam struct { Conf *mgo.Conf CacheConf cache.CacheConf - DbOpts []mon.Option + DBOpts []mon.Option CacheOpts []cache.Option } @@ -33,7 +34,7 @@ func NewAccountRepository(param AccountRepositoryParam) repository.AccountReposi param.Conf, e.CollectionName(), param.CacheConf, - param.DbOpts, + param.DBOpts, param.CacheOpts, ) if err != nil { diff --git a/pkg/repository/account_test.go b/pkg/repository/account_test.go index e27de71..4930555 100644 --- a/pkg/repository/account_test.go +++ b/pkg/repository/account_test.go @@ -1,10 +1,11 @@ package repository import ( - "app-cloudep-member-server/pkg/domain/entity" - "app-cloudep-member-server/pkg/domain/repository" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/repository" "context" "errors" + "fmt" "testing" "time" @@ -26,8 +27,7 @@ func SetupTestAccountRepository(db string) (repository.AccountRepository, func() conf := &mgo.Conf{ Schema: Schema, - Host: h, - Port: p, + Host: fmt.Sprintf("%s:%s", h, p), Database: db, MaxStaleness: 300, MaxPoolSize: 100, diff --git a/pkg/repository/account_uid.go b/pkg/repository/account_uid.go index 795b216..b962df9 100644 --- a/pkg/repository/account_uid.go +++ b/pkg/repository/account_uid.go @@ -1,13 +1,14 @@ package repository import ( - "app-cloudep-member-server/pkg/domain" - "app-cloudep-member-server/pkg/domain/entity" - "app-cloudep-member-server/pkg/domain/repository" "context" "errors" "time" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/repository" + mgo "code.30cm.net/digimon/library-go/mongo" "github.com/zeromicro/go-zero/core/stores/cache" "github.com/zeromicro/go-zero/core/stores/mon" @@ -19,7 +20,7 @@ import ( type AccountUIDRepositoryParam struct { Conf *mgo.Conf CacheConf cache.CacheConf - DbOpts []mon.Option + DBOpts []mon.Option CacheOpts []cache.Option } @@ -33,7 +34,7 @@ func NewAccountUIDRepository(param AccountUIDRepositoryParam) repository.Account param.Conf, e.CollectionName(), param.CacheConf, - param.DbOpts, + param.DBOpts, param.CacheOpts, ) if err != nil { diff --git a/pkg/repository/account_uid_test.go b/pkg/repository/account_uid_test.go index 29476b2..7640107 100644 --- a/pkg/repository/account_uid_test.go +++ b/pkg/repository/account_uid_test.go @@ -1,9 +1,10 @@ package repository import ( - "app-cloudep-member-server/pkg/domain/entity" - "app-cloudep-member-server/pkg/domain/repository" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/repository" "context" + "fmt" "testing" "time" @@ -24,8 +25,7 @@ func SetupTestAccountUIDRepository(db string) (repository.AccountUIDRepository, conf := &mgo.Conf{ Schema: Schema, - Host: h, - Port: p, + Host: fmt.Sprintf("%s:%s", h, p), Database: db, MaxStaleness: 300, MaxPoolSize: 100, diff --git a/pkg/repository/auto_id.go b/pkg/repository/auto_id.go index 9d48a70..4df3e88 100644 --- a/pkg/repository/auto_id.go +++ b/pkg/repository/auto_id.go @@ -1,12 +1,13 @@ package repository import ( - "app-cloudep-member-server/pkg/domain/entity" - "app-cloudep-member-server/pkg/domain/repository" "context" "errors" "time" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/repository" + GIDLib "code.30cm.net/digimon/library-go/utils/invited_code" mgo "code.30cm.net/digimon/library-go/mongo" @@ -19,7 +20,7 @@ import ( type AutoIDRepositoryParam struct { Conf *mgo.Conf - DbOpts []mon.Option + DBOpts []mon.Option } type AutoIDRepository struct { @@ -29,7 +30,7 @@ type AutoIDRepository struct { func NewAutoIDRepository(param AutoIDRepositoryParam) repository.AutoIDRepository { e := entity.AutoID{} - documentDB, err := mgo.NewDocumentDB(param.Conf, e.CollectionName(), param.DbOpts...) + documentDB, err := mgo.NewDocumentDB(param.Conf, e.CollectionName(), param.DBOpts...) if err != nil { panic(err) } diff --git a/pkg/repository/auto_id_test.go b/pkg/repository/auto_id_test.go index c3b1f34..7056a46 100644 --- a/pkg/repository/auto_id_test.go +++ b/pkg/repository/auto_id_test.go @@ -1,9 +1,10 @@ package repository import ( - "app-cloudep-member-server/pkg/domain/entity" - "app-cloudep-member-server/pkg/domain/repository" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/repository" "context" + "fmt" "testing" "time" @@ -19,8 +20,7 @@ func SetupTestAutoIDRepository(db string) (repository.AutoIDRepository, func(), conf := &mgo.Conf{ Schema: Schema, - Host: h, - Port: p, + Host: fmt.Sprintf("%s:%s", h, p), Database: db, MaxStaleness: 300, MaxPoolSize: 100, diff --git a/pkg/repository/user.go b/pkg/repository/user.go index 8b393df..17b0bbf 100644 --- a/pkg/repository/user.go +++ b/pkg/repository/user.go @@ -1,13 +1,14 @@ package repository import ( - "app-cloudep-member-server/pkg/domain" - "app-cloudep-member-server/pkg/domain/entity" - "app-cloudep-member-server/pkg/domain/repository" "context" "errors" "fmt" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/repository" + mgo "code.30cm.net/digimon/library-go/mongo" "time" @@ -23,7 +24,7 @@ import ( type UserRepositoryParam struct { Conf *mgo.Conf CacheConf cache.CacheConf - DbOpts []mon.Option + DBOpts []mon.Option CacheOpts []cache.Option } @@ -37,7 +38,7 @@ func NewUserRepository(param UserRepositoryParam) repository.UserRepository { param.Conf, e.CollectionName(), param.CacheConf, - param.DbOpts, + param.DBOpts, param.CacheOpts, ) if err != nil { diff --git a/pkg/repository/user_test.go b/pkg/repository/user_test.go index b179b29..6352b11 100644 --- a/pkg/repository/user_test.go +++ b/pkg/repository/user_test.go @@ -1,11 +1,12 @@ package repository import ( - "app-cloudep-member-server/pkg/domain/entity" - "app-cloudep-member-server/pkg/domain/member" - "app-cloudep-member-server/pkg/domain/repository" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/member" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/repository" "context" "errors" + "fmt" "testing" "time" @@ -27,8 +28,7 @@ func SetupTestUserRepository(db string) (repository.UserRepository, func(), erro conf := &mgo.Conf{ Schema: Schema, - Host: h, - Port: p, + Host: fmt.Sprintf("%s:%s", h, p), Database: db, MaxStaleness: 300, MaxPoolSize: 100, diff --git a/pkg/repository/verify_code.go b/pkg/repository/verify_code.go index d100430..7ca996d 100644 --- a/pkg/repository/verify_code.go +++ b/pkg/repository/verify_code.go @@ -1,10 +1,11 @@ package repository import ( - "app-cloudep-member-server/pkg/domain" - "app-cloudep-member-server/pkg/domain/repository" "context" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/repository" + "github.com/zeromicro/go-zero/core/stores/redis" ) diff --git a/pkg/repository/verify_code_test.go b/pkg/repository/verify_code_test.go index 6841cb8..df0e946 100644 --- a/pkg/repository/verify_code_test.go +++ b/pkg/repository/verify_code_test.go @@ -1,7 +1,7 @@ package repository import ( - "app-cloudep-member-server/pkg/domain" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain" "context" "fmt" "testing" diff --git a/pkg/usecase/account.go b/pkg/usecase/account.go index b8e5a65..04f7e83 100644 --- a/pkg/usecase/account.go +++ b/pkg/usecase/account.go @@ -1,9 +1,9 @@ package usecase import ( - "app-cloudep-member-server/pkg/domain/config" - "app-cloudep-member-server/pkg/domain/repository" - "app-cloudep-member-server/pkg/domain/usecase" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/config" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/repository" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/usecase" ) type MemberUseCaseParam struct { diff --git a/pkg/usecase/binding.go b/pkg/usecase/binding.go index 521f571..8c4193f 100644 --- a/pkg/usecase/binding.go +++ b/pkg/usecase/binding.go @@ -1,13 +1,14 @@ package usecase import ( - "app-cloudep-member-server/pkg/domain" - "app-cloudep-member-server/pkg/domain/entity" - "app-cloudep-member-server/pkg/domain/usecase" "context" "errors" "fmt" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/usecase" + "code.30cm.net/digimon/library-go/errs" "code.30cm.net/digimon/library-go/errs/code" "github.com/zeromicro/go-zero/core/logx" diff --git a/pkg/usecase/binding_test.go b/pkg/usecase/binding_test.go index 027aac0..b127d49 100644 --- a/pkg/usecase/binding_test.go +++ b/pkg/usecase/binding_test.go @@ -1,9 +1,9 @@ package usecase import ( - "app-cloudep-member-server/pkg/domain/entity" - "app-cloudep-member-server/pkg/domain/member" - "app-cloudep-member-server/pkg/domain/usecase" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/member" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/usecase" "context" "errors" "testing" @@ -12,7 +12,7 @@ import ( "go.uber.org/mock/gomock" "google.golang.org/protobuf/proto" - mockRepo "app-cloudep-member-server/pkg/mock/repository" + mockRepo "code.30cm.net/digimon/app-cloudep-member-server/pkg/mock/repository" ) func TestMemberUseCase_BindUserInfo(t *testing.T) { diff --git a/pkg/usecase/generate.go b/pkg/usecase/generate.go index 4820896..da7bca4 100644 --- a/pkg/usecase/generate.go +++ b/pkg/usecase/generate.go @@ -1,11 +1,12 @@ package usecase import ( - "app-cloudep-member-server/pkg/domain" - "app-cloudep-member-server/pkg/domain/entity" "context" "math" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + "code.30cm.net/digimon/library-go/errs" "code.30cm.net/digimon/library-go/errs/code" GIDLib "code.30cm.net/digimon/library-go/utils/invited_code" diff --git a/pkg/usecase/generate_test.go b/pkg/usecase/generate_test.go index b1e2cab..3ff02bc 100644 --- a/pkg/usecase/generate_test.go +++ b/pkg/usecase/generate_test.go @@ -1,8 +1,8 @@ package usecase import ( - "app-cloudep-member-server/pkg/domain/entity" - mockRepo "app-cloudep-member-server/pkg/mock/repository" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + mockRepo "code.30cm.net/digimon/app-cloudep-member-server/pkg/mock/repository" "context" "errors" "math" diff --git a/pkg/usecase/member.go b/pkg/usecase/member.go index 118c790..8b71588 100644 --- a/pkg/usecase/member.go +++ b/pkg/usecase/member.go @@ -1,15 +1,16 @@ package usecase import ( - "app-cloudep-member-server/pkg/domain" - "app-cloudep-member-server/pkg/domain/entity" - "app-cloudep-member-server/pkg/domain/member" - "app-cloudep-member-server/pkg/domain/repository" - "app-cloudep-member-server/pkg/domain/usecase" "context" "errors" "fmt" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/member" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/repository" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/usecase" + "code.30cm.net/digimon/library-go/errs" "code.30cm.net/digimon/library-go/errs/code" "github.com/zeromicro/go-zero/core/logx" diff --git a/pkg/usecase/member_test.go b/pkg/usecase/member_test.go index b7034ff..770e749 100644 --- a/pkg/usecase/member_test.go +++ b/pkg/usecase/member_test.go @@ -1,13 +1,13 @@ package usecase import ( - "app-cloudep-member-server/pkg/domain" - "app-cloudep-member-server/pkg/domain/config" - "app-cloudep-member-server/pkg/domain/entity" - "app-cloudep-member-server/pkg/domain/member" - "app-cloudep-member-server/pkg/domain/usecase" - mockRepo "app-cloudep-member-server/pkg/mock/repository" - "app-cloudep-member-server/pkg/repository" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/config" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/member" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/usecase" + mockRepo "code.30cm.net/digimon/app-cloudep-member-server/pkg/mock/repository" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/repository" "context" "errors" "testing" diff --git a/pkg/usecase/verify.go b/pkg/usecase/verify.go index 2a08e64..539bba1 100644 --- a/pkg/usecase/verify.go +++ b/pkg/usecase/verify.go @@ -1,12 +1,13 @@ package usecase import ( - "app-cloudep-member-server/pkg/domain" - "app-cloudep-member-server/pkg/domain/member" - "app-cloudep-member-server/pkg/domain/usecase" "context" "fmt" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/member" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/usecase" + "code.30cm.net/digimon/library-go/errs" "code.30cm.net/digimon/library-go/errs/code" ) diff --git a/pkg/usecase/verify_google.go b/pkg/usecase/verify_google.go index 0ef08ec..5cd7314 100644 --- a/pkg/usecase/verify_google.go +++ b/pkg/usecase/verify_google.go @@ -1,8 +1,6 @@ package usecase import ( - "app-cloudep-member-server/pkg/domain" - "app-cloudep-member-server/pkg/domain/usecase" "context" "encoding/json" "errors" @@ -12,6 +10,9 @@ import ( "strconv" "time" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/usecase" + "code.30cm.net/digimon/library-go/errs" "code.30cm.net/digimon/library-go/errs/code" ) diff --git a/pkg/usecase/verify_google_test.go b/pkg/usecase/verify_google_test.go index 54edbf6..61950e6 100644 --- a/pkg/usecase/verify_google_test.go +++ b/pkg/usecase/verify_google_test.go @@ -1,14 +1,15 @@ package usecase import ( - "app-cloudep-member-server/pkg/domain" - "app-cloudep-member-server/pkg/domain/usecase" - "code.30cm.net/digimon/library-go/errs" - "code.30cm.net/digimon/library-go/errs/code" - "github.com/stretchr/testify/assert" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/usecase" "strconv" "testing" "time" + + "code.30cm.net/digimon/library-go/errs" + "code.30cm.net/digimon/library-go/errs/code" + "github.com/stretchr/testify/assert" ) func TestValidateGoogleTokenInfo(t *testing.T) { diff --git a/pkg/usecase/verify_line.go b/pkg/usecase/verify_line.go index 67f88b9..f3ec971 100644 --- a/pkg/usecase/verify_line.go +++ b/pkg/usecase/verify_line.go @@ -1,8 +1,6 @@ package usecase import ( - "app-cloudep-member-server/pkg/domain" - "app-cloudep-member-server/pkg/domain/usecase" "bytes" "context" "encoding/json" @@ -10,6 +8,9 @@ import ( "net/http" "net/url" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/usecase" + "code.30cm.net/digimon/library-go/errs" "code.30cm.net/digimon/library-go/errs/code" ) diff --git a/pkg/usecase/verify_test.go b/pkg/usecase/verify_test.go index cb9a4c8..479ee8b 100644 --- a/pkg/usecase/verify_test.go +++ b/pkg/usecase/verify_test.go @@ -1,10 +1,10 @@ package usecase import ( - "app-cloudep-member-server/pkg/domain/entity" - "app-cloudep-member-server/pkg/domain/member" - "app-cloudep-member-server/pkg/domain/usecase" - mockRepo "app-cloudep-member-server/pkg/mock/repository" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/member" + "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/usecase" + mockRepo "code.30cm.net/digimon/app-cloudep-member-server/pkg/mock/repository" "context" "errors" "fmt"