Merge remote-tracking branch 'origin/2.0' into 2.0

jetlinks-standalone/src/main/resources/application.yml

@@ -144,7 +144,7 @@ logging:
     #    org.springframework.data.elasticsearch.client: trace
     #    org.elasticsearch: error
     org.elasticsearch: error
-    org.elasticsearch.deprecation.search.aggregations.bucket.histogram: error
+    org.elasticsearch.deprecation: off
   config: classpath:logback-spring.xml
 vertx:
   max-event-loop-execute-time-unit: seconds
@@ -159,6 +159,25 @@ micrometer:
     metrics:
       default:
         step: 30s
+system:
+  config:
+    scopes:
+      - id: front
+        name: 前端配置
+        public-access: true
+      - id: paths
+        name: 访问路径配置
+        public-access: true
+        properties:
+          - key: base-path
+            name: 接口根路径
+            default-value: http://localhost:9000/api
+      - id: amap
+        name: 高德地图配置
+        public-access: false
+        properties:
+          - key: apiKey # 配置id
+            name: 高德地图ApiKey # 名称
 management:
   health:
     elasticsearch: