Browse Source

chore: update translate

0xJacky 2 years ago
parent
commit
7a98c16535

+ 9 - 1
frontend/src/language/constants.ts

@@ -18,5 +18,13 @@ export const msg = [
     $gettext('Writing certificate private key to disk'),
     $gettext('Reloading nginx'),
     $gettext('Finished'),
-    $gettext('Issued certificate successfully')
+    $gettext('Issued certificate successfully'),
+
+    $gettext('Initialing core upgrader'),
+    $gettext('Initial core upgrader error'),
+    $gettext('Downloading latest release'),
+    $gettext('Download latest release error'),
+    $gettext('Performing core upgrade'),
+    $gettext('Perform core upgrade error'),
+    $gettext('Upgraded successfully')
 ]

+ 29 - 0
frontend/src/language/en/app.po

@@ -322,6 +322,14 @@ msgstr ""
 msgid "Domain Config Created Successfully"
 msgstr "Domain Config Created Successfully"
 
+#: src/language/constants.ts:26
+msgid "Download latest release error"
+msgstr ""
+
+#: src/language/constants.ts:25
+msgid "Downloading latest release"
+msgstr ""
+
 #: src/views/domain/DomainEdit.vue:4 src/views/domain/DomainEdit.vue:5
 msgid "Edit %{n}"
 msgstr "Edit %{n}"
@@ -457,6 +465,14 @@ msgstr ""
 msgid "HTTP Port"
 msgstr ""
 
+#: src/language/constants.ts:24
+msgid "Initial core upgrader error"
+msgstr ""
+
+#: src/language/constants.ts:23
+msgid "Initialing core upgrader"
+msgstr ""
+
 #: src/routes/index.ts:153 src/views/other/Install.vue:128
 msgid "Install"
 msgstr "Install"
@@ -672,6 +688,14 @@ msgstr "Password (*)"
 msgid "Path"
 msgstr "Path"
 
+#: src/language/constants.ts:28
+msgid "Perform core upgrade error"
+msgstr ""
+
+#: src/language/constants.ts:27
+msgid "Performing core upgrade"
+msgstr ""
+
 #: src/views/other/Install.vue:36
 msgid "Please input your E-mail!"
 msgstr "Please input your E-mail!"
@@ -931,6 +955,11 @@ msgstr "Saved successfully"
 msgid "Upgrade"
 msgstr ""
 
+#: src/language/constants.ts:29
+#, fuzzy
+msgid "Upgraded successfully"
+msgstr "Saved successfully"
+
 #: src/views/system/Upgrade.vue:63
 msgid "Upgrading Nginx UI, please wait..."
 msgstr ""

+ 28 - 0
frontend/src/language/messages.pot

@@ -332,6 +332,14 @@ msgstr ""
 msgid "Domain Config Created Successfully"
 msgstr ""
 
+#: src/language/constants.ts:26
+msgid "Download latest release error"
+msgstr ""
+
+#: src/language/constants.ts:25
+msgid "Downloading latest release"
+msgstr ""
+
 #: src/views/domain/DomainEdit.vue:4
 #: src/views/domain/DomainEdit.vue:5
 msgid "Edit %{n}"
@@ -480,6 +488,14 @@ msgstr ""
 msgid "HTTP Port"
 msgstr ""
 
+#: src/language/constants.ts:24
+msgid "Initial core upgrader error"
+msgstr ""
+
+#: src/language/constants.ts:23
+msgid "Initialing core upgrader"
+msgstr ""
+
 #: src/routes/index.ts:153
 #: src/views/other/Install.vue:128
 msgid "Install"
@@ -699,6 +715,14 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
+#: src/language/constants.ts:28
+msgid "Perform core upgrade error"
+msgstr ""
+
+#: src/language/constants.ts:27
+msgid "Performing core upgrade"
+msgstr ""
+
 #: src/views/other/Install.vue:36
 msgid "Please input your E-mail!"
 msgstr ""
@@ -961,6 +985,10 @@ msgstr ""
 msgid "Upgrade"
 msgstr ""
 
+#: src/language/constants.ts:29
+msgid "Upgraded successfully"
+msgstr ""
+
 #: src/views/system/Upgrade.vue:63
 msgid "Upgrading Nginx UI, please wait..."
 msgstr ""

