wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feat-IRONFANS-70' into conflict

This commit is contained in:
Leufolium 2024-04-30 09:52:51 +08:00
parent cd4cff4d93 1ac73882d1
commit 7e71e670c0
7 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/consts/consts.go
View File

@ -52,6 +52,7 @@ const (
MaxDailyZoneMomentCreateTimesKey = "max_daily_zone_moment_create_times" MaxDailyZoneMomentCreateTimesKey = "max_daily_zone_moment_create_times"
ReferentialZoneMomentKey = "referential_zone_moment" ReferentialZoneMomentKey = "referential_zone_moment"
RestrictedVisitorMomentKey = "restricted_visitor_moment" RestrictedVisitorMomentKey = "restricted_visitor_moment"
IsMomentImageEncryptEnabledKey = "is_moment_image_encrypt_enabled"
) )
// del_flag // del_flag

1
api/proto/zonemoment/proto/zonemoment_op.go
View File

@ -78,6 +78,7 @@ type OpListByMidReq struct {
Offset int `json:"offset"` Offset int `json:"offset"`
Limit int `json:"limit"` Limit int `json:"limit"`
Sort []string Sort []string
Uid *int64
} }
type OpListByMidData struct { type OpListByMidData struct {

11
app/mix/controller/config_op.go
View File

@ -70,3 +70,14 @@ func OpGetUploadMediaFailConfigList(ctx *gin.Context) {
ReplyOk(ctx, config) ReplyOk(ctx, config)
} }
func OpGetIsMomentImageEncryptEnabled(ctx *gin.Context) {
isEnabled, ec := service.DefaultConfigService.OpGetIsMomentImageEncryptEnabled(ctx)
if ec != errcode.ErrCodeOk {
logger.Error("OpGetIsMomentImageEncryptEnabled fail, ec: %v", ec)
ReplyErrCodeMsg(ctx, ec)
return
}
ReplyOk(ctx, isEnabled)
}

1
app/mix/controller/init.go
View File

@ -136,6 +136,7 @@ func Init(r *gin.Engine) {
apiMomentGroup.POST("thumbs_up", middleware.JSONParamValidator(momentproto.ApiThumbsUpReq{}), middleware.JwtAuthenticator(), ApiThumbsUpMoment) apiMomentGroup.POST("thumbs_up", middleware.JSONParamValidator(momentproto.ApiThumbsUpReq{}), middleware.JwtAuthenticator(), ApiThumbsUpMoment)
apiMomentGroup.POST("list_by_ids", middleware.JSONParamValidator(momentproto.ApiListByIdsReq{}), middleware.JwtAuthenticator(), ApiGetMomentListByIds) apiMomentGroup.POST("list_by_ids", middleware.JSONParamValidator(momentproto.ApiListByIdsReq{}), middleware.JwtAuthenticator(), ApiGetMomentListByIds)
apiMomentGroup.POST("recomm_list", middleware.JSONParamValidator(momentproto.ApiRecommListReq{}), middleware.JwtAuthenticator(), ApiGetMomentRecommList) apiMomentGroup.POST("recomm_list", middleware.JSONParamValidator(momentproto.ApiRecommListReq{}), middleware.JwtAuthenticator(), ApiGetMomentRecommList)
apiMomentGroup.POST("is_moment_image_encrypt_enabled", middleware.JSONParamValidator(base.BaseRequest{}), middleware.JwtAuthenticator(), OpGetIsMomentImageEncryptEnabled)
// 足迹 // 足迹
// apiFootPrintGroup := r.Group("/api/footprint", PrepareToC()) // apiFootPrintGroup := r.Group("/api/footprint", PrepareToC())

6
app/mix/dao/mongo.go
View File

@ -4096,6 +4096,12 @@ func (m *Mongo) GetZoneMomentListByMid(ctx *gin.Context, req *zonemomentproto.Op
"mid": req.GetBaseRequest().Mid, "mid": req.GetBaseRequest().Mid,
"del_flag": 0, "del_flag": 0,
} }
if req.Uid != nil {
query["mid"] = util.DerefInt64(req.Uid)
} else {
query["mid"] = req.GetBaseRequest().Mid
}
if req.MType != nil { if req.MType != nil {
query["m_type"] = util.DerefInt64(req.MType) query["m_type"] = util.DerefInt64(req.MType)
} }

15
app/mix/service/configservice.go
View File

@ -171,3 +171,18 @@ func (s *ConfigService) OpGetUploadMediaFailConfigList(ctx *gin.Context) (upload
return return
} }
func (s *ConfigService) OpGetIsMomentImageEncryptEnabled(ctx *gin.Context) (isEnabled int64, ec errcode.ErrCode) {
ec = errcode.ErrCodeOk
isMomentImageEncryptEnabled, err := apollo.GetIntValue(consts.IsMomentImageEncryptEnabledKey, apollo.ApolloOpts().SetNamespace("application"))
if err != nil {
logger.Error("Apollo read failed : %v", err)
ec = errcode.ErrCodeApolloReadFail
return
}
isEnabled = int64(isMomentImageEncryptEnabled)
return
}

1
app/mix/service/service.go
View File

@ -3400,6 +3400,7 @@ func (s *Service) OpGetZoneMomentListByUserId(ctx *gin.Context, req *zonemomentp
list, err := _DefaultZoneMoment.OpListByMid(ctx, &zonemomentproto.OpListByMidReq{ list, err := _DefaultZoneMoment.OpListByMid(ctx, &zonemomentproto.OpListByMidReq{
BaseRequest: req.BaseRequest, BaseRequest: req.BaseRequest,
Uid: account.Mid,
CtUpperBound: req.CtUpperBound, CtUpperBound: req.CtUpperBound,
CtLowerBound: req.CtLowerBound, CtLowerBound: req.CtLowerBound,
}) })