fix translation issue, skip verify tls when getting cert info

frontend/src/locale/en/LC_MESSAGES/app.po

@@ -27,19 +27,19 @@ msgstr ""
 msgid "Add Site"
 msgstr ""
 
-#: src/components/StdDataDisplay/StdTable.vue:79
+#: src/components/StdDataDisplay/StdTable.vue:67
 msgid "Are you sure you want to destroy?"
 msgstr ""
 
-#: src/components/StdDataDisplay/StdTable.vue:44
+#: src/components/StdDataDisplay/StdTable.vue:43
 msgid "Are you sure you want to restore?"
 msgstr ""
 
-#: src/views/domain/DomainAdd.vue:89 src/views/domain/DomainEdit.vue:164
+#: src/views/domain/DomainAdd.vue:89 src/views/domain/DomainEdit.vue:163
 msgid "Auto-renewal disabled for %{name}"
 msgstr ""
 
-#: src/views/domain/DomainAdd.vue:83 src/views/domain/DomainEdit.vue:158
+#: src/views/domain/DomainAdd.vue:83 src/views/domain/DomainEdit.vue:157
 msgid "Auto-renewal enabled for %{name}"
 msgstr ""
 
@@ -115,7 +115,7 @@ msgstr ""
 msgid "Database (Optional, default: database)"
 msgstr ""
 
-#: src/components/StdDataDisplay/StdTable.vue:85
+#: src/components/StdDataDisplay/StdTable.vue:73
 msgid "Destroy"
 msgstr ""
 
@@ -127,7 +127,7 @@ msgstr ""
 msgid "Development Mode"
 msgstr ""
 
-#: src/views/domain/DomainAdd.vue:91 src/views/domain/DomainEdit.vue:166
+#: src/views/domain/DomainAdd.vue:91 src/views/domain/DomainEdit.vue:165
 msgid "Disable auto-renewal failed for %{name}"
 msgstr ""
 
@@ -136,7 +136,7 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: src/views/domain/DomainEdit.vue:180 src/views/domain/DomainList.vue:55
+#: src/views/domain/DomainEdit.vue:179 src/views/domain/DomainList.vue:55
 msgid "Disabled successfully"
 msgstr ""
 
@@ -176,7 +176,7 @@ msgstr ""
 msgid "Email (*)"
 msgstr ""
 
-#: src/views/domain/DomainAdd.vue:85 src/views/domain/DomainEdit.vue:160
+#: src/views/domain/DomainAdd.vue:85 src/views/domain/DomainEdit.vue:159
 msgid "Enable auto-renewal failed for %{name}"
 msgstr ""
 
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: src/views/domain/DomainAdd.vue:37 src/views/domain/DomainEdit.vue:172
+#: src/views/domain/DomainAdd.vue:37 src/views/domain/DomainEdit.vue:171
 #: src/views/domain/DomainList.vue:46
 msgid "Enabled successfully"
 msgstr ""
@@ -203,11 +203,11 @@ msgstr ""
 msgid "Expiration Date: %{date}"
 msgstr ""
 
-#: src/views/domain/DomainEdit.vue:183 src/views/domain/DomainList.vue:59
+#: src/views/domain/DomainEdit.vue:182 src/views/domain/DomainList.vue:59
 msgid "Failed to disable %{msg}"
 msgstr ""
 
-#: src/views/domain/DomainEdit.vue:175 src/views/domain/DomainList.vue:50
+#: src/views/domain/DomainEdit.vue:174 src/views/domain/DomainList.vue:50
 msgid "Failed to enable %{msg}"
 msgstr ""
 
@@ -335,8 +335,7 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: src/components/StdDataDisplay/StdTable.vue:62
-#: src/components/StdDataDisplay/StdTable.vue:97
+#: src/components/StdDataDisplay/StdTable.vue:61
 msgid "No, I'm rethink"
 msgstr ""
 
@@ -398,7 +397,7 @@ msgstr ""
 msgid "Receive"
 msgstr ""
 
-#: src/components/StdDataDisplay/StdTable.vue:50
+#: src/components/StdDataDisplay/StdTable.vue:49
 msgid "Restore"
 msgstr ""
 
