v0.01: 修复死锁Bug + DNS-01默认 + 超时调整
This commit is contained in:
@@ -1,11 +1,9 @@
|
||||
package handlers
|
||||
|
||||
import (
|
||||
"auto-ssl/config"
|
||||
"auto-ssl/services"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -246,13 +244,13 @@ func (h *CertHandler) GetCertFiles(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
fullchain, privkey, chain := services.GetCertFilesPaths(cert.Domain, h.Cfg)
|
||||
fullchain, privkey, chain := services.GetCertFileContents(cert.Domain, h.Cfg)
|
||||
|
||||
result := gin.H{
|
||||
"domain": cert.Domain,
|
||||
"fullchain": readFileSafe(fullchain),
|
||||
"privkey": readFileSafe(privkey),
|
||||
"chain": readFileSafe(chain),
|
||||
"fullchain": fullchain,
|
||||
"privkey": privkey,
|
||||
"chain": chain,
|
||||
}
|
||||
c.JSON(http.StatusOK, result)
|
||||
}
|
||||
@@ -310,10 +308,4 @@ func (h *CertHandler) Stats(c *gin.Context) {
|
||||
})
|
||||
}
|
||||
|
||||
func readFileSafe(path string) string {
|
||||
data, err := filepath.Abs(path)
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
return data
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user