Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-03 1e0fee57168f6190f5dc5a3e01f8cde2b5561811

 ycl-server/src/main/resources/application-prod.yml

@@ -124,10 +124,14 @@
  host: 51.92.65.49
  appKey: 29555942
  appSecret: t9U7tCplCyYHzQPPL7cH

  1111: Hik12345+
DH:
  userName: admin
  password: zg@2024dx

YS:
  userName: admin
  password: zg2024dx
# gb281视频网关地址，用于获取rtsp格式的流地址
rtsp:
  server: http://192.168.3.88:7788