internal 1.1.26__tar.gz → 1.1.49.1__tar.gz

{internal-1.1.26 → internal-1.1.49.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: internal
-Version: 1.1.26
+Version: 1.1.49.1
 Summary: 
 Author: Ray
 Author-email: ray@cruisys.com

{internal-1.1.26 → internal-1.1.49.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "internal"
-version = "1.1.26"
+version = "1.1.49.1"
 description = ""
 authors = [{ name = "Ray", email = "ray@cruisys.com" }]
 readme = "README.md"

{internal-1.1.26 → internal-1.1.49.1}/src/internal/base_config.py

@@ -13,7 +13,7 @@ class BaseConfig(BaseSettings):
     # Request
     REQUEST_VERIFY_SSL: bool = False
     REQUEST_PROXY: str = ''
-    REQUEST_RETRY_COUNT: int = 1
+    REQUEST_RETRY_COUNT: int = 0
     REQUEST_RETRY_DELAY_INITIAL_SECONDS: float = 1.0
     REQUEST_RETRY_DELAY_FACTOR: float = 1.5
     REQUEST_RETRY_DELAY_RANDOM_JITTER_MIN: float = 0.0

{internal-1.1.26 → internal-1.1.49.1}/src/internal/common_enum/event_code.py

@@ -8,9 +8,15 @@ class EventCodeEnum(str, Enum):
     MANUAL_CREATE_SERVICE_TICKET = "manual_create_service_ticket"
     MANUAL_IMPORT_RESERVATION_SMWS = "manual_import_reservation_smws"
     MANUAL_MODIFY_USER_SERVICE_TICKET = "manual_modify_user_service_ticket"
+    MANUAL_MODIFY_ENABLE_NOTIFY_SERVICE_TICKET = "manual_modify_enable_notify_service_ticket"
+    MANUAL_MODIFY_DISABLE_NOTIFY_SERVICE_TICKET = "manual_modify_disable_notify_service_ticket"
     MANUAL_MODIFY_ESTIMATED_ARRIVAL_TIME_SERVICE_TICKET = "manual_modify_estimated_arrival_time_service_ticket"
     MANUAL_MODIFY_ESTIMATED_DELIVERY_TIME_SERVICE_TICKET = "manual_modify_estimated_delivery_time_service_ticket"
     MANUAL_DELETE_ESTIMATED_DELIVERY_TIME_SERVICE_TICKET = "manual_delete_estimated_delivery_time_service_ticket"
+    MANUAL_IMPORT_RESERVATION_MODIFY_USER_SERVICE_TICKET = "manual_import_reservation_modify_user_service_ticket"
+    MANUAL_IMPORT_RESERVATION_MODIFY_ESTIMATED_ARRIVAL_TIME_SERVICE_TICKET = "manual_import_reservation_modify_estimated_arrival_time_service_ticket"
+    MANUAL_IMPORT_RESERVATION_MODIFY_ESTIMATED_DELIVERY_TIME_SERVICE_TICKET = "manual_import_reservation_modify_estimated_delivery_time_service_ticket"
+    MANUAL_IMPORT_RESERVATION_DELETE_ESTIMATED_DELIVERY_TIME_SERVICE_TICKET = "manual_import_reservation_delete_estimated_delivery_time_service_ticket"
     MANUAL_BOOKING_MESSAGE_SERVICE_TICKET = "manual_booking_message_service_ticket"
     MANUAL_DELIVERY_MESSAGE_SERVICE_TICKET = "manual_delivery_message_service_ticket"
 
@@ -39,3 +45,4 @@ class EventCodeEnum(str, Enum):
 
     REPAIR_OVERDUE = "repair_overdue"
     DETAILING_OVERDUE = "detailing_overdue"
+    DELIVERY_OVERDUE = "delivery_overdue"

{internal-1.1.26 → internal-1.1.49.1}/src/internal/common_enum/operator_type.py

@@ -7,3 +7,4 @@ class OperatorTypeEnum(str, Enum):
     CUSTOMER = "customer"
     PROVIDER = "provider"
     CLIENT = "client"
+    ADMIN = "admin"

internal-1.1.49.1/src/internal/common_enum/point_type.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+
+class PointTypeEnum(str, Enum):
+    INVOICE_REWARD = "invoice_reward"
+    ACTIVITY = "activity"

{internal-1.1.26 → internal-1.1.49.1}/src/internal/common_enum/websocket_channel.py

@@ -6,3 +6,4 @@ class WebsocketChannelEnum(str, Enum):
     RECEPTION_CENTER = "reception_center"  # 接待中心
     CAR_MOVEMENT = "car_movement"  # 車輛動態
     USER_BELL_NOTIFICATION = "user_bell_notification"  # 個人小鈴噹
+    DAILY_DELIVERY_SUMMARY = "daily_delivery_summary"  # 當日交車統計

{internal-1.1.26 → internal-1.1.49.1}/src/internal/const.py

@@ -44,12 +44,18 @@ REDIS_LPR_DATA_LIST_PREFIX = "lpr_data_list"
 
 CORRELATION_ID_HEADER_KEY_NAME = "X-Request-ID"
 
-SOURCE_CAR_BY_SMART_WORKSHOP_IMPORTED_SERVICE_TICKET = 'CarBySmartWorkshopImportedServiceTicket'
-SOURCE_CAR_BY_SMART_WORKSHOP_IMPORTED_DMS_DATA = 'CarBySmartWorkshopImportedDMSData'
-SOURCE_CAR_BY_WEBHOOK = 'CarByWebhook'
-SOURCE_CAR_BY_SMART_WORKSHOP = 'CarBySmartWorkshopManual'
-
-SOURCE_CUSTOMER_BY_SMART_WORKSHOP_IMPORTED_SERVICE_TICKET = 'CustomerBySmartWorkshopImportedServiceTicket'
-SOURCE_CUSTOMER_BY_SMART_WORKSHOP_IMPORTED_DMS_DATA = 'CustomerBySmartWorkshopImportedDMSData'
-SOURCE_CUSTOMER_BY_WEBHOOK = 'CustomerByWebhook'
-SOURCE_CUSTOMER_BY_SMART_WORKSHOP = 'CustomerBySmartWorkshopManual'
+SOURCE_SMART_WORKSHOP_IMPORTED_SERVICE_TICKET = 'SmartWorkshopImportedServiceTicket'
+SOURCE_SMART_WORKSHOP_UPDATE_SERVICE_TICKET = 'SmartWorkshopUpdateServiceTicket'
+SOURCE_SMART_WORKSHOP_IMPORTED_UPDATE_SERVICE_TICKET = 'SmartWorkshopImportedUpdateServiceTicket'
+SOURCE_SMART_WORKSHOP_IMPORTED_DMS_DATA = 'SmartWorkshopImportedDMSData'
+SOURCE_SMART_WORKSHOP_IMPORTED_SELF_SELLING_DATA = 'SmartWorkshopImportedSelfSellingData'
+SOURCE_WEBHOOK = 'Webhook'
+SOURCE_SMART_WORKSHOP = 'SmartWorkshopManual'
+SOURCE_SERVICE_GO_LOGIN = 'ServiceGoLogin'
+SOURCE_SERVICE_GO_REGISTER = 'ServiceGoRegister'
+SOURCE_VIP_CODE_MANUAL_APPROVE = 'VIPCodeManualApprove'
+SOURCE_BINDING_SERVICE_GO = 'BindingFromServiceGo'
+SOURCE_BINDING_VIP_CODE = 'BindingFromVIPCode'
+SOURCE_BINDING_SMART_WORKSHOP = 'BindingFromSmartWorkshop'
+SOURCE_UNBINDING_SERVICE_GO = 'UnbindingFromServiceGo'
+SOURCE_UNBINDING_SMART_WORKSHOP = 'UnbindingFromSmartWorkshop'

{internal-1.1.26 → internal-1.1.49.1}/src/internal/database.py

@@ -2,6 +2,18 @@ from motor.motor_asyncio import AsyncIOMotorClient
 from pymongo.errors import ServerSelectionTimeoutError
 
 from .exception.internal_exception import DatabaseInitializeFailureException, DatabaseConnectFailureException
+from bson import Decimal128
+from bson.codec_options import CodecOptions, TypeDecoder, TypeRegistry
+from decimal import Decimal
+
+
+class Decimal128Decoder(TypeDecoder):
+    """自定義 Decimal128 解碼器，自動轉換為 Python Decimal"""
+    bson_type = Decimal128
+    python_type = Decimal
+
+    def transform_bson(self, value):
+        return value.to_decimal()
 
 
 class MongoDB:
@@ -39,10 +51,20 @@ class MongoDB:
         if self.client:
             self.client.close()
 
-    def get_database(self):
+    def get_database(self, db_name: str = None):
         if not self.client:
             raise DatabaseConnectFailureException()
-        return self.client[self.db_name]
+
+        type_registry = TypeRegistry([Decimal128Decoder()])
+        codec_options = CodecOptions(type_registry=type_registry)
+
+        name = db_name if db_name else self.db_name
+        return self.client.get_database(name, codec_options=codec_options)
+
+    def get_collection(self, collection_name: str, db_name: str = None):
+        """直接取得指定的集合"""
+        db = self.get_database(db_name)
+        return db[collection_name]
 
     async def get_mongodb_uri(self) -> str:
         if self.user_name and self.password:

{internal-1.1.26 → internal-1.1.49.1}/src/internal/http/requests.py

@@ -1,4 +1,5 @@
 import asyncio
+import json
 import random
 
 import httpx
@@ -17,11 +18,21 @@ async def invoke_request(timeout: httpx.Timeout, method: str, url: str, app: Fas
             if "json" in kwargs:
                 kwargs["json"] = jsonable_encoder(kwargs["json"])
 
-            app.state.logger.info(f"【{app.title}】 \nURL: {method} {url} \nkwargs: {kwargs} \ninvoke_request() request")
+            app.state.logger.info(f"REQUEST | {kwargs.get('headers').get(CORRELATION_ID_HEADER_KEY_NAME)} | {method} | {url} | kwargs={kwargs}")
+
             response = await client.request(method, url, **kwargs)
-            app.state.logger.info(
-                f"【{app.title}】 \nURL: {method} {url} \nkwargs: {kwargs} \ninvoke_request() response \n\nstatus_code: {response.status_code} \ntext: {response.text}"
-            )
+
+            try:
+                response_json = json.loads(response.text)
+                response_text = json.dumps(response_json, ensure_ascii=False)
+                app.state.logger.info(
+                    f"RESPONSE | {kwargs.get('headers').get(CORRELATION_ID_HEADER_KEY_NAME)} | {method} | {url} | {response.status_code} | {response_text}"
+                )
+            except json.decoder.JSONDecodeError:
+                app.state.logger.info(
+                    f"RESPONSE | {kwargs.get('headers').get(CORRELATION_ID_HEADER_KEY_NAME)} | {method} | {url} | {response.status_code} | {response.text}"
+                )
+
             return response
     except httpx.TimeoutException as exc:
         message = f"【{app.title}】 \nURL: {method} {url} \nkwargs: {kwargs} \ninvoke_request(), TimeoutException, exc: {exc}"

{internal-1.1.26 → internal-1.1.49.1}/src/internal/http/responses.py

@@ -2,6 +2,7 @@ import json
 import arrow
 
 from datetime import datetime, date
+from pydantic import BaseModel
 
 import httpx
 
@@ -14,23 +15,35 @@ from ..const import ARR_HUMAN_READ_FMT, ARR_DATE_FMT
 
 async def async_response(data=None, message=None, code=None, page_no=None, total_num=None, page_size=None,
                          time_zone="UTC", time_format=ARR_HUMAN_READ_FMT, date_format=ARR_DATE_FMT,
-                         status_code=status.HTTP_200_OK):
+                         status_code=status.HTTP_200_OK, is_need_exclude_secret_key=True):
     def _serialize(data):
-        if issubclass(type(data), Document):
+        if issubclass(type(data), Document) or issubclass(type(data), BaseModel):
             link_field_list = []
             datetime_field_list = []
             date_field_list = []
+            replace_dict = {}
             for field_name in data.__annotations__:
                 field_type = getattr(data, field_name)
+                if field_name in ["contact", "pick_up", "car", "customer"]:
+                    if field_type:
+                        replace_dict[field_name] = _serialize(field_type)
+
                 if isinstance(field_type, Link):
                     link_field_list.append(field_name)
 
-                if isinstance(field_type, datetime):
+                if field_name.endswith('_date') or field_name == "birthday" or field_name.endswith('_birthday'):
+                    date_field_list.append(field_name)
+                elif isinstance(field_type, datetime):
                     datetime_field_list.append(field_name)
                 elif isinstance(field_type, date):
                     date_field_list.append(field_name)
 
-            data = json.loads(data.model_dump_json(exclude={"password", "metadata", "otp_code_universal"}, by_alias=False))
+            if is_need_exclude_secret_key:
+                data = json.loads(
+                    data.model_dump_json(exclude={"password", "metadata", "otp_code_universal"}, by_alias=False))
+            else:
+                data = json.loads(data.model_dump_json(by_alias=False))
+
             if link_field_list:
                 for field_name in link_field_list:
                     if isinstance(data[field_name], dict) and "id" in data[field_name].keys():
@@ -42,6 +55,34 @@ async def async_response(data=None, message=None, code=None, page_no=None, total
                 if data[field_name]:
                     data[field_name] = arrow.get(data[field_name]).to(time_zone).format(date_format)
 
+            for key, value in replace_dict.items():
+                data[key] = value
+
+            if "create_time" in data.keys() and data.get("create_time"):
+                data["create_time"] = arrow.get(data["create_time"]).to(time_zone).format(ARR_HUMAN_READ_FMT)
+
+            if "update_time" in data.keys() and data.get("update_time"):
+                data["update_time"] = arrow.get(data["update_time"]).to(time_zone).format(ARR_HUMAN_READ_FMT)
+
+        elif isinstance(data, dict):
+            datetime_field_list = []
+            date_field_list = []
+            for field_name, field_type in data.items():
+                if field_name.endswith('_date') or field_name == "birthday" or field_name.endswith('_birthday'):
+                    date_field_list.append(field_name)
+                elif isinstance(field_type, datetime):
+                    datetime_field_list.append(field_name)
+                elif isinstance(field_type, date):
+                    date_field_list.append(field_name)
+
+            data = json.loads(json.dumps(data, default=jsonable_encoder))
+            for field_name in datetime_field_list:
+                if data[field_name]:
+                    data[field_name] = arrow.get(data[field_name]).to(time_zone).format(time_format)
+            for field_name in date_field_list:
+                if data[field_name]:
+                    data[field_name] = arrow.get(data[field_name]).to(time_zone).format(date_format)
+
             if "create_time" in data.keys() and data.get("create_time"):
                 data["create_time"] = arrow.get(data["create_time"]).to(time_zone).format(ARR_HUMAN_READ_FMT)
 

internal-1.1.49.1/src/internal/middleware/log_request.py

@@ -0,0 +1,90 @@
+import json
+import logging
+import time
+
+from collections import defaultdict
+from fastapi import FastAPI, Request
+from starlette.middleware.base import BaseHTTPMiddleware
+from ..const import CORRELATION_ID_HEADER_KEY_NAME
+
+
+class LogRequestMiddleware(BaseHTTPMiddleware):
+    def __init__(self, app: FastAPI, logger: logging.Logger):
+        super().__init__(app)
+        self.app = app
+        self.logger = logger
+
+    async def dispatch(self, request: Request, call_next):
+        # 记录请求的URL和参数
+        url = request.url.path
+        method = request.method
+        headers = request.headers
+        request_id = headers.get(CORRELATION_ID_HEADER_KEY_NAME, "")
+        content_type = headers.get('content-type', '') or headers.get('Content-Type', '')
+        is_multipart = 'multipart' in content_type.lower()
+
+        query_params = request.query_params
+        temp = defaultdict(list)
+        for key, value in query_params.multi_items():
+            temp[key].append(value)
+        # 如果只有一個值就轉成單一值
+        params = {k: v[0] if len(v) == 1 else v for k, v in temp.items()}
+
+        body = await request.body()
+
+        # 解碼 body 為字符串（如果不是 multipart）
+        if is_multipart:
+            body_str = "因上傳檔案不顯示body"
+        else:
+            try:
+                # 嘗試使用 UTF-8 解碼
+                body_str = body.decode('utf-8')
+            except UnicodeDecodeError:
+                # 如果解碼失敗，顯示原始 bytes
+                body_str = str(body)
+
+        request_info = {
+            "request_id": request_id,
+            "method": method,
+            "url": url,
+            "params": params,
+            "body": body_str,
+            "content_type": content_type,
+            "user_agent": headers.get("user-agent", "")
+        }
+        self.logger.info(f"Request started: {json.dumps(request_info, ensure_ascii=False)}")
+
+        # 记录请求处理时间
+        start_time = time.time()
+        try:
+            response = await call_next(request)
+            process_time = time.time() - start_time
+            status_code = response.status_code
+
+            # 记录成功响应
+            response_info = {
+                "request_id": request_id,
+                "method": method,
+                "url": url,
+                "status_code": status_code,
+                "process_time": round(process_time, 4)
+            }
+
+            self.logger.info(f"Request completed: {json.dumps(response_info, ensure_ascii=False)}")
+
+            return response
+
+        except Exception as e:
+            process_time = time.time() - start_time
+
+            # 记录异常
+            error_info = {
+                "request_id": request_id,
+                "method": method,
+                "url": url,
+                "error": str(e),
+                "process_time": round(process_time, 4)
+            }
+
+            self.logger.error(f"Request failed: {json.dumps(error_info, ensure_ascii=False)}")
+            raise

{internal-1.1.26 → internal-1.1.49.1}/src/internal/model/base_model.py

@@ -1,8 +1,6 @@
 from datetime import datetime
 
 from typing import List, Tuple, Union, Dict, Type, Optional, Any, Literal, Union, Set, Mapping
-import typing_extensions
-from pydantic_core import PydanticUndefined
 from typing_extensions import Self, TypeAlias, Unpack
 
 import arrow
@@ -27,8 +25,8 @@ class InternalBaseDocument(Document):
     @classmethod
     async def get_pagination_list(cls, app: FastAPI, query: list = None, sort: List[Tuple] = None,
                                   page_size: int = DEF_PAGE_SIZE, page_no: int = DEF_PAGE_NO,
-                                  ignore_cache: bool = False,
-                                  fetch_links: bool = False):
+                                  ignore_cache: bool = False, fetch_links: bool = False,
+                                  exclude_field_list: List[str] = None):
         if not query:
             final_query = []
         else:
@@ -46,21 +44,59 @@ class InternalBaseDocument(Document):
                 else:
                     print(f"order type value error: temp_sort:{temp_sort}")
                     continue
-            final_sort.append((cls.id, pymongo.ASCENDING))
 
-        total_num = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links).sort(
-            *final_sort).count()
+            if not any(s[0] == str(cls.id) for s in sort):
+                final_sort.append((cls.id, pymongo.ASCENDING))
+
+        if exclude_field_list:
+            # 當需要排除欄位時，使用 Motor 直接操作
+            collection = cls.get_motor_collection()
+            projection = {field: 0 for field in exclude_field_list}
+
+            # 建立查詢條件
+            mongo_query = {}
+            for q in final_query:
+                if hasattr(q, 'query'):
+                    mongo_query.update(q.query)
+
+            # 計算總數
+            total_num = await collection.count_documents(mongo_query)
+            total_pages = (total_num + page_size - 1) // page_size
+
+            if total_pages == 0:
+                page_no = 1
+                page_data = []
+            else:
+                page_no = max(1, min(page_no, total_pages))
+
+                # 執行分頁查詢
+                cursor = collection.find(mongo_query, projection).sort(final_sort).skip(
+                    (page_no - 1) * page_size).limit(page_size)
+                documents = await cursor.to_list(None)
+
+                # 轉換為 Pydantic 模型
+                page_data = []
+                for doc in documents:
+                    try:
+                        page_data.append(cls.model_validate(doc))
+                    except Exception as e:
+                        print(f"模型驗證失敗: {e}")
+                        continue
+        else:
+            # 沒有排除欄位時使用 Beanie 的方法
+            total_num = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links).sort(
+                *final_sort).count()
 
