Pre Merge pull request !38 from 好青年_GEILIVABLE/N/A

Signed-off-by: 好青年_GEILIVABLE <420050757@qq.com>

docker/docker-compose.yml

@@ -9,6 +9,16 @@ services:
     environment:
       TZ: "Asia/Shanghai"
     command: redis-server /etc/redis/redis_default.conf --appendonly yes
+  mysql:
+    image: mysql:5.7
+    volumes:
+      - ./mysql:/var/lib/mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: mysql@tafei
+      MYSQL_DATABASE: wvp2
+      LANG: C.UTF-8
+    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+    
   wvp:
     build:
       context: ./wvp
@@ -33,7 +43,7 @@ services:
     environment:
       TZ: "Asia/Shanghai"
       # [必须修改] 本机的IP
-      WVP_HOST: 172.18.0.61
+      WVP_HOST: 111.67.197.136
       WVP_PWD: aseqw_+hiy123
       WVP_DOMAIN: 6101130049
       WVP_ID: 61011300490000000001
@@ -45,5 +55,8 @@ services:
       WVP_JVM_CONFIG: -Xms128m -Xmx256m
       ASSIST_CONFIG:
       WVP_CONFIG:
+      DB_HOST: mysql
+      DB_PASSWORD: mysql@tafei
     depends_on:
       - redis
+      - mysql

web_src/src/components/channelList.vue

@@ -355,9 +355,11 @@ export default {
     startRecord: function (itemData) {
       this.$axios({
         method: 'get',
-        url: `/api/device/control/record/${this.deviceId}/Record`,
+        url: `/api/device/control/record`,
         params: {
-          channelId: itemData.deviceId
+          deviceId: this.deviceId,
+          channelId: itemData.deviceId,
+          recordCmdStr: "Record"
         }
       }).then( (res)=> {
         if (res.data.code === 0) {
@@ -381,9 +383,11 @@ export default {
     stopRecord: function (itemData) {
       this.$axios({
         method: 'get',
-        url: `/api/device/control/record/${this.deviceId}/StopRecord`,
+        url: `/api/device/control/record`,
         params: {
-          channelId: itemData.deviceId
+          deviceId: this.deviceId,
+          channelId: itemData.deviceId,
+          recordCmdStr: "StopRecord"
         }
       }).then( (res)=> {
         if (res.data.code === 0) {