mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2026-09-22 16:00:51 +00:00
style(system): fix issue with enable ssl failed (#8159)
This commit is contained in:
@@ -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.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
|
||||
}
|
||||
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 {
|
||||
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 {
|
||||
return err
|
||||
}
|
||||
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 u.UpdateSystemSSL()
|
||||
}
|
||||
|
||||
func (u *SettingService) LoadFromCert() (*dto.SSLInfo, error) {
|
||||
|
||||
@@ -346,7 +346,9 @@ const handleSSL = async () => {
|
||||
} else {
|
||||
address = address.replaceAll('settings/safe', 'login');
|
||||
}
|
||||
window.location.href = `http://${address}`;
|
||||
setTimeout(() => {
|
||||
window.location.href = `http://${address}`;
|
||||
}, 1000);
|
||||
})
|
||||
.catch(() => {
|
||||
form.ssl = 'Enable';
|
||||
|
||||
@@ -247,7 +247,9 @@ const onSaveSSL = async (formEl: FormInstance | undefined) => {
|
||||
} else {
|
||||
address = address.replaceAll('settings/safe', 'login');
|
||||
}
|
||||
window.open(`https://${address}`, '_self');
|
||||
setTimeout(() => {
|
||||
window.open(`https://${address}`, '_self');
|
||||
}, 1000);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user