Merge branch 'dev-meta' of xiongzhu/raex_back into master

src/main/vue/src/plugins/requestWithCertificate.js

@@ -0,0 +1,14 @@
+import https from 'https';
+import axios from 'axios';
+
+const requestWithCertificate = () => {
+  const agent = new https.Agent({
+    rejectUnauthorized: false // 允许访问无效或过期的 SSL 证书
+  });
+  const instance = axios.create({
+    httpsAgent: agent // 指定自定义的 SSL 证书验证方式
+  });
+  return instance;
+};
+
+export default requestWithCertificate;

src/main/vue/src/views/MetaObjectMoveList.vue

@@ -45,7 +45,7 @@
 import { mapState } from 'vuex';
 import axios from 'axios';
 import pageableTable from '@/mixins/pageableTable';
-import https from 'https';
+import requestWithCertificate from '@/plugins/requestWithCertificate';
 
 export default {
 	name: 'MetaObjectMoveList',
@@ -74,13 +74,7 @@ export default {
 		}
 	},
 	mounted() {
-		const agent = new https.Agent({
-			rejectUnauthorized: false // 允许访问无效或过期的 SSL 证书
-		});
-		const instance = axios.create({
-			httpsAgent: agent // 指定自定义的 SSL 证书验证方式
-		});
-		instance.get(`https://${this.baseUrl}/mmo/websocket/check`)
+		requestWithCertificate().get(`https://${this.baseUrl}/mmo/websocket/check`)
 			.then(res => {
 				if (res.data !== 'success') {
 					this.$message.error(res.data);
@@ -89,16 +83,6 @@ export default {
 			.catch(e => {
 				this.$message.error(e.message);
 			});
-		// axios
-		// 	.get(`https://${this.baseUrl}/mmo/websocket/check`)
-		// 	.then(res => {
-		// 		if (res.data != 'success') {
-		// 			this.$message.error(res.data);
-		// 		}
-		// 	})
-		// 	.catch(e => {
-		// 		this.$message.error(e);
-		// 	});
 	},
 	methods: {
 		beforeGetData() {
@@ -179,8 +163,7 @@ export default {
 						return this.$http.post(`/metaObjectMove/${row.id}/run`);
 					})
 					.then(() => {
-						axios
-							.get(`http://${this.baseUrl}/mmo/websocket/${row.objectId}/start`)
+						requestWithCertificate().get(`https://${this.baseUrl}/mmo/websocket/${row.objectId}/start`)
 							.then(() => {
 								this.$message.success('运行成功，正在广播坐标信息');
 								this.getData();
@@ -209,8 +192,7 @@ export default {
 						return this.$http.post(`/metaObjectMove/${row.id}/cancelRun`);
 					})
 					.then(() => {
-						axios
-							.get(`http://${this.baseUrl}/mmo/websocket/${row.objectId}/stop`)
+						requestWithCertificate().get(`https://${this.baseUrl}/mmo/websocket/${row.objectId}/stop`)
 							.then(() => {
 								this.$message.success('停运成功');
 								this.getData();