update 1.1.4

SenQi-666 · SenQi-666 · commit f2545693733d · 2024-07-04T15:33:16.000+08:00
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
   <p align="center">
     <a href="https://gitee.com/senqi666/fastapi-vue-admin"><img src="https://gitee.com/senqi666/fastapi-vue-admin/badge/star.svg?theme=dark"></a>
     <a href="https://github.com/SenQi-666/fastapi-vue-admin"><img src="https://img.shields.io/github/stars/SenQi-666/fastapi-vue-admin?style=social"></a>
-    <a href="https://github.com/SenQi-666/fastapi-vue-admin/blob/main/LICENSE"><img src="https://img.shields.io/badge/License-MIT-orange"></a>
+    <a href="https://gitee.com/senqi666/fastapi-vue-admin/blob/master/LICENSE"><img src="https://img.shields.io/badge/License-MIT-orange"></a>
     <img src="https://img.shields.io/badge/Python-≥3.10-blue">
     <img src="https://img.shields.io/badge/NodeJS-≥20.0-blue">
   </p>
@@ -41,14 +41,14 @@ PC端演示地址：https://fastapi-vue-admin.senqiweb.cn
 
 ### 获取代码
 
-> git clone https://github.com/SenQi-666/fastapi-vue-admin.git
+> git clone https://gitee.com/senqi666/fastapi-vue-admin.git
 
 ### 准备工作
 
 ```
 Python == 3.10（其他版本均未测试）
 nodejs >= 20.0（推荐使用最新版）
-PgSQL（推荐使用最新版）
+PgSQL == 14（其他版本均未测试）
 Redis（推荐使用最新版）
 ```
 
diff --git a/backend/app/scripts/initialize/main.py b/backend/app/scripts/initialize/main.py
@@ -1,66 +1,69 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from typing import TypeVar, List, Dict
 from app.core.config import settings
-from sqlalchemy import create_engine
+from sqlalchemy import create_engine, text
 from sqlalchemy.orm import sessionmaker
 from app.models.base import Model
 from app.models import system
 from pathlib import Path
 import orjson
 
 
+ModelType = TypeVar("ModelType", bound=Model)
+
+
 class InitializeData:
     """
     初始化数据
     """
 
     SCRIPT_DIR: Path = Path.joinpath(settings.BASE_DIR, 'scripts', 'initialize')
 
-    def __init__(self):
+    def __init__(self) -> None:
         self.engine = create_engine(self.__get_db_url(), echo=True, future=True)
         self.DBSession = sessionmaker(bind=self.engine)
-
-    def __get_db_url(self):
+        self.prepare_init_models = [
+            system.DeptModel,
+            system.UserModel,
+            system.MenuModel,
+            system.PositionModel,
+            system.RoleModel,
+            system.OperationLogModel,
+            system.RoleDeptsModel,
+            system.RoleMenusModel,
+            system.UserPositionsModel,
+            system.UserRolesModel
+        ]
+
+    def __get_db_url(self) -> str:
         scheme = settings.SQL_DB_URL.scheme.split('+')[0]
         new_db_url = settings.SQL_DB_URL.unicode_string().replace(settings.SQL_DB_URL.scheme, scheme)
         return new_db_url
 
-    def __init_model(self):
+    def __init_model(self) -> None:
         print("开始初始化数据库...")
         Model.metadata.create_all(
             self.engine,
-            tables=[
-                system.DeptModel.__table__,
-                system.UserModel.__table__,
-                system.MenuModel.__table__,
-                system.PositionModel.__table__,
-                system.RoleModel.__table__,
-                system.OperationLogModel.__table__,
-                system.RoleDeptsModel.__table__,
-                system.RoleMenusModel.__table__,
-                system.UserPositionsModel.__table__,
-                system.UserRolesModel.__table__
-            ]
+            tables=[modal.__table__ for modal in self.prepare_init_models]
         )
         print("数据库初始化完成!")
 
-    def __init_data(self):
+    def __init_data(self) -> None:
         print("开始初始化数据...")
