feat: fix package name

This commit is contained in:
王性驊 2025-02-04 16:58:01 +08:00
parent 80f6caf86d
commit 0917885c1e
60 changed files with 192 additions and 193 deletions

View File

@ -104,7 +104,7 @@ issues:
- contextcheck - contextcheck
exclude-dirs: exclude-dirs:
- internal/logic - gen_result/
exclude-files: exclude-files:
- .*_test.go - .*_test.go

View File

@ -1,22 +1,22 @@
version: "3.9" version: "3.9"
services: services:
app: # app:
image: igs170911/member:v1.0.4 # image: igs170911/member:v1.0.4
container_name: app-service # container_name: app-service
ports: # ports:
- "8080:8080" # 替換為您的應用服務的公開端口 # - "8080:8080" # 替換為您的應用服務的公開端口
depends_on: # depends_on:
- mongo # - mongo
- etcd # - etcd
- redis # - redis
environment: # environment:
MONGO_URI: mongodb://mongo:27017/appdb # MONGO_URI: mongodb://mongo:27017/appdb
ETCD_ENDPOINT: http://etcd:2379 # ETCD_ENDPOINT: http://etcd:2379
REDIS_HOST: redis # REDIS_HOST: redis
REDIS_PORT: 6379 # REDIS_PORT: 6379
networks: # networks:
- app-network # - app-network
mongo: mongo:
image: mongo:8.0 image: mongo:8.0
@ -27,10 +27,6 @@ services:
environment: environment:
MONGO_INITDB_ROOT_USERNAME: root MONGO_INITDB_ROOT_USERNAME: root
MONGO_INITDB_ROOT_PASSWORD: example MONGO_INITDB_ROOT_PASSWORD: example
networks:
- app-network
volumes:
- mongo-data:/data/db
etcd: etcd:
image: quay.io/coreos/etcd:v3.5.5 image: quay.io/coreos/etcd:v3.5.5
@ -45,10 +41,6 @@ services:
ports: ports:
- "2379:2379" - "2379:2379"
- "2380:2380" - "2380:2380"
networks:
- app-network
volumes:
- etcd-data:/etcd-data
redis: redis:
image: redis:7.0 image: redis:7.0
@ -56,16 +48,3 @@ services:
restart: always restart: always
ports: ports:
- "6379:6379" - "6379:6379"
networks:
- app-network
volumes:
- redis-data:/data
networks:
app-network:
driver: bridge
volumes:
mongo-data:
etcd-data:
redis-data:

2
go.mod
View File

@ -1,4 +1,4 @@
module app-cloudep-member-server module code.30cm.net/digimon/app-cloudep-member-server
go 1.23.4 go 1.23.4

View File