@@ -411,7 +410,7 @@ msgid "Save"
 msgstr ""
 
 #: src/views/config/ConfigEdit.vue:47 src/views/domain/DomainAdd.vue:44
-#: src/views/domain/DomainAdd.vue:55 src/views/domain/DomainEdit.vue:142
+#: src/views/domain/DomainAdd.vue:55 src/views/domain/DomainEdit.vue:141
 msgid "Save error %{msg}"
 msgstr ""
 
@@ -514,7 +513,6 @@ msgstr ""
 msgid "Writes"
 msgstr ""
 
-#: src/components/StdDataDisplay/StdTable.vue:56
-#: src/components/StdDataDisplay/StdTable.vue:91
+#: src/components/StdDataDisplay/StdTable.vue:55
 msgid "Yes, I'm sure"
 msgstr ""

frontend/src/locale/zh_CN/LC_MESSAGES/app.po

@@ -29,19 +29,19 @@ msgstr "操作"
 msgid "Add Site"
 msgstr "添加站点"
 
-#: src/components/StdDataDisplay/StdTable.vue:79
+#: src/components/StdDataDisplay/StdTable.vue:67
 msgid "Are you sure you want to destroy?"
 msgstr "你确定要删除?"
 
-#: src/components/StdDataDisplay/StdTable.vue:44
+#: src/components/StdDataDisplay/StdTable.vue:43
 msgid "Are you sure you want to restore?"
 msgstr "你确定要反删除?"
 
-#: src/views/domain/DomainAdd.vue:89 src/views/domain/DomainEdit.vue:164
+#: src/views/domain/DomainAdd.vue:89 src/views/domain/DomainEdit.vue:163
 msgid "Auto-renewal disabled for %{name}"
 msgstr "成功关闭 %{name} 自动续签"
 
-#: src/views/domain/DomainAdd.vue:83 src/views/domain/DomainEdit.vue:158
+#: src/views/domain/DomainAdd.vue:83 src/views/domain/DomainEdit.vue:157
 msgid "Auto-renewal enabled for %{name}"
 msgstr "成功启用 %{name} 自动续签"
 
@@ -117,7 +117,7 @@ msgstr "仪表盘"
 msgid "Database (Optional, default: database)"
 msgstr "数据库 (可选，默认: database)"
 
-#: src/components/StdDataDisplay/StdTable.vue:85
+#: src/components/StdDataDisplay/StdTable.vue:73
 msgid "Destroy"
 msgstr "删除"
 
@@ -129,7 +129,7 @@ msgstr "检测到版本更新，页面将会刷新。"
 msgid "Development Mode"
 msgstr "开发模式"
 
-#: src/views/domain/DomainAdd.vue:91 src/views/domain/DomainEdit.vue:166
+#: src/views/domain/DomainAdd.vue:91 src/views/domain/DomainEdit.vue:165
 msgid "Disable auto-renewal failed for %{name}"
 msgstr "关闭 %{name} 自动续签失败"
 
@@ -138,7 +138,7 @@ msgstr "关闭 %{name} 自动续签失败"
 msgid "Disabled"
 msgstr "禁用"
 
-#: src/views/domain/DomainEdit.vue:180 src/views/domain/DomainList.vue:55
+#: src/views/domain/DomainEdit.vue:179 src/views/domain/DomainList.vue:55
 msgid "Disabled successfully"
 msgstr "禁用成功"
 
@@ -178,7 +178,7 @@ msgstr "编辑站点"
 msgid "Email (*)"
 msgstr "邮箱 (*)"
 
-#: src/views/domain/DomainAdd.vue:85 src/views/domain/DomainEdit.vue:160
+#: src/views/domain/DomainAdd.vue:85 src/views/domain/DomainEdit.vue:159
 msgid "Enable auto-renewal failed for %{name}"
 msgstr "启用 %{name} 自动续签失败"
 
@@ -196,7 +196,7 @@ msgstr "启用 TLS"
 msgid "Enabled"
 msgstr "启用"
 
-#: src/views/domain/DomainAdd.vue:37 src/views/domain/DomainEdit.vue:172
+#: src/views/domain/DomainAdd.vue:37 src/views/domain/DomainEdit.vue:171
 #: src/views/domain/DomainList.vue:46
 msgid "Enabled successfully"
 msgstr "启用成功"
