TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-12-09 11:40: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

4
internal/tasks/health_check_executor.go
View File

@@ -41,12 +41,12 @@ func (this *HealthCheckExecutor) Run() ([]*HealthCheckResult, error) {
if cluster == nil {
return nil, errors.New("can not find cluster with id '" + strconv.FormatInt(this.clusterId, 10) + "'")
}
if len(cluster.HealthCheck) == 0 || cluster.HealthCheck == "null" {
if !cluster.HealthCheck.IsNotNull() {
return nil, errors.New("health check config is not found")
}
healthCheckConfig := &serverconfigs.HealthCheckConfig{}
err = json.Unmarshal([]byte(cluster.HealthCheck), healthCheckConfig)
err = json.Unmarshal(cluster.HealthCheck, healthCheckConfig)
if err != nil {
return nil, err
}

4
internal/tasks/health_check_task.go
View File

@@ -71,8 +71,8 @@ func (this *HealthCheckTask) loop() error {
clusterId := int64(cluster.Id)
config := &serverconfigs.HealthCheckConfig{}
if len(cluster.HealthCheck) > 0 && cluster.HealthCheck != "null" {
err = json.Unmarshal([]byte(cluster.HealthCheck), config)
if len(cluster.HealthCheck) > 0 {
err = json.Unmarshal(cluster.HealthCheck, config)
if err != nil {
logs.Println("[TASK][HEALTH_CHECK]" + err.Error())
continue

10
internal/tasks/ssl_cert_expire_check_executor.go
View File

@@ -70,7 +70,7 @@ func (this *SSLCertExpireCheckExecutor) loop(seconds int64) error {
for _, cert := range certs {
// 发送消息
subject := "SSL证书\"" + cert.Name + "\"在" + strconv.Itoa(days) + "天后将到期，"
msg := "SSL证书\"" + cert.Name + "\"（" + cert.DnsNames + "）在" + strconv.Itoa(days) + "天后将到期，"
msg := "SSL证书\"" + cert.Name + "\"（" + string(cert.DnsNames) + "）在" + strconv.Itoa(days) + "天后将到期，"
// 是否有自动更新任务
if cert.AcmeTaskId > 0 {
@@ -114,7 +114,7 @@ func (this *SSLCertExpireCheckExecutor) loop(seconds int64) error {
for _, cert := range certs {
// 发送消息
subject := "SSL证书\"" + cert.Name + "\"在" + strconv.Itoa(days) + "天后将到期，"
msg := "SSL证书\"" + cert.Name + "\"（" + cert.DnsNames + "）在" + strconv.Itoa(days) + "天后将到期，"
msg := "SSL证书\"" + cert.Name + "\"（" + string(cert.DnsNames) + "）在" + strconv.Itoa(days) + "天后将到期，"
// 是否有自动更新任务
if cert.AcmeTaskId > 0 {
@@ -128,7 +128,7 @@ func (this *SSLCertExpireCheckExecutor) loop(seconds int64) error {
if isOk {
// 发送成功通知
subject := "系统已成功为你自动更新了证书\"" + cert.Name + "\""
msg = "系统已成功为你自动更新了证书\"" + cert.Name + "\"（" + cert.DnsNames + "）。"
msg = "系统已成功为你自动更新了证书\"" + cert.Name + "\"（" + string(cert.DnsNames) + "）。"
err = models.SharedMessageDAO.CreateMessage(nil, int64(cert.AdminId), int64(cert.UserId), models.MessageTypeSSLCertACMETaskSuccess, models.MessageLevelSuccess, subject, msg, maps.Map{
"certId": cert.Id,
"acmeTaskId": cert.AcmeTaskId,
@@ -142,7 +142,7 @@ func (this *SSLCertExpireCheckExecutor) loop(seconds int64) error {
} else {
// 发送失败通知
subject := "系统在尝试自动更新证书\"" + cert.Name + "\"时发生错误"
msg = "系统在尝试自动更新证书\"" + cert.Name + "\"（" + cert.DnsNames + "）时发生错误：" + errMsg + "。请检查系统设置并修复错误。"
msg = "系统在尝试自动更新证书\"" + cert.Name + "\"（" + string(cert.DnsNames) + "）时发生错误：" + errMsg + "。请检查系统设置并修复错误。"
err = models.SharedMessageDAO.CreateMessage(nil, int64(cert.AdminId), int64(cert.UserId), models.MessageTypeSSLCertACMETaskFailed, models.MessageLevelError, subject, msg, maps.Map{
"certId": cert.Id,
"acmeTaskId": cert.AcmeTaskId,
@@ -192,7 +192,7 @@ func (this *SSLCertExpireCheckExecutor) loop(seconds int64) error {
// 发送消息
today := timeutil.Format("Y-m-d")
subject := "SSL证书\"" + cert.Name + "\"在今天（" + today + "）过期"
msg := "SSL证书\"" + cert.Name + "\"（" + cert.DnsNames + "）在今天（" + today + "）过期，请及时更新证书，之后将不再重复提醒。"
msg := "SSL证书\"" + cert.Name + "\"（" + string(cert.DnsNames) + "）在今天（" + today + "）过期，请及时更新证书，之后将不再重复提醒。"
err = models.SharedMessageDAO.CreateMessage(nil, int64(cert.AdminId), int64(cert.UserId), models.MessageTypeSSLCertExpiring, models.MessageLevelWarning, subject, msg, maps.Map{
"certId": cert.Id,
"acmeTaskId": cert.AcmeTaskId,