优化

internal/data/security.go

@@ -52,6 +52,10 @@ func securityToPO(v *biz.SecurityConfig) securityConfigPO {
 	return securityConfigPO{ID: 1, CreatedAt: v.CreatedAt, UpdatedAt: v.UpdatedAt, CaptchaOpen: v.CaptchaOpen, CaptchaTimeout: v.CaptchaTimeout, KeyLong: v.KeyLong, ImgWidth: v.ImgWidth, ImgHeight: v.ImgHeight, PwdMinLength: v.PwdMinLength, PwdRequireUpper: v.PwdRequireUpper, PwdRequireLower: v.PwdRequireLower, PwdRequireDigit: v.PwdRequireDigit, PwdRequireSpecial: v.PwdRequireSpecial, LimitEnable: v.LimitEnable, LimitWindow: v.LimitWindow, LimitCount: v.LimitCount, LockEnable: v.LockEnable, LockThreshold: v.LockThreshold, LockDuration: v.LockDuration, PwdExpireEnable: v.PwdExpireEnable, PwdExpireDays: v.PwdExpireDays, ForceNewUserChangePassword: v.ForceNewUserChangePassword}
 }
 func (r *securityRepo) SecurityConfig(ctx context.Context) (*biz.SecurityConfig, error) {
+	if !r.data.databaseReady.Load() {
+		po := defaultSecurityConfig()
+		return securityFromPO(po), errors.New("数据库未初始化")
+	}
 	var po securityConfigPO
 	err := r.data.gormDB.WithContext(ctx).First(&po, 1).Error
 	if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -64,20 +68,16 @@ func (r *securityRepo) SecurityConfig(ctx context.Context) (*biz.SecurityConfig,
 	return securityFromPO(po), nil
 }
 func (r *securityRepo) SaveSecurityConfig(ctx context.Context, v *biz.SecurityConfig) error {
-	previous, err := r.SecurityConfig(ctx)
-	if err != nil {
+	po := securityToPO(v)
+	if err := r.data.gormDB.WithContext(ctx).Save(&po).Error; err != nil {
 		return err
 	}
-	po := securityToPO(v)
-	po.CreatedAt, po.UpdatedAt = previous.CreatedAt, previous.UpdatedAt
-	return r.data.gormDB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		if err := tx.Save(&po).Error; err != nil {
-			return err
-		}
-		if v.PwdExpireEnable && !previous.PwdExpireEnable {
-			return tx.Model(&userPO{}).Where("password_updated_at IS NULL").Update("password_updated_at", time.Now()).Error
-		}
-		v.ID, v.CreatedAt, v.UpdatedAt = po.ID, po.CreatedAt, po.UpdatedAt
-		return nil
-	})
+	v.ID, v.CreatedAt, v.UpdatedAt = po.ID, po.CreatedAt, po.UpdatedAt
+	return nil
+}
+
+func (r *securityRepo) BackfillPasswordUpdatedAt(ctx context.Context, at time.Time) error {
+	return r.data.gormDB.WithContext(ctx).Model(&userPO{}).
+		Where("password_updated_at IS NULL").
+		Update("password_updated_at", at).Error
 }