diff --git a/gsuid_core/buildin_plugins/core_command/core_status/__init__.py b/gsuid_core/buildin_plugins/core_command/core_status/__init__.py index 48a7464..fa995ea 100644 --- a/gsuid_core/buildin_plugins/core_command/core_status/__init__.py +++ b/gsuid_core/buildin_plugins/core_command/core_status/__init__.py @@ -37,10 +37,11 @@ async def count_group_user(): @scheduler.scheduled_job('cron', hour='0', minute='0') -async def scheduled_save_global_val(): +async def _u_scheduled_save_global_val_all(): global bot_val await save_all_global_val(1) gv.bot_val = {} + logger.success('[早柚核心] 状态已清空!') await count_group_user() logger.success('[早柚核心] 状态已保存!') diff --git a/gsuid_core/global_val.py b/gsuid_core/global_val.py index 9e7a8a3..d629d14 100644 --- a/gsuid_core/global_val.py +++ b/gsuid_core/global_val.py @@ -138,16 +138,19 @@ async def get_global_analysis( new_user.append(i) _user_all_list = list(set(user_all_list)) + _group_sll_list = list(set(group_all_list)) out_user = list(set(out_user)) + out_group = list(set(out_group)) - user_num = len(user_data) - group_num = len(group_data) + # user_num = len(user_data) + # group_num = len(group_data) + + day7_user_num = len(user_7_list) + day7_group_num = len(group_7_list) data = { - 'DAU': '{0:.2f}'.format(sum(user_data) / user_num) if user_num else 0, - 'DAG': ( - '{0:.2f}'.format(sum(group_data) / group_num) if group_num else 0 - ), + 'DAU': '{0:.2f}'.format(day7_user_num / 7) if day7_user_num else 0, + 'DAG': ('{0:.2f}'.format(day7_group_num / 7) if day7_group_num else 0), 'NU': str(len(new_user)), 'OU': ( '{0:.2f}%'.format((len(out_user) / len(_user_all_list)) * 100) @@ -156,8 +159,8 @@ async def get_global_analysis( ), 'NG': str(len(new_group)), 'OG': ( - '{0:.2f}%'.format((len(out_group) / len(group_all_list)) * 100) - if len(group_all_list) != 0 + '{0:.2f}%'.format((len(out_group) / len(_group_sll_list)) * 100) + if len(_group_sll_list) != 0 else "0.00%" ), } diff --git a/gsuid_core_core.svg b/gsuid_core_core.svg new file mode 100644 index 0000000..3ad4a48 --- /dev/null +++ b/gsuid_core_core.svg @@ -0,0 +1,1378 @@ + + + + + + +G + + + +aiofiles + +aiofiles + + + +fastapi_amis_admin_admin_site + +fastapi_amis_admin. +admin. +site + + + +aiofiles->fastapi_amis_admin_admin_site + + + + + +gsuid_core_global_val + +gsuid_core. +global_val + + + +aiofiles->gsuid_core_global_val + + + + + +gsuid_core_logger + +gsuid_core. +logger + + + +aiofiles->gsuid_core_logger + + + + + + +bs4 + +bs4 + + + +gsuid_core_web_app + +gsuid_core. +web_app + + + +bs4->gsuid_core_web_app + + + + +core_py + +core.py + + + +fastapi + +fastapi + + + +fastapi->core_py + + + + + +fastapi->fastapi_amis_admin_admin_site + + + + + +gsuid_core_bot + +gsuid_core.bot + + + +fastapi->gsuid_core_bot + + + + + + +gsuid_core_gs_logger + +gsuid_core. +gs_logger + + + +fastapi->gsuid_core_gs_logger + + + + +gsuid_core_server + +gsuid_core. +server + + + +fastapi->gsuid_core_server + + + + + + +fastapi->gsuid_core_web_app + + + + +gsuid_core_webconsole_mount_app + +gsuid_core. +webconsole. +mount_app + + + +fastapi->gsuid_core_webconsole_mount_app + + + + + + +fastapi_applications + +fastapi. +applications + + + +fastapi_applications->fastapi + + + + + +fastapi_background + +fastapi. +background + + + +fastapi_background->fastapi + + + + +fastapi_datastructures + +fastapi. +datastructures + + + +fastapi_datastructures->fastapi + + + + + +fastapi_datastructures->fastapi_applications + + + + + +fastapi_routing + +fastapi. +routing + + + +fastapi_datastructures->fastapi_routing + + + + + +fastapi_exceptions + +fastapi. +exceptions + + + +fastapi_exceptions->fastapi + + + + + +fastapi_exceptions->fastapi_applications + + + + + + +fastapi_exceptions->fastapi_routing + + + + + +fastapi_param_functions + +fastapi. +param_functions + + + +fastapi_param_functions->fastapi + + + + + +fastapi_requests + +fastapi. +requests + + + +fastapi_requests->fastapi + + + + +fastapi_responses + +fastapi. +responses + + + +fastapi_responses->fastapi + + + + + +fastapi_responses->gsuid_core_web_app + + + + + +fastapi_routing->fastapi + + + + +fastapi_routing->fastapi_applications + + + + + +fastapi_staticfiles + +fastapi. +staticfiles + + + +fastapi_staticfiles->gsuid_core_web_app + + + + + +fastapi_websockets + +fastapi. +websockets + + + +fastapi_websockets->fastapi + + + + + +fastapi_amis_admin + +fastapi_amis_admin + + + +gsuid_core_handler + +gsuid_core. +handler + + + +fastapi_amis_admin->gsuid_core_handler + + + + + +gsuid_core_webconsole + +gsuid_core. +webconsole + + + +fastapi_amis_admin->gsuid_core_webconsole + + + + +gsuid_core_webconsole___init__ + +gsuid_core. +webconsole. +__init__ + + + +fastapi_amis_admin->gsuid_core_webconsole___init__ + + + + + +fastapi_amis_admin->gsuid_core_webconsole_mount_app + + + + + +fastapi_amis_admin_admin + +fastapi_amis_admin. +admin + + + +fastapi_amis_admin_admin->gsuid_core_handler + + + + + + +fastapi_amis_admin_admin->gsuid_core_webconsole_mount_app + + + + +fastapi_amis_admin_admin_site->fastapi_amis_admin_admin + + + + + +fastapi_amis_admin_admin_site->gsuid_core_handler + + + + + +fastapi_amis_admin_admin_site->gsuid_core_webconsole_mount_app + + + + + + +gsuid_core + +gsuid_core + + + +gsuid_core->core_py + + + + +gsuid_core_aps + +gsuid_core.aps + + + +gsuid_core_gss + +gsuid_core.gss + + + +gsuid_core_aps->gsuid_core_gss + + + + + + +gsuid_core_aps->gsuid_core_web_app + + + + +gsuid_core_bot->core_py + + + + +gsuid_core_bot->gsuid_core_handler + + + + +gsuid_core_bot->gsuid_core_server + + + + + +gsuid_core_sv + +gsuid_core.sv + + + +gsuid_core_bot->gsuid_core_sv + + + + + +gsuid_core_config + +gsuid_core. +config + + + +gsuid_core_config->core_py + + + + + +gsuid_core_config->gsuid_core_aps + + + + + +gsuid_core_config->gsuid_core_handler + + + + +gsuid_core_config->gsuid_core_logger + + + + + +gsuid_core_config->gsuid_core_sv + + + + + + +gsuid_core_config->gsuid_core_web_app + + + + + +gsuid_core_config->gsuid_core_webconsole + + + + +gsuid_core_config->gsuid_core_webconsole___init__ + + + + +gsuid_core_data_store + +gsuid_core. +data_store + + + +gsuid_core_data_store->gsuid_core_config + + + + + +gsuid_core_data_store->gsuid_core_global_val + + + + + +gsuid_core_load_template + +gsuid_core. +load_template + + + +gsuid_core_data_store->gsuid_core_load_template + + + + +gsuid_core_data_store->gsuid_core_logger + + + + + +gsuid_core_segment + +gsuid_core. +segment + + + +gsuid_core_data_store->gsuid_core_segment + + + + + +gsuid_core_data_store->gsuid_core_web_app + + + + + + + +gsuid_core_global_val->gsuid_core_bot + + + + +gsuid_core_global_val->gsuid_core_handler + + + + +gsuid_core_global_val->gsuid_core_segment + + + + + +gsuid_core_global_val->gsuid_core_web_app + + + + + + +gsuid_core_gs_logger->gsuid_core_bot + + + + + +gsuid_core_gss->core_py + + + + +gsuid_core_gss->gsuid_core_web_app + + + + + +gsuid_core_handler->core_py + + + + +gsuid_core_load_template->gsuid_core_bot + + + + + + +gsuid_core_load_template->gsuid_core_segment + + + + + +gsuid_core_logger->core_py + + + + + +gsuid_core_logger->gsuid_core_aps + + + + + +gsuid_core_logger->gsuid_core_bot + + + + +gsuid_core_logger->gsuid_core_handler + + + + + +gsuid_core_logger->gsuid_core_load_template + + + + + +gsuid_core_logger->gsuid_core_server + + + + + +gsuid_core_logger->gsuid_core_sv + + + + +gsuid_core_logger->gsuid_core_web_app + + + + +gsuid_core_logger->gsuid_core_webconsole + + + + + + +gsuid_core_logger->gsuid_core_webconsole___init__ + + + + + + + + +gsuid_core_logger->gsuid_core_webconsole_mount_app + + + + + + +gsuid_core_message_models + +gsuid_core. +message_models + + + +gsuid_core_message_models->gsuid_core_bot + + + + + + +gsuid_core_message_models->gsuid_core_load_template + + + + + +gsuid_core_message_models->gsuid_core_segment + + + + + +gsuid_core_models + +gsuid_core. +models + + + +gsuid_core_models->core_py + + + + + +gsuid_core_models->gsuid_core_bot + + + + +gsuid_core_models->gsuid_core_gs_logger + + + + + +gsuid_core_models->gsuid_core_handler + + + + + + + + +gsuid_core_models->gsuid_core_load_template + + + + + + +gsuid_core_models->gsuid_core_logger + + + + + +gsuid_core_models->gsuid_core_segment + + + + + +gsuid_core_models->gsuid_core_sv + + + + + + +gsuid_core_trigger + +gsuid_core. +trigger + + + +gsuid_core_models->gsuid_core_trigger + + + + + + +gsuid_core_segment->gsuid_core_bot + + + + +gsuid_core_segment->gsuid_core_gs_logger + + + + + +gsuid_core_segment->gsuid_core_web_app + + + + + + +gsuid_core_server->gsuid_core_gss + + + + + +gsuid_core_server->gsuid_core_web_app + + + + +gsuid_core_sv->gsuid_core_handler + + + + + +gsuid_core_sv->gsuid_core_web_app + + + + + +gsuid_core_trigger->gsuid_core_handler + + + + +gsuid_core_trigger->gsuid_core_sv + + + + + +gsuid_core_version + +gsuid_core. +version + + + +gsuid_core_version->gsuid_core + + + + + +gsuid_core_version->gsuid_core_webconsole_mount_app + + + + + + +gsuid_core_web_app->core_py + + + + +gsuid_core_webconsole->gsuid_core_web_app + + + + +gsuid_core_webconsole___init__->gsuid_core_web_app + + + + +gsuid_core_webconsole_mount_app->gsuid_core_web_app + + + + +gsuid_core_webconsole_mount_app->gsuid_core_webconsole + + + + + +gsuid_core_webconsole_mount_app->gsuid_core_webconsole___init__ + + + + + +loguru + +loguru + + + +loguru->gsuid_core_logger + + + + +msgspec + +msgspec + + + +msgspec->core_py + + + + +msgspec->gsuid_core_bot + + + + + + + +msgspec->gsuid_core_gs_logger + + + + + + +msgspec->gsuid_core_message_models + + + + + +msgspec->gsuid_core_models + + + + + +msgspec->gsuid_core_segment + + + + + + +msgspec__core + +msgspec._core + + + +msgspec__core->msgspec + + + + + + +msgspec_inspect + +msgspec. +inspect + + + +msgspec__core->msgspec_inspect + + + + + +msgspec_json + +msgspec.json + + + +msgspec__core->msgspec_json + + + + + +msgspec_msgpack + +msgspec. +msgpack + + + +msgspec__core->msgspec_msgpack + + + + + +msgspec_structs + +msgspec. +structs + + + +msgspec__core->msgspec_structs + + + + + + +msgspec__json_schema + +msgspec. +_json_schema + + + +msgspec__json_schema->msgspec_json + + + + + +msgspec__version + +msgspec. +_version + + + +msgspec__version->msgspec + + + + + +msgspec_inspect->msgspec + + + + + + +msgspec_inspect->msgspec__json_schema + + + + + +msgspec_json->core_py + + + + + + + + + + + + +msgspec_json->gsuid_core_bot + + + + + +msgspec_json->gsuid_core_gs_logger + + + + + +msgspec_json->msgspec + + + + + +msgspec_msgpack->msgspec + + + + +msgspec_structs->msgspec + + + + +msgspec_toml + +msgspec.toml + + + +msgspec_toml->msgspec + + + + + +msgspec_yaml + +msgspec.yaml + + + +msgspec_yaml->msgspec + + + + + +PIL + +PIL + + + +PIL->gsuid_core_segment + + + + +PIL->gsuid_core_web_app + + + + +PIL_Image + +PIL.Image + + + +PIL_Image->gsuid_core_segment + + + + + + +PIL_Image->gsuid_core_web_app + + + + + +starlette + +starlette + + + +starlette->fastapi + + + + + + + + +starlette->fastapi_applications + + + + + +starlette->fastapi_background + + + + + +starlette->fastapi_datastructures + + + + + +starlette->fastapi_exceptions + + + + + +starlette->fastapi_requests + + + + + +starlette->fastapi_responses + + + + + + +starlette->fastapi_routing + + + + + + +starlette->fastapi_staticfiles + + + + + +starlette->fastapi_websockets + + + + + +starlette->fastapi_amis_admin_admin_site + + + + + +starlette->gsuid_core_web_app + + + + +starlette->gsuid_core_webconsole_mount_app + + + + + +starlette_requests + +starlette. +requests + + + +starlette_requests->fastapi_applications + + + + + + + +starlette_requests->fastapi_requests + + + + + +starlette_requests->fastapi_routing + + + + +starlette_requests->fastapi_amis_admin_admin_site + + + + + + +starlette_requests->gsuid_core_web_app + + + + +starlette_requests->gsuid_core_webconsole_mount_app + + + + +starlette_status + +starlette. +status + + + +starlette_status->fastapi + + + + + + +starlette_status->gsuid_core_webconsole_mount_app + + + + +uvicorn + +uvicorn + + + +uvicorn->core_py + + + + +uvicorn->gsuid_core_logger + + + + +uvicorn_config + +uvicorn.config + + + +uvicorn_config->gsuid_core_logger + + + + +uvicorn_config->uvicorn + + + + + +uvicorn_main + +uvicorn.main + + + +uvicorn_config->uvicorn_main + + + + + +uvicorn_main->uvicorn + + + + +