From 36930b1bfd4d94ad5c3648ec342a9d631f86d84d Mon Sep 17 00:00:00 2001 From: mhsanaei Date: Thu, 17 Oct 2024 13:58:29 +0200 Subject: [PATCH] Calidity to gin-contrib --- go.mod | 2 +- go.sum | 4 ++-- web/session/session.go | 2 +- web/web.go | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index e965cd40..4dc681eb 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module x-ui go 1.23.2 require ( - github.com/Calidity/gin-sessions v1.3.1 github.com/gin-contrib/gzip v1.0.1 + github.com/gin-contrib/sessions v1.0.1 github.com/gin-gonic/gin v1.10.0 github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1 github.com/goccy/go-json v0.10.3 diff --git a/go.sum b/go.sum index 4682072f..d70e2c87 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/Calidity/gin-sessions v1.3.1 h1:nF3dCBWa7TZ4j26iYLwGRmzZy9YODhWoOS3fmi+snyE= -github.com/Calidity/gin-sessions v1.3.1/go.mod h1:I0+QE6qkO50TeN/n6If6novvxHk4Isvr23U8EdvPdns= github.com/OmarTariq612/goech v0.0.0-20240405204721-8e2e1dafd3a0 h1:Wo41lDOevRJSGpevP+8Pk5bANX7fJacO2w04aqLiC5I= github.com/OmarTariq612/goech v0.0.0-20240405204721-8e2e1dafd3a0/go.mod h1:FVGavL/QEBQDcBpr3fAojoK17xX5k9bicBphrOpP7uM= github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= @@ -31,6 +29,8 @@ github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344 h1:Arcl6UOIS/kgO2nW3 github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I= github.com/gin-contrib/gzip v1.0.1 h1:HQ8ENHODeLY7a4g1Au/46Z92bdGFl74OhxcZble9WJE= github.com/gin-contrib/gzip v1.0.1/go.mod h1:njt428fdUNRvjuJf16tZMYZ2Yl+WQB53X5wmhDwXvC4= +github.com/gin-contrib/sessions v1.0.1 h1:3hsJyNs7v7N8OtelFmYXFrulAf6zSR7nW/putcPEHxI= +github.com/gin-contrib/sessions v1.0.1/go.mod h1:ouxSFM24/OgIud5MJYQJLpy6AwxQ5EYO9yLhbtObGkM= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= diff --git a/web/session/session.go b/web/session/session.go index 36805bde..4df1e68e 100644 --- a/web/session/session.go +++ b/web/session/session.go @@ -5,7 +5,7 @@ import ( "x-ui/database/model" - sessions "github.com/Calidity/gin-sessions" + "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" ) diff --git a/web/web.go b/web/web.go index 63aba8cc..87a3df2b 100644 --- a/web/web.go +++ b/web/web.go @@ -24,9 +24,9 @@ import ( "x-ui/web/network" "x-ui/web/service" - sessions "github.com/Calidity/gin-sessions" - "github.com/Calidity/gin-sessions/cookie" "github.com/gin-contrib/gzip" + "github.com/gin-contrib/sessions" + "github.com/gin-contrib/sessions/cookie" "github.com/gin-gonic/gin" "github.com/robfig/cron/v3" ) @@ -332,13 +332,13 @@ func (s *Server) Start() (err error) { } listener = network.NewAutoHttpsListener(listener) listener = tls.NewListener(listener, c) - logger.Info("web server run https on", listener.Addr()) + logger.Info("Web server running HTTPS on", listener.Addr()) } else { - logger.Error("error in loading certificates: ", err) - logger.Info("web server run http on", listener.Addr()) + logger.Error("Error loading certificates:", err) + logger.Info("Web server running HTTP on", listener.Addr()) } } else { - logger.Info("web server run http on", listener.Addr()) + logger.Info("Web server running HTTP on", listener.Addr()) } s.listener = listener