github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-02-03 00:38:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

support https in rest

Browse Source
This commit is contained in:
kevin 2020-10-29 17:44:51 +08:00
parent 9b7cc43dcb
commit 5e87b33b23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rest/config.go
View File

@ -18,7 +18,7 @@ type (
PrivateKeys []PrivateKeyConf PrivateKeys []PrivateKeyConf
} }
// why not name it as Conf, because we need to consider usage like: // Why not name it as Conf, because we need to consider usage like:
// type Config struct { // type Config struct {
// zrpc.RpcConf // zrpc.RpcConf
// rest.RestConf // rest.RestConf
@ -28,9 +28,11 @@ type (
service.ServiceConf service.ServiceConf
Host string `json:",default=0.0.0.0"` Host string `json:",default=0.0.0.0"`
Port int Port int
Verbose bool `json:",optional"` CertFile string `json:",optional"`
MaxConns int `json:",default=10000"` KeyFile string `json:",optional"`
MaxBytes int64 `json:",default=1048576,range=[0:8388608]"` Verbose bool `json:",optional"`
MaxConns int `json:",default=10000"`
MaxBytes int64 `json:",default=1048576,range=[0:8388608]"`
// milliseconds // milliseconds
Timeout int64 `json:",default=3000"` Timeout int64 `json:",default=3000"`
CpuThreshold int64 `json:",default=900,range=[0:1000]"` CpuThreshold int64 `json:",default=900,range=[0:1000]"`

6
rest/engine.go
View File

@ -65,7 +65,11 @@ func (s *engine) StartWithRouter(router httpx.Router) error {
return err return err
} }
return internal.StartHttp(s.conf.Host, s.conf.Port, router) if len(s.conf.CertFile) == 0 && len(s.conf.KeyFile) == 0 {
return internal.StartHttp(s.conf.Host, s.conf.Port, router)
}
return internal.StartHttps(s.conf.Host, s.conf.Port, s.conf.CertFile, s.conf.KeyFile, router)
} }
func (s *engine) appendAuthHandler(fr featuredRoutes, chain alice.Chain, func (s *engine) appendAuthHandler(fr featuredRoutes, chain alice.Chain,