-        total_pages = (total_num + page_size - 1) // page_size
+            total_pages = (total_num + page_size - 1) // page_size
 
-        if total_pages == 0:
-            page_no = 1
-            page_data = []
-        else:
-            page_no = max(1, min(page_no, total_pages))
+            if total_pages == 0:
+                page_no = 1
+                page_data = []
+            else:
+                page_no = max(1, min(page_no, total_pages))
 
-            page_data = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links).sort(
-                *final_sort).limit(page_size).skip((page_no - 1) * page_size).to_list()
+                page_data = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links).sort(
+                    *final_sort).limit(page_size).skip((page_no - 1) * page_size).to_list()
 
         return page_no, page_size, total_num, page_data
 
@@ -89,7 +125,7 @@ class InternalBaseDocument(Document):
 
     @classmethod
     async def get_list(cls, app: FastAPI, query: list = None, sort: List[Tuple] = None, ignore_cache: bool = False,
-                       fetch_links: bool = False):
+                       fetch_links: bool = False, exclude_field_list: List[str] = None):
         if not query:
             final_query = []
         else:
@@ -107,10 +143,37 @@ class InternalBaseDocument(Document):
                 else:
                     print(f"order type value error: temp_sort:{temp_sort}")
                     continue
-            final_sort.append((cls.id, pymongo.ASCENDING))
 
