From e520a042091376d3daa406b3281bb5028003fbfa Mon Sep 17 00:00:00 2001
From: zhou-hao <admin@hsweb.me>
Date: Tue, 15 Oct 2019 11:12:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=BB=98=E8=AE=A4=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/crud/generator/DefaultIdGenerator.java             | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/generator/DefaultIdGenerator.java b/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/generator/DefaultIdGenerator.java
index dfcb7679f..67691d9e4 100644
--- a/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/generator/DefaultIdGenerator.java
+++ b/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/generator/DefaultIdGenerator.java
@@ -2,6 +2,7 @@ package org.hswebframework.web.crud.generator;
 
 import lombok.Getter;
 import lombok.Setter;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.hswebframework.ezorm.core.DefaultValue;
 import org.hswebframework.ezorm.core.DefaultValueGenerator;
@@ -28,14 +29,16 @@ public class DefaultIdGenerator implements DefaultValueGenerator<RDBColumnMetada
     }
 
     @Override
+    @SneakyThrows
     public DefaultValue generate(RDBColumnMetadata metadata) {
         return Mono.justOrEmpty(mappings.get(metadata.getOwner().getName()))
                 .switchIfEmpty(Mono.justOrEmpty(defaultId))
                 .flatMap(id->Mono.justOrEmpty(metadata.findFeature(DefaultValueGenerator.createId(id))))
                 .doOnNext(gen-> log.debug("use default id generator : {} for column : {}", gen.getSortId(), metadata.getFullName()))
                 .map(gen->gen.generate(metadata))
-                .blockOptional()
-                .orElseThrow(()->new UnsupportedOperationException("不支持的生成器:" + defaultId));
+                .switchIfEmpty(Mono.error(()->new UnsupportedOperationException("不支持的生成器:" + defaultId)))
+                .toFuture()
+                .get();
     }
 
     @Override