From ab73090d8bbb55f884cedf19d298cff07322b020 Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Tue, 7 Sep 2021 22:34:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8F=90=E4=BE=9B=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E7=BA=A7=E5=88=AB=E7=9A=84=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/flyfish/framework/annotations/FormItem.java   | 2 +-
 .../java/com/flyfish/framework/beans/meta/BeanProperty.java     | 2 ++
 .../com/flyfish/framework/handler/GlobalExceptionHandler.java   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

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);