依赖更改

blade-ops-api/blade-stream-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.7.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-ops-api/pom.xml

@@ -28,6 +28,7 @@
                     <finalName>${project.name}</finalName>
                 </configuration>
             </plugin>
+
         </plugins>
     </build>
 

blade-ops/blade-mq-rabbit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.7.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-test</artifactId>
-<!--            <scope>test</scope>-->
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -39,5 +39,15 @@
         </dependency>
     </dependencies>
 
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

blade-ops/blade-stream-consumer/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.7.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-ops/blade-stream-provider/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.7.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -41,5 +41,16 @@
 
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

blade-ops/blade-websocket/pom.xml

@@ -5,13 +5,12 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.7.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-websocket</artifactId>
-    <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.7.2.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

blade-ops/pom.xml

@@ -20,5 +20,4 @@
         <module>blade-stream-provider</module>
     </modules>
 
-
 </project>

blade-service/third/pom.xml

@@ -27,12 +27,6 @@
             <artifactId>community-api</artifactId>
             <version>2.7.2.RELEASE</version>
         </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-websocket</artifactId>
-            <version>${bladex.project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.nepxion</groupId>
             <artifactId>eventbus-aop-starter</artifactId>
@@ -43,6 +37,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-websocket</artifactId>
+            <version>2.7.2.RELEASE</version>
+        </dependency>
 
     </dependencies>
 

blade-service/third/src/main/java/org/springblade/third/open/videocloud/MediaServerWebHookController.java

@@ -9,7 +9,7 @@ import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.device.entity.VideoCloudDevice;
 import org.springblade.device.feign.IVideoCloudDeviceClient;
 import org.springblade.third.service.IThirdVideoCloudDeviceService;
-import org.springblade.websocket.model.ChatMessage;
+//import org.springblade.websocket.model.ChatMessage;
 import org.springframework.messaging.simp.SimpMessageSendingOperations;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -40,21 +40,22 @@ public class MediaServerWebHookController {
 	 */
 	@PostMapping(value = "/on_stream_changed")
 	public Map<String, Object> onStreamChanged(@RequestBody Map<String, Object> params){
-		logger.info("【MediaServer】on_stream_changed", JSONUtil.toJsonStr(params));
-		Boolean regist = (Boolean)params.get("regist");
-		String stream = (String)params.get("stream");
-		VideoCloudDevice videoCloudDevice = videoCloudDeviceClient.getByDeviceNum(stream);
-		if(videoCloudDevice != null){
-			ChatMessage chatMessage = new ChatMessage();
-			chatMessage.setType(ChatMessage.MessageType.CHAT);
-			chatMessage.setSender(stream);
-			String routerKey = "/topic/" + chatMessage.getSender();
-			messagingTemplate.convertAndSend(routerKey, chatMessage);
-		}
-		Map<String, Object> returnMap = new HashMap<>();
-		returnMap.put("code", 0);
-		returnMap.put("msg", "success");
-		return returnMap;
+//		logger.info("【MediaServer】on_stream_changed", JSONUtil.toJsonStr(params));
+//		Boolean regist = (Boolean)params.get("regist");
+//		String stream = (String)params.get("stream");
+//		VideoCloudDevice videoCloudDevice = videoCloudDeviceClient.getByDeviceNum(stream);
+//		if(videoCloudDevice != null){
+//			ChatMessage chatMessage = new ChatMessage();
+//			chatMessage.setType(ChatMessage.MessageType.CHAT);
+//			chatMessage.setSender(stream);
+//			String routerKey = "/topic/" + chatMessage.getSender();
+//			messagingTemplate.convertAndSend(routerKey, chatMessage);
+//		}
+//		Map<String, Object> returnMap = new HashMap<>();
+//		returnMap.put("code", 0);
+//		returnMap.put("msg", "success");
+//		return returnMap;
+		return null;
 	}
 
 //    /**

community-open-gateway/pom.xml

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>BladeX-Biz</artifactId>
-        <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>community-open-gateway</artifactId>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-biz-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-log</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>device-api</artifactId>
-            <version>2.7.2.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>third-api</artifactId>
-            <version>2.7.2.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-websocket</artifactId>
-            <version>2.7.2.RELEASE</version>
-        </dependency>
-
-        <!--糊涂工具包-->
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.6.0</version>
-        </dependency>
-
-        <!--Swagger 接口文档-->
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-swagger</artifactId>
-        </dependency>
-    </dependencies>
-</project>

pom.xml

@@ -40,7 +40,6 @@
         <module>blade-service-api</module>
         <module>community-app-gateway</module>
         <module>park-app-gateway</module>
-        <module>community-open-gateway</module>
     </modules>
 
     <dependencyManagement>