-        data = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links).sort(
-            *final_sort).to_list()
+            if not any(s[0] == str(cls.id) for s in sort):
+                final_sort.append((cls.id, pymongo.ASCENDING))
+
+        if exclude_field_list:
+            # 當需要排除欄位時，使用 Motor 直接操作
+            collection = cls.get_motor_collection()
+            projection = {field: 0 for field in exclude_field_list}
+
+            # 建立查詢條件
+            mongo_query = {}
+            for q in final_query:
+                if hasattr(q, 'query'):
+                    mongo_query.update(q.query)
+
+            # 執行查詢
+            cursor = collection.find(mongo_query, projection).sort(final_sort)
+            documents = await cursor.to_list(None)
+
+            # 轉換為 Pydantic 模型
+            data = []
+            for doc in documents:
+                try:
+                    data.append(cls.model_validate(doc))
+                except Exception as e:
+                    print(f"模型驗證失敗: {e}")
+                    continue
+        else:
+            # 沒有排除欄位時使用 Beanie 的方法
+            data = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links).sort(
+                *final_sort).to_list()
 
         return data
 

{internal-1.1.26 → internal-1.1.49.1}/src/internal/utils.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 import json
+import hashlib
 from datetime import datetime, timezone
 
 import arrow
 
 from .base_config import BaseConfig
