From 8212f7da516e1871ff78c959b4648f074b8352cd Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Thu, 19 Dec 2024 14:41:03 +0800 Subject: [PATCH 1/8] levi service --- app/levi/cmd/main.go | 64 ++++++++++++++++++++++++++++++++ app/levi/controller/init.go | 30 +++++++++++++++ app/levi/controller/levi.go | 13 +++++++ library/httpserver/httpserver.go | 28 ++++++++++++++ 4 files changed, 135 insertions(+) create mode 100644 app/levi/cmd/main.go create mode 100644 app/levi/controller/init.go create mode 100644 app/levi/controller/levi.go diff --git a/app/levi/cmd/main.go b/app/levi/cmd/main.go new file mode 100644 index 00000000..d9f1ec53 --- /dev/null +++ b/app/levi/cmd/main.go @@ -0,0 +1,64 @@ +package main + +import ( + "fmt" + "net" + "net/http" + "os" + "runtime" + "service/app/levi/controller" + "service/library/httpengine" + "service/library/httpserver" + "service/library/logger" + "strings" + "time" +) + +func main() { + defer func() { + logger.Recover() + }() + + // 初始化http server + ip := GetIp() + port := 9900 + router := httpengine.NewRouter() + controller.Init(router) + srv := &http.Server{ + Addr: fmt.Sprintf("%s:%d", ip, port), + Handler: router, + } + + httpserver.StartLeviServer(srv, ip, port) +} + +func PrintAndExit(msg string) { + _, file, line, _ := runtime.Caller(1) + errorMsg := fmt.Sprintf("file %s, line %d, %s\n", file, line, msg) + _, _ = fmt.Fprintf(os.Stderr, errorMsg) + logger.Fatal(errorMsg) + time.Sleep(1) //wait logger flush + //os.Exit(1) +} + +func GetIp() string { + addrs, err := net.InterfaceAddrs() + if err != nil { + PrintAndExit("get ip fail") + return "127.0.0.1" + } + retIp := "" + for _, address := range addrs { + // 检查ip地址判断是否回环地址 + if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() { + if ipnet.IP.To4() != nil { + ip := ipnet.IP.String() + if strings.HasPrefix(ip, "172.") { + retIp = ip + break + } + } + } + } + return retIp +} diff --git a/app/levi/controller/init.go b/app/levi/controller/init.go new file mode 100644 index 00000000..ea3a0de9 --- /dev/null +++ b/app/levi/controller/init.go @@ -0,0 +1,30 @@ +package controller + +import ( + "github.com/gin-gonic/gin" + "net/http" + "service/api/base" + "service/api/consts" +) + +func Init(r *gin.Engine) { + r.HandleMethodNotAllowed = true + + r.GET("/seeyouagain", SeeYouAgainHandler) +} + +func ReplyOk(ctx *gin.Context, data any) { + ctx.JSON(http.StatusOK, base.BaseResponse{ + Ret: consts.RetCodeSuccess, + ErrCode: consts.ErrorCodeSuccess, + Data: data, + }) +} + +func ReplyErrorMsg(ctx *gin.Context, msg string) { + ctx.AbortWithStatusJSON(http.StatusOK, base.BaseResponse{ + Ret: consts.RetCodeFail, + ErrCode: consts.ErrorCodeFail, + Msg: msg, + }) +} diff --git a/app/levi/controller/levi.go b/app/levi/controller/levi.go new file mode 100644 index 00000000..2f0bfe00 --- /dev/null +++ b/app/levi/controller/levi.go @@ -0,0 +1,13 @@ +package controller + +import ( + "github.com/gin-gonic/gin" +) + +func SeeYouAgainHandler(ctx *gin.Context) { + data := map[string]any{ + "api_domain": "api.tiefen.space", + "ws_domain": "ws.tiefen.space", + } + ReplyOk(ctx, data) +} diff --git a/library/httpserver/httpserver.go b/library/httpserver/httpserver.go index e1e7afbc..34ce5951 100644 --- a/library/httpserver/httpserver.go +++ b/library/httpserver/httpserver.go @@ -171,3 +171,31 @@ func StartFirenzeServer(srv *http.Server, cfg *configcenter.DefaultConfig, ip st logger.Info("Server exited") //setServerStatusFD(ServerStatusFDStop) } + +func StartLeviServer(srv *http.Server, ip string, port int) { + go func() { + logger.Info("Start HTTP Server, ip: %v, port: %v", ip, port) + if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed { + logger.Fatal("listen: %v", err) + return + } + }() + + quit := make(chan os.Signal, 1) + signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM) + <-quit + logger.Info("Shutdown Server ...") + + ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second) + if err := srv.Shutdown(ctx); err != nil { + logger.Fatal("Server Shutdown:", err) + } + defer cancel() + + select { + case <-ctx.Done(): + logger.Info("timeout of 1 seconds.") + } + + logger.Info("Server exited") +} From 3c1a18c02587fc05db142c909f850b044407ea40 Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Thu, 19 Dec 2024 15:53:35 +0800 Subject: [PATCH 2/8] cdn levianderwin --- library/mediafiller/mediafiller.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/library/mediafiller/mediafiller.go b/library/mediafiller/mediafiller.go index c1d1bd29..d2d7753a 100644 --- a/library/mediafiller/mediafiller.go +++ b/library/mediafiller/mediafiller.go @@ -48,11 +48,11 @@ func SetFileServerDomainName(fileServerDomainName string) { } func (p *MediaFiller) GetFileServerDomain() string { - return "https://filecdntx01.tiefen.fun/" - if rand.Intn(100) < 50 { - return "https://filecdntx01.tiefen.fun/" - } - return "https://filecdn01.tiefen.fun/" + return "https://levianderwinv01.tiefen.space/" + //if rand.Intn(100) < 50 { + // return "https://filecdntx01.tiefen.fun/" + //} + //return "https://filecdn01.tiefen.fun/" //return defaultMediaFiller.fileServerDomainName } From 58437d5e81872edaa5d5307da48094ab0324a6b0 Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Thu, 19 Dec 2024 15:56:50 +0800 Subject: [PATCH 3/8] cdn --- library/mediafiller/mediafiller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/mediafiller/mediafiller.go b/library/mediafiller/mediafiller.go index d2d7753a..245991f1 100644 --- a/library/mediafiller/mediafiller.go +++ b/library/mediafiller/mediafiller.go @@ -48,7 +48,7 @@ func SetFileServerDomainName(fileServerDomainName string) { } func (p *MediaFiller) GetFileServerDomain() string { - return "https://levianderwinv01.tiefen.space/" + return "https://filecdntx01.tiefen.fun/" //if rand.Intn(100) < 50 { // return "https://filecdntx01.tiefen.fun/" //} From 9a1a89416375d4fd7a07fc2912aca482a6e59f2a Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Thu, 19 Dec 2024 16:01:42 +0800 Subject: [PATCH 4/8] fix cdn --- library/mediafiller/mediafiller.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/mediafiller/mediafiller.go b/library/mediafiller/mediafiller.go index 245991f1..4cb802c6 100644 --- a/library/mediafiller/mediafiller.go +++ b/library/mediafiller/mediafiller.go @@ -48,11 +48,11 @@ func SetFileServerDomainName(fileServerDomainName string) { } func (p *MediaFiller) GetFileServerDomain() string { + //return "https://filecdntx01.tiefen.fun/" + if rand.Intn(100) < 5 { + return "https://levianderwinv01.tiefen.space/" + } return "https://filecdntx01.tiefen.fun/" - //if rand.Intn(100) < 50 { - // return "https://filecdntx01.tiefen.fun/" - //} - //return "https://filecdn01.tiefen.fun/" //return defaultMediaFiller.fileServerDomainName } From 810c625615ade75048ca5085308c3ec34aa6ad31 Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Thu, 19 Dec 2024 16:08:43 +0800 Subject: [PATCH 5/8] fix cdn 30 --- library/mediafiller/mediafiller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/mediafiller/mediafiller.go b/library/mediafiller/mediafiller.go index 4cb802c6..5e0f495c 100644 --- a/library/mediafiller/mediafiller.go +++ b/library/mediafiller/mediafiller.go @@ -49,7 +49,7 @@ func SetFileServerDomainName(fileServerDomainName string) { func (p *MediaFiller) GetFileServerDomain() string { //return "https://filecdntx01.tiefen.fun/" - if rand.Intn(100) < 5 { + if rand.Intn(100) < 30 { return "https://levianderwinv01.tiefen.space/" } return "https://filecdntx01.tiefen.fun/" From 72ab59c9feb3e23dd4ae3a38f382c96e255a4b3c Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Thu, 19 Dec 2024 16:30:27 +0800 Subject: [PATCH 6/8] rollback --- library/mediafiller/mediafiller.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/mediafiller/mediafiller.go b/library/mediafiller/mediafiller.go index 5e0f495c..0c0306c2 100644 --- a/library/mediafiller/mediafiller.go +++ b/library/mediafiller/mediafiller.go @@ -49,9 +49,9 @@ func SetFileServerDomainName(fileServerDomainName string) { func (p *MediaFiller) GetFileServerDomain() string { //return "https://filecdntx01.tiefen.fun/" - if rand.Intn(100) < 30 { - return "https://levianderwinv01.tiefen.space/" - } + //if rand.Intn(100) < 30 { + // return "https://levianderwinv01.tiefen.space/" + //} return "https://filecdntx01.tiefen.fun/" //return defaultMediaFiller.fileServerDomainName From 97380ed80bfb18edecc0c2143b936d938024f80e Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Thu, 19 Dec 2024 16:53:41 +0800 Subject: [PATCH 7/8] zid --- app/mix/controller/zonemoment_api.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/app/mix/controller/zonemoment_api.go b/app/mix/controller/zonemoment_api.go index 14ed6dae..8df1171e 100644 --- a/app/mix/controller/zonemoment_api.go +++ b/app/mix/controller/zonemoment_api.go @@ -8,6 +8,7 @@ import ( "service/bizcommon/util" "service/library/logger" "service/library/mediafiller" + "strings" "github.com/gin-gonic/gin" ) @@ -158,6 +159,20 @@ func ApiGetZoneMomentListByZid(ctx *gin.Context) { mediafiller.FillList(ctx, mediaFillableList) service.DefaultService.UtilEncryptVideosForZoneMomentVOs(ctx, list) + if *req.Zid == 1 { + for _, vo := range list { + for _, mc := range vo.MediaComp.Images { + oldUrl := "" + oldUrls := mc.Urls + if len(oldUrls) >= 0 { + oldUrl = oldUrls[0] + } + newUrl := strings.ReplaceAll(oldUrl, "https://filecdntx01.tiefen.fun/", "https://levianderwinv01.tiefen.space/") + mc.Urls = []string{newUrl} + } + } + } + data := &zonemomentproto.ApiListByZidData{ List: list, Offset: req.Offset + len(list), From 13505eec5cb4253127e2365910d486c0f042e3db Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Thu, 19 Dec 2024 18:56:29 +0800 Subject: [PATCH 8/8] fix cold_config no jwt --- app/mix/controller/init.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mix/controller/init.go b/app/mix/controller/init.go index 9261dd43..7fd498e1 100644 --- a/app/mix/controller/init.go +++ b/app/mix/controller/init.go @@ -316,7 +316,7 @@ func Init(r *gin.Engine) { apiShareGroup.POST("zone_url", GetZoneShareUrl) apiConfigGroup := r.Group("/api/config", PrepareToC()) - apiConfigGroup.POST("cold_config", middleware.JSONParamValidator(base.BaseRequest{}), middleware.JwtAuthenticator(), ColdConfigHandler) + apiConfigGroup.POST("cold_config", middleware.JSONParamValidator(base.BaseRequest{}), ColdConfigHandler) // =============================== 以下是服务，只允许内网调用 ===============================