Merge branch 'master' of https://gogs.baozhida.cn/huangyan/city_chips

.vscode/settings.json

@@ -0,0 +1,20 @@
+{
+    "MicroPython.executeButton": [
+        {
+            "text": "▶",
+            "tooltip": "运行",
+            "alignment": "left",
+            "command": "extension.executeFile",
+            "priority": 3.5
+        }
+    ],
+    "MicroPython.syncButton": [
+        {
+            "text": "$(sync)",
+            "tooltip": "同步",
+            "alignment": "left",
+            "command": "extension.execute",
+            "priority": 4
+        }
+    ]
+}

config/local.yml

@@ -11,8 +11,8 @@ data:
   mysql:
     user: root:bzd@123#321!@tcp(182.43.195.17:3306)/park_a?charset=utf8mb4&parseTime=True&loc=Local
   redis:
-    addr: 127.0.0.1:6379
-    password: ""
+    addr: 124.220.100.95:6379
+    password: "redis_smY74X"
     db: 0
     read_timeout: 0.2s
     write_timeout: 0.2s
@@ -44,8 +44,8 @@ hikvision:
   api:
     nodesByParams: "/artemis/api/irds/v2/region/nodesByParams" #根据查询条件查询区域列表信息，主要用于区域信息查询过滤。相对V1接口，支持级联场景的区域查询
     deviceResource: "/artemis/api/irds/v2/deviceResource/resources" #根据资源类型分页获取资源列表，主要用于资源信息的全量同步。
-    cameras: "/artemis/api/resource/v1/cameras"#分页获取监控点资源获取监控点列表接口可用来全量同步监控点信息，返回结果分页展示。
-    previewURLs: "/artemis/api/video/v2/cameras/previewURLs"#获取监控点预览取流URLv2
+    cameras: "/artemis/api/resource/v1/cameras" #分页获取监控点资源获取监控点列表接口可用来全量同步监控点信息，返回结果分页展示。
+    previewURLs: "/artemis/api/video/v2/cameras/previewURLs" #获取监控点预览取流URLv2
     controlling: "/artemis/api/video/v1/ptzs/controlling" #根据监控点编号进行云台操作接口
     visitorInfo: "/artemis/api/v1/visitorInfo/count" #获取今日访客信息包含：今日来访总人数（已签离人数，未签离人数），预约人数
     doorSearch: "/artemis/api/resource/v2/door/search" #查询门禁点列表v2