Bump fastapi to remove warning for python 3.14 (#872)

* Optimize sqlalchemy types to simplify compatibility

* Update TimeZone type comment

.github/workflows/changelog.yml

@@ -18,4 +18,6 @@ jobs:
         with:
           file: CHANGELOG.md
           pull_request: true
+          commit_summary_template: 'Update the changelog for %s'
+          args: -c
           github_token: ${{ secrets.GH_TOKEN }}

.github/workflows/lint.yml

@@ -12,7 +12,7 @@ jobs:
     name: lint ${{ matrix.python-version }}
     strategy:
       matrix:
-        python-version: [ '3.10', '3.11', '3.12', '3.13' ]
+        python-version: [ '3.10', '3.11', '3.12', '3.13', '3.14' ]
       fail-fast: false
     steps:
       - uses: actions/checkout@v4

.pre-commit-config.yaml

@@ -1,26 +1,23 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
-#      - id: check-added-large-files
+      - id: end-of-file-fixer
-#      - id: end-of-file-fixer
       - id: check-yaml
       - id: check-toml
 
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.11.9
+    rev: v0.14.0
     hooks:
-      - id: ruff
+      - id: ruff-check
         args:
           # https://github.com/astral-sh/ruff-pre-commit/issues/64
-          - '--config'
-          - 'backend/.ruff.toml'
           - '--fix'
           - '--unsafe-fixes'
       - id: ruff-format
 
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.7.3
+    rev: 0.9.0
     hooks:
       - id: uv-lock
       - id: uv-export

.ruff.toml

@@ -0,0 +1,174 @@
+line-length = 120
+preview = true
+fix = true
+unsafe-fixes = true
+show-fixes = true
+required-version = ">=0.13.0"
+
+[lint]
+select = [
+    "FAST",
+    "ANN001",
+    "ANN201",
+    "ANN202",
+    "ANN204",
+    "ANN205",
+    "ANN206",
+    "ASYNC110",
+    "ASYNC116",
+    "ASYNC210",
+    "ASYNC212",
+    "ASYNC230",
+    "ASYNC240",
+    "ASYNC250",
+    "ASYNC251",
+    "S310",
+    "FBT001",
+    "FBT002",
+    "B002",
+    "B005",
+    "B006",
+    "B007",
+    "B008",
+    "B009",
+    "B010",
+    "B013",
+    "B014",
+    "B019",
+    "B020",
+    "B021",
+    "B024",
+    "B025",
+    "B026",
+    "B027",
+    "B039",
+    "COM",
+    "C402",
+    "C403",
+    "C404",
+    "C408",
+    "C410",
+    "C411",
+    "C414",
+    "C416",
+    "C417",
+    "C418",
+    "C419",
+    "C420",
+    "DTZ",
+    "EXE",
+    "ISC001",
+    "ISC002",
+    "ISC003",
+    "PIE",
+    "PYI009",
+    "PYI010",
+    "PYI011",
+    "PYI012",
+    "PYI013",
+    "PYI016",
+    "PYI017",
+    "PYI019",
+    "PYI020",
+    "PYI021",
+    "PYI024",
+    "PYI026",
+    "PYI030",
+    "PYI033",
+    "PYI034",
+    "PYI036",
+    "PYI041",
+    "PYI042",
+    "PYI055",
+    "PYI061",
+    "PYI062",
+    "PYI063",
+    "Q001",
+    "Q002",
+    "RSE102",
+    "RET501",
+    "RET505",
+    "RET506",
+    "RET507",
+    "RET508",
+    "SIM101",
+    "SIM102",
+    "SIM103",
+    "SIM107",
+    "SIM108",
+    "SIM109",
+    "SIM110",
+    "SIM114",
+    "SIM115",
+    "SIM201",
+    "SIM202",
+    "SIM210",
+    "SIM211",
+    "SIM212",
+    "SIM300",
+    "SIM401",
+    "SIM910",
+    "TID252",
+    "TC",
+    "FLY",
+    "I",
+    "C901",
+    "N",
+    "PERF",
+    "E",
+    "W",
+    "D404",
+    "D417",
+    "D419",
+    "F",
+    "PGH",
+    "PLC1901",
+    "UP",
+    "FURB",
+    "RUF",
+    "TRY",
+]
+ignore = [
+    "COM812",
+    "PGH003",
+    "RUF001",
+    "RUF002",
+    "RUF003",
+    "RUF006",
+    "RUF012",
+    "TRY400",
+    "TRY003",
+    "TRY301"
+]
+
+[lint.per-file-ignores]
+"**/model/*.py" = ["TC003"]
+"backend/common/socketio/server.py" = ["ANN001"]
+"backend/common/exception/exception_handler.py" = ["ANN202","RUF029"]
+
+[lint.flake8-pytest-style]
+parametrize-names-type = "list"
+parametrize-values-row-type = "list"
+parametrize-values-type = "list"
+
+[lint.flake8-quotes]
+inline-quotes = "single"
+
+[lint.flake8-type-checking]
+runtime-evaluated-base-classes = ["pydantic.BaseModel", "sqlalchemy.orm.DeclarativeBase"]
+
+[lint.flake8-unused-arguments]
+ignore-variadic-names = true
+
+[lint.isort]
+case-sensitive = true
+lines-between-types = 1
+order-by-type = true
+
+[lint.pylint]
+allow-dunder-method-names = ["__tablename__", "__table_args__"]
+
+[format]
+docstring-code-format = true
+preview = true
+quote-style = "single"

CHANGELOG.md

@@ -1,3 +1,299 @@
+<a id="v1.10.1"></a>
+# [v1.10.1](https://github.com/fastapi-practices/fastapi_best_architecture/releases/tag/v1.10.1) - 2025-10-18
+
+## What's Changed
+* Update the changelog for v1.10.0 by [@wu-clan](https://github.com/wu-clan) in [#864](https://github.com/fastapi-practices/fastapi_best_architecture/pull/864)
+* Fix tasks related to deleting db logs by [@wu-clan](https://github.com/wu-clan) in [#863](https://github.com/fastapi-practices/fastapi_best_architecture/pull/863)
+* Fix the volume in the docker compose script by [@wu-clan](https://github.com/wu-clan) in [#865](https://github.com/fastapi-practices/fastapi_best_architecture/pull/865)
+* Update the release changelog workflow by [@wu-clan](https://github.com/wu-clan) in [#867](https://github.com/fastapi-practices/fastapi_best_architecture/pull/867)
+* Bump dependencies to the latest version by [@wu-clan](https://github.com/wu-clan) in [#868](https://github.com/fastapi-practices/fastapi_best_architecture/pull/868)
+
+
+**Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.10.0...v1.10.1
+
+## Contributors
+
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
+[Changes][v1.10.1]
+
+
+<a id="v1.10.0"></a>
+# [v1.10.0](https://github.com/fastapi-practices/fastapi_best_architecture/releases/tag/v1.10.0) - 2025-10-17
+
+## What's Changed
+* Fix the import table cli command by [@wu-clan](https://github.com/wu-clan) in [#860](https://github.com/fastapi-practices/fastapi_best_architecture/pull/860)
+* Update unique judgment logic for dict data by [@wu-clan](https://github.com/wu-clan) in [#859](https://github.com/fastapi-practices/fastapi_best_architecture/pull/859)
+* Fix the api ninja in code generation by [@wu-clan](https://github.com/wu-clan) in [#858](https://github.com/fastapi-practices/fastapi_best_architecture/pull/858)
+* Fix dict plugin pgsql init script missing by [@wu-clan](https://github.com/wu-clan) in [#857](https://github.com/fastapi-practices/fastapi_best_architecture/pull/857)
+* Update the changelog for v1.9.0 by [@wu-clan](https://github.com/wu-clan) in [#856](https://github.com/fastapi-practices/fastapi_best_architecture/pull/856)
+* Fix ctx in validation exception handler by [@wu-clan](https://github.com/wu-clan) in [#861](https://github.com/fastapi-practices/fastapi_best_architecture/pull/861)
+* Update the primary database to postgresql by [@wu-clan](https://github.com/wu-clan) in [#829](https://github.com/fastapi-practices/fastapi_best_architecture/pull/829)
+
+
+**Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.9.0...v1.10.0
+
+## Contributors
+
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
+[Changes][v1.10.0]
+
+
+<a id="v1.9.0"></a>
+# [v1.9.0](https://github.com/fastapi-practices/fastapi_best_architecture/releases/tag/v1.9.0) - 2025-10-16
+
+## What's Changed
+* Update changelog for v1.8.3 by [@wu-clan](https://github.com/wu-clan) in [#849](https://github.com/fastapi-practices/fastapi_best_architecture/pull/849)
+* Bump fastapi and pydantic to the latest by [@wu-clan](https://github.com/wu-clan) in [#851](https://github.com/fastapi-practices/fastapi_best_architecture/pull/851)
+* Update superuser verify to dependency injection by [@wu-clan](https://github.com/wu-clan) in [#852](https://github.com/fastapi-practices/fastapi_best_architecture/pull/852)
+* Fix the superuser verify missing auth by [@wu-clan](https://github.com/wu-clan) in [#854](https://github.com/fastapi-practices/fastapi_best_architecture/pull/854)
+* Update request state usage to context variable by [@wu-clan](https://github.com/wu-clan) in [#853](https://github.com/fastapi-practices/fastapi_best_architecture/pull/853)
+* Fix safely of access ctx in exception handlers by [@wu-clan](https://github.com/wu-clan) in [#855](https://github.com/fastapi-practices/fastapi_best_architecture/pull/855)
+* Refactor the service layer db session call method by [@wu-clan](https://github.com/wu-clan) in [#850](https://github.com/fastapi-practices/fastapi_best_architecture/pull/850)
+
+
+**Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.8.3...v1.9.0
+
+## Contributors
+
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
+[Changes][v1.9.0]
+
+
+<a id="v1.8.3"></a>
+# [v1.8.3](https://github.com/fastapi-practices/fastapi_best_architecture/releases/tag/v1.8.3) - 2025-10-13
+
+## What's Changed
+* Update changelog for v1.8.2 by [@wu-clan](https://github.com/wu-clan) in [#841](https://github.com/fastapi-practices/fastapi_best_architecture/pull/841)
+* Fix the pgsql script in dict plugin by [@wu-clan](https://github.com/wu-clan) in [#842](https://github.com/fastapi-practices/fastapi_best_architecture/pull/842)
+* Fix SQL script syntax error in config plugin by [@wu-clan](https://github.com/wu-clan) in [#843](https://github.com/fastapi-practices/fastapi_best_architecture/pull/843)
+* Bump dependencies and pre-commits by [@wu-clan](https://github.com/wu-clan) in [#845](https://github.com/fastapi-practices/fastapi_best_architecture/pull/845)
+* Update the ruff rules and format the code by [@wu-clan](https://github.com/wu-clan) in [#846](https://github.com/fastapi-practices/fastapi_best_architecture/pull/846)
+* Bump fastapi and sqlalchemy to support python 3.14 by [@wu-clan](https://github.com/wu-clan) in [#847](https://github.com/fastapi-practices/fastapi_best_architecture/pull/847)
+* Bump sqlalchemy-crud-plus from 0.12.0 to 0.12.1 by [@wu-clan](https://github.com/wu-clan) in [#848](https://github.com/fastapi-practices/fastapi_best_architecture/pull/848)
+
+
+**Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.8.2...v1.8.3
+
+## Contributors
+
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
+[Changes][v1.8.3]
+
+
+<a id="v1.8.2"></a>
+# [v1.8.2](https://github.com/fastapi-practices/fastapi_best_architecture/releases/tag/v1.8.2) - 2025-09-26
+
+## What's Changed
+* Update changelog for v1.8.1 by [@wu-clan](https://github.com/wu-clan) in [#804](https://github.com/fastapi-practices/fastapi_best_architecture/pull/804)
+* Update the swagger docs version to dynamic by [@wu-clan](https://github.com/wu-clan) in [#805](https://github.com/fastapi-practices/fastapi_best_architecture/pull/805)
+* Fix the subprocess ensurepip got stuck in Linux by [@byte-voyager](https://github.com/byte-voyager) in [#806](https://github.com/fastapi-practices/fastapi_best_architecture/pull/806)
+* Update the offline location information parse by [@wu-clan](https://github.com/wu-clan) in [#807](https://github.com/fastapi-practices/fastapi_best_architecture/pull/807)
+* Fix pgsql syntax error in code generation by [@byte-voyager](https://github.com/byte-voyager) in [#808](https://github.com/fastapi-practices/fastapi_best_architecture/pull/808)
+* Fix summary default in opera log middleware by [@wu-clan](https://github.com/wu-clan) in [#809](https://github.com/fastapi-practices/fastapi_best_architecture/pull/809)
+* Fix special character password support in alembic by [@MortyZhaoy](https://github.com/MortyZhaoy) in [#811](https://github.com/fastapi-practices/fastapi_best_architecture/pull/811)
+* Update the startup progress information display by [@wu-clan](https://github.com/wu-clan) in [#812](https://github.com/fastapi-practices/fastapi_best_architecture/pull/812)
+* Update the login captcha verify logic by [@wu-clan](https://github.com/wu-clan) in [#815](https://github.com/fastapi-practices/fastapi_best_architecture/pull/815)
+* Fix the summary in opera log middleware by [@wu-clan](https://github.com/wu-clan) in [#816](https://github.com/fastapi-practices/fastapi_best_architecture/pull/816)
+* Update the dict plugin table structure by [@wu-clan](https://github.com/wu-clan) in [#817](https://github.com/fastapi-practices/fastapi_best_architecture/pull/817)
+* Add version number output to the startup CLI by [@wu-clan](https://github.com/wu-clan) in [#820](https://github.com/fastapi-practices/fastapi_best_architecture/pull/820)
+* Update the user agent in opera log model by [@wu-clan](https://github.com/wu-clan) in [#831](https://github.com/fastapi-practices/fastapi_best_architecture/pull/831)
+* Fix code generation template missing Decimal by [@wu-clan](https://github.com/wu-clan) in [#830](https://github.com/fastapi-practices/fastapi_best_architecture/pull/830)
+* Fix the get model object method return logic by [@wu-clan](https://github.com/wu-clan) in [#832](https://github.com/fastapi-practices/fastapi_best_architecture/pull/832)
+* Simplify the code generation CLI parameters by [@wu-clan](https://github.com/wu-clan) in [#837](https://github.com/fastapi-practices/fastapi_best_architecture/pull/837)
+* Add the refresh token to demo mode exclusion by [@wu-clan](https://github.com/wu-clan) in [#834](https://github.com/fastapi-practices/fastapi_best_architecture/pull/834)
+* Add extension parameters to paging data by [@wu-clan](https://github.com/wu-clan) in [#835](https://github.com/fastapi-practices/fastapi_best_architecture/pull/835)
+* Fix the phone filter in the user list by [@wu-clan](https://github.com/wu-clan) in [#838](https://github.com/fastapi-practices/fastapi_best_architecture/pull/838)
+* Update docker and deployment script comments by [@wu-clan](https://github.com/wu-clan) in [#839](https://github.com/fastapi-practices/fastapi_best_architecture/pull/839)
+* Update the version number to 1.8.2 by [@wu-clan](https://github.com/wu-clan) in [#840](https://github.com/fastapi-practices/fastapi_best_architecture/pull/840)
+
+## New Contributors
+* [@byte-voyager](https://github.com/byte-voyager) made their first contribution in [#806](https://github.com/fastapi-practices/fastapi_best_architecture/pull/806)
+* [@MortyZhaoy](https://github.com/MortyZhaoy) made their first contribution in [#811](https://github.com/fastapi-practices/fastapi_best_architecture/pull/811)
+
+**Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.8.1...v1.8.2
+
+## Contributors
+
+<a href="https://github.com/MortyZhaoy"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2FMortyZhaoy.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@MortyZhaoy"></a>
+<a href="https://github.com/byte-voyager"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fbyte-voyager.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@byte-voyager"></a>
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
+[Changes][v1.8.2]
+
+
+<a id="v1.8.1"></a>
+# [v1.8.1](https://github.com/fastapi-practices/fastapi_best_architecture/releases/tag/v1.8.1) - 2025-09-09
+
+## What's Changed
+* Update changelog for v1.8.0 by [@wu-clan](https://github.com/wu-clan) in [#772](https://github.com/fastapi-practices/fastapi_best_architecture/pull/772)
+* Optimize the celery crontab expression validation by [@yanlingsishao](https://github.com/yanlingsishao) in [#773](https://github.com/fastapi-practices/fastapi_best_architecture/pull/773)
+* Add bulk update interface for config plugin by [@wu-clan](https://github.com/wu-clan) in [#774](https://github.com/fastapi-practices/fastapi_best_architecture/pull/774)
+* Optimize email sending config update logic by [@wu-clan](https://github.com/wu-clan) in [#775](https://github.com/fastapi-practices/fastapi_best_architecture/pull/775)
+* Add test data SQL script for config plugin by [@wu-clan](https://github.com/wu-clan) in [#776](https://github.com/fastapi-practices/fastapi_best_architecture/pull/776)
+* Update the env parameter value in env file by [@wu-clan](https://github.com/wu-clan) in [#777](https://github.com/fastapi-practices/fastapi_best_architecture/pull/777)
+* Fix the docker compose env configuration file by [@wu-clan](https://github.com/wu-clan) in [#778](https://github.com/fastapi-practices/fastapi_best_architecture/pull/778)
+* Fix redis client not close after plugin parse by [@wu-clan](https://github.com/wu-clan) in [#780](https://github.com/fastapi-practices/fastapi_best_architecture/pull/780)
+* Fix the celery beat distributed lock timeout by [@wu-clan](https://github.com/wu-clan) in [#779](https://github.com/fastapi-practices/fastapi_best_architecture/pull/779)
+* Fix the plugin model object detection logic by [@wuyao4](https://github.com/wuyao4) in [#782](https://github.com/fastapi-practices/fastapi_best_architecture/pull/782)
+* Update the celery task result table creation logic by [@wu-clan](https://github.com/wu-clan) in [#783](https://github.com/fastapi-practices/fastapi_best_architecture/pull/783)
+* Fix code generation template params and filename by [@wu-clan](https://github.com/wu-clan) in [#784](https://github.com/fastapi-practices/fastapi_best_architecture/pull/784)
+* Fix CLI openapi url in production environment by [@siyue-wang](https://github.com/siyue-wang) in [#785](https://github.com/fastapi-practices/fastapi_best_architecture/pull/785)
+* Update the model datetime column type to custom by [@wu-clan](https://github.com/wu-clan) in [#786](https://github.com/fastapi-practices/fastapi_best_architecture/pull/786)
+* Update the opera log exception message record by [@wu-clan](https://github.com/wu-clan) in [#788](https://github.com/fastapi-practices/fastapi_best_architecture/pull/788)
+* Update the handling of CORS 500 status code by [@wu-clan](https://github.com/wu-clan) in [#789](https://github.com/fastapi-practices/fastapi_best_architecture/pull/789)
+* Add the Google OAuth2 login by [@wu-clan](https://github.com/wu-clan) in [#790](https://github.com/fastapi-practices/fastapi_best_architecture/pull/790)
+* Fix the tzinfo comparison in the timezone type by [@IAseven](https://github.com/IAseven) in [#787](https://github.com/fastapi-practices/fastapi_best_architecture/pull/787)
+* Bump dependencies and pre-commits by [@wu-clan](https://github.com/wu-clan) in [#791](https://github.com/fastapi-practices/fastapi_best_architecture/pull/791)
+* Update the notice model and pagination by [@wu-clan](https://github.com/wu-clan) in [#792](https://github.com/fastapi-practices/fastapi_best_architecture/pull/792)
+* Add the dict type query all interface by [@wu-clan](https://github.com/wu-clan) in [#794](https://github.com/fastapi-practices/fastapi_best_architecture/pull/794)
+* Fix sql script syntax error in config plugin by [@wu-clan](https://github.com/wu-clan) in [#793](https://github.com/fastapi-practices/fastapi_best_architecture/pull/793)
+* Fix the psycopg dependency naming by [@wu-clan](https://github.com/wu-clan) in [#795](https://github.com/fastapi-practices/fastapi_best_architecture/pull/795)
+* Add schema for the tree data by [@wu-clan](https://github.com/wu-clan) in [#796](https://github.com/fastapi-practices/fastapi_best_architecture/pull/796)
+* Add the code generator to the CLI by [@wu-clan](https://github.com/wu-clan) in [#798](https://github.com/fastapi-practices/fastapi_best_architecture/pull/798)
+* Optimize the code generation interaction logic by [@wu-clan](https://github.com/wu-clan) in [#799](https://github.com/fastapi-practices/fastapi_best_architecture/pull/799)
+* Fix console import in main module by [@wu-clan](https://github.com/wu-clan) in [#800](https://github.com/fastapi-practices/fastapi_best_architecture/pull/800)
+* Fix the subprocess check call failed in windows by [@yzbf-lin](https://github.com/yzbf-lin) in [#802](https://github.com/fastapi-practices/fastapi_best_architecture/pull/802)
+* Fix alembic migration file missing import by [@wu-clan](https://github.com/wu-clan) in [#803](https://github.com/fastapi-practices/fastapi_best_architecture/pull/803)
+
+## New Contributors
+* [@yanlingsishao](https://github.com/yanlingsishao) made their first contribution in [#773](https://github.com/fastapi-practices/fastapi_best_architecture/pull/773)
+* [@wuyao4](https://github.com/wuyao4) made their first contribution in [#782](https://github.com/fastapi-practices/fastapi_best_architecture/pull/782)
+* [@siyue-wang](https://github.com/siyue-wang) made their first contribution in [#785](https://github.com/fastapi-practices/fastapi_best_architecture/pull/785)
+
+**Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.8.0...v1.8.1
+
+## Contributors
+
+<a href="https://github.com/IAseven"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2FIAseven.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@IAseven"></a>
+<a href="https://github.com/siyue-wang"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fsiyue-wang.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@siyue-wang"></a>
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+<a href="https://github.com/wuyao4"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwuyao4.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wuyao4"></a>
+<a href="https://github.com/yanlingsishao"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fyanlingsishao.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@yanlingsishao"></a>
+<a href="https://github.com/yzbf-lin"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fyzbf-lin.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@yzbf-lin"></a>
+
+[Changes][v1.8.1]
+
+
+<a id="v1.8.0"></a>
+# [v1.8.0](https://github.com/fastapi-practices/fastapi_best_architecture/releases/tag/v1.8.0) - 2025-08-15
+
+## What's Changed
+* Update changelog for v1.7.0 by [@wu-clan](https://github.com/wu-clan) in [#729](https://github.com/fastapi-practices/fastapi_best_architecture/pull/729)
+* Simplify task crontab expression validation by [@wu-clan](https://github.com/wu-clan) in [#733](https://github.com/fastapi-practices/fastapi_best_architecture/pull/733)
+* Add distributed lock for scheduled task by [@wu-clan](https://github.com/wu-clan) in [#732](https://github.com/fastapi-practices/fastapi_best_architecture/pull/732)
+* Update the default cache period for userinfo by [@wu-clan](https://github.com/wu-clan) in [#734](https://github.com/fastapi-practices/fastapi_best_architecture/pull/734)
+* Fix celery CLI option to required by [@wu-clan](https://github.com/wu-clan) in [#737](https://github.com/fastapi-practices/fastapi_best_architecture/pull/737)
+* Add auth whitelist regular expression config by [@wu-clan](https://github.com/wu-clan) in [#738](https://github.com/fastapi-practices/fastapi_best_architecture/pull/738)
+* Fix the opera log field encryption by [@wu-clan](https://github.com/wu-clan) in [#739](https://github.com/fastapi-practices/fastapi_best_architecture/pull/739)
+* Update the OAuth2 login password policy by [@wu-clan](https://github.com/wu-clan) in [#741](https://github.com/fastapi-practices/fastapi_best_architecture/pull/741)
+* Add update support for user email and phone by [@wu-clan](https://github.com/wu-clan) in [#742](https://github.com/fastapi-practices/fastapi_best_architecture/pull/742)
+* Fix the error trigger when model auto import by [@wu-clan](https://github.com/wu-clan) in [#743](https://github.com/fastapi-practices/fastapi_best_architecture/pull/743)
+* Simplify the plugin status update logic by [@wu-clan](https://github.com/wu-clan) in [#744](https://github.com/fastapi-practices/fastapi_best_architecture/pull/744)
+* Add some interfaces for user profiles by [@wu-clan](https://github.com/wu-clan) in [#745](https://github.com/fastapi-practices/fastapi_best_architecture/pull/745)
+* Add schedule task demo that contains params by [@wu-clan](https://github.com/wu-clan) in [#746](https://github.com/fastapi-practices/fastapi_best_architecture/pull/746)
+* Fix the kwargs params of schedule task by [@wu-clan](https://github.com/wu-clan) in [#747](https://github.com/fastapi-practices/fastapi_best_architecture/pull/747)
+* Refactor code generation files and routes by [@wu-clan](https://github.com/wu-clan) in [#748](https://github.com/fastapi-practices/fastapi_best_architecture/pull/748)
+* Refactor task routes and add control routes by [@wu-clan](https://github.com/wu-clan) in [#749](https://github.com/fastapi-practices/fastapi_best_architecture/pull/749)
+* Fix message format in validation exception handler by [@wu-clan](https://github.com/wu-clan) in [#755](https://github.com/fastapi-practices/fastapi_best_architecture/pull/755)
+* Update the opera log desensitization method by [@wu-clan](https://github.com/wu-clan) in [#756](https://github.com/fastapi-practices/fastapi_best_architecture/pull/756)
+* Add business pagination in the code generator by [@wu-clan](https://github.com/wu-clan) in [#757](https://github.com/fastapi-practices/fastapi_best_architecture/pull/757)
+* Optimize the data sort logic of tree nodes by [@wu-clan](https://github.com/wu-clan) in [#758](https://github.com/fastapi-practices/fastapi_best_architecture/pull/758)
+* Update log output config and format by [@wu-clan](https://github.com/wu-clan) in [#759](https://github.com/fastapi-practices/fastapi_best_architecture/pull/759)
+* Update the naming of table creation function by [@wu-clan](https://github.com/wu-clan) in [#760](https://github.com/fastapi-practices/fastapi_best_architecture/pull/760)
+* Optimize the opera log storage logic through queue by [@IAseven](https://github.com/IAseven) in [#750](https://github.com/fastapi-practices/fastapi_best_architecture/pull/750)
+* Optimize naming and preview in code generation by [@wu-clan](https://github.com/wu-clan) in [#764](https://github.com/fastapi-practices/fastapi_best_architecture/pull/764)
+* Update the description for the run file by [@wu-clan](https://github.com/wu-clan) in [#766](https://github.com/fastapi-practices/fastapi_best_architecture/pull/766)
+* Optimize the timezone datetime return encoder by [@wu-clan](https://github.com/wu-clan) in [#767](https://github.com/fastapi-practices/fastapi_best_architecture/pull/767)
+* Update the content layout of the config file by [@wu-clan](https://github.com/wu-clan) in [#768](https://github.com/fastapi-practices/fastapi_best_architecture/pull/768)
+* Add a standalone email sending plugin by [@wu-clan](https://github.com/wu-clan) in [#769](https://github.com/fastapi-practices/fastapi_best_architecture/pull/769)
+* Add i18n support for response message by [@downdawn](https://github.com/downdawn) in [#753](https://github.com/fastapi-practices/fastapi_best_architecture/pull/753)
+* Update the menu title in SQL scripts by [@wu-clan](https://github.com/wu-clan) in [#770](https://github.com/fastapi-practices/fastapi_best_architecture/pull/770)
+* Update the version number to 1.8.0 by [@wu-clan](https://github.com/wu-clan) in [#771](https://github.com/fastapi-practices/fastapi_best_architecture/pull/771)
+
+## New Contributors
+* [@IAseven](https://github.com/IAseven) made their first contribution in [#750](https://github.com/fastapi-practices/fastapi_best_architecture/pull/750)
+
+**Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.7.0...v1.8.0
+
+## Contributors
+
+<a href="https://github.com/IAseven"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2FIAseven.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@IAseven"></a>
+<a href="https://github.com/downdawn"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fdowndawn.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@downdawn"></a>
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
+[Changes][v1.8.0]
+
+
+<a id="v1.7.0"></a>
+# [v1.7.0](https://github.com/fastapi-practices/fastapi_best_architecture/releases/tag/v1.7.0) - 2025-07-16
+
+## What's Changed
+* Update the changelog for v1.6.0 by [@wu-clan](https://github.com/wu-clan) in [#703](https://github.com/fastapi-practices/fastapi_best_architecture/pull/703)
+* Update the CLI to be executed async by [@wu-clan](https://github.com/wu-clan) in [#704](https://github.com/fastapi-practices/fastapi_best_architecture/pull/704)
+* Fix the code generation schema template by [@wu-clan](https://github.com/wu-clan) in [#706](https://github.com/fastapi-practices/fastapi_best_architecture/pull/706)
+* Replace gunicorn deployment to granian by [@wu-clan](https://github.com/wu-clan) in [#705](https://github.com/fastapi-practices/fastapi_best_architecture/pull/705)
+* Fix the code generation delete schema template by [@wu-clan](https://github.com/wu-clan) in [#708](https://github.com/fastapi-practices/fastapi_best_architecture/pull/708)
+* Update the refresh token verify mechanism by [@wu-clan](https://github.com/wu-clan) in [#710](https://github.com/fastapi-practices/fastapi_best_architecture/pull/710)
+* Update the reload excludes for CLI run by [@wu-clan](https://github.com/wu-clan) in [#709](https://github.com/fastapi-practices/fastapi_best_architecture/pull/709)
+* Add CLI support for execute sql scripts by [@wu-clan](https://github.com/wu-clan) in [#711](https://github.com/fastapi-practices/fastapi_best_architecture/pull/711)
+* Update the granian env to command params by [@wu-clan](https://github.com/wu-clan) in [#712](https://github.com/fastapi-practices/fastapi_best_architecture/pull/712)
+* Update the middleware logging accuracy by [@wu-clan](https://github.com/wu-clan) in [#713](https://github.com/fastapi-practices/fastapi_best_architecture/pull/713)
+* Update the log output default style by [@wu-clan](https://github.com/wu-clan) in [#714](https://github.com/fastapi-practices/fastapi_best_architecture/pull/714)
+* Optimize the analysis of get plugins by [@wu-clan](https://github.com/wu-clan) in [#716](https://github.com/fastapi-practices/fastapi_best_architecture/pull/716)
+* Simplify user permission database queries by [@wu-clan](https://github.com/wu-clan) in [#717](https://github.com/fastapi-practices/fastapi_best_architecture/pull/717)
+* Update the CLI startup service mode by [@wu-clan](https://github.com/wu-clan) in [#718](https://github.com/fastapi-practices/fastapi_best_architecture/pull/718)
+* Add support for celery dynamic tasks by [@wu-clan](https://github.com/wu-clan) in [#715](https://github.com/fastapi-practices/fastapi_best_architecture/pull/715)
+* Fix the celery task scheduler query by [@wu-clan](https://github.com/wu-clan) in [#719](https://github.com/fastapi-practices/fastapi_best_architecture/pull/719)
+* Update the celery task comment and name by [@wu-clan](https://github.com/wu-clan) in [#720](https://github.com/fastapi-practices/fastapi_best_architecture/pull/720)
+* Optimize celery integrations and events by [@wu-clan](https://github.com/wu-clan) in [#721](https://github.com/fastapi-practices/fastapi_best_architecture/pull/721)
+* Simplify celery task crontab config by [@wu-clan](https://github.com/wu-clan) in [#722](https://github.com/fastapi-practices/fastapi_best_architecture/pull/722)
+* Delete the default value of schema enum data by [@wu-clan](https://github.com/wu-clan) in [#723](https://github.com/fastapi-practices/fastapi_best_architecture/pull/723)
+* Fix the parsing of execution task params by [@wu-clan](https://github.com/wu-clan) in [#725](https://github.com/fastapi-practices/fastapi_best_architecture/pull/725)
+* Bump granian from 2.4.0 to 2.4.2 by [@wu-clan](https://github.com/wu-clan) in [#727](https://github.com/fastapi-practices/fastapi_best_architecture/pull/727)
+* Add CLI support for startup celery services by [@wu-clan](https://github.com/wu-clan) in [#724](https://github.com/fastapi-practices/fastapi_best_architecture/pull/724)
+* Fix login and operation log clearing by [@wu-clan](https://github.com/wu-clan) in [#728](https://github.com/fastapi-practices/fastapi_best_architecture/pull/728)
+
+
+**Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.6.0...v1.7.0
+
+## Contributors
+
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
+[Changes][v1.7.0]
+
+
+<a id="v1.6.0"></a>
+# [v1.6.0](https://github.com/fastapi-practices/fastapi_best_architecture/releases/tag/v1.6.0) - 2025-06-30
+
+## What's Changed
+* Update changelog for v1.5.2 by [@wu-clan](https://github.com/wu-clan) in [#690](https://github.com/fastapi-practices/fastapi_best_architecture/pull/690)
+* Optimize dict create and update logic by [@wu-clan](https://github.com/wu-clan) in [#691](https://github.com/fastapi-practices/fastapi_best_architecture/pull/691)
+* Fix the OAuth2 redirect route names by [@wu-clan](https://github.com/wu-clan) in [#693](https://github.com/fastapi-practices/fastapi_best_architecture/pull/693)
+* Update the SQL to adapt frontend plugin by [@wu-clan](https://github.com/wu-clan) in [#694](https://github.com/fastapi-practices/fastapi_best_architecture/pull/694)
+* Update the extension plugin config by [@wu-clan](https://github.com/wu-clan) in [#695](https://github.com/fastapi-practices/fastapi_best_architecture/pull/695)
+* Add the test user to SQL scripts by [@wu-clan](https://github.com/wu-clan) in [#696](https://github.com/fastapi-practices/fastapi_best_architecture/pull/696)
+* Add custom CLI for service startup by [@wu-clan](https://github.com/wu-clan) in [#697](https://github.com/fastapi-practices/fastapi_best_architecture/pull/697)
+* Add CLI support for plugin install by [@wu-clan](https://github.com/wu-clan) in [#698](https://github.com/fastapi-practices/fastapi_best_architecture/pull/698)
+* Update the help for CLI run worker by [@wu-clan](https://github.com/wu-clan) in [#699](https://github.com/fastapi-practices/fastapi_best_architecture/pull/699)
+* Optimize the installation of plugin dependencies by [@wu-clan](https://github.com/wu-clan) in [#700](https://github.com/fastapi-practices/fastapi_best_architecture/pull/700)
+* Update the Dockerfile to adapt latest code by [@wu-clan](https://github.com/wu-clan) in [#701](https://github.com/fastapi-practices/fastapi_best_architecture/pull/701)
+* Update the version number to 1.6.0 by [@wu-clan](https://github.com/wu-clan) in [#702](https://github.com/fastapi-practices/fastapi_best_architecture/pull/702)
+
+
+**Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.5.2...v1.6.0
+
+## Contributors
+
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
+[Changes][v1.6.0]
+
+
 <a id="v1.5.2"></a>
 # [v1.5.2](https://github.com/fastapi-practices/fastapi_best_architecture/releases/tag/v1.5.2) - 2025-06-24
 
@@ -21,6 +317,11 @@
 
 **Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.5.1...v1.5.2
 
+## Contributors
+
+<a href="https://github.com/downdawn"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fdowndawn.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@downdawn"></a>
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
 [Changes][v1.5.2]
 
 
@@ -37,6 +338,11 @@
 
 **Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.5.0...v1.5.1
 
+## Contributors
+
+<a href="https://github.com/downdawn"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fdowndawn.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@downdawn"></a>
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
 [Changes][v1.5.1]
 
 
@@ -60,6 +366,10 @@
 
 **Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.4.3...v1.5.0
 
+## Contributors
+
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
 [Changes][v1.5.0]
 
 
@@ -81,6 +391,10 @@
 
 **Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.4.2...v1.4.3
 
+## Contributors
+
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
 [Changes][v1.4.3]
 
 
@@ -102,6 +416,11 @@
 
 **Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.4.1...v1.4.2
 
+## Contributors
+
+<a href="https://github.com/huyuwei1996"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fhuyuwei1996.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@huyuwei1996"></a>
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
 [Changes][v1.4.2]
 
 
@@ -119,6 +438,10 @@
 
 **Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.4.0...v1.4.1
 
+## Contributors
+
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
 [Changes][v1.4.1]
 
 
@@ -140,6 +463,10 @@
 
 **Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.3.0...v1.4.0
 
+## Contributors
+
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
 [Changes][v1.4.0]
 
 
@@ -157,6 +484,10 @@
 
 **Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.2.0...v1.3.0
 
+## Contributors
+
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
 [Changes][v1.3.0]
 
 
@@ -174,6 +505,10 @@
 
 **Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.1.2...v1.2.0
 
+## Contributors
+
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
 [Changes][v1.2.0]
 
 
@@ -191,6 +526,10 @@
 
 **Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.1.1...v1.1.2
 
+## Contributors
+
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
 [Changes][v1.1.2]
 
 
@@ -205,6 +544,10 @@
 
 **Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.1.0...v1.1.1
 
+## Contributors
+
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
 [Changes][v1.1.1]
 
 
@@ -224,6 +567,11 @@
 
 **Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.0.5...v1.1.0
 
+## Contributors
+
+<a href="https://github.com/huyuwei1996"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fhuyuwei1996.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@huyuwei1996"></a>
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
 [Changes][v1.1.0]
 
 
@@ -248,6 +596,10 @@
 
 **Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.0.4...v1.0.5
 
+## Contributors
+
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
 [Changes][v1.0.5]
 
 
@@ -276,6 +628,12 @@
 
 **Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.0.3...v1.0.4
 
+## Contributors
+
+<a href="https://github.com/PoetryL"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2FPoetryL.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@PoetryL"></a>
+<a href="https://github.com/ThankCat"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2FThankCat.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@ThankCat"></a>
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
 [Changes][v1.0.4]
 
 
@@ -294,6 +652,11 @@
 
 **Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.0.2...v1.0.3
 
+## Contributors
+
+<a href="https://github.com/huyuwei1996"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fhuyuwei1996.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@huyuwei1996"></a>
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
 [Changes][v1.0.3]
 
 
@@ -309,6 +672,10 @@
 
 **Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.0.1...v1.0.2
 
+## Contributors
+
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
 [Changes][v1.0.2]
 
 
@@ -328,6 +695,11 @@
 
 **Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.0.0...v1.0.1
 
+## Contributors
+
+<a href="https://github.com/huyuwei1996"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fhuyuwei1996.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@huyuwei1996"></a>
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+
 [Changes][v1.0.1]
 
 
@@ -653,9 +1025,29 @@
 
 **Full Changelog**: https://github.com/fastapi-practices/fastapi_best_architecture/commits/v1.0.0
 
+## Contributors
+
+<a href="https://github.com/Meepoljdx"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2FMeepoljdx.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@Meepoljdx"></a>
+<a href="https://github.com/dependabot"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fdependabot.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@dependabot"></a>
+<a href="https://github.com/dividduang"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fdividduang.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@dividduang"></a>
+<a href="https://github.com/downdawn"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fdowndawn.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@downdawn"></a>
+<a href="https://github.com/obrua"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fobrua.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@obrua"></a>
+<a href="https://github.com/qhp13654398483"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fqhp13654398483.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@qhp13654398483"></a>
+<a href="https://github.com/wu-clan"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fwu-clan.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@wu-clan"></a>
+<a href="https://github.com/yshan2028"><img src="https://wsrv.nl/?url=https%3A%2F%2Fgithub.com%2Fyshan2028.png&w=128&h=128&fit=cover&mask=circle" width="64" height="64" alt="@yshan2028"></a>
+
 [Changes][v1.0.0]
 
 
+[v1.10.1]: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.10.0...v1.10.1
+[v1.10.0]: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.9.0...v1.10.0
+[v1.9.0]: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.8.3...v1.9.0
+[v1.8.3]: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.8.2...v1.8.3
+[v1.8.2]: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.8.1...v1.8.2
+[v1.8.1]: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.8.0...v1.8.1
+[v1.8.0]: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.7.0...v1.8.0
+[v1.7.0]: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.6.0...v1.7.0
+[v1.6.0]: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.5.2...v1.6.0
 [v1.5.2]: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.5.1...v1.5.2
 [v1.5.1]: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.5.0...v1.5.1
 [v1.5.0]: https://github.com/fastapi-practices/fastapi_best_architecture/compare/v1.4.3...v1.5.0

Dockerfile

@@ -38,25 +38,23 @@ COPY --from=builder /usr/local /usr/local
 
 COPY deploy/backend/supervisord.conf /etc/supervisor/supervisord.conf
 
+WORKDIR /fba/backend
+
 # === FastAPI server image ===
 FROM base_server AS fastapi_server
 
-WORKDIR /fba
+COPY deploy/backend/fba_server.conf /etc/supervisor/conf.d/
-
-COPY deploy/backend/fastapi_server.conf /etc/supervisor/conf.d/
 
 RUN mkdir -p /var/log/fastapi_server
 
 EXPOSE 8001
 
-CMD ["uvicorn", "backend.main:app", "--host", "0.0.0.0", "--port","8000"]
+CMD ["/usr/local/bin/granian", "main:app", "--interface", "asgi", "--host", "0.0.0.0", "--port","8000"]
 
 # === Celery server image ===
 FROM base_server AS celery
 
-WORKDIR /fba/backend
+COPY deploy/backend/fba_celery.conf /etc/supervisor/conf.d/
-
-COPY deploy/backend/celery.conf /etc/supervisor/conf.d/
 
 RUN mkdir -p /var/log/celery
 

backend/.env.example

@@ -1,10 +1,10 @@
-# Env: dev、pro
+# Env
 ENVIRONMENT='dev'
 # Database
-DATABASE_TYPE='mysql'
+DATABASE_TYPE='postgresql'
 DATABASE_HOST='127.0.0.1'
-DATABASE_PORT=3306
+DATABASE_PORT=5432
-DATABASE_USER='root'
+DATABASE_USER='postgres'
 DATABASE_PASSWORD='123456'
 # Redis
 REDIS_HOST='127.0.0.1'
@@ -15,18 +15,21 @@ REDIS_DATABASE=0
 TOKEN_SECRET_KEY='1VkVF75nsNABBjK_7-qz7GtzNy3AMvktc9TCPwKczCk'
 # Opera Log
 OPERA_LOG_ENCRYPT_SECRET_KEY='d77b25790a804c2b4a339dd0207941e4cefa5751935a33735bc73bb7071a005b'
-# App Admin
+# [ App ] task
-# OAuth2
-OAUTH2_GITHUB_CLIENT_ID='test'
-OAUTH2_GITHUB_CLIENT_SECRET='test'
-OAUTH2_LINUX_DO_CLIENT_ID='test'
-OAUTH2_LINUX_DO_CLIENT_SECRET='test'
-# App Task
 # Celery
 CELERY_BROKER_REDIS_DATABASE=1
-CELERY_BACKEND_REDIS_DATABASE=2
 # Rabbitmq
 CELERY_RABBITMQ_HOST='127.0.0.1'
 CELERY_RABBITMQ_PORT=5672
 CELERY_RABBITMQ_USERNAME='guest'
 CELERY_RABBITMQ_PASSWORD='guest'
+# [ Plugin ] oauth2
+OAUTH2_GITHUB_CLIENT_ID='test'
+OAUTH2_GITHUB_CLIENT_SECRET='test'
+OAUTH2_GOOGLE_CLIENT_ID='test'
+OAUTH2_GOOGLE_CLIENT_SECRET='test'
+OAUTH2_LINUX_DO_CLIENT_ID='test'
+OAUTH2_LINUX_DO_CLIENT_SECRET='test'
+# [ Plugin ] email
+EMAIL_USERNAME=''
+EMAIL_PASSWORD=''

backend/.ruff.toml

@@ -1,55 +0,0 @@
-line-length = 120
-cache-dir = ".ruff_cache"
-target-version = "py310"
-unsafe-fixes = true
-show-fixes = true
-
-[lint]
-select = [
-    "E",
-    "F",
-    "I",
-    "TC",
-    # W
-    "W505",
-    # PT
-    "PT018",
-    # SIM
-    "SIM101",
-    "SIM114",
-    # PGH
-    "PGH004",
-    # PL
-    "PLE1142",
-    # RUF
-    "RUF100",
-    # UP
-    "UP007"
-]
-preview = true
-ignore = ["FURB101"]
-
-[lint.flake8-pytest-style]
-mark-parentheses = false
-parametrize-names-type = "list"
-parametrize-values-row-type = "list"
-parametrize-values-type = "tuple"
-
-[lint.flake8-unused-arguments]
-ignore-variadic-names = true
-
-[lint.isort]
-lines-between-types = 1
-order-by-type = true
-
-[lint.per-file-ignores]
-"**/api/v1/*.py" = ["TC"]
-"**/model/*.py" = ["TC003"]
-"**/model/__init__.py" = ["F401"]
-"**/tests/*.py" = ["E402"]
-
-[format]
-preview = true
-quote-style = "single"
-docstring-code-format = true
-skip-magic-trailing-comma = false

backend/__init__.py

@@ -1,9 +1,7 @@
-#!/usr/bin/env python3
+from backend.common.i18n import i18n
-# -*- coding: utf-8 -*-
-from backend.utils.console import console
 
-__version__ = '1.6.0'
+__version__ = '1.10.2'
 
 
-def get_version() -> str | None:
+# 初始化 i18n
-    console.print(f'[cyan]{__version__}[/]')
+i18n.load_locales()

backend/alembic/env.py

@@ -1,9 +1,6 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-# ruff: noqa: F403, F401, I001, RUF100
 import asyncio
 import os
-import sys
+
 from logging.config import fileConfig
 
 from alembic import context
@@ -11,23 +8,16 @@ from sqlalchemy import pool
 from sqlalchemy.engine import Connection
 from sqlalchemy.ext.asyncio import async_engine_from_config
 
-sys.path.append('../')
+from backend.app import get_app_models
-
 from backend.common.model import MappedBase
 from backend.core import path_conf
 from backend.database.db import SQLALCHEMY_DATABASE_URL
 from backend.plugin.tools import get_plugin_models
 
-# import your new model here
+# import models
-from backend.app.admin.model import *  # noqa: F401
+for cls in get_app_models() + get_plugin_models():
-from backend.plugin.code_generator.model import *  # noqa: F401
-
-# import plugin model
-for cls in get_plugin_models():
     class_name = cls.__name__
-    if class_name in globals():
+    if class_name not in globals():
-        print(f'\nWarning: Class "{class_name}" already exists in global namespace.')
-    else:
         globals()[class_name] = cls
 
 if not os.path.exists(path_conf.ALEMBIC_VERSION_DIR):
@@ -47,10 +37,13 @@ if alembic_config.config_file_name is not None:
 target_metadata = MappedBase.metadata
 
 # other values from the config, defined by the needs of env.py,
-alembic_config.set_main_option('sqlalchemy.url', SQLALCHEMY_DATABASE_URL.render_as_string(hide_password=False))
+alembic_config.set_main_option(
+    'sqlalchemy.url',
+    SQLALCHEMY_DATABASE_URL.render_as_string(hide_password=False).replace('%', '%%'),
+)
 
 
-def run_migrations_offline():
+def run_migrations_offline() -> None:
     """Run migrations in 'offline' mode.
 
     This configures the context with just a URL
@@ -79,7 +72,7 @@ def run_migrations_offline():
 
 def do_run_migrations(connection: Connection) -> None:
     # 当迁移无变化时，不生成迁移记录
-    def process_revision_directives(context, revision, directives):
+    def process_revision_directives(context, revision, directives) -> None:  # noqa: ANN001
         if alembic_config.cmd_opts.autogenerate:
             script = directives[0]
             if script.upgrade_ops.is_empty():

backend/alembic/script.py.mako

@@ -7,6 +7,7 @@ Create Date: ${create_date}
 """
 from alembic import op
 import sqlalchemy as sa
+import backend.common.model
 ${imports if imports else ""}
 
 # revision identifiers, used by Alembic.

backend/app/__init__.py

@@ -1,2 +1,28 @@
-#!/usr/bin/env python3
+import os.path
-# -*- coding: utf-8 -*-
+
+from backend.core.path_conf import BASE_PATH
+from backend.utils.import_parse import get_model_objects
+
+
+def get_app_models() -> list[type]:
+    """获取 app 所有模型类"""
+    app_path = BASE_PATH / 'app'
+    list_dirs = os.listdir(app_path)
+
+    apps = [d for d in list_dirs if os.path.isdir(os.path.join(app_path, d)) and d != '__pycache__']
+
+    objs = []
+    for app in apps:
+        module_path = f'backend.app.{app}.model'
+        obj = get_model_objects(module_path)
+        if obj:
+            objs.extend(obj)
+
+    return objs
+
+
+# import all app models for auto create db tables
+for cls in get_app_models():
+    class_name = cls.__name__
+    if class_name not in globals():
+        globals()[class_name] = cls

backend/app/admin/__init__.py

@@ -1,2 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-

backend/app/admin/api/__init__.py

@@ -1,2 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-

backend/app/admin/api/router.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from fastapi import APIRouter
 
 from backend.app.admin.api.v1.auth import router as auth_router

backend/app/admin/api/v1/__init__.py

@@ -1,2 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-

backend/app/admin/api/v1/auth/__init__.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from fastapi import APIRouter
 
 from backend.app.admin.api.v1.auth.auth import router as auth_router

backend/app/admin/api/v1/auth/auth.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, Request, Response
@@ -12,13 +10,16 @@ from backend.app.admin.schema.user import AuthLoginParam
 from backend.app.admin.service.auth_service import auth_service
 from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
 from backend.common.security.jwt import DependsJwtAuth
+from backend.database.db import CurrentSession, CurrentSessionTransaction
 
 router = APIRouter()
 
 
 @router.post('/login/swagger', summary='swagger 调试专用', description='用于快捷获取 token 进行 swagger 认证')
-async def login_swagger(obj: Annotated[HTTPBasicCredentials, Depends()]) -> GetSwaggerToken:
+async def login_swagger(
-    token, user = await auth_service.swagger_login(obj=obj)
+    db: CurrentSessionTransaction, obj: Annotated[HTTPBasicCredentials, Depends()]
+) -> GetSwaggerToken:
+    token, user = await auth_service.swagger_login(db=db, obj=obj)
     return GetSwaggerToken(access_token=token, user=user)
 
 
@@ -29,25 +30,28 @@ async def login_swagger(obj: Annotated[HTTPBasicCredentials, Depends()]) -> GetS
     dependencies=[Depends(RateLimiter(times=5, minutes=1))],
 )
 async def login(
-    request: Request, response: Response, obj: AuthLoginParam, background_tasks: BackgroundTasks
+    db: CurrentSessionTransaction,
+    response: Response,
+    obj: AuthLoginParam,
+    background_tasks: BackgroundTasks,
 ) -> ResponseSchemaModel[GetLoginToken]:
-    data = await auth_service.login(request=request, response=response, obj=obj, background_tasks=background_tasks)
+    data = await auth_service.login(db=db, response=response, obj=obj, background_tasks=background_tasks)
     return response_base.success(data=data)
 
 
 @router.get('/codes', summary='获取所有授权码', description='适配 vben admin v5', dependencies=[DependsJwtAuth])
-async def get_codes(request: Request) -> ResponseSchemaModel[list[str]]:
+async def get_codes(db: CurrentSession, request: Request) -> ResponseSchemaModel[list[str]]:
-    codes = await auth_service.get_codes(request=request)
+    codes = await auth_service.get_codes(db=db, request=request)
     return response_base.success(data=codes)
 
 
-@router.post('/tokens', summary='刷新 token')
+@router.post('/refresh', summary='刷新 token')
-async def refresh_token(request: Request) -> ResponseSchemaModel[GetNewToken]:
+async def refresh_token(db: CurrentSession, request: Request) -> ResponseSchemaModel[GetNewToken]:
-    data = await auth_service.refresh_token(request=request)
+    data = await auth_service.refresh_token(db=db, request=request)
     return response_base.success(data=data)
 
 
-@router.post('/logout', summary='用户登出', dependencies=[DependsJwtAuth])
+@router.post('/logout', summary='用户登出')
 async def logout(request: Request, response: Response) -> ResponseModel:
     await auth_service.logout(request=request, response=response)
     return response_base.success()

backend/app/admin/api/v1/auth/captcha.py

@@ -1,7 +1,7 @@
-#!/usr/bin/env python3
+from uuid import uuid4
-# -*- coding: utf-8 -*-
+
 from fast_captcha import img_captcha
-from fastapi import APIRouter, Depends, Request
+from fastapi import APIRouter, Depends
 from fastapi_limiter.depends import RateLimiter
 from starlette.concurrency import run_in_threadpool
 
@@ -18,17 +18,17 @@ router = APIRouter()
     summary='获取登录验证码',
     dependencies=[Depends(RateLimiter(times=5, seconds=10))],
 )
-async def get_captcha(request: Request) -> ResponseSchemaModel[GetCaptchaDetail]:
+async def get_captcha() -> ResponseSchemaModel[GetCaptchaDetail]:
     """
     此接口可能存在性能损耗，尽管是异步接口，但是验证码生成是IO密集型任务，使用线程池尽量减少性能损耗
     """
     img_type: str = 'base64'
     img, code = await run_in_threadpool(img_captcha, img_byte=img_type)
-    ip = request.state.ip
+    uuid = str(uuid4())
     await redis_client.set(
-        f'{settings.CAPTCHA_LOGIN_REDIS_PREFIX}:{ip}',
+        f'{settings.CAPTCHA_LOGIN_REDIS_PREFIX}:{uuid}',
         code,
         ex=settings.CAPTCHA_LOGIN_EXPIRE_SECONDS,
     )
-    data = GetCaptchaDetail(image_type=img_type, image=img)
+    data = GetCaptchaDetail(uuid=uuid, img_type=img_type, image=img)
     return response_base.success(data=data)

backend/app/admin/api/v1/log/__init__.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from fastapi import APIRouter
 
 from backend.app.admin.api.v1.log.login_log import router as login_log

backend/app/admin/api/v1/log/login_log.py

@@ -1,17 +1,15 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, Query
 
 from backend.app.admin.schema.login_log import DeleteLoginLogParam, GetLoginLogDetail
 from backend.app.admin.service.login_log_service import login_log_service
-from backend.common.pagination import DependsPagination, PageData, paging_data
+from backend.common.pagination import DependsPagination, PageData
 from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
 from backend.common.security.jwt import DependsJwtAuth
 from backend.common.security.permission import RequestPermission
 from backend.common.security.rbac import DependsRBAC
-from backend.database.db import CurrentSession
+from backend.database.db import CurrentSession, CurrentSessionTransaction
 
 router = APIRouter()
 
@@ -24,14 +22,14 @@ router = APIRouter()
         DependsPagination,
     ],
 )
-async def get_login_logs_paged(
+async def get_login_logs_paginated(
     db: CurrentSession,
     username: Annotated[str | None, Query(description='用户名')] = None,
     status: Annotated[int | None, Query(description='状态')] = None,
     ip: Annotated[str | None, Query(description='IP 地址')] = None,
 ) -> ResponseSchemaModel[PageData[GetLoginLogDetail]]:
-    log_select = await login_log_service.get_select(username=username, status=status, ip=ip)
+    page_data = await login_log_service.get_list(db=db, username=username, status=status, ip=ip)
-    page_data = await paging_data(db, log_select)
+
     return response_base.success(data=page_data)
 
 
@@ -43,8 +41,8 @@ async def get_login_logs_paged(
         DependsRBAC,
     ],
 )
-async def delete_login_logs(obj: DeleteLoginLogParam) -> ResponseModel:
+async def delete_login_logs(db: CurrentSessionTransaction, obj: DeleteLoginLogParam) -> ResponseModel:
-    count = await login_log_service.delete(obj=obj)
+    count = await login_log_service.delete(db=db, obj=obj)
     if count > 0:
         return response_base.success()
     return response_base.fail()
@@ -58,8 +56,6 @@ async def delete_login_logs(obj: DeleteLoginLogParam) -> ResponseModel:
         DependsRBAC,
     ],
 )
-async def delete_all_login_logs() -> ResponseModel:
+async def delete_all_login_logs(db: CurrentSessionTransaction) -> ResponseModel:
-    count = await login_log_service.delete_all()
+    await login_log_service.delete_all(db=db)
-    if count > 0:
+    return response_base.success()
-        return response_base.success()
-    return response_base.fail()

backend/app/admin/api/v1/log/opera_log.py

@@ -1,17 +1,15 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, Query
 
 from backend.app.admin.schema.opera_log import DeleteOperaLogParam, GetOperaLogDetail
 from backend.app.admin.service.opera_log_service import opera_log_service
-from backend.common.pagination import DependsPagination, PageData, paging_data
+from backend.common.pagination import DependsPagination, PageData
 from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
 from backend.common.security.jwt import DependsJwtAuth
 from backend.common.security.permission import RequestPermission
 from backend.common.security.rbac import DependsRBAC
-from backend.database.db import CurrentSession
+from backend.database.db import CurrentSession, CurrentSessionTransaction
 
 router = APIRouter()
 
@@ -24,14 +22,14 @@ router = APIRouter()
         DependsPagination,
     ],
 )
-async def get_opera_logs_paged(
+async def get_opera_logs_paginated(
     db: CurrentSession,
     username: Annotated[str | None, Query(description='用户名')] = None,
     status: Annotated[int | None, Query(description='状态')] = None,
     ip: Annotated[str | None, Query(description='IP 地址')] = None,
 ) -> ResponseSchemaModel[PageData[GetOperaLogDetail]]:
-    log_select = await opera_log_service.get_select(username=username, status=status, ip=ip)
+    page_data = await opera_log_service.get_list(db=db, username=username, status=status, ip=ip)
-    page_data = await paging_data(db, log_select)
+
     return response_base.success(data=page_data)
 
 
@@ -43,8 +41,8 @@ async def get_opera_logs_paged(
         DependsRBAC,
     ],
 )
-async def delete_opera_logs(obj: DeleteOperaLogParam) -> ResponseModel:
+async def delete_opera_logs(db: CurrentSessionTransaction, obj: DeleteOperaLogParam) -> ResponseModel:
-    count = await opera_log_service.delete(obj=obj)
+    count = await opera_log_service.delete(db=db, obj=obj)
     if count > 0:
         return response_base.success()
     return response_base.fail()
@@ -58,8 +56,6 @@ async def delete_opera_logs(obj: DeleteOperaLogParam) -> ResponseModel:
         DependsRBAC,
     ],
 )
-async def delete_all_opera_logs() -> ResponseModel:
+async def delete_all_opera_logs(db: CurrentSessionTransaction) -> ResponseModel:
-    count = await opera_log_service.delete_all()
+    await opera_log_service.delete_all(db=db)
-    if count > 0:
+    return response_base.success()
-        return response_base.success()
-    return response_base.fail()

backend/app/admin/api/v1/monitor/__init__.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from fastapi import APIRouter
 
 from backend.app.admin.api.v1.monitor.online import router as token_router

backend/app/admin/api/v1/monitor/online.py

@@ -1,17 +1,13 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 import json
 
 from typing import Annotated
 
-from fastapi import APIRouter, Depends, Path, Query, Request
+from fastapi import APIRouter, Path, Query
 
 from backend.app.admin.schema.token import GetTokenDetail
 from backend.common.enums import StatusType
 from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
-from backend.common.security.jwt import DependsJwtAuth, jwt_decode, revoke_token, superuser_verify
+from backend.common.security.jwt import DependsJwtAuth, DependsSuperUser, jwt_decode, revoke_token
-from backend.common.security.permission import RequestPermission
-from backend.common.security.rbac import DependsRBAC
 from backend.core.conf import settings
 from backend.database.redis import redis_client
 
@@ -37,8 +33,8 @@ async def get_sessions(
                     'browser': extra_info.get('browser', '未知'),
                     'device': extra_info.get('device', '未知'),
                     'last_login_time': extra_info.get('last_login_time', '未知'),
-                }
+                },
-            )
+            ),
         )
 
     for key in token_keys:
@@ -77,16 +73,11 @@ async def get_sessions(
 @router.delete(
     '/{pk}',
     summary='强制下线',
-    dependencies=[
+    dependencies=[DependsSuperUser],
-        Depends(RequestPermission('sys:session:delete')),
-        DependsRBAC,
-    ],
 )
 async def delete_session(
-    request: Request,
     pk: Annotated[int, Path(description='用户 ID')],
     session_uuid: Annotated[str, Query(description='会话 UUID')],
 ) -> ResponseModel:
-    superuser_verify(request)
     await revoke_token(pk, session_uuid)
     return response_base.success()

backend/app/admin/api/v1/monitor/redis.py

@@ -1,23 +1,13 @@
-#!/usr/bin/env python3
+from fastapi import APIRouter
-# -*- coding: utf-8 -*-
-from fastapi import APIRouter, Depends
 
 from backend.common.response.response_schema import ResponseModel, response_base
 from backend.common.security.jwt import DependsJwtAuth
-from backend.common.security.permission import RequestPermission
 from backend.utils.redis_info import redis_info
 
 router = APIRouter()
 
 
-@router.get(
+@router.get('', summary='redis 监控', dependencies=[DependsJwtAuth])
-    '',
-    summary='redis 监控',
-    dependencies=[
-        Depends(RequestPermission('sys:monitor:redis')),
-        DependsJwtAuth,
-    ],
-)
 async def get_redis_info() -> ResponseModel:
     data = {
         'info': await redis_info.get_info(),

backend/app/admin/api/v1/monitor/server.py

@@ -1,24 +1,14 @@
-#!/usr/bin/env python3
+from fastapi import APIRouter
-# -*- coding: utf-8 -*-
-from fastapi import APIRouter, Depends
 from starlette.concurrency import run_in_threadpool
 
 from backend.common.response.response_schema import ResponseModel, response_base
 from backend.common.security.jwt import DependsJwtAuth
-from backend.common.security.permission import RequestPermission
 from backend.utils.server_info import server_info
 
 router = APIRouter()
 
 
-@router.get(
+@router.get('', summary='server 监控', dependencies=[DependsJwtAuth])
-    '',
-    summary='server 监控',
-    dependencies=[
-        Depends(RequestPermission('sys:monitor:server')),
-        DependsJwtAuth,
-    ],
-)
 async def get_server_info() -> ResponseModel:
     data = {
         # 扔到线程池，避免阻塞

backend/app/admin/api/v1/sys/__init__.py

@@ -1,5 +1,3 @@
-# !/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from fastapi import APIRouter
 
 from backend.app.admin.api.v1.sys.data_rule import router as data_rule_router

backend/app/admin/api/v1/sys/data_rule.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, Path, Query
@@ -12,12 +10,12 @@ from backend.app.admin.schema.data_rule import (
     UpdateDataRuleParam,
 )
 from backend.app.admin.service.data_rule_service import data_rule_service
-from backend.common.pagination import DependsPagination, PageData, paging_data
+from backend.common.pagination import DependsPagination, PageData
 from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
 from backend.common.security.jwt import DependsJwtAuth
 from backend.common.security.permission import RequestPermission
 from backend.common.security.rbac import DependsRBAC
-from backend.database.db import CurrentSession
+from backend.database.db import CurrentSession, CurrentSessionTransaction
 
 router = APIRouter()
 
@@ -37,16 +35,17 @@ async def get_data_rule_model_columns(
 
 
 @router.get('/all', summary='获取所有数据规则', dependencies=[DependsJwtAuth])
-async def get_all_data_rules() -> ResponseSchemaModel[list[GetDataRuleDetail]]:
+async def get_all_data_rules(db: CurrentSession) -> ResponseSchemaModel[list[GetDataRuleDetail]]:
-    data = await data_rule_service.get_all()
+    data = await data_rule_service.get_all(db=db)
     return response_base.success(data=data)
 
 
 @router.get('/{pk}', summary='获取数据规则详情', dependencies=[DependsJwtAuth])
 async def get_data_rule(
+    db: CurrentSession,
     pk: Annotated[int, Path(description='数据规则 ID')],
 ) -> ResponseSchemaModel[GetDataRuleDetail]:
-    data = await data_rule_service.get(pk=pk)
+    data = await data_rule_service.get(db=db, pk=pk)
     return response_base.success(data=data)
 
 
@@ -58,11 +57,11 @@ async def get_data_rule(
         DependsPagination,
     ],
 )
-async def get_data_rules_paged(
+async def get_data_rules_paginated(
-    db: CurrentSession, name: Annotated[str | None, Query(description='规则名称')] = None
+    db: CurrentSession,
+    name: Annotated[str | None, Query(description='规则名称')] = None,
 ) -> ResponseSchemaModel[PageData[GetDataRuleDetail]]:
-    data_rule_select = await data_rule_service.get_select(name=name)
+    page_data = await data_rule_service.get_list(db=db, name=name)
-    page_data = await paging_data(db, data_rule_select)
     return response_base.success(data=page_data)
 
 
@@ -74,8 +73,8 @@ async def get_data_rules_paged(
         DependsRBAC,
     ],
 )
-async def create_data_rule(obj: CreateDataRuleParam) -> ResponseModel:
+async def create_data_rule(db: CurrentSessionTransaction, obj: CreateDataRuleParam) -> ResponseModel:
-    await data_rule_service.create(obj=obj)
+    await data_rule_service.create(db=db, obj=obj)
     return response_base.success()
 
 
@@ -88,9 +87,11 @@ async def create_data_rule(obj: CreateDataRuleParam) -> ResponseModel:
     ],
 )
 async def update_data_rule(
-    pk: Annotated[int, Path(description='数据规则 ID')], obj: UpdateDataRuleParam
+    db: CurrentSessionTransaction,
+    pk: Annotated[int, Path(description='数据规则 ID')],
+    obj: UpdateDataRuleParam,
 ) -> ResponseModel:
-    count = await data_rule_service.update(pk=pk, obj=obj)
+    count = await data_rule_service.update(db=db, pk=pk, obj=obj)
     if count > 0:
         return response_base.success()
     return response_base.fail()
@@ -104,8 +105,8 @@ async def update_data_rule(
         DependsRBAC,
     ],
 )
-async def delete_data_rules(obj: DeleteDataRuleParam) -> ResponseModel:
+async def delete_data_rules(db: CurrentSessionTransaction, obj: DeleteDataRuleParam) -> ResponseModel:
-    count = await data_rule_service.delete(obj=obj)
+    count = await data_rule_service.delete(db=db, obj=obj)
     if count > 0:
         return response_base.success()
     return response_base.fail()

backend/app/admin/api/v1/sys/data_scope.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, Path, Query
@@ -13,35 +11,37 @@ from backend.app.admin.schema.data_scope import (
     UpdateDataScopeRuleParam,
 )
 from backend.app.admin.service.data_scope_service import data_scope_service
-from backend.common.pagination import DependsPagination, PageData, paging_data
+from backend.common.pagination import DependsPagination, PageData
 from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
 from backend.common.security.jwt import DependsJwtAuth
 from backend.common.security.permission import RequestPermission
 from backend.common.security.rbac import DependsRBAC
-from backend.database.db import CurrentSession
+from backend.database.db import CurrentSession, CurrentSessionTransaction
 
 router = APIRouter()
 
 
 @router.get('/all', summary='获取所有数据范围', dependencies=[DependsJwtAuth])
-async def get_all_data_scope() -> ResponseSchemaModel[list[GetDataScopeDetail]]:
+async def get_all_data_scope(db: CurrentSession) -> ResponseSchemaModel[list[GetDataScopeDetail]]:
-    data = await data_scope_service.get_all()
+    data = await data_scope_service.get_all(db=db)
     return response_base.success(data=data)
 
 
 @router.get('/{pk}', summary='获取数据范围详情', dependencies=[DependsJwtAuth])
 async def get_data_scope(
+    db: CurrentSession,
     pk: Annotated[int, Path(description='数据范围 ID')],
 ) -> ResponseSchemaModel[GetDataScopeDetail]:
-    data = await data_scope_service.get(pk=pk)
+    data = await data_scope_service.get(db=db, pk=pk)
     return response_base.success(data=data)
 
 
 @router.get('/{pk}/rules', summary='获取数据范围所有规则', dependencies=[DependsJwtAuth])
 async def get_data_scope_rules(
+    db: CurrentSession,
     pk: Annotated[int, Path(description='数据范围 ID')],
 ) -> ResponseSchemaModel[GetDataScopeWithRelationDetail]:
-    data = await data_scope_service.get_rules(pk=pk)
+    data = await data_scope_service.get_rules(db=db, pk=pk)
     return response_base.success(data=data)
 
 
@@ -53,13 +53,12 @@ async def get_data_scope_rules(
         DependsPagination,
     ],
 )
-async def get_data_scopes_paged(
+async def get_data_scopes_paginated(
     db: CurrentSession,
     name: Annotated[str | None, Query(description='范围名称')] = None,
     status: Annotated[int | None, Query(description='状态')] = None,
 ) -> ResponseSchemaModel[PageData[GetDataScopeDetail]]:
-    data_scope_select = await data_scope_service.get_select(name=name, status=status)
+    page_data = await data_scope_service.get_list(db=db, name=name, status=status)
-    page_data = await paging_data(db, data_scope_select)
     return response_base.success(data=page_data)
 
 
@@ -71,8 +70,8 @@ async def get_data_scopes_paged(
         DependsRBAC,
     ],
 )
-async def create_data_scope(obj: CreateDataScopeParam) -> ResponseModel:
+async def create_data_scope(db: CurrentSessionTransaction, obj: CreateDataScopeParam) -> ResponseModel:
-    await data_scope_service.create(obj=obj)
+    await data_scope_service.create(db=db, obj=obj)
     return response_base.success()
 
 
@@ -85,9 +84,11 @@ async def create_data_scope(obj: CreateDataScopeParam) -> ResponseModel:
     ],
 )
 async def update_data_scope(
-    pk: Annotated[int, Path(description='数据范围 ID')], obj: UpdateDataScopeParam
+    db: CurrentSessionTransaction,
+    pk: Annotated[int, Path(description='数据范围 ID')],
+    obj: UpdateDataScopeParam,
 ) -> ResponseModel:
-    count = await data_scope_service.update(pk=pk, obj=obj)
+    count = await data_scope_service.update(db=db, pk=pk, obj=obj)
     if count > 0:
         return response_base.success()
     return response_base.fail()
@@ -102,9 +103,11 @@ async def update_data_scope(
     ],
 )
 async def update_data_scope_rules(
-    pk: Annotated[int, Path(description='数据范围 ID')], rule_ids: UpdateDataScopeRuleParam
+    db: CurrentSessionTransaction,
-):
+    pk: Annotated[int, Path(description='数据范围 ID')],
-    count = await data_scope_service.update_data_scope_rule(pk=pk, rule_ids=rule_ids)
+    rule_ids: UpdateDataScopeRuleParam,
+) -> ResponseModel:
+    count = await data_scope_service.update_data_scope_rule(db=db, pk=pk, rule_ids=rule_ids)
     if count > 0:
         return response_base.success()
     return response_base.fail()
@@ -118,8 +121,8 @@ async def update_data_scope_rules(
         DependsRBAC,
     ],
 )
-async def delete_data_scopes(obj: DeleteDataScopeParam) -> ResponseModel:
+async def delete_data_scopes(db: CurrentSessionTransaction, obj: DeleteDataScopeParam) -> ResponseModel:
-    count = await data_scope_service.delete(obj=obj)
+    count = await data_scope_service.delete(db=db, obj=obj)
     if count > 0:
         return response_base.success()
     return response_base.fail()

backend/app/admin/api/v1/sys/dept.py

@@ -1,34 +1,36 @@
-#!/usr/bin/env python3
+from typing import Annotated
-# -*- coding: utf-8 -*-
-from typing import Annotated, Any
 
 from fastapi import APIRouter, Depends, Path, Query, Request
 
-from backend.app.admin.schema.dept import CreateDeptParam, GetDeptDetail, UpdateDeptParam
+from backend.app.admin.schema.dept import CreateDeptParam, GetDeptDetail, GetDeptTree, UpdateDeptParam
 from backend.app.admin.service.dept_service import dept_service
 from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
 from backend.common.security.jwt import DependsJwtAuth
 from backend.common.security.permission import RequestPermission
 from backend.common.security.rbac import DependsRBAC
+from backend.database.db import CurrentSession, CurrentSessionTransaction
 
 router = APIRouter()
 
 
 @router.get('/{pk}', summary='获取部门详情', dependencies=[DependsJwtAuth])
-async def get_dept(pk: Annotated[int, Path(description='部门 ID')]) -> ResponseSchemaModel[GetDeptDetail]:
+async def get_dept(
-    data = await dept_service.get(pk=pk)
+    db: CurrentSession, pk: Annotated[int, Path(description='部门 ID')]
+) -> ResponseSchemaModel[GetDeptDetail]:
+    data = await dept_service.get(db=db, pk=pk)
     return response_base.success(data=data)
 
 
 @router.get('', summary='获取部门树', dependencies=[DependsJwtAuth])
 async def get_dept_tree(
+    db: CurrentSession,
     request: Request,
     name: Annotated[str | None, Query(description='部门名称')] = None,
     leader: Annotated[str | None, Query(description='部门负责人')] = None,
     phone: Annotated[str | None, Query(description='联系电话')] = None,
     status: Annotated[int | None, Query(description='状态')] = None,
-) -> ResponseSchemaModel[list[dict[str, Any]]]:
+) -> ResponseSchemaModel[list[GetDeptTree]]:
-    dept = await dept_service.get_tree(request=request, name=name, leader=leader, phone=phone, status=status)
+    dept = await dept_service.get_tree(db=db, request=request, name=name, leader=leader, phone=phone, status=status)
     return response_base.success(data=dept)
 
 
@@ -40,8 +42,8 @@ async def get_dept_tree(
         DependsRBAC,
     ],
 )
-async def create_dept(obj: CreateDeptParam) -> ResponseModel:
+async def create_dept(db: CurrentSessionTransaction, obj: CreateDeptParam) -> ResponseModel:
-    await dept_service.create(obj=obj)
+    await dept_service.create(db=db, obj=obj)
     return response_base.success()
 
 
@@ -53,8 +55,10 @@ async def create_dept(obj: CreateDeptParam) -> ResponseModel:
         DependsRBAC,
     ],
 )
-async def update_dept(pk: Annotated[int, Path(description='部门 ID')], obj: UpdateDeptParam) -> ResponseModel:
+async def update_dept(
-    count = await dept_service.update(pk=pk, obj=obj)
+    db: CurrentSessionTransaction, pk: Annotated[int, Path(description='部门 ID')], obj: UpdateDeptParam
+) -> ResponseModel:
+    count = await dept_service.update(db=db, pk=pk, obj=obj)
     if count > 0:
         return response_base.success()
     return response_base.fail()
@@ -68,8 +72,8 @@ async def update_dept(pk: Annotated[int, Path(description='部门 ID')], obj: Up
         DependsRBAC,
     ],
 )
-async def delete_dept(pk: Annotated[int, Path(description='部门 ID')]) -> ResponseModel:
+async def delete_dept(db: CurrentSessionTransaction, pk: Annotated[int, Path(description='部门 ID')]) -> ResponseModel:
-    count = await dept_service.delete(pk=pk)
+    count = await dept_service.delete(db=db, pk=pk)
     if count > 0:
         return response_base.success()
     return response_base.fail()

backend/app/admin/api/v1/sys/files.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, File, UploadFile
@@ -8,7 +6,7 @@ from backend.common.dataclasses import UploadUrl
 from backend.common.response.response_schema import ResponseSchemaModel, response_base
 from backend.common.security.permission import RequestPermission
 from backend.common.security.rbac import DependsRBAC
-from backend.utils.file_ops import file_verify, upload_file
+from backend.utils.file_ops import upload_file, upload_file_verify
 
 router = APIRouter()
 
@@ -22,6 +20,6 @@ router = APIRouter()
     ],
 )
 async def upload_files(file: Annotated[UploadFile, File()]) -> ResponseSchemaModel[UploadUrl]:
-    file_verify(file)
+    upload_file_verify(file)
     filename = await upload_file(file)
     return response_base.success(data={'url': f'/static/upload/{filename}'})

backend/app/admin/api/v1/sys/menu.py

@@ -1,37 +1,39 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from typing import Annotated, Any
 
 from fastapi import APIRouter, Depends, Path, Query, Request
 
-from backend.app.admin.schema.menu import CreateMenuParam, GetMenuDetail, UpdateMenuParam
+from backend.app.admin.schema.menu import CreateMenuParam, GetMenuDetail, GetMenuTree, UpdateMenuParam
 from backend.app.admin.service.menu_service import menu_service
 from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
 from backend.common.security.jwt import DependsJwtAuth
 from backend.common.security.permission import RequestPermission
 from backend.common.security.rbac import DependsRBAC
+from backend.database.db import CurrentSession, CurrentSessionTransaction
 
 router = APIRouter()
 
 
 @router.get('/sidebar', summary='获取用户菜单侧边栏', description='已适配 vben admin v5', dependencies=[DependsJwtAuth])
-async def get_user_sidebar(request: Request) -> ResponseSchemaModel[list[dict[str, Any] | None]]:
+async def get_user_sidebar(db: CurrentSession, request: Request) -> ResponseSchemaModel[list[dict[str, Any] | None]]:
-    menu = await menu_service.get_sidebar(request=request)
+    menu = await menu_service.get_sidebar(db=db, request=request)
     return response_base.success(data=menu)
 
 
 @router.get('/{pk}', summary='获取菜单详情', dependencies=[DependsJwtAuth])
-async def get_menu(pk: Annotated[int, Path(description='菜单 ID')]) -> ResponseSchemaModel[GetMenuDetail]:
+async def get_menu(
-    data = await menu_service.get(pk=pk)
+    db: CurrentSession, pk: Annotated[int, Path(description='菜单 ID')]
+) -> ResponseSchemaModel[GetMenuDetail]:
+    data = await menu_service.get(db=db, pk=pk)
     return response_base.success(data=data)
 
 
 @router.get('', summary='获取菜单树', dependencies=[DependsJwtAuth])
 async def get_menu_tree(
+    db: CurrentSession,
     title: Annotated[str | None, Query(description='菜单标题')] = None,
     status: Annotated[int | None, Query(description='状体')] = None,
-) -> ResponseSchemaModel[list[dict[str, Any]]]:
+) -> ResponseSchemaModel[list[GetMenuTree]]:
-    menu = await menu_service.get_tree(title=title, status=status)
+    menu = await menu_service.get_tree(db=db, title=title, status=status)
     return response_base.success(data=menu)
 
 
@@ -43,8 +45,8 @@ async def get_menu_tree(
         DependsRBAC,
     ],
 )
-async def create_menu(obj: CreateMenuParam) -> ResponseModel:
+async def create_menu(db: CurrentSessionTransaction, obj: CreateMenuParam) -> ResponseModel:
-    await menu_service.create(obj=obj)
+    await menu_service.create(db=db, obj=obj)
     return response_base.success()
 
 
@@ -56,8 +58,10 @@ async def create_menu(obj: CreateMenuParam) -> ResponseModel:
         DependsRBAC,
     ],
 )
-async def update_menu(pk: Annotated[int, Path(description='菜单 ID')], obj: UpdateMenuParam) -> ResponseModel:
+async def update_menu(
-    count = await menu_service.update(pk=pk, obj=obj)
+    db: CurrentSessionTransaction, pk: Annotated[int, Path(description='菜单 ID')], obj: UpdateMenuParam
+) -> ResponseModel:
+    count = await menu_service.update(db=db, pk=pk, obj=obj)
     if count > 0:
         return response_base.success()
     return response_base.fail()
@@ -71,8 +75,8 @@ async def update_menu(pk: Annotated[int, Path(description='菜单 ID')], obj: Up
         DependsRBAC,
     ],
 )
-async def delete_menu(pk: Annotated[int, Path(description='菜单 ID')]) -> ResponseModel:
+async def delete_menu(db: CurrentSessionTransaction, pk: Annotated[int, Path(description='菜单 ID')]) -> ResponseModel:
-    count = await menu_service.delete(pk=pk)
+    count = await menu_service.delete(db=db, pk=pk)
     if count > 0:
         return response_base.success()
     return response_base.fail()

backend/app/admin/api/v1/sys/plugin.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from typing import Annotated, Any
 
 from fastapi import APIRouter, Depends, File, Path, UploadFile
@@ -46,8 +44,9 @@ async def install_plugin(
     plugin_name = await plugin_service.install(type=type, file=file, repo_url=repo_url)
     return response_base.success(
         res=CustomResponse(
-            code=200, msg=f'插件 {plugin_name} 安装成功，请根据插件说明（README.md）进行相关配置并重启服务'
+            code=200,
-        )
+            msg=f'插件 {plugin_name} 安装成功，请根据插件说明（README.md）进行相关配置并重启服务',
+        ),
     )
 
 
@@ -63,7 +62,7 @@ async def install_plugin(
 async def uninstall_plugin(plugin: Annotated[str, Path(description='插件名称')]) -> ResponseModel:
     await plugin_service.uninstall(plugin=plugin)
     return response_base.success(
-        res=CustomResponse(code=200, msg=f'插件 {plugin} 卸载成功，请根据插件说明（README.md）移除相关配置并重启服务')
+        res=CustomResponse(code=200, msg=f'插件 {plugin} 卸载成功，请根据插件说明（README.md）移除相关配置并重启服务'),
     )
 
 

backend/app/admin/api/v1/sys/role.py

@@ -1,9 +1,8 @@
-#!/usr/bin/env python3
+from typing import Annotated
-# -*- coding: utf-8 -*-
-from typing import Annotated, Any
 
 from fastapi import APIRouter, Depends, Path, Query
 
+from backend.app.admin.schema.menu import GetMenuTree
 from backend.app.admin.schema.role import (
     CreateRoleParam,
     DeleteRoleParam,
@@ -14,39 +13,44 @@ from backend.app.admin.schema.role import (
     UpdateRoleScopeParam,
 )
 from backend.app.admin.service.role_service import role_service
-from backend.common.pagination import DependsPagination, PageData, paging_data
+from backend.common.pagination import DependsPagination, PageData
 from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
 from backend.common.security.jwt import DependsJwtAuth
 from backend.common.security.permission import RequestPermission
 from backend.common.security.rbac import DependsRBAC
-from backend.database.db import CurrentSession
+from backend.database.db import CurrentSession, CurrentSessionTransaction
 
 router = APIRouter()
 
 
 @router.get('/all', summary='获取所有角色', dependencies=[DependsJwtAuth])
-async def get_all_roles() -> ResponseSchemaModel[list[GetRoleDetail]]:
+async def get_all_roles(db: CurrentSession) -> ResponseSchemaModel[list[GetRoleDetail]]:
-    data = await role_service.get_all()
+    data = await role_service.get_all(db=db)
     return response_base.success(data=data)
 
 
 @router.get('/{pk}/menus', summary='获取角色菜单树', dependencies=[DependsJwtAuth])
 async def get_role_menu_tree(
+    db: CurrentSession,
     pk: Annotated[int, Path(description='角色 ID')],
-) -> ResponseSchemaModel[list[dict[str, Any] | None]]:
+) -> ResponseSchemaModel[list[GetMenuTree] | None]:
-    menu = await role_service.get_menu_tree(pk=pk)
+    menu = await role_service.get_menu_tree(db=db, pk=pk)
     return response_base.success(data=menu)
 
 
 @router.get('/{pk}/scopes', summary='获取角色所有数据范围', dependencies=[DependsJwtAuth])
-async def get_role_scopes(pk: Annotated[int, Path(description='角色 ID')]) -> ResponseSchemaModel[list[int]]:
+async def get_role_scopes(
-    rule = await role_service.get_scopes(pk=pk)
+    db: CurrentSession, pk: Annotated[int, Path(description='角色 ID')]
+) -> ResponseSchemaModel[list[int]]:
+    rule = await role_service.get_scopes(db=db, pk=pk)
     return response_base.success(data=rule)
 
 
 @router.get('/{pk}', summary='获取角色详情', dependencies=[DependsJwtAuth])
-async def get_role(pk: Annotated[int, Path(description='角色 ID')]) -> ResponseSchemaModel[GetRoleWithRelationDetail]:
+async def get_role(
-    data = await role_service.get(pk=pk)
+    db: CurrentSession, pk: Annotated[int, Path(description='角色 ID')]
+) -> ResponseSchemaModel[GetRoleWithRelationDetail]:
+    data = await role_service.get(db=db, pk=pk)
     return response_base.success(data=data)
 
 
@@ -58,13 +62,12 @@ async def get_role(pk: Annotated[int, Path(description='角色 ID')]) -> Respons
         DependsPagination,
     ],
 )
-async def get_roles_paged(
+async def get_roles_paginated(
     db: CurrentSession,
     name: Annotated[str | None, Query(description='角色名称')] = None,
     status: Annotated[int | None, Query(description='状态')] = None,
 ) -> ResponseSchemaModel[PageData[GetRoleDetail]]:
-    role_select = await role_service.get_select(name=name, status=status)
+    page_data = await role_service.get_list(db=db, name=name, status=status)
-    page_data = await paging_data(db, role_select)
     return response_base.success(data=page_data)
 
 
@@ -76,8 +79,8 @@ async def get_roles_paged(
         DependsRBAC,
     ],
 )
-async def create_role(obj: CreateRoleParam) -> ResponseModel:
+async def create_role(db: CurrentSessionTransaction, obj: CreateRoleParam) -> ResponseModel:
-    await role_service.create(obj=obj)
+    await role_service.create(db=db, obj=obj)
     return response_base.success()
 
 
@@ -89,8 +92,10 @@ async def create_role(obj: CreateRoleParam) -> ResponseModel:
         DependsRBAC,
     ],
 )
-async def update_role(pk: Annotated[int, Path(description='角色 ID')], obj: UpdateRoleParam) -> ResponseModel:
+async def update_role(
-    count = await role_service.update(pk=pk, obj=obj)
+    db: CurrentSessionTransaction, pk: Annotated[int, Path(description='角色 ID')], obj: UpdateRoleParam
+) -> ResponseModel:
+    count = await role_service.update(db=db, pk=pk, obj=obj)
     if count > 0:
         return response_base.success()
     return response_base.fail()
@@ -105,9 +110,11 @@ async def update_role(pk: Annotated[int, Path(description='角色 ID')], obj: Up
     ],
 )
 async def update_role_menus(
-    pk: Annotated[int, Path(description='角色 ID')], menu_ids: UpdateRoleMenuParam
+    db: CurrentSessionTransaction,
+    pk: Annotated[int, Path(description='角色 ID')],
+    menu_ids: UpdateRoleMenuParam,
 ) -> ResponseModel:
-    count = await role_service.update_role_menu(pk=pk, menu_ids=menu_ids)
+    count = await role_service.update_role_menu(db=db, pk=pk, menu_ids=menu_ids)
     if count > 0:
         return response_base.success()
     return response_base.fail()
@@ -122,9 +129,11 @@ async def update_role_menus(
     ],
 )
 async def update_role_scopes(
-    pk: Annotated[int, Path(description='角色 ID')], scope_ids: UpdateRoleScopeParam
+    db: CurrentSessionTransaction,
+    pk: Annotated[int, Path(description='角色 ID')],
+    scope_ids: UpdateRoleScopeParam,
 ) -> ResponseModel:
-    count = await role_service.update_role_scope(pk=pk, scope_ids=scope_ids)
+    count = await role_service.update_role_scope(db=db, pk=pk, scope_ids=scope_ids)
     if count > 0:
         return response_base.success()
     return response_base.fail()
@@ -138,8 +147,8 @@ async def update_role_scopes(
         DependsRBAC,
     ],
 )
-async def delete_roles(obj: DeleteRoleParam) -> ResponseModel:
+async def delete_roles(db: CurrentSessionTransaction, obj: DeleteRoleParam) -> ResponseModel:
-    count = await role_service.delete(obj=obj)
+    count = await role_service.delete(db=db, obj=obj)
     if count > 0:
         return response_base.success()
     return response_base.fail()

backend/app/admin/api/v1/sys/user.py

@@ -1,8 +1,6 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from typing import Annotated
 
-from fastapi import APIRouter, Depends, Path, Query, Request
+from fastapi import APIRouter, Body, Depends, Path, Query, Request
 
 from backend.app.admin.schema.role import GetRoleDetail
 from backend.app.admin.schema.user import (
@@ -14,12 +12,12 @@ from backend.app.admin.schema.user import (
 )
 from backend.app.admin.service.user_service import user_service
 from backend.common.enums import UserPermissionType
-from backend.common.pagination import DependsPagination, PageData, paging_data
+from backend.common.pagination import DependsPagination, PageData
 from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
-from backend.common.security.jwt import DependsJwtAuth
+from backend.common.security.jwt import DependsJwtAuth, DependsSuperUser
 from backend.common.security.permission import RequestPermission
 from backend.common.security.rbac import DependsRBAC
-from backend.database.db import CurrentSession
+from backend.database.db import CurrentSession, CurrentSessionTransaction
 
 router = APIRouter()
 
@@ -32,15 +30,18 @@ async def get_current_user(request: Request) -> ResponseSchemaModel[GetCurrentUs
 
 @router.get('/{pk}', summary='获取用户信息', dependencies=[DependsJwtAuth])
 async def get_userinfo(
+    db: CurrentSession,
     pk: Annotated[int, Path(description='用户 ID')],
 ) -> ResponseSchemaModel[GetUserInfoWithRelationDetail]:
-    data = await user_service.get_userinfo(pk=pk)
+    data = await user_service.get_userinfo(db=db, pk=pk)
     return response_base.success(data=data)
 
 
 @router.get('/{pk}/roles', summary='获取用户所有角色', dependencies=[DependsJwtAuth])
-async def get_user_roles(pk: Annotated[int, Path(description='用户 ID')]) -> ResponseSchemaModel[list[GetRoleDetail]]:
+async def get_user_roles(
-    data = await user_service.get_roles(pk=pk)
+    db: CurrentSession, pk: Annotated[int, Path(description='用户 ID')]
+) -> ResponseSchemaModel[list[GetRoleDetail]]:
+    data = await user_service.get_roles(db=db, pk=pk)
     return response_base.success(data=data)
 
 
@@ -52,52 +53,105 @@ async def get_user_roles(pk: Annotated[int, Path(description='用户 ID')]) -> R
         DependsPagination,
     ],
 )
-async def get_users_paged(
+async def get_users_paginated(
     db: CurrentSession,
     dept: Annotated[int | None, Query(description='部门 ID')] = None,
     username: Annotated[str | None, Query(description='用户名')] = None,
     phone: Annotated[str | None, Query(description='手机号')] = None,
     status: Annotated[int | None, Query(description='状态')] = None,
 ) -> ResponseSchemaModel[PageData[GetUserInfoWithRelationDetail]]:
-    user_select = await user_service.get_select(dept=dept, username=username, phone=phone, status=status)
+    page_data = await user_service.get_list(db=db, dept=dept, username=username, phone=phone, status=status)
-    page_data = await paging_data(db, user_select)
     return response_base.success(data=page_data)
 
 
-@router.post('', summary='创建用户', dependencies=[DependsRBAC])
+@router.post('', summary='创建用户', dependencies=[DependsSuperUser])
-async def create_user(request: Request, obj: AddUserParam) -> ResponseSchemaModel[GetUserInfoWithRelationDetail]:
+async def create_user(
-    await user_service.create(request=request, obj=obj)
+    db: CurrentSessionTransaction, obj: AddUserParam
-    data = await user_service.get_userinfo(username=obj.username)
+) -> ResponseSchemaModel[GetUserInfoWithRelationDetail]:
+    await user_service.create(db=db, obj=obj)
+    data = await user_service.get_userinfo(db=db, username=obj.username)
     return response_base.success(data=data)
 
 
-@router.put('/{pk}', summary='更新用户信息', dependencies=[DependsJwtAuth])
+@router.put('/{pk}', summary='更新用户信息', dependencies=[DependsSuperUser])
 async def update_user(
-    request: Request, pk: Annotated[int, Path(description='用户 ID')], obj: UpdateUserParam
+    db: CurrentSessionTransaction,
+    pk: Annotated[int, Path(description='用户 ID')],
+    obj: UpdateUserParam,
 ) -> ResponseModel:
-    count = await user_service.update(request=request, pk=pk, obj=obj)
+    count = await user_service.update(db=db, pk=pk, obj=obj)
     if count > 0:
         return response_base.success()
     return response_base.fail()
 
 
-@router.put('/{pk}/permissions', summary='更新用户权限', dependencies=[DependsRBAC])
+@router.put('/{pk}/permissions', summary='更新用户权限', dependencies=[DependsSuperUser])
 async def update_user_permission(
+    db: CurrentSessionTransaction,
     request: Request,
     pk: Annotated[int, Path(description='用户 ID')],
     type: Annotated[UserPermissionType, Query(description='权限类型')],
 ) -> ResponseModel:
-    count = await user_service.update_permission(request=request, pk=pk, type=type)
+    count = await user_service.update_permission(db=db, request=request, pk=pk, type=type)
     if count > 0:
         return response_base.success()
     return response_base.fail()
 
 
-@router.put('/{pk}/password', summary='重置用户密码', dependencies=[DependsJwtAuth])
+@router.put('/me/password', summary='更新当前用户密码', dependencies=[DependsJwtAuth])
-async def reset_user_password(
+async def update_user_password(
-    pk: Annotated[int, Path(description='用户 ID')], obj: ResetPasswordParam
+    db: CurrentSessionTransaction, request: Request, obj: ResetPasswordParam
 ) -> ResponseModel:
-    count = await user_service.reset_pwd(pk=pk, obj=obj)
+    count = await user_service.update_password(db=db, request=request, obj=obj)
+    if count > 0:
+        return response_base.success()
+    return response_base.fail()
+
+
+@router.put('/{pk}/password', summary='重置用户密码', dependencies=[DependsSuperUser])
+async def reset_user_password(
+    db: CurrentSessionTransaction,
+    pk: Annotated[int, Path(description='用户 ID')],
+    password: Annotated[str, Body(embed=True, description='新密码')],
+) -> ResponseModel:
+    count = await user_service.reset_password(db=db, pk=pk, password=password)
+    if count > 0:
+        return response_base.success()
+    return response_base.fail()
+
+
+@router.put('/me/nickname', summary='更新当前用户昵称', dependencies=[DependsJwtAuth])
+async def update_user_nickname(
+    db: CurrentSessionTransaction,
+    request: Request,
+    nickname: Annotated[str, Body(embed=True, description='用户昵称')],
+) -> ResponseModel:
+    count = await user_service.update_nickname(db=db, request=request, nickname=nickname)
+    if count > 0:
+        return response_base.success()
+    return response_base.fail()
+
+
+@router.put('/me/avatar', summary='更新当前用户头像', dependencies=[DependsJwtAuth])
+async def update_user_avatar(
+    db: CurrentSessionTransaction,
+    request: Request,
+    avatar: Annotated[str, Body(embed=True, description='用户头像地址')],
+) -> ResponseModel:
+    count = await user_service.update_avatar(db=db, request=request, avatar=avatar)
+    if count > 0:
+        return response_base.success()
+    return response_base.fail()
+
+
+@router.put('/me/email', summary='更新当前用户邮箱', dependencies=[DependsJwtAuth])
+async def update_user_email(
+    db: CurrentSessionTransaction,
+    request: Request,
+    captcha: Annotated[str, Body(embed=True, description='邮箱验证码')],
+    email: Annotated[str, Body(embed=True, description='用户邮箱')],
+) -> ResponseModel:
+    count = await user_service.update_email(db=db, request=request, captcha=captcha, email=email)
     if count > 0:
         return response_base.success()
     return response_base.fail()
@@ -111,8 +165,8 @@ async def reset_user_password(
         DependsRBAC,
     ],
 )
-async def delete_user(pk: Annotated[int, Path(description='用户 ID')]) -> ResponseModel:
+async def delete_user(db: CurrentSessionTransaction, pk: Annotated[int, Path(description='用户 ID')]) -> ResponseModel:
-    count = await user_service.delete(pk=pk)
+    count = await user_service.delete(db=db, pk=pk)
     if count > 0:
         return response_base.success()
     return response_base.fail()

backend/app/admin/crud/__init__.py

@@ -1,2 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-

backend/app/admin/crud/crud_data_rule.py

@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
+from collections.abc import Sequence
-# -*- coding: utf-8 -*-
-from typing import Sequence
 
 from sqlalchemy import Select
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -23,9 +21,9 @@ class CRUDDataRule(CRUDPlus[DataRule]):
         """
         return await self.select_model(db, pk)
 
-    async def get_list(self, name: str | None) -> Select:
+    async def get_select(self, name: str | None) -> Select:
         """
-        获取规则列表
+        获取规则列表查询表达式
 
         :param name: 规则名称
         :return:

backend/app/admin/crud/crud_data_scope.py

@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
+from collections.abc import Sequence
-# -*- coding: utf-8 -*-
-from typing import Sequence
 
 from sqlalchemy import Select, select
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -52,9 +50,9 @@ class CRUDDataScope(CRUDPlus[DataScope]):
         """
         return await self.select_models(db)
 
-    async def get_list(self, name: str | None, status: int | None) -> Select:
+    async def get_select(self, name: str | None, status: int | None) -> Select:
         """
-        获取数据范围列表
+        获取数据范围列表查询表达式
 
         :param name: 范围名称
         :param status: 范围状态

backend/app/admin/crud/crud_dept.py

@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
+from collections.abc import Sequence
-# -*- coding: utf-8 -*-
-from typing import Sequence
 
 from fastapi import Request
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -22,7 +20,7 @@ class CRUDDept(CRUDPlus[Dept]):
         :param dept_id: 部门 ID
         :return:
         """
-        return await self.select_model_by_column(db, id=dept_id, del_flag=0)
+        return await self.select_model_by_column(db, id=dept_id, del_flag=False)
 
     async def get_by_name(self, db: AsyncSession, name: str) -> Dept | None:
         """
@@ -32,7 +30,7 @@ class CRUDDept(CRUDPlus[Dept]):
         :param name: 部门名称
         :return:
         """
-        return await self.select_model_by_column(db, name=name, del_flag=0)
+        return await self.select_model_by_column(db, name=name, del_flag=False)
 
     async def get_all(
         self,
@@ -54,7 +52,7 @@ class CRUDDept(CRUDPlus[Dept]):
         :param status: 部门状态
         :return:
         """
-        filters = {'del_flag': 0}
+        filters = {'del_flag': False}
 
         if name is not None:
             filters['name__like'] = f'%{name}%'

backend/app/admin/crud/crud_login_log.py

@@ -1,6 +1,5 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from sqlalchemy import Select
+from sqlalchemy import delete as sa_delete
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy_crud_plus import CRUDPlus
 
@@ -11,9 +10,9 @@ from backend.app.admin.schema.login_log import CreateLoginLogParam
 class CRUDLoginLog(CRUDPlus[LoginLog]):
     """登录日志数据库操作类"""
 
-    async def get_list(self, username: str | None, status: int | None, ip: str | None) -> Select:
+    async def get_select(self, username: str | None, status: int | None, ip: str | None) -> Select:
         """
-        获取登录日志列表
+        获取登录日志列表查询表达式
 
         :param username: 用户名
         :param status: 登录状态
@@ -51,14 +50,15 @@ class CRUDLoginLog(CRUDPlus[LoginLog]):
         """
         return await self.delete_model_by_column(db, allow_multiple=True, id__in=pks)
 
-    async def delete_all(self, db: AsyncSession) -> int:
+    @staticmethod
+    async def delete_all(db: AsyncSession) -> None:
         """
         删除所有日志
 
         :param db: 数据库会话
         :return:
         """
-        return await self.delete_model_by_column(db, allow_multiple=True)
+        await db.execute(sa_delete(LoginLog))
 
 
 login_log_dao: CRUDLoginLog = CRUDLoginLog(LoginLog)

backend/app/admin/crud/crud_menu.py

@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
+from collections.abc import Sequence
-# -*- coding: utf-8 -*-
-from typing import Sequence
 
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy_crud_plus import CRUDPlus

backend/app/admin/crud/crud_opera_log.py

@@ -1,6 +1,5 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from sqlalchemy import Select
+from sqlalchemy import delete as sa_delete
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy_crud_plus import CRUDPlus
 
@@ -11,9 +10,9 @@ from backend.app.admin.schema.opera_log import CreateOperaLogParam
 class CRUDOperaLogDao(CRUDPlus[OperaLog]):
     """操作日志数据库操作类"""
 
-    async def get_list(self, username: str | None, status: int | None, ip: str | None) -> Select:
+    async def get_select(self, username: str | None, status: int | None, ip: str | None) -> Select:
         """
-        获取操作日志列表
+        获取操作日志列表查询表达式
 
         :param username: 用户名
         :param status: 操作状态
@@ -36,11 +35,21 @@ class CRUDOperaLogDao(CRUDPlus[OperaLog]):
         创建操作日志
 
         :param db: 数据库会话
-        :param obj: 创建操作日志参数
+        :param obj: 操作日志创建参数
         :return:
         """
         await self.create_model(db, obj)
 
+    async def bulk_create(self, db: AsyncSession, objs: list[CreateOperaLogParam]) -> None:
+        """
+        批量创建操作日志
+
+        :param db: 数据库会话
+        :param objs: 操作日志创建参数列表
+        :return:
+        """
+        await self.create_models(db, objs)
+
     async def delete(self, db: AsyncSession, pks: list[int]) -> int:
         """
         批量删除操作日志
@@ -51,14 +60,15 @@ class CRUDOperaLogDao(CRUDPlus[OperaLog]):
         """
         return await self.delete_model_by_column(db, allow_multiple=True, id__in=pks)
 
-    async def delete_all(self, db: AsyncSession) -> int:
+    @staticmethod
+    async def delete_all(db: AsyncSession) -> None:
         """
         删除所有日志
 
         :param db: 数据库会话
         :return:
         """
-        return await self.delete_model_by_column(db, allow_multiple=True)
+        await db.execute(sa_delete(OperaLog))
 
 
 opera_log_dao: CRUDOperaLogDao = CRUDOperaLogDao(OperaLog)

backend/app/admin/crud/crud_role.py

@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
+from collections.abc import Sequence
-# -*- coding: utf-8 -*-
-from typing import Sequence
 
 from sqlalchemy import Select, select
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -47,9 +45,9 @@ class CRUDRole(CRUDPlus[Role]):
         """
         return await self.select_models(db)
 
-    async def get_list(self, name: str | None, status: int | None) -> Select:
+    async def get_select(self, name: str | None, status: int | None) -> Select:
         """
-        获取角色列表
+        获取角色列表查询表达式
 
         :param name: 角色名称
         :param status: 角色状态

backend/app/admin/crud/crud_user.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 import bcrypt
 
 from sqlalchemy import select
@@ -89,10 +87,8 @@ class CRUDUser(CRUDPlus[User]):
         :param obj: 注册用户参数
         :return:
         """
-        salt = bcrypt.gensalt()
-        obj.password = get_hash_password(obj.password, salt)
         dict_obj = obj.model_dump()
-        dict_obj.update({'is_staff': True, 'salt': salt})
+        dict_obj.update({'is_staff': True, 'salt': None})
         new_user = self.model(**dict_obj)
 
         stmt = select(Role)
@@ -119,6 +115,17 @@ class CRUDUser(CRUDPlus[User]):
         input_user.roles = roles.scalars().all()
         return count
 
+    async def update_nickname(self, db: AsyncSession, user_id: int, nickname: str) -> int:
+        """
+        更新用户昵称
+
+        :param db: 数据库会话
+        :param user_id: 用户 ID
+        :param nickname: 用户昵称
+        :return:
+        """
+        return await self.update_model(db, user_id, {'nickname': nickname})
+
     async def update_avatar(self, db: AsyncSession, user_id: int, avatar: str) -> int:
         """
         更新用户头像
@@ -130,6 +137,17 @@ class CRUDUser(CRUDPlus[User]):
         """
         return await self.update_model(db, user_id, {'avatar': avatar})
 
+    async def update_email(self, db: AsyncSession, user_id: int, email: str) -> int:
+        """
+        更新用户邮箱
+
+        :param db: 数据库会话
+        :param user_id: 用户 ID
+        :param email: 邮箱
+        :return:
+        """
+        return await self.update_model(db, user_id, {'email': email})
+
     async def delete(self, db: AsyncSession, user_id: int) -> int:
         """
         删除用户
@@ -150,20 +168,22 @@ class CRUDUser(CRUDPlus[User]):
         """
         return await self.select_model_by_column(db, email=email)
 
-    async def reset_password(self, db: AsyncSession, pk: int, new_pwd: str) -> int:
+    async def reset_password(self, db: AsyncSession, pk: int, password: str) -> int:
         """
         重置用户密码
 
         :param db: 数据库会话
         :param pk: 用户 ID
-        :param new_pwd: 新密码（已加密）
+        :param password: 新密码
         :return:
         """
-        return await self.update_model(db, pk, {'password': new_pwd})
+        salt = bcrypt.gensalt()
+        new_pwd = get_hash_password(password, salt)
+        return await self.update_model(db, pk, {'password': new_pwd, 'salt': salt})
 
-    async def get_list(self, dept: int | None, username: str | None, phone: str | None, status: int | None) -> Select:
+    async def get_select(self, dept: int | None, username: str | None, phone: str | None, status: int | None) -> Select:
         """
-        获取用户列表
+        获取用户列表查询表达式
 
         :param dept: 部门 ID
         :param username: 用户名
@@ -178,7 +198,7 @@ class CRUDUser(CRUDPlus[User]):
         if username:
             filters['username__like'] = f'%{username}%'
         if phone:
-            filters['phone_like'] = f'%{phone}%'
+            filters['phone__like'] = f'%{phone}%'
         if status is not None:
             filters['status'] = status
 
@@ -192,51 +212,7 @@ class CRUDUser(CRUDPlus[User]):
             **filters,
         )
 
-    async def get_super(self, db: AsyncSession, user_id: int) -> bool:
+    async def set_super(self, db: AsyncSession, user_id: int, *, is_super: bool) -> int:
-        """
-        获取用户是否为超级管理员
-
-        :param db: 数据库会话
-        :param user_id: 用户 ID
-        :return:
-        """
-        user = await self.get(db, user_id)
-        return user.is_superuser
-
-    async def get_staff(self, db: AsyncSession, user_id: int) -> bool:
-        """
-        获取用户是否可以登录后台
-
-        :param db: 数据库会话
-        :param user_id: 用户 ID
-        :return:
-        """
-        user = await self.get(db, user_id)
-        return user.is_staff
-
-    async def get_status(self, db: AsyncSession, user_id: int) -> int:
-        """
-        获取用户状态
-
-        :param db: 数据库会话
-        :param user_id: 用户 ID
-        :return:
-        """
-        user = await self.get(db, user_id)
-        return user.status
-
-    async def get_multi_login(self, db: AsyncSession, user_id: int) -> bool:
-        """
-        获取用户是否允许多端登录
-
-        :param db: 数据库会话
-        :param user_id: 用户 ID
-        :return:
-        """
-        user = await self.get(db, user_id)
-        return user.is_multi_login
-
-    async def set_super(self, db: AsyncSession, user_id: int, is_super: bool) -> int:
         """
         设置用户超级管理员状态
 
@@ -247,7 +223,7 @@ class CRUDUser(CRUDPlus[User]):
         """
         return await self.update_model(db, user_id, {'is_superuser': is_super})
 
-    async def set_staff(self, db: AsyncSession, user_id: int, is_staff: bool) -> int:
+    async def set_staff(self, db: AsyncSession, user_id: int, *, is_staff: bool) -> int:
         """
         设置用户后台登录状态
 
@@ -269,7 +245,7 @@ class CRUDUser(CRUDPlus[User]):
         """
         return await self.update_model(db, user_id, {'status': status})
 
-    async def set_multi_login(self, db: AsyncSession, user_id: int, multi_login: bool) -> int:
+    async def set_multi_login(self, db: AsyncSession, user_id: int, *, multi_login: bool) -> int:
         """
         设置用户多端登录状态
 
@@ -281,7 +257,11 @@ class CRUDUser(CRUDPlus[User]):
         return await self.update_model(db, user_id, {'is_multi_login': multi_login})
 
     async def get_with_relation(
-        self, db: AsyncSession, *, user_id: int | None = None, username: str | None = None
+        self,
+        db: AsyncSession,
+        *,
+        user_id: int | None = None,
+        username: str | None = None,
     ) -> User | None:
         """
         获取用户关联信息

backend/app/admin/model/__init__.py

@@ -1,10 +1,8 @@
-#!/usr/bin/env python3
+from backend.app.admin.model.data_rule import DataRule as DataRule
-# -*- coding: utf-8 -*-
+from backend.app.admin.model.data_scope import DataScope as DataScope
-from backend.app.admin.model.data_rule import DataRule
+from backend.app.admin.model.dept import Dept as Dept
-from backend.app.admin.model.data_scope import DataScope
+from backend.app.admin.model.login_log import LoginLog as LoginLog
-from backend.app.admin.model.dept import Dept
+from backend.app.admin.model.menu import Menu as Menu
-from backend.app.admin.model.login_log import LoginLog
+from backend.app.admin.model.opera_log import OperaLog as OperaLog
-from backend.app.admin.model.menu import Menu
+from backend.app.admin.model.role import Role as Role
-from backend.app.admin.model.opera_log import OperaLog
+from backend.app.admin.model.user import User as User
-from backend.app.admin.model.role import Role
-from backend.app.admin.model.user import User

backend/app/admin/model/data_rule.py

@@ -1,10 +1,9 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from sqlalchemy import String
+import sqlalchemy as sa
+
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from backend.app.admin.model.m2m import sys_data_scope_rule
@@ -20,14 +19,14 @@ class DataRule(Base):
     __tablename__ = 'sys_data_rule'
 
     id: Mapped[id_key] = mapped_column(init=False)
-    name: Mapped[str] = mapped_column(String(500), unique=True, comment='名称')
+    name: Mapped[str] = mapped_column(sa.String(500), unique=True, comment='名称')
-    model: Mapped[str] = mapped_column(String(50), comment='SQLA 模型名，对应 DATA_PERMISSION_MODELS 键名')
+    model: Mapped[str] = mapped_column(sa.String(50), comment='SQLA 模型名，对应 DATA_PERMISSION_MODELS 键名')
-    column: Mapped[str] = mapped_column(String(20), comment='模型字段名')
+    column: Mapped[str] = mapped_column(sa.String(20), comment='模型字段名')
     operator: Mapped[int] = mapped_column(comment='运算符（0：and、1：or）')
     expression: Mapped[int] = mapped_column(
-        comment='表达式（0：==、1：!=、2：>、3：>=、4：<、5：<=、6：in、7：not_in）'
+        comment='表达式（0：==、1：!=、2：>、3：>=、4：<、5：<=、6：in、7：not_in）',
     )
-    value: Mapped[str] = mapped_column(String(255), comment='规则值')
+    value: Mapped[str] = mapped_column(sa.String(255), comment='规则值')
 
     # 数据范围规则多对多
     scopes: Mapped[list[DataScope]] = relationship(init=False, secondary=sys_data_scope_rule, back_populates='rules')

backend/app/admin/model/data_scope.py

@@ -1,10 +1,9 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from sqlalchemy import String
+import sqlalchemy as sa
+
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from backend.app.admin.model.m2m import sys_data_scope_rule, sys_role_data_scope
@@ -20,7 +19,7 @@ class DataScope(Base):
     __tablename__ = 'sys_data_scope'
 
     id: Mapped[id_key] = mapped_column(init=False)
-    name: Mapped[str] = mapped_column(String(50), unique=True, comment='名称')
+    name: Mapped[str] = mapped_column(sa.String(50), unique=True, comment='名称')
     status: Mapped[int] = mapped_column(default=1, comment='状态（0停用 1正常）')
 
     # 数据范围规则多对多

backend/app/admin/model/dept.py

@@ -1,11 +1,9 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
+
+import sqlalchemy as sa
 
-from sqlalchemy import BigInteger, Boolean, ForeignKey, String
-from sqlalchemy.dialects.postgresql import INTEGER
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from backend.common.model import Base, id_key
@@ -20,22 +18,20 @@ class Dept(Base):
     __tablename__ = 'sys_dept'
 
     id: Mapped[id_key] = mapped_column(init=False)
-    name: Mapped[str] = mapped_column(String(50), comment='部门名称')
+    name: Mapped[str] = mapped_column(sa.String(50), comment='部门名称')
     sort: Mapped[int] = mapped_column(default=0, comment='排序')
-    leader: Mapped[str | None] = mapped_column(String(20), default=None, comment='负责人')
+    leader: Mapped[str | None] = mapped_column(sa.String(20), default=None, comment='负责人')
-    phone: Mapped[str | None] = mapped_column(String(11), default=None, comment='手机')
+    phone: Mapped[str | None] = mapped_column(sa.String(11), default=None, comment='手机')
-    email: Mapped[str | None] = mapped_column(String(50), default=None, comment='邮箱')
+    email: Mapped[str | None] = mapped_column(sa.String(50), default=None, comment='邮箱')
     status: Mapped[int] = mapped_column(default=1, comment='部门状态(0停用 1正常)')
-    del_flag: Mapped[bool] = mapped_column(
+    del_flag: Mapped[bool] = mapped_column(default=False, comment='删除标志（0删除 1存在）')
-        Boolean().with_variant(INTEGER, 'postgresql'), default=False, comment='删除标志（0删除 1存在）'
-    )
 
     # 父级部门一对多
     parent_id: Mapped[int | None] = mapped_column(
-        BigInteger, ForeignKey('sys_dept.id', ondelete='SET NULL'), default=None, index=True, comment='父部门ID'
+        sa.BigInteger, sa.ForeignKey('sys_dept.id', ondelete='SET NULL'), default=None, index=True, comment='父部门ID'
     )
-    parent: Mapped[Optional['Dept']] = relationship(init=False, back_populates='children', remote_side=[id])
+    parent: Mapped[Dept | None] = relationship(init=False, back_populates='children', remote_side=[id])
-    children: Mapped[Optional[list['Dept']]] = relationship(init=False, back_populates='parent')
+    children: Mapped[list[Dept] | None] = relationship(init=False, back_populates='parent')
 
     # 部门用户一对多
     users: Mapped[list[User]] = relationship(init=False, back_populates='dept')

backend/app/admin/model/login_log.py

@@ -1,13 +1,10 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from datetime import datetime
 
-from sqlalchemy import DateTime, String
+import sqlalchemy as sa
-from sqlalchemy.dialects.mysql import LONGTEXT
+
-from sqlalchemy.dialects.postgresql import TEXT
 from sqlalchemy.orm import Mapped, mapped_column
 
-from backend.common.model import DataClassBase, id_key
+from backend.common.model import DataClassBase, TimeZone, UniversalText, id_key
 from backend.utils.timezone import timezone
 
 
@@ -17,19 +14,22 @@ class LoginLog(DataClassBase):
     __tablename__ = 'sys_login_log'
 
     id: Mapped[id_key] = mapped_column(init=False)
-    user_uuid: Mapped[str] = mapped_column(String(50), comment='用户UUID')
+    user_uuid: Mapped[str] = mapped_column(sa.String(50), comment='用户UUID')
-    username: Mapped[str] = mapped_column(String(20), comment='用户名')
+    username: Mapped[str] = mapped_column(sa.String(20), comment='用户名')
     status: Mapped[int] = mapped_column(insert_default=0, comment='登录状态(0失败 1成功)')
-    ip: Mapped[str] = mapped_column(String(50), comment='登录IP地址')
+    ip: Mapped[str] = mapped_column(sa.String(50), comment='登录IP地址')
-    country: Mapped[str | None] = mapped_column(String(50), comment='国家')
+    country: Mapped[str | None] = mapped_column(sa.String(50), comment='国家')
-    region: Mapped[str | None] = mapped_column(String(50), comment='地区')
+    region: Mapped[str | None] = mapped_column(sa.String(50), comment='地区')
-    city: Mapped[str | None] = mapped_column(String(50), comment='城市')
+    city: Mapped[str | None] = mapped_column(sa.String(50), comment='城市')
-    user_agent: Mapped[str] = mapped_column(String(255), comment='请求头')
+    user_agent: Mapped[str] = mapped_column(sa.String(255), comment='请求头')
-    os: Mapped[str | None] = mapped_column(String(50), comment='操作系统')
+    os: Mapped[str | None] = mapped_column(sa.String(50), comment='操作系统')
-    browser: Mapped[str | None] = mapped_column(String(50), comment='浏览器')
+    browser: Mapped[str | None] = mapped_column(sa.String(50), comment='浏览器')
-    device: Mapped[str | None] = mapped_column(String(50), comment='设备')
+    device: Mapped[str | None] = mapped_column(sa.String(50), comment='设备')
-    msg: Mapped[str] = mapped_column(LONGTEXT().with_variant(TEXT, 'postgresql'), comment='提示消息')
+    msg: Mapped[str] = mapped_column(UniversalText, comment='提示消息')
-    login_time: Mapped[datetime] = mapped_column(DateTime(timezone=True), comment='登录时间')
+    login_time: Mapped[datetime] = mapped_column(TimeZone, comment='登录时间')
     created_time: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), init=False, default_factory=timezone.now, comment='创建时间'
+        TimeZone,
+        init=False,
+        default_factory=timezone.now,
+        comment='创建时间',
     )

backend/app/admin/model/m2m.py

@@ -1,54 +1,62 @@
-#!/usr/bin/env python3
+import sqlalchemy as sa
-# -*- coding: utf-8 -*-
-from sqlalchemy import BigInteger, Column, ForeignKey, Table
 
 from backend.common.model import MappedBase
 
-sys_user_role = Table(
+sys_user_role = sa.Table(
     'sys_user_role',
     MappedBase.metadata,
-    Column('id', BigInteger, primary_key=True, unique=True, index=True, autoincrement=True, comment='主键ID'),
+    sa.Column('id', sa.BigInteger, primary_key=True, unique=True, index=True, autoincrement=True, comment='主键ID'),
-    Column('user_id', BigInteger, ForeignKey('sys_user.id', ondelete='CASCADE'), primary_key=True, comment='用户ID'),
+    sa.Column(
-    Column('role_id', BigInteger, ForeignKey('sys_role.id', ondelete='CASCADE'), primary_key=True, comment='角色ID'),
+        'user_id', sa.BigInteger, sa.ForeignKey('sys_user.id', ondelete='CASCADE'), primary_key=True, comment='用户ID'
+    ),
+    sa.Column(
+        'role_id', sa.BigInteger, sa.ForeignKey('sys_role.id', ondelete='CASCADE'), primary_key=True, comment='角色ID'
+    ),
 )
 
-sys_role_menu = Table(
+sys_role_menu = sa.Table(
     'sys_role_menu',
     MappedBase.metadata,
-    Column('id', BigInteger, primary_key=True, unique=True, index=True, autoincrement=True, comment='主键ID'),
+    sa.Column('id', sa.BigInteger, primary_key=True, unique=True, index=True, autoincrement=True, comment='主键ID'),
-    Column('role_id', BigInteger, ForeignKey('sys_role.id', ondelete='CASCADE'), primary_key=True, comment='角色ID'),
+    sa.Column(
-    Column('menu_id', BigInteger, ForeignKey('sys_menu.id', ondelete='CASCADE'), primary_key=True, comment='菜单ID'),
+        'role_id', sa.BigInteger, sa.ForeignKey('sys_role.id', ondelete='CASCADE'), primary_key=True, comment='角色ID'
+    ),
+    sa.Column(
+        'menu_id', sa.BigInteger, sa.ForeignKey('sys_menu.id', ondelete='CASCADE'), primary_key=True, comment='菜单ID'
+    ),
 )
 
-sys_role_data_scope = Table(
+sys_role_data_scope = sa.Table(
     'sys_role_data_scope',
     MappedBase.metadata,
-    Column('id', BigInteger, primary_key=True, unique=True, index=True, autoincrement=True, comment='主键 ID'),
+    sa.Column('id', sa.BigInteger, primary_key=True, unique=True, index=True, autoincrement=True, comment='主键 ID'),
-    Column('role_id', BigInteger, ForeignKey('sys_role.id', ondelete='CASCADE'), primary_key=True, comment='角色 ID'),
+    sa.Column(
-    Column(
+        'role_id', sa.BigInteger, sa.ForeignKey('sys_role.id', ondelete='CASCADE'), primary_key=True, comment='角色 ID'
+    ),
+    sa.Column(
         'data_scope_id',
-        BigInteger,
+        sa.BigInteger,
-        ForeignKey('sys_data_scope.id', ondelete='CASCADE'),
+        sa.ForeignKey('sys_data_scope.id', ondelete='CASCADE'),
         primary_key=True,
         comment='数据范围 ID',
     ),
 )
 
-sys_data_scope_rule = Table(
+sys_data_scope_rule = sa.Table(
     'sys_data_scope_rule',
     MappedBase.metadata,
-    Column('id', BigInteger, primary_key=True, unique=True, index=True, autoincrement=True, comment='主键ID'),
+    sa.Column('id', sa.BigInteger, primary_key=True, unique=True, index=True, autoincrement=True, comment='主键ID'),
-    Column(
+    sa.Column(
         'data_scope_id',
-        BigInteger,
+        sa.BigInteger,
-        ForeignKey('sys_data_scope.id', ondelete='CASCADE'),
+        sa.ForeignKey('sys_data_scope.id', ondelete='CASCADE'),
         primary_key=True,
         comment='数据范围 ID',
     ),
-    Column(
+    sa.Column(
         'data_rule_id',
-        BigInteger,
+        sa.BigInteger,
-        ForeignKey('sys_data_rule.id', ondelete='CASCADE'),
+        sa.ForeignKey('sys_data_rule.id', ondelete='CASCADE'),
         primary_key=True,
         comment='数据规则 ID',
     ),

backend/app/admin/model/menu.py

@@ -1,16 +1,13 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
+
+import sqlalchemy as sa
 
-from sqlalchemy import BigInteger, ForeignKey, String
-from sqlalchemy.dialects.mysql import LONGTEXT
-from sqlalchemy.dialects.postgresql import TEXT
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from backend.app.admin.model.m2m import sys_role_menu
-from backend.common.model import Base, id_key
+from backend.common.model import Base, UniversalText, id_key
 
 if TYPE_CHECKING:
     from backend.app.admin.model import Role
@@ -22,30 +19,26 @@ class Menu(Base):
     __tablename__ = 'sys_menu'
 
     id: Mapped[id_key] = mapped_column(init=False)
-    title: Mapped[str] = mapped_column(String(50), comment='菜单标题')
+    title: Mapped[str] = mapped_column(sa.String(50), comment='菜单标题')
-    name: Mapped[str] = mapped_column(String(50), comment='菜单名称')
+    name: Mapped[str] = mapped_column(sa.String(50), comment='菜单名称')
-    path: Mapped[str | None] = mapped_column(String(200), comment='路由地址')
+    path: Mapped[str | None] = mapped_column(sa.String(200), comment='路由地址')
     sort: Mapped[int] = mapped_column(default=0, comment='排序')
-    icon: Mapped[str | None] = mapped_column(String(100), default=None, comment='菜单图标')
+    icon: Mapped[str | None] = mapped_column(sa.String(100), default=None, comment='菜单图标')
     type: Mapped[int] = mapped_column(default=0, comment='菜单类型（0目录 1菜单 2按钮 3内嵌 4外链）')
-    component: Mapped[str | None] = mapped_column(String(255), default=None, comment='组件路径')
+    component: Mapped[str | None] = mapped_column(sa.String(255), default=None, comment='组件路径')
-    perms: Mapped[str | None] = mapped_column(String(100), default=None, comment='权限标识')
+    perms: Mapped[str | None] = mapped_column(sa.String(100), default=None, comment='权限标识')
     status: Mapped[int] = mapped_column(default=1, comment='菜单状态（0停用 1正常）')
     display: Mapped[int] = mapped_column(default=1, comment='是否显示（0否 1是）')
     cache: Mapped[int] = mapped_column(default=1, comment='是否缓存（0否 1是）')
-    link: Mapped[str | None] = mapped_column(
+    link: Mapped[str | None] = mapped_column(UniversalText, default=None, comment='外链地址')
-        LONGTEXT().with_variant(TEXT, 'postgresql'), default=None, comment='外链地址'
+    remark: Mapped[str | None] = mapped_column(UniversalText, default=None, comment='备注')
-    )
-    remark: Mapped[str | None] = mapped_column(
-        LONGTEXT().with_variant(TEXT, 'postgresql'), default=None, comment='备注'
-    )
 
     # 父级菜单一对多
     parent_id: Mapped[int | None] = mapped_column(
-        BigInteger, ForeignKey('sys_menu.id', ondelete='SET NULL'), default=None, index=True, comment='父菜单ID'
+        sa.BigInteger, sa.ForeignKey('sys_menu.id', ondelete='SET NULL'), default=None, index=True, comment='父菜单ID'
     )
-    parent: Mapped[Optional['Menu']] = relationship(init=False, back_populates='children', remote_side=[id])
+    parent: Mapped[Menu | None] = relationship(init=False, back_populates='children', remote_side=[id])
-    children: Mapped[Optional[list['Menu']]] = relationship(init=False, back_populates='parent')
+    children: Mapped[list[Menu] | None] = relationship(init=False, back_populates='parent')
 
     # 菜单角色多对多
     roles: Mapped[list[Role]] = relationship(init=False, secondary=sys_role_menu, back_populates='menus')

backend/app/admin/model/opera_log.py

@@ -1,13 +1,10 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from datetime import datetime
 
-from sqlalchemy import DateTime, String
+import sqlalchemy as sa
-from sqlalchemy.dialects.mysql import JSON, LONGTEXT
+
-from sqlalchemy.dialects.postgresql import TEXT
 from sqlalchemy.orm import Mapped, mapped_column
 
-from backend.common.model import DataClassBase, id_key
+from backend.common.model import DataClassBase, TimeZone, UniversalText, id_key
 from backend.utils.timezone import timezone
 
 
@@ -17,25 +14,25 @@ class OperaLog(DataClassBase):
     __tablename__ = 'sys_opera_log'
 
     id: Mapped[id_key] = mapped_column(init=False)
-    trace_id: Mapped[str] = mapped_column(String(32), comment='请求跟踪 ID')
+    trace_id: Mapped[str] = mapped_column(sa.String(32), comment='请求跟踪 ID')
-    username: Mapped[str | None] = mapped_column(String(20), comment='用户名')
+    username: Mapped[str | None] = mapped_column(sa.String(20), comment='用户名')
-    method: Mapped[str] = mapped_column(String(20), comment='请求类型')
+    method: Mapped[str] = mapped_column(sa.String(20), comment='请求类型')
-    title: Mapped[str] = mapped_column(String(255), comment='操作模块')
+    title: Mapped[str] = mapped_column(sa.String(255), comment='操作模块')
-    path: Mapped[str] = mapped_column(String(500), comment='请求路径')
+    path: Mapped[str] = mapped_column(sa.String(500), comment='请求路径')
-    ip: Mapped[str] = mapped_column(String(50), comment='IP地址')
+    ip: Mapped[str] = mapped_column(sa.String(50), comment='IP地址')
-    country: Mapped[str | None] = mapped_column(String(50), comment='国家')
+    country: Mapped[str | None] = mapped_column(sa.String(50), comment='国家')
-    region: Mapped[str | None] = mapped_column(String(50), comment='地区')
+    region: Mapped[str | None] = mapped_column(sa.String(50), comment='地区')
-    city: Mapped[str | None] = mapped_column(String(50), comment='城市')
+    city: Mapped[str | None] = mapped_column(sa.String(50), comment='城市')
-    user_agent: Mapped[str] = mapped_column(String(255), comment='请求头')
+    user_agent: Mapped[str] = mapped_column(sa.String(255), comment='请求头')
-    os: Mapped[str | None] = mapped_column(String(50), comment='操作系统')
+    os: Mapped[str | None] = mapped_column(sa.String(50), comment='操作系统')
-    browser: Mapped[str | None] = mapped_column(String(50), comment='浏览器')
+    browser: Mapped[str | None] = mapped_column(sa.String(50), comment='浏览器')
-    device: Mapped[str | None] = mapped_column(String(50), comment='设备')
+    device: Mapped[str | None] = mapped_column(sa.String(50), comment='设备')
-    args: Mapped[str | None] = mapped_column(JSON(), comment='请求参数')
+    args: Mapped[str | None] = mapped_column(sa.JSON(), comment='请求参数')
     status: Mapped[int] = mapped_column(comment='操作状态（0异常 1正常）')
-    code: Mapped[str] = mapped_column(String(20), insert_default='200', comment='操作状态码')
+    code: Mapped[str] = mapped_column(sa.String(20), insert_default='200', comment='操作状态码')
-    msg: Mapped[str | None] = mapped_column(LONGTEXT().with_variant(TEXT, 'postgresql'), comment='提示消息')
+    msg: Mapped[str | None] = mapped_column(UniversalText, comment='提示消息')
     cost_time: Mapped[float] = mapped_column(insert_default=0.0, comment='请求耗时（ms）')
-    opera_time: Mapped[datetime] = mapped_column(DateTime(timezone=True), comment='操作时间')
+    opera_time: Mapped[datetime] = mapped_column(TimeZone, comment='操作时间')
     created_time: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), init=False, default_factory=timezone.now, comment='创建时间'
+        TimeZone, init=False, default_factory=timezone.now, comment='创建时间'
     )

backend/app/admin/model/role.py

@@ -1,16 +1,13 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from sqlalchemy import Boolean, String
+import sqlalchemy as sa
-from sqlalchemy.dialects.mysql import LONGTEXT
+
-from sqlalchemy.dialects.postgresql import INTEGER, TEXT
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from backend.app.admin.model.m2m import sys_role_data_scope, sys_role_menu, sys_user_role
-from backend.common.model import Base, id_key
+from backend.common.model import Base, UniversalText, id_key
 
 if TYPE_CHECKING:
     from backend.app.admin.model import DataScope, Menu, User
@@ -22,14 +19,10 @@ class Role(Base):
     __tablename__ = 'sys_role'
 
     id: Mapped[id_key] = mapped_column(init=False)
-    name: Mapped[str] = mapped_column(String(20), unique=True, comment='角色名称')
+    name: Mapped[str] = mapped_column(sa.String(20), unique=True, comment='角色名称')
     status: Mapped[int] = mapped_column(default=1, comment='角色状态（0停用 1正常）')
-    is_filter_scopes: Mapped[bool] = mapped_column(
+    is_filter_scopes: Mapped[bool] = mapped_column(default=True, comment='过滤数据权限(0否 1是)')
-        Boolean().with_variant(INTEGER, 'postgresql'), default=True, comment='过滤数据权限(0否 1是)'
+    remark: Mapped[str | None] = mapped_column(UniversalText, default=None, comment='备注')
-    )
-    remark: Mapped[str | None] = mapped_column(
-        LONGTEXT().with_variant(TEXT, 'postgresql'), default=None, comment='备注'
-    )
 
     # 角色用户多对多
     users: Mapped[list[User]] = relationship(init=False, secondary=sys_user_role, back_populates='roles')

backend/app/admin/model/user.py

@@ -1,16 +1,14 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from __future__ import annotations
 
 from datetime import datetime
 from typing import TYPE_CHECKING
 
-from sqlalchemy import VARBINARY, Boolean, DateTime, ForeignKey, String
+import sqlalchemy as sa
-from sqlalchemy.dialects.postgresql import BYTEA, INTEGER
+
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from backend.app.admin.model.m2m import sys_user_role
-from backend.common.model import Base, id_key
+from backend.common.model import Base, TimeZone, id_key
 from backend.database.db import uuid4_str
 from backend.utils.timezone import timezone
 
@@ -24,34 +22,26 @@ class User(Base):
     __tablename__ = 'sys_user'
 
     id: Mapped[id_key] = mapped_column(init=False)
-    uuid: Mapped[str] = mapped_column(String(50), init=False, default_factory=uuid4_str, unique=True)
+    uuid: Mapped[str] = mapped_column(sa.String(50), init=False, default_factory=uuid4_str, unique=True)
-    username: Mapped[str] = mapped_column(String(20), unique=True, index=True, comment='用户名')
+    username: Mapped[str] = mapped_column(sa.String(20), unique=True, index=True, comment='用户名')
-    nickname: Mapped[str] = mapped_column(String(20), comment='昵称')
+    nickname: Mapped[str] = mapped_column(sa.String(20), comment='昵称')
-    password: Mapped[str] = mapped_column(String(255), comment='密码')
+    password: Mapped[str | None] = mapped_column(sa.String(255), comment='密码')
-    salt: Mapped[bytes] = mapped_column(VARBINARY(255).with_variant(BYTEA(255), 'postgresql'), comment='加密盐')
+    salt: Mapped[bytes | None] = mapped_column(sa.LargeBinary(255), comment='加密盐')
-    email: Mapped[str | None] = mapped_column(String(50), default=None, unique=True, index=True, comment='邮箱')
+    email: Mapped[str | None] = mapped_column(sa.String(50), default=None, unique=True, index=True, comment='邮箱')
-    phone: Mapped[str | None] = mapped_column(String(11), default=None, comment='手机号')
+    phone: Mapped[str | None] = mapped_column(sa.String(11), default=None, comment='手机号')
-    avatar: Mapped[str | None] = mapped_column(String(255), default=None, comment='头像')
+    avatar: Mapped[str | None] = mapped_column(sa.String(255), default=None, comment='头像')
     status: Mapped[int] = mapped_column(default=1, index=True, comment='用户账号状态(0停用 1正常)')
-    is_superuser: Mapped[bool] = mapped_column(
+    is_superuser: Mapped[bool] = mapped_column(default=False, comment='超级权限(0否 1是)')
-        Boolean().with_variant(INTEGER, 'postgresql'), default=False, comment='超级权限(0否 1是)'
+    is_staff: Mapped[bool] = mapped_column(default=False, comment='后台管理登陆(0否 1是)')
-    )
+    is_multi_login: Mapped[bool] = mapped_column(default=False, comment='是否重复登陆(0否 1是)')
-    is_staff: Mapped[bool] = mapped_column(
+    join_time: Mapped[datetime] = mapped_column(TimeZone, init=False, default_factory=timezone.now, comment='注册时间')
-        Boolean().with_variant(INTEGER, 'postgresql'), default=False, comment='后台管理登陆(0否 1是)'
-    )
-    is_multi_login: Mapped[bool] = mapped_column(
-        Boolean().with_variant(INTEGER, 'postgresql'), default=False, comment='是否重复登陆(0否 1是)'
-    )
-    join_time: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), init=False, default_factory=timezone.now, comment='注册时间'
-    )
     last_login_time: Mapped[datetime | None] = mapped_column(
-        DateTime(timezone=True), init=False, onupdate=timezone.now, comment='上次登录'
+        TimeZone, init=False, onupdate=timezone.now, comment='上次登录'
     )
 
     # 部门用户一对多
     dept_id: Mapped[int | None] = mapped_column(
-        ForeignKey('sys_dept.id', ondelete='SET NULL'), default=None, comment='部门关联ID'
+        sa.BigInteger, sa.ForeignKey('sys_dept.id', ondelete='SET NULL'), default=None, comment='部门关联ID'
     )
     dept: Mapped[Dept | None] = relationship(init=False, back_populates='users')
 

backend/app/admin/schema/__init__.py

@@ -1,2 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-

backend/app/admin/schema/captcha.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from pydantic import Field
 
 from backend.common.schema import SchemaBase
@@ -8,5 +6,6 @@ from backend.common.schema import SchemaBase
 class GetCaptchaDetail(SchemaBase):
     """验证码详情"""
 
-    image_type: str = Field(description='图片类型')
+    uuid: str = Field(description='图片唯一标识')
+    img_type: str = Field(description='图片类型')
     image: str = Field(description='图片内容')

backend/app/admin/schema/data_rule.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from datetime import datetime
 
 from pydantic import ConfigDict, Field
@@ -14,8 +12,8 @@ class DataRuleSchemaBase(SchemaBase):
     name: str = Field(description='规则名称')
     model: str = Field(description='模型名称')
     column: str = Field(description='字段名称')
-    operator: RoleDataRuleOperatorType = Field(RoleDataRuleOperatorType.AND, description='操作符（AND/OR）')
+    operator: RoleDataRuleOperatorType = Field(description='操作符（AND/OR）')
-    expression: RoleDataRuleExpressionType = Field(RoleDataRuleExpressionType.eq, description='表达式类型')
+    expression: RoleDataRuleExpressionType = Field(description='表达式类型')
     value: str = Field(description='规则值')
 
 

backend/app/admin/schema/data_scope.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from datetime import datetime
 
 from pydantic import ConfigDict, Field
@@ -13,7 +11,7 @@ class DataScopeBase(SchemaBase):
     """数据范围基础模型"""
 
     name: str = Field(description='名称')
-    status: StatusType = Field(StatusType.enable, description='状态')
+    status: StatusType = Field(description='状态')
 
 
 class CreateDataScopeParam(DataScopeBase):

backend/app/admin/schema/dept.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from datetime import datetime
 
 from pydantic import ConfigDict, Field
@@ -17,7 +15,7 @@ class DeptSchemaBase(SchemaBase):
     leader: str | None = Field(None, description='负责人')
     phone: CustomPhoneNumber | None = Field(None, description='联系电话')
     email: CustomEmailStr | None = Field(None, description='邮箱')
-    status: StatusType = Field(StatusType.enable, description='状态')
+    status: StatusType = Field(description='状态')
 
 
 class CreateDeptParam(DeptSchemaBase):
@@ -37,3 +35,9 @@ class GetDeptDetail(DeptSchemaBase):
     del_flag: bool = Field(description='是否删除')
     created_time: datetime = Field(description='创建时间')
     updated_time: datetime | None = Field(None, description='更新时间')
+
+
+class GetDeptTree(GetDeptDetail):
+    """获取部门树"""
+
+    children: list['GetDeptTree'] | None = Field(None, description='子菜单')

backend/app/admin/schema/login_log.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from datetime import datetime
 
 from pydantic import ConfigDict, Field

backend/app/admin/schema/menu.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from datetime import datetime
 
 from pydantic import ConfigDict, Field
@@ -17,12 +15,12 @@ class MenuSchemaBase(SchemaBase):
     parent_id: int | None = Field(None, description='菜单父级 ID')
     sort: int = Field(0, ge=0, description='排序')
     icon: str | None = Field(None, description='图标')
-    type: MenuType = Field(MenuType.directory, description='菜单类型（0目录 1菜单 2按钮 3内嵌 4外链）')
+    type: MenuType = Field(description='菜单类型（0目录 1菜单 2按钮 3内嵌 4外链）')
     component: str | None = Field(None, description='组件路径')
     perms: str | None = Field(None, description='权限标识')
-    status: StatusType = Field(StatusType.enable, description='状态')
+    status: StatusType = Field(description='状态')
-    display: StatusType = Field(StatusType.enable, description='是否显示')
+    display: StatusType = Field(description='是否显示')
-    cache: StatusType = Field(StatusType.enable, description='是否缓存')
+    cache: StatusType = Field(description='是否缓存')
     link: str | None = Field(None, description='外链地址')
     remark: str | None = Field(None, description='备注')
 
@@ -43,3 +41,9 @@ class GetMenuDetail(MenuSchemaBase):
     id: int = Field(description='菜单 ID')
     created_time: datetime = Field(description='创建时间')
     updated_time: datetime | None = Field(None, description='更新时间')
+
+
+class GetMenuTree(GetMenuDetail):
+    """获取菜单树"""
+
+    children: list['GetMenuTree'] | None = Field(None, description='子菜单')

backend/app/admin/schema/opera_log.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from datetime import datetime
 from typing import Any
 
@@ -26,7 +24,7 @@ class OperaLogSchemaBase(SchemaBase):
     browser: str | None = Field(None, description='浏览器')
     device: str | None = Field(None, description='设备')
     args: dict[str, Any] | None = Field(None, description='请求参数')
-    status: StatusType = Field(StatusType.enable, description='状态')
+    status: StatusType = Field(description='状态')
     code: str = Field(description='状态码')
     msg: str | None = Field(None, description='消息')
     cost_time: float = Field(description='耗时')

backend/app/admin/schema/role.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from datetime import datetime
 
 from pydantic import ConfigDict, Field
@@ -14,7 +12,7 @@ class RoleSchemaBase(SchemaBase):
     """角色基础模型"""
 
     name: str = Field(description='角色名称')
-    status: StatusType = Field(StatusType.enable, description='状态')
+    status: StatusType = Field(description='状态')
     is_filter_scopes: bool = Field(True, description='过滤数据权限')
     remark: str | None = Field(None, description='备注')
 

backend/app/admin/schema/token.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from datetime import datetime
 
 from pydantic import Field

backend/app/admin/schema/user.py

@@ -1,9 +1,7 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from datetime import datetime
 from typing import Any
 
-from pydantic import ConfigDict, EmailStr, Field, HttpUrl, model_validator
+from pydantic import ConfigDict, Field, HttpUrl, model_validator
 from typing_extensions import Self
 
 from backend.app.admin.schema.dept import GetDeptDetail
@@ -16,28 +14,32 @@ class AuthSchemaBase(SchemaBase):
     """用户认证基础模型"""
 
     username: str = Field(description='用户名')
-    password: str | None = Field(description='密码')
+    password: str = Field(description='密码')
 
 
 class AuthLoginParam(AuthSchemaBase):
     """用户登录参数"""
 
+    uuid: str = Field(description='验证码 UUID')
     captcha: str = Field(description='验证码')
 
 
 class AddUserParam(AuthSchemaBase):
     """添加用户参数"""
 
+    nickname: str | None = Field(None, description='昵称')
+    email: CustomEmailStr | None = Field(None, description='邮箱')
+    phone: CustomPhoneNumber | None = Field(None, description='手机号码')
     dept_id: int = Field(description='部门 ID')
     roles: list[int] = Field(description='角色 ID 列表')
-    nickname: str | None = Field(None, description='昵称')
 
 
 class AddOAuth2UserParam(AuthSchemaBase):
     """添加 OAuth2 用户参数"""
 
+    password: str | None = Field(None, description='密码')
     nickname: str | None = Field(None, description='昵称')
-    email: EmailStr = Field(description='邮箱')
+    email: CustomEmailStr | None = Field(None, description='邮箱')
     avatar: HttpUrl | None = Field(None, description='头像地址')
 
 
@@ -56,6 +58,8 @@ class UserInfoSchemaBase(SchemaBase):
     username: str = Field(description='用户名')
     nickname: str = Field(description='昵称')
     avatar: HttpUrl | None = Field(None, description='头像地址')
+    email: CustomEmailStr | None = Field(None, description='邮箱')
+    phone: CustomPhoneNumber | None = Field(None, description='手机号')
 
 
 class UpdateUserParam(UserInfoSchemaBase):
@@ -72,9 +76,7 @@ class GetUserInfoDetail(UserInfoSchemaBase):
     dept_id: int | None = Field(None, description='部门 ID')
     id: int = Field(description='用户 ID')
     uuid: str = Field(description='用户 UUID')
-    email: CustomEmailStr | None = Field(None, description='邮箱')
+    status: StatusType = Field(description='状态')
-    phone: CustomPhoneNumber | None = Field(None, description='手机号')
-    status: StatusType = Field(StatusType.enable, description='状态')
     is_superuser: bool = Field(description='是否超级管理员')
     is_staff: bool = Field(description='是否管理员')
     is_multi_login: bool = Field(description='是否允许多端登录')

backend/app/admin/service/__init__.py

@@ -1,2 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-

backend/app/admin/service/auth_service.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from fastapi import Request, Response
 from fastapi.security import HTTPBasicCredentials
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -11,8 +9,10 @@ from backend.app.admin.model import User
 from backend.app.admin.schema.token import GetLoginToken, GetNewToken
 from backend.app.admin.schema.user import AuthLoginParam
 from backend.app.admin.service.login_log_service import login_log_service
+from backend.common.context import ctx
 from backend.common.enums import LoginLogStatusType
 from backend.common.exception import errors
+from backend.common.i18n import t
 from backend.common.log import log
 from backend.common.response.response_code import CustomErrorCode
 from backend.common.security.jwt import (
@@ -24,7 +24,7 @@ from backend.common.security.jwt import (
     password_verify,
 )
 from backend.core.conf import settings
-from backend.database.db import async_db_session, uuid4_str
+from backend.database.db import uuid4_str
 from backend.database.redis import redis_client
 from backend.utils.timezone import timezone
 
@@ -33,7 +33,7 @@ class AuthService:
     """认证服务类"""
 
     @staticmethod
-    async def user_verify(db: AsyncSession, username: str, password: str | None) -> User:
+    async def user_verify(db: AsyncSession, username: str, password: str) -> User:
         """
         验证用户名和密码
 
@@ -48,135 +48,137 @@ class AuthService:
 
         if user.password is None:
             raise errors.AuthorizationError(msg='用户名或密码有误')
-        else:
+        if not password_verify(password, user.password):
-            if not password_verify(password, user.password):
+            raise errors.AuthorizationError(msg='用户名或密码有误')
-                raise errors.AuthorizationError(msg='用户名或密码有误')
 
         if not user.status:
             raise errors.AuthorizationError(msg='用户已被锁定, 请联系统管理员')
 
         return user
 
-    async def swagger_login(self, *, obj: HTTPBasicCredentials) -> tuple[str, User]:
+    async def swagger_login(self, *, db: AsyncSession, obj: HTTPBasicCredentials) -> tuple[str, User]:
         """
         Swagger 文档登录
 
+        :param db: 数据库会话
         :param obj: 登录凭证
         :return:
         """
-        async with async_db_session.begin() as db:
+        user = await self.user_verify(db, obj.username, obj.password)
-            user = await self.user_verify(db, obj.username, obj.password)
+        await user_dao.update_login_time(db, obj.username)
-            await user_dao.update_login_time(db, obj.username)
+        access_token = await create_access_token(
-            access_token = await create_access_token(
+            user.id,
-                user.id,
+            multi_login=user.is_multi_login,
-                user.is_multi_login,
+            # extra info
-                # extra info
+            swagger=True,
-                swagger=True,
+        )
-            )
+        return access_token.access_token, user
-            return access_token.access_token, user
 
     async def login(
-        self, *, request: Request, response: Response, obj: AuthLoginParam, background_tasks: BackgroundTasks
+        self,
+        *,
+        db: AsyncSession,
+        response: Response,
+        obj: AuthLoginParam,
+        background_tasks: BackgroundTasks,
     ) -> GetLoginToken:
         """
         用户登录
 
+        :param db: 数据库会话
         :param request: 请求对象
         :param response: 响应对象
         :param obj: 登录参数
         :param background_tasks: 后台任务
         :return:
         """
-        async with async_db_session.begin() as db:
+        user = None
-            user = None
+        try:
-            try:
+            user = await self.user_verify(db, obj.username, obj.password)
-                user = await self.user_verify(db, obj.username, obj.password)
+            captcha_code = await redis_client.get(f'{settings.CAPTCHA_LOGIN_REDIS_PREFIX}:{obj.uuid}')
-                captcha_code = await redis_client.get(f'{settings.CAPTCHA_LOGIN_REDIS_PREFIX}:{request.state.ip}')
+            if not captcha_code:
-                if not captcha_code:
+                raise errors.RequestError(msg=t('error.captcha.expired'))
-                    raise errors.RequestError(msg='验证码失效，请重新获取')
+            if captcha_code.lower() != obj.captcha.lower():
-                if captcha_code.lower() != obj.captcha.lower():
+                raise errors.CustomError(error=CustomErrorCode.CAPTCHA_ERROR)
-                    raise errors.CustomError(error=CustomErrorCode.CAPTCHA_ERROR)
+            await redis_client.delete(f'{settings.CAPTCHA_LOGIN_REDIS_PREFIX}:{obj.uuid}')
-                await redis_client.delete(f'{settings.CAPTCHA_LOGIN_REDIS_PREFIX}:{request.state.ip}')
+            await user_dao.update_login_time(db, obj.username)
-                await user_dao.update_login_time(db, obj.username)
+            await db.refresh(user)
-                await db.refresh(user)
+            access_token = await create_access_token(
-                access_token = await create_access_token(
+                user.id,
-                    user.id,
+                multi_login=user.is_multi_login,
-                    user.is_multi_login,
+                # extra info
-                    # extra info
+                username=user.username,
-                    username=user.username,
+                nickname=user.nickname,
-                    nickname=user.nickname,
+                last_login_time=timezone.to_str(user.last_login_time),
-                    last_login_time=timezone.to_str(user.last_login_time),
+                ip=ctx.ip,
-                    ip=request.state.ip,
+                os=ctx.os,
-                    os=request.state.os,
+                browser=ctx.browser,
-                    browser=request.state.browser,
+                device=ctx.device,
-                    device=request.state.device,
+            )
-                )
+            refresh_token = await create_refresh_token(
-                refresh_token = await create_refresh_token(access_token.session_uuid, user.id, user.is_multi_login)
+                access_token.session_uuid,
-                response.set_cookie(
+                user.id,
-                    key=settings.COOKIE_REFRESH_TOKEN_KEY,
+                multi_login=user.is_multi_login,
-                    value=refresh_token.refresh_token,
+            )
-                    max_age=settings.COOKIE_REFRESH_TOKEN_EXPIRE_SECONDS,
+            response.set_cookie(
-                    expires=timezone.to_utc(refresh_token.refresh_token_expire_time),
+                key=settings.COOKIE_REFRESH_TOKEN_KEY,
-                    httponly=True,
+                value=refresh_token.refresh_token,
-                )
+                max_age=settings.COOKIE_REFRESH_TOKEN_EXPIRE_SECONDS,
-            except errors.NotFoundError as e:
+                expires=timezone.to_utc(refresh_token.refresh_token_expire_time),
-                log.error('登陆错误: 用户名不存在')
+                httponly=True,
-                raise errors.NotFoundError(msg=e.msg)
+            )
-            except (errors.RequestError, errors.CustomError) as e:
+        except errors.NotFoundError as e:
-                if not user:
+            log.error('登陆错误: 用户名不存在')
-                    log.error('登陆错误: 用户密码有误')
+            raise errors.NotFoundError(msg=e.msg)
-                task = BackgroundTask(
+        except (errors.RequestError, errors.CustomError) as e:
-                    login_log_service.create,
+            if not user:
-                    **dict(
+                log.error('登陆错误: 用户密码有误')
-                        db=db,
+            task = BackgroundTask(
-                        request=request,
+                login_log_service.create,
-                        user_uuid=user.uuid if user else uuid4_str(),
+                db=db,
-                        username=obj.username,
+                user_uuid=user.uuid if user else uuid4_str(),
-                        login_time=timezone.now(),
+                username=obj.username,
-                        status=LoginLogStatusType.fail.value,
+                login_time=timezone.now(),
-                        msg=e.msg,
+                status=LoginLogStatusType.fail.value,
-                    ),
+                msg=e.msg,
-                )
+            )
-                raise errors.RequestError(msg=e.msg, background=task)
+            raise errors.RequestError(code=e.code, msg=e.msg, background=task)
-            except Exception as e:
+        except Exception as e:
-                log.error(f'登陆错误: {e}')
+            log.error(f'登陆错误: {e}')
-                raise e
+            raise
-            else:
+        else:
-                background_tasks.add_task(
+            background_tasks.add_task(
-                    login_log_service.create,
+                login_log_service.create,
-                    **dict(
+                db=db,
-                        db=db,
+                user_uuid=user.uuid,
-                        request=request,
+                username=obj.username,
-                        user_uuid=user.uuid,
+                login_time=timezone.now(),
-                        username=obj.username,
+                status=LoginLogStatusType.success.value,
-                        login_time=timezone.now(),
+                msg=t('success.login.success'),
-                        status=LoginLogStatusType.success.value,
+            )
-                        msg='登录成功',
+            data = GetLoginToken(
-                    ),
+                access_token=access_token.access_token,
-                )
+                access_token_expire_time=access_token.access_token_expire_time,
-                data = GetLoginToken(
+                session_uuid=access_token.session_uuid,
-                    access_token=access_token.access_token,
+                user=user,  # type: ignore
-                    access_token_expire_time=access_token.access_token_expire_time,
+            )
-                    session_uuid=access_token.session_uuid,
+            return data
-                    user=user,  # type: ignore
-                )
-                return data
 
     @staticmethod
-    async def get_codes(*, request: Request) -> list[str]:
+    async def get_codes(*, db: AsyncSession, request: Request) -> list[str]:
         """
         获取用户权限码
 
+        :param db: 数据库会话
         :param request: FastAPI 请求对象
         :return:
         """
         codes = set()
         if request.user.is_superuser:
-            async with async_db_session.begin() as db:
+            menus = await menu_dao.get_all(db, None, None)
-                menus = await menu_dao.get_all(db, None, None)
+            for menu in menus:
-                for menu in menus:
+                if menu.perms:
-                    if menu.perms:
+                    codes.add(*menu.perms.split(','))
-                        codes.add(*menu.perms.split(','))
         else:
             roles = request.user.roles
             if roles:
@@ -188,43 +190,46 @@ class AuthService:
         return list(codes)
 
     @staticmethod
-    async def refresh_token(*, request: Request) -> GetNewToken:
+    async def refresh_token(*, db: AsyncSession, request: Request) -> GetNewToken:
         """
         刷新令牌
 
+        :param db: 数据库会话
         :param request: FastAPI 请求对象
         :return:
         """
         refresh_token = request.cookies.get(settings.COOKIE_REFRESH_TOKEN_KEY)
         if not refresh_token:
-            raise errors.TokenError(msg='Refresh Token 已过期，请重新登录')
+            raise errors.RequestError(msg='Refresh Token 已过期，请重新登录')
         token_payload = jwt_decode(refresh_token)
-        async with async_db_session() as db:
+
-            user = await user_dao.get(db, token_payload.id)
+        user = await user_dao.get(db, token_payload.id)
-            if not user:
+        if not user:
-                raise errors.NotFoundError(msg='用户不存在')
+            raise errors.NotFoundError(msg='用户不存在')
-            elif not user.status:
+        if not user.status:
-                raise errors.AuthorizationError(msg='用户已被锁定, 请联系统管理员')
+            raise errors.AuthorizationError(msg='用户已被锁定, 请联系统管理员')
-            new_token = await create_new_token(
+        if not user.is_multi_login and await redis_client.keys(match=f'{settings.TOKEN_REDIS_PREFIX}:{user.id}:*'):
-                refresh_token,
+            raise errors.ForbiddenError(msg='此用户已在异地登录，请重新登录并及时修改密码')
-                token_payload.session_uuid,
+        new_token = await create_new_token(
-                user.id,
+            refresh_token,
-                user.is_multi_login,
+            token_payload.session_uuid,
-                # extra info
+            user.id,
-                username=user.username,
+            multi_login=user.is_multi_login,
-                nickname=user.nickname,
+            # extra info
-                last_login_time=timezone.to_str(user.last_login_time),
+            username=user.username,
-                ip=request.state.ip,
+            nickname=user.nickname,
-                os=request.state.os,
+            last_login_time=timezone.to_str(user.last_login_time),
-                browser=request.state.browser,
+            ip=ctx.ip,
-                device_type=request.state.device,
+            os=ctx.os,
-            )
+            browser=ctx.browser,
-            data = GetNewToken(
+            device_type=ctx.device,
-                access_token=new_token.new_access_token,
+        )
-                access_token_expire_time=new_token.new_access_token_expire_time,
+        data = GetNewToken(
-                session_uuid=new_token.session_uuid,
+            access_token=new_token.new_access_token,
-            )
+            access_token_expire_time=new_token.new_access_token_expire_time,
-            return data
+            session_uuid=new_token.session_uuid,
+        )
+        return data
 
     @staticmethod
     async def logout(*, request: Request, response: Response) -> None:

backend/app/admin/service/data_rule_service.py

@@ -1,8 +1,7 @@
-#!/usr/bin/env python3
+from collections.abc import Sequence
-# -*- coding: utf-8 -*-
+from typing import Any
-from typing import Sequence
 
-from sqlalchemy import Select
+from sqlalchemy.ext.asyncio import AsyncSession
 
 from backend.app.admin.crud.crud_data_rule import data_rule_dao
 from backend.app.admin.model import DataRule
@@ -13,8 +12,8 @@ from backend.app.admin.schema.data_rule import (
     UpdateDataRuleParam,
 )
 from backend.common.exception import errors
+from backend.common.pagination import paging_data
 from backend.core.conf import settings
-from backend.database.db import async_db_session
 from backend.utils.import_parse import dynamic_import_data_model
 
 
@@ -22,18 +21,19 @@ class DataRuleService:
     """数据规则服务类"""
 
     @staticmethod
-    async def get(*, pk: int) -> DataRule:
+    async def get(*, db: AsyncSession, pk: int) -> DataRule:
         """
         获取数据规则详情
 
+        :param db: 数据库会话
         :param pk: 规则 ID
         :return:
         """
-        async with async_db_session() as db:
+
-            data_rule = await data_rule_dao.get(db, pk)
+        data_rule = await data_rule_dao.get(db, pk)
-            if not data_rule:
+        if not data_rule:
-                raise errors.NotFoundError(msg='数据规则不存在')
+            raise errors.NotFoundError(msg='数据规则不存在')
-            return data_rule
+        return data_rule
 
     @staticmethod
     async def get_models() -> list[str]:
@@ -60,66 +60,72 @@ class DataRuleService:
         return model_columns
 
     @staticmethod
-    async def get_select(*, name: str | None) -> Select:
+    async def get_list(*, db: AsyncSession, name: str | None) -> dict[str, Any]:
         """
-        获取数据规则列表查询条件
+        获取数据规则列表
 
+        :param db: 数据库会话
         :param name: 规则名称
         :return:
         """
-        return await data_rule_dao.get_list(name=name)
+        data_rule_select = await data_rule_dao.get_select(name=name)
+        return await paging_data(db, data_rule_select)
 
     @staticmethod
-    async def get_all() -> Sequence[DataRule]:
+    async def get_all(*, db: AsyncSession) -> Sequence[DataRule]:
-        """获取所有数据规则"""
+        """
-        async with async_db_session() as db:
+        获取所有数据规则
-            data_rules = await data_rule_dao.get_all(db)
+
-            return data_rules
+        :param db: 数据库会话
+        :return:
+        """
+
+        data_rules = await data_rule_dao.get_all(db)
+        return data_rules
 
     @staticmethod
-    async def create(*, obj: CreateDataRuleParam) -> None:
+    async def create(*, db: AsyncSession, obj: CreateDataRuleParam) -> None:
         """
         创建数据规则
 
+        :param db: 数据库会话
         :param obj: 规则创建参数
         :return:
         """
-        async with async_db_session.begin() as db:
+        data_rule = await data_rule_dao.get_by_name(db, obj.name)
-            data_rule = await data_rule_dao.get_by_name(db, obj.name)
+        if data_rule:
-            if data_rule:
+            raise errors.ConflictError(msg='数据规则已存在')
-                raise errors.ConflictError(msg='数据规则已存在')
+        await data_rule_dao.create(db, obj)
-            await data_rule_dao.create(db, obj)
 
     @staticmethod
-    async def update(*, pk: int, obj: UpdateDataRuleParam) -> int:
+    async def update(*, db: AsyncSession, pk: int, obj: UpdateDataRuleParam) -> int:
         """
         更新数据规则
 
+        :param db: 数据库会话
         :param pk: 规则 ID
         :param obj: 规则更新参数
         :return:
         """
-        async with async_db_session.begin() as db:
+        data_rule = await data_rule_dao.get(db, pk)
-            data_rule = await data_rule_dao.get(db, pk)
+        if not data_rule:
-            if not data_rule:
+            raise errors.NotFoundError(msg='数据规则不存在')
-                raise errors.NotFoundError(msg='数据规则不存在')
+        if data_rule.name != obj.name and await data_rule_dao.get_by_name(db, obj.name):
-            if data_rule.name != obj.name:
+            raise errors.ConflictError(msg='数据规则已存在')
-                if await data_rule_dao.get_by_name(db, obj.name):
+        count = await data_rule_dao.update(db, pk, obj)
-                    raise errors.ConflictError(msg='数据规则已存在')
+        return count
-            count = await data_rule_dao.update(db, pk, obj)
-            return count
 
     @staticmethod
-    async def delete(*, obj: DeleteDataRuleParam) -> int:
+    async def delete(*, db: AsyncSession, obj: DeleteDataRuleParam) -> int:
         """
         批量删除数据规则
 
+        :param db: 数据库会话
         :param obj: 规则 ID 列表
         :return:
         """
-        async with async_db_session.begin() as db:
+        count = await data_rule_dao.delete(db, obj.pks)
-            count = await data_rule_dao.delete(db, obj.pks)
+        return count
-            return count
 
 
 data_rule_service: DataRuleService = DataRuleService()

backend/app/admin/service/data_scope_service.py

@@ -1,8 +1,7 @@
-#!/usr/bin/env python3
+from collections.abc import Sequence
-# -*- coding: utf-8 -*-
+from typing import Any
-from typing import Sequence
 
-from sqlalchemy import Select
+from sqlalchemy.ext.asyncio import AsyncSession
 
 from backend.app.admin.crud.crud_data_scope import data_scope_dao
 from backend.app.admin.model import DataScope
@@ -13,8 +12,8 @@ from backend.app.admin.schema.data_scope import (
     UpdateDataScopeRuleParam,
 )
 from backend.common.exception import errors
+from backend.common.pagination import paging_data
 from backend.core.conf import settings
-from backend.database.db import async_db_session
 from backend.database.redis import redis_client
 
 
@@ -22,89 +21,97 @@ class DataScopeService:
     """数据范围服务类"""
 
     @staticmethod
-    async def get(*, pk: int) -> DataScope:
+    async def get(*, db: AsyncSession, pk: int) -> DataScope:
         """
         获取数据范围详情
 
+        :param db: 数据库会话
         :param pk: 范围 ID
         :return:
         """
-        async with async_db_session() as db:
+
-            data_scope = await data_scope_dao.get(db, pk)
+        data_scope = await data_scope_dao.get(db, pk)
-            if not data_scope:
+        if not data_scope:
-                raise errors.NotFoundError(msg='数据范围不存在')
+            raise errors.NotFoundError(msg='数据范围不存在')
-            return data_scope
+        return data_scope
 
     @staticmethod
-    async def get_all() -> Sequence[DataScope]:
+    async def get_all(*, db: AsyncSession) -> Sequence[DataScope]:
-        """获取所有数据范围"""
+        """
-        async with async_db_session() as db:
+        获取所有数据范围
-            data_scopes = await data_scope_dao.get_all(db)
+
-            return data_scopes
+        :param db: 数据库会话
+        :return:
+        """
+
+        data_scopes = await data_scope_dao.get_all(db)
+        return data_scopes
 
     @staticmethod
-    async def get_rules(*, pk: int) -> DataScope:
+    async def get_rules(*, db: AsyncSession, pk: int) -> DataScope:
         """
         获取数据范围规则
 
+        :param db: 数据库会话
         :param pk: 范围 ID
         :return:
         """
-        async with async_db_session() as db:
+
-            data_scope = await data_scope_dao.get_with_relation(db, pk)
+        data_scope = await data_scope_dao.get_with_relation(db, pk)
-            if not data_scope:
+        if not data_scope:
-                raise errors.NotFoundError(msg='数据范围不存在')
+            raise errors.NotFoundError(msg='数据范围不存在')
-            return data_scope
+        return data_scope
 
     @staticmethod
-    async def get_select(*, name: str | None, status: int | None) -> Select:
+    async def get_list(*, db: AsyncSession, name: str | None, status: int | None) -> dict[str, Any]:
         """
-        获取数据范围列表查询条件
+        获取数据范围列表
 
+        :param db: 数据库会话
         :param name: 范围名称
         :param status: 范围状态
         :return:
         """
-        return await data_scope_dao.get_list(name, status)
+        data_scope_select = await data_scope_dao.get_select(name, status)
+        return await paging_data(db, data_scope_select)
 
     @staticmethod
-    async def create(*, obj: CreateDataScopeParam) -> None:
+    async def create(*, db: AsyncSession, obj: CreateDataScopeParam) -> None:
         """
         创建数据范围
 
+        :param db: 数据库会话
         :param obj: 数据范围参数
         :return:
         """
-        async with async_db_session.begin() as db:
+        data_scope = await data_scope_dao.get_by_name(db, obj.name)
-            data_scope = await data_scope_dao.get_by_name(db, obj.name)
+        if data_scope:
-            if data_scope:
+            raise errors.ConflictError(msg='数据范围已存在')
-                raise errors.ConflictError(msg='数据范围已存在')
+        await data_scope_dao.create(db, obj)
-            await data_scope_dao.create(db, obj)
 
     @staticmethod
-    async def update(*, pk: int, obj: UpdateDataScopeParam) -> int:
+    async def update(*, db: AsyncSession, pk: int, obj: UpdateDataScopeParam) -> int:
         """
         更新数据范围
 
+        :param db: 数据库会话
         :param pk: 范围 ID
         :param obj: 数据范围更新参数
         :return:
         """
-        async with async_db_session.begin() as db:
+        data_scope = await data_scope_dao.get(db, pk)
-            data_scope = await data_scope_dao.get(db, pk)
+        if not data_scope:
-            if not data_scope:
+            raise errors.NotFoundError(msg='数据范围不存在')
-                raise errors.NotFoundError(msg='数据范围不存在')
+        if data_scope.name != obj.name and await data_scope_dao.get_by_name(db, obj.name):
-            if data_scope.name != obj.name:
+            raise errors.ConflictError(msg='数据范围已存在')
-                if await data_scope_dao.get_by_name(db, obj.name):
+        count = await data_scope_dao.update(db, pk, obj)
-                    raise errors.ConflictError(msg='数据范围已存在')
+        for role in await data_scope.awaitable_attrs.roles:
-            count = await data_scope_dao.update(db, pk, obj)
+            for user in await role.awaitable_attrs.users:
-            for role in await data_scope.awaitable_attrs.roles:
+                await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
-                for user in await role.awaitable_attrs.users:
+        return count
-                    await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
-            return count
 
     @staticmethod
-    async def update_data_scope_rule(*, pk: int, rule_ids: UpdateDataScopeRuleParam) -> int:
+    async def update_data_scope_rule(*, db: AsyncSession, pk: int, rule_ids: UpdateDataScopeRuleParam) -> int:
         """
         更新数据范围规则
 
@@ -112,27 +119,26 @@ class DataScopeService:
         :param rule_ids: 规则 ID 列表
         :return:
         """
-        async with async_db_session.begin() as db:
+        count = await data_scope_dao.update_rules(db, pk, rule_ids)
-            count = await data_scope_dao.update_rules(db, pk, rule_ids)
+        return count
-            return count
 
     @staticmethod
-    async def delete(*, obj: DeleteDataScopeParam) -> int:
+    async def delete(*, db: AsyncSession, obj: DeleteDataScopeParam) -> int:
         """
         批量删除数据范围
 
+        :param db: 数据库会话
         :param obj: 范围 ID 列表
         :return:
         """
-        async with async_db_session.begin() as db:
+        count = await data_scope_dao.delete(db, obj.pks)
-            count = await data_scope_dao.delete(db, obj.pks)
+        for pk in obj.pks:
-            for pk in obj.pks:
+            data_rule = await data_scope_dao.get(db, pk)
-                data_rule = await data_scope_dao.get(db, pk)
+            if data_rule:
-                if data_rule:
+                for role in await data_rule.awaitable_attrs.roles:
-                    for role in await data_rule.awaitable_attrs.roles:
+                    for user in await role.awaitable_attrs.users:
-                        for user in await role.awaitable_attrs.users:
+                        await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
-                            await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
+        return count
-            return count
 
 
 data_scope_service: DataScopeService = DataScopeService()

backend/app/admin/service/dept_service.py

@@ -1,15 +1,13 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from typing import Any
 
 from fastapi import Request
+from sqlalchemy.ext.asyncio import AsyncSession
 
 from backend.app.admin.crud.crud_dept import dept_dao
 from backend.app.admin.model import Dept
 from backend.app.admin.schema.dept import CreateDeptParam, UpdateDeptParam
 from backend.common.exception import errors
 from backend.core.conf import settings
-from backend.database.db import async_db_session
 from backend.database.redis import redis_client
 from backend.utils.build_tree import get_tree_data
 
@@ -18,26 +16,34 @@ class DeptService:
     """部门服务类"""
 
     @staticmethod
-    async def get(*, pk: int) -> Dept:
+    async def get(*, db: AsyncSession, pk: int) -> Dept:
         """
         获取部门详情
 
+        :param db: 数据库会话
         :param pk: 部门 ID
         :return:
         """
-        async with async_db_session() as db:
+
-            dept = await dept_dao.get(db, pk)
+        dept = await dept_dao.get(db, pk)
-            if not dept:
+        if not dept:
-                raise errors.NotFoundError(msg='部门不存在')
+            raise errors.NotFoundError(msg='部门不存在')
-            return dept
+        return dept
 
     @staticmethod
     async def get_tree(
-        *, request: Request, name: str | None, leader: str | None, phone: str | None, status: int | None
+        *,
+        db: AsyncSession,
+        request: Request,
+        name: str | None,
+        leader: str | None,
+        phone: str | None,
+        status: int | None,
     ) -> list[dict[str, Any]]:
         """
         获取部门树形结构
 
+        :param db: 数据库会话
         :param request: FastAPI 请求对象
         :param name: 部门名称
         :param leader: 部门负责人
@@ -45,73 +51,72 @@ class DeptService:
         :param status: 状态
         :return:
         """
-        async with async_db_session() as db:
+
-            dept_select = await dept_dao.get_all(request, db, name, leader, phone, status)
+        dept_select = await dept_dao.get_all(request, db, name, leader, phone, status)
-            tree_data = get_tree_data(dept_select)
+        tree_data = get_tree_data(dept_select)
-            return tree_data
+        return tree_data
 
     @staticmethod
-    async def create(*, obj: CreateDeptParam) -> None:
+    async def create(*, db: AsyncSession, obj: CreateDeptParam) -> None:
         """
         创建部门
 
+        :param db: 数据库会话
         :param obj: 部门创建参数
         :return:
         """
-        async with async_db_session.begin() as db:
+        dept = await dept_dao.get_by_name(db, obj.name)
-            dept = await dept_dao.get_by_name(db, obj.name)
+        if dept:
-            if dept:
+            raise errors.ConflictError(msg='部门名称已存在')
-                raise errors.ConflictError(msg='部门名称已存在')
+        if obj.parent_id:
-            if obj.parent_id:
+            parent_dept = await dept_dao.get(db, obj.parent_id)
-                parent_dept = await dept_dao.get(db, obj.parent_id)
+            if not parent_dept:
-                if not parent_dept:
+                raise errors.NotFoundError(msg='父级部门不存在')
-                    raise errors.NotFoundError(msg='父级部门不存在')
+        await dept_dao.create(db, obj)
-            await dept_dao.create(db, obj)
 
     @staticmethod
-    async def update(*, pk: int, obj: UpdateDeptParam) -> int:
+    async def update(*, db: AsyncSession, pk: int, obj: UpdateDeptParam) -> int:
         """
         更新部门
 
+        :param db: 数据库会话
         :param pk: 部门 ID
         :param obj: 部门更新参数
         :return:
         """
-        async with async_db_session.begin() as db:
+        dept = await dept_dao.get(db, pk)
-            dept = await dept_dao.get(db, pk)
+        if not dept:
-            if not dept:
+            raise errors.NotFoundError(msg='部门不存在')
-                raise errors.NotFoundError(msg='部门不存在')
+        if dept.name != obj.name and await dept_dao.get_by_name(db, obj.name):
-            if dept.name != obj.name:
+            raise errors.ConflictError(msg='部门名称已存在')
-                if await dept_dao.get_by_name(db, obj.name):
+        if obj.parent_id:
-                    raise errors.ConflictError(msg='部门名称已存在')
+            parent_dept = await dept_dao.get(db, obj.parent_id)
-            if obj.parent_id:
+            if not parent_dept:
-                parent_dept = await dept_dao.get(db, obj.parent_id)
+                raise errors.NotFoundError(msg='父级部门不存在')
-                if not parent_dept:
+        if obj.parent_id == dept.id:
-                    raise errors.NotFoundError(msg='父级部门不存在')
+            raise errors.ForbiddenError(msg='禁止关联自身为父级')
-            if obj.parent_id == dept.id:
+        count = await dept_dao.update(db, pk, obj)
-                raise errors.ForbiddenError(msg='禁止关联自身为父级')
+        return count
-            count = await dept_dao.update(db, pk, obj)
-            return count
 
     @staticmethod
-    async def delete(*, pk: int) -> int:
+    async def delete(*, db: AsyncSession, pk: int) -> int:
         """
         删除部门
 
+        :param db: 数据库会话
         :param pk: 部门 ID
         :return:
         """
-        async with async_db_session.begin() as db:
+        dept = await dept_dao.get_with_relation(db, pk)
-            dept = await dept_dao.get_with_relation(db, pk)
+        if dept.users:
-            if dept.users:
+            raise errors.ConflictError(msg='部门下存在用户，无法删除')
-                raise errors.ConflictError(msg='部门下存在用户，无法删除')
+        children = await dept_dao.get_children(db, pk)
-            children = await dept_dao.get_children(db, pk)
+        if children:
-            if children:
+            raise errors.ConflictError(msg='部门下存在子部门，无法删除')
-                raise errors.ConflictError(msg='部门下存在子部门，无法删除')
+        count = await dept_dao.delete(db, pk)
-            count = await dept_dao.delete(db, pk)
+        for user in dept.users:
-            for user in dept.users:
+            await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
-                await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
+        return count
-            return count
 
 
 dept_service: DeptService = DeptService()

backend/app/admin/service/login_log_service.py

@@ -1,37 +1,36 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from datetime import datetime
+from typing import Any
 
-from fastapi import Request
-from sqlalchemy import Select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from backend.app.admin.crud.crud_login_log import login_log_dao
 from backend.app.admin.schema.login_log import CreateLoginLogParam, DeleteLoginLogParam
+from backend.common.context import ctx
 from backend.common.log import log
-from backend.database.db import async_db_session
+from backend.common.pagination import paging_data
 
 
 class LoginLogService:
     """登录日志服务类"""
 
     @staticmethod
-    async def get_select(*, username: str | None, status: int | None, ip: str | None) -> Select:
+    async def get_list(*, db: AsyncSession, username: str | None, status: int | None, ip: str | None) -> dict[str, Any]:
         """
-        获取登录日志列表查询条件
+        获取登录日志列表
 
+        :param db: 数据库会话
         :param username: 用户名
         :param status: 状态
         :param ip: IP 地址
         :return:
         """
-        return await login_log_dao.get_list(username=username, status=status, ip=ip)
+        log_select = await login_log_dao.get_select(username=username, status=status, ip=ip)
+        return await paging_data(db, log_select)
 
     @staticmethod
     async def create(
         *,
         db: AsyncSession,
-        request: Request,
         user_uuid: str,
         username: str,
         login_time: datetime,
@@ -42,7 +41,6 @@ class LoginLogService:
         创建登录日志
 
         :param db: 数据库会话
-        :param request: FastAPI 请求对象
         :param user_uuid: 用户 UUID
         :param username: 用户名
         :param login_time: 登录时间
@@ -55,14 +53,14 @@ class LoginLogService:
                 user_uuid=user_uuid,
                 username=username,
                 status=status,
-                ip=request.state.ip,
+                ip=ctx.ip,
-                country=request.state.country,
+                country=ctx.country,
-                region=request.state.region,
+                region=ctx.region,
-                city=request.state.city,
+                city=ctx.city,
-                user_agent=request.state.user_agent,
+                user_agent=ctx.user_agent,
-                browser=request.state.browser,
+                browser=ctx.browser,
-                os=request.state.os,
+                os=ctx.os,
-                device=request.state.device,
+                device=ctx.device,
                 msg=msg,
                 login_time=login_time,
             )
@@ -71,23 +69,21 @@ class LoginLogService:
             log.error(f'登录日志创建失败: {e}')
 
     @staticmethod
-    async def delete(*, obj: DeleteLoginLogParam) -> int:
+    async def delete(*, db: AsyncSession, obj: DeleteLoginLogParam) -> int:
         """
         批量删除登录日志
 
+        :param db: 数据库会话
         :param obj: 日志 ID 列表
         :return:
         """
-        async with async_db_session.begin() as db:
+        count = await login_log_dao.delete(db, obj.pks)
-            count = await login_log_dao.delete(db, obj.pks)
+        return count
-            return count
 
     @staticmethod
-    async def delete_all() -> int:
+    async def delete_all(*, db: AsyncSession) -> None:
         """清空所有登录日志"""
-        async with async_db_session.begin() as db:
+        await login_log_dao.delete_all(db)
-            count = await login_log_dao.delete_all(db)
-            return count
 
 
 login_log_service: LoginLogService = LoginLogService()

backend/app/admin/service/menu_service.py

@@ -1,15 +1,13 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from typing import Any
 
 from fastapi import Request
+from sqlalchemy.ext.asyncio import AsyncSession
 
 from backend.app.admin.crud.crud_menu import menu_dao
 from backend.app.admin.model import Menu
 from backend.app.admin.schema.menu import CreateMenuParam, UpdateMenuParam
 from backend.common.exception import errors
 from backend.core.conf import settings
-from backend.database.db import async_db_session
 from backend.database.redis import redis_client
 from backend.utils.build_tree import get_tree_data, get_vben5_tree_data
 
@@ -18,120 +16,124 @@ class MenuService:
     """菜单服务类"""
 
     @staticmethod
-    async def get(*, pk: int) -> Menu:
+    async def get(*, db: AsyncSession, pk: int) -> Menu:
         """
         获取菜单详情
 
+        :param db: 数据库会话
         :param pk: 菜单 ID
         :return:
         """
-        async with async_db_session() as db:
+
-            menu = await menu_dao.get(db, menu_id=pk)
+        menu = await menu_dao.get(db, menu_id=pk)
-            if not menu:
+        if not menu:
-                raise errors.NotFoundError(msg='菜单不存在')
+            raise errors.NotFoundError(msg='菜单不存在')
-            return menu
+        return menu
 
     @staticmethod
-    async def get_tree(*, title: str | None, status: int | None) -> list[dict[str, Any]]:
+    async def get_tree(*, db: AsyncSession, title: str | None, status: int | None) -> list[dict[str, Any]]:
         """
         获取菜单树形结构
 
+        :param db: 数据库会话
         :param title: 菜单标题
         :param status: 状态
         :return:
         """
-        async with async_db_session() as db:
+
-            menu_data = await menu_dao.get_all(db, title=title, status=status)
+        menu_data = await menu_dao.get_all(db, title=title, status=status)
-            menu_tree = get_tree_data(menu_data)
+        menu_tree = get_tree_data(menu_data)
-            return menu_tree
+        return menu_tree
 
     @staticmethod
-    async def get_sidebar(*, request: Request) -> list[dict[str, Any] | None]:
+    async def get_sidebar(*, db: AsyncSession, request: Request) -> list[dict[str, Any] | None]:
         """
         获取用户的菜单侧边栏
 
+        :param db: 数据库会话
         :param request: FastAPI 请求对象
         :return:
         """
-        async with async_db_session() as db:
+
-            if request.user.is_superuser:
+        if request.user.is_superuser:
-                menu_data = await menu_dao.get_sidebar(db, None)
+            menu_data = await menu_dao.get_sidebar(db, None)
-            else:
+        else:
-                roles = request.user.roles
+            roles = request.user.roles
-                menu_ids = set()
+            menu_ids = set()
-                if roles:
+            if roles:
-                    for role in roles:
+                for role in roles:
-                        for menu in role.menus:
+                    menu_ids.update(menu.id for menu in role.menus)
-                            menu_ids.add(menu.id)
+                menu_data = await menu_dao.get_sidebar(db, list(menu_ids))
-                    menu_data = await menu_dao.get_sidebar(db, list(menu_ids))
+        menu_tree = get_vben5_tree_data(menu_data)
-            menu_tree = get_vben5_tree_data(menu_data)
+        return menu_tree
-            return menu_tree
 
     @staticmethod
-    async def create(*, obj: CreateMenuParam) -> None:
+    async def create(*, db: AsyncSession, obj: CreateMenuParam) -> None:
         """
         创建菜单
 
+        :param db: 数据库会话
         :param obj: 菜单创建参数
         :return:
         """
-        async with async_db_session.begin() as db:
+
-            title = await menu_dao.get_by_title(db, obj.title)
+        title = await menu_dao.get_by_title(db, obj.title)
-            if title:
+        if title:
-                raise errors.ConflictError(msg='菜单标题已存在')
+            raise errors.ConflictError(msg='菜单标题已存在')
-            if obj.parent_id:
+        if obj.parent_id:
-                parent_menu = await menu_dao.get(db, obj.parent_id)
+            parent_menu = await menu_dao.get(db, obj.parent_id)
-                if not parent_menu:
+            if not parent_menu:
-                    raise errors.NotFoundError(msg='父级菜单不存在')
+                raise errors.NotFoundError(msg='父级菜单不存在')
-            await menu_dao.create(db, obj)
+        await menu_dao.create(db, obj)
 
     @staticmethod
-    async def update(*, pk: int, obj: UpdateMenuParam) -> int:
+    async def update(*, db: AsyncSession, pk: int, obj: UpdateMenuParam) -> int:
         """
         更新菜单
 
+        :param db: 数据库会话
         :param pk: 菜单 ID
         :param obj: 菜单更新参数
         :return:
         """
-        async with async_db_session.begin() as db:
+
-            menu = await menu_dao.get(db, pk)
+        menu = await menu_dao.get(db, pk)
-            if not menu:
+        if not menu:
-                raise errors.NotFoundError(msg='菜单不存在')
+            raise errors.NotFoundError(msg='菜单不存在')
-            if menu.title != obj.title:
+        if menu.title != obj.title and await menu_dao.get_by_title(db, obj.title):
-                if await menu_dao.get_by_title(db, obj.title):
+            raise errors.ConflictError(msg='菜单标题已存在')
-                    raise errors.ConflictError(msg='菜单标题已存在')
+        if obj.parent_id:
-            if obj.parent_id:
+            parent_menu = await menu_dao.get(db, obj.parent_id)
-                parent_menu = await menu_dao.get(db, obj.parent_id)
+            if not parent_menu:
-                if not parent_menu:
+                raise errors.NotFoundError(msg='父级菜单不存在')
-                    raise errors.NotFoundError(msg='父级菜单不存在')
+        if obj.parent_id == menu.id:
-            if obj.parent_id == menu.id:
+            raise errors.ForbiddenError(msg='禁止关联自身为父级')
-                raise errors.ForbiddenError(msg='禁止关联自身为父级')
+        count = await menu_dao.update(db, pk, obj)
-            count = await menu_dao.update(db, pk, obj)
+        for role in await menu.awaitable_attrs.roles:
-            for role in await menu.awaitable_attrs.roles:
+            for user in await role.awaitable_attrs.users:
-                for user in await role.awaitable_attrs.users:
+                await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
-                    await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
+        return count
-            return count
 
     @staticmethod
-    async def delete(*, pk: int) -> int:
+    async def delete(*, db: AsyncSession, pk: int) -> int:
         """
         删除菜单
 
+        :param db: 数据库会话
         :param pk: 菜单 ID
         :return:
         """
-        async with async_db_session.begin() as db:
+
-            children = await menu_dao.get_children(db, pk)
+        children = await menu_dao.get_children(db, pk)
-            if children:
+        if children:
-                raise errors.ConflictError(msg='菜单下存在子菜单，无法删除')
+            raise errors.ConflictError(msg='菜单下存在子菜单，无法删除')
-            menu = await menu_dao.get(db, pk)
+        menu = await menu_dao.get(db, pk)
-            count = await menu_dao.delete(db, pk)
+        count = await menu_dao.delete(db, pk)
-            if menu:
+        if menu:
-                for role in await menu.awaitable_attrs.roles:
+            for role in await menu.awaitable_attrs.roles:
-                    for user in await role.awaitable_attrs.users:
+                for user in await role.awaitable_attrs.users:
-                        await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
+                    await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
-            return count
+        return count
 
 
 menu_service: MenuService = MenuService()

backend/app/admin/service/opera_log_service.py

@@ -1,56 +1,72 @@
-#!/usr/bin/env python3
+from typing import Any
-# -*- coding: utf-8 -*-
+
-from sqlalchemy import Select
+from sqlalchemy.ext.asyncio import AsyncSession
 
 from backend.app.admin.crud.crud_opera_log import opera_log_dao
 from backend.app.admin.schema.opera_log import CreateOperaLogParam, DeleteOperaLogParam
-from backend.database.db import async_db_session
+from backend.common.pagination import paging_data
 
 
 class OperaLogService:
     """操作日志服务类"""
 
     @staticmethod
-    async def get_select(*, username: str | None, status: int | None, ip: str | None) -> Select:
+    async def get_list(*, db: AsyncSession, username: str | None, status: int | None, ip: str | None) -> dict[str, Any]:
         """
-        获取操作日志列表查询条件
+        获取操作日志列表
 
+        :param db: 数据库会话
         :param username: 用户名
         :param status: 状态
         :param ip: IP 地址
         :return:
         """
-        return await opera_log_dao.get_list(username=username, status=status, ip=ip)
+        log_select = await opera_log_dao.get_select(username=username, status=status, ip=ip)
+        return await paging_data(db, log_select)
 
     @staticmethod
-    async def create(*, obj: CreateOperaLogParam) -> None:
+    async def create(*, db: AsyncSession, obj: CreateOperaLogParam) -> None:
         """
         创建操作日志
 
+        :param db: 数据库会话
         :param obj: 操作日志创建参数
         :return:
         """
-        async with async_db_session.begin() as db:
+        await opera_log_dao.create(db, obj)
-            await opera_log_dao.create(db, obj)
 
     @staticmethod
-    async def delete(*, obj: DeleteOperaLogParam) -> int:
+    async def bulk_create(*, db: AsyncSession, objs: list[CreateOperaLogParam]) -> None:
+        """
+        批量创建操作日志
+
+        :param db: 数据库会话
+        :param objs: 操作日志创建参数列表
+        :return:
+        """
+        await opera_log_dao.bulk_create(db, objs)
+
+    @staticmethod
+    async def delete(*, db: AsyncSession, obj: DeleteOperaLogParam) -> int:
         """
         批量删除操作日志
 
+        :param db: 数据库会话
         :param obj: 日志 ID 列表
         :return:
         """
-        async with async_db_session.begin() as db:
+        count = await opera_log_dao.delete(db, obj.pks)
-            count = await opera_log_dao.delete(db, obj.pks)
+        return count
-            return count
 
     @staticmethod
-    async def delete_all() -> int:
+    async def delete_all(*, db: AsyncSession) -> None:
-        """清空所有操作日志"""
+        """
-        async with async_db_session.begin() as db:
+        清空所有操作日志
-            count = await opera_log_dao.delete_all(db)
+
-            return count
+        :param db: 数据库会话
+        :return:
+        """
+        await opera_log_dao.delete_all(db)
 
 
 opera_log_service: OperaLogService = OperaLogService()

backend/app/admin/service/plugin_service.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 import io
 import json
 import os
@@ -8,6 +6,8 @@ import zipfile
 
 from typing import Any
 
+import anyio
+
 from fastapi import UploadFile
 
 from backend.common.enums import PluginType, StatusType
@@ -26,14 +26,10 @@ class PluginService:
     @staticmethod
     async def get_all() -> list[dict[str, Any]]:
         """获取所有插件"""
-        keys = []
-        result = []
 
-        async for key in redis_client.scan_iter(f'{settings.PLUGIN_REDIS_PREFIX}:info:*'):
+        keys = [key async for key in redis_client.scan_iter(f'{settings.PLUGIN_REDIS_PREFIX}:*')]
-            keys.append(key)
 
-        for info in await redis_client.mget(*keys):
+        result = [json.loads(info) for info in await redis_client.mget(*keys)]
-            result.append(json.loads(info))
 
         return result
 
@@ -61,32 +57,31 @@ class PluginService:
         return await install_git_plugin(repo_url)
 
     @staticmethod
-    async def uninstall(*, plugin: str):
+    async def uninstall(*, plugin: str) -> None:
         """
         卸载插件
 
         :param plugin: 插件名称
         :return:
         """
-        plugin_dir = os.path.join(PLUGIN_DIR, plugin)
+        plugin_dir = anyio.Path(PLUGIN_DIR / plugin)
-        if not os.path.exists(plugin_dir):
+        if not await plugin_dir.exists():
             raise errors.NotFoundError(msg='插件不存在')
         await uninstall_requirements_async(plugin)
-        bacup_dir = os.path.join(PLUGIN_DIR, f'{plugin}.{timezone.now().strftime("%Y%m%d%H%M%S")}.backup')
+        bacup_dir = PLUGIN_DIR / f'{plugin}.{timezone.now().strftime("%Y%m%d%H%M%S")}.backup'
         shutil.move(plugin_dir, bacup_dir)
-        await redis_client.delete(f'{settings.PLUGIN_REDIS_PREFIX}:info:{plugin}')
+        await redis_client.delete(f'{settings.PLUGIN_REDIS_PREFIX}:{plugin}')
-        await redis_client.hdel(f'{settings.PLUGIN_REDIS_PREFIX}:status', plugin)
         await redis_client.set(f'{settings.PLUGIN_REDIS_PREFIX}:changed', 'ture')
 
     @staticmethod
-    async def update_status(*, plugin: str):
+    async def update_status(*, plugin: str) -> None:
         """
         更新插件状态
 
         :param plugin: 插件名称
         :return:
         """
-        plugin_info = await redis_client.get(f'{settings.PLUGIN_REDIS_PREFIX}:info:{plugin}')
+        plugin_info = await redis_client.get(f'{settings.PLUGIN_REDIS_PREFIX}:{plugin}')
         if not plugin_info:
             raise errors.NotFoundError(msg='插件不存在')
         plugin_info = json.loads(plugin_info)
@@ -98,10 +93,7 @@ class PluginService:
             else str(StatusType.disable.value)
         )
         plugin_info['plugin']['enable'] = new_status
-        await redis_client.set(
+        await redis_client.set(f'{settings.PLUGIN_REDIS_PREFIX}:{plugin}', json.dumps(plugin_info, ensure_ascii=False))
-            f'{settings.PLUGIN_REDIS_PREFIX}:info:{plugin}', json.dumps(plugin_info, ensure_ascii=False)
-        )
-        await redis_client.hset(f'{settings.PLUGIN_REDIS_PREFIX}:status', plugin, new_status)
 
     @staticmethod
     async def build(*, plugin: str) -> io.BytesIO:
@@ -111,8 +103,8 @@ class PluginService:
         :param plugin: 插件名称
         :return:
         """
-        plugin_dir = os.path.join(PLUGIN_DIR, plugin)
+        plugin_dir = anyio.Path(PLUGIN_DIR / plugin)
-        if not os.path.exists(plugin_dir):
+        if not await plugin_dir.exists():
             raise errors.NotFoundError(msg='插件不存在')
 
         bio = io.BytesIO()
@@ -121,7 +113,7 @@ class PluginService:
                 dirs[:] = [d for d in dirs if d != '__pycache__']
                 for file in files:
                     file_path = os.path.join(root, file)
-                    arcname = os.path.relpath(file_path, start=plugin_dir)
+                    arcname = os.path.relpath(file_path, start=plugin_dir)  # noqa: ASYNC240
                     zf.write(file_path, os.path.join(plugin, arcname))
 
         bio.seek(0)

backend/app/admin/service/role_service.py

@@ -1,8 +1,7 @@
-#!/usr/bin/env python3
+from collections.abc import Sequence
-# -*- coding: utf-8 -*-
+from typing import Any
-from typing import Any, Sequence
 
-from sqlalchemy import Select
+from sqlalchemy.ext.asyncio import AsyncSession
 
 from backend.app.admin.crud.crud_data_scope import data_scope_dao
 from backend.app.admin.crud.crud_menu import menu_dao
@@ -16,8 +15,8 @@ from backend.app.admin.schema.role import (
     UpdateRoleScopeParam,
 )
 from backend.common.exception import errors
+from backend.common.pagination import paging_data
 from backend.core.conf import settings
-from backend.database.db import async_db_session
 from backend.database.redis import redis_client
 from backend.utils.build_tree import get_tree_data
 
@@ -26,162 +25,176 @@ class RoleService:
     """角色服务类"""
 
     @staticmethod
-    async def get(*, pk: int) -> Role:
+    async def get(*, db: AsyncSession, pk: int) -> Role:
         """
         获取角色详情
 
+        :param db: 数据库会话
         :param pk: 角色 ID
         :return:
         """
-        async with async_db_session() as db:
+
-            role = await role_dao.get_with_relation(db, pk)
+        role = await role_dao.get_with_relation(db, pk)
-            if not role:
+        if not role:
-                raise errors.NotFoundError(msg='角色不存在')
+            raise errors.NotFoundError(msg='角色不存在')
-            return role
+        return role
 
     @staticmethod
-    async def get_all() -> Sequence[Role]:
+    async def get_all(*, db: AsyncSession) -> Sequence[Role]:
-        """获取所有角色"""
-        async with async_db_session() as db:
-            roles = await role_dao.get_all(db)
-            return roles
-
-    @staticmethod
-    async def get_select(*, name: str | None, status: int | None) -> Select:
         """
-        获取角色列表查询条件
+        获取所有角色
 
+        :param db: 数据库会话
+        :return:
+        """
+
+        roles = await role_dao.get_all(db)
+        return roles
+
+    @staticmethod
+    async def get_list(*, db: AsyncSession, name: str | None, status: int | None) -> dict[str, Any]:
+        """
+        获取角色列表
+
+        :param db: 数据库会话
         :param name: 角色名称
         :param status: 状态
         :return:
         """
-        return await role_dao.get_list(name=name, status=status)
+        role_select = await role_dao.get_select(name=name, status=status)
+        return await paging_data(db, role_select)
 
     @staticmethod
-    async def get_menu_tree(*, pk: int) -> list[dict[str, Any] | None]:
+    async def get_menu_tree(*, db: AsyncSession, pk: int) -> list[dict[str, Any] | None]:
         """
         获取角色的菜单树形结构
 
+        :param db: 数据库会话
         :param pk: 角色 ID
         :return:
         """
-        async with async_db_session() as db:
+
-            role = await role_dao.get_with_relation(db, pk)
+        role = await role_dao.get_with_relation(db, pk)
-            if not role:
+        if not role:
-                raise errors.NotFoundError(msg='角色不存在')
+            raise errors.NotFoundError(msg='角色不存在')
-            menu_tree = get_tree_data(role.menus) if role.menus else []
+        menu_tree = get_tree_data(role.menus) if role.menus else []
-            return menu_tree
+        return menu_tree
 
     @staticmethod
-    async def get_scopes(*, pk: int) -> list[int]:
+    async def get_scopes(*, db: AsyncSession, pk: int) -> list[int]:
         """
         获取角色数据范围列表
 
+        :param db: 数据库会话
         :param pk:
         :return:
         """
-        async with async_db_session() as db:
+
-            role = await role_dao.get_with_relation(db, pk)
+        role = await role_dao.get_with_relation(db, pk)
-            if not role:
+        if not role:
-                raise errors.NotFoundError(msg='角色不存在')
+            raise errors.NotFoundError(msg='角色不存在')
-            scope_ids = [scope.id for scope in role.scopes]
+        scope_ids = [scope.id for scope in role.scopes]
-            return scope_ids
+        return scope_ids
 
     @staticmethod
-    async def create(*, obj: CreateRoleParam) -> None:
+    async def create(*, db: AsyncSession, obj: CreateRoleParam) -> None:
         """
         创建角色
 
+        :param db: 数据库会话
         :param obj: 角色创建参数
         :return:
         """
-        async with async_db_session.begin() as db:
+
-            role = await role_dao.get_by_name(db, obj.name)
+        role = await role_dao.get_by_name(db, obj.name)
-            if role:
+        if role:
-                raise errors.ConflictError(msg='角色已存在')
+            raise errors.ConflictError(msg='角色已存在')
-            await role_dao.create(db, obj)
+        await role_dao.create(db, obj)
 
     @staticmethod
-    async def update(*, pk: int, obj: UpdateRoleParam) -> int:
+    async def update(*, db: AsyncSession, pk: int, obj: UpdateRoleParam) -> int:
         """
         更新角色
 
+        :param db: 数据库会话
         :param pk: 角色 ID
         :param obj: 角色更新参数
         :return:
         """
-        async with async_db_session.begin() as db:
+
-            role = await role_dao.get(db, pk)
+        role = await role_dao.get(db, pk)
-            if not role:
+        if not role:
-                raise errors.NotFoundError(msg='角色不存在')
+            raise errors.NotFoundError(msg='角色不存在')
-            if role.name != obj.name:
+        if role.name != obj.name and await role_dao.get_by_name(db, obj.name):
-                if await role_dao.get_by_name(db, obj.name):
+            raise errors.ConflictError(msg='角色已存在')
-                    raise errors.ConflictError(msg='角色已存在')
+        count = await role_dao.update(db, pk, obj)
-            count = await role_dao.update(db, pk, obj)
+        for user in await role.awaitable_attrs.users:
-            for user in await role.awaitable_attrs.users:
+            await redis_client.delete_prefix(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
-                await redis_client.delete_prefix(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
+        return count
-            return count
 
     @staticmethod
-    async def update_role_menu(*, pk: int, menu_ids: UpdateRoleMenuParam) -> int:
+    async def update_role_menu(*, db: AsyncSession, pk: int, menu_ids: UpdateRoleMenuParam) -> int:
         """
         更新角色菜单
 
+        :param db: 数据库会话
         :param pk: 角色 ID
         :param menu_ids: 菜单 ID 列表
         :return:
         """
-        async with async_db_session.begin() as db:
+
-            role = await role_dao.get(db, pk)
+        role = await role_dao.get(db, pk)
-            if not role:
+        if not role:
-                raise errors.NotFoundError(msg='角色不存在')
+            raise errors.NotFoundError(msg='角色不存在')
-            for menu_id in menu_ids.menus:
+        for menu_id in menu_ids.menus:
-                menu = await menu_dao.get(db, menu_id)
+            menu = await menu_dao.get(db, menu_id)
-                if not menu:
+            if not menu:
-                    raise errors.NotFoundError(msg='菜单不存在')
+                raise errors.NotFoundError(msg='菜单不存在')
-            count = await role_dao.update_menus(db, pk, menu_ids)
+        count = await role_dao.update_menus(db, pk, menu_ids)
-            for user in await role.awaitable_attrs.users:
+        for user in await role.awaitable_attrs.users:
-                await redis_client.delete_prefix(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
+            await redis_client.delete_prefix(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
-            return count
+        return count
 
     @staticmethod
-    async def update_role_scope(*, pk: int, scope_ids: UpdateRoleScopeParam) -> int:
+    async def update_role_scope(*, db: AsyncSession, pk: int, scope_ids: UpdateRoleScopeParam) -> int:
         """
         更新角色数据范围
 
+        :param db: 数据库会话
         :param pk: 角色 ID
         :param scope_ids: 权限规则 ID 列表
         :return:
         """
-        async with async_db_session.begin() as db:
+
-            role = await role_dao.get(db, pk)
+        role = await role_dao.get(db, pk)
-            if not role:
+        if not role:
-                raise errors.NotFoundError(msg='角色不存在')
+            raise errors.NotFoundError(msg='角色不存在')
-            for scope_id in scope_ids.scopes:
+        for scope_id in scope_ids.scopes:
-                scope = await data_scope_dao.get(db, scope_id)
+            scope = await data_scope_dao.get(db, scope_id)
-                if not scope:
+            if not scope:
-                    raise errors.NotFoundError(msg='数据范围不存在')
+                raise errors.NotFoundError(msg='数据范围不存在')
-            count = await role_dao.update_scopes(db, pk, scope_ids)
+        count = await role_dao.update_scopes(db, pk, scope_ids)
-            for user in await role.awaitable_attrs.users:
+        for user in await role.awaitable_attrs.users:
-                await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
+            await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
-            return count
+        return count
 
     @staticmethod
-    async def delete(*, obj: DeleteRoleParam) -> int:
+    async def delete(*, db: AsyncSession, obj: DeleteRoleParam) -> int:
         """
         批量删除角色
 
+        :param db: 数据库会话
         :param obj: 角色 ID 列表
         :return:
         """
-        async with async_db_session.begin() as db:
+
-            count = await role_dao.delete(db, obj.pks)
+        count = await role_dao.delete(db, obj.pks)
-            for pk in obj.pks:
+        for pk in obj.pks:
-                role = await role_dao.get(db, pk)
+            role = await role_dao.get(db, pk)
-                if role:
+            if role:
-                    for user in await role.awaitable_attrs.users:
+                for user in await role.awaitable_attrs.users:
-                        await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
+                    await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
-            return count
+        return count
 
 
 role_service: RoleService = RoleService()

backend/app/admin/service/user_service.py

@@ -1,11 +1,10 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 import random
 
-from typing import Sequence
+from collections.abc import Sequence
+from typing import Any
 
 from fastapi import Request
-from sqlalchemy import Select
+from sqlalchemy.ext.asyncio import AsyncSession
 
 from backend.app.admin.crud.crud_dept import dept_dao
 from backend.app.admin.crud.crud_role import role_dao
@@ -16,11 +15,13 @@ from backend.app.admin.schema.user import (
     ResetPasswordParam,
     UpdateUserParam,
 )
+from backend.common.context import ctx
 from backend.common.enums import UserPermissionType
 from backend.common.exception import errors
-from backend.common.security.jwt import get_hash_password, get_token, jwt_decode, password_verify, superuser_verify
+from backend.common.pagination import paging_data
+from backend.common.response.response_code import CustomErrorCode
+from backend.common.security.jwt import get_token, jwt_decode, password_verify
 from backend.core.conf import settings
-from backend.database.db import async_db_session
 from backend.database.redis import redis_client
 
 
@@ -28,195 +29,98 @@ class UserService:
     """用户服务类"""
 
     @staticmethod
-    async def get_userinfo(*, pk: int | None = None, username: str | None = None) -> User:
+    async def get_userinfo(*, db: AsyncSession, pk: int | None = None, username: str | None = None) -> User:
         """
         获取用户信息
 
+        :param db: 数据库会话
         :param pk: 用户 ID
         :param username: 用户名
         :return:
         """
-        async with async_db_session() as db:
+        user = await user_dao.get_with_relation(db, user_id=pk, username=username)
-            user = await user_dao.get_with_relation(db, user_id=pk, username=username)
+        if not user:
-            if not user:
+            raise errors.NotFoundError(msg='用户不存在')
-                raise errors.NotFoundError(msg='用户不存在')
+        return user
-            return user
 
     @staticmethod
-    async def get_roles(*, pk: int) -> Sequence[Role]:
+    async def get_roles(*, db: AsyncSession, pk: int) -> Sequence[Role]:
         """
         获取用户所有角色
 
+        :param db: 数据库会话
         :param pk: 用户 ID
         :return:
         """
-        async with async_db_session() as db:
+        user = await user_dao.get_with_relation(db, user_id=pk)
-            user = await user_dao.get_with_relation(db, user_id=pk)
+        if not user:
-            if not user:
+            raise errors.NotFoundError(msg='用户不存在')
-                raise errors.NotFoundError(msg='用户不存在')
+        return user.roles
-            return user.roles
 
     @staticmethod
-    async def get_select(*, dept: int, username: str, phone: str, status: int) -> Select:
+    async def get_list(*, db: AsyncSession, dept: int, username: str, phone: str, status: int) -> dict[str, Any]:
         """
-        获取用户列表查询条件
+        获取用户列表
 
+        :param db: 数据库会话
         :param dept: 部门 ID
         :param username: 用户名
         :param phone: 手机号
         :param status: 状态
         :return:
         """
-        return await user_dao.get_list(dept=dept, username=username, phone=phone, status=status)
+        user_select = await user_dao.get_select(dept=dept, username=username, phone=phone, status=status)
+        return await paging_data(db, user_select)
 
     @staticmethod
-    async def create(*, request: Request, obj: AddUserParam) -> None:
+    async def create(*, db: AsyncSession, obj: AddUserParam) -> None:
         """
         创建用户
 
-        :param request: FastAPI 请求对象
+        :param db: 数据库会话
         :param obj: 用户添加参数
         :return:
         """
-        async with async_db_session.begin() as db:
+        if await user_dao.get_by_username(db, obj.username):
-            superuser_verify(request)
+            raise errors.ConflictError(msg='用户名已注册')
-            if await user_dao.get_by_username(db, obj.username):
+        obj.nickname = obj.nickname or f'#{random.randrange(88888, 99999)}'
-                raise errors.ConflictError(msg='用户名已注册')
+        if not obj.password:
-            obj.nickname = obj.nickname if obj.nickname else f'#{random.randrange(88888, 99999)}'
+            raise errors.RequestError(msg='密码不允许为空')
-            if not obj.password:
+        if not await dept_dao.get(db, obj.dept_id):
-                raise errors.RequestError(msg='密码不允许为空')
+            raise errors.NotFoundError(msg='部门不存在')
-            if not await dept_dao.get(db, obj.dept_id):
+        for role_id in obj.roles:
-                raise errors.NotFoundError(msg='部门不存在')
+            if not await role_dao.get(db, role_id):
-            for role_id in obj.roles:
+                raise errors.NotFoundError(msg='角色不存在')
-                if not await role_dao.get(db, role_id):
+        await user_dao.add(db, obj)
-                    raise errors.NotFoundError(msg='角色不存在')
-            await user_dao.add(db, obj)
 
     @staticmethod
-    async def update(*, request: Request, pk: int, obj: UpdateUserParam) -> int:
+    async def update(*, db: AsyncSession, pk: int, obj: UpdateUserParam) -> int:
         """
         更新用户信息
 
-        :param request: FastAPI 请求对象
+        :param db: 数据库会话
         :param pk: 用户 ID
         :param obj: 用户更新参数
         :return:
         """
-        async with async_db_session.begin() as db:
+        user = await user_dao.get_with_relation(db, user_id=pk)
-            user = await user_dao.get_with_relation(db, user_id=pk)
+        if not user:
-            if not user:
+            raise errors.NotFoundError(msg='用户不存在')
-                raise errors.NotFoundError(msg='用户不存在')
+        if obj.username != user.username and await user_dao.get_by_username(db, obj.username):
-            if request.user.username != user.username:
+            raise errors.ConflictError(msg='用户名已注册')
-                raise errors.ForbiddenError(msg='只能修改自己的信息')
+        for role_id in obj.roles:
-            if obj.username != user.username:
+            if not await role_dao.get(db, role_id):
-                if await user_dao.get_by_username(db, obj.username):
+                raise errors.NotFoundError(msg='角色不存在')
-                    raise errors.ConflictError(msg='用户名已注册')
+        count = await user_dao.update(db, user, obj)
-            for role_id in obj.roles:
+        await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
-                if not await role_dao.get(db, role_id):
+        return count
-                    raise errors.NotFoundError(msg='角色不存在')
-            count = await user_dao.update(db, user, obj)
-            await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
-            return count
 
     @staticmethod
-    async def update_superuser(*, request: Request, pk: int) -> int:
+    async def update_permission(*, db: AsyncSession, request: Request, pk: int, type: UserPermissionType) -> int:  # noqa: C901
-        """
-        更新用户管理员状态
-
-        :param request: FastAPI 请求对象
-        :param pk: 用户 ID
-        :return:
-        """
-        async with async_db_session.begin() as db:
-            superuser_verify(request)
-            user = await user_dao.get(db, pk)
-            if not user:
-                raise errors.NotFoundError(msg='用户不存在')
-            if pk == request.user.id:
-                raise errors.ForbiddenError(msg='禁止修改自身权限')
-            super_status = await user_dao.get_super(db, pk)
-            count = await user_dao.set_super(db, pk, not super_status)
-            await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
-            return count
-
-    @staticmethod
-    async def update_staff(*, request: Request, pk: int) -> int:
-        """
-        更新用户职员状态
-
-        :param request: FastAPI 请求对象
-        :param pk: 用户 ID
-        :return:
-        """
-        async with async_db_session.begin() as db:
-            superuser_verify(request)
-            user = await user_dao.get(db, pk)
-            if not user:
-                raise errors.NotFoundError(msg='用户不存在')
-            if pk == request.user.id:
-                raise errors.ForbiddenError(msg='禁止修改自身权限')
-            staff_status = await user_dao.get_staff(db, pk)
-            count = await user_dao.set_staff(db, pk, not staff_status)
-            await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
-            return count
-
-    @staticmethod
-    async def update_status(*, request: Request, pk: int) -> int:
-        """
-        更新用户状态
-
-        :param request: FastAPI 请求对象
-        :param pk: 用户 ID
-        :return:
-        """
-        async with async_db_session.begin() as db:
-            superuser_verify(request)
-            user = await user_dao.get(db, pk)
-            if not user:
-                raise errors.NotFoundError(msg='用户不存在')
-            if pk == request.user.id:
-                raise errors.ForbiddenError(msg='禁止修改自身权限')
-            status = await user_dao.get_status(db, pk)
-            count = await user_dao.set_status(db, pk, 0 if status == 1 else 1)
-            await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
-            return count
-
-    @staticmethod
-    async def update_multi_login(*, request: Request, pk: int) -> int:
-        """
-        更新用户多端登录状态
-
-        :param request: FastAPI 请求对象
-        :param pk: 用户 ID
-        :return:
-        """
-        async with async_db_session.begin() as db:
-            superuser_verify(request)
-            user = await user_dao.get(db, pk)
-            if not user:
-                raise errors.NotFoundError(msg='用户不存在')
-            multi_login = await user_dao.get_multi_login(db, pk) if pk != user.id else request.user.is_multi_login
-            new_multi_login = not multi_login
-            count = await user_dao.set_multi_login(db, pk, new_multi_login)
-            await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
-            token = get_token(request)
-            token_payload = jwt_decode(token)
-            if pk == user.id:
-                # 系统管理员修改自身时，除当前 token 外，其他 token 失效
-                if not new_multi_login:
-                    key_prefix = f'{settings.TOKEN_REDIS_PREFIX}:{user.id}'
-                    await redis_client.delete_prefix(key_prefix, exclude=f'{key_prefix}:{token_payload.session_uuid}')
-            else:
-                # 系统管理员修改他人时，他人 token 全部失效
-                if not new_multi_login:
-                    key_prefix = f'{settings.TOKEN_REDIS_PREFIX}:{user.id}'
-                    await redis_client.delete_prefix(key_prefix)
-            return count
-
-    async def update_permission(self, *, request: Request, pk: int, type: UserPermissionType) -> int:
         """
         更新用户权限
 
+        :param db: 数据库会话
         :param request: FastAPI 请求对象
         :param pk: 用户 ID
         :param type: 权限类型
@@ -224,65 +128,190 @@ class UserService:
         """
         match type:
             case UserPermissionType.superuser:
-                count = await self.update_superuser(request=request, pk=pk)
+                user = await user_dao.get(db, pk)
+                if not user:
+                    raise errors.NotFoundError(msg='用户不存在')
+                if pk == request.user.id:
+                    raise errors.ForbiddenError(msg='禁止修改自身权限')
+                count = await user_dao.set_super(db, pk, is_super=not user.status)
             case UserPermissionType.staff:
-                count = await self.update_staff(request=request, pk=pk)
+                user = await user_dao.get(db, pk)
+                if not user:
+                    raise errors.NotFoundError(msg='用户不存在')
+                if pk == request.user.id:
+                    raise errors.ForbiddenError(msg='禁止修改自身权限')
+                count = await user_dao.set_staff(db, pk, is_staff=not user.is_staff)
             case UserPermissionType.status:
-                count = await self.update_status(request=request, pk=pk)
+                user = await user_dao.get(db, pk)
+                if not user:
+                    raise errors.NotFoundError(msg='用户不存在')
+                if pk == request.user.id:
+                    raise errors.ForbiddenError(msg='禁止修改自身权限')
+                count = await user_dao.set_status(db, pk, 0 if user.status == 1 else 1)
             case UserPermissionType.multi_login:
-                count = await self.update_multi_login(request=request, pk=pk)
+                user = await user_dao.get(db, pk)
+                if not user:
+                    raise errors.NotFoundError(msg='用户不存在')
+                multi_login = user.is_multi_login if pk != user.id else request.user.is_multi_login
+                new_multi_login = not multi_login
+                count = await user_dao.set_multi_login(db, pk, multi_login=new_multi_login)
+                token = get_token(request)
+                token_payload = jwt_decode(token)
+                if pk == user.id:
+                    # 系统管理员修改自身时，除当前 token 外，其他 token 失效
+                    if not new_multi_login:
+                        key_prefix = f'{settings.TOKEN_REDIS_PREFIX}:{user.id}'
+                        await redis_client.delete_prefix(
+                            key_prefix,
+                            exclude=f'{key_prefix}:{token_payload.session_uuid}',
+                        )
+                else:
+                    # 系统管理员修改他人时，他人 token 全部失效
+                    if not new_multi_login:
+                        key_prefix = f'{settings.TOKEN_REDIS_PREFIX}:{user.id}'
+                        await redis_client.delete_prefix(key_prefix)
             case _:
                 raise errors.RequestError(msg='权限类型不存在')
+
+        await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
         return count
 
     @staticmethod
-    async def reset_pwd(*, pk: int, obj: ResetPasswordParam) -> int:
+    async def reset_password(*, db: AsyncSession, pk: int, password: str) -> int:
         """
         重置用户密码
 
+        :param db: 数据库会话
         :param pk: 用户 ID
+        :param password: 新密码
+        :return:
+        """
+        user = await user_dao.get(db, pk)
+        if not user:
+            raise errors.NotFoundError(msg='用户不存在')
+        count = await user_dao.reset_password(db, user.id, password)
+        key_prefix = [
+            f'{settings.TOKEN_REDIS_PREFIX}:{user.id}',
+            f'{settings.TOKEN_REFRESH_REDIS_PREFIX}:{user.id}',
+            f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}',
+        ]
+        for prefix in key_prefix:
+            await redis_client.delete(prefix)
+        return count
+
+    @staticmethod
+    async def update_nickname(*, db: AsyncSession, request: Request, nickname: str) -> int:
+        """
+        更新当前用户昵称
+
+        :param db: 数据库会话
+        :param request: FastAPI 请求对象
+        :param nickname: 用户昵称
+        :return:
+        """
+        token = get_token(request)
+        token_payload = jwt_decode(token)
+        user = await user_dao.get(db, token_payload.id)
+        if not user:
+            raise errors.NotFoundError(msg='用户不存在')
+        count = await user_dao.update_nickname(db, token_payload.id, nickname)
+        await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
+        return count
+
+    @staticmethod
+    async def update_avatar(*, db: AsyncSession, request: Request, avatar: str) -> int:
+        """
+        更新当前用户头像
+
+        :param db: 数据库会话
+        :param request: FastAPI 请求对象
+        :param avatar: 头像地址
+        :return:
+        """
+        token = get_token(request)
+        token_payload = jwt_decode(token)
+        user = await user_dao.get(db, token_payload.id)
+        if not user:
+            raise errors.NotFoundError(msg='用户不存在')
+        count = await user_dao.update_avatar(db, token_payload.id, avatar)
+        await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
+        return count
+
+    @staticmethod
+    async def update_email(*, db: AsyncSession, request: Request, captcha: str, email: str) -> int:
+        """
+        更新当前用户邮箱
+
+        :param db: 数据库会话
+        :param request: FastAPI 请求对象
+        :param captcha: 邮箱验证码
+        :param email: 邮箱
+        :return:
+        """
+        token = get_token(request)
+        token_payload = jwt_decode(token)
+        user = await user_dao.get(db, token_payload.id)
+        if not user:
+            raise errors.NotFoundError(msg='用户不存在')
+        captcha_code = await redis_client.get(f'{settings.EMAIL_CAPTCHA_REDIS_PREFIX}:{ctx.ip}')
+        if not captcha_code:
+            raise errors.RequestError(msg='验证码已失效，请重新获取')
+        if captcha != captcha_code:
+            raise errors.CustomError(error=CustomErrorCode.CAPTCHA_ERROR)
+        await redis_client.delete(f'{settings.EMAIL_CAPTCHA_REDIS_PREFIX}:{ctx.ip}')
+        count = await user_dao.update_email(db, token_payload.id, email)
+        await redis_client.delete(f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}')
+        return count
+
+    @staticmethod
+    async def update_password(*, db: AsyncSession, request: Request, obj: ResetPasswordParam) -> int:
+        """
+        更新当前用户密码
+
+        :param db: 数据库会话
+        :param request: FastAPI 请求对象
         :param obj: 密码重置参数
         :return:
         """
-        async with async_db_session.begin() as db:
+        token = get_token(request)
-            user = await user_dao.get(db, pk)
+        token_payload = jwt_decode(token)
-            if not user:
+        user = await user_dao.get(db, token_payload.id)
-                raise errors.NotFoundError(msg='用户不存在')
+        if not user:
-            if not password_verify(obj.old_password, user.password):
+            raise errors.NotFoundError(msg='用户不存在')
-                raise errors.RequestError(msg='原密码错误')
+        if not password_verify(obj.old_password, user.password):
-            if obj.new_password != obj.confirm_password:
+            raise errors.RequestError(msg='原密码错误')
-                raise errors.RequestError(msg='密码输入不一致')
+        if obj.new_password != obj.confirm_password:
-            new_pwd = get_hash_password(obj.new_password, user.salt)
+            raise errors.RequestError(msg='密码输入不一致')
-            count = await user_dao.reset_password(db, user.id, new_pwd)
+        count = await user_dao.reset_password(db, user.id, obj.new_password)
-            key_prefix = [
+        key_prefix = [
-                f'{settings.TOKEN_REDIS_PREFIX}:{user.id}',
+            f'{settings.TOKEN_REDIS_PREFIX}:{user.id}',
-                f'{settings.TOKEN_REFRESH_REDIS_PREFIX}:{user.id}',
+            f'{settings.TOKEN_REFRESH_REDIS_PREFIX}:{user.id}',
-                f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}',
+            f'{settings.JWT_USER_REDIS_PREFIX}:{user.id}',
-            ]
+        ]
-            for prefix in key_prefix:
+        for prefix in key_prefix:
-                await redis_client.delete_prefix(prefix)
+            await redis_client.delete_prefix(prefix)
-            return count
+        return count
 
     @staticmethod
-    async def delete(*, pk: int) -> int:
+    async def delete(*, db: AsyncSession, pk: int) -> int:
         """
         删除用户
 
+        :param db: 数据库会话
         :param pk: 用户 ID
         :return:
         """
-        async with async_db_session.begin() as db:
+        user = await user_dao.get(db, pk)
-            user = await user_dao.get(db, pk)
+        if not user:
-            if not user:
+            raise errors.NotFoundError(msg='用户不存在')
-                raise errors.NotFoundError(msg='用户不存在')
+        count = await user_dao.delete(db, user.id)
-            count = await user_dao.delete(db, user.id)
+        key_prefix = [
-            key_prefix = [
+            f'{settings.TOKEN_REDIS_PREFIX}:{user.id}',
-                f'{settings.TOKEN_REDIS_PREFIX}:{user.id}',
+            f'{settings.TOKEN_REFRESH_REDIS_PREFIX}:{user.id}',
-                f'{settings.TOKEN_REFRESH_REDIS_PREFIX}:{user.id}',
+        ]
-            ]
+        for key in key_prefix:
-            for key in key_prefix:
+            await redis_client.delete_prefix(key)
-                await redis_client.delete_prefix(key)
+        return count
-            return count
 
 
 user_service: UserService = UserService()

backend/app/admin/tests/__init__.py

@@ -1,2 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-

backend/app/admin/tests/api_v1/__init__.py

@@ -1,2 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-

backend/app/admin/tests/api_v1/test_auth.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from starlette.testclient import TestClient
 
 

backend/app/admin/tests/conftest.py

@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
+from collections.abc import Generator
-# -*- coding: utf-8 -*-
-from typing import Generator
 
 import pytest
 

backend/app/admin/tests/utils/__init__.py

@@ -1,2 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-

backend/app/admin/tests/utils/db.py

@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
+from collections.abc import AsyncGenerator
-# -*- coding: utf-8 -*-
-from typing import AsyncGenerator
 
 from sqlalchemy.ext.asyncio.session import AsyncSession
 

backend/app/router.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from fastapi import APIRouter
 
 from backend.app.admin.api.router import v1 as admin_v1

backend/app/task/README.md

@@ -3,21 +3,21 @@
 当前任务使用 Celery
 实现，实施方案请查看 [#225](https://github.com/fastapi-practices/fastapi_best_architecture/discussions/225)
 
-## 添加任务
+## 定时任务
 
-> [!IMPORTANT]
+在 `backend/app/task/tasks/beat.py` 文件内编写相关定时任务
-> 由于 Celery 任务扫描规则，使其对任务的目录结构要求及其严格，务必在 celery_task 目录下添加任务
 
 ### 简单任务
 
-可以直接在 `tasks.py` 文件内编写相关任务代码
+在 `backend/app/task/tasks/tasks.py` 文件内编写相关任务代码
 
 ### 层级任务
 
 如果你想对任务进行目录层级划分，使任务结构更加清晰，你可以新建任意目录，但必须注意的是
 
-1. 新建目录后，务必更新任务配置 `CELERY_TASKS_PACKAGES`，将新建目录添加到此列表
+1. 在 `backend/app/task/tasks` 目录下新建 python 包目录
-2. 在新建目录下，务必添加 `tasks.py` 文件，并在此文件中编写相关任务代码
+2. 新建目录后，务必更新 `conf.py` 配置中的 `CELERY_TASKS_PACKAGES`，将新建目录模块路径添加到此列表
+3. 在新建目录下，务必添加 `tasks.py` 文件，并在此文件中编写相关任务代码
 
 ## 消息代理
 

backend/app/task/__init__.py

@@ -1,8 +1,8 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 import sys
 
-from pathlib import Path
+from backend.core.path_conf import BASE_PATH
+
+from .actions import *  # noqa: F403
 
 # 导入项目根目录
-sys.path.append(str(Path(__file__).resolve().parent.parent.parent.parent))
+sys.path.append(str(BASE_PATH.parent))

backend/app/task/actions.py

@@ -0,0 +1,11 @@
+from starlette.concurrency import run_in_threadpool
+
+from backend.app.task.celery import celery_app
+from backend.common.socketio.server import sio
+
+
+@sio.event
+async def task_worker_status(sid, data) -> None:  # noqa: ANN001
+    """任务 Worker 状态事件"""
+    worker = await run_in_threadpool(celery_app.control.ping)
+    await sio.emit('task_worker_status', worker, sid)

backend/app/task/api/__init__.py

@@ -1,2 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-

backend/app/task/api/router.py

@@ -1,10 +1,12 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 from fastapi import APIRouter
 
-from backend.app.task.api.v1.task import router as task_router
+from backend.app.task.api.v1.control import router as task_control_router
+from backend.app.task.api.v1.result import router as task_result_router
+from backend.app.task.api.v1.scheduler import router as task_scheduler_router
 from backend.core.conf import settings
 
-v1 = APIRouter(prefix=settings.FASTAPI_API_V1_PATH)
+v1 = APIRouter(prefix=f'{settings.FASTAPI_API_V1_PATH}/tasks', tags=['任务'])
 
-v1.include_router(task_router, prefix='/tasks', tags=['任务'])
+v1.include_router(task_control_router)
+v1.include_router(task_result_router, prefix='/results')
+v1.include_router(task_scheduler_router, prefix='/schedulers')

backend/app/task/api/v1/__init__.py

@@ -1,2 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-

backend/app/task/api/v1/control.py

@@ -0,0 +1,49 @@
+from typing import Annotated
+
+from fastapi import APIRouter, Depends, Path
+from starlette.concurrency import run_in_threadpool
+
+from backend.app.task import celery_app
+from backend.app.task.schema.control import TaskRegisteredDetail
+from backend.common.exception import errors
+from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
+from backend.common.security.jwt import DependsJwtAuth
+from backend.common.security.permission import RequestPermission
+from backend.common.security.rbac import DependsRBAC
+
+router = APIRouter()
+
+
+@router.get('/registered', summary='获取已注册的任务', dependencies=[DependsJwtAuth])
+async def get_task_registered() -> ResponseSchemaModel[list[TaskRegisteredDetail]]:
+    inspector = celery_app.control.inspect(timeout=0.5)
+    registered = await run_in_threadpool(inspector.registered)
+    if not registered:
+        raise errors.ServerError(msg='Celery Worker 暂不可用，请稍后重试')
+    task_registered = []
+    celery_app_tasks = celery_app.tasks
+    for tasks in registered.values():
+        for task in tasks:
+            task_ins = celery_app_tasks.get(task)
+            if task_ins:
+                task_doc = task_ins.__doc__
+                task_registered.append({'name': task_doc or task_ins, 'task': task_ins})
+            else:
+                task_registered.append({'name': task, 'task': task})
+    return response_base.success(data=task_registered)
+
+
+@router.delete(
+    '/{task_id}/cancel',
+    summary='撤销任务',
+    dependencies=[
+        Depends(RequestPermission('sys:task:revoke')),
+        DependsRBAC,
+    ],
+)
+async def revoke_task(task_id: Annotated[str, Path(description='任务 UUID')]) -> ResponseModel:
+    workers = await run_in_threadpool(celery_app.control.ping, timeout=0.5)
+    if not workers:
+        raise errors.ServerError(msg='Celery Worker 暂不可用，请稍后重试')
+    celery_app.control.revoke(task_id)
+    return response_base.success()

backend/app/task/api/v1/result.py

@@ -0,0 +1,55 @@
+from typing import Annotated
+
+from fastapi import APIRouter, Depends, Path, Query
+
+from backend.app.task.schema.result import DeleteTaskResultParam, GetTaskResultDetail
+from backend.app.task.service.result_service import task_result_service
+from backend.common.pagination import DependsPagination, PageData
+from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
+from backend.common.security.jwt import DependsJwtAuth
+from backend.common.security.permission import RequestPermission
+from backend.common.security.rbac import DependsRBAC
+from backend.database.db import CurrentSession, CurrentSessionTransaction
+
+router = APIRouter()
+
+
+@router.get('/{pk}', summary='获取任务结果详情', dependencies=[DependsJwtAuth])
+async def get_task_result(
+    db: CurrentSession,
+    pk: Annotated[int, Path(description='任务结果 ID')],
+) -> ResponseSchemaModel[GetTaskResultDetail]:
+    result = await task_result_service.get(db=db, pk=pk)
+    return response_base.success(data=result)
+
+
+@router.get(
+    '',
+    summary='分页获取所有任务结果',
+    dependencies=[
+        DependsJwtAuth,
+        DependsPagination,
+    ],
+)
+async def get_task_results_paginated(
+    db: CurrentSession,
+    name: Annotated[str | None, Query(description='任务名称')] = None,
+    task_id: Annotated[str | None, Query(description='任务 ID')] = None,
+) -> ResponseSchemaModel[PageData[GetTaskResultDetail]]:
+    page_data = await task_result_service.get_list(db=db, name=name, task_id=task_id)
+    return response_base.success(data=page_data)
+
+
+@router.delete(
+    '',
+    summary='批量删除任务结果',
+    dependencies=[
+        Depends(RequestPermission('sys:task:del')),
+        DependsRBAC,
+    ],
+)
+async def delete_task_result(db: CurrentSessionTransaction, obj: DeleteTaskResultParam) -> ResponseModel:
+    count = await task_result_service.delete(db=db, obj=obj)
+    if count > 0:
+        return response_base.success()
+    return response_base.fail()

backend/app/task/api/v1/scheduler.py

@@ -0,0 +1,129 @@
+from typing import Annotated
+
+from fastapi import APIRouter, Depends, Path, Query
+
+from backend.app.task.schema.scheduler import (
+    CreateTaskSchedulerParam,
+    GetTaskSchedulerDetail,
+    UpdateTaskSchedulerParam,
+)
+from backend.app.task.service.scheduler_service import task_scheduler_service
+from backend.common.pagination import DependsPagination, PageData
+from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
+from backend.common.security.jwt import DependsJwtAuth
+from backend.common.security.permission import RequestPermission
+from backend.common.security.rbac import DependsRBAC
+from backend.database.db import CurrentSession, CurrentSessionTransaction
+
+router = APIRouter()
+
+
+@router.get('/all', summary='获取所有任务调度', dependencies=[DependsJwtAuth])
+async def get_all_task_schedulers(db: CurrentSession) -> ResponseSchemaModel[list[GetTaskSchedulerDetail]]:
+    schedulers = await task_scheduler_service.get_all(db=db)
+    return response_base.success(data=schedulers)
+
+
+@router.get('/{pk}', summary='获取任务调度详情', dependencies=[DependsJwtAuth])
+async def get_task_scheduler(
+    db: CurrentSession,
+    pk: Annotated[int, Path(description='任务调度 ID')],
+) -> ResponseSchemaModel[GetTaskSchedulerDetail]:
+    task_scheduler = await task_scheduler_service.get(db=db, pk=pk)
+    return response_base.success(data=task_scheduler)
+
+
+@router.get(
+    '',
+    summary='分页获取所有任务调度',
+    dependencies=[
+        DependsJwtAuth,
+        DependsPagination,
+    ],
+)
+async def get_task_scheduler_paginated(
+    db: CurrentSession,
+    name: Annotated[int | None, Path(description='任务调度名称')] = None,
+    type: Annotated[int | None, Query(description='任务调度类型')] = None,
+) -> ResponseSchemaModel[PageData[GetTaskSchedulerDetail]]:
+    page_data = await task_scheduler_service.get_list(db=db, name=name, type=type)
+    return response_base.success(data=page_data)
+
+
+@router.post(
+    '',
+    summary='创建任务调度',
+    dependencies=[
+        Depends(RequestPermission('sys:task:add')),
+        DependsRBAC,
+    ],
+)
+async def create_task_scheduler(db: CurrentSessionTransaction, obj: CreateTaskSchedulerParam) -> ResponseModel:
+    await task_scheduler_service.create(db=db, obj=obj)
+    return response_base.success()
+
+
+@router.put(
+    '/{pk}',
+    summary='更新任务调度',
+    dependencies=[
+        Depends(RequestPermission('sys:task:edit')),
+        DependsRBAC,
+    ],
+)
+async def update_task_scheduler(
+    db: CurrentSessionTransaction,
+    pk: Annotated[int, Path(description='任务调度 ID')],
+    obj: UpdateTaskSchedulerParam,
+) -> ResponseModel:
+    count = await task_scheduler_service.update(db=db, pk=pk, obj=obj)
+    if count > 0:
+        return response_base.success()
+    return response_base.fail()
+
+
+@router.put(
+    '/{pk}/status',
+    summary='更新任务调度状态',
+    dependencies=[
+        Depends(RequestPermission('sys:task:edit')),
+        DependsRBAC,
+    ],
+)
+async def update_task_scheduler_status(
+    db: CurrentSessionTransaction, pk: Annotated[int, Path(description='任务调度 ID')]
+) -> ResponseModel:
+    count = await task_scheduler_service.update_status(db=db, pk=pk)
+    if count > 0:
+        return response_base.success()
+    return response_base.fail()
+
+
+@router.delete(
+    '/{pk}',
+    summary='删除任务调度',
+    dependencies=[
+        Depends(RequestPermission('sys:task:del')),
+        DependsRBAC,
+    ],
+)
+async def delete_task_scheduler(
+    db: CurrentSessionTransaction, pk: Annotated[int, Path(description='任务调度 ID')]
+) -> ResponseModel:
+    count = await task_scheduler_service.delete(db=db, pk=pk)
+    if count > 0:
+        return response_base.success()
+    return response_base.fail()
+
+
+@router.post(
+    '/{pk}/executions',
+    summary='手动执行任务',
+    dependencies=[
+        Depends(RequestPermission('sys:task:exec')),
+        DependsRBAC,
+    ],
+)
+async def execute_task(db: CurrentSession, pk: Annotated[int, Path(description='任务调度 ID')]) -> ResponseModel:
+    await task_scheduler_service.execute(db=db, pk=pk)
+    return response_base.success()

backend/app/task/api/v1/task.py

@@ -1,58 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-from typing import Annotated
-
-from fastapi import APIRouter, Depends, Path
-
-from backend.app.task.schema.task import RunParam, TaskResult
-from backend.app.task.service.task_service import task_service
-from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
-from backend.common.security.jwt import DependsJwtAuth
-from backend.common.security.permission import RequestPermission
-from backend.common.security.rbac import DependsRBAC
-
-router = APIRouter()
-
-
-@router.get(
-    '/{tid}',
-    summary='获取任务详情',
-    deprecated=True,
-    description='此接口被视为作废，建议使用 flower 查看任务详情',
-    dependencies=[DependsJwtAuth],
-)
-async def get_task(tid: Annotated[str, Path(description='任务 UUID')]) -> ResponseSchemaModel[TaskResult]:
-    status = task_service.get(tid=tid)
-    return response_base.success(data=status)
-
-
-@router.get('', summary='获取所有任务', dependencies=[DependsJwtAuth])
-async def get_all_tasks() -> ResponseSchemaModel[list[str]]:
-    tasks = await task_service.get_all()
-    return response_base.success(data=tasks)
-
-
-@router.delete(
-    '/{tid}',
-    summary='撤销任务',
-    dependencies=[
-        Depends(RequestPermission('sys:task:revoke')),
-        DependsRBAC,
-    ],
-)
-async def revoke_task(tid: Annotated[str, Path(description='任务 UUID')]) -> ResponseModel:
-    task_service.revoke(tid=tid)
-    return response_base.success()
-
-
-@router.post(
-    '/runs',
-    summary='运行任务',
-    dependencies=[
-        Depends(RequestPermission('sys:task:run')),
-        DependsRBAC,
-    ],
-)
-async def run_task(obj: RunParam) -> ResponseSchemaModel[str]:
-    task = task_service.run(obj=obj)
-    return response_base.success(data=task)

backend/app/task/celery.py

@@ -1,44 +1,21 @@
-#!/usr/bin/env python3
+import os
-# -*- coding: utf-8 -*-
-from typing import Any
 
 import celery
 import celery_aio_pool
 
+from backend.app.task.tasks.beat import LOCAL_BEAT_SCHEDULE
 from backend.core.conf import settings
-
+from backend.core.path_conf import BASE_PATH
-__all__ = ['celery_app']
 
 
-def get_broker_url() -> str:
+def find_task_packages() -> list[str]:
-    """获取消息代理 URL"""
+    packages = []
-    if settings.CELERY_BROKER == 'redis':
+    task_dir = BASE_PATH / 'app' / 'task' / 'tasks'
-        return (
+    for root, _dirs, files in os.walk(task_dir):
-            f'redis://:{settings.REDIS_PASSWORD}@{settings.REDIS_HOST}:'
+        if 'tasks.py' in files:
-            f'{settings.REDIS_PORT}/{settings.CELERY_BROKER_REDIS_DATABASE}'
+            package = root.replace(str(BASE_PATH.parent) + os.path.sep, '').replace(os.path.sep, '.')
-        )
+            packages.append(package)
-    return (
+    return packages
-        f'amqp://{settings.CELERY_RABBITMQ_USERNAME}:{settings.CELERY_RABBITMQ_PASSWORD}@'
-        f'{settings.CELERY_RABBITMQ_HOST}:{settings.CELERY_RABBITMQ_PORT}'
-    )
-
-
-def get_result_backend() -> str:
-    """获取结果后端 URL"""
-    return (
-        f'redis://:{settings.REDIS_PASSWORD}@{settings.REDIS_HOST}:'
-        f'{settings.REDIS_PORT}/{settings.CELERY_BACKEND_REDIS_DATABASE}'
-    )
-
-
-def get_result_backend_transport_options() -> dict[str, Any]:
-    """获取结果后端传输选项"""
-    return {
-        'global_keyprefix': settings.CELERY_BACKEND_REDIS_PREFIX,
-        'retry_policy': {
-            'timeout': settings.CELERY_BACKEND_REDIS_TIMEOUT,
-        },
-    }
 
 
 def init_celery() -> celery.Celery:
@@ -50,21 +27,34 @@ def init_celery() -> celery.Celery:
     celery.app.trace.build_tracer = celery_aio_pool.build_async_tracer
     celery.app.trace.reset_worker_optimizations()
 
+    # https://docs.celeryq.dev/en/stable/userguide/configuration.html
     app = celery.Celery(
         'fba_celery',
+        broker_url=f'redis://:{settings.REDIS_PASSWORD}@{settings.REDIS_HOST}:{settings.REDIS_PORT}/{settings.CELERY_BROKER_REDIS_DATABASE}'
+        if settings.CELERY_BROKER == 'redis'
+        else f'amqp://{settings.CELERY_RABBITMQ_USERNAME}:{settings.CELERY_RABBITMQ_PASSWORD}@{settings.CELERY_RABBITMQ_HOST}:{settings.CELERY_RABBITMQ_PORT}',
+        broker_connection_retry_on_startup=True,
+        result_backend=f'db+{settings.DATABASE_TYPE}+{"pymysql" if settings.DATABASE_TYPE == "mysql" else "psycopg"}'
+        f'://{settings.DATABASE_USER}:{settings.DATABASE_PASSWORD}@{settings.DATABASE_HOST}:{settings.DATABASE_PORT}/{settings.DATABASE_SCHEMA}',
+        result_extended=True,
+        database_engine_options={'echo': settings.DATABASE_ECHO},
+        # result_expires=0,
+        # beat_sync_every=1,
+        beat_schedule=LOCAL_BEAT_SCHEDULE,
+        beat_scheduler='backend.app.task.utils.schedulers:DatabaseScheduler',
+        task_cls='backend.app.task.tasks.base:TaskBase',
+        task_track_started=True,
         enable_utc=False,
         timezone=settings.DATETIME_TIMEZONE,
-        beat_schedule=settings.CELERY_SCHEDULE,
-        broker_url=get_broker_url(),
-        broker_connection_retry_on_startup=True,
-        result_backend=get_result_backend(),
-        result_backend_transport_options=get_result_backend_transport_options(),
-        task_cls='app.task.celery_task.base:TaskBase',
-        task_track_started=True,
     )
 
+    # 在 Celery 中设置此参数无效
+    # 参数：https://github.com/celery/celery/issues/7270
+    app.loader.override_backends = {'db': 'backend.app.task.database:DatabaseBackend'}
+
     # 自动发现任务
-    app.autodiscover_tasks(settings.CELERY_TASK_PACKAGES)
+    packages = find_task_packages()
+    app.autodiscover_tasks(packages)
 
     return app
 

backend/app/task/celery_task/__init__.py

@@ -1,2 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-

backend/app/task/celery_task/db_log/__init__.py

@@ -1,2 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-

backend/app/task/celery_task/db_log/tasks.py

@@ -1,19 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-from backend.app.admin.service.login_log_service import login_log_service
-from backend.app.admin.service.opera_log_service import opera_log_service
-from backend.app.task.celery import celery_app
-
-
-@celery_app.task(name='delete_db_opera_log')
-async def delete_db_opera_log() -> int:
-    """自动删除数据库操作日志"""
-    result = await opera_log_service.delete_all()
-    return result
-
-
-@celery_app.task(name='delete_db_login_log')
-async def delete_db_login_log() -> int:
-    """自动删除数据库登录日志"""
-    result = await login_log_service.delete_all()
-    return result

backend/app/task/celery_task/tasks.py

@@ -1,12 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-from anyio import sleep
-
-from backend.app.task.celery import celery_app
-
-
-@celery_app.task(name='task_demo_async')
-async def task_demo_async() -> str:
-    """异步示例任务，模拟耗时操作"""
-    await sleep(20)
-    return 'test async'

backend/app/task/crud/crud_result.py

@@ -0,0 +1,49 @@
+from sqlalchemy import Select
+from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy_crud_plus import CRUDPlus
+
+from backend.app.task.model import TaskResult
+
+
+class CRUDTaskResult(CRUDPlus[TaskResult]):
+    """任务结果数据库操作类"""
+
+    async def get(self, db: AsyncSession, pk: int) -> TaskResult | None:
+        """
+        获取任务结果详情
+
+        :param db: 数据库会话
+        :param pk: 任务 ID
+        :return:
+        """
+        return await self.select_model(db, pk)
+
+    async def get_select(self, name: str | None, task_id: str | None) -> Select:
+        """
+        获取任务结果列表查询表达式
+
+        :param name: 任务名称
+        :param task_id: 任务 ID
+        :return:
+        """
+        filters = {}
+
+        if name is not None:
+            filters['name__like'] = f'%{name}%'
+        if task_id is not None:
+            filters['task_id'] = task_id
+
+        return await self.select_order('id', 'desc', **filters)
+
+    async def delete(self, db: AsyncSession, pks: list[int]) -> int:
+        """
+        批量删除任务结果
+
+        :param db: 数据库会话
+        :param pks: 任务结果 ID 列表
+        :return:
+        """
+        return await self.delete_model_by_column(db, allow_multiple=True, id__in=pks)
+
+
+task_result_dao: CRUDTaskResult = CRUDTaskResult(TaskResult)