Update singleton pattern class typing

wu-clan · wu-clan · commit fc3848e09296 · 2024-11-08T12:13:52.000+08:00
diff --git a/backend/app/admin/service/api_service.py b/backend/app/admin/service/api_service.py
@@ -51,4 +51,4 @@ async def delete(*, pk: list[int]) -> int:
             return count
 
 
-api_service = ApiService()
+api_service: ApiService = ApiService()
diff --git a/backend/app/admin/service/auth_service.py b/backend/app/admin/service/auth_service.py
@@ -168,4 +168,4 @@ async def logout(*, request: Request, response: Response) -> None:
             await redis_client.delete_prefix(key_prefix)
 
 
-auth_service = AuthService()
+auth_service: AuthService = AuthService()
diff --git a/backend/app/admin/service/casbin_service.py b/backend/app/admin/service/casbin_service.py
@@ -134,4 +134,4 @@ async def delete_all_groups(*, uuid: UUID) -> int:
         return count
 
 
-casbin_service = CasbinService()
+casbin_service: CasbinService = CasbinService()
diff --git a/backend/app/admin/service/config_service.py b/backend/app/admin/service/config_service.py
@@ -54,4 +54,4 @@ async def delete(*, pk: list[int]) -> int:
             return count
 
 
-config_service = ConfigService()
+config_service: ConfigService = ConfigService()
diff --git a/backend/app/admin/service/dept_service.py b/backend/app/admin/service/dept_service.py
@@ -71,4 +71,4 @@ async def delete(*, pk: int) -> int:
             return count
 
 
-dept_service = DeptService()
+dept_service: DeptService = DeptService()
diff --git a/backend/app/admin/service/dict_data_service.py b/backend/app/admin/service/dict_data_service.py
@@ -56,4 +56,4 @@ async def delete(*, pk: list[int]) -> int:
             return count
 
 
-dict_data_service = DictDataService()
+dict_data_service: DictDataService = DictDataService()
diff --git a/backend/app/admin/service/dict_type_service.py b/backend/app/admin/service/dict_type_service.py
@@ -40,4 +40,4 @@ async def delete(*, pk: list[int]) -> int:
             return count
 
 
-dict_type_service = DictTypeService()
+dict_type_service: DictTypeService = DictTypeService()
diff --git a/backend/app/admin/service/login_log_service.py b/backend/app/admin/service/login_log_service.py
@@ -61,4 +61,4 @@ async def delete_all() -> int:
             return count
 
 
-login_log_service = LoginLogService()
+login_log_service: LoginLogService = LoginLogService()
diff --git a/backend/app/admin/service/menu_service.py b/backend/app/admin/service/menu_service.py
@@ -96,4 +96,4 @@ async def delete(*, pk: int) -> int:
             return count
 
 
-menu_service = MenuService()
+menu_service: MenuService = MenuService()
diff --git a/backend/app/admin/service/oauth2_service.py b/backend/app/admin/service/oauth2_service.py
@@ -91,4 +91,4 @@ async def create_with_login(
             return data
 
 
-oauth2_service = OAuth2Service()
+oauth2_service: OAuth2Service = OAuth2Service()
diff --git a/backend/app/admin/service/opera_log_service.py b/backend/app/admin/service/opera_log_service.py
@@ -30,4 +30,4 @@ async def delete_all() -> int:
             return count
 
 
-opera_log_service = OperaLogService()
+opera_log_service: OperaLogService = OperaLogService()
diff --git a/backend/app/admin/service/role_service.py b/backend/app/admin/service/role_service.py
@@ -84,4 +84,4 @@ async def delete(*, pk: list[int]) -> int:
             return count
 
 
-role_service = RoleService()
+role_service: RoleService = RoleService()
diff --git a/backend/app/admin/service/user_service.py b/backend/app/admin/service/user_service.py
@@ -246,4 +246,4 @@ async def delete(*, username: str) -> int:
             return count
 
 
-user_service = UserService()
+user_service: UserService = UserService()
diff --git a/backend/app/generator/service/gen_business_service.py b/backend/app/generator/service/gen_business_service.py
@@ -45,4 +45,4 @@ async def delete(*, pk: int) -> int:
             return count
 
 
-gen_business_service = GenBusinessService()
+gen_business_service: GenBusinessService = GenBusinessService()
diff --git a/backend/app/generator/service/gen_model_service.py b/backend/app/generator/service/gen_model_service.py
@@ -58,4 +58,4 @@ async def delete(*, pk: int) -> int:
             return count
 
 
-gen_model_service = GenModelService()
+gen_model_service: GenModelService = GenModelService()
diff --git a/backend/app/generator/service/gen_service.py b/backend/app/generator/service/gen_service.py
@@ -166,4 +166,4 @@ async def download(self, *, pk: int) -> io.BytesIO:
             return bio
 
 
-gen_service = GenService()
+gen_service: GenService = GenService()
diff --git a/backend/app/task/service/task_service.py b/backend/app/task/service/task_service.py
@@ -43,4 +43,4 @@ def run(*, name: str, args: list | None = None, kwargs: dict | None = None):
         return task
 
 
-task_service = TaskService()
+task_service: TaskService = TaskService()
diff --git a/backend/common/response/response_schema.py b/backend/common/response/response_schema.py
@@ -107,4 +107,4 @@ def fast_success(
         return MsgSpecJSONResponse({'code': res.code, 'msg': res.msg, 'data': data})
 
 
-response_base = ResponseBase()
+response_base: ResponseBase = ResponseBase()
diff --git a/backend/common/security/rbac.py b/backend/common/security/rbac.py
@@ -101,6 +101,6 @@ async def rbac_verify(self, request: Request, _token: str = DependsJwtAuth) -> N
                 raise AuthorizationError
 
 
-rbac = RBAC()
+rbac: RBAC = RBAC()
 # RBAC 授权依赖注入
 DependsRBAC = Depends(rbac.rbac_verify)
diff --git a/backend/database/db_redis.py b/backend/database/db_redis.py
@@ -60,5 +60,5 @@ async def delete_prefix(self, prefix: str, exclude: str | list = None):
             await self.delete(*keys)
 
 
-# 创建 redis 客户端实例
-redis_client = RedisCli()
+# 创建 redis 客户端单例
+redis_client: RedisCli = RedisCli()
diff --git a/backend/templates/py/service.jinja b/backend/templates/py/service.jinja
@@ -45,4 +45,4 @@ class {{ table_name_class }}Service:
             return count
 
 
-{{ table_name_en }}_service = {{ table_name_class }}Service()
+{{ table_name_en }}_service: {{ table_name_class }}Service = {{ table_name_class }}Service()
diff --git a/backend/utils/gen_template.py b/backend/utils/gen_template.py
@@ -99,4 +99,4 @@ def get_vars(business: GenBusiness, models: list[GenModel]) -> dict:
         }
 
 
-gen_template = GenTemplate()
+gen_template: GenTemplate = GenTemplate()
diff --git a/backend/utils/redis_info.py b/backend/utils/redis_info.py
@@ -30,4 +30,4 @@ async def get_stats():
         return stats_list
 
 
-redis_info = RedisInfo()
+redis_info: RedisInfo = RedisInfo()
diff --git a/backend/utils/server_info.py b/backend/utils/server_info.py
@@ -144,4 +144,4 @@ def get_service_info():
         }
 
 
