Skip to content

Commit e207622

Browse files
authored
Update the system config to plugin (#561)
1 parent 38d9d9f commit e207622

File tree

18 files changed

+65
-27
lines changed

18 files changed

+65
-27
lines changed

backend/app/admin/api/v1/sys/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# -*- coding: utf-8 -*-
33
from fastapi import APIRouter
44

5-
from backend.app.admin.api.v1.sys.config import router as config_router
65
from backend.app.admin.api.v1.sys.data_rule import router as data_rule_router
76
from backend.app.admin.api.v1.sys.dept import router as dept_router
87
from backend.app.admin.api.v1.sys.dict_data import router as dict_data_router
@@ -16,7 +15,6 @@
1615

1716
router = APIRouter(prefix='/sys')
1817

19-
router.include_router(config_router, prefix='/configs', tags=['系统参数配置'])
2018
router.include_router(dept_router, prefix='/depts', tags=['系统部门'])
2119
router.include_router(dict_data_router, prefix='/dict-datas', tags=['系统字典数据'])
2220
router.include_router(dict_type_router, prefix='/dict-types', tags=['系统字典类型'])

backend/app/admin/conf.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,10 @@ class AdminSettings(BaseSettings):
2727
CAPTCHA_LOGIN_REDIS_PREFIX: str = 'fba:login:captcha'
2828
CAPTCHA_LOGIN_EXPIRE_SECONDS: int = 60 * 5 # 3 分钟
2929

30-
# 参数配置
31-
CONFIG_BUILT_IN_TYPES: list[str] = ['website', 'protocol', 'policy']
32-
3330

3431
@lru_cache
3532
def get_admin_settings() -> AdminSettings:
36-
"""获取 admin 参数配置"""
33+
"""获取 admin 配置"""
3734
return AdminSettings()
3835

3936

backend/app/admin/model/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
3-
from backend.app.admin.model.config import Config
43
from backend.app.admin.model.data_rule import DataRule
54
from backend.app.admin.model.dept import Dept
65
from backend.app.admin.model.dict_data import DictData

backend/plugin/config/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-

backend/plugin/config/api/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-

backend/app/admin/api/v1/sys/config.py renamed to backend/plugin/config/api/v1/sys/config.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44

55
from fastapi import APIRouter, Depends, Path, Query
66

7-
from backend.app.admin.schema.config import (
8-
CreateConfigParam,
9-
GetConfigDetail,
10-
SaveBuiltInConfigParam,
11-
UpdateConfigParam,
12-
)
13-
from backend.app.admin.service.config_service import config_service
147
from backend.common.pagination import DependsPagination, PageData, paging_data
158
from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
169
from backend.common.security.jwt import DependsJwtAuth
1710
from backend.common.security.permission import RequestPermission
1811
from backend.common.security.rbac import DependsRBAC
1912
from backend.database.db import CurrentSession
13+
from backend.plugin.config.schema.config import (
14+
CreateConfigParam,
15+
GetConfigDetail,
16+
SaveBuiltInConfigParam,
17+
UpdateConfigParam,
18+
)
19+
from backend.plugin.config.service.config_service import config_service
2020

2121
router = APIRouter()
2222

backend/plugin/config/conf.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-
3+
from functools import lru_cache
4+
5+
from pydantic_settings import BaseSettings
6+
7+
8+
class ConfigSettings(BaseSettings):
9+
"""参数配置"""
10+
11+
# 参数
12+
CONFIG_BUILT_IN_TYPES: list[str] = ['website', 'protocol', 'policy']
13+
14+
15+
@lru_cache
16+
def get_config_settings() -> ConfigSettings:
17+
"""获取参数配置"""
18+
return ConfigSettings()
19+
20+
21+
config_settings = get_config_settings()
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-

0 commit comments

Comments
 (0)