diff --git a/core/app/service/host.go b/core/app/service/host.go index eabffe7ab..1b1dc7f04 100644 --- a/core/app/service/host.go +++ b/core/app/service/host.go @@ -266,8 +266,8 @@ func (u *HostService) Create(req dto.HostOperate) (*dto.HostInfo, error) { req.GroupID = group.ID } var sameHostID uint - if req.Addr == "127.0.0.1" { - hostSame, _ := hostRepo.Get(hostRepo.WithByAddr(req.Addr)) + if req.Name == "local" { + hostSame, _ := hostRepo.Get(repo.WithByName("local")) sameHostID = hostSame.ID } else { hostSame, _ := hostRepo.Get(hostRepo.WithByAddr(req.Addr), hostRepo.WithByUser(req.User), hostRepo.WithByPort(req.Port)) diff --git a/core/cmd/server/conf/app.yaml b/core/cmd/server/conf/app.yaml index bcf952070..d216ea93f 100644 --- a/core/cmd/server/conf/app.yaml +++ b/core/cmd/server/conf/app.yaml @@ -1,18 +1,20 @@ -system: - db_core_file: core.db - base_dir: /opt +base: + install_dir: /opt mode: dev - repo_url: https://resource.fit2cloud.com/1panel/package - app_repo: https://apps-assets.fit2cloud.com is_demo: false is_intl: false port: 9999 username: admin password: admin123 + version: v2.0.0 + +remote_url: + repo_url: https://resource.fit2cloud.com/1panel/package + app_repo: https://apps-assets.fit2cloud.com log: level: debug time_zone: Asia/Shanghai log_name: 1Panel log_suffix: .log - max_backup: 10 + max_backup: 10 \ No newline at end of file diff --git a/core/global/config.go b/core/global/config.go index 1c5e91730..f6fe16899 100644 --- a/core/global/config.go +++ b/core/global/config.go @@ -36,8 +36,7 @@ type ApiInterface struct { } type RemoteURL struct { - RepoUrl string `mapstructure:"repo_url"` - ResourceUrl string `mapstructure:"resource_url"` + RepoUrl string `mapstructure:"repo_url"` } type LogConfig struct { diff --git a/core/init/migration/migrate.go b/core/init/migration/migrate.go index 5cdeecdf3..c854dcc1c 100644 --- a/core/init/migration/migrate.go +++ b/core/init/migration/migrate.go @@ -20,6 +20,7 @@ func Init() { migrations.AddTaskDB, migrations.UpdateSettingStatus, migrations.RemoveLocalBackup, + migrations.AddMFAInterval, }) if err := m.Migrate(); err != nil { global.LOG.Error(err) diff --git a/core/init/migration/migrations/init.go b/core/init/migration/migrations/init.go index b5678e832..7a7f0b849 100644 --- a/core/init/migration/migrations/init.go +++ b/core/init/migration/migrations/init.go @@ -297,3 +297,13 @@ var RemoveLocalBackup = &gormigrate.Migration{ return nil }, } + +var AddMFAInterval = &gormigrate.Migration{ + ID: "20250207-add-mfa-interval", + Migrate: func(tx *gorm.DB) error { + if err := tx.Create(&model.Setting{Key: "MFAInterval", Value: "30"}).Error; err != nil { + return err + } + return nil + }, +} diff --git a/frontend/package.json b/frontend/package.json index cdab697e6..3ca9c181d 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -21,6 +21,8 @@ }, "dependencies": { "@codemirror/lang-json": "^6.0.1", + "@codemirror/lang-html": "^6.4.9", + "@codemirror/lang-php": "^6.0.1", "@codemirror/language": "^6.10.2", "@codemirror/legacy-modes": "^6.4.0", "@codemirror/theme-one-dark": "^6.1.2", diff --git a/frontend/src/components/group/index.vue b/frontend/src/components/group/index.vue index 35650511e..b0e54714a 100644 --- a/frontend/src/components/group/index.vue +++ b/frontend/src/components/group/index.vue @@ -2,7 +2,7 @@