diff --git a/backend/app/api/v1/monitor.go b/backend/app/api/v1/monitor.go index 37759da1c..1eb5a6d7f 100644 --- a/backend/app/api/v1/monitor.go +++ b/backend/app/api/v1/monitor.go @@ -9,8 +9,8 @@ import ( "github.com/1Panel-dev/1Panel/backend/constant" "github.com/1Panel-dev/1Panel/backend/global" "github.com/gin-gonic/gin" - "github.com/shirou/gopsutil/disk" - "github.com/shirou/gopsutil/net" + "github.com/shirou/gopsutil/v3/disk" + "github.com/shirou/gopsutil/v3/net" ) func (b *BaseApi) LoadMonitor(c *gin.Context) { diff --git a/backend/app/service/dashboard.go b/backend/app/service/dashboard.go index 61e3c5718..fc545d47f 100644 --- a/backend/app/service/dashboard.go +++ b/backend/app/service/dashboard.go @@ -5,12 +5,12 @@ import ( "time" "github.com/1Panel-dev/1Panel/backend/app/dto" - "github.com/shirou/gopsutil/cpu" - "github.com/shirou/gopsutil/disk" - "github.com/shirou/gopsutil/host" - "github.com/shirou/gopsutil/load" - "github.com/shirou/gopsutil/mem" - "github.com/shirou/gopsutil/net" + "github.com/shirou/gopsutil/v3/cpu" + "github.com/shirou/gopsutil/v3/disk" + "github.com/shirou/gopsutil/v3/host" + "github.com/shirou/gopsutil/v3/load" + "github.com/shirou/gopsutil/v3/mem" + "github.com/shirou/gopsutil/v3/net" ) type DashboardService struct{} diff --git a/backend/cron/job/monitor.go b/backend/cron/job/monitor.go index 60c77fb2c..a416115b3 100644 --- a/backend/cron/job/monitor.go +++ b/backend/cron/job/monitor.go @@ -7,11 +7,11 @@ import ( "github.com/1Panel-dev/1Panel/backend/app/model" "github.com/1Panel-dev/1Panel/backend/app/repo" "github.com/1Panel-dev/1Panel/backend/global" - "github.com/shirou/gopsutil/cpu" - "github.com/shirou/gopsutil/disk" - "github.com/shirou/gopsutil/load" - "github.com/shirou/gopsutil/mem" - "github.com/shirou/gopsutil/net" + "github.com/shirou/gopsutil/v3/cpu" + "github.com/shirou/gopsutil/v3/disk" + "github.com/shirou/gopsutil/v3/load" + "github.com/shirou/gopsutil/v3/mem" + "github.com/shirou/gopsutil/v3/net" ) type monitor struct{} diff --git a/frontend/src/assets/fonts/DIN.otf b/frontend/src/assets/fonts/DIN.otf deleted file mode 100644 index 3296d1ea7..000000000 Binary files a/frontend/src/assets/fonts/DIN.otf and /dev/null differ diff --git a/frontend/src/assets/fonts/MetroDF.ttf b/frontend/src/assets/fonts/MetroDF.ttf deleted file mode 100644 index 9d31af497..000000000 Binary files a/frontend/src/assets/fonts/MetroDF.ttf and /dev/null differ diff --git a/frontend/src/assets/fonts/PingFang-SC-Regular.ttf b/frontend/src/assets/fonts/PingFang-SC-Regular.ttf new file mode 100644 index 000000000..abe72b0a0 Binary files /dev/null and b/frontend/src/assets/fonts/PingFang-SC-Regular.ttf differ diff --git a/frontend/src/assets/fonts/YouSheBiaoTiHei.ttf b/frontend/src/assets/fonts/YouSheBiaoTiHei.ttf deleted file mode 100644 index 3729151a2..000000000 Binary files a/frontend/src/assets/fonts/YouSheBiaoTiHei.ttf and /dev/null differ diff --git a/frontend/src/assets/fonts/font.scss b/frontend/src/assets/fonts/font.scss index ebddc73ed..c9da70cb4 100644 --- a/frontend/src/assets/fonts/font.scss +++ b/frontend/src/assets/fonts/font.scss @@ -1,12 +1,4 @@ @font-face { - font-family: YouSheBiaoTiHei; - src: url('./YouSheBiaoTiHei.ttf'); -} -@font-face { - font-family: MetroDF; - src: url('./MetroDF.ttf'); -} -@font-face { - font-family: DIN; - src: url('./DIN.Otf'); + font-family: 'pingFangSC-Regular'; + src: url('./PingFang-SC-Regular.ttf'); } diff --git a/frontend/src/assets/images/1panel-login.png b/frontend/src/assets/images/1panel-login.png new file mode 100644 index 000000000..f129b3bff Binary files /dev/null and b/frontend/src/assets/images/1panel-login.png differ diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 792c07e00..39d710c18 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -107,6 +107,7 @@ export default { solutionHelper: '在 SSH 终端输入以下一种命令来解决 1.查看面板入口:/etc/init.d/bt default', warnning: '注意:【关闭安全入口】将使您的面板登录地址被直接暴露在互联网上,非常危险,请谨慎操作', codeInput: '请输入 MFA 验证器的 6 位验证码', + mfaTitle: 'MFA认证', }, rule: { username: '请输入用户名', diff --git a/frontend/src/main.ts b/frontend/src/main.ts index 43ee68c6d..0d972d4bb 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -6,6 +6,7 @@ import App from './App.vue'; import '@/styles/index.scss'; import '@/styles/reset.scss'; import '@/styles/common.scss'; +import '@/assets/fonts/font.scss'; import '@/assets/iconfont/iconfont.css'; import '@/assets/iconfont/iconfont.js'; import '@/styles/element-dark.scss'; diff --git a/frontend/src/views/login/components/login-form.vue b/frontend/src/views/login/components/login-form.vue index 130090cd7..1bf1c4269 100644 --- a/frontend/src/views/login/components/login-form.vue +++ b/frontend/src/views/login/components/login-form.vue @@ -3,12 +3,17 @@
- - - +