Merge branch 'master' into dev/1078-newUI

# Conflicts:
#	src/main/resources/application.yml

web_src/src/components/StreamPushEdit.vue

@@ -86,9 +86,9 @@ export default {
             showClose: true,
             message: error
           })
-        }).finally(()=>[
+        }).finally(()=>{
           this.locading = false
-        ])
+        })
       }else {
         this.$axios({
           method: 'post',
@@ -113,9 +113,9 @@ export default {
             showClose: true,
             message: error
           })
-        }).finally(()=>[
+        }).finally(()=>{
           this.locading = false
-        ])
+        })
       }
 
     },

web_src/src/components/common/CommonChannelEdit.vue

@@ -279,9 +279,9 @@ export default {
             showClose: true,
             message: error
           });
-        }).finally(()=>[
+        }).finally(()=>{
           this.locading = false
-        ])
+        })
       }else {
         this.$axios({
           method: 'post',
@@ -308,9 +308,9 @@ export default {
             showClose: true,
             message: error
           });
-        }).finally(()=>[
+        }).finally(()=>{
           this.locading = false
-        ])
+        })
       }
 
     },
@@ -338,9 +338,9 @@ export default {
           }
         }).catch((error) => {
           console.error(error)
-        }).finally(()=>[
+        }).finally(()=>{
           this.locading = false
-        ])
+        })
       }).catch(() => {
 
       });
@@ -363,9 +363,9 @@ export default {
         }
       }).catch((error) => {
         console.error(error)
-      }).finally(()=>[
+      }).finally(()=>{
         this.locading = false
-      ])
+      })
     },
     buildDeviceIdCode: function (deviceId){
 

web_src/src/components/dialog/deviceEdit.vue

@@ -109,8 +109,8 @@ export default {
       console.log(this.form);
       this.$axios({
         method: 'post',
-        url:`/api/device/query/device/${this.isEdit?'update':'add'}/`,
-        params: this.form
+        url:`/api/device/query/device/${this.isEdit?'update':'add'}`,
+        data: this.form
       }).then((res) => {
         console.log(res.data)
         if (res.data.code === 0) {