diff --git a/cmd/server/cmd/reset.go b/cmd/server/cmd/reset.go index f59315578..fe74e53fa 100644 --- a/cmd/server/cmd/reset.go +++ b/cmd/server/cmd/reset.go @@ -5,14 +5,22 @@ import ( ) func init() { - RootCmd.AddCommand(resetMFACmd) - RootCmd.AddCommand(resetSSLCmd) - RootCmd.AddCommand(resetEntranceCmd) + RootCmd.AddCommand(resetCmd) + resetCmd.AddCommand(resetMFACmd) + resetCmd.AddCommand(resetSSLCmd) + resetCmd.AddCommand(resetEntranceCmd) + resetCmd.AddCommand(resetBindIpsCmd) + resetCmd.AddCommand(resetDomainCmd) +} + +var resetCmd = &cobra.Command{ + Use: "reset", + Short: "重置系统信息", } var resetMFACmd = &cobra.Command{ - Use: "reset-mfa", - Short: "关闭 1Panel 两步验证", + Use: "mfa", + Short: "取消 1Panel 两步验证", RunE: func(cmd *cobra.Command, args []string) error { db, err := loadDBConn() if err != nil { @@ -22,10 +30,9 @@ var resetMFACmd = &cobra.Command{ return setSettingByKey(db, "MFAStatus", "disable") }, } - var resetSSLCmd = &cobra.Command{ - Use: "reset-https", - Short: "取消 1Panel https 方式登录", + Use: "https", + Short: "取消 1Panel https 方式登录", RunE: func(cmd *cobra.Command, args []string) error { db, err := loadDBConn() if err != nil { @@ -36,7 +43,7 @@ var resetSSLCmd = &cobra.Command{ }, } var resetEntranceCmd = &cobra.Command{ - Use: "reset-entrance", + Use: "entrance", Short: "取消 1Panel 安全入口", RunE: func(cmd *cobra.Command, args []string) error { db, err := loadDBConn() @@ -47,3 +54,27 @@ var resetEntranceCmd = &cobra.Command{ return setSettingByKey(db, "SecurityEntrance", "") }, } +var resetBindIpsCmd = &cobra.Command{ + Use: "ips", + Short: "取消 1Panel 授权 IP 限制", + RunE: func(cmd *cobra.Command, args []string) error { + db, err := loadDBConn() + if err != nil { + return err + } + + return setSettingByKey(db, "AllowIPs", "") + }, +} +var resetDomainCmd = &cobra.Command{ + Use: "domain", + Short: "取消 1Panel 访问域名绑定", + RunE: func(cmd *cobra.Command, args []string) error { + db, err := loadDBConn() + if err != nil { + return err + } + + return setSettingByKey(db, "BindDomain", "") + }, +} diff --git a/frontend/src/components/error-message/err_domain.vue b/frontend/src/components/error-message/err_domain.vue index 1ff6d7c23..a54ab9ee8 100644 --- a/frontend/src/components/error-message/err_domain.vue +++ b/frontend/src/components/error-message/err_domain.vue @@ -5,7 +5,7 @@

{{ $t('commons.login.notSafe') }}

{{ $t('commons.login.errDomain1') }}

-

{{ $t('commons.login.errHelper') }} 1pctl reset-domain

+

{{ $t('commons.login.errHelper') }} 1pctl reset domain

@@ -22,7 +22,7 @@ import { MsgSuccess } from '@/utils/message'; const onCopy = () => { let input = document.createElement('input'); - input.value = '1pctl reset-domain'; + input.value = '1pctl reset domain'; document.body.appendChild(input); input.select(); document.execCommand('Copy'); diff --git a/frontend/src/components/error-message/err_ip.vue b/frontend/src/components/error-message/err_ip.vue index be17e835d..8ade4b974 100644 --- a/frontend/src/components/error-message/err_ip.vue +++ b/frontend/src/components/error-message/err_ip.vue @@ -5,7 +5,7 @@

{{ $t('commons.login.notSafe') }}

{{ $t('commons.login.errIP1') }}

-

{{ $t('commons.login.errHelper') }} 1pctl reset-ips

+

{{ $t('commons.login.errHelper') }} 1pctl reset ips

@@ -22,7 +22,7 @@ import { MsgSuccess } from '@/utils/message'; const onCopy = () => { let input = document.createElement('input'); - input.value = '1pctl reset-ips'; + input.value = '1pctl reset ips'; document.body.appendChild(input); input.select(); document.execCommand('Copy');