mirror/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2024-11-24 11:09:16 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix: 解决启用 https 时无法访问的问题 (#2745)

Browse Source
This commit is contained in:
ssongliu 2023-10-31 21:59:39 +08:00 committed by GitHub
parent 000f175d97
commit 34ca984018
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/app/api/v1/website_ssl.go
View File

@ -20,7 +20,7 @@ import (
// @Router /websites/ssl/search [post]
func (b *BaseApi) PageWebsiteSSL(c *gin.Context) {
var req request.WebsiteSSLSearch
if err := helper.CheckBindAndValidate(&req, c); err != nil {
if err := helper.CheckBind(&req, c); err != nil {
return
}
if !reflect.DeepEqual(req.PageInfo, dto.PageInfo{}) {

15
backend/server/server.go
View File

@ -4,7 +4,6 @@ import (
"crypto/tls"
"encoding/gob"
"fmt"
"net"
"net/http"
"os"
"path"
@ -71,16 +70,14 @@ func Start() {
server.TLSConfig = &tls.Config{
Certificates: []tls.Certificate{cert},
}
}
global.LOG.Infof("listen at %s:%s [%s]", global.CONF.System.BindAddress, global.CONF.System.Port, tcpItem)
ln, err := net.Listen(tcpItem, global.CONF.System.BindAddress+":"+global.CONF.System.Port)
if err != nil {
global.LOG.Infof("listen at https://%s:%s [%s]", global.CONF.System.BindAddress, global.CONF.System.Port, tcpItem)
if err := server.ListenAndServeTLS("", ""); err != nil {
panic(err)
}
type tcpKeepAliveListener struct {
*net.TCPListener
}
if err := server.Serve(tcpKeepAliveListener{ln.(*net.TCPListener)}); err != nil {
} else {
global.LOG.Infof("listen at http://%s:%s [%s]", global.CONF.System.BindAddress, global.CONF.System.Port, tcpItem)
if err := server.ListenAndServe(); err != nil {
panic(err)
}
}
}