Merge pull request 'master' (#2) from master into prod

Reviewed-on: #2

.gitea/workflows/master.yml

@@ -15,7 +15,7 @@ jobs:
       - name: 拉取代码
         uses: http://git.missmoc.top/mocheng/checkout@v4
         with:
-          fetch-depth: 1
+          fetch-depth: 0
 
       - name: 使用Maven构建项目
         run: |
@@ -87,8 +87,8 @@ jobs:
           echo "===== 清理操作 ====="
           docker system prune -f
           echo "===== 所有操作完成 ===="
-     
+
       - name: 重启服务
         run: |
           kubectl rollout restart deployment sis -n smartparks
-          kubectl rollout restart deployment property -n smartparks
+          kubectl rollout restart deployment property -n smartparks

ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/zkmedia/ZLMediaKitServiceImpl.java

@@ -80,6 +80,8 @@ public class ZLMediaKitServiceImpl implements ZLMediaKitService {
         if (resp == null) {
             resp = new AddStreamProxyResp();
         }
+        resp.setApp(app);
+        resp.setStreamId(streamId);
         // RTMP 播放地址
         resp.setRtmp(String.format(RTMP_PLAY_URL, zlmConfig.getIp(), zlmConfig.getRtmpPort(), app, streamId));
         // RTSP 播放地址
@@ -88,9 +90,9 @@ public class ZLMediaKitServiceImpl implements ZLMediaKitService {
         resp.setFlv(String.format(HTTP_FLV_PLAY_URL, zlmConfig.getIp(), zlmConfig.getHttpPort(), app, streamId));
         resp.setWsFlv(String.format(WS_FLV_PLAY_URL, zlmConfig.getIp(), zlmConfig.getHttpPort(), app, streamId));
         // HLS 播放地址
-        resp.setHls(String.format(HLS_FLV_PLAY_URL, zlmConfig.getIp(), zlmConfig.getHttpPort(), app, streamId));
+//        resp.setHls(String.format(HLS_FLV_PLAY_URL, zlmConfig.getIp(), zlmConfig.getHttpPort(), app, streamId));
         // MP4 播放地址
-        resp.setMp4(String.format(MP4_FLV_PLAY_URL, zlmConfig.getIp(), zlmConfig.getHttpPort(), app, streamId));
+//        resp.setMp4(String.format(MP4_FLV_PLAY_URL, zlmConfig.getIp(), zlmConfig.getHttpPort(), app, streamId));
         return resp;
     }
 

ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/zkmedia/model/AddStreamProxyResp.java

@@ -9,15 +9,24 @@ public class AddStreamProxyResp implements Serializable {
 
     private String key;
 
+    /**
+     * 应用
+     */
+    private String app;
+
+    /**
+     * 流id
+     */
+    private String streamId;
+
     private String rtsp;
-
     private String rtmp;
-
     private String flv;
     private String wsFlv;
-
     private String mp4;
-
     private String hls;
 
+
+
+
 }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/ZeroSensationPassageServiceImpl.java

@@ -63,7 +63,7 @@ public class ZeroSensationPassageServiceImpl implements IZeroSensationPassageSer
         if (result.getCode() != 200) {
             log.info("华为盒子比对失败,msg={}", result.getMessage());
             // 产生告警数据
-//            alarmEventsService.createAlarmRecord(deviceIp, 1, 1, "人脸比对失败", smallImg, bigImg);
+            alarmEventsService.createAlarmRecord(deviceIp, 1, 1, "人脸比对失败", smallImg, bigImg);
             return;
         }
         log.info("人脸比对执行完成,耗时：{}ms", interval.intervalMs());

ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties

@@ -40,9 +40,9 @@ spring.sql.init.platform=mysql
 db.num=1
 
 ### Connect URL of DB:
-db.url.0=jdbc:mysql://113.249.101.254:18000/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+db.url.0=jdbc:mysql://10.20.1.65:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
 db.user.0=root
-db.password.0=by@2025??
+db.password.0=By@2025!
 
 ### the maximum retry times for push
 nacos.config.push.maxRetryTime=50