Merge pull request #1343 from longguikeji/v2.5-dev

2.6.1
longguikeji · Oct 13, 2022 · c2e66c8 · c2e66c8
2 parents a991152 + 1f13c94
commit c2e66c8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git 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
 
 

diff --git 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:

diff --git 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'