From a3355e25453ea2210f1b849e4c6e3f182a7fadbd Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Fri, 5 Dec 2025 15:02:04 +0800 Subject: [PATCH] =?UTF-8?q?refactor&feat:=20=E4=BC=98=E5=8C=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=93=E6=9E=84=EF=BC=8C=E6=96=B0=E5=A2=9Ecommon?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=8E=9Fannotation=E3=80=81aspect?= =?UTF-8?q?=E3=80=81constant=E3=80=81enums=E6=A8=A1=E5=9D=97=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E8=87=B3common=E6=A8=A1=E5=9D=97=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{module_admin => common}/annotation/log_annotation.py | 2 +- .../annotation/pydantic_annotation.py | 0 .../{module_admin => common}/aspect/data_scope.py | 0 .../{module_admin => common}/aspect/interface_auth.py | 0 ruoyi-fastapi-backend/{config => common}/constant.py | 0 ruoyi-fastapi-backend/{config => common}/enums.py | 0 .../module_admin/controller/cache_controller.py | 2 +- .../module_admin/controller/captcha_controller.py | 2 +- .../module_admin/controller/config_controller.py | 6 +++--- .../module_admin/controller/dept_controller.py | 8 ++++---- .../module_admin/controller/dict_controller.py | 6 +++--- .../module_admin/controller/job_controller.py | 6 +++--- .../module_admin/controller/log_controller.py | 6 +++--- .../module_admin/controller/login_controller.py | 4 ++-- .../module_admin/controller/menu_controller.py | 6 +++--- .../module_admin/controller/notice_controller.py | 6 +++--- .../module_admin/controller/online_controller.py | 6 +++--- .../module_admin/controller/post_controller.py | 6 +++--- .../module_admin/controller/role_controller.py | 8 ++++---- .../module_admin/controller/server_controller.py | 2 +- .../module_admin/controller/user_controller.py | 8 ++++---- .../module_admin/service/cache_service.py | 2 +- .../module_admin/service/config_service.py | 4 ++-- .../module_admin/service/dept_service.py | 2 +- .../module_admin/service/dict_service.py | 4 ++-- ruoyi-fastapi-backend/module_admin/service/job_service.py | 2 +- .../module_admin/service/login_service.py | 4 ++-- .../module_admin/service/menu_service.py | 2 +- .../module_admin/service/notice_service.py | 2 +- .../module_admin/service/online_service.py | 2 +- .../module_admin/service/post_service.py | 2 +- .../module_admin/service/role_service.py | 2 +- .../module_admin/service/user_service.py | 2 +- .../module_generator/controller/gen_controller.py | 6 +++--- .../module_generator/entity/vo/gen_vo.py | 2 +- .../module_generator/service/gen_service.py | 2 +- .../templates/python/controller.py.jinja2 | 6 +++--- .../module_generator/templates/python/service.py.jinja2 | 2 +- ruoyi-fastapi-backend/utils/gen_util.py | 2 +- ruoyi-fastapi-backend/utils/response_util.py | 2 +- ruoyi-fastapi-backend/utils/string_util.py | 2 +- ruoyi-fastapi-backend/utils/template_util.py | 2 +- 42 files changed, 70 insertions(+), 70 deletions(-) rename ruoyi-fastapi-backend/{module_admin => common}/annotation/log_annotation.py (99%) rename ruoyi-fastapi-backend/{module_admin => common}/annotation/pydantic_annotation.py (100%) rename ruoyi-fastapi-backend/{module_admin => common}/aspect/data_scope.py (100%) rename ruoyi-fastapi-backend/{module_admin => common}/aspect/interface_auth.py (100%) rename ruoyi-fastapi-backend/{config => common}/constant.py (100%) rename ruoyi-fastapi-backend/{config => common}/enums.py (100%) diff --git a/ruoyi-fastapi-backend/module_admin/annotation/log_annotation.py b/ruoyi-fastapi-backend/common/annotation/log_annotation.py similarity index 99% rename from ruoyi-fastapi-backend/module_admin/annotation/log_annotation.py rename to ruoyi-fastapi-backend/common/annotation/log_annotation.py index 0c48512..a0df36a 100644 --- a/ruoyi-fastapi-backend/module_admin/annotation/log_annotation.py +++ b/ruoyi-fastapi-backend/common/annotation/log_annotation.py @@ -15,7 +15,7 @@ from starlette.status import HTTP_200_OK from typing_extensions import ParamSpec from user_agents import parse -from config.enums import BusinessType +from common.enums import BusinessType from config.env import AppConfig from exceptions.exception import LoginException, ServiceException, ServiceWarning from module_admin.entity.vo.log_vo import LogininforModel, OperLogModel diff --git a/ruoyi-fastapi-backend/module_admin/annotation/pydantic_annotation.py b/ruoyi-fastapi-backend/common/annotation/pydantic_annotation.py similarity index 100% rename from ruoyi-fastapi-backend/module_admin/annotation/pydantic_annotation.py rename to ruoyi-fastapi-backend/common/annotation/pydantic_annotation.py diff --git a/ruoyi-fastapi-backend/module_admin/aspect/data_scope.py b/ruoyi-fastapi-backend/common/aspect/data_scope.py similarity index 100% rename from ruoyi-fastapi-backend/module_admin/aspect/data_scope.py rename to ruoyi-fastapi-backend/common/aspect/data_scope.py diff --git a/ruoyi-fastapi-backend/module_admin/aspect/interface_auth.py b/ruoyi-fastapi-backend/common/aspect/interface_auth.py similarity index 100% rename from ruoyi-fastapi-backend/module_admin/aspect/interface_auth.py rename to ruoyi-fastapi-backend/common/aspect/interface_auth.py diff --git a/ruoyi-fastapi-backend/config/constant.py b/ruoyi-fastapi-backend/common/constant.py similarity index 100% rename from ruoyi-fastapi-backend/config/constant.py rename to ruoyi-fastapi-backend/common/constant.py diff --git a/ruoyi-fastapi-backend/config/enums.py b/ruoyi-fastapi-backend/common/enums.py similarity index 100% rename from ruoyi-fastapi-backend/config/enums.py rename to ruoyi-fastapi-backend/common/enums.py diff --git a/ruoyi-fastapi-backend/module_admin/controller/cache_controller.py b/ruoyi-fastapi-backend/module_admin/controller/cache_controller.py index 7ade706..a5ff8ca 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/cache_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/cache_controller.py @@ -2,7 +2,7 @@ from typing import Annotated from fastapi import APIRouter, Depends, Path, Request, Response -from module_admin.aspect.interface_auth import CheckUserInterfaceAuth +from common.aspect.interface_auth import CheckUserInterfaceAuth from module_admin.entity.vo.cache_vo import CacheInfoModel, CacheMonitorModel from module_admin.service.cache_service import CacheService from module_admin.service.login_service import LoginService diff --git a/ruoyi-fastapi-backend/module_admin/controller/captcha_controller.py b/ruoyi-fastapi-backend/module_admin/controller/captcha_controller.py index 479375c..f1ef6c4 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/captcha_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/captcha_controller.py @@ -3,7 +3,7 @@ from datetime import timedelta from fastapi import APIRouter, Request, Response -from config.enums import RedisInitKeyConfig +from common.enums import RedisInitKeyConfig from module_admin.entity.vo.login_vo import CaptchaCode from module_admin.service.captcha_service import CaptchaService from utils.log_util import logger diff --git a/ruoyi-fastapi-backend/module_admin/controller/config_controller.py b/ruoyi-fastapi-backend/module_admin/controller/config_controller.py index 640966c..ac8c811 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/config_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/config_controller.py @@ -5,10 +5,10 @@ from fastapi import APIRouter, Depends, Form, Path, Query, Request, Response from pydantic_validation_decorator import ValidateFields from sqlalchemy.ext.asyncio import AsyncSession -from config.enums import BusinessType +from common.annotation.log_annotation import Log +from common.aspect.interface_auth import CheckUserInterfaceAuth +from common.enums import BusinessType from config.get_db import get_db -from module_admin.annotation.log_annotation import Log -from module_admin.aspect.interface_auth import CheckUserInterfaceAuth from module_admin.entity.vo.config_vo import ConfigModel, ConfigPageQueryModel, DeleteConfigModel from module_admin.entity.vo.user_vo import CurrentUserModel from module_admin.service.config_service import ConfigService diff --git a/ruoyi-fastapi-backend/module_admin/controller/dept_controller.py b/ruoyi-fastapi-backend/module_admin/controller/dept_controller.py index d5638c7..a3a98e6 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/dept_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/dept_controller.py @@ -5,11 +5,11 @@ from fastapi import APIRouter, Depends, Path, Query, Request, Response from pydantic_validation_decorator import ValidateFields from sqlalchemy.ext.asyncio import AsyncSession -from config.enums import BusinessType +from common.annotation.log_annotation import Log +from common.aspect.data_scope import GetDataScope +from common.aspect.interface_auth import CheckUserInterfaceAuth +from common.enums import BusinessType from config.get_db import get_db -from module_admin.annotation.log_annotation import Log -from module_admin.aspect.data_scope import GetDataScope -from module_admin.aspect.interface_auth import CheckUserInterfaceAuth from module_admin.entity.vo.dept_vo import DeleteDeptModel, DeptModel, DeptQueryModel from module_admin.entity.vo.user_vo import CurrentUserModel from module_admin.service.dept_service import DeptService diff --git a/ruoyi-fastapi-backend/module_admin/controller/dict_controller.py b/ruoyi-fastapi-backend/module_admin/controller/dict_controller.py index 2822591..9a719ae 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/dict_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/dict_controller.py @@ -5,10 +5,10 @@ from fastapi import APIRouter, Depends, Form, Path, Query, Request, Response from pydantic_validation_decorator import ValidateFields from sqlalchemy.ext.asyncio import AsyncSession -from config.enums import BusinessType +from common.annotation.log_annotation import Log +from common.aspect.interface_auth import CheckUserInterfaceAuth +from common.enums import BusinessType from config.get_db import get_db -from module_admin.annotation.log_annotation import Log -from module_admin.aspect.interface_auth import CheckUserInterfaceAuth from module_admin.entity.vo.dict_vo import ( DeleteDictDataModel, DeleteDictTypeModel, diff --git a/ruoyi-fastapi-backend/module_admin/controller/job_controller.py b/ruoyi-fastapi-backend/module_admin/controller/job_controller.py index 0b4306d..efe9021 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/job_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/job_controller.py @@ -5,10 +5,10 @@ from fastapi import APIRouter, Depends, Form, Path, Query, Request, Response from pydantic_validation_decorator import ValidateFields from sqlalchemy.ext.asyncio import AsyncSession -from config.enums import BusinessType +from common.annotation.log_annotation import Log +from common.aspect.interface_auth import CheckUserInterfaceAuth +from common.enums import BusinessType from config.get_db import get_db -from module_admin.annotation.log_annotation import Log -from module_admin.aspect.interface_auth import CheckUserInterfaceAuth from module_admin.entity.vo.job_vo import ( DeleteJobLogModel, DeleteJobModel, diff --git a/ruoyi-fastapi-backend/module_admin/controller/log_controller.py b/ruoyi-fastapi-backend/module_admin/controller/log_controller.py index 39541be..c64943e 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/log_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/log_controller.py @@ -3,10 +3,10 @@ from typing import Annotated from fastapi import APIRouter, Depends, Form, Path, Query, Request, Response from sqlalchemy.ext.asyncio import AsyncSession -from config.enums import BusinessType +from common.annotation.log_annotation import Log +from common.aspect.interface_auth import CheckUserInterfaceAuth +from common.enums import BusinessType from config.get_db import get_db -from module_admin.annotation.log_annotation import Log -from module_admin.aspect.interface_auth import CheckUserInterfaceAuth from module_admin.entity.vo.log_vo import ( DeleteLoginLogModel, DeleteOperLogModel, diff --git a/ruoyi-fastapi-backend/module_admin/controller/login_controller.py b/ruoyi-fastapi-backend/module_admin/controller/login_controller.py index 0accf07..6df7872 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/login_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/login_controller.py @@ -6,10 +6,10 @@ import jwt from fastapi import APIRouter, Depends, Request, Response from sqlalchemy.ext.asyncio import AsyncSession -from config.enums import BusinessType, RedisInitKeyConfig +from common.annotation.log_annotation import Log +from common.enums import BusinessType, RedisInitKeyConfig from config.env import AppConfig, JwtConfig from config.get_db import get_db -from module_admin.annotation.log_annotation import Log from module_admin.entity.vo.common_vo import CrudResponseModel from module_admin.entity.vo.login_vo import Token, UserLogin, UserRegister from module_admin.entity.vo.user_vo import CurrentUserModel, EditUserModel diff --git a/ruoyi-fastapi-backend/module_admin/controller/menu_controller.py b/ruoyi-fastapi-backend/module_admin/controller/menu_controller.py index 4cf4d76..0359ab0 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/menu_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/menu_controller.py @@ -5,10 +5,10 @@ from fastapi import APIRouter, Depends, Path, Query, Request, Response from pydantic_validation_decorator import ValidateFields from sqlalchemy.ext.asyncio import AsyncSession -from config.enums import BusinessType +from common.annotation.log_annotation import Log +from common.aspect.interface_auth import CheckUserInterfaceAuth +from common.enums import BusinessType from config.get_db import get_db -from module_admin.annotation.log_annotation import Log -from module_admin.aspect.interface_auth import CheckUserInterfaceAuth from module_admin.entity.vo.menu_vo import DeleteMenuModel, MenuModel, MenuQueryModel from module_admin.entity.vo.user_vo import CurrentUserModel from module_admin.service.login_service import LoginService diff --git a/ruoyi-fastapi-backend/module_admin/controller/notice_controller.py b/ruoyi-fastapi-backend/module_admin/controller/notice_controller.py index 9a01737..8dcb2cf 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/notice_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/notice_controller.py @@ -5,10 +5,10 @@ from fastapi import APIRouter, Depends, Path, Query, Request, Response from pydantic_validation_decorator import ValidateFields from sqlalchemy.ext.asyncio import AsyncSession -from config.enums import BusinessType +from common.annotation.log_annotation import Log +from common.aspect.interface_auth import CheckUserInterfaceAuth +from common.enums import BusinessType from config.get_db import get_db -from module_admin.annotation.log_annotation import Log -from module_admin.aspect.interface_auth import CheckUserInterfaceAuth from module_admin.entity.vo.notice_vo import DeleteNoticeModel, NoticeModel, NoticePageQueryModel from module_admin.entity.vo.user_vo import CurrentUserModel from module_admin.service.login_service import LoginService diff --git a/ruoyi-fastapi-backend/module_admin/controller/online_controller.py b/ruoyi-fastapi-backend/module_admin/controller/online_controller.py index 70c731c..4fde252 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/online_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/online_controller.py @@ -3,10 +3,10 @@ from typing import Annotated from fastapi import APIRouter, Depends, Path, Query, Request, Response from sqlalchemy.ext.asyncio import AsyncSession -from config.enums import BusinessType +from common.annotation.log_annotation import Log +from common.aspect.interface_auth import CheckUserInterfaceAuth +from common.enums import BusinessType from config.get_db import get_db -from module_admin.annotation.log_annotation import Log -from module_admin.aspect.interface_auth import CheckUserInterfaceAuth from module_admin.entity.vo.online_vo import DeleteOnlineModel, OnlineQueryModel from module_admin.service.login_service import LoginService from module_admin.service.online_service import OnlineService diff --git a/ruoyi-fastapi-backend/module_admin/controller/post_controller.py b/ruoyi-fastapi-backend/module_admin/controller/post_controller.py index 475849d..64368ae 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/post_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/post_controller.py @@ -5,10 +5,10 @@ from fastapi import APIRouter, Depends, Form, Path, Query, Request, Response from pydantic_validation_decorator import ValidateFields from sqlalchemy.ext.asyncio import AsyncSession -from config.enums import BusinessType +from common.annotation.log_annotation import Log +from common.aspect.interface_auth import CheckUserInterfaceAuth +from common.enums import BusinessType from config.get_db import get_db -from module_admin.annotation.log_annotation import Log -from module_admin.aspect.interface_auth import CheckUserInterfaceAuth from module_admin.entity.vo.post_vo import DeletePostModel, PostModel, PostPageQueryModel from module_admin.entity.vo.user_vo import CurrentUserModel from module_admin.service.login_service import LoginService diff --git a/ruoyi-fastapi-backend/module_admin/controller/role_controller.py b/ruoyi-fastapi-backend/module_admin/controller/role_controller.py index 5e52133..c13bf55 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/role_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/role_controller.py @@ -5,11 +5,11 @@ from fastapi import APIRouter, Depends, Form, Path, Query, Request, Response from pydantic_validation_decorator import ValidateFields from sqlalchemy.ext.asyncio import AsyncSession -from config.enums import BusinessType +from common.annotation.log_annotation import Log +from common.aspect.data_scope import GetDataScope +from common.aspect.interface_auth import CheckUserInterfaceAuth +from common.enums import BusinessType from config.get_db import get_db -from module_admin.annotation.log_annotation import Log -from module_admin.aspect.data_scope import GetDataScope -from module_admin.aspect.interface_auth import CheckUserInterfaceAuth from module_admin.entity.vo.dept_vo import DeptModel from module_admin.entity.vo.role_vo import AddRoleModel, DeleteRoleModel, RoleModel, RolePageQueryModel from module_admin.entity.vo.user_vo import CrudUserRoleModel, CurrentUserModel, UserRolePageQueryModel diff --git a/ruoyi-fastapi-backend/module_admin/controller/server_controller.py b/ruoyi-fastapi-backend/module_admin/controller/server_controller.py index 2258e83..ed1bffb 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/server_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/server_controller.py @@ -1,6 +1,6 @@ from fastapi import APIRouter, Depends, Request, Response -from module_admin.aspect.interface_auth import CheckUserInterfaceAuth +from common.aspect.interface_auth import CheckUserInterfaceAuth from module_admin.entity.vo.server_vo import ServerMonitorModel from module_admin.service.login_service import LoginService from module_admin.service.server_service import ServerService diff --git a/ruoyi-fastapi-backend/module_admin/controller/user_controller.py b/ruoyi-fastapi-backend/module_admin/controller/user_controller.py index c36604b..b8cdc5a 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/user_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/user_controller.py @@ -7,12 +7,12 @@ from fastapi import APIRouter, Depends, File, Form, Path, Query, Request, Respon from pydantic_validation_decorator import ValidateFields from sqlalchemy.ext.asyncio import AsyncSession -from config.enums import BusinessType +from common.annotation.log_annotation import Log +from common.aspect.data_scope import GetDataScope +from common.aspect.interface_auth import CheckUserInterfaceAuth +from common.enums import BusinessType from config.env import UploadConfig from config.get_db import get_db -from module_admin.annotation.log_annotation import Log -from module_admin.aspect.data_scope import GetDataScope -from module_admin.aspect.interface_auth import CheckUserInterfaceAuth from module_admin.entity.vo.dept_vo import DeptModel from module_admin.entity.vo.user_vo import ( AddUserModel, diff --git a/ruoyi-fastapi-backend/module_admin/service/cache_service.py b/ruoyi-fastapi-backend/module_admin/service/cache_service.py index 27619a8..6ffb2eb 100644 --- a/ruoyi-fastapi-backend/module_admin/service/cache_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/cache_service.py @@ -1,6 +1,6 @@ from fastapi import Request -from config.enums import RedisInitKeyConfig +from common.enums import RedisInitKeyConfig from config.get_redis import RedisUtil from module_admin.entity.vo.cache_vo import CacheInfoModel, CacheMonitorModel from module_admin.entity.vo.common_vo import CrudResponseModel diff --git a/ruoyi-fastapi-backend/module_admin/service/config_service.py b/ruoyi-fastapi-backend/module_admin/service/config_service.py index 20a4968..3c45a5f 100644 --- a/ruoyi-fastapi-backend/module_admin/service/config_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/config_service.py @@ -4,8 +4,8 @@ from fastapi import Request from redis import asyncio as aioredis from sqlalchemy.ext.asyncio import AsyncSession -from config.constant import CommonConstant -from config.enums import RedisInitKeyConfig +from common.constant import CommonConstant +from common.enums import RedisInitKeyConfig from exceptions.exception import ServiceException from module_admin.dao.config_dao import ConfigDao from module_admin.entity.vo.common_vo import CrudResponseModel diff --git a/ruoyi-fastapi-backend/module_admin/service/dept_service.py b/ruoyi-fastapi-backend/module_admin/service/dept_service.py index 247ee6b..186ea32 100644 --- a/ruoyi-fastapi-backend/module_admin/service/dept_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/dept_service.py @@ -3,7 +3,7 @@ from typing import Any from sqlalchemy.ext.asyncio import AsyncSession -from config.constant import CommonConstant +from common.constant import CommonConstant from exceptions.exception import ServiceException, ServiceWarning from module_admin.dao.dept_dao import DeptDao from module_admin.entity.do.dept_do import SysDept diff --git a/ruoyi-fastapi-backend/module_admin/service/dict_service.py b/ruoyi-fastapi-backend/module_admin/service/dict_service.py index 9bd556e..d92fcbe 100644 --- a/ruoyi-fastapi-backend/module_admin/service/dict_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/dict_service.py @@ -6,8 +6,8 @@ from fastapi import Request from redis import asyncio as aioredis from sqlalchemy.ext.asyncio import AsyncSession -from config.constant import CommonConstant -from config.enums import RedisInitKeyConfig +from common.constant import CommonConstant +from common.enums import RedisInitKeyConfig from exceptions.exception import ServiceException from module_admin.dao.dict_dao import DictDataDao, DictTypeDao from module_admin.entity.do.dict_do import SysDictData diff --git a/ruoyi-fastapi-backend/module_admin/service/job_service.py b/ruoyi-fastapi-backend/module_admin/service/job_service.py index 7e584ce..83a9282 100644 --- a/ruoyi-fastapi-backend/module_admin/service/job_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/job_service.py @@ -3,7 +3,7 @@ from typing import Any, Union from fastapi import Request from sqlalchemy.ext.asyncio import AsyncSession -from config.constant import CommonConstant, JobConstant +from common.constant import CommonConstant, JobConstant from config.get_scheduler import SchedulerUtil from exceptions.exception import ServiceException from module_admin.dao.job_dao import JobDao diff --git a/ruoyi-fastapi-backend/module_admin/service/login_service.py b/ruoyi-fastapi-backend/module_admin/service/login_service.py index f55eaa8..6dfe31b 100644 --- a/ruoyi-fastapi-backend/module_admin/service/login_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/login_service.py @@ -10,8 +10,8 @@ from jwt.exceptions import InvalidTokenError from sqlalchemy import Row from sqlalchemy.ext.asyncio import AsyncSession -from config.constant import CommonConstant, MenuConstant -from config.enums import RedisInitKeyConfig +from common.constant import CommonConstant, MenuConstant +from common.enums import RedisInitKeyConfig from config.env import AppConfig, JwtConfig from config.get_db import get_db from exceptions.exception import AuthException, LoginException, ServiceException diff --git a/ruoyi-fastapi-backend/module_admin/service/menu_service.py b/ruoyi-fastapi-backend/module_admin/service/menu_service.py index 6c403d5..43526bd 100644 --- a/ruoyi-fastapi-backend/module_admin/service/menu_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/menu_service.py @@ -3,7 +3,7 @@ from typing import Any, Optional from sqlalchemy.ext.asyncio import AsyncSession -from config.constant import CommonConstant, MenuConstant +from common.constant import CommonConstant, MenuConstant from exceptions.exception import ServiceException, ServiceWarning from module_admin.dao.menu_dao import MenuDao from module_admin.dao.role_dao import RoleDao diff --git a/ruoyi-fastapi-backend/module_admin/service/notice_service.py b/ruoyi-fastapi-backend/module_admin/service/notice_service.py index 51452e6..5949887 100644 --- a/ruoyi-fastapi-backend/module_admin/service/notice_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/notice_service.py @@ -2,7 +2,7 @@ from typing import Any, Union from sqlalchemy.ext.asyncio import AsyncSession -from config.constant import CommonConstant +from common.constant import CommonConstant from exceptions.exception import ServiceException from module_admin.dao.notice_dao import NoticeDao from module_admin.entity.vo.common_vo import CrudResponseModel diff --git a/ruoyi-fastapi-backend/module_admin/service/online_service.py b/ruoyi-fastapi-backend/module_admin/service/online_service.py index 2ba06c4..cf25d4f 100644 --- a/ruoyi-fastapi-backend/module_admin/service/online_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/online_service.py @@ -3,7 +3,7 @@ from typing import Any import jwt from fastapi import Request -from config.enums import RedisInitKeyConfig +from common.enums import RedisInitKeyConfig from config.env import JwtConfig from exceptions.exception import ServiceException from module_admin.entity.vo.common_vo import CrudResponseModel diff --git a/ruoyi-fastapi-backend/module_admin/service/post_service.py b/ruoyi-fastapi-backend/module_admin/service/post_service.py index f82016e..cdf93ef 100644 --- a/ruoyi-fastapi-backend/module_admin/service/post_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/post_service.py @@ -2,7 +2,7 @@ from typing import Any, Union from sqlalchemy.ext.asyncio import AsyncSession -from config.constant import CommonConstant +from common.constant import CommonConstant from exceptions.exception import ServiceException from module_admin.dao.post_dao import PostDao from module_admin.entity.vo.common_vo import CrudResponseModel diff --git a/ruoyi-fastapi-backend/module_admin/service/role_service.py b/ruoyi-fastapi-backend/module_admin/service/role_service.py index a0eaf91..4662e0d 100644 --- a/ruoyi-fastapi-backend/module_admin/service/role_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/role_service.py @@ -2,7 +2,7 @@ from typing import Any, Union from sqlalchemy.ext.asyncio import AsyncSession -from config.constant import CommonConstant +from common.constant import CommonConstant from exceptions.exception import ServiceException from module_admin.dao.role_dao import RoleDao from module_admin.dao.user_dao import UserDao diff --git a/ruoyi-fastapi-backend/module_admin/service/user_service.py b/ruoyi-fastapi-backend/module_admin/service/user_service.py index fe2bf8e..aaefc00 100644 --- a/ruoyi-fastapi-backend/module_admin/service/user_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/user_service.py @@ -6,7 +6,7 @@ import pandas as pd from fastapi import Request, UploadFile from sqlalchemy.ext.asyncio import AsyncSession -from config.constant import CommonConstant +from common.constant import CommonConstant from exceptions.exception import ServiceException from module_admin.dao.user_dao import UserDao from module_admin.entity.do.user_do import SysUserRole diff --git a/ruoyi-fastapi-backend/module_generator/controller/gen_controller.py b/ruoyi-fastapi-backend/module_generator/controller/gen_controller.py index 9a22bc8..6f5d4c5 100644 --- a/ruoyi-fastapi-backend/module_generator/controller/gen_controller.py +++ b/ruoyi-fastapi-backend/module_generator/controller/gen_controller.py @@ -5,11 +5,11 @@ from fastapi import APIRouter, Depends, Path, Query, Request, Response from pydantic_validation_decorator import ValidateFields from sqlalchemy.ext.asyncio import AsyncSession -from config.enums import BusinessType +from common.annotation.log_annotation import Log +from common.aspect.interface_auth import CheckRoleInterfaceAuth, CheckUserInterfaceAuth +from common.enums import BusinessType from config.env import GenConfig from config.get_db import get_db -from module_admin.annotation.log_annotation import Log -from module_admin.aspect.interface_auth import CheckRoleInterfaceAuth, CheckUserInterfaceAuth from module_admin.entity.vo.user_vo import CurrentUserModel from module_admin.service.login_service import LoginService from module_generator.entity.vo.gen_vo import DeleteGenTableModel, EditGenTableModel, GenTablePageQueryModel diff --git a/ruoyi-fastapi-backend/module_generator/entity/vo/gen_vo.py b/ruoyi-fastapi-backend/module_generator/entity/vo/gen_vo.py index d821287..c43b227 100644 --- a/ruoyi-fastapi-backend/module_generator/entity/vo/gen_vo.py +++ b/ruoyi-fastapi-backend/module_generator/entity/vo/gen_vo.py @@ -5,7 +5,7 @@ from pydantic import BaseModel, ConfigDict, Field, model_validator from pydantic.alias_generators import to_camel from pydantic_validation_decorator import NotBlank -from config.constant import GenConstant +from common.constant import GenConstant from utils.string_util import StringUtil diff --git a/ruoyi-fastapi-backend/module_generator/service/gen_service.py b/ruoyi-fastapi-backend/module_generator/service/gen_service.py index a77cd85..a46bc7b 100644 --- a/ruoyi-fastapi-backend/module_generator/service/gen_service.py +++ b/ruoyi-fastapi-backend/module_generator/service/gen_service.py @@ -10,7 +10,7 @@ from sqlalchemy.ext.asyncio import AsyncSession from sqlglot import parse as sqlglot_parse from sqlglot.expressions import Add, Alter, Create, Delete, Drop, Expression, Insert, Table, TruncateTable, Update -from config.constant import GenConstant +from common.constant import GenConstant from config.env import DataBaseConfig, GenConfig from exceptions.exception import ServiceException from module_admin.entity.vo.common_vo import CrudResponseModel diff --git a/ruoyi-fastapi-backend/module_generator/templates/python/controller.py.jinja2 b/ruoyi-fastapi-backend/module_generator/templates/python/controller.py.jinja2 index fa9de0e..4c33ca9 100644 --- a/ruoyi-fastapi-backend/module_generator/templates/python/controller.py.jinja2 +++ b/ruoyi-fastapi-backend/module_generator/templates/python/controller.py.jinja2 @@ -17,10 +17,10 @@ from fastapi import APIRouter, Depends, Form, Path, Query, Request, Response from pydantic_validation_decorator import ValidateFields from sqlalchemy.ext.asyncio import AsyncSession -from config.enums import BusinessType +from common.annotation.log_annotation import Log +from common.aspect.interface_auth import CheckUserInterfaceAuth +from common.enums import BusinessType from config.get_db import get_db -from module_admin.annotation.log_annotation import Log -from module_admin.aspect.interface_auth import CheckUserInterfaceAuth from module_admin.entity.vo.user_vo import CurrentUserModel from module_admin.service.login_service import LoginService from {{ packageName }}.service.{{ businessName }}_service import {{ BusinessName }}Service diff --git a/ruoyi-fastapi-backend/module_generator/templates/python/service.py.jinja2 b/ruoyi-fastapi-backend/module_generator/templates/python/service.py.jinja2 index a75563e..5608b55 100644 --- a/ruoyi-fastapi-backend/module_generator/templates/python/service.py.jinja2 +++ b/ruoyi-fastapi-backend/module_generator/templates/python/service.py.jinja2 @@ -9,7 +9,7 @@ from fastapi import Request {% endif %} from sqlalchemy.ext.asyncio import AsyncSession -from config.constant import CommonConstant +from common.constant import CommonConstant from exceptions.exception import ServiceException from {{ packageName }}.dao.{{ businessName }}_dao import {{ BusinessName }}Dao from module_admin.entity.vo.common_vo import CrudResponseModel diff --git a/ruoyi-fastapi-backend/utils/gen_util.py b/ruoyi-fastapi-backend/utils/gen_util.py index 68d3419..c08ceec 100644 --- a/ruoyi-fastapi-backend/utils/gen_util.py +++ b/ruoyi-fastapi-backend/utils/gen_util.py @@ -1,7 +1,7 @@ import re from datetime import datetime -from config.constant import GenConstant +from common.constant import GenConstant from config.env import GenConfig from module_generator.entity.vo.gen_vo import GenTableColumnModel, GenTableModel from utils.string_util import StringUtil diff --git a/ruoyi-fastapi-backend/utils/response_util.py b/ruoyi-fastapi-backend/utils/response_util.py index 16ce145..ebf85c3 100644 --- a/ruoyi-fastapi-backend/utils/response_util.py +++ b/ruoyi-fastapi-backend/utils/response_util.py @@ -8,7 +8,7 @@ from fastapi.responses import JSONResponse, Response, StreamingResponse from pydantic import BaseModel from starlette.background import BackgroundTask -from config.constant import HttpStatusConstant +from common.constant import HttpStatusConstant class ResponseUtil: diff --git a/ruoyi-fastapi-backend/utils/string_util.py b/ruoyi-fastapi-backend/utils/string_util.py index 756456f..d14d660 100644 --- a/ruoyi-fastapi-backend/utils/string_util.py +++ b/ruoyi-fastapi-backend/utils/string_util.py @@ -1,6 +1,6 @@ from typing import Union -from config.constant import CommonConstant +from common.constant import CommonConstant class StringUtil: diff --git a/ruoyi-fastapi-backend/utils/template_util.py b/ruoyi-fastapi-backend/utils/template_util.py index b5163a5..9983fa5 100644 --- a/ruoyi-fastapi-backend/utils/template_util.py +++ b/ruoyi-fastapi-backend/utils/template_util.py @@ -5,7 +5,7 @@ from typing import Any from jinja2 import Environment, FileSystemLoader -from config.constant import GenConstant +from common.constant import GenConstant from config.env import DataBaseConfig from exceptions.exception import ServiceWarning from module_generator.entity.vo.gen_vo import GenTableColumnModel, GenTableModel