File diff suppressed because it is too large
+ 0 - 0
frontend/src/language/translations.json


BIN
frontend/src/language/zh_CN/app.mo


+ 30 - 3
frontend/src/language/zh_CN/app.po

@@ -200,9 +200,8 @@ msgid "Content"
 msgstr "内容"
 
 #: src/views/system/Upgrade.vue:3
-#, fuzzy
 msgid "Core Upgrade"
-msgstr "升级"
+msgstr "核心升级"
 
 #: src/views/dashboard/DashBoard.vue:64
 msgid "CPU Status"
@@ -319,6 +318,14 @@ msgstr "域名"
 msgid "Domain Config Created Successfully"
 msgstr "域名配置文件创建成功"
 
+#: src/language/constants.ts:26
+msgid "Download latest release error"
+msgstr "下载最新版本错误"
+
+#: src/language/constants.ts:25
+msgid "Downloading latest release"
+msgstr "下载最新版本"
+
 #: src/views/domain/DomainEdit.vue:4 src/views/domain/DomainEdit.vue:5
 msgid "Edit %{n}"
 msgstr "编辑 %{n}"
@@ -452,6 +459,14 @@ msgstr "HTTP Challenge 监听端口"
 msgid "HTTP Port"
 msgstr "HTTP 监听端口"
 
+#: src/language/constants.ts:24
+msgid "Initial core upgrader error"
+msgstr "初始化核心升级程序错误"
+
+#: src/language/constants.ts:23
+msgid "Initialing core upgrader"
+msgstr "初始化核心升级器"
+
 #: src/routes/index.ts:153 src/views/other/Install.vue:128
 msgid "Install"
 msgstr "安装"
@@ -661,6 +676,14 @@ msgstr "密码 (*)"
 msgid "Path"
 msgstr "路径"
 
+#: src/language/constants.ts:28
+msgid "Perform core upgrade error"
+msgstr "执行核心升级错误"
+
+#: src/language/constants.ts:27
+msgid "Performing core upgrade"
+msgstr "正在进行核心升级"
+
 #: src/views/other/Install.vue:36
 msgid "Please input your E-mail!"
 msgstr "请输入您的邮箱!"
@@ -904,9 +927,13 @@ msgstr "更新成功"
 msgid "Upgrade"
 msgstr "升级"
 
+#: src/language/constants.ts:29
+msgid "Upgraded successfully"
+msgstr "升级成功"
+
 #: src/views/system/Upgrade.vue:63
 msgid "Upgrading Nginx UI, please wait..."
-msgstr ""
+msgstr "正在升级Nginx UI,请等待..."
 
 #: src/views/dashboard/DashBoard.vue:137
 msgid "Uptime:"

BIN
frontend/src/language/zh_TW/app.mo


+ 72 - 65
frontend/src/language/zh_TW/app.po

@@ -57,7 +57,7 @@ msgstr "高階模式"
 #: src/views/system/Upgrade.vue:12 src/views/system/Upgrade.vue:13
 #: src/views/system/Upgrade.vue:17 src/views/system/Upgrade.vue:21
 msgid "Arch"
-msgstr ""
+msgstr "架搆"
 
 #: src/components/StdDataDisplay/StdTable.vue:54
 #: src/views/domain/DomainList.vue:26
@@ -80,7 +80,7 @@ msgstr "您確定要刪除此 Location 嗎?"
 #: src/views/domain/ngx_conf/ConfigTemplate.vue:23
 #: src/views/domain/ngx_conf/ConfigTemplate.vue:29
 msgid "Author"
-msgstr ""
+msgstr "作者"
 
 #: src/views/preference/Preference.vue:22
 #: src/views/preference/Preference.vue:23
@@ -88,13 +88,12 @@ msgid "Auto"
 msgstr "自動"
 
 #: src/views/cert/Cert.vue:41 src/views/domain/cert/ChangeCert.vue:35
-#, fuzzy
 msgid "Auto Cert"
-msgstr "自動新"
+msgstr "自動新"
 
 #: src/views/cert/Cert.vue:8
 msgid "Auto cert is enabled, please do not modify this certification."
-msgstr ""
+msgstr "自動證書已啟用,請不要修改此證書。"
 
 #: src/views/nginx_log/NginxLog.vue:4
 msgid "Auto Refresh"
