diff --git a/README.md b/README.md index 35d5ebc..85cc90c 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@

logo

-

Dash-FastAPI-Admin v1.4.1

+

Dash-FastAPI-Admin v1.4.2

基于Dash+FastAPI前后端分离的纯Python快速开发框架

- + @@ -18,6 +18,7 @@ + ## 平台简介 Dash-FastAPI-Admin是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。 diff --git a/dash-fastapi-backend/.env.dev b/dash-fastapi-backend/.env.dev index 27b925e..840a1ab 100644 --- a/dash-fastapi-backend/.env.dev +++ b/dash-fastapi-backend/.env.dev @@ -10,7 +10,7 @@ APP_HOST = '0.0.0.0' # 应用端口 APP_PORT = 9099 # 应用版本 -APP_VERSION= '1.4.1' +APP_VERSION= '1.4.2' # 应用是否开启热重载 APP_RELOAD = true # 应用是否开启IP归属区域查询 diff --git a/dash-fastapi-backend/.env.prod b/dash-fastapi-backend/.env.prod index f73763c..ea8f2b6 100644 --- a/dash-fastapi-backend/.env.prod +++ b/dash-fastapi-backend/.env.prod @@ -10,7 +10,7 @@ APP_HOST = '0.0.0.0' # 应用端口 APP_PORT = 9099 # 应用版本 -APP_VERSION= '1.4.1' +APP_VERSION= '1.4.2' # 应用是否开启热重载 APP_RELOAD = false # 应用是否开启IP归属区域查询 diff --git a/dash-fastapi-backend/module_admin/controller/config_controller.py b/dash-fastapi-backend/module_admin/controller/config_controller.py index a8286e6..a146fcf 100644 --- a/dash-fastapi-backend/module_admin/controller/config_controller.py +++ b/dash-fastapi-backend/module_admin/controller/config_controller.py @@ -35,7 +35,9 @@ async def get_system_config_list(request: Request, config_page_query: ConfigPage async def add_system_config(request: Request, add_config: ConfigModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)): try: add_config.create_by = current_user.user.user_name + add_config.create_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_config.update_by = current_user.user.user_name + add_config.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_config_result = await ConfigService.add_config_services(request, query_db, add_config) if add_config_result.is_success: logger.info(add_config_result.message) diff --git a/dash-fastapi-backend/module_admin/controller/dept_controller.py b/dash-fastapi-backend/module_admin/controller/dept_controller.py index b51aff6..6b0171f 100644 --- a/dash-fastapi-backend/module_admin/controller/dept_controller.py +++ b/dash-fastapi-backend/module_admin/controller/dept_controller.py @@ -53,7 +53,9 @@ async def get_system_dept_list(request: Request, dept_query: DeptModel, query_db async def add_system_dept(request: Request, add_dept: DeptModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)): try: add_dept.create_by = current_user.user.user_name + add_dept.create_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_dept.update_by = current_user.user.user_name + add_dept.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_dept_result = DeptService.add_dept_services(query_db, add_dept) if add_dept_result.is_success: logger.info(add_dept_result.message) diff --git a/dash-fastapi-backend/module_admin/controller/dict_controller.py b/dash-fastapi-backend/module_admin/controller/dict_controller.py index dcb0906..293f8e3 100644 --- a/dash-fastapi-backend/module_admin/controller/dict_controller.py +++ b/dash-fastapi-backend/module_admin/controller/dict_controller.py @@ -46,7 +46,9 @@ async def get_system_all_dict_type(request: Request, dict_type_query: DictTypeQu async def add_system_dict_type(request: Request, add_dict_type: DictTypeModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)): try: add_dict_type.create_by = current_user.user.user_name + add_dict_type.create_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_dict_type.update_by = current_user.user.user_name + add_dict_type.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_dict_type_result = await DictTypeService.add_dict_type_services(request, query_db, add_dict_type) if add_dict_type_result.is_success: logger.info(add_dict_type_result.message) @@ -166,7 +168,9 @@ async def query_system_dict_data_list(request: Request, dict_type: str, query_db async def add_system_dict_data(request: Request, add_dict_data: DictDataModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)): try: add_dict_data.create_by = current_user.user.user_name + add_dict_data.create_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_dict_data.update_by = current_user.user.user_name + add_dict_data.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_dict_data_result = await DictDataService.add_dict_data_services(request, query_db, add_dict_data) if add_dict_data_result.is_success: logger.info(add_dict_data_result.message) diff --git a/dash-fastapi-backend/module_admin/controller/job_controller.py b/dash-fastapi-backend/module_admin/controller/job_controller.py index adf7ec5..a2dc90c 100644 --- a/dash-fastapi-backend/module_admin/controller/job_controller.py +++ b/dash-fastapi-backend/module_admin/controller/job_controller.py @@ -36,7 +36,9 @@ async def get_system_job_list(request: Request, job_page_query: JobPageObject, q async def add_system_job(request: Request, add_job: JobModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)): try: add_job.create_by = current_user.user.user_name + add_job.create_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_job.update_by = current_user.user.user_name + add_job.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_job_result = JobService.add_job_services(query_db, add_job) if add_job_result.is_success: logger.info(add_job_result.message) diff --git a/dash-fastapi-backend/module_admin/controller/menu_controller.py b/dash-fastapi-backend/module_admin/controller/menu_controller.py index 51c1322..c2630d8 100644 --- a/dash-fastapi-backend/module_admin/controller/menu_controller.py +++ b/dash-fastapi-backend/module_admin/controller/menu_controller.py @@ -52,7 +52,9 @@ async def get_system_menu_list(request: Request, menu_query: MenuModel, query_db async def add_system_menu(request: Request, add_menu: MenuModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)): try: add_menu.create_by = current_user.user.user_name + add_menu.create_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_menu.update_by = current_user.user.user_name + add_menu.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_menu_result = MenuService.add_menu_services(query_db, add_menu) if add_menu_result.is_success: logger.info(add_menu_result.message) diff --git a/dash-fastapi-backend/module_admin/controller/notice_controller.py b/dash-fastapi-backend/module_admin/controller/notice_controller.py index cbda2de..f23c625 100644 --- a/dash-fastapi-backend/module_admin/controller/notice_controller.py +++ b/dash-fastapi-backend/module_admin/controller/notice_controller.py @@ -34,7 +34,9 @@ async def get_system_notice_list(request: Request, notice_page_query: NoticePage async def add_system_notice(request: Request, add_notice: NoticeModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)): try: add_notice.create_by = current_user.user.user_name + add_notice.create_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_notice.update_by = current_user.user.user_name + add_notice.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_notice_result = NoticeService.add_notice_services(query_db, add_notice) if add_notice_result.is_success: logger.info(add_notice_result.message) diff --git a/dash-fastapi-backend/module_admin/controller/post_controler.py b/dash-fastapi-backend/module_admin/controller/post_controler.py index e917826..33180db 100644 --- a/dash-fastapi-backend/module_admin/controller/post_controler.py +++ b/dash-fastapi-backend/module_admin/controller/post_controler.py @@ -46,7 +46,9 @@ async def get_system_post_list(request: Request, post_page_query: PostPageObject async def add_system_post(request: Request, add_post: PostModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)): try: add_post.create_by = current_user.user.user_name + add_post.create_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_post.update_by = current_user.user.user_name + add_post.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_post_result = PostService.add_post_services(query_db, add_post) if add_post_result.is_success: logger.info(add_post_result.message) diff --git a/dash-fastapi-backend/module_admin/controller/role_controller.py b/dash-fastapi-backend/module_admin/controller/role_controller.py index 55e68fd..e43e841 100644 --- a/dash-fastapi-backend/module_admin/controller/role_controller.py +++ b/dash-fastapi-backend/module_admin/controller/role_controller.py @@ -46,7 +46,9 @@ async def get_system_role_list(request: Request, role_page_query: RolePageObject async def add_system_role(request: Request, add_role: AddRoleModel, query_db: Session = Depends(get_db), current_user: CurrentUserInfoServiceResponse = Depends(get_current_user)): try: add_role.create_by = current_user.user.user_name + add_role.create_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_role.update_by = current_user.user.user_name + add_role.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_role_result = RoleService.add_role_services(query_db, add_role) if add_role_result.is_success: logger.info(add_role_result.message) diff --git a/dash-fastapi-backend/module_admin/controller/user_controller.py b/dash-fastapi-backend/module_admin/controller/user_controller.py index 27bc11b..c14d4d2 100644 --- a/dash-fastapi-backend/module_admin/controller/user_controller.py +++ b/dash-fastapi-backend/module_admin/controller/user_controller.py @@ -39,7 +39,9 @@ async def add_system_user(request: Request, add_user: AddUserModel, query_db: Se try: add_user.password = PwdUtil.get_password_hash(add_user.password) add_user.create_by = current_user.user.user_name + add_user.create_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_user.update_by = current_user.user.user_name + add_user.update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") add_user_result = UserService.add_user_services(query_db, add_user) if add_user_result.is_success: logger.info(add_user_result.message) diff --git a/dash-fastapi-backend/module_admin/service/user_service.py b/dash-fastapi-backend/module_admin/service/user_service.py index eef7ed4..c0baa8d 100644 --- a/dash-fastapi-backend/module_admin/service/user_service.py +++ b/dash-fastapi-backend/module_admin/service/user_service.py @@ -221,7 +221,9 @@ def batch_import_user_services(cls, result_db: Session, user_import: ImportUserM sex=row['sex'], status=row['status'], create_by=current_user.user.user_name, - update_by=current_user.user.user_name + create_time=datetime.now().strftime("%Y-%m-%d %H:%M:%S"), + update_by=current_user.user.user_name, + update_time=datetime.now().strftime("%Y-%m-%d %H:%M:%S") ) ) user_info = UserDao.get_user_by_info(result_db, UserModel(**dict(user_name=row['user_name']))) @@ -237,7 +239,8 @@ def batch_import_user_services(cls, result_db: Session, user_import: ImportUserM phonenumber=row['phonenumber'], sex=row['sex'], status=row['status'], - update_by=current_user.user.user_name + update_by=current_user.user.user_name, + update_time=datetime.now().strftime("%Y-%m-%d %H:%M:%S") ) ).dict(exclude_unset=True) UserDao.edit_user_dao(result_db, edit_user)