diff --git a/core/init/migration/migrations/init.go b/core/init/migration/migrations/init.go index a45db537f..1b925da01 100644 --- a/core/init/migration/migrations/init.go +++ b/core/init/migration/migrations/init.go @@ -166,8 +166,7 @@ var InitSetting = &gormigrate.Migration{ var InitHost = &gormigrate.Migration{ ID: "20240816-init-host", Migrate: func(tx *gorm.DB) error { - hostGroup := &model.Group{Name: "Default", Type: "host", IsDefault: true} - if err := global.DB.Create(hostGroup).Error; err != nil { + if err := tx.Create(&model.Group{Name: "Default", Type: "host", IsDefault: true}).Error; err != nil { return err } if err := tx.Create(&model.Group{Name: "Default", Type: "node", IsDefault: true}).Error; err != nil { @@ -182,12 +181,6 @@ var InitHost = &gormigrate.Migration{ if err := tx.Create(&model.Group{Name: "Default", Type: "redis", IsDefault: true}).Error; err != nil { return err } - host := model.Host{ - Name: "local", Addr: "127.0.0.1", User: "root", Port: 22, AuthMode: "password", GroupID: hostGroup.ID, - } - if err := tx.Create(&host).Error; err != nil { - return err - } return nil }, } diff --git a/core/utils/terminal/local_cmd.go b/core/utils/terminal/local_cmd.go index 02ac335b2..256c429cf 100644 --- a/core/utils/terminal/local_cmd.go +++ b/core/utils/terminal/local_cmd.go @@ -32,14 +32,14 @@ func NewCommand(script string) (*LocalCommand, error) { } else { cmd.Env = append(os.Environ(), "TERM=xterm") } - cmd.Env = append(cmd.Env, "INIT_SCRIPT="+script) + cmd.Env = append(cmd.Env, "1PANEL_INIT_SCRIPT="+script) pty, err := pty.Start(cmd) if err != nil { return nil, errors.Wrapf(err, "failed to start command") } if len(script) != 0 { time.Sleep(100 * time.Millisecond) - _, _ = pty.Write([]byte("bash -c \"$INIT_SCRIPT\"\n")) + _, _ = pty.Write([]byte("bash -c \"$1PANEL_INIT_SCRIPT\"\n")) } lcmd := &LocalCommand{ diff --git a/frontend/src/components/terminal/index.vue b/frontend/src/components/terminal/index.vue index 7f190d446..0755141db 100644 --- a/frontend/src/components/terminal/index.vue +++ b/frontend/src/components/terminal/index.vue @@ -8,7 +8,8 @@ import { Terminal } from '@xterm/xterm'; import '@xterm/xterm/css/xterm.css'; import { FitAddon } from '@xterm/addon-fit'; import { Base64 } from 'js-base64'; -import { TerminalStore } from '@/store'; +import { GlobalStore, TerminalStore } from '@/store'; +const globalStore = GlobalStore(); const terminalElement = ref(null); const fitAddon = new FitAddon(); @@ -166,7 +167,7 @@ const initWebSocket = (endpoint_: string, args: string = '') => { const host = href.split('//')[1].split('/')[0]; const endpoint = endpoint_.replace(/^\/+/, ''); terminalSocket.value = new WebSocket( - `${protocol}://${host}/${endpoint}?cols=${term.value.cols}&rows=${term.value.rows}&${args}`, + `${protocol}://${host}/${endpoint}?cols=${term.value.cols}&rows=${term.value.rows}&${args}&operateNode=${globalStore.currentNode}`, ); terminalSocket.value.onopen = runRealTerminal; terminalSocket.value.onmessage = onWSReceive; diff --git a/frontend/src/views/container/container/index.vue b/frontend/src/views/container/container/index.vue index c0a2e9019..a96719b05 100644 --- a/frontend/src/views/container/container/index.vue +++ b/frontend/src/views/container/container/index.vue @@ -277,8 +277,8 @@