优化结构

internal/service/integration/integration_config.go

@@ -84,15 +84,9 @@ func (s *IntegrationConfigService) Delete(ctx context.Context, kind, provider st
 }
 
 func mergeConfigJSON(defaults map[string]any, raw json.RawMessage) json.RawMessage {
-	values := make(map[string]any, len(defaults))
-	for key, value := range defaults {
-		values[key] = value
-	}
 	stored := map[string]any{}
 	_ = json.Unmarshal(raw, &stored)
-	for key, value := range stored {
-		values[key] = value
-	}
+	values := integrationbiz.MergeIntegrationDefaults(defaults, stored)
 	encoded, _ := json.Marshal(values)
 	return encoded
 }

internal/service/system/parameter.go

@@ -24,12 +24,12 @@ func (s *ParameterService) UpdateParameterRequest(ctx context.Context, req *dto.
 	return s.UpdateParameter(ctx, parameterDomain(req))
 }
 func (s *ParameterService) ParametersFilter(ctx context.Context, page, size int, name, key string, start, end *time.Time) ([]*dto.SystemParameterResponse, int64, error) {
-	return s.Parameters(ctx, page, size, &system.SystemParameter{Name: name, Key: key, StartCreatedAt: start, EndCreatedAt: end})
+	return s.Parameters(ctx, page, size, &system.SystemParameterFilter{Name: name, Key: key, StartCreatedAt: start, EndCreatedAt: end})
 }
 func parameterDTO(v *system.SystemParameter) *dto.SystemParameterResponse {
 	return &dto.SystemParameterResponse{ID: v.ID, CreatedAt: v.CreatedAt, UpdatedAt: v.UpdatedAt, DeletedAt: nil, Name: v.Name, Key: v.Key, Value: v.Value, Desc: v.Desc}
 }
-func (s *ParameterService) Parameters(ctx context.Context, page, size int, q *system.SystemParameter) ([]*dto.SystemParameterResponse, int64, error) {
+func (s *ParameterService) Parameters(ctx context.Context, page, size int, q *system.SystemParameterFilter) ([]*dto.SystemParameterResponse, int64, error) {
 	items, total, err := s.uc.ListParameters(ctx, page, size, q)
 	if err != nil {
 		return nil, 0, err