feat: 修改登录页样式

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) {

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{}

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{}

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');
 }

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: '请输入用户名',

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';

frontend/src/views/login/components/login-form.vue

@@ -3,12 +3,17 @@
         <div v-if="isFirst">
             <div class="login-container">
                 <el-form ref="registerFormRef" :model="registerForm" size="default" :rules="registerRules">
-                    <div class="login-title">{{ globalStore.themeConfig.panelName }}</div>
-                    <div class="login-border"></div>
-                    <div class="login-welcome">{{ $t('commons.login.firstLogin') }}</div>
+                    <div class="login-title">{{ $t('commons.button.init') }}</div>
                     <div class="login-form">
+                        <input type="text" class="hide" id="name" />
+                        <input type="password" class="hide" id="password" />
                         <el-form-item prop="name">
-                            <el-input v-model="registerForm.name" :placeholder="$t('commons.login.username')">
+                            <el-input
+                                v-model="registerForm.name"
+                                :placeholder="$t('commons.login.username')"
+                                autocomplete="off"
+                                type="text"
+                            >
                                 <template #prefix>
                                     <el-icon class="el-input__icon">
                                         <user />
@@ -23,6 +28,8 @@
                                 v-model="registerForm.password"
                                 show-password
                                 :placeholder="$t('commons.login.password')"
+                                name="passwod"
+                                autocomplete="new-password"
                             >
                                 <template #prefix>
                                     <el-icon class="el-input__icon">
@@ -49,9 +56,10 @@
                         <el-form-item>
                             <el-button
                                 @click="register(registerFormRef)"
-                                style="width: 100%"
+                                class="login-button"
                                 type="primary"
                                 size="default"
+                                round
                             >
                                 {{ $t('commons.button.init') }}
                             </el-button>
@@ -64,9 +72,7 @@
             <div v-if="mfaShow">
                 <div class="login-container">
                     <el-form>
-                        <div class="login-title">{{ globalStore.themeConfig.panelName }}</div>
-                        <div class="login-border"></div>
-                        <div class="login-welcome">{{ $t('commons.login.codeInput') }}</div>
+                        <div class="login-title">{{ $t('commons.login.mfaTitle') }}</div>
                         <div class="login-form">
                             <el-form-item>
                                 <el-input
@@ -82,13 +88,7 @@
                                 </el-input>
                             </el-form-item>
                             <el-form-item>
-                                <el-button
-                                    class="login-btn"
-                                    style="width: 100%"
-                                    size="default"
-                                    type="primary"
-                                    @click="mfaLogin()"
-                                >
+                                <el-button class="login-button" type="primary" size="default" round @click="mfaLogin()">
                                     {{ $t('commons.button.verify') }}
                                 </el-button>
                             </el-form-item>
@@ -99,12 +99,14 @@
             <div v-if="!mfaShow">
                 <div class="login-container">
                     <el-form ref="loginFormRef" :model="loginForm" size="default" :rules="loginRules">
-                        <div class="login-title">{{ globalStore.themeConfig.panelName }}</div>
-                        <div class="login-border"></div>
-                        <div class="login-welcome">{{ $t('commons.login.welcome') }}</div>
+                        <div class="login-title">{{ $t('commons.button.login') }}</div>
                         <div class="login-form">
-                            <el-form-item prop="username">
-                                <el-input v-model="loginForm.name" :placeholder="$t('commons.login.username')">
+                            <el-form-item prop="name">
+                                <el-input
+                                    v-model="loginForm.name"
+                                    :placeholder="$t('commons.login.username')"
+                                    class="form-input"
+                                >
                                     <template #prefix>
                                         <el-icon class="el-input__icon">
                                             <user />
@@ -130,16 +132,14 @@
                                     {{ $t('commons.login.errorAuthInfo') }}
                                 </span>
                             </el-form-item>
-                            <el-form-item prop="captcha">
+                            <el-form-item prop="captcha" class="login-captcha">
                                 <el-input
                                     v-model="loginForm.captcha"
                                     :placeholder="$t('commons.login.captchaHelper')"
-                                    style="width: 70%"
                                 />
                                 <img
                                     v-if="captcha.imagePath"
                                     :src="captcha.imagePath"
-                                    style="width: 30%; height: 32px"
                                     :alt="$t('commons.login.captchaHelper')"
                                     @click="loginVerify()"
                                 />
