提交 6d36ef3a 作者: 翁进城

feat: 飞控连接增加token

上级 02866184
...@@ -35,6 +35,7 @@ export default { ...@@ -35,6 +35,7 @@ export default {
baseUrl: "/", baseUrl: "/",
wsUrl: "wss://tmj.mmcuav.cn/websocket", wsUrl: "wss://tmj.mmcuav.cn/websocket",
mqttUrl: "wss://fkzx.mmcuav.cn:8884/mqtt", mqttUrl: "wss://fkzx.mmcuav.cn:8884/mqtt",
mqttToken: '',
}, },
scene: 0, // 场景类型 1: 无人机 2: 机库 scene: 0, // 场景类型 1: 无人机 2: 机库
account: "mmctest@admin", account: "mmctest@admin",
......
...@@ -5,7 +5,7 @@ export default { ...@@ -5,7 +5,7 @@ export default {
computed: { computed: {
...mapState("MMCFlightControlCenter/hangar", ["hangar"]), ...mapState("MMCFlightControlCenter/hangar", ["hangar"]),
...mapState("MMCFlightControlCenter/uav", ["uav"]), ...mapState("MMCFlightControlCenter/uav", ["uav"]),
...mapState("MMCFlightControlCenter", ['mqttUrlHangar']), ...mapState("MMCFlightControlCenter", ['mqttUrlHangar', 'mqttToken']),
// mqtt实时数据 // mqtt实时数据
mqttDataSetHangar() { mqttDataSetHangar() {
return this.$store.state.MMCMQTT?.dataSet?.[this.hangar?.deviceId]; return this.$store.state.MMCMQTT?.dataSet?.[this.hangar?.deviceId];
...@@ -35,6 +35,7 @@ export default { ...@@ -35,6 +35,7 @@ export default {
this.$store this.$store
.dispatch("MMCMQTT/init", { .dispatch("MMCMQTT/init", {
url: this.mqttUrlHangar, url: this.mqttUrlHangar,
password: this.mqttToken
}) })
.then(() => { .then(() => {
console.log("mqtt连接成功"); console.log("mqtt连接成功");
......
...@@ -12,6 +12,9 @@ export default { ...@@ -12,6 +12,9 @@ export default {
mqttUrl() { mqttUrl() {
return this.$store.state.MMCFlightControlCenter.mqttUrl; return this.$store.state.MMCFlightControlCenter.mqttUrl;
}, },
mqttToken() {
return this.$store.state.MMCFlightControlCenter.mqttToken;
}
}, },
watch: { watch: {
mqttDataSet(newVal) { mqttDataSet(newVal) {
...@@ -43,6 +46,7 @@ export default { ...@@ -43,6 +46,7 @@ export default {
this.$store this.$store
.dispatch("MMCMQTT/init", { .dispatch("MMCMQTT/init", {
url: this.mqttUrl, url: this.mqttUrl,
password: this.mqttToken
}) })
.then(() => { .then(() => {
console.log("mqtt连接成功"); console.log("mqtt连接成功");
......
...@@ -138,6 +138,14 @@ export default { ...@@ -138,6 +138,14 @@ export default {
key: "mqttUrlHangar", key: "mqttUrlHangar",
value: newVal.mqttUrlHangar, value: newVal.mqttUrlHangar,
}); });
this.$store.commit("MMCFlightControlCenter/setState", {
key: "mqttUrlHangar",
value: newVal.mqttUrlHangar,
});
this.$store.commit("MMCFlightControlCenter/setState", {
key: "mqttToken",
value: newVal.mqttToken,
});
}, },
}, },
useSTLAirway: { useSTLAirway: {
......
...@@ -45,6 +45,7 @@ export default { ...@@ -45,6 +45,7 @@ export default {
wsUrl: '', //websocket的url wsUrl: '', //websocket的url
mqttUrl: '', //无人机的mqtt地址 mqttUrl: '', //无人机的mqtt地址
mqttUrlHangar: '', //机库的mqtt地址 mqttUrlHangar: '', //机库的mqtt地址
mqttToken: '', //mqtt token
showAirwayEdit: false, //展开航线编辑 showAirwayEdit: false, //展开航线编辑
}, },
mutations: { mutations: {
......
...@@ -24,7 +24,6 @@ export default { ...@@ -24,7 +24,6 @@ export default {
}, },
orders, //所有指令 orders, //所有指令
username: 'tmj', username: 'tmj',
password: 'Tmj@192D9'
}, },
mutations: { mutations: {
/** /**
...@@ -60,8 +59,8 @@ export default { ...@@ -60,8 +59,8 @@ export default {
init({ commit, state }, data) { init({ commit, state }, data) {
let clientId = Date.now(); let clientId = Date.now();
let client = mqtt.connect(data.url, { let client = mqtt.connect(data.url, {
username: state.username, username: data.username || state.username,
password: state.password, password: data.password,
clientId, clientId,
}); });
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论