diff --git a/backend/app/repo/databse_mysql.go b/backend/app/repo/database_mysql.go similarity index 100% rename from backend/app/repo/databse_mysql.go rename to backend/app/repo/database_mysql.go diff --git a/backend/app/repo/databse_postgresql.go b/backend/app/repo/database_postgresql.go similarity index 100% rename from backend/app/repo/databse_postgresql.go rename to backend/app/repo/database_postgresql.go diff --git a/backend/app/service/docker.go b/backend/app/service/docker.go index 9e6f555bf..371538732 100644 --- a/backend/app/service/docker.go +++ b/backend/app/service/docker.go @@ -181,7 +181,7 @@ func (u *DockerService) UpdateConf(req dto.SettingUpdate) error { } else { daemonMap["iptables"] = false } - case "Dirver": + case "Driver": if opts, ok := daemonMap["exec-opts"]; ok { if optsValue, isArray := opts.([]interface{}); isArray { for i := 0; i < len(optsValue); i++ { diff --git a/backend/app/service/snapshot_create.go b/backend/app/service/snapshot_create.go index 1ba4c6994..1cc006554 100644 --- a/backend/app/service/snapshot_create.go +++ b/backend/app/service/snapshot_create.go @@ -97,11 +97,11 @@ func snapAppData(snap snapHelper, targetDir string) { } } } - for _, rumtime := range runtimes { + for _, runtime := range runtimes { for _, existImage := range existImages { - if rumtime.Image == existImage && !duplicateMap[rumtime.Image] { - imageSaveList = append(imageSaveList, rumtime.Image) - duplicateMap[rumtime.Image] = true + if runtime.Image == existImage && !duplicateMap[runtime.Image] { + imageSaveList = append(imageSaveList, runtime.Image) + duplicateMap[runtime.Image] = true } } } diff --git a/backend/app/service/upgrade.go b/backend/app/service/upgrade.go index 04ef61ca5..a58d6f63a 100644 --- a/backend/app/service/upgrade.go +++ b/backend/app/service/upgrade.go @@ -261,8 +261,8 @@ func loadArch() (string, error) { if std == "armv7l\n" { return "armv7", nil } - return "", fmt.Errorf("unsupport such arch: arm-%s", std) + return "", fmt.Errorf("unsupported such arch: arm-%s", std) default: - return "", fmt.Errorf("unsupport such arch: %s", runtime.GOARCH) + return "", fmt.Errorf("unsupported such arch: %s", runtime.GOARCH) } } diff --git a/backend/init/business/business.go b/backend/init/business/business.go index c58cce1b1..4a544b5da 100644 --- a/backend/init/business/business.go +++ b/backend/init/business/business.go @@ -23,7 +23,7 @@ func syncApp() { func syncInstalledApp() { if err := service.NewIAppInstalledService().SyncAll(true); err != nil { - global.LOG.Errorf("sync instaled app error: %s", err.Error()) + global.LOG.Errorf("sync installed app error: %s", err.Error()) } } diff --git a/backend/init/db/db.go b/backend/init/db/db.go index e549b4595..5742e9297 100644 --- a/backend/init/db/db.go +++ b/backend/init/db/db.go @@ -17,13 +17,13 @@ import ( func Init() { if _, err := os.Stat(global.CONF.System.DbPath); err != nil { if err := os.MkdirAll(global.CONF.System.DbPath, os.ModePerm); err != nil { - panic(fmt.Errorf("init db dir falied, err: %v", err)) + panic(fmt.Errorf("init db dir failed, err: %v", err)) } } fullPath := global.CONF.System.DbPath + "/" + global.CONF.System.DbFile if _, err := os.Stat(fullPath); err != nil { if _, err := os.Create(fullPath); err != nil { - panic(fmt.Errorf("init db file falied, err: %v", err)) + panic(fmt.Errorf("init db file failed, err: %v", err)) } } diff --git a/backend/init/log/log.go b/backend/init/log/log.go index f04f4a4b5..9e1128e2d 100644 --- a/backend/init/log/log.go +++ b/backend/init/log/log.go @@ -56,8 +56,8 @@ type MineFormatter struct{} func (s *MineFormatter) Format(entry *logrus.Entry) ([]byte, error) { detailInfo := "" if entry.Caller != nil { - funcion := strings.ReplaceAll(entry.Caller.Function, "github.com/1Panel-dev/1Panel/backend/", "") - detailInfo = fmt.Sprintf("(%s: %d)", funcion, entry.Caller.Line) + function := strings.ReplaceAll(entry.Caller.Function, "github.com/1Panel-dev/1Panel/backend/", "") + detailInfo = fmt.Sprintf("(%s: %d)", function, entry.Caller.Line) } if len(entry.Data) == 0 { msg := fmt.Sprintf("[%s] [%s] %s %s \n", time.Now().Format(TimeFormat), strings.ToUpper(entry.Level.String()), entry.Message, detailInfo) diff --git a/backend/utils/firewall/client/ufw.go b/backend/utils/firewall/client/ufw.go index cbaca5ed8..f7bd48897 100644 --- a/backend/utils/firewall/client/ufw.go +++ b/backend/utils/firewall/client/ufw.go @@ -141,7 +141,7 @@ func (f *Ufw) Port(port FireInfo, operation string) error { case "drop": port.Strategy = "deny" default: - return fmt.Errorf("unsupport strategy %s", port.Strategy) + return fmt.Errorf("unsupported strategy %s", port.Strategy) } if cmd.CheckIllegal(port.Protocol, port.Port) { return buserr.New(constant.ErrCmdIllegal) @@ -168,7 +168,7 @@ func (f *Ufw) RichRules(rule FireInfo, operation string) error { case "drop": rule.Strategy = "deny" default: - return fmt.Errorf("unsupport strategy %s", rule.Strategy) + return fmt.Errorf("unsupported strategy %s", rule.Strategy) } if cmd.CheckIllegal(operation, rule.Protocol, rule.Address, rule.Port) { diff --git a/backend/utils/mysql/helper/dump.go b/backend/utils/mysql/helper/dump.go index 10dad5186..4e1f85e4d 100644 --- a/backend/utils/mysql/helper/dump.go +++ b/backend/utils/mysql/helper/dump.go @@ -152,7 +152,7 @@ func Dump(dns string, opts ...DumpOption) error { var columns []string columns, err = lineRows.Columns() if err != nil { - global.LOG.Errorf("get columes falied, err: %v", err) + global.LOG.Errorf("get columes failed, err: %v", err) return err } columnTypes, err := lineRows.ColumnTypes() diff --git a/frontend/src/api/index.ts b/frontend/src/api/index.ts index d46f88f17..6150bd589 100644 --- a/frontend/src/api/index.ts +++ b/frontend/src/api/index.ts @@ -27,8 +27,8 @@ class RequestHttp { ...config.headers, }; if (config.url === '/auth/login' || config.url === '/auth/mfalogin') { - let entrace = Base64.encode(globalStore.entrance); - config.headers.EntranceCode = entrace; + let entrance = Base64.encode(globalStore.entrance); + config.headers.EntranceCode = entrance; } return { ...config, diff --git a/frontend/src/api/interface/container.ts b/frontend/src/api/interface/container.ts index baef4e432..cf99eedf7 100644 --- a/frontend/src/api/interface/container.ts +++ b/frontend/src/api/interface/container.ts @@ -245,7 +245,7 @@ export namespace Container { path: string; template: number; } - export interface ComposeOpration { + export interface ComposeOperation { name: string; operation: string; path: string; diff --git a/frontend/src/api/modules/container.ts b/frontend/src/api/modules/container.ts index 7ab086a02..6090ec792 100644 --- a/frontend/src/api/modules/container.ts +++ b/frontend/src/api/modules/container.ts @@ -156,7 +156,7 @@ export const upCompose = (params: Container.ComposeCreate) => { export const testCompose = (params: Container.ComposeCreate) => { return http.post(`/containers/compose/test`, params); }; -export const composeOperator = (params: Container.ComposeOpration) => { +export const composeOperator = (params: Container.ComposeOperation) => { return http.post(`/containers/compose/operate`, params); }; export const composeUpdate = (params: Container.ComposeUpdate) => { diff --git a/frontend/src/components/log-file/index.vue b/frontend/src/components/log-file/index.vue index a5cc790b8..0fa5077c8 100644 --- a/frontend/src/components/log-file/index.vue +++ b/frontend/src/components/log-file/index.vue @@ -164,7 +164,7 @@ const getContent = () => { } data.value = res.data; if (res.data.content != '') { - if (stopSignals.some((singal) => res.data.content.endsWith(singal))) { + if (stopSignals.some((signal) => res.data.content.endsWith(signal))) { onCloseLog(); } if (end.value) { diff --git a/frontend/src/components/status/index.vue b/frontend/src/components/status/index.vue index 36b128201..0735732d4 100644 --- a/frontend/src/components/status/index.vue +++ b/frontend/src/components/status/index.vue @@ -13,7 +13,7 @@ import { onMounted, ref } from 'vue'; const props = defineProps({ status: { type: String, - default: 'runnning', + default: 'running', }, }); let status = ref('running'); diff --git a/frontend/src/components/system-upgrade/index.vue b/frontend/src/components/system-upgrade/index.vue index ed26f2087..6e7346cdf 100644 --- a/frontend/src/components/system-upgrade/index.vue +++ b/frontend/src/components/system-upgrade/index.vue @@ -36,9 +36,9 @@
- {{ $t('setting.versionHelper') }} -
  • {{ $t('setting.versionHelper1') }}
  • -
  • {{ $t('setting.versionHelper2') }}
  • + {{ $t('setting.versionHelper') }} +
  • {{ $t('setting.versionHelper1') }}
  • +
  • {{ $t('setting.versionHelper2') }}
  • {{ $t('app.version') }}

    @@ -161,7 +161,7 @@ onMounted(() => { text-decoration: none; letter-spacing: 0.5px; } -.line-heigth { +.line-height { line-height: 25px; } .panel-MdEditor { diff --git a/frontend/src/enums/files.ts b/frontend/src/enums/files.ts index 7d474263b..a2cb0ef28 100644 --- a/frontend/src/enums/files.ts +++ b/frontend/src/enums/files.ts @@ -7,7 +7,7 @@ export enum CompressType { Xz = 'xz', } -export enum CompressExtention { +export enum CompressExtension { zip = '.zip', gz = '.gz', bz2 = '.tar.bz2', diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 14eb089bb..f16bb2852 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -1084,7 +1084,7 @@ const message = { infoDetail: 'File Properties', list: 'File List', sub: 'Subdirectory', - downlodSuccess: 'Download Success', + downloadSuccess: 'Download Success', theme: 'Theme', language: 'Language', eol: 'End Of Line', @@ -1099,7 +1099,7 @@ const message = { uploadFailed: '[{0}] File Upload file', fileUploadStart: 'Uploading [{0}]....', currentSelect: 'Current Select: ', - unsupportType: 'Unsupported file type', + unsupportedType: 'Unsupported file type', deleteHelper: 'Are you sure you want to delete the following files? By default, it will enter the recycle bin after deletion', fileHeper: 'Note: 1. Search results do not support sorting. 2. Folders cannot be sorted by size.', diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts index 97152c8b0..3cab2436c 100644 --- a/frontend/src/lang/modules/tw.ts +++ b/frontend/src/lang/modules/tw.ts @@ -1032,7 +1032,7 @@ const message = { root: '根目錄', list: '文件列表', sub: '子目錄', - downlodSuccess: '下載完成', + downloadSuccess: '下載完成', theme: '主題', language: '語言', eol: '行尾符', @@ -1046,7 +1046,7 @@ const message = { uploadFailed: '【{0}】 文件上傳失敗', fileUploadStart: '正在上傳【{0}】....', currentSelect: '當前選中: ', - unsupportType: '不支持的文件類型', + unsupportedType: '不支持的文件類型', deleteHelper: '確定刪除所選檔案? 預設刪除之後將進入回收站?', fileHeper: '注意:1. 搜尋結果不支援排序功能 2. 資料夾無法依大小排序。', forceDeleteHelper: '永久刪除檔案(不進入回收站,直接刪除)', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 7f3e88ab8..9207dd44d 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -1033,7 +1033,7 @@ const message = { root: '根目录', list: '文件列表', sub: '子目录', - downlodSuccess: '下载完成', + downloadSuccess: '下载完成', theme: '主题', language: '语言', eol: '行尾符', @@ -1047,7 +1047,7 @@ const message = { uploadFailed: '【{0}】 文件上传失败', fileUploadStart: '正在上传【{0}】....', currentSelect: '当前选中: ', - unsupportType: '不支持的文件类型', + unsupportedType: '不支持的文件类型', deleteHelper: '确定删除所选文件? 默认删除之后将进入回收站', fileHeper: '注意:1. 搜索结果不支持排序功能 2. 文件夹无法按大小排序。', forceDeleteHelper: '永久删除文件(不进入回收站,直接删除)', diff --git a/frontend/src/layout/index.vue b/frontend/src/layout/index.vue index 379c55618..4f3ed8572 100644 --- a/frontend/src/layout/index.vue +++ b/frontend/src/layout/index.vue @@ -1,5 +1,5 @@ @@ -458,7 +458,7 @@ const openOperate = (row: any, op: string) => { } }; -const openIngore = () => { +const openIgnore = () => { ignoreRef.value.acceptParams(); }; diff --git a/frontend/src/views/container/compose/index.vue b/frontend/src/views/container/compose/index.vue index cbd7c4014..f5f46f919 100644 --- a/frontend/src/views/container/compose/index.vue +++ b/frontend/src/views/container/compose/index.vue @@ -1,7 +1,7 @@