-        self.__init_dept()
-        self.__init_user()
-        self.__init_menu()
-        self.__init_position()
-        self.__init_role()
-        self.__init_role_depts()
-        self.__init_role_menus()
-        self.__init_user_positions()
-        self.__init_user_roles()
+
+        for model in self.prepare_init_models:
+            max_rows = self.__generate_data(model)
+            self.__update_sequence(model, max_rows)
+
         print("数据初始化完成!")
 
-    def __generate_data(self, table_name: str, model: Model):
+    def __generate_data(self, model: ModelType) -> int:
         session = self.DBSession()
 
+        table_name = model.__tablename__
+
         data = self.__get_data(table_name)
         objs = [model(**item) for item in data]
         session.add_all(objs)
@@ -69,40 +72,41 @@ def __generate_data(self, table_name: str, model: Model):
         session.close()
         print(f"{table_name} 表数据已生成!")
 
-    def __get_data(self, filename: str):
-        json_path = Path.joinpath(self.SCRIPT_DIR, 'data', f'{filename}.json')
-        with open(json_path, 'r', encoding='utf-8') as f:
-            data = orjson.loads(f.read())
-            return data
+        return len(objs)
 
-    def __init_dept(self):
-        self.__generate_data("system_dept", system.DeptModel)
+    def __get_data(self, filename: str) -> List[Dict]:
+        try:
+            json_path = Path.joinpath(self.SCRIPT_DIR, 'data', f'{filename}.json')
+            with open(json_path, 'r', encoding='utf-8') as f:
+                data = orjson.loads(f.read())
+                return data
 
-    def __init_menu(self):
-        self.__generate_data("system_menu", system.MenuModel)
+        except FileNotFoundError:
+            return []
 
-    def __init_position(self):
-        self.__generate_data("system_position", system.PositionModel)
+    def __update_sequence(self, model: ModelType, max_rows: int) -> None:
+        table_name = model.__tablename__
 
-    def __init_role(self):
-        self.__generate_data("system_role", system.RoleModel)
+        # 检查模型中是否有自增字段
+        sequence_name = None
+        for col in model.__table__.columns:
+            if col.autoincrement is True:
+                sequence_name = f"{table_name}_{col.name}_seq"
+                break
 
-    def __init_role_depts(self):
-        self.__generate_data("system_role_depts", system.RoleDeptsModel)
-
-    def __init_role_menus(self):
-        self.__generate_data("system_role_menus", system.RoleMenusModel)
-
-    def __init_user(self):
-        self.__generate_data("system_user", system.UserModel)
+        if not sequence_name:
+            print(f"{table_name} 表无需设置自增序列值")
+            return
 
-    def __init_user_positions(self):
-        self.__generate_data("system_user_positions", system.UserPositionsModel)
+        session = self.DBSession()
 
-    def __init_user_roles(self):
-        self.__generate_data("system_user_roles", system.UserRolesModel)
+        # 更新序列最大值
+        new_value = max_rows + 1
+        session.execute(text(f"ALTER SEQUENCE {sequence_name} RESTART WITH {new_value}"))
+        session.commit()
+        print(f"{table_name} 表的自增序列值已更新!")
 
-    def run(self):
+    def run(self) -> None:
         """
         执行初始化
         """
diff --git a/backend/app/services/system/auth_service.py b/backend/app/services/system/auth_service.py
@@ -12,9 +12,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from app.core.exceptions import CustomException
 from aioredis import Redis
-from captcha.image import ImageCaptcha
-from io import BytesIO
-from app.utils.tools import get_random_character
+from app.utils.tools import get_random_character, generate_captcha
 from datetime import timedelta
 from app.core.config import settings
 from app.crud.system import UserCRUD