-from .const import STR_EMPTY, ARR_EXPORT_DATETIME_FMT, STR_DASH, REDIS_LPR_DATA_LIST_PREFIX
+from .const import STR_EMPTY, ARR_EXPORT_DATETIME_FMT, STR_DASH, REDIS_LPR_DATA_LIST_PREFIX, STR_SPACE
 
 
 def is_today(time, system_time_zone):
@@ -48,7 +49,7 @@ def update_dict_with_cast(curr_settings: BaseConfig, new_conf: dict):
 
 
 def sanitize_plate_no(plate_no):
-    return plate_no.replace(STR_DASH, STR_EMPTY).upper()
+    return plate_no.replace(STR_SPACE, STR_EMPTY).replace(STR_DASH, STR_EMPTY).upper()
 
 
 def get_current_utc() -> datetime:
@@ -105,6 +106,7 @@ def get_dealer_by_organization_id(organization_id: str) -> str:
 
     return organization_id
 
+
 def extract_title(name):
     if '小姐' in name:
         return '小姐'
@@ -115,6 +117,7 @@ def extract_title(name):
     else:
         return None
 
+
 def extract_name(name):
     """从姓名中提取真实姓名"""
     # 检查是否包含 '小姐' 或 '先生' 并提取姓名
@@ -125,4 +128,28 @@ def extract_name(name):
     elif '先生' in name:
         return name.split('先生')[0].strip()
     else:
