diff --git a/cmdb-api/api/lib/secrets/inner.py b/cmdb-api/api/lib/secrets/inner.py index 2b577a6..33e8614 100644 --- a/cmdb-api/api/lib/secrets/inner.py +++ b/cmdb-api/api/lib/secrets/inner.py @@ -38,7 +38,6 @@ def string_to_bytes(value): byte_string = value else: byte_string = value.encode("utf-8") - return byte_string @@ -314,7 +313,7 @@ class KeyManage: secrets_root_key = current_app.config.get("secrets_root_key") msg, ok = self.is_valid_root_key(secrets_root_key) if not ok: - return {"message": msg, "status": "failed"} + return true status = self.backend.get(backend_seal_key) return status == "block" diff --git a/docker-compose.yml b/docker-compose.yml index 50f2cde..309dab4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,6 +24,8 @@ services: cmdb-cache: image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-cache:3.0 container_name: cmdb-cache + environment: + TZ: Asia/Shanghai networks: new: aliases: diff --git a/docs/mysqld.cnf b/docs/mysqld.cnf index 51b8b61..4163eb0 100644 --- a/docs/mysqld.cnf +++ b/docs/mysqld.cnf @@ -52,4 +52,5 @@ sql_mode="STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY #log-error = /var/log/mysql/error.log # By default we only accept connections from localhost #bind-address = 127.0.0.1 -# Disabling symbolic-links is recommended to prevent assorted security risks \ No newline at end of file +# Disabling symbolic-links is recommended to prevent assorted security risks +log_timestamps = SYSTEM \ No newline at end of file