Merge branch 'superGroup' into v2.3.0release

# Conflicts:
#	go.sum
#	pkg/common/db/RedisModel.go
#	pkg/common/db/model.go
This commit is contained in:
Gordon
2022-07-25 17:22:47 +08:00
9 changed files with 171 additions and 4 deletions
+4
View File
@@ -196,6 +196,10 @@ type config struct {
Intent string `yaml:"intent"`
MasterSecret string `yaml:"masterSecret"`
}
Fcm struct {
ServiceAccount string `yaml:"serviceAccount"`
Enable bool `yaml:"enable"`
}
}
Manager struct {
AppManagerUid []string `yaml:"appManagerUid"`