Merge branch 'feat/multiActivity' into 'master'

feat: vcc开关状态查询请求头version跟随app版本

See merge request !94

app/web/api/editor.api.ts

@@ -26,9 +26,18 @@ export default {
     });
   },
   getFinanceSetting() {
+    const customHeader: any = {};
+    if (EASY_ENV_IS_BROWSER) {
+      const ua = window.navigator.userAgent;
+      const appVersion = ua.match(/xyqb\/([\d|.]+)/) ? (ua.match(/xyqb\/([\d|.]+)/) as string[])[1] : '8.2.00';
+      customHeader.version = appVersion;
+    }
+
     // return http.post(`http://yapi.quantgroups.com/mock/351/api/kdsp/api/kdsp/vcc_switch`, {
     return http.post(`${config.kdspHost}/api/kdsp/vcc_switch/get-vcc-status`, {
       areaType: 6
+    }, {
+      customHeader
     });
   }
 };
\ No newline at end of file

config/apollo.json

@@ -19,7 +19,7 @@
   },
   "redis": {
     "port": "30835",
-    "host": "172.16.4.6",
+    "host": "172.16.4.89",
     "password": "",
     "db": 0
   },