diff --git a/internal/data/website.go b/internal/data/website.go index 5f22dcb9..6ec14854 100644 --- a/internal/data/website.go +++ b/internal/data/website.go @@ -238,9 +238,6 @@ func (r *websiteRepo) List(page, limit uint) ([]*biz.Website, int64, error) { func (r *websiteRepo) Create(req *request.WebsiteCreate) (*biz.Website, error) { // 初始化nginx配置 config := nginx.DefaultConf - if app.Locale == "zh_CN" { - config = nginx.DefaultConfZh - } p, err := nginx.NewParser(config) if err != nil { return nil, err @@ -294,9 +291,12 @@ func (r *websiteRepo) Create(req *request.WebsiteCreate) (*biz.Website, error) { return nil, err } var index []byte - if app.Locale == "zh_CN" { - index, err = embed.WebsiteFS.ReadFile(filepath.Join("website", "index_zh.html")) - } else { + switch app.Locale { + case "zh_CN": + index, err = embed.WebsiteFS.ReadFile(filepath.Join("website", "index_zh_CN.html")) + case "zh_TW": + index, err = embed.WebsiteFS.ReadFile(filepath.Join("website", "index_zh_TW.html")) + default: index, err = embed.WebsiteFS.ReadFile(filepath.Join("website", "index.html")) } if err != nil { @@ -306,9 +306,12 @@ func (r *websiteRepo) Create(req *request.WebsiteCreate) (*biz.Website, error) { return nil, err } var notFound []byte - if app.Locale == "zh_CN" { - notFound, err = embed.WebsiteFS.ReadFile(filepath.Join("website", "404_zh.html")) - } else { + switch app.Locale { + case "zh_CN": + notFound, err = embed.WebsiteFS.ReadFile(filepath.Join("website", "404_zh_CN.html")) + case "zh_TW": + notFound, err = embed.WebsiteFS.ReadFile(filepath.Join("website", "404_zh_TW.html")) + default: notFound, err = embed.WebsiteFS.ReadFile(filepath.Join("website", "404.html")) } if err != nil { @@ -632,9 +635,6 @@ func (r *websiteRepo) ResetConfig(id uint) error { // 初始化nginx配置 config := nginx.DefaultConf - if app.Locale == "zh_CN" { - config = nginx.DefaultConfZh - } p, err := nginx.NewParser(config) if err != nil { return err diff --git a/pkg/embed/website/404_zh.html b/pkg/embed/website/404_zh_CN.html similarity index 91% rename from pkg/embed/website/404_zh.html rename to pkg/embed/website/404_zh_CN.html index 6ae49ccb..0c614b4e 100644 --- a/pkg/embed/website/404_zh.html +++ b/pkg/embed/website/404_zh_CN.html @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@

Not Found

-

请求的 URL 在此服务器上未找到。

+

在此服务器上未找到请求的 URL。

如果您是手动输入的 URL 请检查拼写并重试。

由 AcePanel 强力驱动

diff --git a/pkg/embed/website/404_zh_TW.html b/pkg/embed/website/404_zh_TW.html new file mode 100644 index 00000000..bbdbb228 --- /dev/null +++ b/pkg/embed/website/404_zh_TW.html @@ -0,0 +1,17 @@ + + + + + + 404 Not Found + + + +
+

Not Found

+

在此伺服器上找不到請求的 URL。

+

如果您是手動輸入的 URL 請檢查拼寫並重試。

+

由 AcePanel 技術支援

+
+ + diff --git a/pkg/embed/website/index.html b/pkg/embed/website/index.html index d0352fc3..17bc3900 100644 --- a/pkg/embed/website/index.html +++ b/pkg/embed/website/index.html @@ -1,5 +1,5 @@ - + diff --git a/pkg/embed/website/index_zh.html b/pkg/embed/website/index_zh_CN.html similarity index 88% rename from pkg/embed/website/index_zh.html rename to pkg/embed/website/index_zh_CN.html index d27fceba..e0a184a7 100644 --- a/pkg/embed/website/index_zh.html +++ b/pkg/embed/website/index_zh_CN.html @@ -1,5 +1,5 @@ - + @@ -10,7 +10,7 @@

AcePanel

这是 AcePanel 的网站默认页面！

-

当您看到此页面，说明您的网站已创建成功。

+

当您看到此页面时，说明您的网站已创建成功。

由 AcePanel 强力驱动

diff --git a/pkg/embed/website/index_zh_TW.html b/pkg/embed/website/index_zh_TW.html new file mode 100644 index 00000000..f269be8c --- /dev/null +++ b/pkg/embed/website/index_zh_TW.html @@ -0,0 +1,17 @@ + + + + + + AcePanel + + + +
+

AcePanel

+

這是 AcePanel 的網站預設頁面！

+

當您看到此頁面時，表示您的網站已成功建立。

+

由 AcePanel 技術支援

+
+ + diff --git a/pkg/nginx/data.go b/pkg/nginx/data.go index 569cf6c6..816430cb 100644 --- a/pkg/nginx/data.go +++ b/pkg/nginx/data.go @@ -7,12 +7,12 @@ var order = []string{"listen", "server_name", "index", "root", const DefaultConf = `server { listen 80; server_name localhost; - index index.php index.html index.htm; + index index.php index.html; root /www/wwwroot/default; - # Error page configuration + # Error page error_page 404 /404.html; include enable-php-0.conf; - # Do not log static files + # Browser cache location ~ .*\.(bmp|jpg|jpeg|png|gif|svg|ico|tiff|webp|avif|heif|heic|jxl)$ { expires 30d; access_log /dev/null; @@ -23,35 +23,7 @@ const DefaultConf = `server { access_log /dev/null; error_log /dev/null; } - # Deny some sensitive directories - location ~ ^/(\.user.ini|\.htaccess|\.git|\.svn|\.env) { - return 404; - } - access_log /www/wwwlogs/default.log; - error_log /www/wwwlogs/default.log; -} -` - -const DefaultConfZh = `server { - listen 80; - server_name localhost; - index index.php index.html index.htm; - root /www/wwwroot/default; - # 错误页配置 - error_page 404 /404.html; - include enable-php-0.conf; - # 不记录静态文件日志 - location ~ .*\.(bmp|jpg|jpeg|png|gif|svg|ico|tiff|webp|avif|heif|heic|jxl)$ { - expires 30d; - access_log /dev/null; - error_log /dev/null; - } - location ~ .*\.(js|css|ttf|otf|woff|woff2|eot)$ { - expires 6h; - access_log /dev/null; - error_log /dev/null; - } - # 禁止部分敏感目录 + # Deny sensitive files location ~ ^/(\.user.ini|\.htaccess|\.git|\.svn|\.env) { return 404; }