From ee6b2254f05ad2252886bdb01fb8a4754e23355e Mon Sep 17 00:00:00 2001 From: Maisam Date: Sat, 25 May 2024 11:25:05 +0330 Subject: [PATCH] Revert "Add certificate setting update to CLI" This reverts commit 2a937d59d7c1f3edeb66782a4b235bafc89dfff6. --- main.go | 43 ------------------------------------------ web/service/setting.go | 8 -------- 2 files changed, 51 deletions(-) diff --git a/main.go b/main.go index 9512dbda..f4ce0846 100644 --- a/main.go +++ b/main.go @@ -254,33 +254,6 @@ func updateSetting(port int, username string, password string, webBasePath strin } } -func updateCert(publicKey string, privateKey string) { - err := database.InitDB(config.GetDBPath()) - if err != nil { - fmt.Println(err) - return - } - - if (privateKey != "" && publicKey != "") || (privateKey == "" && publicKey == "") { - settingService := service.SettingService{} - err = settingService.SetCertFile(publicKey) - if err != nil { - fmt.Println("set certificate public key failed:", err) - } else { - fmt.Println("set certificate public key success") - } - - err = settingService.SetKeyFile(privateKey) - if err != nil { - fmt.Println("set certificate private key failed:", err) - } else { - fmt.Println("set certificate private key success") - } - } else { - fmt.Println("both public and private key should be entered.") - } -} - func migrateDb() { inboundService := service.InboundService{} @@ -339,8 +312,6 @@ func main() { var username string var password string var webBasePath string - var webCertFile string - var webKeyFile string var tgbottoken string var tgbotchatid string var enabletgbot bool @@ -355,8 +326,6 @@ func main() { settingCmd.StringVar(&username, "username", "", "set login username") settingCmd.StringVar(&password, "password", "", "set login password") settingCmd.StringVar(&webBasePath, "webBasePath", "", "set web base path") - settingCmd.StringVar(&webCertFile, "webCert", "", "set web public key path") - settingCmd.StringVar(&webKeyFile, "webCertKey", "", "set web private key path") settingCmd.StringVar(&tgbottoken, "tgbottoken", "", "set telegram bot token") settingCmd.StringVar(&tgbotRuntime, "tgbotRuntime", "", "set telegram bot cron time") settingCmd.StringVar(&tgbotchatid, "tgbotchatid", "", "set telegram bot chat id") @@ -411,18 +380,6 @@ func main() { if enabletgbot { updateTgbotEnableSts(enabletgbot) } - case "cert": - err := settingCmd.Parse(os.Args[2:]) - if err != nil { - fmt.Println(err) - return - } - if reset { - updateCert("", "") - } else { - updateCert(webCertFile, webKeyFile) - } - default: fmt.Println("Invalid subcommands") fmt.Println() diff --git a/web/service/setting.go b/web/service/setting.go index bc5aeaa4..69b1fece 100644 --- a/web/service/setting.go +++ b/web/service/setting.go @@ -309,18 +309,10 @@ func (s *SettingService) SetPort(port int) error { return s.setInt("webPort", port) } -func (s *SettingService) SetCertFile(webCertFile string) error { - return s.setString("webCertFile", webCertFile) -} - func (s *SettingService) GetCertFile() (string, error) { return s.getString("webCertFile") } -func (s *SettingService) SetKeyFile(webKeyFile string) error { - return s.setString("webKeyFile", webKeyFile) -} - func (s *SettingService) GetKeyFile() (string, error) { return s.getString("webKeyFile") }