mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-11 02:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

chore: prepare v2.0.0-rc.4

Browse source
This commit is contained in:
Jacky 2025-03-09 00:35:36 +00:00
parent 5460885bd6
commit 22834f59b4
No known key found for this signature in database
GPG key ID: 215C21B10DF38B4D
18 changed files with 144 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/cert/tencent_cloud_dns_test.go
View file

@ -30,7 +30,7 @@ func TestTencentCloudDNS(t *testing.T) {
}
myUser := model.AcmeUser{
Email: settings.ServerSettings.Email,
Email: settings.CertSettings.Email,
Key: model.PrivateKey{
X: privateKey.PublicKey.X,
Y: privateKey.PublicKey.Y,
@ -39,12 +39,12 @@ func TestTencentCloudDNS(t *testing.T) {
config := lego.NewConfig(&myUser)
if settings.ServerSettings.Demo {
if settings.NodeSettings.Demo {
config.CADirURL = "https://acme-staging-v02.api.letsencrypt.org/directory"
}
if settings.ServerSettings.CADir != "" {
config.CADirURL = settings.ServerSettings.CADir
if settings.CertSettings.CADir != "" {
config.CADirURL = settings.CertSettings.CADir
if config.HTTPClient != nil {
config.HTTPClient.Transport = &http.Transport{
Proxy: http.ProxyFromEnvironment,

12
internal/nginx/ngx_conf_parse_test.go
View file

@ -2,10 +2,11 @@ package nginx
import (
"fmt"
"github.com/tufanbarisyildirim/gonginx/config"
"github.com/tufanbarisyildirim/gonginx/parser"
"strings"
"testing"
"github.com/tufanbarisyildirim/gonginx/config"
"github.com/tufanbarisyildirim/gonginx/parser"
)
func TestNgxConfParse(t *testing.T) {
@ -44,7 +45,12 @@ func fn(block config.IBlock, deep int) {
}
}
fmt.Println(fmt.Sprintf("%s%s %s", strings.Repeat("\t", deep), v.GetName(), strings.Join(v.GetParameters(), " ")))
// 将 []config.Parameter 转换为 []string
params := make([]string, len(v.GetParameters()))
for i, p := range v.GetParameters() {
params[i] = p.String()
}
fmt.Printf("%s%s %s\n", strings.Repeat("\t", deep), v.GetName(), strings.Join(params, " "))
fn(v.GetBlock(), deep+1)
}
}