@ -1,10 +1,11 @@
package config package config
import ( import (
"time"
"github.com/zeromicro/go-zero/core/stores/cache" "github.com/zeromicro/go-zero/core/stores/cache"
"github.com/zeromicro/go-zero/core/stores/redis" "github.com/zeromicro/go-zero/core/stores/redis"
"github.com/zeromicro/go-zero/zrpc" "github.com/zeromicro/go-zero/zrpc"
"time"
) )
type Config struct { type Config struct {

View File

@ -1,15 +1,16 @@
package accountlogic package accountlogic
import ( import (
domain "app-cloudep-member-server/pkg/domain/member"
"app-cloudep-member-server/pkg/domain/usecase"
"code.30cm.net/digimon/library-go/errs"
"context" "context"
"fmt" "fmt"
"math" "math"
"app-cloudep-member-server/gen_result/pb/member" domain "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/member"
"app-cloudep-member-server/internal/svc" "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" "github.com/zeromicro/go-zero/core/logx"
) )

View File

@ -1,10 +1,11 @@
package accountlogic package accountlogic
import ( import (
"app-cloudep-member-server/gen_result/pb/member"
"app-cloudep-member-server/internal/svc"
"context" "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" "github.com/zeromicro/go-zero/core/logx"
) )

View File

@ -3,8 +3,8 @@ package accountlogic
import ( import (
"context" "context"
"app-cloudep-member-server/gen_result/pb/member" "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
"app-cloudep-member-server/internal/svc" "code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
) )

View File

@ -3,8 +3,8 @@ package accountlogic
import ( import (
"context" "context"
"app-cloudep-member-server/gen_result/pb/member" "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
"app-cloudep-member-server/internal/svc" "code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
) )

View File

@ -3,8 +3,8 @@ package accountlogic
import ( import (
"context" "context"
"app-cloudep-member-server/gen_result/pb/member" "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
"app-cloudep-member-server/internal/svc" "code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
) )

View File

@ -3,8 +3,8 @@ package accountlogic
import ( import (
"context" "context"
"app-cloudep-member-server/gen_result/pb/member" "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
"app-cloudep-member-server/internal/svc" "code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
) )

View File

@ -3,8 +3,8 @@ package accountlogic
import ( import (
"context" "context"
"app-cloudep-member-server/gen_result/pb/member" "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
"app-cloudep-member-server/internal/svc" "code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
) )

View File

@ -3,8 +3,8 @@ package accountlogic
import ( import (
"context" "context"
"app-cloudep-member-server/gen_result/pb/member" "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
"app-cloudep-member-server/internal/svc" "code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
) )

View File

@ -3,8 +3,8 @@ package accountlogic
import ( import (
"context" "context"
"app-cloudep-member-server/gen_result/pb/member" "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
"app-cloudep-member-server/internal/svc" "code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
) )

View File

@ -3,8 +3,8 @@ package accountlogic
import ( import (
"context" "context"
"app-cloudep-member-server/gen_result/pb/member" "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
"app-cloudep-member-server/internal/svc" "code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
) )

View File

@ -3,8 +3,8 @@ package accountlogic
import ( import (
"context" "context"
"app-cloudep-member-server/gen_result/pb/member" "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
"app-cloudep-member-server/internal/svc" "code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
) )

View File

@ -3,8 +3,8 @@ package accountlogic
import ( import (
"context" "context"
"app-cloudep-member-server/gen_result/pb/member" "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
"app-cloudep-member-server/internal/svc" "code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
) )

View File

@ -3,8 +3,8 @@ package accountlogic
import ( import (
"context" "context"
"app-cloudep-member-server/gen_result/pb/member" "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
"app-cloudep-member-server/internal/svc" "code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
) )

View File

@ -3,8 +3,8 @@ package accountlogic
import ( import (
"context" "context"
"app-cloudep-member-server/gen_result/pb/member" "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
"app-cloudep-member-server/internal/svc" "code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
) )

View File

@ -3,8 +3,8 @@ package accountlogic
import ( import (
"context" "context"
"app-cloudep-member-server/gen_result/pb/member" "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
"app-cloudep-member-server/internal/svc" "code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
) )

View File

@ -3,8 +3,8 @@ package accountlogic
import ( import (
"context" "context"
"app-cloudep-member-server/gen_result/pb/member" "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
"app-cloudep-member-server/internal/svc" "code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
) )

View File

@ -3,8 +3,8 @@ package accountlogic
import ( import (
"context" "context"
"app-cloudep-member-server/gen_result/pb/member" "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
"app-cloudep-member-server/internal/svc" "code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
) )

View File

@ -3,8 +3,8 @@ package accountlogic
import ( import (
"context" "context"
"app-cloudep-member-server/gen_result/pb/member" "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
"app-cloudep-member-server/internal/svc" "code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
) )

View File

@ -3,8 +3,8 @@ package accountlogic
import ( import (
"context" "context"
"app-cloudep-member-server/gen_result/pb/member" "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
"app-cloudep-member-server/internal/svc" "code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
) )

View File

@ -7,9 +7,9 @@ package server
import ( import (
"context" "context"
"app-cloudep-member-server/gen_result/pb/member" "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
accountlogic "app-cloudep-member-server/internal/logic/account" accountlogic "code.30cm.net/digimon/app-cloudep-member-server/internal/logic/account"
"app-cloudep-member-server/internal/svc" "code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
) )
type AccountServer struct { type AccountServer struct {

View File

@ -1,11 +1,11 @@
package svc package svc
import ( import (
"app-cloudep-member-server/internal/config" "code.30cm.net/digimon/app-cloudep-member-server/internal/config"
cfg "app-cloudep-member-server/pkg/domain/config" cfg "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/config"
"app-cloudep-member-server/pkg/domain/usecase" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/usecase"
"app-cloudep-member-server/pkg/repository" "code.30cm.net/digimon/app-cloudep-member-server/pkg/repository"
uc "app-cloudep-member-server/pkg/usecase" 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.30cm.net/digimon/library-go/errs/code" "code.30cm.net/digimon/library-go/errs/code"
mgo "code.30cm.net/digimon/library-go/mongo" mgo "code.30cm.net/digimon/library-go/mongo"
@ -67,24 +67,24 @@ func NewAccountUC(c *config.Config) usecase.AccountUseCase {
Conf: conf, Conf: conf,
CacheConf: c.Cache, CacheConf: c.Cache,
CacheOpts: cacheOpts, CacheOpts: cacheOpts,
DbOpts: dbOpts, DBOpts: dbOpts,
}), }),
User: repository.NewUserRepository(repository.UserRepositoryParam{ User: repository.NewUserRepository(repository.UserRepositoryParam{
Conf: conf, Conf: conf,
CacheConf: c.Cache, CacheConf: c.Cache,
CacheOpts: cacheOpts, CacheOpts: cacheOpts,
DbOpts: dbOpts, DBOpts: dbOpts,
}), }),
AccountUID: repository.NewAccountUIDRepository(repository.AccountUIDRepositoryParam{ AccountUID: repository.NewAccountUIDRepository(repository.AccountUIDRepositoryParam{
Conf: conf, Conf: conf,
CacheConf: c.Cache, CacheConf: c.Cache,
CacheOpts: cacheOpts, CacheOpts: cacheOpts,
DbOpts: dbOpts, DBOpts: dbOpts,
}), }),
VerifyCodeModel: repository.NewVerifyCodeRepository(newRedis), VerifyCodeModel: repository.NewVerifyCodeRepository(newRedis),
GenerateUID: repository.NewAutoIDRepository(repository.AutoIDRepositoryParam{ GenerateUID: repository.NewAutoIDRepository(repository.AutoIDRepositoryParam{
Conf: conf, Conf: conf,
DbOpts: dbOpts, DBOpts: dbOpts,
}), }),
Config: prepareCfg(c), Config: prepareCfg(c),
}) })

