test stage 1

This commit is contained in:
Sense T
2024-04-19 09:44:37 +08:00
parent b583720223
commit 88b2255f8b
20 changed files with 131 additions and 95 deletions

View File

@@ -5,6 +5,8 @@ import (
"reCoreD-UI/database"
"reCoreD-UI/models"
"strconv"
"github.com/sirupsen/logrus"
)
type domainsDAO struct {
@@ -28,6 +30,7 @@ func CreateDomain(d *models.Domain) (*models.Domain, error) {
r.Name = "@"
r.RecordType = models.RecordTypeSOA
r.Content = d.GenerateSOA()
logrus.Debug(r)
if err := r.CheckZone(); err != nil {
tx.Rollback()
return nil, err
@@ -41,7 +44,7 @@ func CreateDomain(d *models.Domain) (*models.Domain, error) {
for i, ns := range nss {
record := &models.Record[models.NSRecord]{
Zone: d.WithDotEnd(),
RecordType: models.RecordTypeSOA,
RecordType: models.RecordTypeNS,
Name: fmt.Sprintf("ns%d", i+1),
}
record.Content.Host = ns
@@ -123,13 +126,13 @@ func DeleteDomain(id string) error {
}
tx := database.Client.Begin()
domain, err := (domainsDAO{}).GetOne(tx, &models.Domain{ID: ID})
domain, err := (domainsDAO{}).GetOne(tx, &models.Domain{ID: uint(ID)})
if err != nil {
tx.Rollback()
return err
}
if err := (domainsDAO{}).Delete(tx, &models.Domain{ID: ID}); err != nil {
if err := (domainsDAO{}).Delete(tx, &models.Domain{ID: uint(ID)}); err != nil {
tx.Rollback()
return err
}

View File

@@ -37,7 +37,7 @@ func RegisterMetrics() {
GinMetrics := ginprometheus.NewPrometheus("recoredui")
for _, v := range GinMetrics.MetricsList {
prometheus.MustRegister(v.MetricCollector)
prometheus.Register(v.MetricCollector)
}
}

View File

@@ -42,7 +42,7 @@ func CreateRecords(rs []models.IRecord) error {
return err
}
}
return tx.Commit().Error
}
@@ -68,7 +68,7 @@ func DeleteRecord(domain, id string) error {
}
tx := database.Client.Begin()
record, err := (recordsDAO{}).GetOne(tx, &models.Record[models.RecordContentDefault]{ID: ID, Zone: fmt.Sprintf("%s.", domain)})
record, err := (recordsDAO{}).GetOne(tx, &models.Record[models.RecordContentDefault]{ID: uint(ID), Zone: fmt.Sprintf("%s.", domain)})
if err != nil {
tx.Rollback()
return err