fix: tz

Author: cc3630

docker/backup.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import os
 import re
 import sys
@@ -6,7 +7,7 @@
 from urllib.parse import urlparse
 import boto3
 from botocore.client import Config
-import requests
+import time
 
 # 数据库清理备份脚本
 # 1. 按要求备份数据，并保存到指定路径
@@ -89,13 +90,16 @@ def check_bool(key):
 s3_bucket = os.environ["S3_BUCKET"] if check_var("S3_BUCKET") else None
 s3_prefix = os.environ["S3_PREFIX"] if check_var("S3_PREFIX") else DEFAULT_S3_PREFIX
 s3_region = os.environ["S3_REGION"] if check_var("S3_REGION") else None
-s3_region = os.environ["S3_REGION"] if check_var("S3_REGION") else None
 s3_signature_version = (
     os.environ["S3_SIGNATURE_VERSION"] if check_var("S3_SIGNATURE_VERSION") else None
 )
 
 # 计算当前日期，按照 年月日时分 格式
-date = (datetime.now() + timedelta(hours=8)).strftime("%Y%m%d%H%M%S")
+date = (
+    datetime.now() + timedelta(hours=8)
+    if not time.localtime().tm_gmtoff
+    else datetime.now()
+).strftime("%Y%m%d%H%M%S")
 
 
 def get_dbname_from_mongo_uri(uri):
@@ -185,7 +189,9 @@ def upload_s3(prefix):
         config_s3["addressing_style"] = "virtual"
 
     if s3_region and s3_signature_version:
-        config = Config(s3=config_s3, signature_version="s3", region_name=s3_region)
+        config = Config(
+            s3=config_s3, signature_version=s3_signature_version, region_name=s3_region
+        )
     elif s3_region:
         config = Config(s3=config_s3, region_name=s3_region)
     elif s3_signature_version:

docker/restore.py

@@ -1,10 +1,12 @@
+# -*- coding: utf-8 -*-
 import os
 import re
 import sys
 from datetime import datetime, timedelta
 import subprocess
 import boto3
 from botocore.client import Config
+import time
 
 # 数据库还原
 
@@ -66,7 +68,11 @@ def check_bool(key):
 s3_prefix = os.environ["S3_PREFIX"] if check_var("S3_PREFIX") else DEFAULT_S3_PREFIX
 s3_region = os.environ["S3_REGION"] if check_var("S3_REGION") else None
 
-date = (datetime.now() + timedelta(hours=8)).strftime("%Y%m%d%H%M%S")
+date = (
+    datetime.now() + timedelta(hours=8)
+    if not time.localtime().tm_gmtoff
+    else datetime.now()
+).strftime("%Y%m%d%H%M%S")
 
 
 def get_files(compiled_regex):

helm-chart/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.6.2
+version: 1.6.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.6.2"
+appVersion: "1.6.3"