@@ -205,11 +205,11 @@ msgstr "启用成功"
 msgid "Expiration Date: %{date}"
 msgstr "过期时间: %{date}"
 
-#: src/views/domain/DomainEdit.vue:183 src/views/domain/DomainList.vue:59
+#: src/views/domain/DomainEdit.vue:182 src/views/domain/DomainList.vue:59
 msgid "Failed to disable %{msg}"
 msgstr "禁用失败 %{msg}"
 
-#: src/views/domain/DomainEdit.vue:175 src/views/domain/DomainList.vue:50
+#: src/views/domain/DomainEdit.vue:174 src/views/domain/DomainList.vue:50
 msgid "Failed to enable %{msg}"
 msgstr "启用失败 %{msg}"
 
@@ -339,8 +339,7 @@ msgstr "上传流量"
 msgid "Next"
 msgstr "下一步"
 
-#: src/components/StdDataDisplay/StdTable.vue:62
-#: src/components/StdDataDisplay/StdTable.vue:97
+#: src/components/StdDataDisplay/StdTable.vue:61
 msgid "No, I'm rethink"
 msgstr "再想想"
 
@@ -402,7 +401,7 @@ msgstr "读"
 msgid "Receive"
 msgstr "下载"
 
-#: src/components/StdDataDisplay/StdTable.vue:50
+#: src/components/StdDataDisplay/StdTable.vue:49
 msgid "Restore"
 msgstr "反删除"
 
@@ -415,7 +414,7 @@ msgid "Save"
 msgstr "保存"
 
 #: src/views/config/ConfigEdit.vue:47 src/views/domain/DomainAdd.vue:44
-#: src/views/domain/DomainAdd.vue:55 src/views/domain/DomainEdit.vue:142
+#: src/views/domain/DomainAdd.vue:55 src/views/domain/DomainEdit.vue:141
 msgid "Save error %{msg}"
 msgstr "保存错误 %{msg}"
 
@@ -489,8 +488,8 @@ msgid ""
 "fields in your configuration file. The configuration filename cannot be "
 "changed after it has been created."
 msgstr ""
-"只有在您的配置文件中有相应字段时，下列的配置才能生效。配置文件名称创建后不"
-"可修改。"
+"只有在您的配置文件中有相应字段时，下列的配置才能生效。配置文件名称创建后不可"
+"修改。"
 
 #: src/views/domain/DomainAdd.vue:15 src/views/domain/DomainAdd.vue:4
 #: src/views/domain/DomainEdit.vue:24 src/views/domain/DomainEdit.vue:5
@@ -522,8 +521,7 @@ msgstr "用户名 (*)"
 msgid "Writes"
 msgstr "写"
 
-#: src/components/StdDataDisplay/StdTable.vue:56
-#: src/components/StdDataDisplay/StdTable.vue:91
+#: src/components/StdDataDisplay/StdTable.vue:55
 msgid "Yes, I'm sure"
 msgstr "是的"
 

frontend/src/locale/zh_TW/LC_MESSAGES/app.po

@@ -30,19 +30,19 @@ msgstr "操作"
 msgid "Add Site"
 msgstr "新增站點"
 
-#: src/components/StdDataDisplay/StdTable.vue:79
+#: src/components/StdDataDisplay/StdTable.vue:67
 msgid "Are you sure you want to destroy?"
 msgstr "你确定要删除?"
 
-#: src/components/StdDataDisplay/StdTable.vue:44
+#: src/components/StdDataDisplay/StdTable.vue:43
 msgid "Are you sure you want to restore?"
 msgstr "你确定要反删除?"
 
-#: src/views/domain/DomainAdd.vue:89 src/views/domain/DomainEdit.vue:164
+#: src/views/domain/DomainAdd.vue:89 src/views/domain/DomainEdit.vue:163
 msgid "Auto-renewal disabled for %{name}"
 msgstr "成功關閉 %{name} 自動續簽"
 
-#: src/views/domain/DomainAdd.vue:83 src/views/domain/DomainEdit.vue:158
+#: src/views/domain/DomainAdd.vue:83 src/views/domain/DomainEdit.vue:157
 msgid "Auto-renewal enabled for %{name}"
 msgstr "成功啟用 %{name} 自動續簽"
 