-        return name.strip()
+        return name.strip()
+
+
+def hash_login_password(passwd):
+    prefix = '___'
+    postfix = '_______'
+    data = str(passwd)
+    sha_256 = hashlib.sha256()
+    sha_256.update(prefix.encode())
+    sha_256.update(data.encode())
+    sha_256.update(postfix.encode())
+
+    return sha_256.hexdigest()
+
+
+def hash_secret_key(passwd):
+    prefix = '___'
+    postfix = '_______'
+    data = str(passwd)
+    sha_256 = hashlib.sha256()
+    sha_256.update(prefix.encode())
+    sha_256.update(data.encode())
+    sha_256.update(postfix.encode())
+
+    return sha_256.hexdigest()

{internal-1.1.26 → internal-1.1.49.1}/src/internal/validator_utils.py

@@ -10,8 +10,12 @@ def verify_and_sanitize_plate_no(value: str, is_require: bool = False):
         raise PlateNoFormatException()
 
     if value:
-        if not re.match(r'^[A-Za-z0-9]{6,7}$', value):
+        # 移除空格和常見分隔符號進行檢查
+        cleaned = sanitize_plate_no(value)
+
+        if not re.match(r'^[外使領試臨軍A-Za-z0-9]{5,7}\Z', cleaned):
             raise PlateNoFormatException()
