Merge pull request #1340 from longguikeji/release-2.6.x

Release 2.6.0
longguikeji · Oct 12, 2022 · 72a2334 · 72a2334
2 parents 10847a6 + a991152
commit 72a2334
Show file tree

Hide file tree

Showing 140 changed files with 3,552 additions and 19,533 deletions.
diff --git a/.gitignore b/.gitignore
@@ -196,7 +196,11 @@ db.sqlite3-journal
 djangosaml2idp/saml2_config/*.xml
 
 arkid_extensions
+arkid_celery_tasks
 
 .devcontainer/
 storage/
 results.sqlite
+
+tasks
+~
diff --git a/api/v1/pages/app_manage/app_group.py b/api/v1/pages/app_manage/app_group.py
@@ -20,7 +20,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='app',
+    icon='app_group',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/app_manage/app_list.py b/api/v1/pages/app_manage/app_list.py
@@ -52,7 +52,7 @@
 router = routers.FrontRouter(
     path=tag,
     name=name,
-    icon='list',
+    icon='app_list',
     page=page,
 )
 

diff --git a/api/v1/pages/app_manage/app_protocol.py b/api/v1/pages/app_manage/app_protocol.py
@@ -13,7 +13,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='protocal',
+    icon='app_protocal',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/approve_manage/all_approve_requests.py b/api/v1/pages/approve_manage/all_approve_requests.py
@@ -15,7 +15,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='request',
+    icon='approve_request',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/approve_manage/approve_action.py b/api/v1/pages/approve_manage/approve_action.py
@@ -17,7 +17,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='action',
+    icon='approve_action',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/approve_manage/approve_system.py b/api/v1/pages/approve_manage/approve_system.py
@@ -17,6 +17,7 @@
     path=tag,
     name=name,
     page=page,
+    icon='approve_system'
 )
 
 page.create_actions(

diff --git a/api/v1/pages/auth_manage/auth_factor.py b/api/v1/pages/auth_manage/auth_factor.py
@@ -17,7 +17,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='factor',
+    icon='auth_factor',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/auth_manage/auth_rules.py b/api/v1/pages/auth_manage/auth_rules.py
@@ -17,7 +17,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='rule',
+    icon='auth_rule',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/auth_manage/auto_auth.py b/api/v1/pages/auth_manage/auto_auth.py
@@ -17,7 +17,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='auto',
+    icon='auto_auth',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/auth_manage/third_auth.py b/api/v1/pages/auth_manage/third_auth.py
@@ -17,7 +17,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='third',
+    icon='third_auth',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/charts_manage/__init__.py b/api/v1/pages/charts_manage/__init__.py
@@ -3,9 +3,9 @@
 from . import bi_systems,charts
 
 router = routers.FrontRouter(
-    path='charts',
+    path='charts_manage',
     name='图表分析',
-    icon='charts',
+    icon='charts_manage',
     children=[
         charts.router,
         bi_systems.router,

diff --git a/api/v1/pages/charts_manage/bi_systems.py b/api/v1/pages/charts_manage/bi_systems.py
@@ -17,7 +17,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='bi',
+    icon='bi_system',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/data_source_manage/__init__.py b/api/v1/pages/data_source_manage/__init__.py
@@ -5,7 +5,7 @@
 router = routers.FrontRouter(
     path='data_source',
     name='身份数据源',
-    icon='source',
+    icon='data_source',
     children=[
         scim_sync.router,
         permission_sync.router,

diff --git a/api/v1/pages/data_source_manage/permission_sync.py b/api/v1/pages/data_source_manage/permission_sync.py
@@ -17,7 +17,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='sync',
+    icon='permission_sync',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/data_source_manage/scim_sync.py b/api/v1/pages/data_source_manage/scim_sync.py
@@ -17,7 +17,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='scim',
+    icon='scim_sync',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/desktop/mine_app_group_list.py b/api/v1/pages/desktop/mine_app_group_list.py
@@ -14,7 +14,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='app',
+    icon='app_group_list',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/developer_manage/api_docs.py b/api/v1/pages/developer_manage/api_docs.py
@@ -8,5 +8,6 @@
 router = FrontRouter(
     path=tag,
     name=name,
-    url='/api/v1/tenant/{tenant_id}/docs/redoc/'
+    url='/api/v1/tenant/{tenant_id}/docs/redoc/',
+    icon='api_doc'
 )
diff --git a/api/v1/pages/developer_manage/event_list.py b/api/v1/pages/developer_manage/event_list.py
@@ -13,7 +13,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='list',
+    icon='event_list',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/extension_manage/extension_admin.py b/api/v1/pages/extension_manage/extension_admin.py
@@ -55,7 +55,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='extension',
+    icon='extension_admin',
 )
 
 page.add_pages([

diff --git a/api/v1/pages/extension_manage/extension_manage.py b/api/v1/pages/extension_manage/extension_manage.py
@@ -47,7 +47,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='extension',
+    icon='tenant_extension_manage',
 )
 
 platform_extension_page.create_actions(

diff --git a/api/v1/pages/log_manage/log_config.py b/api/v1/pages/log_manage/log_config.py
@@ -11,7 +11,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='settings',
+    icon='log_config',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/message/message_manage.py b/api/v1/pages/message/message_manage.py
@@ -11,7 +11,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='message',
+    icon='message_manage',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/mine/approve_manage.py b/api/v1/pages/mine/approve_manage.py
@@ -13,7 +13,7 @@
 router = routers.FrontRouter(
     path=tag,
     name=name,
-    icon='app',
+    icon='mine_approve_request',
     page=page,
 )
 

diff --git a/api/v1/pages/mine/auth_manage.py b/api/v1/pages/mine/auth_manage.py
@@ -53,6 +53,6 @@
 router = routers.FrontRouter(
     path=tag,
     name=name,
-    icon='auth',
+    icon='mine_auth_manage',
     page=page
 )
diff --git a/api/v1/pages/mine/grant_manage.py b/api/v1/pages/mine/grant_manage.py
@@ -25,7 +25,7 @@
 router = routers.FrontRouter(
     path=tag,
     name=name,
-    icon='app',
+    icon='mine_grant_manage',
     page=page,
 )
 

diff --git a/api/v1/pages/mine/mine_message.py b/api/v1/pages/mine/mine_message.py
@@ -21,7 +21,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='message',
+    icon='mine_message',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/mine/profile.py b/api/v1/pages/mine/profile.py
@@ -16,7 +16,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='profile',
+    icon='mine_profile',
 )
 
 page.add_pages([profile_page])

diff --git a/api/v1/pages/permission_manage/__init__.py b/api/v1/pages/permission_manage/__init__.py
@@ -5,7 +5,7 @@
 router = routers.FrontRouter(
     path='permission_manage',
     name=_('权限管理'),
-    icon='list',
+    icon='permission_manage',
     children=[
         permission_list.router,
         permission_group.router,

diff --git a/api/v1/pages/permission_manage/grant_manage/__init__.py b/api/v1/pages/permission_manage/grant_manage/__init__.py
@@ -20,5 +20,5 @@
     path='grant_manage',
     name=_('授权管理'),
     page=page,
-    icon='grant',
+    icon='grant_manage',
 )
diff --git a/api/v1/pages/permission_manage/grant_rules.py b/api/v1/pages/permission_manage/grant_rules.py
@@ -17,7 +17,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='rule',
+    icon='grant_rule',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/permission_manage/permission_group.py b/api/v1/pages/permission_manage/permission_group.py
@@ -22,7 +22,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='group',
+    icon='permission_group',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/permission_manage/permission_list.py b/api/v1/pages/permission_manage/permission_list.py
@@ -17,7 +17,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='list',
+    icon='permission_list',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/platform_admin/__init__.py b/api/v1/pages/platform_admin/__init__.py
@@ -6,7 +6,7 @@
 router = routers.FrontRouter(
     path='platform_admin',
     name=_('平台管理'),
-    icon='platform',
+    icon='platform_admin',
     children=[
         language_admin.router,
         tenant_admin.router,

diff --git a/api/v1/pages/platform_admin/language_admin.py b/api/v1/pages/platform_admin/language_admin.py
@@ -14,7 +14,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='language',
+    icon='language_admin',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/platform_admin/platform_config.py b/api/v1/pages/platform_admin/platform_config.py
@@ -11,7 +11,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='settings',
+    icon='platform_config',
 )
 
 pages.register_front_pages(page)

diff --git a/api/v1/pages/platform_admin/tenant_admin.py b/api/v1/pages/platform_admin/tenant_admin.py
@@ -13,7 +13,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='list',
+    icon='tenant_admin',
 )
 
 

diff --git a/api/v1/pages/tenant_manage/__init__.py b/api/v1/pages/tenant_manage/__init__.py
@@ -5,7 +5,7 @@
 router = routers.FrontRouter(
     path='tenant_manage',
     name=_('租户管理'),
-    icon='tenant',
+    icon='tenant_manage',
     children=[
         tenant_config.router,
         child_manager.router,

diff --git a/api/v1/pages/tenant_manage/center_arkid.py b/api/v1/pages/tenant_manage/center_arkid.py
@@ -17,7 +17,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='center',
+    icon='center_arkid',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/tenant_manage/child_manager.py b/api/v1/pages/tenant_manage/child_manager.py
@@ -51,7 +51,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='child',
+    icon='child_manager',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/tenant_manage/tenant_config.py b/api/v1/pages/tenant_manage/tenant_config.py
@@ -13,7 +13,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='settings',
+    icon='tenant_config',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/user_manage/account_life.py b/api/v1/pages/user_manage/account_life.py
@@ -19,7 +19,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='life',
+    icon='account_life',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/user_manage/user_group.py b/api/v1/pages/user_manage/user_group.py
@@ -22,7 +22,7 @@
     path=tag,
     name=name,
     page=page,
-    icon='user',
+    icon='user_group',
 )
 
 page.create_actions(

diff --git a/api/v1/pages/user_manage/user_list.py b/api/v1/pages/user_manage/user_list.py
@@ -16,7 +16,7 @@
 router = routers.FrontRouter(
     path=tag,
     name=name,
-    icon='list',
+    icon='user_list',
     page=page,
 )