1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-11-10 03:30:53 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

style(system): fix issue with enable ssl failed (#8159)

Browse source
This commit is contained in:
zhengkunwang 2025-03-14 22:38:51 +08:00 • committed by GitHub
parent 23f83068f1
commit cfb48b95e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
core/app/service/setting.go
View file

@ -240,6 +240,13 @@ func (u *SettingService) UpdateSSL(c *gin.Context, req dto.SSLUpdate) error {
} }
_ = os.Remove(path.Join(secretDir, "server.crt")) _ = os.Remove(path.Join(secretDir, "server.crt"))
_ = os.Remove(path.Join(secretDir, "server.key")) _ = os.Remove(path.Join(secretDir, "server.key"))
go func() {
time.Sleep(1 * time.Second)
_, err := cmd.Exec("systemctl restart 1panel-core.service")
if err != nil {
global.LOG.Errorf("restart system failed, err: %v", err)
}
}()
return nil return nil
} }
if _, err := os.Stat(secretDir); err != nil && os.IsNotExist(err) { if _, err := os.Stat(secretDir); err != nil && os.IsNotExist(err) {
@ -329,17 +336,20 @@ func (u *SettingService) UpdateSSL(c *gin.Context, req dto.SSLUpdate) error {
if err := os.Rename(path.Join(secretDir, "server.key.tmp"), path.Join(secretDir, "server.key")); err != nil { if err := os.Rename(path.Join(secretDir, "server.key.tmp"), path.Join(secretDir, "server.key")); err != nil {
return err return err
} }
status, _ := settingRepo.GetValueByKey("SSL")
if req.SSL != status {
go func() {
time.Sleep(1 * time.Second)
_, err := cmd.Exec("systemctl restart 1panel-core.service")
if err != nil {
global.LOG.Errorf("restart system failed, err: %v", err)
}
}()
}
if err := settingRepo.Update("SSL", req.SSL); err != nil { if err := settingRepo.Update("SSL", req.SSL); err != nil {
return err return err
} }
go func() { return u.UpdateSystemSSL()
time.Sleep(1 * time.Second)
_, err := cmd.Exec("systemctl restart 1panel-core.service")
if err != nil {
global.LOG.Errorf("restart system failed, err: %v", err)
}
}()
return nil
} }
func (u *SettingService) LoadFromCert() (*dto.SSLInfo, error) { func (u *SettingService) LoadFromCert() (*dto.SSLInfo, error) {

4
frontend/src/views/setting/safe/index.vue
View file

@ -346,7 +346,9 @@ const handleSSL = async () => {
} else { } else {
address = address.replaceAll('settings/safe', 'login'); address = address.replaceAll('settings/safe', 'login');
} }
window.location.href = `http://${address}`; setTimeout(() => {
window.location.href = `http://${address}`;
}, 1000);
}) })
.catch(() => { .catch(() => {
form.ssl = 'Enable'; form.ssl = 'Enable';

4
frontend/src/views/setting/safe/ssl/index.vue
View file

@ -247,7 +247,9 @@ const onSaveSSL = async (formEl: FormInstance | undefined) => {
} else { } else {
address = address.replaceAll('settings/safe', 'login'); address = address.replaceAll('settings/safe', 'login');
} }
window.open(`https://${address}`, '_self'); setTimeout(() => {
window.open(`https://${address}`, '_self');
}, 1000);
}); });
}); });
}); });