@@ -150,9 +150,10 @@
                             <el-form-item>
                                 <el-button
                                     @click="login(loginFormRef)"
-                                    style="width: 100%"
+                                    class="login-button"
                                     type="primary"
                                     size="default"
+                                    round
                                 >
                                     {{ $t('commons.button.login') }}
                                 </el-button>
@@ -343,16 +344,10 @@ onUnmounted(() => {
 
 <style scoped lang="scss">
 .login-container {
-    .login-logo {
-        margin-top: 30px;
-        margin-left: 30px;
-        @media only screen and (max-width: 1280px) {
-            margin-top: 20px;
-        }
-
-        img {
-            height: 45px;
-        }
+    .hide {
+        width: 0;
+        border: 0;
+        position: absolute;
     }
 
     .login-title {
@@ -360,45 +355,44 @@ onUnmounted(() => {
         font-size: 32px;
         letter-spacing: 0;
         text-align: center;
-        color: #999999;
+        color: #646a73;
 
         @media only screen and (max-width: 1280px) {
             margin-top: 20px;
         }
     }
 
-    .login-border {
-        height: 2px;
-        margin: 20px auto 20px;
-        position: relative;
-        width: 80px;
-        @media only screen and (max-width: 1280px) {
-            margin: 10px auto 10px;
-        }
-    }
-
-    .login-welcome {
-        margin-top: 10px;
-        font-size: 14px;
-        color: #999999;
-        letter-spacing: 0;
-        line-height: 18px;
-        text-align: center;
-        @media only screen and (max-width: 1280px) {
-            margin-top: 20px;
-        }
-    }
-
     .login-form {
         margin-top: 30px;
         padding: 0 40px;
 
-        @media only screen and (max-width: 1280px) {
-            margin-top: 10px;
+        .el-input {
+            height: 44px;
         }
 
-        &:deep(.el-input__inner) {
-            border-radius: 0;
+        :deep(.el-input) {
+            --el-input-focus-border: $menu-backgroup-color;
+            --el-input-transparent-border: 0 0 0 0px;
+            --el-input-border-color: $menu-backgroup-color;
+            --el-input-hover-border: 0px !important;
+            --el-input-hover-border-color: $menu-backgroup-color;
+            --el-input-focus-border-color: $menu-backgroup-color;
+            --el-input-clear-hover-color: $menu-backgroup-color;
+            box-shadow: 0 0 0 0px !important;
+            --el-input-border: 0px;
+        }
+    }
+
+    .login-captcha {
+        .el-input {
+            width: 50%;
+            height: 44px;
+        }
+
+        img {
+            width: 45%;
+            height: 44px;
+            margin-left: 5%;
         }
     }
 
@@ -429,5 +423,10 @@ onUnmounted(() => {
             margin-top: 20px;
         }
     }
+
+    .login-button {
+        width: 100%;
+        height: 45px;
+    }
 }
 </style>

frontend/src/views/login/index.vue

@@ -1,17 +1,11 @@
 <template>
     <div>
-        <div v-if="statusCode == 1">
-            <div class="login-background">
-                <div class="login-container">
-                    <el-row type="flex">
-                        <el-col :span="12">
-                            <LoginForm ref="loginRef"></LoginForm>
-                        </el-col>
-                        <el-col :span="12">
-                            <img class="login-image" src="@/assets/images/1Panel-login.jpg" alt="login" />
-                        </el-col>
-                    </el-row>
+        <div class="login-backgroud" v-if="statusCode == 1">
+            <div class="login-title">
+                <span>1Panel 现代化的 Linux 面板</span>
             </div>
+            <div class="login-container">
+                <LoginForm ref="loginRef"></LoginForm>
             </div>
         </div>
         <div style="margin-left: 50px" v-if="statusCode == -1">
@@ -56,30 +50,40 @@ onMounted(() => {
     justify-content: center;
     align-items: center;
 }
-.login-background {
-    height: 100%;
+.login-backgroud {
+    height: 100vh;
     display: flex;
-    @include login-center;
+    // @include login-center;
+    background-image: url(@/assets/images/1Panel-login.png);
+    background-color: $menu-backgroup-color;
+    background-position: 0% 40%;
+    background-size: 70%;
+    background-repeat: no-repeat;
+
+    .login-title {
+        margin-top: 10%;
+        text-align: center;
+        margin-left: 15%;
+        span:first-child {
+            color: $primary-color;
+            font-size: 48px;
+            font-family: pingFangSC-Regular;
+        }
+    }
 }
 
 .login-container {
-    margin-top: 150px;
-    min-width: 640px;
-    width: 960px;
-    height: 480px;
-    background-color: #ffffff;
-    box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2), 0 8px 10px 1px rgba(0, 0, 0, 0.14),
-        0 3px 14px 2px rgba(0, 0, 0, 0.12);
+    margin-top: 19%;
+    margin-left: 15%;
+    width: 394px;
+    height: 422px;
+    background-color: rgba(255, 255, 255, 0.55);
+    border-radius: 4px;
+
+    box-shadow: 2px 4px 22px rgba(0, 94, 235, 0.2);
     @media only screen and (max-width: 1280px) {
         width: 900px;
         height: 380px;
     }
-    .login-image {
-        width: 480px;
-        height: 480px;
-        @media only screen and (max-width: 1280px) {
-            height: 380px;
-        }
-    }
 }
 </style>

go.mod

@@ -34,7 +34,7 @@ require (
 	github.com/pkg/sftp v1.13.1
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/satori/go.uuid v1.2.0
-	github.com/shirou/gopsutil v3.21.11+incompatible
+	github.com/shirou/gopsutil/v3 v3.23.1
 	github.com/sirupsen/logrus v1.9.0
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 	github.com/spf13/afero v1.8.2
@@ -109,6 +109,7 @@ require (
 	github.com/klauspost/pgzip v1.2.5 // indirect
 	github.com/kr/fs v0.1.0 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/mailru/easyjson v0.7.6 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
@@ -131,14 +132,15 @@ require (
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.2 // indirect
 	github.com/pierrec/lz4/v4 v4.1.15 // indirect
+	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/rs/xid v1.4.0 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.3.0 // indirect
 	github.com/therootcompany/xz v1.0.1 // indirect
-	github.com/tklauser/go-sysconf v0.3.10 // indirect
-	github.com/tklauser/numcpus v0.4.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.11 // indirect
+	github.com/tklauser/numcpus v0.6.0 // indirect
 	github.com/ugorji/go/codec v1.2.7 // indirect
 	github.com/ulikunitz/xz v0.5.10 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
@@ -151,7 +153,7 @@ require (
 	golang.org/x/image v0.0.0-20190802002840-cff245a6509b // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
 	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
-	golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
+	golang.org/x/sys v0.4.0 // indirect
 	golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
 	golang.org/x/tools v0.1.12 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect

go.sum

@@ -495,7 +495,8 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0=
 github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
@@ -649,6 +650,8 @@ github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgx
 github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
 github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
 github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
 github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
@@ -810,6 +813,8 @@ github.com/pkg/sftp v1.13.1 h1:I2qBYMChEhIjOgazfJmV3/mZM256btk6wkCDRmW7JYs=
 github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
 github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
@@ -859,8 +864,8 @@ github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh
 github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U=
 github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
 github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
-github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
-github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/shirou/gopsutil/v3 v3.23.1 h1:a9KKO+kGLKEvcPIs4W62v0nu3sciVDOOOPUD0Hz7z/4=
+github.com/shirou/gopsutil/v3 v3.23.1/go.mod h1:NN6mnm5/0k8jw4cBfCnJtr5L7ErOTg18tMNpgFkn0hA=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
 github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
@@ -912,6 +917,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -921,8 +927,9 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI=
 github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs=
 github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a h1:kAe4YSu0O0UFn1DowNo2MY5p6xzqtJ/wQ7LZynSvGaY=
@@ -938,10 +945,10 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG
 github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I=
 github.com/therootcompany/xz v1.0.1 h1:CmOtsn1CbtmyYiusbfmhmkpAAETj0wBIH6kCYaX+xzw=
 github.com/therootcompany/xz v1.0.1/go.mod h1:3K3UH1yCKgBneZYhuQUvJ9HPD19UEXEI0BWbMn8qNMY=
-github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw=
-github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
-github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
-github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
+github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
+github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
+github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=
+github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
@@ -1218,6 +1225,7 @@ golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1239,13 +1247,14 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
+golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=