View File

@ -5,10 +5,10 @@ import (
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
"app-cloudep-member-server/gen_result/pb/member" "code.30cm.net/digimon/app-cloudep-member-server/gen_result/pb/member"
"app-cloudep-member-server/internal/config" "code.30cm.net/digimon/app-cloudep-member-server/internal/config"
accountServer "app-cloudep-member-server/internal/server/account" accountServer "code.30cm.net/digimon/app-cloudep-member-server/internal/server/account"
"app-cloudep-member-server/internal/svc" "code.30cm.net/digimon/app-cloudep-member-server/internal/svc"
"github.com/zeromicro/go-zero/core/conf" "github.com/zeromicro/go-zero/core/conf"
"github.com/zeromicro/go-zero/core/service" "github.com/zeromicro/go-zero/core/service"

View File

@ -1,7 +1,7 @@
package entity package entity
import ( 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" "go.mongodb.org/mongo-driver/bson/primitive"
) )

View File

@ -1,7 +1,7 @@
package entity package entity
import ( 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" "go.mongodb.org/mongo-driver/bson/primitive"
) )

View File

@ -1,7 +1,7 @@
package entity package entity
import ( 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" "go.mongodb.org/mongo-driver/bson/primitive"
) )

View File

@ -1,9 +1,10 @@
package repository package repository
import ( import (
"app-cloudep-member-server/pkg/domain/entity"
"context" "context"
"code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity"
"go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo"
) )

View File

@ -1,9 +1,10 @@
package repository package repository
import ( import (
"app-cloudep-member-server/pkg/domain/entity"
"context" "context"
"code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity"
"go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo"
) )

View File

@ -1,9 +1,10 @@
package repository package repository
import ( import (
"app-cloudep-member-server/pkg/domain/entity"
"context" "context"
"code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity"
"go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo"
) )

