fix: 初验针对修改

etc/files_dev.yaml

@@ -1,11 +1,12 @@
 Service: files
 Port: 12452
+BindIP: 0.0.0.0
 SecretKey: ops-files
 
 Databases:
   Driver: postgres
   Source:
-    - host=8.137.107.29 user=postgres password=Weidong2023~! dbname=ops_dev port=19432 sslmode=disable TimeZone=Asia/Shanghai
+    - "${OPS_FILES_DB_DSN}"
 
 Cache: redis://null:Weidong2023~!@8.137.107.29:19379/
 
@@ -19,17 +20,26 @@ ServiceClients:
   dc-control: ${DC_CONTROL_FILES_SECRET}
   visual: ${VISUAL_FILES_SECRET}
 
-ObjectStorage:
-  Provider: aliyun
-  Endpoint: https://oss-cn-beijing.aliyuncs.com
-  Region: cn-beijing
-  Bucket: ops-app
-  PublicBaseURL: https://ops-app.oss-cn-beijing.aliyuncs.com
-  AccessKeyID: ${FILES_OSS_ACCESS_KEY_ID}
-  AccessKeySecret: ${FILES_OSS_ACCESS_KEY_SECRET}
-  PresignTTLSeconds: 600
+Storage:
+  Provider: local
+  ExternalBaseURL: http://127.0.0.1:12452/Files
+  AccessTTLSeconds: 600
+  SigningSecret: local-dev-files-signing-secret
+  Local:
+    RootPath: D:/work/ops/.data/files
+    MinimumFreeSpaceMB: 1024
+  Aliyun:
+    Endpoint: ""
+    Region: ""
+    Bucket: ""
+    AccessKeyID: ""
+    AccessKeySecret: ""
 
 Namespaces:
+  device-config-backups:
+    Prefix: device-config-backups
+    MaxSizeMB: 1
+    AllowedExtensions: [.txt]
   reports:
     Prefix: reports
     MaxSizeMB: 512
@@ -45,3 +55,5 @@ Namespaces:
 
 Cleanup:
   IntervalSeconds: 600
+  IntegrityIntervalSeconds: 3600
+  IntegrityBatchSize: 100

etc/files_prod.yaml

@@ -1,13 +1,14 @@
 Service: files
 Port: 12452
-SecretKey: ops-files
+BindIP: 127.0.0.1
+SecretKey: ${FILES_SERVICE_SECRET}
 
 Databases:
   Driver: postgres
   Source:
-    - host=8.137.107.29 user=postgres password=Weidong2023~! dbname=ops_dev port=19432 sslmode=disable TimeZone=Asia/Shanghai
+    - "${OPS_FILES_DB_DSN}"
 
-Cache: redis://null:Weidong2023~!@8.137.107.29:19379/
+Cache: ${OPS_CACHE_DSN}
 
 MicroService:
   Enable: false
@@ -19,17 +20,26 @@ ServiceClients:
   dc-control: ${DC_CONTROL_FILES_SECRET}
   visual: ${VISUAL_FILES_SECRET}
 
-ObjectStorage:
-  Provider: aliyun
-  Endpoint: https://oss-cn-beijing.aliyuncs.com
-  Region: cn-beijing
-  Bucket: ops-app
-  PublicBaseURL: https://ops-app.oss-cn-beijing.aliyuncs.com
-  AccessKeyID: ${FILES_OSS_ACCESS_KEY_ID}
-  AccessKeySecret: ${FILES_OSS_ACCESS_KEY_SECRET}
-  PresignTTLSeconds: 600
+Storage:
+  Provider: ${FILES_STORAGE_PROVIDER}
+  ExternalBaseURL: ${FILES_PUBLIC_BASE_URL}
+  AccessTTLSeconds: 600
+  SigningSecret: ${FILES_STORAGE_SIGNING_SECRET}
+  Local:
+    RootPath: ${FILES_LOCAL_ROOT}
+    MinimumFreeSpaceMB: 10240
+  Aliyun:
+    Endpoint: ${FILES_OSS_ENDPOINT}
+    Region: ${FILES_OSS_REGION}
+    Bucket: ${FILES_OSS_BUCKET}
+    AccessKeyID: ${FILES_OSS_ACCESS_KEY_ID}
+    AccessKeySecret: ${FILES_OSS_ACCESS_KEY_SECRET}
 
 Namespaces:
+  device-config-backups:
+    Prefix: device-config-backups
+    MaxSizeMB: 1
+    AllowedExtensions: [.txt]
   reports:
     Prefix: reports
     MaxSizeMB: 512
@@ -45,3 +55,5 @@ Namespaces:
 
 Cleanup:
   IntervalSeconds: 600
+  IntegrityIntervalSeconds: 3600
+  IntegrityBatchSize: 100

etc/files_test.yaml

@@ -1,5 +1,6 @@
 Service: files
 Port: 12452
+BindIP: 127.0.0.1
 SecretKey: ops-files
 
 Databases:
@@ -19,17 +20,26 @@ ServiceClients:
   dc-control: ${DC_CONTROL_FILES_SECRET}
   visual: ${VISUAL_FILES_SECRET}
 
-ObjectStorage:
-  Provider: aliyun
-  Endpoint: https://oss-cn-beijing.aliyuncs.com
-  Region: cn-beijing
-  Bucket: ops-app
-  PublicBaseURL: https://ops-app.oss-cn-beijing.aliyuncs.com
-  AccessKeyID: ${FILES_OSS_ACCESS_KEY_ID}
-  AccessKeySecret: ${FILES_OSS_ACCESS_KEY_SECRET}
-  PresignTTLSeconds: 600
+Storage:
+  Provider: local
+  ExternalBaseURL: http://127.0.0.1:12452/Files
+  AccessTTLSeconds: 600
+  SigningSecret: local-test-files-signing-secret
+  Local:
+    RootPath: D:/work/ops/.data/files-test
+    MinimumFreeSpaceMB: 1
+  Aliyun:
+    Endpoint: ""
+    Region: ""
+    Bucket: ""
+    AccessKeyID: ""
+    AccessKeySecret: ""
 
 Namespaces:
+  device-config-backups:
+    Prefix: device-config-backups
+    MaxSizeMB: 1
+    AllowedExtensions: [.txt]
   reports:
     Prefix: reports
     MaxSizeMB: 512
@@ -45,3 +55,5 @@ Namespaces:
 
 Cleanup:
   IntervalSeconds: 600
+  IntegrityIntervalSeconds: 3600
+  IntegrityBatchSize: 100

etc/ops-files.service

@@ -13,11 +13,11 @@ Environment=BSM_RuntimeMode=prod
 Environment=RUN_MODE=prod
 Environment=BSM_Prefix=/data/app
 ExecStart=/data/app/ops-files
-ExecStartPost=/data/app/systemd/wait-http.sh ops-files http://127.0.0.1:12452/Files/v1/ping/hello 60
+ExecStartPost=/data/app/systemd/wait-http.sh ops-files http://127.0.0.1:12452/ready 60
 Restart=on-failure
 RestartSec=5s
 TimeoutStartSec=75s
-TimeoutStopSec=30s
+TimeoutStopSec=75s
 KillSignal=SIGTERM
 StandardOutput=append:/data/app/logs/files.log
 StandardError=inherit