From 34d46897f8aa8d57dd844805d06efd8b55740c72 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 20 May 2021 15:55:15 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=91=A8=E6=9C=9F?=
 =?UTF-8?q?=E7=9B=91=E6=B5=8B=E4=BB=BB=E5=8A=A1=E9=85=8D=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/jumpserver/conf.py | 2 +-
 config_example.yml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py
index 7bb8dd095..68be2776b 100644
--- a/apps/jumpserver/conf.py
+++ b/apps/jumpserver/conf.py
@@ -279,7 +279,7 @@ class Config(dict):
         'WINDOWS_SSH_DEFAULT_SHELL': 'cmd',
         'FLOWER_URL': "127.0.0.1:5555",
         'DEFAULT_ORG_SHOW_ALL_USERS': True,
-        'PERIOD_TASK_ENABLE': True,
+        'PERIOD_TASK_ENABLED': True,
         'FORCE_SCRIPT_NAME': '',
         'LOGIN_CONFIRM_ENABLE': False,
         'WINDOWS_SKIP_ALL_MANUAL_PASSWORD': False,
diff --git a/config_example.yml b/config_example.yml
index c3e2ce0f5..9fa4c1814 100644
--- a/config_example.yml
+++ b/config_example.yml
@@ -122,7 +122,7 @@ REDIS_PORT: 6379
 # USER_LOGIN_SINGLE_MACHINE_ENABLED: False
 #
 # 启用定时任务
-# PERIOD_TASK_ENABLE: True
+# PERIOD_TASK_ENABLED: True
 #
 # 启用二次复合认证配置
 # LOGIN_CONFIRM_ENABLE: False

From c66f366446bb51aa0307a220d1e1395953d3e4a7 Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Thu, 20 May 2021 17:25:41 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20default=20?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=94=A8=E6=88=B7=E6=95=B0=E9=87=8F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/orgs/caches.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/orgs/caches.py b/apps/orgs/caches.py
index 8b5a61b51..5ca445479 100644
--- a/apps/orgs/caches.py
+++ b/apps/orgs/caches.py
@@ -78,12 +78,12 @@ class OrgResourceStatisticsCache(OrgRelatedCache):
         return self.org
 
     def compute_users_amount(self):
-        if self.org.is_root():
-            users_amount = User.objects.exclude(role='App').count()
-        else:
-            users_amount = OrganizationMember.objects.values(
-                'user_id'
-            ).filter(org_id=self.org.id).distinct().count()
+        users = User.objects.exclude(role='App')
+
+        if not self.org.is_root():
+            users = users.filter(m2m_org_members__org_id=self.org.id)
+
+        users_amount = users.values('id').distinct().count()
         return users_amount
 
     def compute_assets_amount(self):

From 9ccde0365686755b5178f7033bb55f149e85348e Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Fri, 21 May 2021 11:14:29 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9cloud=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/locale/zh/LC_MESSAGES/django.mo | Bin 75310 -> 75321 bytes
 apps/locale/zh/LC_MESSAGES/django.po |  35 +++++++++++++++------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 231c4df8c203cbe0edd5ba7271eef34414d7398b..b3bde6600c0bb872d8d1b75fc24aa8530be39c0b 100644
GIT binary patch
delta 10964
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

delta 10961
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

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 8cf941acb..a64dde7cd 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JumpServer 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 14:56+0800\n"
+"POT-Creation-Date: 2021-05-21 11:08+0800\n"
 "PO-Revision-Date: 2021-05-20 10:54+0800\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: JumpServer team<ibuler@qq.com>\n"
@@ -184,7 +184,7 @@ msgstr "格式为逗号分隔的字符串, * 表示匹配所有. "
 #: users/templates/users/_select_user_modal.html:14
 #: xpack/plugins/change_auth_plan/models.py:47
 #: xpack/plugins/change_auth_plan/models.py:278
-#: xpack/plugins/cloud/serializers.py:71
+#: xpack/plugins/cloud/serializers.py:65
 msgid "Username"
 msgstr "用户名"
 
@@ -285,7 +285,7 @@ msgid "Cluster"
 msgstr "集群"
 
 #: applications/serializers/attrs/application_category/db.py:11
-#: ops/models/adhoc.py:146 xpack/plugins/cloud/serializers.py:69
+#: ops/models/adhoc.py:146 xpack/plugins/cloud/serializers.py:63
 msgid "Host"
 msgstr "主机"
 
@@ -295,7 +295,7 @@ msgstr "主机"
 #: applications/serializers/attrs/application_type/oracle.py:11
 #: applications/serializers/attrs/application_type/pgsql.py:11
 #: assets/models/asset.py:188 assets/models/domain.py:53
-#: xpack/plugins/cloud/serializers.py:70
+#: xpack/plugins/cloud/serializers.py:64
 msgid "Port"
 msgstr "端口"
 
@@ -325,7 +325,7 @@ msgstr "目标URL"
 #: xpack/plugins/change_auth_plan/models.py:68
 #: xpack/plugins/change_auth_plan/models.py:190
 #: xpack/plugins/change_auth_plan/models.py:285