@@ -104,7 +102,7 @@ async def get_captcha(cls, redis: Redis) -> Dict[str, Union[CaptchaKey, CaptchaB
         random_strings = random.sample(list(total_strings), 4)
         captcha_string = "".join(random_strings)
 
-        captcha: BytesIO = ImageCaptcha().generate(captcha_string)
+        captcha = generate_captcha(captcha_string)
         captcha_bytes = captcha.getvalue()
         captcha_base64 = base64.b64encode(captcha_bytes).decode()
 
diff --git a/backend/app/utils/tools.py b/backend/app/utils/tools.py
@@ -2,13 +2,15 @@
 # -*- coding: utf-8 -*-
 
 from typing import Any, List, Dict, Sequence, Optional
-import importlib, uuid
+import importlib, uuid, random
 from pathlib import Path
 from app.crud.base import ModelType
 from app.models.base import Model
 from sqlalchemy.sql.elements import ColumnElement
 from fastapi import UploadFile
 from app.core.config import settings
+from io import BytesIO
+from PIL import Image, ImageDraw, ImageFont
 
 
 def import_module(module: str) -> Any:
@@ -67,6 +69,78 @@ def get_random_character() -> str:
     return uuid.uuid4().hex
 
 
+# 生成带有噪声和干扰的验证码图片
+def generate_captcha(code) -> BytesIO:
+    """
+    生成带有噪声和干扰的验证码图片
+    :return: 验证码图片流
+    """
+    # 创建一张随机颜色背景的图片
+    background_color = (random.randint(200, 255), random.randint(200, 255), random.randint(200, 255))
+    width, height = 160, 60
+    image = Image.new('RGB', (width, height), color=background_color)
+
+    # 获取一个绘图对象
+    draw = ImageDraw.Draw(image)
+
+    # 字体设置（如果需要自定义字体，请替换下面的字体路径）
+    font = ImageFont.truetype("./app/resources/gantians.otf", 42)
+
+    # 计算验证码文本的总宽度
+    total_text_width = 0
+    for char in code:
+        # 计算文本的宽度
+        bbox = ImageDraw.Draw(Image.new('RGB', (1, 1))).textbbox((0, 0), char, font=font)
+        text_width = bbox[2] - bbox[0]
+        total_text_width += text_width
+
+    # 计算每个字符的起始位置
+    x_offset = (width - total_text_width) / 2
+    # 计算文本的高度
+    bbox = ImageDraw.Draw(Image.new('RGB', (1, 1))).textbbox((0, 0), code[0], font=font)
+    text_height = bbox[3] - bbox[1]
+    y_offset = (height - text_height) / 2 - draw.textbbox((0, 0), code[0], font=font)[1]
+
+    # 绘制每个字符（单独的颜色和扭曲）
+    for char in code:
+        # 随机选择字体颜色
+        text_color = (random.randint(0, 100), random.randint(0, 100), random.randint(0, 100))
+
+        # 计算字符位置并稍微扭曲
+        bbox = ImageDraw.Draw(Image.new('RGB', (1, 1))).textbbox((0, 0), char, font=font)
+        char_width = bbox[2] - bbox[0]
+        char_x = x_offset + random.uniform(-3, 3)
+        char_y = y_offset + random.uniform(-5, 5)
+
+        # 绘制字符
+        draw.text((char_x, char_y), char, font=font, fill=text_color)
+
+        # 更新下一个字符的位置
+        x_offset += char_width + random.uniform(2, 8)
+
+    # 添加少量的圆圈干扰
+    for _ in range(random.randint(2, 4)):
+        # 随机位置和大小
+        x = random.randint(0, width)
+        y = random.randint(0, height)
+        radius = random.randint(5, 10)
+        draw.ellipse((x - radius, y - radius, x + radius, y + radius), outline=text_color)
+
+    # 添加少量的噪点
+    for _ in range(random.randint(10, 20)):
+        x = random.randint(0, width - 1)
+        y = random.randint(0, height - 1)
+        noise_size = random.randint(2, 4)
+        noise_color = (random.randint(0, 50), random.randint(0, 50), random.randint(0, 50))
+        draw.rectangle([x, y, x + noise_size, y + noise_size], fill=noise_color)
+
+    # 返回验证码图片流
+    stream = BytesIO()
+    image.save(stream, format='PNG')
+
+    return stream
+
+
 def get_parent_id_map(model_list: Sequence[Model]) -> Dict[int, int]:
     """
     获取父级ID的映射集
diff --git a/backend/requirements.txt b/backend/requirements.txt
