Merge branch 'pam' of github.com:jumpserver/jumpserver into pam

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
 

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)
 

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"

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