@@ -158,21 +157,19 @@ msgid "Certificate Status"
 msgstr "憑證狀態"
 
 #: src/routes/index.ts:87 src/views/cert/Cert.vue:2
-#, fuzzy
 msgid "Certification"
-msgstr "此憑證有效"
+msgstr "證照"
 
 #: src/views/domain/cert/ChangeCert.vue:2
 #: src/views/domain/cert/ChangeCert.vue:3
 #: src/views/domain/cert/ChangeCert.vue:5
-#, fuzzy
 msgid "Change Certificate"
-msgstr "正在獲取證書,請稍等..."
+msgstr "更改證書"
 
 #: src/views/system/Upgrade.vue:16 src/views/system/Upgrade.vue:17
 #: src/views/system/Upgrade.vue:21 src/views/system/Upgrade.vue:25
 msgid "Check again"
-msgstr ""
+msgstr "再次檢查"
 
 #: src/views/domain/ngx_conf/directive/DirectiveEditorItem.vue:34
 #: src/views/domain/ngx_conf/LocationEditor.vue:31
@@ -182,9 +179,8 @@ msgid "Comments"
 msgstr "註釋"
 
 #: src/views/domain/ngx_conf/ConfigTemplate.vue:61
-#, fuzzy
 msgid "Config Templates"
-msgstr "配置"
+msgstr "配置模板"
 
 #: src/views/domain/DomainAdd.vue:11
 msgid "Configuration Name"
@@ -206,7 +202,7 @@ msgstr "內容"
 
 #: src/views/system/Upgrade.vue:3
 msgid "Core Upgrade"
-msgstr ""
+msgstr "核心升級"
 
 #: src/views/dashboard/DashBoard.vue:64
 msgid "CPU Status"
@@ -231,7 +227,7 @@ msgstr "創建客戶端方便與CA服務器通信"
 #: src/views/system/Upgrade.vue:10 src/views/system/Upgrade.vue:11
 #: src/views/system/Upgrade.vue:15 src/views/system/Upgrade.vue:19
 msgid "Current Version"
-msgstr ""
+msgstr "當前版本"
 
 #: src/views/domain/ngx_conf/ConfigTemplate.vue:22
 #: src/views/domain/ngx_conf/ConfigTemplate.vue:23
@@ -240,7 +236,7 @@ msgstr ""
 #: src/views/domain/ngx_conf/NgxConfigEditor.vue:6
 #: src/views/domain/ngx_conf/NgxConfigEditor.vue:7
 msgid "Custom"
-msgstr ""
+msgstr "自訂"
 
 #: src/views/preference/Preference.vue:28
 #: src/views/preference/Preference.vue:29
@@ -276,7 +272,7 @@ msgstr "刪除站點:%{site_name}"
 #: src/views/domain/ngx_conf/ConfigTemplate.vue:24
 #: src/views/domain/ngx_conf/ConfigTemplate.vue:30
 msgid "Description"
-msgstr ""
+msgstr "敘述"
 
 #: src/views/system/About.vue:7 src/views/system/About.vue:8
 msgid "Development Mode"
@@ -284,7 +280,7 @@ msgstr "開發模式"
 
 #: src/views/config/config.ts:20
 msgid "Dir"
-msgstr ""
+msgstr "目錄"
 
 #: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:20
 msgid "Directive"
@@ -317,12 +313,20 @@ msgstr "磁碟 IO"
 
 #: src/views/cert/Cert.vue:32
 msgid "Domain"
-msgstr ""
+msgstr "網域"
 
 #: src/views/domain/DomainAdd.vue:58
 msgid "Domain Config Created Successfully"
 msgstr "域名配置文件創建成功"
 
+#: src/language/constants.ts:26
+msgid "Download latest release error"
+msgstr "下載最新版本錯誤"
+
+#: src/language/constants.ts:25
+msgid "Downloading latest release"
+msgstr "正在下載最新版本"
+
 #: src/views/domain/DomainEdit.vue:4 src/views/domain/DomainEdit.vue:5
 msgid "Edit %{n}"
 msgstr "編輯 %{n}"
@@ -375,7 +379,7 @@ msgstr "錯誤日志"
 #: src/views/system/Upgrade.vue:13 src/views/system/Upgrade.vue:14
 #: src/views/system/Upgrade.vue:18 src/views/system/Upgrade.vue:22
 msgid "Executable Path"