@@ -118,7 +118,7 @@ msgstr "儀表盤"
 msgid "Database (Optional, default: database)"
 msgstr "資料庫 (可選，預設: database)"
 
-#: src/components/StdDataDisplay/StdTable.vue:85
+#: src/components/StdDataDisplay/StdTable.vue:73
 msgid "Destroy"
 msgstr "删除"
 
@@ -130,7 +130,7 @@ msgstr "檢測到版本更新，頁面將會重新整理。"
 msgid "Development Mode"
 msgstr "開發模式"
 
-#: src/views/domain/DomainAdd.vue:91 src/views/domain/DomainEdit.vue:166
+#: src/views/domain/DomainAdd.vue:91 src/views/domain/DomainEdit.vue:165
 msgid "Disable auto-renewal failed for %{name}"
 msgstr "關閉 %{name} 自動續簽失敗"
 
@@ -139,7 +139,7 @@ msgstr "關閉 %{name} 自動續簽失敗"
 msgid "Disabled"
 msgstr "禁用"
 
-#: src/views/domain/DomainEdit.vue:180 src/views/domain/DomainList.vue:55
+#: src/views/domain/DomainEdit.vue:179 src/views/domain/DomainList.vue:55
 msgid "Disabled successfully"
 msgstr "禁用成功"
 
@@ -179,7 +179,7 @@ msgstr "編輯站點"
 msgid "Email (*)"
 msgstr "郵箱 (*)"
 
-#: src/views/domain/DomainAdd.vue:85 src/views/domain/DomainEdit.vue:160
+#: src/views/domain/DomainAdd.vue:85 src/views/domain/DomainEdit.vue:159
 msgid "Enable auto-renewal failed for %{name}"
 msgstr "啟用 %{name} 自動續簽失敗"
 
@@ -197,7 +197,7 @@ msgstr "啟用 TLS"
 msgid "Enabled"
 msgstr "啟用"
 
-#: src/views/domain/DomainAdd.vue:37 src/views/domain/DomainEdit.vue:172
+#: src/views/domain/DomainAdd.vue:37 src/views/domain/DomainEdit.vue:171
 #: src/views/domain/DomainList.vue:46
 msgid "Enabled successfully"
 msgstr "啟用成功"
@@ -206,11 +206,11 @@ msgstr "啟用成功"
 msgid "Expiration Date: %{date}"
 msgstr "過期時間: %{date}"
 
-#: src/views/domain/DomainEdit.vue:183 src/views/domain/DomainList.vue:59
+#: src/views/domain/DomainEdit.vue:182 src/views/domain/DomainList.vue:59
 msgid "Failed to disable %{msg}"
 msgstr "禁用失敗 %{msg}"
 
-#: src/views/domain/DomainEdit.vue:175 src/views/domain/DomainList.vue:50
+#: src/views/domain/DomainEdit.vue:174 src/views/domain/DomainList.vue:50
 msgid "Failed to enable %{msg}"
 msgstr "啟用失敗 %{msg}"
 
@@ -340,8 +340,7 @@ msgstr "上傳流量"
 msgid "Next"
 msgstr "下一步"
 
-#: src/components/StdDataDisplay/StdTable.vue:62
-#: src/components/StdDataDisplay/StdTable.vue:97
+#: src/components/StdDataDisplay/StdTable.vue:61
 msgid "No, I'm rethink"
 msgstr "再想想"
 
@@ -403,7 +402,7 @@ msgstr "讀"
 msgid "Receive"
 msgstr "下載"
 
-#: src/components/StdDataDisplay/StdTable.vue:50
+#: src/components/StdDataDisplay/StdTable.vue:49
 msgid "Restore"
 msgstr "反删除"
 
@@ -416,7 +415,7 @@ msgid "Save"
 msgstr "儲存"
 
 #: src/views/config/ConfigEdit.vue:47 src/views/domain/DomainAdd.vue:44
-#: src/views/domain/DomainAdd.vue:55 src/views/domain/DomainEdit.vue:142
+#: src/views/domain/DomainAdd.vue:55 src/views/domain/DomainEdit.vue:141
 msgid "Save error %{msg}"
 msgstr "儲存錯誤 %{msg}"
 
