diff --git a/config.go b/config.go index 79ab421..1a85c62 100644 --- a/config.go +++ b/config.go @@ -1,9 +1,9 @@ package main import ( - "log" "gopkg.in/yaml.v2" "io/ioutil" + "log" ) type ConfYaml struct { @@ -19,20 +19,20 @@ type SectionCore struct { } type SectionApi struct { - PushUri string `yaml:"push_uri"` - StatGoUri string `yaml:"stat_go_uri"` + PushUri string `yaml:"push_uri"` + StatGoUri string `yaml:"stat_go_uri"` } type SectionAndroid struct { - Enabled bool `yaml:"enabled"` - ApiKey string `yaml:"apikey"` + Enabled bool `yaml:"enabled"` + ApiKey string `yaml:"apikey"` } type SectionIos struct { - Enabled bool `yaml:"enabled"` - PemCertPath string `yaml:"pem_cert_path"` - PemKeyPath string `yaml:"pem_key_path"` - Production bool `yaml:"production"` + Enabled bool `yaml:"enabled"` + PemCertPath string `yaml:"pem_cert_path"` + PemKeyPath string `yaml:"pem_key_path"` + Production bool `yaml:"production"` } func BuildDefaultPushConf() ConfYaml { diff --git a/global.go b/global.go index cc5e6ce..9be2bbd 100644 --- a/global.go +++ b/global.go @@ -6,7 +6,7 @@ import ( ) var ( - PushConf ConfYaml + PushConf ConfYaml CertificatePemIos tls.Certificate - ApnsClient *apns.Client + ApnsClient *apns.Client ) diff --git a/main.go b/main.go index 5c10739..1d6dc14 100644 --- a/main.go +++ b/main.go @@ -4,10 +4,10 @@ import ( api "github.com/appleboy/gin-status-api" "github.com/fvbock/endless" "github.com/gin-gonic/gin" - "log" - "net/http" apns "github.com/sideshow/apns2" "github.com/sideshow/apns2/certificate" + "log" + "net/http" ) func AbortWithError(c *gin.Context, code int, message string) { @@ -87,6 +87,5 @@ func main() { } } - endless.ListenAndServe(":"+PushConf.Core.Port, GetMainEngine()) }