删除不支持的内容

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/DataAccessConfig.java

@@ -78,23 +78,18 @@ public interface DataAccessConfig extends Serializable {
          */
         String DENY_FIELDS = "DENY_FIELDS";
 
-        /**
-         * 字段过滤,白名单
-         *
-         * @see FieldFilterDataAccessConfig#getType()
-         */
-        String ALLOW_FIELDS = "ALLOW_FIELDS";
         /**
          * 自定义脚本方式
          *
          * @see ScriptDataAccessConfig#getType()
          */
-        String SCRIPT       = "SCRIPT";
+        String SCRIPT = "SCRIPT";
+
         /**
          * 自定义控制器
          *
          * @see CustomDataAccessConfig#getType()
          */
-        String CUSTOM       = "CUSTOM";
+        String CUSTOM = "CUSTOM";
     }
 }

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/simple/builder/SimpleDataAccessConfigBuilderFactory.java

@@ -25,12 +25,10 @@ import static org.hswebframework.web.authorization.access.DataAccessConfig.Defau
 public class SimpleDataAccessConfigBuilderFactory implements DataAccessConfigBuilderFactory {
 
     private List<String> defaultSupportConvert = Arrays.asList(
-            CUSTOM
-//            DataAccessConfig.DefaultType.SCRIPT
-            , OWN_CREATED,
+            CUSTOM,
+            OWN_CREATED,
             FIELD_SCOPE,
-            DENY_FIELDS,
-            ALLOW_FIELDS);
+            DENY_FIELDS);
 
     private List<DataAccessConfigConvert> converts = new LinkedList<>();
 
@@ -79,9 +77,6 @@ public class SimpleDataAccessConfigBuilderFactory implements DataAccessConfigBui
         if (defaultSupportConvert.contains(DENY_FIELDS))
             converts.add(createJsonConfig(DENY_FIELDS, SimpleFieldFilterDataAccessConfig.class));
 
-        if (defaultSupportConvert.contains(ALLOW_FIELDS))
-            converts.add(createJsonConfig(ALLOW_FIELDS, SimpleFieldFilterDataAccessConfig.class));
-
         if (defaultSupportConvert.contains(OWN_CREATED))
             converts.add(createConfig(OWN_CREATED, (action, config) -> new SimpleOwnCreatedDataAccessConfig(action)));
 

hsweb-examples/hsweb-examples-oauth2/hsweb-examples-oauth2-server/src/main/java/org/hswebframework/web/example/oauth2/OAuth2ServerApplication.java

@@ -103,7 +103,7 @@ public class OAuth2ServerApplication implements CommandLineRunner {
         updateAccessEntity.setAction(Permission.ACTION_UPDATE);
 
         DataAccessEntity denyFields = new DataAccessEntity();
-        denyFields.setType(DataAccessConfig.DefaultType.ALLOW_FIELDS);
+        denyFields.setType(DataAccessConfig.DefaultType.DENY_FIELDS);
         denyFields.setAction(Permission.ACTION_UPDATE);
         denyFields.setConfig(JSON.toJSONString(new SimpleFieldFilterDataAccessConfig("password")));
 

hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-entity/src/main/java/org/hswebframework/web/entity/dictionary/DictionaryItemEntity.java

@@ -53,7 +53,7 @@ public interface DictionaryItemEntity extends TreeSortSupportEntity<String> {
     /**
      * 是否启用
      */
-    String status        = "status";
+    String status         = "status";
     /**
      * 说明
      */
@@ -175,4 +175,6 @@ public interface DictionaryItemEntity extends TreeSortSupportEntity<String> {
      * 设置 快速搜索码
      */
     void setSearchCode(String searchCode);
+
+    void setChildren(List<DictionaryItemEntity> children);
 }

hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-entity/src/main/java/org/hswebframework/web/entity/dictionary/SimpleDictionaryItemEntity.java

@@ -49,15 +49,15 @@ public class SimpleDictionaryItemEntity extends SimpleTreeSortSupportEntity<Stri
     private String valueExpression;
 
 
-    private List<SimpleDictionaryItemEntity> children;
+    private List<DictionaryItemEntity> children;
 
     @Override
     @SuppressWarnings("unchecked")
-    public List<SimpleDictionaryItemEntity> getChildren() {
+    public List<DictionaryItemEntity> getChildren() {
         return children;
     }
 
-    public void setChildren(List<SimpleDictionaryItemEntity> children) {
+    public void setChildren(List<DictionaryItemEntity> children) {
         this.children = children;
     }