更改版本号为0.2.0

vue2/package.json

 {
   "name": "vue2",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",
@@ -9,6 +9,7 @@
   },
   "dependencies": {
     "core-js": "^3.8.3",
+    "js-base64": "^3.7.5",
     "mqtt": "^4.3.6",
     "vue": "^2.6.14",
     "vue-router": "^3.5.2",

vue2/src/views/groundStation/demo.js

@@ -2,6 +2,9 @@ export default `
 <template>
   <div>
     <el-form>
+      <el-form-item label="地面站地址">
+        <el-input v-model="url"></el-input>
+      </el-form-item>
       <el-form-item label="账号">
         <el-input v-model="account"></el-input>
       </el-form-item>
@@ -31,12 +34,14 @@ export default `
 </template>
 
 <script>
+import { Base64 } from "js-base64"
+
 export default {
   name: "GroundStation",
   data() {
     return {
-      account: "juchut",
-      password: "dG1qMDQwNyNuZXcuMQ==",
+      account: "wjc",
+      password: "123456",
       deviceHardId: "",
       userInfo: {
         username: "",
@@ -45,6 +50,7 @@ export default {
         // 'task-id': 1448
       },
       callbackText: "",
+      url: "wss://test.tmj.mmcuav.cn/websocket"
     };
   },
   computed: {
@@ -60,46 +66,25 @@ export default {
     async login() {
       let formData = new FormData();
       formData.append("userAccount", this.account);
-      formData.append("password", this.password);
-      let res1 = await fetch("/crm/account/login", {
+      formData.append("password", Base64.encode(this.password));
+      let res1 = await fetch("/crm/login", {
         method: "post",
         headers: {
-          "Content-Type": "application/json",
+          // "Content-Type": "multipart/form-data",
         },
-        body: JSON.stringify({
-          username: this.account,
-          password: this.password,
-        }),
+        body: formData,
       });
       let data1 = await res1.json();
 
       if (data1.code == 200) {
-        this.userInfo.username = data1.data.username;
-      }
-
-      let res2 = await fetch("/crm/account/loginInfo", {
-        method: "post",
-        headers: {
-          token: data1.data.token,
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          loginInfo: {
-            appId: "40004",
-            token: data1.data.token,
-          },
-        }),
-      });
-      let data2 = await res2.json();
-
-      if (data2.code == 200) {
-        this.userInfo.token = data2.data.token + data2.data.flyingSessionId;
+        this.userInfo.username = data1.data.userName;
+        this.userInfo.token = data1.data.token;
       }
     },
     async connect() {
       try {
         await this.$store.dispatch("MMCGroundStation/init", {
-          url: "ws://121.43.58.140:30105",
+          url: this.url,
           userInfo: this.userInfo,
         });
       } catch (e) {

vue2/src/views/groundStation/demo.vue

@@ -33,12 +33,14 @@
 </template>
 
 <script>
+import { Base64 } from "js-base64"
+
 export default {
   name: "GroundStation",
   data() {
     return {
-      account: "mmc111",
-      password: "MTIzNDU2",
+      account: "wjc",
+      password: "123456",
       deviceHardId: "",
       userInfo: {
         username: "",
@@ -63,7 +65,7 @@ export default {
     async login() {
       let formData = new FormData();
       formData.append("userAccount", this.account);
-      formData.append("password", this.password);
+      formData.append("password", Base64.encode(this.password));
       let res1 = await fetch("/crm/login", {
         method: "post",
         headers: {