refactor&feat: 优化项目结构，新增common模块，原annotation、aspect、constant、enums模块移动至common模块下

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

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

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

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

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

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,

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,

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,

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

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

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

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

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

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

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

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,

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

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 common.constant import CommonConstant
-from config.enums import RedisInitKeyConfig
+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

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

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 common.constant import CommonConstant
-from config.enums import RedisInitKeyConfig
+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

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

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 common.constant import CommonConstant, MenuConstant
-from config.enums import RedisInitKeyConfig
+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

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

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

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

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

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

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

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

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
 
 

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

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

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

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

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:

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:

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