diff --git a/flyfish-data/src/main/java/com/flyfish/framework/annotations/FormItem.java b/flyfish-data/src/main/java/com/flyfish/framework/annotations/FormItem.java index 5e56fbe..b358d65 100644 --- a/flyfish-data/src/main/java/com/flyfish/framework/annotations/FormItem.java +++ b/flyfish-data/src/main/java/com/flyfish/framework/annotations/FormItem.java @@ -15,7 +15,7 @@ public @interface FormItem { /** * @return 组件 */ - String component() default "a-input"; + String component() default ""; /** * 属性key=value diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java b/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java index bc48ac4..09cda2b 100644 --- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java +++ b/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java @@ -273,11 +273,13 @@ public class BeanProperty { if (StringUtils.isNotBlank(prop.group())) { property.group = prop.group(); } + property.readonly = prop.readonly(); } else { BeanProperty property = new BeanProperty(); property.setType(BeanPropertyType.STRING); property.setName(key); property.setTitle(prop.title()); + property.setReadonly(prop.readonly()); result.add(property); } } diff --git a/flyfish-web/src/main/java/com/flyfish/framework/handler/GlobalExceptionHandler.java b/flyfish-web/src/main/java/com/flyfish/framework/handler/GlobalExceptionHandler.java index 1f9e450..f5c08b9 100644 --- a/flyfish-web/src/main/java/com/flyfish/framework/handler/GlobalExceptionHandler.java +++ b/flyfish-web/src/main/java/com/flyfish/framework/handler/GlobalExceptionHandler.java @@ -25,7 +25,7 @@ import java.util.stream.Collectors; * Created by wangyu on 2017/9/8. * 只允许implement了SafeController的class */ -@RestControllerAdvice(basePackageClasses = SafeController.class) +@RestControllerAdvice(assignableTypes = SafeController.class) @ResponseBody public class GlobalExceptionHandler { private Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class);