feat: expose build version in public config

- add version to public/admin config responses
- inject build version in Docker and GoReleaser builds
- limit Docker image publishing to v* tags
- restore soft-deleted settings on upsert
This commit is contained in:
line-6000
2026-05-21 19:23:04 +08:00
parent 049a15cb95
commit 85b81e661c
185 changed files with 409 additions and 207 deletions
+13 -2
View File
@@ -40,6 +40,9 @@ type InitialAdminPasswordHashInfo struct {
// can print it to the console. Idempotent — subsequent calls return
// ("", false, nil).
func EnsureDefaultAdmin() (password string, created bool, err error) {
if err := purgeDeletedInitialAdminPasswordPlain(); err != nil {
return "", false, err
}
var count int64
if err := dao.Mdb.Model(&mdb.AdminUser{}).Count(&count).Error; err != nil {
return "", false, err
@@ -68,6 +71,12 @@ func EnsureDefaultAdmin() (password string, created bool, err error) {
return password, true, nil
}
func purgeDeletedInitialAdminPasswordPlain() error {
return dao.Mdb.Unscoped().
Where("`key` = ? AND deleted_at IS NOT NULL", mdb.SettingKeyInitAdminPasswordPlain).
Delete(&mdb.Setting{}).Error
}
func randomAdminPassword() string {
b := make([]byte, 16)
_, _ = rand.Read(b)
@@ -121,9 +130,11 @@ func initAdminPasswordState(plain string) error {
}
func upsertSettingRow(tx *gorm.DB, row mdb.Setting) error {
updates := clause.AssignmentColumns([]string{"group", "value", "type", "description", "updated_at"})
updates = append(updates, clause.Assignment{Column: clause.Column{Name: "deleted_at"}, Value: nil})
return tx.Clauses(clause.OnConflict{
Columns: []clause.Column{{Name: "key"}},
DoUpdates: clause.AssignmentColumns([]string{"group", "value", "type", "description", "updated_at"}),
DoUpdates: updates,
}).Create(&row).Error
}
@@ -154,7 +165,7 @@ func ConsumeInitialAdminPassword() (string, error) {
return ErrInitAdminPasswordUnavailable
}
password = row.Value
res := tx.Where("`key` = ?", mdb.SettingKeyInitAdminPasswordPlain).Delete(&mdb.Setting{})
res := tx.Unscoped().Where("`key` = ?", mdb.SettingKeyInitAdminPasswordPlain).Delete(&mdb.Setting{})
if res.Error != nil {
return res.Error
}