-msgstr ""
+msgstr "可執行檔路徑"
 
 #: src/views/domain/cert/CertInfo.vue:12
 msgid "Expiration Date: %{date}"
@@ -402,11 +406,11 @@ msgstr "獲取證書信息失敗"
 
 #: src/views/domain/DomainEdit.vue:117
 msgid "Failed to save, syntax error(s) was detected in the configuration."
-msgstr ""
+msgstr "保存失敗,在配置中檢測到語法錯誤。"
 
 #: src/views/config/config.ts:22
 msgid "File"
-msgstr ""
+msgstr "文件"
 
 #: src/views/other/Error.vue:3 src/views/other/Error.vue:4
 msgid "File Not Found"
@@ -422,17 +426,15 @@ msgstr "完成"
 
 #: src/views/config/ConfigEdit.vue:67
 msgid "Format Code"
-msgstr ""
+msgstr "格式化代碼"
 
 #: src/views/config/ConfigEdit.vue:52
-#, fuzzy
 msgid "Format error %{msg}"
-msgstr "儲存錯誤 %{msg}"
+msgstr "格式錯誤 %{msg}"
 
 #: src/views/config/ConfigEdit.vue:50
-#, fuzzy
 msgid "Format successfully"
-msgstr "保存成功"
+msgstr "格式化成功"
 
 #: src/components/StdDataEntry/components/StdPassword.vue:42
 msgid "Generate"
@@ -451,15 +453,21 @@ msgid "Home"
 msgstr "首頁"
 
 #: src/views/preference/Preference.vue:17
-#, fuzzy
 msgid "HTTP Challenge Port"
-msgstr "HTTP 監聽埠"
+msgstr "HTTP 挑戰端口"
 
 #: src/views/preference/Preference.vue:5
-#, fuzzy
 msgid "HTTP Port"
 msgstr "HTTP 監聽埠"
 
+#: src/language/constants.ts:24
+msgid "Initial core upgrader error"
+msgstr "初始核心升級程序錯誤"
+
+#: src/language/constants.ts:23
+msgid "Initialing core upgrader"
+msgstr "正在初始化核心升級程序"
+
 #: src/routes/index.ts:153 src/views/other/Install.vue:128
 msgid "Install"
 msgstr "安裝"
@@ -478,12 +486,12 @@ msgstr "頒發證書成功"
 
 #: src/views/preference/Preference.vue:11
 msgid "Jwt Secret"
-msgstr ""
+msgstr "Jwt Secret"
 
 #: src/views/system/Upgrade.vue:14 src/views/system/Upgrade.vue:15
 #: src/views/system/Upgrade.vue:19 src/views/system/Upgrade.vue:23
 msgid "Last checked at"
-msgstr ""
+msgstr "上次檢查時間"
 
 #: src/views/user/User.vue:26
 msgid "Leave blank for no change"
@@ -563,9 +571,8 @@ msgstr "修改配置"
 
 #: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:10
 #: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:9
-#, fuzzy
 msgid "Multi-line Directive"
-msgstr "行指令"
+msgstr "行指令"
 
 #: src/views/cert/Cert.vue:16 src/views/config/config.ts:9
 #: src/views/domain/cert/ChangeCert.vue:19 src/views/domain/DomainEdit.vue:46
@@ -591,26 +598,23 @@ msgstr "上傳流量"
 
 #: src/views/system/Upgrade.vue:34
 msgid "New version released"
-msgstr ""
+msgstr "新版本發布"
 
 #: src/views/domain/DomainAdd.vue:136
 msgid "Next"
 msgstr "下一步"
 
 #: src/views/preference/Preference.vue:33
-#, fuzzy
 msgid "Nginx Access Log Path"
-msgstr "訪問日誌"
+msgstr "Nginx 訪問日誌路徑"
 
 #: src/views/domain/DomainEdit.vue:31
-#, fuzzy
 msgid "Nginx Configuration Parse Error"
-msgstr "配置名稱"
+msgstr "Nginx 配置解析錯誤"
 
 #: src/views/preference/Preference.vue:36
-#, fuzzy
 msgid "Nginx Error Log Path"
-msgstr "Nginx 日誌"
+msgstr "Nginx 錯誤日誌路徑"
 
 #: src/routes/index.ts:103 src/views/nginx_log/NginxLog.vue:2
 msgid "Nginx Log"