View File

@ -1,10 +1,11 @@
package repository package repository
import ( import (
"app-cloudep-member-server/pkg/domain/entity"
"app-cloudep-member-server/pkg/domain/member"
"context" "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" "go.mongodb.org/mongo-driver/mongo"
) )

View File

@ -1,8 +1,9 @@
package usecase package usecase
import ( import (
"app-cloudep-member-server/pkg/domain/member"
"context" "context"
"code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/member"
) )
// AccountUseCase 定義了帳號服務的操作方法 // AccountUseCase 定義了帳號服務的操作方法

View File

@ -10,10 +10,10 @@
package mock package mock
import ( import (
entity "app-cloudep-member-server/pkg/domain/entity"
context "context" context "context"
reflect "reflect" reflect "reflect"
entity "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity"
mongo "go.mongodb.org/mongo-driver/mongo" mongo "go.mongodb.org/mongo-driver/mongo"
gomock "go.uber.org/mock/gomock" gomock "go.uber.org/mock/gomock"
) )

View File

@ -10,10 +10,10 @@
package mock package mock
import ( import (
entity "app-cloudep-member-server/pkg/domain/entity"
context "context" context "context"
reflect "reflect" reflect "reflect"
entity "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity"
mongo "go.mongodb.org/mongo-driver/mongo" mongo "go.mongodb.org/mongo-driver/mongo"
gomock "go.uber.org/mock/gomock" gomock "go.uber.org/mock/gomock"
) )

View File

@ -10,10 +10,10 @@
package mock package mock
import ( import (
entity "app-cloudep-member-server/pkg/domain/entity"
context "context" context "context"
reflect "reflect" reflect "reflect"
entity "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity"
mongo "go.mongodb.org/mongo-driver/mongo" mongo "go.mongodb.org/mongo-driver/mongo"
gomock "go.uber.org/mock/gomock" gomock "go.uber.org/mock/gomock"
) )

View File

@ -10,11 +10,11 @@
package mock package mock
import ( import (
entity "app-cloudep-member-server/pkg/domain/entity"
repository "app-cloudep-member-server/pkg/domain/repository"
context "context" context "context"
reflect "reflect" 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" mongo "go.mongodb.org/mongo-driver/mongo"
gomock "go.uber.org/mock/gomock" gomock "go.uber.org/mock/gomock"
) )

View File

