From 262b8e391e4b86f006269abbcad1665d491f3662 Mon Sep 17 00:00:00 2001 From: feng <1304903146@qq.com> Date: Fri, 22 Nov 2024 14:31:06 +0800 Subject: [PATCH 1/3] perf: Update poetry --- poetry.lock | 4 ++-- pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index 78cbcdc6f..a063e5d75 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.4 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. [[package]] name = "adal" @@ -7752,4 +7752,4 @@ reference = "aliyun" [metadata] lock-version = "2.0" python-versions = "^3.11" -content-hash = "184c3ae62b74c9af2a61c7a1e955666da7099bd832ad3c16504b1b3012ff93bb" +content-hash = "ebb8489221c06b52f600454895456831b92f37c0c6422bc7abcc9b4cbf92b67a" diff --git a/pyproject.toml b/pyproject.toml index 7ddace257..f27911bfc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -165,7 +165,7 @@ polib = "^1.2.0" # psycopg2 = "2.9.6" psycopg2-binary = "2.9.6" pycountry = "^24.6.1" -premailer = "^3.10.0" +premailer = "3.10.0" [tool.poetry.group.xpack] optional = true From da7965a49168342e199426a8205293ce130c2ae9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 22 Nov 2024 06:45:13 +0000 Subject: [PATCH 2/3] perf: Update Dockerfile with new base image tag --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0168efb66..9b0ed9a87 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM jumpserver/core-base:20240909_110723 AS stage-build +FROM jumpserver/core-base:20241122_063310 AS stage-build ARG VERSION From d962312db5a66b4338f3ea1cc6843c4b4b3ef43d Mon Sep 17 00:00:00 2001 From: feng <1304903146@qq.com> Date: Mon, 25 Nov 2024 17:25:41 +0800 Subject: [PATCH 3/3] fix: Account migrate 0012 file --- ...12_accountcheckengine_accountcheckautomation_engines.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/accounts/migrations/0012_accountcheckengine_accountcheckautomation_engines.py b/apps/accounts/migrations/0012_accountcheckengine_accountcheckautomation_engines.py index 375469b9d..ebc1ce012 100644 --- a/apps/accounts/migrations/0012_accountcheckengine_accountcheckautomation_engines.py +++ b/apps/accounts/migrations/0012_accountcheckengine_accountcheckautomation_engines.py @@ -1,9 +1,10 @@ # Generated by Django 4.1.13 on 2024-11-14 11:00 -from django.db import migrations, models -import django.db.models.deletion import uuid +import django.db.models.deletion +from django.db import migrations, models + def init_account_check_engine(apps, schema_editor): data = [ @@ -20,7 +21,7 @@ def init_account_check_engine(apps, schema_editor): 'comment': '基于账号密码的安全性进行检查分析, 检查密码强度、泄露等信息' } ] - model_cls = apps.get_model('accounts', 'AccountCheckEngine') + model_cls = apps.get_model('accounts', 'CheckAccountEngine') for item in data: model_cls.objects.create(**item)