@@ -633,11 +637,11 @@ msgstr "此前無效: %{date}"
 
 #: src/views/domain/cert/IssueCert.vue:37
 msgid "Note"
-msgstr ""
+msgstr "備註"
 
 #: src/language/constants.ts:16 src/views/domain/cert/IssueCert.vue:3
 msgid "Obtaining certificate"
-msgstr "正在獲取證書,請稍等..."
+msgstr "正在獲取證書"
 
 #: src/components/StdDataDisplay/StdBatchEdit.vue:8
 #: src/components/StdDataDisplay/StdCurd.vue:28
@@ -649,9 +653,8 @@ msgstr "確定"
 
 #: src/views/system/Upgrade.vue:11 src/views/system/Upgrade.vue:12
 #: src/views/system/Upgrade.vue:16 src/views/system/Upgrade.vue:20
-#, fuzzy
 msgid "OS"
-msgstr "作業系統:"
+msgstr "作業系統"
 
 #: src/views/dashboard/DashBoard.vue:147
 msgid "OS:"
@@ -674,6 +677,14 @@ msgstr "密碼 (*)"
 msgid "Path"
 msgstr "路徑"
 
+#: src/language/constants.ts:28
+msgid "Perform core upgrade error"
+msgstr "執行核心升級錯誤"
+
+#: src/language/constants.ts:27
+msgid "Performing core upgrade"
+msgstr "正在執行核心升級"
+
 #: src/views/other/Install.vue:36
 msgid "Please input your E-mail!"
 msgstr "請輸入您的郵箱!"
@@ -721,7 +732,6 @@ msgstr "註冊用戶"
 #: src/views/system/Upgrade.vue:24 src/views/system/Upgrade.vue:25
 #: src/views/system/Upgrade.vue:29 src/views/system/Upgrade.vue:33
 #: src/views/system/Upgrade.vue:36 src/views/system/Upgrade.vue:39
-#, fuzzy
 msgid "Reinstall"
 msgstr "安裝"
 
@@ -729,7 +739,7 @@ msgstr "安裝"
 #: src/views/system/Upgrade.vue:36 src/views/system/Upgrade.vue:40
 #: src/views/system/Upgrade.vue:43 src/views/system/Upgrade.vue:48
 msgid "Release Note"
-msgstr ""
+msgstr "發行公告"
 
 #: src/language/constants.ts:19
 msgid "Reloading nginx"
@@ -742,7 +752,6 @@ msgid "Reset"
 msgstr "重設"
 
 #: src/views/preference/Preference.vue:8
-#, fuzzy
 msgid "Run Mode"
 msgstr "高階模式"
 
@@ -826,24 +835,20 @@ msgid "Sites List"
 msgstr "站點列表"
 
 #: src/views/cert/Cert.vue:65
-#, fuzzy
 msgid "SSL Certificate Key Path"
-msgstr "憑證狀態"
+msgstr "SSL 證書密鑰路徑"
 
 #: src/views/cert/Cert.vue:58
-#, fuzzy
 msgid "SSL Certificate Path"
-msgstr "憑證狀態"
+msgstr "SSL證書路徑"
 
 #: src/views/cert/Cert.vue:19
-#, fuzzy
 msgid "SSL Certification Content"
-msgstr "憑證狀態"
+msgstr "SSL認證內容"
 
 #: src/views/cert/Cert.vue:22
-#, fuzzy
 msgid "SSL Certification Key Content"
-msgstr "憑證狀態"
+msgstr "SSL 證書密鑰內容"
 
 #: src/views/domain/DomainList.vue:24
 msgid "Status"
@@ -862,9 +867,8 @@ msgid "Swap"
 msgstr "交換空間"
 
 #: src/routes/index.ts:134
-#, fuzzy
 msgid "System"
-msgstr "系統訊息"
+msgstr "系統"
 
 #: src/components/StdDataDisplay/StdCurd.vue:3
 msgid "Table"
@@ -876,7 +880,7 @@ msgstr "終端"
 
 #: src/views/preference/Preference.vue:14
 msgid "Terminal Start Command"
-msgstr ""
+msgstr "終端啟動命令"
 
 #: src/views/domain/cert/IssueCert.vue:206
 msgid ""
