From ef51da5404827e826e979ad614950a9e0192f4c6 Mon Sep 17 00:00:00 2001
From: qixiaoning <jony.kee@outlook.com>
Date: 星期五, 08 八月 2025 09:15:26 +0800
Subject: [PATCH] 调整数据推送相关接口

---
 config/pro.yaml |  183 +++++++++++++++++++++------------------------
 1 files changed, 87 insertions(+), 96 deletions(-)

diff --git a/config/pro.yaml b/config/pro.yaml
index 3f68211..5bdc2d5 100644
--- a/config/pro.yaml
+++ b/config/pro.yaml
@@ -1,42 +1,32 @@
 server:
-    serverName: "SmartAI"
     runmode: debug
     jwtSecret: BASIC
     jwtExpire: 24
     url: http://127.0.0.1:8080
-    analyServerId: DSPAD010120211015235820
-    networkAdapter: eth0 
-#寰幆瑕嗙洊---------------------------------------------------------------------------------------------#
-    #es鏈嶅姟IP  浠呭湪鍏徃娴嬭瘯鐜浣跨敤锛岀嚎涓婂嬁閰嶇疆
-    esServerIp: 192.168.8.118
-    #es鏈嶅姟绔彛  浠呭湪鍏徃娴嬭瘯鐜浣跨敤锛岀嚎涓婂嬁閰嶇疆
-    esServerPort: 9200
-#---------------------------------------------------------------------------------------------寰幆瑕嗙洊#
-    #骞惰绾跨▼杩涘埗
-    coreBaseUnit: 100
-    #瓒呮椂鏃堕棿
-    timeOut: 2
+    analyServerId: DSVAD202505139F8038
+    networkAdapter: enp6s0
     #鑴氭湰鐩綍
     scriptPath: /opt/vasystem/script
     #璁惧缂栧彿
     deviceNum: 001
     #璁惧鍨嬪彿
-    deviceModel: Bsk-JS1000N
+    deviceModel: BSK-JS1000X
     #璁惧鍨嬪彿
-    deviceType: DS0104322264020416 
+    deviceType: DS0301322264020416
     deviceDesc: 鍒嗘瀽/瀛樺偍璁惧1
     #璁惧搴忓垪鍙�
     deviceSerialNum: 01
     #涓绘帶鐗堟湰
-    masterVersion: V1.0.0 
+    masterVersion: V1.0.0.0
     #web鐗堟湰
-    webVersion: 2.0 
+    webVersion: 2.0
     #閫氶亾涓暟
     channelCount: 0
     #纭洏涓暟
     diskCount: 2
     #Exec root command
-    sudoPassword: basic2021 
+    sudoPassword: 123 
+    rtspUnique: false
     sysThresholds:
     - value: 60
       color: '#13ce66'
@@ -49,34 +39,78 @@
     licensePath: /opt/vasystem/licence.inc
     lKey: flzxsqc,ysyhljt.
     lPublicKeyPath: /opt/vasystem/public.pem
+    headpics: ["none"]
+    langs:
+    - name: "绠�浣撲腑鏂�"
+      lang: "zh_CN.UTF-8"
+      language: "zh_CN:zh"
+    - name: "鑻辫"
+      lang: "en_US.UTF-8"
+      language: "en_US:en"
+    - name: "绻佷綋涓枃(棣欐腐)"
+      lang: "zh_HK.UTF-8"
+      language: "zh_HK:zh"
     voices:
     - id: 1
       name: 1.mp3
-      path: /files/voices/1.mp3
-    - id: 2 
+      path: /home/basic/files/1.mp3
+    - id: 2
       name: 2.mp3
-      path: /files/voices/2.mp3
+      path: /home/basic/files/2.mp3
     - id: 3
       name: 3.mp3
-      path: /files/voices/3.mp3
+      path: /home/basic/files/3.mp3
     - id: 4
       name: 4.mp3
-      path: /files/voices/4.mp3
+      path: /home/basic/files/4.mp3
     - id: 5
       name: 5.mp3
