From 4dc54dc5bc2d84c90c4b2ba9f2ffe1751fd16966 Mon Sep 17 00:00:00 2001 From: Rogee Date: Mon, 16 Dec 2024 15:01:43 +0800 Subject: [PATCH] fix: issues --- backend/config.prod.toml | 12 ++++++------ backend/modules/middlewares/m_wechat_auth.go | 6 ++---- backend/pkg/service/http/http.go | 3 +++ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/backend/config.prod.toml b/backend/config.prod.toml index e3c9722..45f601a 100755 --- a/backend/config.prod.toml +++ b/backend/config.prod.toml @@ -3,7 +3,7 @@ Mode = "prod" BaseURI = "https://qvyun.mp.jdwan.com" [Http] -Port = 80 +Port = 9600 [Swagger] BaseRoute = "doc" @@ -14,15 +14,15 @@ Version = "1.0.0" [Database] -Host = "10.1.1.3" +Host = "host.local" Database = "qvyun" Password = "xixi0202" [Wechat] -AppId = "wxf5bf0adeb99c2afd" -AppSecret = "3cf8fad4aa414f2b861399f111b22bb5" +AppId = "wx47649361b6eba174" +AppSecret = "e9cdf19b006cd294a9dae7ad8ae08b72" Token = "W8Xhw5TivYBgY" -AesKey = "F6AqCxAV4W1eCrY6llJ2zapphKK49CQN3RgtPDrjhnI" +AesKey = "OlgPgMvsl92zy5oErtEzRcziRT2txoN3jgEHV6RQZMY" DevMode = false [JWT] @@ -36,4 +36,4 @@ Salt = "LiXi.Y@140202" Type = "local" # Path = "/projects/mp-qvyun/backend/fixtures/processed" Path = "/app/processed" -Asset = "/app/dist" +Asset = "/app/assets" diff --git a/backend/modules/middlewares/m_wechat_auth.go b/backend/modules/middlewares/m_wechat_auth.go index 56c064c..66fe26b 100644 --- a/backend/modules/middlewares/m_wechat_auth.go +++ b/backend/modules/middlewares/m_wechat_auth.go @@ -35,10 +35,8 @@ func (f *Middlewares) WeChatAuth(c fiber.Ctx) error { if state == "" && code == "" { url := string(c.Request().URI().FullURI()) - if f.app.IsDevMode() && f.app.BaseURI != nil { - url = strings.ReplaceAll(url, "http", "https") - url = strings.ReplaceAll(url, c.BaseURL(), *f.app.BaseURI) - } + url = strings.ReplaceAll(url, "http", "https") + url = strings.ReplaceAll(url, c.BaseURL(), *f.app.BaseURI) log.WithField("module", "middleware.SilentAuth").Debug("redirect_uri: ", url) diff --git a/backend/pkg/service/http/http.go b/backend/pkg/service/http/http.go index 5e1f4fa..096b6a4 100644 --- a/backend/pkg/service/http/http.go +++ b/backend/pkg/service/http/http.go @@ -78,6 +78,9 @@ func Serve(cmd *cobra.Command, args []string) error { engine.Use(mid.WeChatVerify) engine.Use([]string{"/t/:tenant", "/t/:tenant/*"}, mid.WeChatAuth, http.Wechat.Render) + engine.Get("MP_verify_dEF9kn8rJlBsuLKk.txt", func(c fiber.Ctx) error { + return c.SendString("dEF9kn8rJlBsuLKk") + }) engine.Get("/posters/:tenant/:hash.jpg", func(c fiber.Ctx) error { tenant := c.Params("tenant") hash := c.Params("hash")