no message

Backend/sample/src/main/resources/application-prd.yml

@@ -121,17 +121,9 @@ url:
 oss:
   enable: true
   provider: minio
-<<<<<<< HEAD
   endpoint: https://minio.jkec.info:9000
   access-key: uavadmin
   secret-key: YEDG9DZ8oby97UGMyxW&
-=======
-  endpoint: https://minio.ryuiso.com:59000
-  #  access-key: dji_media
-  #  secret-key: W9AB^CJ*3WcBR6z#
-  access-key: oss_library
-  secret-key: yDkG9YJiC92G3vk52goST
->>>>>>> 8ff7aa2bb1257a92a76510236feae1b5f55e1a25
   bucket: dji-cloudapi
   bucket-logs: log-files
   expire: 3600

Web/env/.env.subsystem

@@ -5,4 +5,4 @@ VITE_ENV = 'subsystem'
 VITE_API_URL = 'https://uav.jkec.info/api'
 
 # WebSocket 地址
-VITE_WEBSOCKET_URL = 'wss://uav.jkec.info:443/api/v1/ws'
+VITE_WEBSOCKET_URL = 'wss://uav.jkec.info:51443/api/v1/ws'