-      path: /files/voices/5.mp3
-    - id: lineup 
-      name: 璇锋湁搴忔帓闃�,涓嶈鎷ユ尋
-      path: /files/voices/lineup.mp3
-    - id: warningArea 
-      name: 璀︽垝鍖哄煙,灏藉揩绂诲紑 
-      path: /files/voices/warningArea.wav
-
+      path: /home/basic/files/5.mp3
+database:
+    driver: sqlite
+    name: sqlite3
+    filepath: /opt/vasystem/config/testdb.db
+cluster:
+    pwdpre: bjbasic123
+    #serf snapshot鏂囦欢鐨勫畬鏁磋矾寰�,serfSnapShot鏄釜鏂囦欢
+    serfsnapshotpath: /opt/vasystem/serfSnapShot
+    # 闆嗙兢鍐呴儴绔彛
+    port: 7081
+    # 闆嗙兢蹇冭烦闂撮殧
+    heartBeat: 15
+    # saas鏈嶅姟涓婃姤鍦板潃
+    saasReportUrl: 192.168.20.117:7081
+facedetect:
+    ip: 127.0.0.1
+    port: 4009
+dbpersoncompare:
+    ip: 127.0.0.1
+    port: 4010
+espersoncompare:
+    port: 4011
+    ips:
+    - 127.0.0.1
+weedfs:
+    port: 6333
+es:
+    port: 9200
+    shards: 1,2
+    index:
+      aiOcean:
+        index: ai_ocean
+        type: analysisModel
+    thresholdTime: 10
+    thresholdStayTime: 0
+    storePath:
+      - /data3/elasticsearch
 #寰幆瑕嗙洊---------------------------------------------------------------------------------------------#
 storage:
-    mountPoint: ["data"]
+    #鍚宎nalyServerId
+    id: DSVAD20230919AC63EC 
+    #鏂囦欢鏈嶅姟鎸傝浇鐐�
+    mountPoint: ["/data/disk1/"]
     #鏂囦欢鏈嶅姟瀛樺偍璺緞
-    volumePath: ["/data/disk2/seaweedfs/data/volume"]
+    volumePath: ["/data/disk1/seaweedfs/data/volume"]
     #娓呯悊闃堝��
     threshold: 85
     #鏂囦欢鏈嶅姟绔彛--鐢ㄥ仛鎸囧畾鏈嶅姟绔彛浠诲姟鎺у埗
@@ -93,85 +127,42 @@
         indexName: basicfs
         indexType: clearItem
 #---------------------------------------------------------------------------------------------寰幆瑕嗙洊#
-fileDb:                                                                                                                                                                                                             
-  driver: sqlite
-  name: sqlite3
-  filepath: /opt/vasystem/config/file-service.db
-file-service:
-  savePath: /opt/vasystem/files
-shop:
-  url: apps.smartai.com:7004
-database:
+fileDb:
     driver: sqlite
-    name: sqlite3
-    filepath: /opt/vasystem/config/testdb.db
-cluster:
-    pwdpre: bjbasic123
-    #serf snapshot鏂囦欢鐨勫畬鏁磋矾寰�,serfSnapShot鏄釜鏂囦欢
-    serfsnapshotpath: /opt/vasystem/serfSnapShot
-    # 鍐呴儴闆嗙兢閰嶇疆
-    # 闆嗙兢鍐呴儴绔彛
-    port: 7081
-    # 闆嗙兢蹇冭烦闂撮殧
-    heartBeat: 15
-    # saas鏈嶅姟涓婃姤鍦板潃
-    saasReportUrl: 192.168.20.117:7081
-
+    name: sqlite
+    filepath: /opt/vasystem/config/file-service.db
+file-service:
+    savePath: /opt/vasystem/files
+shop:
+    url: 127.0.0.1:7004
 saas:
-  url: 192.168.20.117:7080
-
-facedetect:
-    ip: 127.0.0.1
-    port: 4009
-dbpersoncompare:
-    ip: 127.0.0.1
-    port: 4010
-espersoncompare:
-    port: 4011
-    ips:
-    - 127.0.0.1
-redis:
-    host: 127.0.0.1
-    port: 6379
-    password: password
-    db: 1
-es:
-    shards: 1,2
-    index:
-        # 浜鸿劯鎶撴媿璁板綍
-        videopersons:
-            index: videopersons
-            type: perVideoPicture
-        # 琛屼负鎶撴媿璁板綍*
-        personaction:
-            index: personaction
-            type: perVideoAction
-        aiocean:
-            index: ai_ocean
-            type: analysisModel
-    thresholdTime: 10
-    thresholdStayTime: 0
+    url: 192.168.20.117:7080
+ruletrack:
+    timeout_seconds: 30
+    target_box: 1
+    jitter_buffer: 300
 #so閰嶇疆
 sopath:
     ip: 192.168.1.182
     port: 8008
-ruletrack:
-    timeout_seconds: 86400
-    movepos: 1
-
 #閫氱敤閰嶇疆
 LogBasePath: /opt/vasystem/valog/
-LogLevel: 5 
+LogLevel: 5
 log:
     path: /opt/vasystem/valog/
     level: -1
     maxSize: 128
     maxBackups: 30
     maxAge: 15
-
-#鎺ㄦ祦
 MaxStreamsNum: 16
+#鎺ㄦ祦
 LibFfmpegPath: /opt/vasystem/libs/libcffmpeg-capture.so
 VideoPublishWidth: 960
 VideoPublishHeight: 640
 VideoPublishPort: 10101
+
+SenderFreq: 1000 
+
+#so閰嶇疆
+trace:
+    useBlockList: 1

--
Gitblit v1.8.0