From 3086cfc5836cffc424f8f6c8a610ab339e311b23 Mon Sep 17 00:00:00 2001 From: inji-hanbin Date: Wed, 12 Oct 2022 16:11:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20=E4=B8=8D=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arkid/core/tasks/celery.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkid/core/tasks/celery.py b/arkid/core/tasks/celery.py index 70bab4236..a598416ec 100644 --- a/arkid/core/tasks/celery.py +++ b/arkid/core/tasks/celery.py @@ -45,7 +45,7 @@ def __init__(self, parent, **options): @app.task(bind=True) def dispatch_task(self, task_name, *args, **kwargs): - logger.info(f'=== Dispatch task：{task_name}, args: {args}, kwargs: {kwargs}') + # logger.info(f'=== Dispatch task：{task_name}, args: {args}, kwargs: {kwargs}') for name, task in app.tasks.items(): func_name = name.split('.')[-1] if func_name == task_name: From a7b8ee488e012ce54b2c90eab912c00613fa503d Mon Sep 17 00:00:00 2001 From: wely Date: Thu, 13 Oct 2022 10:16:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84package?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extension_root/com_longgui_default_desktop/config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension_root/com_longgui_default_desktop/config.toml b/extension_root/com_longgui_default_desktop/config.toml index 616dd8325..7a6e7febc 100644 --- a/extension_root/com_longgui_default_desktop/config.toml +++ b/extension_root/com_longgui_default_desktop/config.toml @@ -1,4 +1,4 @@ -package='com.longgui.other.defaultdesktop' +package='com.longgui.default.desktop' name="租户默认桌面设置" version='1.0' labels='defaultdesktop' From 1f13c94d04013a57cd78328a35fc26db52021137 Mon Sep 17 00:00:00 2001 From: luolu-lg Date: Thu, 13 Oct 2022 10:21:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=B8=AD=E5=BF=83arkid=20(#1342)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arkid/common/bind_saas.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arkid/common/bind_saas.py b/arkid/common/bind_saas.py index 4ebce3275..d20c93ad4 100644 --- a/arkid/common/bind_saas.py +++ b/arkid/common/bind_saas.py @@ -20,9 +20,10 @@ def get_bind_info(tenant_id): if resp.status_code != 200: raise Exception(f'Error get_bind_info: {resp.status_code}') resp = resp.json() - tenant = Tenant.objects.get(id=tenant_id) - create_arkidstore_login_app(tenant, resp['saas_tenant_id']) - create_arkid_saas_login_app(tenant, resp['saas_tenant_id'], resp.get('saas_login_url')) + if resp.get('saas_tenant_id'): + tenant = Tenant.objects.get(id=tenant_id) + create_arkidstore_login_app(tenant, resp['saas_tenant_id']) + create_arkid_saas_login_app(tenant, resp['saas_tenant_id'], resp.get('saas_login_url')) return resp