feat: Improve international language and style (#8150)

agent/middleware/loading.go

@@ -1,25 +0,0 @@
-package middleware
-
-import (
-	"net/http"
-
-	"github.com/1Panel-dev/1Panel/agent/app/api/v2/helper"
-	"github.com/1Panel-dev/1Panel/agent/app/repo"
-	"github.com/gin-gonic/gin"
-)
-
-func GlobalLoading() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		settingRepo := repo.NewISettingRepo()
-		status, err := settingRepo.Get(settingRepo.WithByKey("SystemStatus"))
-		if err != nil {
-			helper.InternalServer(c, err)
-			return
-		}
-		if status.Value != "Free" {
-			helper.ErrorWithDetail(c, http.StatusProxyAuthRequired, status.Value, err)
-			return
-		}
-		c.Next()
-	}
-}

core/app/service/upgrade.go

@@ -138,17 +138,20 @@ func (u *UpgradeService) Upgrade(req dto.Upgrade) error {
 
 		if err := files.CopyItem(false, true, path.Join(tmpDir, "1panel-core"), "/usr/local/bin"); err != nil {
 			global.LOG.Errorf("upgrade 1panel-core failed, err: %v", err)
+			_ = settingRepo.Update("SystemStatus", "Free")
 			u.handleRollback(originalDir, 1)
 			return
 		}
 		if err := files.CopyItem(false, true, path.Join(tmpDir, "1panel-agent"), "/usr/local/bin"); err != nil {
 			global.LOG.Errorf("upgrade 1panel-agent failed, err: %v", err)
+			_ = settingRepo.Update("SystemStatus", "Free")
 			u.handleRollback(originalDir, 1)
 			return
 		}
 
 		if err := files.CopyItem(false, true, path.Join(tmpDir, "1pctl"), "/usr/local/bin"); err != nil {
 			global.LOG.Errorf("upgrade 1pctl failed, err: %v", err)
+			_ = settingRepo.Update("SystemStatus", "Free")
 			u.handleRollback(originalDir, 2)
 			return
 		}
@@ -160,6 +163,7 @@ func (u *UpgradeService) Upgrade(req dto.Upgrade) error {
 
 		if err := files.CopyItem(false, true, path.Join(tmpDir, "1panel*.service"), "/etc/systemd/system"); err != nil {
 			global.LOG.Errorf("upgrade 1panel.service failed, err: %v", err)
+			_ = settingRepo.Update("SystemStatus", "Free")
 			u.handleRollback(originalDir, 3)
 			return
 		}
@@ -207,20 +211,26 @@ func (u *UpgradeService) handleRollback(originalDir string, errStep int) {
 			global.LOG.Errorf("rollback 1panel db failed, err: %v", err)
 		}
 	}
-	if err := files.CopyItem(false, true, path.Join(originalDir, "1panel*"), "/usr/local/bin"); err != nil {
+	if err := files.CopyItem(false, true, path.Join(originalDir, "1panel-core"), "/usr/local/bin"); err != nil {
-		global.LOG.Errorf("rollback 1pctl failed, err: %v", err)
+		global.LOG.Errorf("rollback 1panel-core failed, err: %v", err)
+	}
+	if err := files.CopyItem(false, true, path.Join(originalDir, "1panel-agent"), "/usr/local/bin"); err != nil {
+		global.LOG.Errorf("rollback 1panel-agent failed, err: %v", err)
 	}
 	if errStep == 1 {
 		return
 	}
 	if err := files.CopyItem(false, true, path.Join(originalDir, "1pctl"), "/usr/local/bin"); err != nil {
-		global.LOG.Errorf("rollback 1panel failed, err: %v", err)
+		global.LOG.Errorf("rollback 1pctl failed, err: %v", err)
 	}
 	if errStep == 2 {
 		return
 	}
-	if err := files.CopyItem(false, true, path.Join(originalDir, "1panel*.service"), "/etc/systemd/system"); err != nil {
+	if err := files.CopyItem(false, true, path.Join(originalDir, "1panel-core.service"), "/etc/systemd/system"); err != nil {
-		global.LOG.Errorf("rollback 1panel failed, err: %v", err)
+		global.LOG.Errorf("rollback 1panel-core.service failed, err: %v", err)
+	}
+	if err := files.CopyItem(false, true, path.Join(originalDir, "1panel-agent.service"), "/etc/systemd/system"); err != nil {
+		global.LOG.Errorf("rollback 1panel-agent.service failed, err: %v", err)
 	}
 }
 

frontend/src/lang/modules/ja.ts

@@ -48,7 +48,7 @@ const message = {
             saveAndEnable: '保存して有効にします',
             import: '輸入',
             search: '検索',
-            refresh: 'リフレッシュします',
+            refresh: 'リロード',
             get: '得る',
             upgrade: 'アップグレード',
             update: '編集',
@@ -1237,7 +1237,7 @@ const message = {
         editPermissions: '編集@:file.mode',
         owner: '所有者',
         file: 'ファイル',
-        remoteFile: 'リモコンからダウンロードしてください',
+        remoteFile: 'リモートダウンロード',
         share: '共有',
         sync: 'データ同期',
         size: 'サイズ',

frontend/src/lang/modules/ru.ts

@@ -1271,7 +1271,7 @@ const message = {
         editPermissions: '@:file.mode',
         owner: 'Владелец',
         file: 'Файл',
-        remoteFile: 'Скачать с удаленного сервера',
+        remoteFile: 'Удалённая загрузка',
         share: 'Поделиться',
         sync: 'Синхронизация данных',
         size: 'Размер',

frontend/src/views/host/file-management/index.vue

@@ -229,12 +229,12 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column :label="$t('file.mode')" prop="mode" max-width="50" min-width="110px">
+                    <el-table-column :label="$t('file.mode')" prop="mode" min-width="110">
                         <template #default="{ row }">
                             <el-link :underline="false" @click="openMode(row)">{{ row.mode }}</el-link>
                         </template>
                     </el-table-column>
-                    <el-table-column :label="$t('commons.table.user')" prop="user" show-overflow-tooltip>
+                    <el-table-column :label="$t('commons.table.user')" prop="user" show-overflow-tooltip min-width="90">
                         <template #default="{ row }">
                             <el-link :underline="false" @click="openChown(row)">
                                 {{ row.user ? row.user : '-' }} ({{ row.uid }})
@@ -248,7 +248,7 @@
                             </el-link>
                         </template>
                     </el-table-column>
-                    <el-table-column :label="$t('file.size')" prop="size" max-width="50" sortable>
+                    <el-table-column :label="$t('file.size')" prop="size" min-width="100" sortable>
                         <template #default="{ row, $index }">
                             <span v-if="row.isDir">
                                 <el-button