-server_info = ServerInfo()
+server_info: ServerInfo = ServerInfo()
diff --git a/backend/utils/timezone.py b/backend/utils/timezone.py
@@ -50,4 +50,4 @@ def f_utc(dt: datetime) -> datetime:
         return dt.astimezone(datetime_timezone.utc)
 
 
-timezone = TimeZone()
+timezone: TimeZone = TimeZone()

Original file line number	Diff line number	Diff line change
`@@ -51,4 +51,4 @@ async def delete(*, pk: list[int]) -> int:`
`51`	`51`	`return count`
`52`	`52`
`53`	`53`
`54`		`-api_service = ApiService()`
	`54`	`+api_service: ApiService = ApiService()`
Original file line number	Diff line number	Diff line change
`@@ -168,4 +168,4 @@ async def logout(*, request: Request, response: Response) -> None:`
`168`	`168`	`await redis_client.delete_prefix(key_prefix)`
`169`	`169`
`170`	`170`
`171`		`-auth_service = AuthService()`
	`171`	`+auth_service: AuthService = AuthService()`
Original file line number	Diff line number	Diff line change
`@@ -134,4 +134,4 @@ async def delete_all_groups(*, uuid: UUID) -> int:`
`134`	`134`	`return count`
`135`	`135`
`136`	`136`
`137`		`-casbin_service = CasbinService()`
	`137`	`+casbin_service: CasbinService = CasbinService()`
Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,4 @@ async def delete(*, pk: list[int]) -> int:`
`54`	`54`	`return count`
`55`	`55`
`56`	`56`
`57`		`-config_service = ConfigService()`
	`57`	`+config_service: ConfigService = ConfigService()`
Original file line number	Diff line number	Diff line change
`@@ -71,4 +71,4 @@ async def delete(*, pk: int) -> int:`
`71`	`71`	`return count`
`72`	`72`
`73`	`73`
`74`		`-dept_service = DeptService()`
	`74`	`+dept_service: DeptService = DeptService()`
Original file line number	Diff line number	Diff line change
`@@ -56,4 +56,4 @@ async def delete(*, pk: list[int]) -> int:`
`56`	`56`	`return count`
`57`	`57`
`58`	`58`
`59`		`-dict_data_service = DictDataService()`
	`59`	`+dict_data_service: DictDataService = DictDataService()`
Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,4 @@ async def delete(*, pk: list[int]) -> int:`
`40`	`40`	`return count`
`41`	`41`
`42`	`42`
`43`		`-dict_type_service = DictTypeService()`
	`43`	`+dict_type_service: DictTypeService = DictTypeService()`
Original file line number	Diff line number	Diff line change
`@@ -61,4 +61,4 @@ async def delete_all() -> int:`
`61`	`61`	`return count`
`62`	`62`
`63`	`63`
`64`		`-login_log_service = LoginLogService()`
	`64`	`+login_log_service: LoginLogService = LoginLogService()`
Original file line number	Diff line number	Diff line change
`@@ -96,4 +96,4 @@ async def delete(*, pk: int) -> int:`
`96`	`96`	`return count`
`97`	`97`
`98`	`98`
`99`		`-menu_service = MenuService()`
	`99`	`+menu_service: MenuService = MenuService()`
Original file line number	Diff line number	Diff line change
`@@ -91,4 +91,4 @@ async def create_with_login(`
`91`	`91`	`return data`
`92`	`92`
`93`	`93`
`94`		`-oauth2_service = OAuth2Service()`
	`94`	`+oauth2_service: OAuth2Service = OAuth2Service()`