diff --git a/server/server-handler.go b/server/server-handler.go index 2297a2d..498bcfe 100644 --- a/server/server-handler.go +++ b/server/server-handler.go @@ -2,7 +2,7 @@ package server import ( cs "git.loafle.net/commons/server-go" - oge "git.loafle.net/overflow/gateway/external" + oe "git.loafle.net/overflow/external-go" ogrs "git.loafle.net/overflow/gateway_rpc/server" "git.loafle.net/overflow/member_gateway_rpc/config" "git.loafle.net/overflow/member_gateway_rpc/subscribe" @@ -22,7 +22,7 @@ func (sh *ServerHandlers) Init(serverCtx cs.ServerCtx) error { if err := sh.ServerHandlers.Init(serverCtx); nil != err { return err } - oge.InitPackage(sh.Config.External) + oe.InitPackage(sh.Config.External) subscribe.InitPackage() return nil @@ -33,7 +33,7 @@ func (sh *ServerHandlers) OnStart(serverCtx cs.ServerCtx) error { return err } - oge.StartPackage(sh.Config.External) + oe.StartPackage(sh.Config.External) subscribe.StartPackage() return nil @@ -41,14 +41,14 @@ func (sh *ServerHandlers) OnStart(serverCtx cs.ServerCtx) error { func (sh *ServerHandlers) OnStop(serverCtx cs.ServerCtx) { subscribe.StopPackage() - oge.StopPackage(sh.Config.External) + oe.StopPackage(sh.Config.External) sh.ServerHandlers.OnStop(serverCtx) } func (sh *ServerHandlers) Destroy(serverCtx cs.ServerCtx) { subscribe.DestroyPackage() - oge.DestroyPackage(sh.Config.External) + oe.DestroyPackage(sh.Config.External) sh.ServerHandlers.Destroy(serverCtx) } diff --git a/servlet/webapp-servlet.go b/servlet/webapp-servlet.go index 92e7ca8..04935e3 100644 --- a/servlet/webapp-servlet.go +++ b/servlet/webapp-servlet.go @@ -7,6 +7,7 @@ import ( "git.loafle.net/commons/logging-go" "git.loafle.net/commons/server-go" "git.loafle.net/commons/server-go/socket" + oe "git.loafle.net/overflow/external-go" og "git.loafle.net/overflow/gateway" ogs "git.loafle.net/overflow/gateway/subscribe" ogrs "git.loafle.net/overflow/gateway_rpc/servlet" @@ -89,7 +90,7 @@ func (s *WebappServlets) Handshake(servletCtx server.ServletCtx, ctx *fasthttp.R sessionID := uuid.NewV4().String() servletCtx.SetAttribute(og.SessionIDKey, sessionID) - servletCtx.SetAttribute(og.SessionClientTypeKey, og.MEMBER) + servletCtx.SetAttribute(og.SessionClientTypeKey, oe.MEMBER) servletCtx.SetAttribute(og.SessionTargetIDKey, userEmail) return nil, nil diff --git a/subscribe/subscribe.go b/subscribe/subscribe.go index 1ea2ed8..91044bd 100644 --- a/subscribe/subscribe.go +++ b/subscribe/subscribe.go @@ -2,7 +2,7 @@ package subscribe import ( "git.loafle.net/commons/logging-go" - oger "git.loafle.net/overflow/gateway/external/redis" + oer "git.loafle.net/overflow/external-go/redis" ogsr "git.loafle.net/overflow/gateway/subscribe/redis" ) @@ -10,7 +10,7 @@ var Subscriber *ogsr.Subscribers func InitPackage() { Subscriber = &ogsr.Subscribers{} - Subscriber.Conn = oger.Pool.Get() + Subscriber.Conn = oer.Pool.Get() if err := Subscriber.Start(); nil != err { logging.Logger().Panic(err) }