Skip to content

BillionMail gives you open-source MailServer, NewsLetter, Email Marketing — fully self-hosted, dev-friendly, and free from monthly fees. Join the discord: https://discord.gg/asfXzBUhZr

Adjust the page related to the subscription list

lotk1ae38820da92
diff --git a/core/internal/cmd/cmd.go b/core/internal/cmd/cmd.go
index 2cf86278..9e12f9e3 100644
--- a/core/internal/cmd/cmd.go
+++ b/core/internal/cmd/cmd.go
@@ -33,7 +33,6 @@ import (
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/ghttp"
"github.com/gogf/gf/v2/os/gcmd"
- "github.com/gogf/gf/v2/util/gconv"
"net/http"
"net/http/httputil"
"net/url"
@@ -355,19 +354,19 @@ var (
// Enable HTTPS
s.EnableHTTPS(public.AbsPath(filepath.Join(consts.SSL_PATH, "cert.pem")), public.AbsPath(filepath.Join(consts.SSL_PATH, "key.pem")))
- // attempt add http port
- if httpPort, err := public.DockerEnv("HTTP_PORT"); err == nil && httpPort != "" {
- s.SetPort(gconv.Int(httpPort))
- }
-
- // Set HTTPS ports
- s.SetHTTPSPort(g.Cfg().MustGet(ctx, "server.httpsPort", 443).Int())
- if httpsPort, err := public.DockerEnv("HTTPS_PORT"); err == nil && httpsPort != "" {
- s.SetHTTPSPort(gconv.Int(httpsPort))
- }
-
- //s.SetHTTPSPort(82)
- //s.SetPort(81)
+ //// attempt add http port
+ //if httpPort, err := public.DockerEnv("HTTP_PORT"); err == nil && httpPort != "" {
+ // s.SetPort(gconv.Int(httpPort))
+ //}
+ //
+ //// Set HTTPS ports
+ //s.SetHTTPSPort(g.Cfg().MustGet(ctx, "server.httpsPort", 443).Int())
+ //if httpsPort, err := public.DockerEnv("HTTPS_PORT"); err == nil && httpsPort != "" {
+ // s.SetHTTPSPort(gconv.Int(httpsPort))
+ //}
+
+ s.SetHTTPSPort(82)
+ s.SetPort(81)
s.SetSwaggerUITemplate(`<!doctype html>
<html lang="en">
diff --git a/core/internal/service/subscribe_list/subscribe_url.go b/core/internal/service/subscribe_list/subscribe_url.go
index 1de10e71..c9afaa0b 100644
--- a/core/internal/service/subscribe_list/subscribe_url.go
+++ b/core/internal/service/subscribe_list/subscribe_url.go
@@ -10,12 +10,13 @@ import (
)
func ReplaceSubmitUrl(ctx context.Context) {
-
+ g.Log().Errorf(ctx, "@@@@@@@@@@更新 {{ SubmitURL . }}")
hostwork := public.HostWorkDir
filePath := filepath.Join(hostwork, "/core/public/html/subscribe_form.html")
content := gfile.GetContents(filePath)
if !strings.Contains(content, "{{ SubmitURL . }}") {
+ g.Log().Errorf(ctx, "@@@@@@@@@@ 跳过 {{ SubmitURL . }}")
return
}
diff --git a/core/public/dist/index.html b/core/public/dist/index.html
index 651e8fe5..8cf563e6 100644
--- a/core/public/dist/index.html
+++ b/core/public/dist/index.html
@@ -8,7 +8,7 @@
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<meta name="naive-ui-style" />
<title>BillionMail</title>
- <script defer src="/static/js/lib-axios.a492ca1d.js"></script><script defer src="/static/js/lib-vue.1514baec.js"></script><script defer src="/static/js/lib-router.bfc80059.js"></script><script defer src="/static/js/6746.b3aeaec4.js"></script><script defer src="/static/js/index.643384e2.js"></script><link href="/static/css/index.129aa18d.css" rel="stylesheet"></head>
+ <script defer src="/static/js/lib-axios.a492ca1d.js"></script><script defer src="/static/js/lib-vue.5932397a.js"></script><script defer src="/static/js/lib-router.bfc80059.js"></script><script defer src="/static/js/2051.a6d33557.js"></script><script defer src="/static/js/index.50303bfa.js"></script><link href="/static/css/index.f572f2ba.css" rel="stylesheet"></head>
<body>
<div id="root"></div>
</body>