+
     return sanitize_plate_no(value)
 
 
@@ -20,7 +24,7 @@ def verify_vin(value: str, is_require: bool = False):
         raise VinLengthOrFormatException()
 
     if value:
-        if not re.match(r'^(?:[A-Za-z0-9]{7}|[A-Za-z0-9]{10}|[A-Za-z0-9]{17})$', value):
+        if not re.match(r'^(?:[A-Za-z0-9]{7}|[A-Za-z0-9]{10}|[A-Za-z0-9]{17})\Z', value):
             raise VinLengthOrFormatException()
 
 
@@ -29,7 +33,7 @@ def verify_phone(value: str, is_require: bool = False):
         raise PhoneFormatException()
 
     if value:
-        if not re.match(r'^09\d{8}$', value):
+        if not re.match(r'^09\d{8}\Z', value):
             raise PhoneFormatException()
 
 

internal-1.1.26/src/internal/middleware/log_request.py

@@ -1,39 +0,0 @@
-import logging
-import time
-
-from collections import defaultdict
-from fastapi import FastAPI, Request
-from starlette.middleware.base import BaseHTTPMiddleware
-from ..const import CORRELATION_ID_HEADER_KEY_NAME
-
-
-class LogRequestMiddleware(BaseHTTPMiddleware):
-    def __init__(self, app: FastAPI, logger: logging.Logger):
-        super().__init__(app)
-        self.app = app
-        self.logger = logger
-
-    async def dispatch(self, request: Request, call_next):
-        # 记录请求的URL和参数
-        url = request.url.path
-        method = request.method
-        headers = request.headers
-        request_id = headers.get(CORRELATION_ID_HEADER_KEY_NAME, "")
-
-        query_params = request.query_params
-        temp = defaultdict(list)
-        for key, value in query_params.multi_items():
-            temp[key].append(value)
-        # 如果只有一個值就轉成單一值
-        params = {k: v[0] if len(v) == 1 else v for k, v in temp.items()}
-
-        body = await request.body()
-        self.logger.info(f"[Request id: {request_id}] \nURL: {method} {url} \nParams: {params} \nBody: {body} \nHeaders: {headers} \nstart processing...")
-
-        # 记录请求处理时间
-        start_time = time.time()
-        response = await call_next(request)
-        process_time = time.time() - start_time
-
-        self.logger.info(f"[Request id: {request_id}] \nURL: {method} {url} \nParams: {params} \nBody: {body} \nCompleted in {process_time:.4f} seconds")
-        return response