Merge remote-tracking branch 'origin/master'

.gitignore

@@ -19,8 +19,8 @@
 hs_err_pid*
 **/transaction-logs/
 !/.mvn/wrapper/maven-wrapper.jar
-/data/
 *.db
+data/
 /static/
 /upload
 /ui/upload/

docker/dev-env/docker-compose.yml

@@ -2,7 +2,7 @@ version: '2'
 services:
   redis:
     image: redis:5.0.4
-    container_name: jetlinks-redis
+    container_name: jetlinks-ce-redis
     ports:
       - "6379:6379"
     volumes:
@@ -12,7 +12,7 @@ services:
       - TZ=Asia/Shanghai
   elasticsearch:
     image: elasticsearch:6.7.2
-    container_name: jetlinks-elasticsearch
+    container_name: jetlinks-ce-elasticsearch
     environment:
       ES_JAVA_OPTS: -Djava.net.preferIPv4Stack=true -Xms1g -Xmx1g
       transport.host: 0.0.0.0
@@ -27,7 +27,7 @@ services:
       - "9300:9300"
   kibana:
     image: kibana:6.7.2
-    container_name: jetlinks-kibana
+    container_name: jetlinks-ce-kibana
     environment:
       ELASTICSEARCH_URL: http://elasticsearch:9200
     links:
@@ -38,7 +38,7 @@ services:
       - elasticsearch
   postgres:
     image: postgres:11-alpine
-    container_name: jetlinks-postgres
+    container_name: jetlinks-ce-postgres
     ports:
       - "5432:5432"
     volumes:

docker/run-all/docker-compose.yml

@@ -60,7 +60,7 @@ services:
     image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-standalone
     container_name: jetlinks-ce
     ports:
-      - 9010:8848 # API端口
+      - 8848:8848 # API端口
       - 1883:1883 # MQTT端口
       - 8000:8000 # 预留
       - 8001:8001 # 预留
@@ -69,7 +69,7 @@ services:
       - "./data/upload:/static/upload"  # 持久化上传的文件
     environment:
 #      - "JAVA_OPTS=-Xms4g -Xmx10g -XX:+UseG1GC"
-      - "hsweb.file.upload.static-location=http://127.0.0.1:9000/upload"  #上传的静态文件访问根地址,为ui的地址.
+      - "hsweb.file.upload.static-location=http://127.0.0.1:8848/upload"  #上传的静态文件访问根地址,为ui的地址.
       - "spring.r2dbc.url=r2dbc:postgresql://postgres:5432/jetlinks" #数据库连接地址
       - "spring.r2dbc.username=postgres"
       - "spring.r2dbc.password=jetlinks"

jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/web/request/AuthorizationSettingDetail.java

@@ -70,7 +70,7 @@ public class AuthorizationSettingDetail {
         /**
          * 字段权限
          */
-        private List<FiledAccess> filedAccess;
+        private List<FiledAccess> fieldAccess;
 
         /**
          * 数据权限
@@ -80,7 +80,7 @@ public class AuthorizationSettingDetail {
         private PermissionInfo unwrap(AuthorizationSettingEntity entity) {
             this.id = entity.getPermission();
             this.actions = entity.getActions();
-            this.filedAccess = new ArrayList<>();
+            this.fieldAccess = new ArrayList<>();
             this.dataAccess = new ArrayList<>();
 
             //filed : access
@@ -116,7 +116,7 @@ public class AuthorizationSettingDetail {
                 }
             }
             this.dataAccess.addAll(dataAccessMap.values());
-            this.filedAccess.addAll(filedAccessMap.values());
+            this.fieldAccess.addAll(filedAccessMap.values());
 
             return this;
         }
@@ -125,9 +125,9 @@ public class AuthorizationSettingDetail {
             entity.setPermission(id);
             entity.setActions(actions);
             List<DataAccessEntity> entities = new ArrayList<>();
-            if (CollectionUtils.isNotEmpty(filedAccess)) {
+            if (CollectionUtils.isNotEmpty(fieldAccess)) {
                 Map<String, Set<String>> group = new HashMap<>();
-                for (FiledAccess access : filedAccess) {
+                for (FiledAccess access : fieldAccess) {
                     for (String action : access.getAction()) {
                         group.computeIfAbsent(action, r -> new HashSet<>())
                             .add(access.name);