TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-12 14:50:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

字段中的blob和JSON类型映射为[]byte和dbs.JSON

Browse Source
This commit is contained in:
GoEdgeLab
2022-03-21 21:39:36 +08:00
parent a2cf2e5b03
commit 31599bee13
105 changed files with 1537 additions and 1156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/db/models/ssl_cert_dao.go
View File

@@ -148,7 +148,7 @@ func (this *SSLCertDAO) UpdateCert(tx *dbs.Tx,
return nil
}
var oldCert = oldOne.(*SSLCert)
var dataIsChanged = bytes.Compare(certData, []byte(oldCert.CertData)) != 0 || bytes.Compare(keyData, []byte(oldCert.KeyData)) != 0
var dataIsChanged = bytes.Compare(certData, oldCert.CertData) != 0 || bytes.Compare(keyData, oldCert.KeyData) != 0
var op = NewSSLCertOperator()
op.Id = certId
@@ -224,31 +224,31 @@ func (this *SSLCertDAO) ComposeCertConfig(tx *dbs.Tx, certId int64, cacheMap *ut
config.IsACME = cert.IsACME == 1
config.Name = cert.Name
config.Description = cert.Description
config.CertData = []byte(cert.CertData)
config.KeyData = []byte(cert.KeyData)
config.CertData = cert.CertData
config.KeyData = cert.KeyData
config.ServerName = cert.ServerName
config.TimeBeginAt = int64(cert.TimeBeginAt)
config.TimeEndAt = int64(cert.TimeEndAt)
// OCSP
if int64(cert.OcspExpiresAt) > time.Now().Unix() {
config.OCSP = []byte(cert.Ocsp)
config.OCSP = cert.Ocsp
config.OCSPExpiresAt = int64(cert.OcspExpiresAt)
}
config.OCSPError = cert.OcspError
if IsNotNull(cert.DnsNames) {
dnsNames := []string{}
err := json.Unmarshal([]byte(cert.DnsNames), &dnsNames)
err := json.Unmarshal(cert.DnsNames, &dnsNames)
if err != nil {
return nil, err
}
config.DNSNames = dnsNames
}
if IsNotNull(cert.CommonNames) {
if cert.CommonNames.IsNotNull() {
commonNames := []string{}
err := json.Unmarshal([]byte(cert.CommonNames), &commonNames)
err := json.Unmarshal(cert.CommonNames, &commonNames)
if err != nil {
return nil, err
}