三端用户手机号联通,增加临时用户
This commit is contained in:
@@ -21,12 +21,12 @@ type ServiceContext struct {
|
||||
Redis *redis.Redis
|
||||
|
||||
// 中间件
|
||||
SourceInterceptor rest.Middleware
|
||||
AuthInterceptor rest.Middleware
|
||||
|
||||
AuthInterceptor rest.Middleware
|
||||
UserAuthInterceptor rest.Middleware
|
||||
// 用户相关模型
|
||||
UserModel model.UserModel
|
||||
UserAuthModel model.UserAuthModel
|
||||
UserTempModel model.UserTempModel
|
||||
|
||||
// 产品相关模型
|
||||
ProductModel model.ProductModel
|
||||
@@ -95,6 +95,7 @@ type ServiceContext struct {
|
||||
UserService *service.UserService
|
||||
DictService *service.DictService
|
||||
AdminPromotionLinkStatsService *service.AdminPromotionLinkStatsService
|
||||
ImageService *service.ImageService
|
||||
|
||||
// core service
|
||||
CloudAuthService *cloudauth.CloudAuthClient
|
||||
@@ -104,12 +105,14 @@ type ServiceContext struct {
|
||||
type userModels struct {
|
||||
UserModel model.UserModel
|
||||
UserAuthModel model.UserAuthModel
|
||||
UserTempModel model.UserTempModel
|
||||
}
|
||||
|
||||
func initUserModels(db sqlx.SqlConn, redis cache.CacheConf) userModels {
|
||||
return userModels{
|
||||
UserModel: model.NewUserModel(db, redis),
|
||||
UserAuthModel: model.NewUserAuthModel(db, redis),
|
||||
UserTempModel: model.NewUserTempModel(db, redis),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -259,14 +262,14 @@ type services struct {
|
||||
UserService *service.UserService
|
||||
DictService *service.DictService
|
||||
AdminPromotionLinkStatsService *service.AdminPromotionLinkStatsService
|
||||
|
||||
CloudAuthService *cloudauth.CloudAuthClient
|
||||
ImageService *service.ImageService
|
||||
CloudAuthService *cloudauth.CloudAuthClient
|
||||
}
|
||||
|
||||
func initServices(c config.Config, userAuthModel model.UserAuthModel, westDexService *service.WestDexService,
|
||||
yushanService *service.YushanService, featureModel model.FeatureModel,
|
||||
productFeatureModel model.ProductFeatureModel, agentModels agentModels,
|
||||
userModels userModels, adminModels adminModels) services {
|
||||
userModels userModels, adminModels adminModels, userTempModel model.UserTempModel) services {
|
||||
|
||||
alipayService := service.NewAliPayService(c)
|
||||
wechatPayService := service.NewWechatPayService(c, userAuthModel, service.InitTypeWxPayPubKey)
|
||||
@@ -282,9 +285,10 @@ func initServices(c config.Config, userAuthModel model.UserAuthModel, westDexSer
|
||||
agentModels.AgentMembershipUserConfigModel, agentModels.AgentProductConfigModel,
|
||||
agentModels.AgentPlatformDeductionModel, agentModels.AgentActiveStatModel,
|
||||
asynqService, agentModels.AgentWithdrawalModel)
|
||||
userService := service.NewUserService(userModels.UserModel, userModels.UserAuthModel)
|
||||
userService := service.NewUserService(&c, userModels.UserModel, userModels.UserAuthModel, userTempModel, agentModels.AgentModel)
|
||||
dictService := service.NewDictService(adminModels.AdminDictTypeModel, adminModels.AdminDictDataModel)
|
||||
AdminPromotionLinkStatsService := service.NewAdminPromotionLinkStatsService(adminModels.AdminPromotionLinkModel, adminModels.AdminPromotionLinkStatsTotalModel, adminModels.AdminPromotionLinkStatsHistoryModel)
|
||||
imageService := service.NewImageService()
|
||||
asynqServer := asynq.NewServer(
|
||||
asynq.RedisClientOpt{Addr: c.CacheRedis[0].Host, Password: c.CacheRedis[0].Pass},
|
||||
asynq.Config{
|
||||
@@ -322,7 +326,7 @@ func initServices(c config.Config, userAuthModel model.UserAuthModel, westDexSer
|
||||
UserService: userService,
|
||||
DictService: dictService,
|
||||
AdminPromotionLinkStatsService: AdminPromotionLinkStatsService,
|
||||
|
||||
ImageService: imageService,
|
||||
// core service
|
||||
CloudAuthService: cloudAuthService,
|
||||
}
|
||||
@@ -357,18 +361,17 @@ func NewServiceContext(c config.Config) *ServiceContext {
|
||||
|
||||
// 初始化所有服务
|
||||
services := initServices(c, userModels.UserAuthModel, westDexService, yushanService,
|
||||
productModels.FeatureModel, productModels.ProductFeatureModel, agentModels, userModels, adminModels)
|
||||
productModels.FeatureModel, productModels.ProductFeatureModel, agentModels, userModels, adminModels, userModels.UserTempModel)
|
||||
|
||||
return &ServiceContext{
|
||||
Config: c,
|
||||
Redis: redisClient,
|
||||
SourceInterceptor: middleware.NewSourceInterceptorMiddleware().Handle,
|
||||
AuthInterceptor: middleware.NewAuthInterceptorMiddleware(c).Handle,
|
||||
|
||||
Config: c,
|
||||
Redis: redisClient,
|
||||
AuthInterceptor: middleware.NewAuthInterceptorMiddleware(c).Handle,
|
||||
UserAuthInterceptor: middleware.NewUserAuthInterceptorMiddleware().Handle,
|
||||
// 用户相关模型
|
||||
UserModel: userModels.UserModel,
|
||||
UserAuthModel: userModels.UserAuthModel,
|
||||
|
||||
UserTempModel: userModels.UserTempModel,
|
||||
// 产品相关模型
|
||||
ProductModel: productModels.ProductModel,
|
||||
FeatureModel: productModels.FeatureModel,
|
||||
@@ -435,6 +438,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
|
||||
UserService: services.UserService,
|
||||
DictService: services.DictService,
|
||||
AdminPromotionLinkStatsService: services.AdminPromotionLinkStatsService,
|
||||
ImageService: services.ImageService,
|
||||
|
||||
// core service
|
||||
CloudAuthService: services.CloudAuthService,
|
||||
|
||||
Reference in New Issue
Block a user