Merge branch 'master' of http://121.42.8.157:13000/zengminguo/gis-server

src/User.js

@@ -133,16 +133,15 @@ export default class User {
     socket.on('META', (req) => {
       // console.log(`Got META message : \n\t${JSON.stringify(req)}`)
       let sql = req.data.sql
-      let bUpdateOverSpeed = false
-      let bSolutionSelected = false
+      let bUpdateSettings = false
       //设置此字段为超速，server通知采集应用新的配置信息
       if (sql.indexOf('dat_setting') != -1 && sql.indexOf('over_speed') != -1)
       {
-        bUpdateOverSpeed = true
+        bUpdateSettings = true
       }
-      if (sql.indexOf('dat_map_zhurong') != -1 && sql.indexOf('name') != -1)
+      if (sql.indexOf('dat_map_zhurong') != -1 && sql.indexOf('solution') != -1)
       {
-        bSolutionSelected = true
+        bUpdateSettings = true
       }
       req = Utils.toJson(req)
       if (!req) {
@@ -152,7 +151,7 @@ export default class User {
 
       if (socket.auth) {
         this.meta.dispatch(this.socket, req)
-        if (bUpdateOverSpeed||bSolutionSelected)
+        if (bUpdateSettings)
         {
           let message = {
             cmd: 'setting',