From e85811512f50986e44d98c2d300686bed6d11d31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?= Date: Fri, 23 May 2025 22:12:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- define/err.go | 40 ---------------------------------------- dispatch/abstract.go | 7 +++++-- go.mod | 1 + go.sum | 2 ++ server.go | 3 ++- 5 files changed, 10 insertions(+), 43 deletions(-) diff --git a/define/err.go b/define/err.go index 90d84a8..b52d040 100644 --- a/define/err.go +++ b/define/err.go @@ -7,46 +7,6 @@ // Date : 2021-04-01 6:38 下午 package define -// NewError ... -// -// Author : go_developer@163.com<张德满> -// -// Date : 6:40 下午 2021/4/1 -func NewError(errType string, message string) *Error { - return &Error{ - errType: errType, - message: message, - } -} - -// Error 定义异常 -// -// Author : go_developer@163.com<张德满> -// -// Date : 6:38 下午 2021/4/1 -type Error struct { - errType string - message string -} - -// Error 获取错误信息, 兼容内置 error 类型 -// -// Author : go_developer@163.com<张德满> -// -// Date : 6:39 下午 2021/4/1 -func (e Error) Error() string { - return e.message -} - -// GetErrType 获取错误类型 -// -// Author : go_developer@163.com<张德满> -// -// Date : 6:42 下午 2021/4/1 -func (e Error) GetErrType() string { - return e.errType -} - const ( // ErrorTypeNodeListEmpty 服务器节点列表为空 ErrorTypeNodeListEmpty = "NODE_LIST_EMPTY" diff --git a/dispatch/abstract.go b/dispatch/abstract.go index 8ac109f..082efad 100644 --- a/dispatch/abstract.go +++ b/dispatch/abstract.go @@ -7,7 +7,10 @@ // Date : 2021-04-01 5:53 下午 package dispatch -import "git.zhangdeman.cn/gateway/balance/define" +import ( + "git.zhangdeman.cn/gateway/balance/define" + "git.zhangdeman.cn/zhangdeman/exception" +) // IDispatch 负载均衡的接口定义 // @@ -16,5 +19,5 @@ import "git.zhangdeman.cn/gateway/balance/define" // Date : 2:44 下午 2021/4/1 type IDispatch interface { // Get 获取一个节点 - Get(nodeList []*define.SeverNode) (string, *define.Error) + Get(nodeList []*define.SeverNode) (string, exception.IException) } diff --git a/go.mod b/go.mod index 2979c59..c4c72e3 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ require ( ) require ( + git.zhangdeman.cn/zhangdeman/exception v0.0.0-20250510123912-a0d52fc093ab // indirect git.zhangdeman.cn/zhangdeman/util v0.0.0-20240618042405-6ee2c904644e // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mozillazg/go-pinyin v0.20.0 // indirect diff --git a/go.sum b/go.sum index bc9c05f..c3a0218 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ git.zhangdeman.cn/zhangdeman/easylock v0.0.0-20230731062340-983985c12eda h1:bMD6r9gjRy7cO+T4zRQVYAesgIblBdTnhzT1vN5wjvI= git.zhangdeman.cn/zhangdeman/easylock v0.0.0-20230731062340-983985c12eda/go.mod h1:dT0rmHcJ9Z9IqWeMIt7YzR88nKkNV2V3dfG0j9Q6lK0= +git.zhangdeman.cn/zhangdeman/exception v0.0.0-20250510123912-a0d52fc093ab h1:O0XaAKKb8qrjcjewonmKfnRsMFoCfJF+tUv6RfhRe94= +git.zhangdeman.cn/zhangdeman/exception v0.0.0-20250510123912-a0d52fc093ab/go.mod h1:Voc8J4ordx7nuMWpgACXXZULQy7ZIuBzcEIoS8VnDIw= git.zhangdeman.cn/zhangdeman/util v0.0.0-20240618042405-6ee2c904644e h1:Q973S6CcWr1ICZhFI1STFOJ+KUImCl2BaIXm6YppBqI= git.zhangdeman.cn/zhangdeman/util v0.0.0-20240618042405-6ee2c904644e/go.mod h1:VpPjBlwz8U+OxZuxzHQBv1aEEZ3pStH6bZvT21ADEbI= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= diff --git a/server.go b/server.go index 0c368a0..7b73cc1 100644 --- a/server.go +++ b/server.go @@ -11,6 +11,7 @@ import ( "git.zhangdeman.cn/gateway/balance/define" "git.zhangdeman.cn/gateway/balance/dispatch" "git.zhangdeman.cn/zhangdeman/easylock" + "git.zhangdeman.cn/zhangdeman/exception" ) // NewServer ... @@ -73,7 +74,7 @@ func (s *Server) Remove(nodeID string) { // Author : go_developer@163.com<张德满> // // Date : 5:17 下午 2021/4/1 -func (s *Server) Get() (string, *define.Error) { +func (s *Server) Get() (string, exception.IException) { _ = s.lock.RLock() defer func() { _ = s.lock.RUnlock()