@@ -891,7 +895,6 @@ msgid "The filename cannot contain the following characters: %{c}"
 msgstr "檔名不能包含以下字元: %{c}"
 
 #: src/views/domain/cert/IssueCert.vue:202
-#, fuzzy
 msgid ""
 "The server_name in the current configuration must be the domain name you "
 "need to get the certificate."
@@ -907,7 +910,7 @@ msgstr "外觀樣式"
 
 #: src/views/config/config.ts:14
 msgid "Type"
-msgstr ""
+msgstr "類型"
 
 #: src/views/cert/Cert.vue:72 src/views/config/config.ts:29
 #: src/views/domain/DomainList.vue:41 src/views/user/User.vue:37
@@ -924,11 +927,15 @@ msgstr "已成功更新"
 #: src/views/system/Upgrade.vue:38 src/views/system/Upgrade.vue:41
 #: src/views/system/Upgrade.vue:42
 msgid "Upgrade"
-msgstr ""
+msgstr "升級"
+
+#: src/language/constants.ts:29
+msgid "Upgraded successfully"
+msgstr "升級成功"
 
 #: src/views/system/Upgrade.vue:63
 msgid "Upgrading Nginx UI, please wait..."
-msgstr ""
+msgstr "正在升級 Nginx UI,請稍候..."
 
 #: src/views/dashboard/DashBoard.vue:137
 msgid "Uptime:"
@@ -950,7 +957,7 @@ msgstr "使用 HTTP01 挑戰提供者"
 #: src/views/domain/ngx_conf/ConfigTemplate.vue:13
 #: src/views/domain/ngx_conf/ConfigTemplate.vue:9
 msgid "View"
-msgstr ""
+msgstr "查看"
 
 #: src/views/domain/cert/IssueCert.vue:26 src/views/domain/DomainAdd.vue:22
 msgid "Warning"
@@ -976,12 +983,12 @@ msgstr "是的"
 
 #: src/views/system/Upgrade.vue:30
 msgid "You are using the latest version"
-msgstr ""
+msgstr "您使用的是最新版本"
 
 #: src/views/system/Upgrade.vue:10 src/views/system/Upgrade.vue:14
 #: src/views/system/Upgrade.vue:18 src/views/system/Upgrade.vue:9
 msgid "You can check Nginx UI upgrade at this page."
-msgstr ""
+msgstr "您可以在此頁面查看 Nginx UI 升級。"
 
 #: src/views/system/About.vue:27
 msgctxt "Project"

+ 1 - 2
go.mod

