@@ -1,6 +1,8 @@ | |||||
module code.fnuoos.com/EggPlanet/egg_system_rules.git | module code.fnuoos.com/EggPlanet/egg_system_rules.git | ||||
go 1.19 | |||||
go 1.21 | |||||
toolchain go1.23.2 | |||||
// go.mod文件中 | // go.mod文件中 | ||||
// replace code.fnuoos.com/EggPlanet/egg_models.git => E:/company/Egg/egg_models | // replace code.fnuoos.com/EggPlanet/egg_models.git => E:/company/Egg/egg_models | ||||
@@ -29,6 +31,10 @@ require ( | |||||
github.com/alibabacloud-go/tea-xml v1.1.3 // indirect | github.com/alibabacloud-go/tea-xml v1.1.3 // indirect | ||||
github.com/aliyun/credentials-go v1.3.10 // indirect | github.com/aliyun/credentials-go v1.3.10 // indirect | ||||
github.com/clbanning/mxj/v2 v2.5.5 // indirect | github.com/clbanning/mxj/v2 v2.5.5 // indirect | ||||
github.com/go-pay/crypto v0.0.1 // indirect | |||||
github.com/go-pay/gopay v1.5.106 // indirect | |||||
github.com/go-pay/xlog v0.0.3 // indirect | |||||
github.com/go-pay/xtime v0.0.2 // indirect | |||||
github.com/onsi/ginkgo v1.16.5 // indirect | github.com/onsi/ginkgo v1.16.5 // indirect | ||||
github.com/onsi/gomega v1.27.8 // indirect | github.com/onsi/gomega v1.27.8 // indirect | ||||
github.com/pkg/errors v0.9.1 // indirect | github.com/pkg/errors v0.9.1 // indirect | ||||
@@ -129,6 +129,14 @@ github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgO | |||||
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= | github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= | ||||
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= | github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= | ||||
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= | github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= | ||||
github.com/go-pay/crypto v0.0.1 h1:B6InT8CLfSLc6nGRVx9VMJRBBazFMjr293+jl0lLXUY= | |||||
github.com/go-pay/crypto v0.0.1/go.mod h1:41oEIvHMKbNcYlWUlRWtsnC6+ASgh7u29z0gJXe5bes= | |||||
github.com/go-pay/gopay v1.5.106 h1:UVAX/jJu3tQXcS39FwYw1bcBEOcW1zdBSQ4EIbhiLrI= | |||||
github.com/go-pay/gopay v1.5.106/go.mod h1:I+1qOFZsNt6quaA1B9grXgz+RrFh6rOXQYiX2R+IaoU= | |||||
github.com/go-pay/xlog v0.0.3 h1:avyMhCL/JgBHreoGx/am/kHxfs1udDOAeVqbmzP/Yes= | |||||
github.com/go-pay/xlog v0.0.3/go.mod h1:mH47xbobrdsSHWsmFtSF5agWbMHFP+tK0ZbVCk5OAEw= | |||||
github.com/go-pay/xtime v0.0.2 h1:7YR4/iuELsEHpJ6LUO0SVK80hQxDO9MLCfuVYIiTCRM= | |||||
github.com/go-pay/xtime v0.0.2/go.mod h1:W1yRbJaSt4CSBcdAtLBQ8xajiN/Pl5hquGczUcUE9xE= | |||||
github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= | github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= | ||||
github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= | github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= | ||||
github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= | github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= | ||||
@@ -299,3 +299,42 @@ type EggFriendCircleCommentEs struct { | |||||
// CreatedAt string `json:"created_at"` | // CreatedAt string `json:"created_at"` | ||||
// UpdatedAt string `json:"updated_at"` | // UpdatedAt string `json:"updated_at"` | ||||
//} | //} | ||||
const EggFriendCircleLikeEsAlias = "egg_friend_circle_like" | |||||
const EggFriendCircleLikeEsIndex = "egg_friend_circle_like_" | |||||
const EggFriendCircleLikeEsMapping = ` | |||||
{ | |||||
"settings" : { | |||||
"number_of_shards" : 2, | |||||
"number_of_replicas" : 1 | |||||
}, | |||||
"aliases": { | |||||
"egg_friend_circle": {} | |||||
}, | |||||
"mappings":{ | |||||
"properties":{ | |||||
"uid":{ | |||||
"type": "integer" | |||||
}, | |||||
"circle_id":{ | |||||
"type": "integer" | |||||
}, | |||||
"created_at":{ | |||||
"type": "date", | |||||
"format": "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis" | |||||
}, | |||||
"updated_at":{ | |||||
"type": "date", | |||||
"format": "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis" | |||||
} | |||||
} | |||||
} | |||||
}` | |||||
type EggFriendCircleLikeEs struct { | |||||
Uid int64 `json:"uid" label:"uid"` | |||||
ImUid int64 `json:"im_uid" label:"im_uid"` | |||||
CircleId string `json:"circle_id" label:"朋友圈id"` | |||||
CreatedAt string `json:"created_at"` | |||||
UpdatedAt string `json:"updated_at"` | |||||
} |
@@ -170,6 +170,7 @@ func settlementPublicGiveActivityCoin(engine *xorm.Engine, uid int64, ch *rabbit | |||||
if err != nil { | if err != nil { | ||||
return err | return err | ||||
} | } | ||||
watchRecord = &tempM | |||||
} else { | } else { | ||||
residueWatchAdNum := watchRecord.ResidueWatchAdNum - 1 | residueWatchAdNum := watchRecord.ResidueWatchAdNum - 1 | ||||
nextWatchAdDate := watchRecord.NextWatchAdDate | nextWatchAdDate := watchRecord.NextWatchAdDate | ||||