diff --git a/backend/app.yaml b/backend/app.yaml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/backend/app/repo/setting.go b/backend/app/repo/setting.go
index 7f5778fa0..c2c9d286a 100644
--- a/backend/app/repo/setting.go
+++ b/backend/app/repo/setting.go
@@ -11,6 +11,7 @@ type SettingRepo struct{}
type ISettingRepo interface {
GetList(opts ...DBOption) ([]model.Setting, error)
Get(opts ...DBOption) (model.Setting, error)
+ Create(key, value string) error
Update(key, value string) error
WithByKey(key string) DBOption
}
@@ -29,6 +30,14 @@ func (u *SettingRepo) GetList(opts ...DBOption) ([]model.Setting, error) {
return settings, err
}
+func (u *SettingRepo) Create(key, value string) error {
+ setting := &model.Setting{
+ Key: key,
+ Value: value,
+ }
+ return global.DB.Create(setting).Error
+}
+
func (u *SettingRepo) Get(opts ...DBOption) (model.Setting, error) {
var settings model.Setting
db := global.DB.Model(&model.Setting{})
diff --git a/backend/app/service/setting.go b/backend/app/service/setting.go
index ee0a42a3c..ddc712962 100644
--- a/backend/app/service/setting.go
+++ b/backend/app/service/setting.go
@@ -2,7 +2,6 @@ package service
import (
"encoding/json"
- "errors"
"strconv"
"time"
@@ -63,15 +62,16 @@ func (u *SettingService) Update(c *gin.Context, key, value string) error {
}
func (u *SettingService) UpdatePort(port uint) error {
- global.Viper.Set("system.port", port)
- if err := global.Viper.WriteConfig(); err != nil {
+ if err := settingRepo.Update("ServerPort", strconv.Itoa(int(port))); err != nil {
return err
}
- _ = settingRepo.Update("ServerPort", strconv.Itoa(int(port)))
- stdout, err := cmd.Exec("systemctl restart 1panel.service")
- if err != nil {
- return errors.New(stdout)
- }
+ _ = settingRepo.Update("SystemStatus", "Restarting")
+ go func() {
+ _, err := cmd.Exec("systemctl restart 1panel.service")
+ if err != nil {
+ global.LOG.Errorf("restart system port failed, err: %v")
+ }
+ }()
return nil
}
diff --git a/backend/app/service/upgrade.go b/backend/app/service/upgrade.go
index 256a7f349..8c6b1f144 100644
--- a/backend/app/service/upgrade.go
+++ b/backend/app/service/upgrade.go
@@ -75,18 +75,14 @@ func (u *UpgradeService) Upgrade(version string) error {
originalDir := fmt.Sprintf("%s/%s/original", constant.TmpDir, timeStr)
downloadPath := fmt.Sprintf("%s/releases/%s/%s.tar.gz", global.CONF.System.AppOss, version, version)
- setting, err := settingRepo.Get(settingRepo.WithByKey("SystemVersion"))
- if err != nil {
- return err
- }
- u.changeStatus(constant.StatusWaiting, nil)
+ _ = settingRepo.Update("SystemStatus", "Upgrading")
go func() {
if err := os.MkdirAll(originalDir, os.ModePerm); err != nil {
- u.changeStatus(setting.Value, err)
+ global.LOG.Error(err.Error())
return
}
if err := fileOp.DownloadFile(downloadPath, filePath); err != nil {
- u.changeStatus(setting.Value, fmt.Errorf("download file failed, err: %v", err))
+ global.LOG.Errorf("download file failed, err: %v", err)
return
}
global.LOG.Info("download file from oss successful!")
@@ -94,34 +90,35 @@ func (u *UpgradeService) Upgrade(version string) error {
_ = os.Remove(filePath)
}()
if err := fileOp.Decompress(filePath, rootDir, files.TarGz); err != nil {
- u.changeStatus(setting.Value, fmt.Errorf("decompress file failed, err: %v", err))
+ global.LOG.Errorf("decompress file failed, err: %v", err)
return
}
if err := u.handleBackup(fileOp, originalDir); err != nil {
- u.changeStatus(setting.Value, fmt.Errorf("handle backup original file failed, err: %v", err))
+ global.LOG.Errorf("handle backup original file failed, err: %v", err)
return
}
global.LOG.Info("backup original data successful, now start to upgrade!")
if err := cpBinary(rootDir+"/1panel", "/usr/local/bin/1panel"); err != nil {
u.handleRollback(fileOp, originalDir, 1)
- u.changeStatus(setting.Value, fmt.Errorf("upgrade 1panel failed, err: %v", err))
+ global.LOG.Errorf("upgrade 1panel failed, err: %v", err)
return
}
if err := cpBinary(rootDir+"/1pctl", "/usr/local/bin/1pctl"); err != nil {
u.handleRollback(fileOp, originalDir, 2)
- u.changeStatus(setting.Value, fmt.Errorf("upgrade 1pctl failed, err: %v", err))
+ global.LOG.Errorf("upgrade 1pctl failed, err: %v", err)
return
}
if err := cpBinary(rootDir+"/1panel.service", "/etc/systemd/system/1panel.service"); err != nil {
u.handleRollback(fileOp, originalDir, 3)
- u.changeStatus(setting.Value, fmt.Errorf("upgrade 1panel.service failed, err: %v", err))
+ global.LOG.Errorf("upgrade 1panel.service failed, err: %v", err)
return
}
global.LOG.Info("upgrade successful!")
- u.changeStatus(version, nil)
+ _ = settingRepo.Update("SystemStatus", "Upgrade")
+ _ = settingRepo.Update("SystemVersion", version)
_, _ = cmd.Exec("systemctl restart 1panel.service")
}()
return nil
@@ -165,12 +162,3 @@ func (u *UpgradeService) handleRollback(fileOp files.FileOp, originalDir string,
global.LOG.Errorf("rollback 1panel failed, err: %v", err)
}
}
-
-func (u *UpgradeService) changeStatus(status string, err error) {
- if err != nil {
- global.LOG.Error(err.Error())
- }
- if err := settingRepo.Update("SystemVersion", status); err != nil {
- global.LOG.Errorf("update system version failed, err: %v", err)
- }
-}
diff --git a/backend/configs/system.go b/backend/configs/system.go
index 406b41a19..9ad65bd41 100644
--- a/backend/configs/system.go
+++ b/backend/configs/system.go
@@ -1,7 +1,7 @@
package configs
type System struct {
- Port int `mapstructure:"port"`
+ Port string `mapstructure:"port"`
DbFile string `mapstructure:"db_file"`
DbPath string `mapstructure:"db_path"`
LogPath string `mapstructure:"log_path"`
diff --git a/backend/init/hook/hook.go b/backend/init/hook/hook.go
new file mode 100644
index 000000000..fa9d3ecb4
--- /dev/null
+++ b/backend/init/hook/hook.go
@@ -0,0 +1,22 @@
+package hook
+
+import (
+ "github.com/1Panel-dev/1Panel/backend/app/repo"
+ "github.com/1Panel-dev/1Panel/backend/global"
+)
+
+func Init() {
+ settingRepo := repo.NewISettingRepo()
+ portSetting, err := settingRepo.Get(settingRepo.WithByKey("ServerPort"))
+ if err != nil {
+ global.LOG.Errorf("load service port from setting failed, err: %v", err)
+ }
+ global.CONF.System.Port = portSetting.Value
+
+ if _, err := settingRepo.Get(settingRepo.WithByKey("SystemStatus")); err != nil {
+ _ = settingRepo.Create("SystemStatus", "Free")
+ }
+ if err := settingRepo.Update("SystemStatus", "Free"); err != nil {
+ global.LOG.Fatalf("init service before start failed, err: %v", "Free")
+ }
+}
diff --git a/backend/init/migration/migrations/init.go b/backend/init/migration/migrations/init.go
index 88950ca94..d1d3d7848 100644
--- a/backend/init/migration/migrations/init.go
+++ b/backend/init/migration/migrations/init.go
@@ -99,7 +99,7 @@ var AddTableSetting = &gormigrate.Migration{
if err := tx.Create(&model.Setting{Key: "ExpirationDays", Value: "0"}).Error; err != nil {
return err
}
- if err := tx.Create(&model.Setting{Key: "ComplexityVerification", Value: "enable"}).Error; err != nil {
+ if err := tx.Create(&model.Setting{Key: "ComplexityVerification", Value: "disable"}).Error; err != nil {
return err
}
if err := tx.Create(&model.Setting{Key: "MFAStatus", Value: "disable"}).Error; err != nil {
@@ -131,6 +131,9 @@ var AddTableSetting = &gormigrate.Migration{
if err := tx.Create(&model.Setting{Key: "SystemVersion", Value: "v1.0.0"}).Error; err != nil {
return err
}
+ if err := tx.Create(&model.Setting{Key: "SystemStatus", Value: "Free"}).Error; err != nil {
+ return err
+ }
return nil
},
}
diff --git a/backend/middleware/loading.go b/backend/middleware/loading.go
index 4de81b10a..eccb30931 100644
--- a/backend/middleware/loading.go
+++ b/backend/middleware/loading.go
@@ -10,13 +10,13 @@ import (
func GlobalLoading() gin.HandlerFunc {
return func(c *gin.Context) {
settingRepo := repo.NewISettingRepo()
- upgradeSetting, err := settingRepo.Get(settingRepo.WithByKey("SystemVersion"))
+ status, err := settingRepo.Get(settingRepo.WithByKey("SystemStatus"))
if err != nil {
helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
return
}
- if upgradeSetting.Value == constant.StatusWaiting {
- helper.ErrorWithDetail(c, constant.CodeGlobalLoading, "Upgrading", err)
+ if status.Value != "Free" {
+ helper.ErrorWithDetail(c, constant.CodeGlobalLoading, status.Value, err)
return
}
c.Next()
diff --git a/backend/server/server.go b/backend/server/server.go
index 95b939e9c..c60cb2aca 100644
--- a/backend/server/server.go
+++ b/backend/server/server.go
@@ -15,6 +15,7 @@ import (
"github.com/1Panel-dev/1Panel/backend/global"
"github.com/1Panel-dev/1Panel/backend/init/db"
+ "github.com/1Panel-dev/1Panel/backend/init/hook"
"github.com/1Panel-dev/1Panel/backend/init/log"
"github.com/1Panel-dev/1Panel/backend/init/migration"
"github.com/1Panel-dev/1Panel/backend/init/router"
@@ -38,11 +39,12 @@ func Start() {
gin.SetMode("debug")
cron.Run()
business.Init()
+ hook.Init()
rootRouter := router.Routers()
- address := fmt.Sprintf(":%d", global.CONF.System.Port)
+ address := fmt.Sprintf(":%s", global.CONF.System.Port)
s := initServer(address, rootRouter)
- global.LOG.Infof("server run success on %d", global.CONF.System.Port)
+ global.LOG.Infof("server run success on %s", global.CONF.System.Port)
if err := s.ListenAndServe(); err != nil {
global.LOG.Error(err)
panic(err)
diff --git a/cmd/server/conf/app.yaml b/cmd/server/conf/app.yaml
index 3118fe646..846f7a3f3 100644
--- a/cmd/server/conf/app.yaml
+++ b/cmd/server/conf/app.yaml
@@ -1,5 +1,4 @@
system:
- port: 9999
db_file: 1Panel.db
app_oss: "https://1panel.oss-cn-hangzhou.aliyuncs.com"
diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 67f518a36..5165cf256 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -29,8 +29,6 @@ declare module 'vue' {
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
ElCol: typeof import('element-plus/es')['ElCol']
- ElCollapse: typeof import('element-plus/es')['ElCollapse']
- ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElContainer: typeof import('element-plus/es')['ElContainer']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index 4c8294384..77cd8d0dd 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -63,6 +63,7 @@ export default {
},
loadingText: {
Upgrading: 'System upgrade, please wait...',
+ Restarting: 'System restart, please wait...',
},
msg: {
delete: 'This operation cannot be rolled back. Do you want to continue',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index cd8465c20..792c07e00 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -66,6 +66,7 @@ export default {
},
loadingText: {
Upgrading: '系统升级中，请稍候...',
+ Restarting: '系统重启中，请稍候...',
},
msg: {
delete: '删除 操作不可回滚，是否继续',
diff --git a/frontend/src/views/app-store/installed/index.vue b/frontend/src/views/app-store/installed/index.vue
index addc21994..f92ee8ef3 100644
--- a/frontend/src/views/app-store/installed/index.vue
+++ b/frontend/src/views/app-store/installed/index.vue
@@ -350,6 +350,7 @@ onMounted(() => {
onUnmounted(() => {
clearInterval(Number(timer));
+ timer = null;
});
diff --git a/frontend/src/views/container/container/terminal/index.vue b/frontend/src/views/container/container/terminal/index.vue
index f70bed270..5d4ab7e8e 100644
--- a/frontend/src/views/container/container/terminal/index.vue
+++ b/frontend/src/views/container/container/terminal/index.vue
@@ -123,7 +123,7 @@ const initTerm = (formEl: FormInstance | undefined) => {
formEl.validate(async (valid) => {
if (!valid) return;
let href = window.location.href;
- let ipLocal = href.split('//')[1].split(':')[0];
+ let ipLocal = href.split('//')[1].split('/')[0];
terminalOpen.value = true;
let ifm = document.getElementById('terminal-exec') as HTMLInputElement | null;
term = new Terminal({
@@ -141,7 +141,7 @@ const initTerm = (formEl: FormInstance | undefined) => {
if (ifm) {
term.open(ifm);
terminalSocket = new WebSocket(
- `ws://${ipLocal}:9999/api/v1/containers/exec?containerid=${form.containerID}&cols=${term.cols}&rows=${term.rows}&user=${form.user}&command=${form.command}`,
+ `ws://${ipLocal}/api/v1/containers/exec?containerid=${form.containerID}&cols=${term.cols}&rows=${term.rows}&user=${form.user}&command=${form.command}`,
);
terminalSocket.onopen = runRealTerminal;
terminalSocket.onmessage = onWSReceive;
diff --git a/frontend/src/views/database/redis/terminal/index.vue b/frontend/src/views/database/redis/terminal/index.vue
index babfe37bd..fd8c836fe 100644
--- a/frontend/src/views/database/redis/terminal/index.vue
+++ b/frontend/src/views/database/redis/terminal/index.vue
@@ -70,7 +70,7 @@ const closeRealTerminal = (ev: CloseEvent) => {
const initTerm = () => {
let ifm = document.getElementById('terminal-exec') as HTMLInputElement | null;
let href = window.location.href;
- let ipLocal = href.split('//')[1].split(':')[0];
+ let ipLocal = href.split('//')[1].split('/')[0];
term = new Terminal({
lineHeight: 1.2,
fontSize: 12,
@@ -86,7 +86,7 @@ const initTerm = () => {
if (ifm) {
term.open(ifm);
terminalSocket = new WebSocket(
- `ws://${ipLocal}:9999/api/v1/databases/redis/exec?cols=${term.cols}&rows=${term.rows}`,
+ `ws://${ipLocal}/api/v1/databases/redis/exec?cols=${term.cols}&rows=${term.rows}`,
);
terminalSocket.onopen = runRealTerminal;
terminalSocket.onmessage = onWSReceive;
diff --git a/frontend/src/views/host/file-management/process/index.vue b/frontend/src/views/host/file-management/process/index.vue
index 9113d3a78..306cf499c 100644
--- a/frontend/src/views/host/file-management/process/index.vue
+++ b/frontend/src/views/host/file-management/process/index.vue
@@ -56,8 +56,8 @@ const onClose = () => {};
const initProcess = () => {
let href = window.location.href;
- let ipLocal = href.split('//')[1].split(':')[0];
- processSocket = new WebSocket(`ws://${ipLocal}:9999/api/v1/files/ws`);
+ let ipLocal = href.split('//')[1].split('/')[0];
+ processSocket = new WebSocket(`ws://${ipLocal}/api/v1/files/ws`);
processSocket.onopen = onOpenProcess;
processSocket.onmessage = onMessage;
processSocket.onerror = onerror;
diff --git a/frontend/src/views/host/terminal/terminal/terminal.vue b/frontend/src/views/host/terminal/terminal/terminal.vue
index deca680e9..9e3f6eeaa 100644
--- a/frontend/src/views/host/terminal/terminal/terminal.vue
+++ b/frontend/src/views/host/terminal/terminal/terminal.vue
@@ -93,7 +93,7 @@ const initErrorTerm = (errorInfo: string) => {
const initTerm = () => {
let ifm = document.getElementById('terminal-' + terminalID.value) as HTMLInputElement | null;
let href = window.location.href;
- let ipLocal = href.split('//')[1].split(':')[0];
+ let ipLocal = href.split('//')[1].split('/')[0];
term = new Terminal({
lineHeight: 1.2,
fontSize: 12,
@@ -109,7 +109,7 @@ const initTerm = () => {
if (ifm) {
term.open(ifm);
terminalSocket = new WebSocket(
- `ws://${ipLocal}:9999/api/v1/terminals?id=${wsID.value}&cols=${term.cols}&rows=${term.rows}`,
+ `ws://${ipLocal}/api/v1/terminals?id=${wsID.value}&cols=${term.cols}&rows=${term.rows}`,
);
terminalSocket.onopen = runRealTerminal;
terminalSocket.onmessage = onWSReceive;
diff --git a/frontend/src/views/login/components/login-form.vue b/frontend/src/views/login/components/login-form.vue
index b095defa4..0800a2973 100644
--- a/frontend/src/views/login/components/login-form.vue
+++ b/frontend/src/views/login/components/login-form.vue
@@ -166,7 +166,7 @@