@ -1,13 +1,14 @@
package repository package repository
import ( import (
"app-cloudep-member-server/pkg/domain"
"app-cloudep-member-server/pkg/domain/entity"
"app-cloudep-member-server/pkg/domain/repository"
"context" "context"
"errors" "errors"
"time" "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" mgo "code.30cm.net/digimon/library-go/mongo"
"github.com/zeromicro/go-zero/core/stores/cache" "github.com/zeromicro/go-zero/core/stores/cache"
"github.com/zeromicro/go-zero/core/stores/mon" "github.com/zeromicro/go-zero/core/stores/mon"
@ -19,7 +20,7 @@ import (
type AccountRepositoryParam struct { type AccountRepositoryParam struct {
Conf *mgo.Conf Conf *mgo.Conf
CacheConf cache.CacheConf CacheConf cache.CacheConf
DbOpts []mon.Option DBOpts []mon.Option
CacheOpts []cache.Option CacheOpts []cache.Option
} }
@ -33,7 +34,7 @@ func NewAccountRepository(param AccountRepositoryParam) repository.AccountReposi
param.Conf, param.Conf,
e.CollectionName(), e.CollectionName(),
param.CacheConf, param.CacheConf,
param.DbOpts, param.DBOpts,
param.CacheOpts, param.CacheOpts,
) )
if err != nil { if err != nil {

View File

@ -1,10 +1,11 @@
package repository package repository
import ( import (
"app-cloudep-member-server/pkg/domain/entity" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity"
"app-cloudep-member-server/pkg/domain/repository" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/repository"
"context" "context"
"errors" "errors"
"fmt"
"testing" "testing"
"time" "time"
@ -26,8 +27,7 @@ func SetupTestAccountRepository(db string) (repository.AccountRepository, func()
conf := &mgo.Conf{ conf := &mgo.Conf{
Schema: Schema, Schema: Schema,
Host: h, Host: fmt.Sprintf("%s:%s", h, p),
Port: p,
Database: db, Database: db,
MaxStaleness: 300, MaxStaleness: 300,
MaxPoolSize: 100, MaxPoolSize: 100,

View File

@ -1,13 +1,14 @@
package repository package repository
import ( import (
"app-cloudep-member-server/pkg/domain"
"app-cloudep-member-server/pkg/domain/entity"
"app-cloudep-member-server/pkg/domain/repository"
"context" "context"
"errors" "errors"
"time" "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" mgo "code.30cm.net/digimon/library-go/mongo"
"github.com/zeromicro/go-zero/core/stores/cache" "github.com/zeromicro/go-zero/core/stores/cache"
"github.com/zeromicro/go-zero/core/stores/mon" "github.com/zeromicro/go-zero/core/stores/mon"
@ -19,7 +20,7 @@ import (
type AccountUIDRepositoryParam struct { type AccountUIDRepositoryParam struct {
Conf *mgo.Conf Conf *mgo.Conf
CacheConf cache.CacheConf CacheConf cache.CacheConf
DbOpts []mon.Option DBOpts []mon.Option
CacheOpts []cache.Option CacheOpts []cache.Option
} }
@ -33,7 +34,7 @@ func NewAccountUIDRepository(param AccountUIDRepositoryParam) repository.Account
param.Conf, param.Conf,
e.CollectionName(), e.CollectionName(),
param.CacheConf, param.CacheConf,
param.DbOpts, param.DBOpts,
param.CacheOpts, param.CacheOpts,
) )
if err != nil { if err != nil {

View File

@ -1,9 +1,10 @@
package repository package repository
import ( import (
"app-cloudep-member-server/pkg/domain/entity" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity"
"app-cloudep-member-server/pkg/domain/repository" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/repository"
"context" "context"
"fmt"
"testing" "testing"
"time" "time"
@ -24,8 +25,7 @@ func SetupTestAccountUIDRepository(db string) (repository.AccountUIDRepository,
conf := &mgo.Conf{ conf := &mgo.Conf{
Schema: Schema, Schema: Schema,
Host: h, Host: fmt.Sprintf("%s:%s", h, p),
Port: p,
Database: db, Database: db,
MaxStaleness: 300, MaxStaleness: 300,
MaxPoolSize: 100, MaxPoolSize: 100,

View File

@ -1,12 +1,13 @@
package repository package repository
import ( import (
"app-cloudep-member-server/pkg/domain/entity"
"app-cloudep-member-server/pkg/domain/repository"
"context" "context"
"errors" "errors"
"time" "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" GIDLib "code.30cm.net/digimon/library-go/utils/invited_code"
mgo "code.30cm.net/digimon/library-go/mongo" mgo "code.30cm.net/digimon/library-go/mongo"
@ -19,7 +20,7 @@ import (
type AutoIDRepositoryParam struct { type AutoIDRepositoryParam struct {
Conf *mgo.Conf Conf *mgo.Conf
DbOpts []mon.Option DBOpts []mon.Option
} }
type AutoIDRepository struct { type AutoIDRepository struct {
@ -29,7 +30,7 @@ type AutoIDRepository struct {
func NewAutoIDRepository(param AutoIDRepositoryParam) repository.AutoIDRepository { func NewAutoIDRepository(param AutoIDRepositoryParam) repository.AutoIDRepository {
e := entity.AutoID{} 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 { if err != nil {
panic(err) panic(err)
} }

View File

@ -1,9 +1,10 @@
package repository package repository
import ( import (
"app-cloudep-member-server/pkg/domain/entity" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity"
"app-cloudep-member-server/pkg/domain/repository" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/repository"
"context" "context"
"fmt"
"testing" "testing"
"time" "time"
@ -19,8 +20,7 @@ func SetupTestAutoIDRepository(db string) (repository.AutoIDRepository, func(),
conf := &mgo.Conf{ conf := &mgo.Conf{
Schema: Schema, Schema: Schema,
Host: h, Host: fmt.Sprintf("%s:%s", h, p),
Port: p,
Database: db, Database: db,
MaxStaleness: 300, MaxStaleness: 300,
MaxPoolSize: 100, MaxPoolSize: 100,

View File

@ -1,13 +1,14 @@
package repository package repository
import ( import (
"app-cloudep-member-server/pkg/domain"
"app-cloudep-member-server/pkg/domain/entity"
"app-cloudep-member-server/pkg/domain/repository"
"context" "context"
"errors" "errors"
"fmt" "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" mgo "code.30cm.net/digimon/library-go/mongo"
"time" "time"
@ -23,7 +24,7 @@ import (
type UserRepositoryParam struct { type UserRepositoryParam struct {
Conf *mgo.Conf Conf *mgo.Conf
CacheConf cache.CacheConf CacheConf cache.CacheConf
DbOpts []mon.Option DBOpts []mon.Option
CacheOpts []cache.Option CacheOpts []cache.Option
} }
@ -37,7 +38,7 @@ func NewUserRepository(param UserRepositoryParam) repository.UserRepository {
param.Conf, param.Conf,
e.CollectionName(), e.CollectionName(),
param.CacheConf, param.CacheConf,
param.DbOpts, param.DBOpts,
param.CacheOpts, param.CacheOpts,
) )
if err != nil { if err != nil {

View File

@ -1,11 +1,12 @@
package repository package repository
import ( import (
"app-cloudep-member-server/pkg/domain/entity" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity"
"app-cloudep-member-server/pkg/domain/member" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/member"
"app-cloudep-member-server/pkg/domain/repository" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/repository"
"context" "context"
"errors" "errors"
"fmt"
"testing" "testing"
"time" "time"
@ -27,8 +28,7 @@ func SetupTestUserRepository(db string) (repository.UserRepository, func(), erro
conf := &mgo.Conf{ conf := &mgo.Conf{
Schema: Schema, Schema: Schema,
Host: h, Host: fmt.Sprintf("%s:%s", h, p),
Port: p,
Database: db, Database: db,
MaxStaleness: 300, MaxStaleness: 300,
MaxPoolSize: 100, MaxPoolSize: 100,

View File

@ -1,10 +1,11 @@
package repository package repository
import ( import (
"app-cloudep-member-server/pkg/domain"
"app-cloudep-member-server/pkg/domain/repository"
"context" "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" "github.com/zeromicro/go-zero/core/stores/redis"
) )

View File

@ -1,7 +1,7 @@
package repository package repository
import ( import (
"app-cloudep-member-server/pkg/domain" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain"
"context" "context"
"fmt" "fmt"
"testing" "testing"

View File

@ -1,9 +1,9 @@
package usecase package usecase
import ( import (
"app-cloudep-member-server/pkg/domain/config" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/config"
"app-cloudep-member-server/pkg/domain/repository" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/repository"
"app-cloudep-member-server/pkg/domain/usecase" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/usecase"
) )
type MemberUseCaseParam struct { type MemberUseCaseParam struct {

View File

@ -1,13 +1,14 @@
package usecase package usecase
import ( import (
"app-cloudep-member-server/pkg/domain"
"app-cloudep-member-server/pkg/domain/entity"
"app-cloudep-member-server/pkg/domain/usecase"
"context" "context"
"errors" "errors"
"fmt" "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.30cm.net/digimon/library-go/errs/code" "code.30cm.net/digimon/library-go/errs/code"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"

View File

@ -1,9 +1,9 @@
package usecase package usecase
import ( import (
"app-cloudep-member-server/pkg/domain/entity" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity"
"app-cloudep-member-server/pkg/domain/member" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/member"
"app-cloudep-member-server/pkg/domain/usecase" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/usecase"
"context" "context"
"errors" "errors"
"testing" "testing"
@ -12,7 +12,7 @@ import (
"go.uber.org/mock/gomock" "go.uber.org/mock/gomock"
"google.golang.org/protobuf/proto" "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) { func TestMemberUseCase_BindUserInfo(t *testing.T) {

View File

@ -1,11 +1,12 @@
package usecase package usecase
import ( import (
"app-cloudep-member-server/pkg/domain"
"app-cloudep-member-server/pkg/domain/entity"
"context" "context"
"math" "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.30cm.net/digimon/library-go/errs/code" "code.30cm.net/digimon/library-go/errs/code"
GIDLib "code.30cm.net/digimon/library-go/utils/invited_code" GIDLib "code.30cm.net/digimon/library-go/utils/invited_code"

View File

@ -1,8 +1,8 @@
package usecase package usecase
import ( import (
"app-cloudep-member-server/pkg/domain/entity" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity"
mockRepo "app-cloudep-member-server/pkg/mock/repository" mockRepo "code.30cm.net/digimon/app-cloudep-member-server/pkg/mock/repository"
"context" "context"
"errors" "errors"
"math" "math"

View File

@ -1,15 +1,16 @@
package usecase package usecase
import ( 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" "context"
"errors" "errors"
"fmt" "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.30cm.net/digimon/library-go/errs/code" "code.30cm.net/digimon/library-go/errs/code"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"

View File

@ -1,13 +1,13 @@
package usecase package usecase
import ( import (
"app-cloudep-member-server/pkg/domain" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain"
"app-cloudep-member-server/pkg/domain/config" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/config"
"app-cloudep-member-server/pkg/domain/entity" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity"
"app-cloudep-member-server/pkg/domain/member" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/member"
"app-cloudep-member-server/pkg/domain/usecase" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/usecase"
mockRepo "app-cloudep-member-server/pkg/mock/repository" mockRepo "code.30cm.net/digimon/app-cloudep-member-server/pkg/mock/repository"
"app-cloudep-member-server/pkg/repository" "code.30cm.net/digimon/app-cloudep-member-server/pkg/repository"
"context" "context"
"errors" "errors"
"testing" "testing"

View File

@ -1,12 +1,13 @@
package usecase package usecase
import ( import (
"app-cloudep-member-server/pkg/domain"
"app-cloudep-member-server/pkg/domain/member"
"app-cloudep-member-server/pkg/domain/usecase"
"context" "context"
"fmt" "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.30cm.net/digimon/library-go/errs/code" "code.30cm.net/digimon/library-go/errs/code"
) )

View File

@ -1,8 +1,6 @@
package usecase package usecase
import ( import (
"app-cloudep-member-server/pkg/domain"
"app-cloudep-member-server/pkg/domain/usecase"
"context" "context"
"encoding/json" "encoding/json"
"errors" "errors"
@ -12,6 +10,9 @@ import (
"strconv" "strconv"
"time" "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.30cm.net/digimon/library-go/errs/code" "code.30cm.net/digimon/library-go/errs/code"
) )

View File

@ -1,14 +1,15 @@
package usecase package usecase
import ( import (
"app-cloudep-member-server/pkg/domain" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain"
"app-cloudep-member-server/pkg/domain/usecase" "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/stretchr/testify/assert"
"strconv" "strconv"
"testing" "testing"
"time" "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) { func TestValidateGoogleTokenInfo(t *testing.T) {

View File

@ -1,8 +1,6 @@
package usecase package usecase
import ( import (
"app-cloudep-member-server/pkg/domain"
"app-cloudep-member-server/pkg/domain/usecase"
"bytes" "bytes"
"context" "context"
"encoding/json" "encoding/json"
@ -10,6 +8,9 @@ import (
"net/http" "net/http"
"net/url" "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.30cm.net/digimon/library-go/errs/code" "code.30cm.net/digimon/library-go/errs/code"
) )

View File

@ -1,10 +1,10 @@
package usecase package usecase
import ( import (
"app-cloudep-member-server/pkg/domain/entity" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/entity"
"app-cloudep-member-server/pkg/domain/member" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/member"
"app-cloudep-member-server/pkg/domain/usecase" "code.30cm.net/digimon/app-cloudep-member-server/pkg/domain/usecase"
mockRepo "app-cloudep-member-server/pkg/mock/repository" mockRepo "code.30cm.net/digimon/app-cloudep-member-server/pkg/mock/repository"
"context" "context"
"errors" "errors"
"fmt" "fmt"