From 7507a6261bd20c345adcb7028bf91777c46aa23b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Mon, 2 Nov 2020 10:44:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E9=85=8D=E7=BD=AE=E6=9C=89?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96=E6=97=B6=E4=B9=9F=E6=8F=90=E7=A4=BA=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=9B=86=E7=BE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/db/models/server_dao.go             |  8 +++++++-
 internal/rpc/services/service_server.go      | 16 ++++++++++++++++
 internal/rpc/services/service_sys_setting.go |  2 +-
 internal/tasks/event_looper.go               |  1 +
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/internal/db/models/server_dao.go b/internal/db/models/server_dao.go
index 2973d497..a288fc44 100644
--- a/internal/db/models/server_dao.go
+++ b/internal/db/models/server_dao.go
@@ -212,8 +212,14 @@ func (this *ServerDAO) UpdateServerConfig(serverId int64, configJSON []byte, upd
 		return false, err
 	}
 
+	globalConfig, err := SharedSysSettingDAO.ReadSetting(SettingCodeServerGlobalConfig)
+	if err != nil {
+		return false, err
+	}
+
 	m := md5.New()
-	_, _ = m.Write(configJSON)
+	_, _ = m.Write(configJSON)   // 当前服务配置
+	_, _ = m.Write(globalConfig) // 全局配置
 	h := m.Sum(nil)
 	newConfigMd5 := fmt.Sprintf("%x", h)
 
diff --git a/internal/rpc/services/service_server.go b/internal/rpc/services/service_server.go
index f9f05147..78112dc4 100644
--- a/internal/rpc/services/service_server.go
+++ b/internal/rpc/services/service_server.go
@@ -801,3 +801,19 @@ func (this *ServerService) CountAllEnabledServersWithGroupId(ctx context.Context
 		Count: count,
 	}, nil
 }
+
+// 通知更新
+func (this *ServerService) NotifyServersChange(ctx context.Context, req *pb.NotifyServersChangeRequest) (*pb.NotifyServersChangeResponse, error) {
+	// 校验请求
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedSysEventDAO.CreateEvent(models.NewServerChangeEvent())
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.NotifyServersChangeResponse{}, nil
+}
diff --git a/internal/rpc/services/service_sys_setting.go b/internal/rpc/services/service_sys_setting.go
index 9b5354e4..7d5b15f7 100644
--- a/internal/rpc/services/service_sys_setting.go
+++ b/internal/rpc/services/service_sys_setting.go
@@ -22,7 +22,7 @@ func (this *SysSettingService) UpdateSysSetting(ctx context.Context, req *pb.Upd
 	if err != nil {
 		return nil, err
 	}
-
+	
 	return rpcutils.RPCUpdateSuccess()
 }
 
diff --git a/internal/tasks/event_looper.go b/internal/tasks/event_looper.go
index 90707d77..900ed473 100644
--- a/internal/tasks/event_looper.go
+++ b/internal/tasks/event_looper.go
@@ -14,6 +14,7 @@ func init() {
 	})
 }
 
+// 事件相关处理程序
 type EventLooper struct {
 }