-#: xpack/plugins/cloud/serializers.py:73
+#: xpack/plugins/cloud/serializers.py:67
 msgid "Password"
 msgstr "密码"
 
@@ -407,7 +407,7 @@ msgstr "激活"
 
 #: assets/models/asset.py:196 assets/models/cluster.py:19
 #: assets/models/user.py:66 templates/_nav.html:44
-#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers.py:166
+#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers.py:160
 msgid "Admin user"
 msgstr "管理用户"
 
@@ -678,7 +678,7 @@ msgstr "ssh私钥"
 #: users/templates/users/user_asset_permission.html:41
 #: users/templates/users/user_asset_permission.html:73
 #: users/templates/users/user_asset_permission.html:158
-#: xpack/plugins/cloud/models.py:89 xpack/plugins/cloud/serializers.py:167
+#: xpack/plugins/cloud/models.py:89 xpack/plugins/cloud/serializers.py:161
 msgid "Node"
 msgstr "节点"
 
@@ -3999,7 +3999,7 @@ msgid "Security token validation"
 msgstr "安全令牌验证"
 
 #: users/templates/users/_base_otp.html:14 xpack/plugins/cloud/models.py:78
-#: xpack/plugins/cloud/serializers.py:165
+#: xpack/plugins/cloud/serializers.py:159
 msgid "Account"
 msgstr "账户"
 
@@ -4740,7 +4740,7 @@ msgstr "云服务商"
 msgid "Cloud account"
 msgstr "云账号"
 
-#: xpack/plugins/cloud/models.py:81 xpack/plugins/cloud/serializers.py:146
+#: xpack/plugins/cloud/models.py:81 xpack/plugins/cloud/serializers.py:140
 msgid "Regions"
 msgstr "地域"
 
@@ -4748,7 +4748,7 @@ msgstr "地域"
 msgid "Hostname strategy"
 msgstr "主机名策略"
 
-#: xpack/plugins/cloud/models.py:95 xpack/plugins/cloud/serializers.py:169
+#: xpack/plugins/cloud/models.py:95 xpack/plugins/cloud/serializers.py:163
 msgid "Always update"
 msgstr "总是更新"
 
@@ -4940,19 +4940,19 @@ msgstr ""
 msgid "Subscription ID"
 msgstr ""
 
-#: xpack/plugins/cloud/serializers.py:55
-msgid "{} is required"
-msgstr "{} 字段是必填项"
+#: xpack/plugins/cloud/serializers.py:49
+msgid "This field is required"
+msgstr "这个字段是必填项"
 
-#: xpack/plugins/cloud/serializers.py:144
+#: xpack/plugins/cloud/serializers.py:138
 msgid "History count"
 msgstr "执行次数"
 
-#: xpack/plugins/cloud/serializers.py:145
+#: xpack/plugins/cloud/serializers.py:139
 msgid "Instance count"
 msgstr "实例个数"
 
-#: xpack/plugins/cloud/serializers.py:168
+#: xpack/plugins/cloud/serializers.py:162
 #: xpack/plugins/gathered_user/serializers.py:20
 msgid "Periodic display"
 msgstr "定时执行"
@@ -5045,6 +5045,9 @@ msgstr "旗舰版"
 msgid "Community edition"
 msgstr "社区版"
 
+#~ msgid "{} is required"
+#~ msgstr "{} 字段是必填项"
+
 #~ msgid "AppSecret is required"
 #~ msgstr "AppSecret 是必须的"
 

From d765e61991fe9e5608088c0c1f8d8b9b76caae3c Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Fri, 21 May 2021 15:13:43 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix(assets):=20=E4=BF=AE=E5=A4=8D=E7=BD=91?=
 =?UTF-8?q?=E5=85=B3=E4=BF=A1=E6=81=AF=E6=B2=A1=E6=9C=89=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/serializers/domain.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/assets/serializers/domain.py b/apps/assets/serializers/domain.py
index 0d9c4a6f5..5d8d0e8d8 100644
--- a/apps/assets/serializers/domain.py
+++ b/apps/assets/serializers/domain.py
@@ -59,7 +59,7 @@ class GatewaySerializer(AuthSerializerMixin, BulkOrgResourceModelSerializer):
             'created_by', 'comment',
         ]
         fields_fk = ['domain']
-        fields = fields_small +  fields_fk
+        fields = fields_small + fields_fk
         extra_kwargs = {
             'password': {'write_only': True, 'validators': [NoSpecialChars()]},
             'private_key': {"write_only": True},
@@ -78,12 +78,12 @@ class GatewaySerializer(AuthSerializerMixin, BulkOrgResourceModelSerializer):
 
 
 class GatewayWithAuthSerializer(GatewaySerializer):
-    def get_field_names(self, declared_fields, info):
-        fields = super().get_field_names(declared_fields, info)
-        fields.extend(
-            ['password', 'private_key']
-        )
-        return fields
+    class Meta(GatewaySerializer.Meta):
+        extra_kwargs = {
+            'password': {'write_only': False, 'validators': [NoSpecialChars()]},
+            'private_key': {"write_only": False},
+            'public_key': {"write_only": False},
+        }
 
 
 class DomainWithGatewaySerializer(BulkOrgResourceModelSerializer):