@@ -490,8 +489,8 @@ msgid ""
 "fields in your configuration file. The configuration filename cannot be "
 "changed after it has been created."
 msgstr ""
-"只有在您的配置檔案中有相應欄位時，下列的配置才能生效。配置檔名稱建立後不可"
-"修改。"
+"只有在您的配置檔案中有相應欄位時，下列的配置才能生效。配置檔名稱建立後不可修"
+"改。"
 
 #: src/views/domain/DomainAdd.vue:15 src/views/domain/DomainAdd.vue:4
 #: src/views/domain/DomainEdit.vue:24 src/views/domain/DomainEdit.vue:5
@@ -523,8 +522,7 @@ msgstr "使用者名稱 (*)"
 msgid "Writes"
 msgstr "寫"
 
-#: src/components/StdDataDisplay/StdTable.vue:56
-#: src/components/StdDataDisplay/StdTable.vue:91
+#: src/components/StdDataDisplay/StdTable.vue:55
 msgid "Yes, I'm sure"
 msgstr "是的"
 

frontend/src/views/domain/DomainEdit.vue

@@ -194,7 +194,6 @@ export default {
                     if (this.$refs['cert-info']) this.$refs['cert-info'].get()
                 }
             }).catch(r => {
-                console.log(r)
                 this.$message.error($interpolate($gettext('Save error %{msg}'), {msg: r.message ?? ''}), 10)
             })
         },
@@ -211,15 +210,15 @@ export default {
         change_auto_cert() {
             if (this.config.auto_cert) {
                 this.$api.domain.add_auto_cert(this.name).then(() => {
-                    this.$message.success($interpolate($gettext('Auto-renewal enabled for %{name}', {name: this.name})))
+                    this.$message.success($interpolate($gettext('Auto-renewal enabled for %{name}'), {name: this.name}))
                 }).catch(e => {
-                    this.$message.error(e.message ?? $interpolate($gettext('Enable auto-renewal failed for %{name}', {name: this.name})))
+                    this.$message.error(e.message ?? $interpolate($gettext('Enable auto-renewal failed for %{name}'), {name: this.name}))
                 })
             } else {
                 this.$api.domain.remove_auto_cert(this.name).then(() => {
-                    this.$message.success($interpolate($gettext('Auto-renewal disabled for %{name}', {name: this.name})))
+                    this.$message.success($interpolate($gettext('Auto-renewal disabled for %{name}'), {name: this.name}))
                 }).catch(e => {
-                    this.$message.error(e.message ?? $interpolate($gettext('Disable auto-renewal failed for %{name}', {name: this.name})))
+                    this.$message.error(e.message ?? $interpolate($gettext('Disable auto-renewal failed for %{name}'), {name: this.name}))
                 })
             }
         },

server/router/middleware.go

@@ -60,7 +60,9 @@ type serverFileSystemType struct {
 
 func (f serverFileSystemType) Exists(prefix string, _path string) bool {
 	file, err := f.Open(path.Join(prefix, _path))
-	defer file.Close()
+	if file != nil {
+		defer file.Close()
+	}
 	return err == nil
 }
 

server/tool/cert.go

@@ -5,6 +5,7 @@ import (
 	"crypto/ecdsa"
 	"crypto/elliptic"
 	"crypto/rand"
+	"crypto/tls"
 	"crypto/x509"
 	"github.com/0xJacky/Nginx-UI/server/model"
 	"github.com/0xJacky/Nginx-UI/server/settings"
@@ -50,6 +51,7 @@ func AutoCert() {
 			domain := autoCertList[i].Domain
 			key, err := GetCertInfo(domain)
 			if err != nil {
+				log.Println("GetCertInfo Err", err)
 				// 获取证书信息失败，本次跳过
 				continue
 			}
@@ -77,6 +79,7 @@ func GetCertInfo(domain string) (key *x509.Certificate, err error) {
 				Timeout: 5 * time.Second,
 			}).DialContext,
 			DisableKeepAlives: true,
+			TLSClientConfig:   &tls.Config{InsecureSkipVerify: true},
 		},
 		Timeout: 5 * time.Second,
 	}