@@ -16,6 +16,7 @@ require (
 	github.com/google/uuid v1.1.1
 	github.com/gorilla/websocket v1.4.2
 	github.com/hpcloud/tail v1.0.0
+	github.com/jpillora/overseer v1.1.6
 	github.com/pkg/errors v0.9.1
 	github.com/shirou/gopsutil/v3 v3.21.7
 	github.com/spf13/cast v1.3.1
@@ -30,13 +31,11 @@ require (
 require (
 	github.com/StackExchange/wmi v1.2.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.1.0 // indirect
-	github.com/fvbock/endless v0.0.0-20170109170031-447134032cb6 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-ole/go-ole v1.2.5 // indirect
 	github.com/golang/protobuf v1.3.4 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.2 // indirect
-	github.com/jpillora/overseer v1.1.6 // indirect
 	github.com/jpillora/s3 v1.1.4 // indirect
 	github.com/json-iterator/go v1.1.9 // indirect
 	github.com/leodido/go-urn v1.2.0 // indirect

+ 1 - 4
go.sum

@@ -23,8 +23,6 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/0xJacky/gonginx v0.0.0-20230104051937-4c3a63627efb h1:UzbGgIvP2UXpqlPG0ylT8/y0TIl5tBvAIeI3OAChFHI=
-github.com/0xJacky/gonginx v0.0.0-20230104051937-4c3a63627efb/go.mod h1:+uQMU+LMBHOQermcm/ICplG+r35Ypb6Up9iYKlvKuTE=
 github.com/Azure/azure-sdk-for-go v32.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/go-autorest/autorest v0.1.0/go.mod h1:AKyIcETwSUFxIcs/Wnq/C+kwCtlEYGUVd7FPNb2slmg=
 github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
@@ -108,8 +106,6 @@ github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fvbock/endless v0.0.0-20170109170031-447134032cb6 h1:6VSn3hB5U5GeA6kQw4TwWIWbOhtvR2hmbBJnTOtqTWc=
-github.com/fvbock/endless v0.0.0-20170109170031-447134032cb6/go.mod h1:YxOVT5+yHzKvwhsiSIWmbAYM3Dr9AEEbER2dVayfBkg=
 github.com/getkin/kin-openapi v0.13.0/go.mod h1:WGRs2ZMM1Q8LR1QBEwUxC6RJEfaBcD0s+pcEVXFuAjw=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
@@ -409,6 +405,7 @@ github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:s
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/smartystreets/gunit v1.0.4/go.mod h1:EH5qMBab2UclzXUcpR8b93eHsIlp9u+pDQIRp5DZNzQ=
+github.com/smartystreets/gunit v1.1.3 h1:32x+htJCu3aMswhPw3teoJ+PnWPONqdNgaGs6Qt8ZaU=
 github.com/smartystreets/gunit v1.1.3/go.mod h1:EH5qMBab2UclzXUcpR8b93eHsIlp9u+pDQIRp5DZNzQ=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=

+ 0 - 1
main.go

@@ -31,7 +31,6 @@ func main() {
 		Program:          prog,
 		Address:          fmt.Sprintf(":%s", settings.ServerSettings.HttpPort),
 		Fetcher:          &fetcher.File{Path: r.ExPath},
-		Debug:            gin.IsDebugging(),
 		TerminateTimeout: 0,
 	})
 

+ 14 - 2
server/api/upgrade.go

@@ -46,7 +46,7 @@ func PerformCoreUpgrade(c *gin.Context) {
 
 	_ = ws.WriteJSON(gin.H{
 		"status":  "info",
-		"message": "Initialing Core Upgrader",
+		"message": "Initialing core upgrader",
 	})
 
 	u, err := service.NewUpgrader()
@@ -54,7 +54,11 @@ func PerformCoreUpgrade(c *gin.Context) {
 	if err != nil {
 		_ = ws.WriteJSON(gin.H{
 			"status":  "error",
-			"message": "Initialing core upgrader error",
+			"message": "Initial core upgrader error",
+		})
+		_ = ws.WriteJSON(gin.H{
+			"status":  "error",
+			"message": err.Error(),
 		})
 		log.Println("[Error] PerformCoreUpgrade service.NewUpgrader()", err)
 		return
@@ -69,6 +73,10 @@ func PerformCoreUpgrade(c *gin.Context) {
 			"status":  "error",
 			"message": "Download latest release error",
 		})
+		_ = ws.WriteJSON(gin.H{
+			"status":  "error",
+			"message": err.Error(),
+		})
 		log.Println("[Error] PerformCoreUpgrade DownloadLatestRelease", err)
 		return
 	}
@@ -84,6 +92,10 @@ func PerformCoreUpgrade(c *gin.Context) {
 			"status":  "error",
 			"message": "Perform core upgrade error",
 		})
+		_ = ws.WriteJSON(gin.H{
+			"status":  "error",
+			"message": err.Error(),
+		})
 		log.Println("[Error] PerformCoreUpgrade PerformCoreUpgrade", err)
 		return
 	}

+ 6 - 5
server/service/upgrade.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	_github "github.com/0xJacky/Nginx-UI/.github"
 	"github.com/0xJacky/Nginx-UI/frontend"
+	"github.com/0xJacky/Nginx-UI/server/pkg/helper"
 	"github.com/0xJacky/Nginx-UI/server/settings"
 	"github.com/pkg/errors"
 	"io"
@@ -185,11 +186,11 @@ func (u *Upgrader) DownloadLatestRelease() (tarName string, err error) {
 }
 
 func (u *Upgrader) PerformCoreUpgrade(dir, tarPath string) (err error) {
-	//err = helper.UnTar(dir, tarPath)
-	//if err != nil {
-	//    err = errors.Wrap(err, "PerformCoreUpgrade unTar error")
-	//    return
-	//}
+	err = helper.UnTar(dir, tarPath)
+	if err != nil {
+		err = errors.Wrap(err, "PerformCoreUpgrade unTar error")
+		return
+	}
 
 	_ = os.Remove(tarPath)
 

Some files were not shown because too many files changed in this diff