mirror of
				https://github.com/TeaOSLab/EdgeAPI.git
				synced 2025-11-04 07:50:25 +08:00 
			
		
		
		
	优化代码
This commit is contained in:
		@@ -2,6 +2,7 @@ package acme
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import (
 | 
					import (
 | 
				
			||||||
	"bytes"
 | 
						"bytes"
 | 
				
			||||||
 | 
						"context"
 | 
				
			||||||
	"encoding/json"
 | 
						"encoding/json"
 | 
				
			||||||
	acmeutils "github.com/TeaOSLab/EdgeAPI/internal/acme"
 | 
						acmeutils "github.com/TeaOSLab/EdgeAPI/internal/acme"
 | 
				
			||||||
	teaconst "github.com/TeaOSLab/EdgeAPI/internal/const"
 | 
						teaconst "github.com/TeaOSLab/EdgeAPI/internal/const"
 | 
				
			||||||
@@ -434,7 +435,7 @@ func (this *ACMETaskDAO) runTaskWithoutLog(tx *dbs.Tx, taskId int64) (isOk bool,
 | 
				
			|||||||
		CertData: certData,
 | 
							CertData: certData,
 | 
				
			||||||
		KeyData:  keyData,
 | 
							KeyData:  keyData,
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	err = sslConfig.Init(nil)
 | 
						err = sslConfig.Init(context.Background())
 | 
				
			||||||
	if err != nil {
 | 
						if err != nil {
 | 
				
			||||||
		errMsg = "证书生成成功,但是分析证书信息时发生错误:" + err.Error()
 | 
							errMsg = "证书生成成功,但是分析证书信息时发生错误:" + err.Error()
 | 
				
			||||||
		return
 | 
							return
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -70,7 +70,7 @@ func TestServerDomainHourlyStatDAO_FindTopDomainStats(t *testing.T) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
func TestServerDomainHourlyStatDAO_Clean(t *testing.T) {
 | 
					func TestServerDomainHourlyStatDAO_Clean(t *testing.T) {
 | 
				
			||||||
	var dao = NewServerDomainHourlyStatDAO()
 | 
						var dao = NewServerDomainHourlyStatDAO()
 | 
				
			||||||
	err := dao.Clean(nil, 10)
 | 
						err := dao.CleanDays(nil, 10)
 | 
				
			||||||
	if err != nil {
 | 
						if err != nil {
 | 
				
			||||||
		t.Fatal(err)
 | 
							t.Fatal(err)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -425,6 +425,9 @@ func (this *HTTPWebService) UpdateHTTPWebPages(ctx context.Context, req *pb.Upda
 | 
				
			|||||||
	if len(req.PagesJSON) > 0 {
 | 
						if len(req.PagesJSON) > 0 {
 | 
				
			||||||
		var pages = []*serverconfigs.HTTPPageConfig{}
 | 
							var pages = []*serverconfigs.HTTPPageConfig{}
 | 
				
			||||||
		err = json.Unmarshal(req.PagesJSON, &pages)
 | 
							err = json.Unmarshal(req.PagesJSON, &pages)
 | 
				
			||||||
 | 
							if err != nil {
 | 
				
			||||||
 | 
								return nil, err
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		for _, page := range pages {
 | 
							for _, page := range pages {
 | 
				
			||||||
			err = page.Init()
 | 
								err = page.Init()
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -346,6 +346,9 @@ func (this *ServerService) CreateBasicHTTPServer(ctx context.Context, req *pb.Cr
 | 
				
			|||||||
		Options: nil,
 | 
							Options: nil,
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	reverseProxyScheduleJSON, err := json.Marshal(reverseProxyScheduleConfig)
 | 
						reverseProxyScheduleJSON, err := json.Marshal(reverseProxyScheduleConfig)
 | 
				
			||||||
 | 
						if err != nil {
 | 
				
			||||||
 | 
							return nil, err
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	var primaryOrigins = []*serverconfigs.OriginRef{}
 | 
						var primaryOrigins = []*serverconfigs.OriginRef{}
 | 
				
			||||||
	for _, originAddr := range req.OriginAddrs {
 | 
						for _, originAddr := range req.OriginAddrs {
 | 
				
			||||||
@@ -615,6 +618,9 @@ func (this *ServerService) CreateBasicTCPServer(ctx context.Context, req *pb.Cre
 | 
				
			|||||||
		Options: nil,
 | 
							Options: nil,
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	reverseProxyScheduleJSON, err := json.Marshal(reverseProxyScheduleConfig)
 | 
						reverseProxyScheduleJSON, err := json.Marshal(reverseProxyScheduleConfig)
 | 
				
			||||||
 | 
						if err != nil {
 | 
				
			||||||
 | 
							return nil, err
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	var primaryOrigins = []*serverconfigs.OriginRef{}
 | 
						var primaryOrigins = []*serverconfigs.OriginRef{}
 | 
				
			||||||
	for _, originAddr := range req.OriginAddrs {
 | 
						for _, originAddr := range req.OriginAddrs {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user