From da80818a0473aefb0de9f0010c31dfd4a61e0caf Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Mon, 1 Jul 2024 16:04:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=8B=E5=BA=8F=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.config/dotnet-tools.json | 0 .../Controllers/CommonController.cs | 10 +- .../MES/andon/AndonDataAnalysisController .cs | 10 +- .../MES/andon/AndonFaultRecordController.cs | 14 +-- .../MES/andon/AndonInteractionController.cs | 8 +- .../MES/dev/DeviceAccountController.cs | 14 +-- .../MES/dev/DeviceDataAnalysisController.cs | 6 +- .../MES/dev/DeviceFormConfigController.cs | 12 +-- .../MES/dev/DeviceInspectController.cs | 12 +-- .../dev/DeviceMaintenanceRecordController.cs | 12 +-- .../DevicePointInspectionPlanController.cs | 12 +-- .../MES/dev/DeviceRepairController.cs | 12 +-- .../DeviceRouteInspectionPlanController.cs | 12 +-- .../MES/dev/DeviceTaskExecuteController.cs | 14 +-- .../dev/DeviceTaskExecuteResultController.cs | 12 +-- .../MES/dev/DeviceTypeController.cs | 10 +- .../MES/qu/upload/UploadController.cs | 12 +-- .../System/ArticleCategoryController.cs | 12 +-- .../Controllers/System/ArticleController.cs | 12 +-- .../System/CodeGeneratorController.cs | 22 ++--- .../System/CommonLangController.cs | 12 +-- .../Controllers/System/SysConfigController.cs | 12 +-- .../Controllers/System/SysDeptController.cs | 10 +- .../System/SysDictDataController.cs | 12 +-- .../System/SysDictTypeController.cs | 14 +-- .../Controllers/System/SysFileController.cs | 10 +- .../Controllers/System/SysLoginController.cs | 12 +-- .../Controllers/System/SysMenuController.cs | 10 +- .../Controllers/System/SysNoticeController.cs | 14 +-- .../Controllers/System/SysPostController.cs | 10 +- .../System/SysProfileController.cs | 10 +- .../Controllers/System/SysRoleController.cs | 12 +-- .../Controllers/System/SysUserController.cs | 12 +-- .../System/SysUserRoleController.cs | 8 +- .../Controllers/System/TasksController.cs | 12 +-- .../Controllers/System/TasksLogController.cs | 12 +-- .../System/monitor/MonitorController.cs | 2 +- .../System/monitor/SqlDiffLogController.cs | 8 +- .../System/monitor/SysLogininforController.cs | 12 +-- .../System/monitor/SysOperlogController.cs | 10 +- .../System/monitor/SysUserOnlineController.cs | 10 +- .../Controllers/WxOpenController.cs | 2 +- .../DOAN.WebApi.csproj | 13 +-- ...y-42ad3d4b-cda9-464c-97c8-8b0a079cb299.xml | 0 ...y-4d4871d6-d94d-4c2f-b6fc-bb969c0e11b5.xml | 0 ...y-84c046e6-be05-4390-8200-b37161a3cd29.xml | 0 .../Dockerfile | 4 +- .../Extensions/SwaggerExtension.cs | 20 ++-- .../Extensions/TasksExtension.cs | 6 +- .../GlobalUsing.cs | 4 +- .../NLog.config | 0 .../Program.cs | 10 +- .../PublishProfiles/FolderProfile.pubxml | 0 .../PublishProfiles/FolderProfile1.pubxml | 0 .../Properties/launchSettings.json | 2 +- .../appsettings.Development.json | 6 +- .../appsettings.Production.json | 6 +- .../appsettings.json | 0 .../ip2region.db | Bin .../wwwroot/CodeGenTemplate/CurdForm.txt | 0 .../wwwroot/CodeGenTemplate/QueryForm.txt | 0 .../wwwroot/CodeGenTemplate/TableList.txt | 0 .../CodeGenTemplate/TplControllers.txt | 0 .../wwwroot/CodeGenTemplate/TplDto.txt | 0 .../wwwroot/CodeGenTemplate/TplIService.txt | 0 .../wwwroot/CodeGenTemplate/TplModel.txt | 0 .../wwwroot/CodeGenTemplate/TplRepository.txt | 0 .../wwwroot/CodeGenTemplate/TplService.txt | 0 .../wwwroot/CodeGenTemplate/TplTreeVue.txt | 0 .../wwwroot/CodeGenTemplate/TplVue.txt | 0 .../wwwroot/CodeGenTemplate/TplVueApi.txt | 0 .../wwwroot/CodeGenTemplate/TplVueSelect.txt | 0 .../wwwroot/CodeGenTemplate/app/api.txt | 0 .../wwwroot/CodeGenTemplate/app/form.txt | 0 .../wwwroot/CodeGenTemplate/app/vue2.txt | 0 .../CodeGenTemplate/sql/MySqlTemplate.txt | 2 +- .../wwwroot/CodeGenTemplate/sql/Other.txt | 0 .../wwwroot/CodeGenTemplate/sql/PgSql.txt | 2 +- .../CodeGenTemplate/sql/SqlTemplate.txt | 2 +- .../wwwroot/CodeGenTemplate/v3/TreeVue.txt | 0 .../wwwroot/CodeGenTemplate/v3/Vue.txt | 0 .../DeviceTaskExecuteResult1Controller.cs | 10 +- .../Business/DeviceTaskExecuteResult1Dto.cs | 2 +- .../Business/DeviceTaskExecuteResult1.cs | 2 +- .../DeviceTaskExecuteResult1Service.cs | 12 +-- .../IDeviceTaskExecuteResult1Service.cs | 8 +- .../api/business/devicetaskexecuteresult1.js | 0 .../business/DeviceTaskExecuteResult1.vue | 0 .../20240611/sql/DeviceTaskExecuteResult1.sql | 2 +- .../wwwroot/ImportTemplate/lang.xlsx | Bin .../wwwroot/ImportTemplate/user.xlsx | Bin .../wwwroot/data.xlsx | Bin .../device/account/922E7DB8D42FBF55.png | Bin .../device/account/F9259CC00753BA0C.png | Bin .../device/account/image/304D75DD9D78143B.jpg | Bin .../device/account/image/730483BB4F27D736.png | Bin .../device/account/image/8C4CB663C1831A5E.png | Bin .../device/account/image/B80940D211A74A50.png | Bin .../device/account/image/DF506194B85A4482.png | Bin .../device/inspect/196B997B26E1281A.png | Bin .../device/inspect/2F37290663D4B96E.jpg | Bin .../device/inspect/7229789B881E15B9.jpg | Bin .../device/inspect/A820D850BBC51AC4.jpg | Bin .../device/inspect/AB81EC9BBF505757.jpg | Bin .../device/inspect/C72203D8D04E290A.jpg | Bin .../device/inspect/E39A355D3449D8D0.jpg | Bin .../device/repair/file/FA08B4257BC2F06E.png | Bin .../task/execute/img/2561097D2300F495.png | Bin .../task/execute/img/29458E3F539DA4B1.png | Bin .../task/execute/img/439F87303DE93732.png | Bin .../task/execute/img/56857FAF59F7AF43.png | Bin .../task/execute/img/88E20F9434D1C65E.png | Bin .../task/execute/img/C6D1B373E5DBEFD4.png | Bin .../wwwroot/logo.txt | 0 .../CodeGenerateOption.cs | 2 +- .../CodeGenerateTemplate.cs | 4 +- .../CodeGeneratorTool.cs | 10 +- .../DOAN.CodeGenerator.csproj | 6 +- .../DbProvider.cs | 2 +- .../GenConstants.cs | 2 +- .../Model/GenerateDto.cs | 6 +- .../Model/OracleSeq.cs | 2 +- .../Model/ReplaceDto.cs | 2 +- .../Service/CodeGeneraterService.cs | 6 +- {ZR.Common => DOAN.Common}/AliyunOssHelper.cs | 2 +- .../DOAN.Common.csproj | 2 +- {ZR.Common => DOAN.Common}/ExcelHelper.cs | 2 +- {ZR.Common => DOAN.Common}/MailHelper.cs | 2 +- .../Model/WxTokenResult.cs | 2 +- {ZR.Common => DOAN.Common}/Tools.cs | 2 +- {ZR.Common => DOAN.Common}/WxHelper.cs | 4 +- {ZR.Common => DOAN.Common}/WxNoticeHelper.cs | 4 +- {ZR.Common => DOAN.Common}/YIDAHelper.cs | 2 +- .../DOAN.Model.csproj | 0 {ZR.Model => DOAN.Model}/GlobalUsing.cs | 0 .../MES/andon/AndonFaultDict.cs | 2 +- .../MES/andon/AndonFaultRecord.cs | 2 +- .../MES/andon/Dto/AndonAnalysisQueryDto.cs | 2 +- .../MES/andon/Dto/AndonFaultDictDto.cs | 2 +- .../MES/andon/Dto/AndonFaultRecordDto.cs | 2 +- .../MES/dev/DeviceAccount.cs | 2 +- .../MES/dev/DeviceFormConfig.cs | 2 +- .../MES/dev/DeviceInspect.cs | 2 +- .../MES/dev/DeviceMaintenanceRecord.cs | 2 +- .../MES/dev/DevicePointInspectionPlan.cs | 2 +- .../MES/dev/DeviceRelAccountInspect.cs | 2 +- .../MES/dev/DeviceRelPpAt.cs | 2 +- .../MES/dev/DeviceRelRpAt.cs | 2 +- .../MES/dev/DeviceRepair.cs | 2 +- .../MES/dev/DeviceRouteInspectionPlan.cs | 2 +- .../MES/dev/DeviceTaskExecute.cs | 2 +- .../MES/dev/DeviceTaskExecuteResult.cs | 2 +- .../MES/dev/DeviceType.cs | 2 +- .../MES/dev/Dto/DeviceAccountDto.cs | 2 +- .../MES/dev/Dto/DeviceDefaultDto.cs | 2 +- .../MES/dev/Dto/DeviceFormConfigDto.cs | 2 +- .../MES/dev/Dto/DeviceInspectDto.cs | 2 +- .../MES/dev/Dto/DeviceMaintenanceRecordDto.cs | 2 +- .../dev/Dto/DevicePointInspectionPlanDto.cs | 2 +- .../MES/dev/Dto/DeviceRepairDto.cs | 2 +- .../dev/Dto/DeviceRouteInspectionPlanDto.cs | 2 +- .../MES/dev/Dto/DeviceStatusAnalysisDto.cs | 2 +- .../dev/Dto/DeviceStatusAnalysisResultDto.cs | 2 +- .../MES/dev/Dto/DeviceTaskExecuteDto.cs | 2 +- .../MES/dev/Dto/DeviceTaskExecuteResultDto.cs | 2 +- .../MES/dev/Dto/DeviceTypeDto.cs | 2 +- .../MES/upload/QcYidaExcel.cs | 2 +- .../MES/upload/QcYidaForm.cs | 2 +- {ZR.Model => DOAN.Model}/PagedInfo.cs | 2 +- {ZR.Model => DOAN.Model}/PagerInfo.cs | 2 +- {ZR.Model => DOAN.Model}/TreeDto.cs | 2 +- .../BaseRepository.cs | 4 +- .../DOAN.Repository.csproj | 4 +- .../IBaseRepository.cs | 4 +- .../DOAN.Service.csproj | 2 +- {ZR.Service => DOAN.Service}/GlobalUsing.cs | 0 .../MES/andon/AndonDataAnalysisServcie.cs | 16 ++-- .../MES/andon/AndonFaultRecordService.cs | 14 +-- .../MES/andon/AndonInteractionService.cs | 10 +- .../IService/IAndonDataAnalysisServcie.cs | 10 +- .../IService/IAndonFaultRecordService.cs | 10 +- .../IService/IAndonInteractionService.cs | 6 +- .../MES/dev/DeviceAccountService.cs | 12 +-- .../MES/dev/DeviceDataAnalysisService.cs | 10 +- .../MES/dev/DeviceFormConfigService.cs | 14 +-- .../MES/dev/DeviceInspectService.cs | 16 ++-- .../MES/dev/DeviceMaintenanceRecordService.cs | 12 +-- .../dev/DevicePointInspectionPlanService.cs | 12 +-- .../MES/dev/DeviceRepairService.cs | 12 +-- .../dev/DeviceRouteInspectionPlanService.cs | 12 +-- .../MES/dev/DeviceTaskExecuteResultService.cs | 12 +-- .../MES/dev/DeviceTaskExecuteService.cs | 12 +-- .../MES/dev/DeviceTypeService.cs | 16 ++-- .../MES/dev/IService/IDeviceAccountService.cs | 10 +- .../IService/IDeviceDataAnalysisServcie.cs | 4 +- .../dev/IService/IDeviceFormConfigService.cs | 8 +- .../MES/dev/IService/IDeviceInspectService.cs | 8 +- .../IDeviceMaintenanceRecordService.cs | 8 +- .../IDevicePointInspectionPlanService.cs | 8 +- .../MES/dev/IService/IDeviceRepairService.cs | 8 +- .../IDeviceRouteInspectionPlanService.cs | 8 +- .../IDeviceTaskExecuteResultService.cs | 10 +- .../dev/IService/IDeviceTaskExecuteService.cs | 8 +- .../MES/dev/IService/IDeviceTypeService.cs | 10 +- .../MES/qu/upload/IUploadServive.cs | 6 +- .../MES/qu/upload/service/UploadService.cs | 12 +-- .../BaseService.cs | 4 +- .../DOAN.ServiceCore.csproj | 4 +- .../Filters/ActionPermissionFilter.cs | 8 +- .../Filters/GlobalActionMonitor.cs | 6 +- .../Filters/VerifyAttribute.cs | 4 +- .../GlobalUsing.cs | 0 .../IBaseService.cs | 4 +- .../Middleware/GlobalExceptionMiddleware.cs | 8 +- .../Model/Article.cs | 2 +- .../Model/ArticleCategory.cs | 2 +- .../Model/CommonLang.cs | 2 +- .../Model/Dto/ArticleCategoryDto.cs | 2 +- .../Model/Dto/ArticleDto.cs | 2 +- .../Model/Dto/ChatMessageDto.cs | 2 +- .../Model/Dto/CommonLangDto.cs | 2 +- .../Model/Dto/GenTableDto.cs | 4 +- .../Model/Dto/LockUserDto.cs | 2 +- .../Model/Dto/LoginBodyDto.cs | 2 +- .../Model/Dto/MenuDto.cs | 2 +- .../Model/Dto/RegisterDto.cs | 2 +- .../Model/Dto/RoleMenuExportDto.cs | 4 +- .../Model/Dto/RoleUserDto.cs | 2 +- .../Model/Dto/ScanDto.cs | 2 +- .../Model/Dto/SqlDiffLogDto.cs | 2 +- .../Model/Dto/SysConfigDto.cs | 2 +- .../Model/Dto/SysDeptDto.cs | 2 +- .../Model/Dto/SysDictTypeDto.cs | 2 +- .../Model/Dto/SysFileQueryDto.cs | 2 +- .../Model/Dto/SysLogininfoDto.cs | 2 +- .../Model/Dto/SysNoticeDto.cs | 2 +- .../Model/Dto/SysOperLogDto.cs | 2 +- .../Model/Dto/SysRoleDto.cs | 2 +- .../Model/Dto/SysRoleMenuDto.cs | 2 +- .../Model/Dto/SysUserDto.cs | 2 +- .../Model/Dto/SysdictDataDto.cs | 2 +- .../Model/Dto/TasksDto.cs | 2 +- .../Model/Dto/TasksLogDto.cs | 2 +- .../Model/Enums/MenuStatus.cs | 2 +- .../Model/Enums/MenuType.cs | 2 +- .../Model/Generate/GenTable.cs | 2 +- .../Model/Generate/GenTableColumn.cs | 2 +- .../Model/SqlDiffLog.cs | 2 +- .../Model/SysBase.cs | 2 +- .../Model/SysConfig.cs | 2 +- .../Model/SysDept.cs | 2 +- .../Model/SysDictData.cs | 2 +- .../Model/SysDictType.cs | 2 +- .../Model/SysFile.cs | 2 +- .../Model/SysLogininfor.cs | 2 +- .../Model/SysMenu.cs | 2 +- .../Model/SysNotice.cs | 4 +- .../Model/SysOperLog.cs | 2 +- .../Model/SysPost.cs | 2 +- .../Model/SysRole.cs | 2 +- .../Model/SysRoleDept.cs | 2 +- .../Model/SysRoleMenu.cs | 2 +- .../Model/SysTasks.cs | 2 +- .../Model/SysTasksLog.cs | 2 +- .../Model/SysUser.cs | 2 +- .../Model/SysUserPost.cs | 2 +- .../Model/SysUserRole.cs | 2 +- .../Model/UserConstants.cs | 2 +- .../Model/Vo/RouterVo.cs | 2 +- .../Model/Vo/TreeSelectVo.cs | 2 +- .../ProteryConstant.cs | 0 .../Services/ArticleCategoryService.cs | 12 +-- .../Services/ArticleService.cs | 12 +-- .../Services/CacheService.cs | 4 +- .../Services/CommonLangService.cs | 14 +-- .../Services/GenTableService.cs | 8 +- .../IService/IArticleCategoryService.cs | 8 +- .../Services/IService/IArticleService.cs | 8 +- .../Services/IService/ICommonLangService.cs | 10 +- .../Services/IService/IGenTableService.cs | 6 +- .../Services/IService/ISqlDiffLogService.cs | 8 +- .../Services/IService/ISysConfigService.cs | 4 +- .../Services/IService/ISysDeptService.cs | 8 +- .../Services/IService/ISysDictDataService.cs | 6 +- .../Services/IService/ISysDictService.cs | 6 +- .../Services/IService/ISysFileService.cs | 6 +- .../Services/IService/ISysLoginService.cs | 8 +- .../Services/IService/ISysMenuService.cs | 10 +- .../Services/IService/ISysNoticeService.cs | 10 +- .../Services/IService/ISysOperLogService.cs | 8 +- .../IService/ISysPermissionService.cs | 4 +- .../Services/IService/ISysPostService.cs | 6 +- .../Services/IService/ISysRoleService.cs | 8 +- .../Services/IService/ISysTasksLogService.cs | 6 +- .../Services/IService/ISysTasksQzService.cs | 8 +- .../Services/IService/ISysUserPostService.cs | 4 +- .../Services/IService/ISysUserRoleService.cs | 8 +- .../Services/IService/ISysUserService.cs | 8 +- .../Services/SeedDataService.cs | 6 +- .../Services/SqlDiffLogService.cs | 12 +-- .../Services/SysConfigService.cs | 6 +- .../Services/SysDeptService.cs | 12 +-- .../Services/SysDictDataService.cs | 10 +- .../Services/SysDictService.cs | 8 +- .../Services/SysFileService.cs | 8 +- .../Services/SysLoginService.cs | 12 +-- .../Services/SysMenuService.cs | 16 ++-- .../Services/SysNoticeService.cs | 12 +-- .../Services/SysOperLogService.cs | 12 +-- .../Services/SysPermissionService.cs | 6 +- .../Services/SysPostService.cs | 6 +- .../Services/SysRoleMenuService.cs | 6 +- .../Services/SysRoleService.cs | 12 +-- .../Services/SysTasksLogService.cs | 10 +- .../Services/SysTasksQzService.cs | 16 ++-- .../Services/SysUserPostService.cs | 6 +- .../Services/SysUserRoleService.cs | 12 +-- .../Services/SysUserService.cs | 14 +-- .../Signalr/HubsConstant.cs | 2 +- .../Signalr/MessageHub.cs | 6 +- .../Signalr/OnlineUsers.cs | 2 +- .../SqlSugar/DataPermi.cs | 4 +- .../SqlSugar/InitTable.cs | 8 +- .../SqlSugar/SqlSugarCache.cs | 4 +- .../SqlSugar/SqlsugarSetup.cs | 4 +- .../DOAN.Tasks.csproj | 4 +- .../ITaskSchedulerServer.cs | 4 +- {ZR.Tasks => DOAN.Tasks}/JobFactory.cs | 2 +- .../TaskScheduler/JobBase.cs | 8 +- .../TaskScheduler/Job_Device_Execute.cs | 10 +- .../TaskScheduler/Job_Email_send.cs | 8 +- .../TaskScheduler/Job_HttpRequest.cs | 6 +- .../TaskScheduler/Job_SqlExecute.cs | 4 +- .../TaskScheduler/Job_SyncTest.cs | 2 +- .../TaskScheduler/Job_YIDAtoken.cs | 4 +- .../TaskSchedulerServer.cs | 6 +- {ZR.Tasks => DOAN.Tasks}/Test.cs | 2 +- ZRAdmin3.sln => DOAN.sln | 18 ++-- Infrastructure/Cache/CacheHelper.cs | 2 +- Infrastructure/Cache/RedisServer.cs | 2 +- ...ture.csproj => DOAN.Infrastructure.csproj} | 0 .../WebExtensions/IPRateExtension.cs | 2 +- Infrastructure/WebExtensions/JwtExtension.cs | 2 +- LICENSE | 2 +- README.en.md | 90 +++++++++--------- README.md | 82 ++++++++-------- document/mysql/admin-mysql-初始化数据.sql | 14 +-- document/mysql/admin-mysql20230515.sql | 14 +-- .../sqlserver/admin-sqlserver-初始化数据.sql | 6 +- .../admin-sqlserver-表字段说明导入.sql | 4 +- document/sqlserver/admin-sqlserver.sql | 4 +- .../sqlserver/admin-sqlserver20230515.sql | 6 +- startup.bat | 2 +- 353 files changed, 969 insertions(+), 968 deletions(-) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/.config/dotnet-tools.json (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/CommonController.cs (98%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/MES/andon/AndonDataAnalysisController .cs (94%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/MES/andon/AndonFaultRecordController.cs (93%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/MES/andon/AndonInteractionController.cs (94%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/MES/dev/DeviceAccountController.cs (97%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/MES/dev/DeviceDataAnalysisController.cs (97%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/MES/dev/DeviceFormConfigController.cs (95%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/MES/dev/DeviceInspectController.cs (96%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/MES/dev/DeviceMaintenanceRecordController.cs (94%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/MES/dev/DevicePointInspectionPlanController.cs (95%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/MES/dev/DeviceRepairController.cs (94%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/MES/dev/DeviceRouteInspectionPlanController.cs (95%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/MES/dev/DeviceTaskExecuteController.cs (97%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/MES/dev/DeviceTaskExecuteResultController.cs (95%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/MES/dev/DeviceTypeController.cs (94%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/MES/qu/upload/UploadController.cs (94%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/ArticleCategoryController.cs (96%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/ArticleController.cs (95%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/CodeGeneratorController.cs (96%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/CommonLangController.cs (97%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/SysConfigController.cs (96%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/SysDeptController.cs (97%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/SysDictDataController.cs (96%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/SysDictTypeController.cs (94%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/SysFileController.cs (95%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/SysLoginController.cs (98%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/SysMenuController.cs (97%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/SysNoticeController.cs (96%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/SysPostController.cs (96%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/SysProfileController.cs (96%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/SysRoleController.cs (97%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/SysUserController.cs (97%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/SysUserRoleController.cs (95%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/TasksController.cs (98%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/TasksLogController.cs (94%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/monitor/MonitorController.cs (98%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/monitor/SqlDiffLogController.cs (94%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/monitor/SysLogininforController.cs (94%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/monitor/SysOperlogController.cs (94%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/System/monitor/SysUserOnlineController.cs (93%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Controllers/WxOpenController.cs (96%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/DOAN.WebApi.csproj (86%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/DataProtection/key-42ad3d4b-cda9-464c-97c8-8b0a079cb299.xml (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/DataProtection/key-4d4871d6-d94d-4c2f-b6fc-bb969c0e11b5.xml (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/DataProtection/key-84c046e6-be05-4390-8200-b37161a3cd29.xml (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Dockerfile (73%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Extensions/SwaggerExtension.cs (91%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Extensions/TasksExtension.cs (95%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/GlobalUsing.cs (80%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/NLog.config (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Program.cs (97%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Properties/PublishProfiles/FolderProfile.pubxml (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Properties/PublishProfiles/FolderProfile1.pubxml (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/Properties/launchSettings.json (95%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/appsettings.Development.json (95%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/appsettings.Production.json (95%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/appsettings.json (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/ip2region.db (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/CurdForm.txt (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/QueryForm.txt (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/TableList.txt (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/TplControllers.txt (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/TplDto.txt (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/TplIService.txt (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/TplModel.txt (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/TplRepository.txt (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/TplService.txt (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/TplTreeVue.txt (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/TplVue.txt (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/TplVueApi.txt (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/TplVueSelect.txt (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/app/api.txt (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/app/form.txt (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/app/vue2.txt (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/sql/MySqlTemplate.txt (99%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/sql/Other.txt (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/sql/PgSql.txt (99%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/sql/SqlTemplate.txt (99%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/v3/TreeVue.txt (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/CodeGenTemplate/v3/Vue.txt (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/Generatecode/20240611/ZR.Admin.WebApi/Controllers/Business/DeviceTaskExecuteResult1Controller.cs (95%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/Generatecode/20240611/ZR.Model/Dto/Business/DeviceTaskExecuteResult1Dto.cs (98%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/Generatecode/20240611/ZR.Model/Models/Business/DeviceTaskExecuteResult1.cs (99%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/Generatecode/20240611/ZR.Service/Business/DeviceTaskExecuteResult1Service.cs (94%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/Generatecode/20240611/ZR.Service/Business/IBusinessService/IDeviceTaskExecuteResult1Service.cs (83%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/Generatecode/20240611/ZRAdmin-vue/src/api/business/devicetaskexecuteresult1.js (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/Generatecode/20240611/ZRAdmin-vue/src/views/business/DeviceTaskExecuteResult1.vue (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/Generatecode/20240611/sql/DeviceTaskExecuteResult1.sql (98%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/ImportTemplate/lang.xlsx (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/ImportTemplate/user.xlsx (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/data.xlsx (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/account/922E7DB8D42FBF55.png (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/account/F9259CC00753BA0C.png (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/account/image/304D75DD9D78143B.jpg (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/account/image/730483BB4F27D736.png (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/account/image/8C4CB663C1831A5E.png (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/account/image/B80940D211A74A50.png (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/account/image/DF506194B85A4482.png (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/inspect/196B997B26E1281A.png (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/inspect/2F37290663D4B96E.jpg (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/inspect/7229789B881E15B9.jpg (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/inspect/A820D850BBC51AC4.jpg (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/inspect/AB81EC9BBF505757.jpg (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/inspect/C72203D8D04E290A.jpg (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/inspect/E39A355D3449D8D0.jpg (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/repair/file/FA08B4257BC2F06E.png (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/task/execute/img/2561097D2300F495.png (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/task/execute/img/29458E3F539DA4B1.png (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/task/execute/img/439F87303DE93732.png (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/task/execute/img/56857FAF59F7AF43.png (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/task/execute/img/88E20F9434D1C65E.png (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/device/task/execute/img/C6D1B373E5DBEFD4.png (100%) rename {ZR.Admin.WebApi => DOAN.Admin.WebApi}/wwwroot/logo.txt (100%) rename {ZR.CodeGenerator => DOAN.CodeGenerator}/CodeGenerateOption.cs (98%) rename {ZR.CodeGenerator => DOAN.CodeGenerator}/CodeGenerateTemplate.cs (95%) rename {ZR.CodeGenerator => DOAN.CodeGenerator}/CodeGeneratorTool.cs (99%) rename ZR.CodeGenerator/ZR.CodeGenerator.csproj => DOAN.CodeGenerator/DOAN.CodeGenerator.csproj (59%) rename {ZR.CodeGenerator => DOAN.CodeGenerator}/DbProvider.cs (98%) rename {ZR.CodeGenerator => DOAN.CodeGenerator}/GenConstants.cs (99%) rename {ZR.CodeGenerator => DOAN.CodeGenerator}/Model/GenerateDto.cs (94%) rename {ZR.CodeGenerator => DOAN.CodeGenerator}/Model/OracleSeq.cs (84%) rename {ZR.CodeGenerator => DOAN.CodeGenerator}/Model/ReplaceDto.cs (98%) rename {ZR.CodeGenerator => DOAN.CodeGenerator}/Service/CodeGeneraterService.cs (97%) rename {ZR.Common => DOAN.Common}/AliyunOssHelper.cs (99%) rename ZR.Common/ZR.Common.csproj => DOAN.Common/DOAN.Common.csproj (83%) rename {ZR.Common => DOAN.Common}/ExcelHelper.cs (99%) rename {ZR.Common => DOAN.Common}/MailHelper.cs (99%) rename {ZR.Common => DOAN.Common}/Model/WxTokenResult.cs (90%) rename {ZR.Common => DOAN.Common}/Tools.cs (99%) rename {ZR.Common => DOAN.Common}/WxHelper.cs (98%) rename {ZR.Common => DOAN.Common}/WxNoticeHelper.cs (99%) rename {ZR.Common => DOAN.Common}/YIDAHelper.cs (99%) rename ZR.Model/ZR.Model.csproj => DOAN.Model/DOAN.Model.csproj (100%) rename {ZR.Model => DOAN.Model}/GlobalUsing.cs (100%) rename {ZR.Model => DOAN.Model}/MES/andon/AndonFaultDict.cs (98%) rename {ZR.Model => DOAN.Model}/MES/andon/AndonFaultRecord.cs (98%) rename {ZR.Model => DOAN.Model}/MES/andon/Dto/AndonAnalysisQueryDto.cs (97%) rename {ZR.Model => DOAN.Model}/MES/andon/Dto/AndonFaultDictDto.cs (96%) rename {ZR.Model => DOAN.Model}/MES/andon/Dto/AndonFaultRecordDto.cs (98%) rename {ZR.Model => DOAN.Model}/MES/dev/DeviceAccount.cs (98%) rename {ZR.Model => DOAN.Model}/MES/dev/DeviceFormConfig.cs (98%) rename {ZR.Model => DOAN.Model}/MES/dev/DeviceInspect.cs (98%) rename {ZR.Model => DOAN.Model}/MES/dev/DeviceMaintenanceRecord.cs (98%) rename {ZR.Model => DOAN.Model}/MES/dev/DevicePointInspectionPlan.cs (98%) rename {ZR.Model => DOAN.Model}/MES/dev/DeviceRelAccountInspect.cs (98%) rename {ZR.Model => DOAN.Model}/MES/dev/DeviceRelPpAt.cs (98%) rename {ZR.Model => DOAN.Model}/MES/dev/DeviceRelRpAt.cs (98%) rename {ZR.Model => DOAN.Model}/MES/dev/DeviceRepair.cs (98%) rename {ZR.Model => DOAN.Model}/MES/dev/DeviceRouteInspectionPlan.cs (99%) rename {ZR.Model => DOAN.Model}/MES/dev/DeviceTaskExecute.cs (98%) rename {ZR.Model => DOAN.Model}/MES/dev/DeviceTaskExecuteResult.cs (99%) rename {ZR.Model => DOAN.Model}/MES/dev/DeviceType.cs (98%) rename {ZR.Model => DOAN.Model}/MES/dev/Dto/DeviceAccountDto.cs (98%) rename {ZR.Model => DOAN.Model}/MES/dev/Dto/DeviceDefaultDto.cs (97%) rename {ZR.Model => DOAN.Model}/MES/dev/Dto/DeviceFormConfigDto.cs (96%) rename {ZR.Model => DOAN.Model}/MES/dev/Dto/DeviceInspectDto.cs (97%) rename {ZR.Model => DOAN.Model}/MES/dev/Dto/DeviceMaintenanceRecordDto.cs (96%) rename {ZR.Model => DOAN.Model}/MES/dev/Dto/DevicePointInspectionPlanDto.cs (96%) rename {ZR.Model => DOAN.Model}/MES/dev/Dto/DeviceRepairDto.cs (98%) rename {ZR.Model => DOAN.Model}/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs (97%) rename {ZR.Model => DOAN.Model}/MES/dev/Dto/DeviceStatusAnalysisDto.cs (98%) rename {ZR.Model => DOAN.Model}/MES/dev/Dto/DeviceStatusAnalysisResultDto.cs (99%) rename {ZR.Model => DOAN.Model}/MES/dev/Dto/DeviceTaskExecuteDto.cs (99%) rename {ZR.Model => DOAN.Model}/MES/dev/Dto/DeviceTaskExecuteResultDto.cs (98%) rename {ZR.Model => DOAN.Model}/MES/dev/Dto/DeviceTypeDto.cs (96%) rename {ZR.Model => DOAN.Model}/MES/upload/QcYidaExcel.cs (99%) rename {ZR.Model => DOAN.Model}/MES/upload/QcYidaForm.cs (98%) rename {ZR.Model => DOAN.Model}/PagedInfo.cs (98%) rename {ZR.Model => DOAN.Model}/PagerInfo.cs (97%) rename {ZR.Model => DOAN.Model}/TreeDto.cs (95%) rename {ZR.Repository => DOAN.Repository}/BaseRepository.cs (99%) rename ZR.Repository/ZR.Repository.csproj => DOAN.Repository/DOAN.Repository.csproj (75%) rename {ZR.Repository => DOAN.Repository}/IBaseRepository.cs (98%) rename ZR.Service/ZR.Service.csproj => DOAN.Service/DOAN.Service.csproj (87%) rename {ZR.Service => DOAN.Service}/GlobalUsing.cs (100%) rename {ZR.Service => DOAN.Service}/MES/andon/AndonDataAnalysisServcie.cs (97%) rename {ZR.Service => DOAN.Service}/MES/andon/AndonFaultRecordService.cs (95%) rename {ZR.Service => DOAN.Service}/MES/andon/AndonInteractionService.cs (97%) rename {ZR.Service => DOAN.Service}/MES/andon/IService/IAndonDataAnalysisServcie.cs (81%) rename {ZR.Service => DOAN.Service}/MES/andon/IService/IAndonFaultRecordService.cs (78%) rename {ZR.Service => DOAN.Service}/MES/andon/IService/IAndonInteractionService.cs (84%) rename {ZR.Service => DOAN.Service}/MES/dev/DeviceAccountService.cs (99%) rename {ZR.Service => DOAN.Service}/MES/dev/DeviceDataAnalysisService.cs (99%) rename {ZR.Service => DOAN.Service}/MES/dev/DeviceFormConfigService.cs (93%) rename {ZR.Service => DOAN.Service}/MES/dev/DeviceInspectService.cs (96%) rename {ZR.Service => DOAN.Service}/MES/dev/DeviceMaintenanceRecordService.cs (94%) rename {ZR.Service => DOAN.Service}/MES/dev/DevicePointInspectionPlanService.cs (94%) rename {ZR.Service => DOAN.Service}/MES/dev/DeviceRepairService.cs (96%) rename {ZR.Service => DOAN.Service}/MES/dev/DeviceRouteInspectionPlanService.cs (96%) rename {ZR.Service => DOAN.Service}/MES/dev/DeviceTaskExecuteResultService.cs (95%) rename {ZR.Service => DOAN.Service}/MES/dev/DeviceTaskExecuteService.cs (99%) rename {ZR.Service => DOAN.Service}/MES/dev/DeviceTypeService.cs (91%) rename {ZR.Service => DOAN.Service}/MES/dev/IService/IDeviceAccountService.cs (89%) rename {ZR.Service => DOAN.Service}/MES/dev/IService/IDeviceDataAnalysisServcie.cs (92%) rename {ZR.Service => DOAN.Service}/MES/dev/IService/IDeviceFormConfigService.cs (81%) rename {ZR.Service => DOAN.Service}/MES/dev/IService/IDeviceInspectService.cs (86%) rename {ZR.Service => DOAN.Service}/MES/dev/IService/IDeviceMaintenanceRecordService.cs (82%) rename {ZR.Service => DOAN.Service}/MES/dev/IService/IDevicePointInspectionPlanService.cs (83%) rename {ZR.Service => DOAN.Service}/MES/dev/IService/IDeviceRepairService.cs (78%) rename {ZR.Service => DOAN.Service}/MES/dev/IService/IDeviceRouteInspectionPlanService.cs (83%) rename {ZR.Service => DOAN.Service}/MES/dev/IService/IDeviceTaskExecuteResultService.cs (80%) rename {ZR.Service => DOAN.Service}/MES/dev/IService/IDeviceTaskExecuteService.cs (91%) rename {ZR.Service => DOAN.Service}/MES/dev/IService/IDeviceTypeService.cs (75%) rename {ZR.Service => DOAN.Service}/MES/qu/upload/IUploadServive.cs (81%) rename {ZR.Service => DOAN.Service}/MES/qu/upload/service/UploadService.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/BaseService.cs (80%) rename ZR.ServiceCore/ZR.ServiceCore.csproj => DOAN.ServiceCore/DOAN.ServiceCore.csproj (75%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Filters/ActionPermissionFilter.cs (96%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Filters/GlobalActionMonitor.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Filters/VerifyAttribute.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/GlobalUsing.cs (100%) rename {ZR.ServiceCore => DOAN.ServiceCore}/IBaseService.cs (80%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Middleware/GlobalExceptionMiddleware.cs (97%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Article.cs (99%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/ArticleCategory.cs (97%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/CommonLang.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/ArticleCategoryDto.cs (96%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/ArticleDto.cs (97%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/ChatMessageDto.cs (95%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/CommonLangDto.cs (97%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/GenTableDto.cs (97%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/LockUserDto.cs (88%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/LoginBodyDto.cs (95%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/MenuDto.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/RegisterDto.cs (96%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/RoleMenuExportDto.cs (93%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/RoleUserDto.cs (95%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/ScanDto.cs (82%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/SqlDiffLogDto.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/SysConfigDto.cs (96%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/SysDeptDto.cs (95%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/SysDictTypeDto.cs (96%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/SysFileQueryDto.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/SysLogininfoDto.cs (92%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/SysNoticeDto.cs (95%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/SysOperLogDto.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/SysRoleDto.cs (96%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/SysRoleMenuDto.cs (93%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/SysUserDto.cs (97%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/SysdictDataDto.cs (87%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/TasksDto.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Dto/TasksLogDto.cs (93%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Enums/MenuStatus.cs (88%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Enums/MenuType.cs (90%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Generate/GenTable.cs (99%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Generate/GenTableColumn.cs (99%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SqlDiffLog.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SysBase.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SysConfig.cs (97%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SysDept.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SysDictData.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SysDictType.cs (97%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SysFile.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SysLogininfor.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SysMenu.cs (99%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SysNotice.cs (96%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SysOperLog.cs (99%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SysPost.cs (96%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SysRole.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SysRoleDept.cs (93%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SysRoleMenu.cs (95%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SysTasks.cs (99%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SysTasksLog.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SysUser.cs (99%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SysUserPost.cs (94%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/SysUserRole.cs (94%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/UserConstants.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Vo/RouterVo.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Model/Vo/TreeSelectVo.cs (97%) rename {ZR.ServiceCore => DOAN.ServiceCore}/ProteryConstant.cs (100%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/ArticleCategoryService.cs (92%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/ArticleService.cs (94%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/CacheService.cs (97%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/CommonLangService.cs (96%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/GenTableService.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/IArticleCategoryService.cs (76%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/IArticleService.cs (77%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/ICommonLangService.cs (82%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/IGenTableService.cs (92%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/ISqlDiffLogService.cs (76%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/ISysConfigService.cs (81%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/ISysDeptService.cs (88%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/ISysDictDataService.cs (90%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/ISysDictService.cs (94%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/ISysFileService.cs (93%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/ISysLoginService.cs (92%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/ISysMenuService.cs (94%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/ISysNoticeService.cs (71%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/ISysOperLogService.cs (89%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/ISysPermissionService.cs (82%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/ISysPostService.cs (76%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/ISysRoleService.cs (97%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/ISysTasksLogService.cs (80%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/ISysTasksQzService.cs (69%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/ISysUserPostService.cs (82%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/ISysUserRoleService.cs (94%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/IService/ISysUserService.cs (95%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SeedDataService.cs (99%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SqlDiffLogService.cs (95%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SysConfigService.cs (84%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SysDeptService.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SysDictDataService.cs (97%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SysDictService.cs (97%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SysFileService.cs (97%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SysLoginService.cs (96%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SysMenuService.cs (99%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SysNoticeService.cs (91%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SysOperLogService.cs (94%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SysPermissionService.cs (95%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SysPostService.cs (93%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SysRoleMenuService.cs (94%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SysRoleService.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SysTasksLogService.cs (89%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SysTasksQzService.cs (91%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SysUserPostService.cs (95%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SysUserRoleService.cs (96%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Services/SysUserService.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Signalr/HubsConstant.cs (92%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Signalr/MessageHub.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/Signalr/OnlineUsers.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/SqlSugar/DataPermi.cs (98%) rename {ZR.ServiceCore => DOAN.ServiceCore}/SqlSugar/InitTable.cs (94%) rename {ZR.ServiceCore => DOAN.ServiceCore}/SqlSugar/SqlSugarCache.cs (96%) rename {ZR.ServiceCore => DOAN.ServiceCore}/SqlSugar/SqlsugarSetup.cs (99%) rename ZR.Tasks/ZR.Tasks.csproj => DOAN.Tasks/DOAN.Tasks.csproj (74%) rename {ZR.Tasks => DOAN.Tasks}/ITaskSchedulerServer.cs (93%) rename {ZR.Tasks => DOAN.Tasks}/JobFactory.cs (98%) rename {ZR.Tasks => DOAN.Tasks}/TaskScheduler/JobBase.cs (96%) rename {ZR.Tasks => DOAN.Tasks}/TaskScheduler/Job_Device_Execute.cs (91%) rename {ZR.Tasks => DOAN.Tasks}/TaskScheduler/Job_Email_send.cs (94%) rename {ZR.Tasks => DOAN.Tasks}/TaskScheduler/Job_HttpRequest.cs (95%) rename {ZR.Tasks => DOAN.Tasks}/TaskScheduler/Job_SqlExecute.cs (95%) rename {ZR.Tasks => DOAN.Tasks}/TaskScheduler/Job_SyncTest.cs (95%) rename {ZR.Tasks => DOAN.Tasks}/TaskScheduler/Job_YIDAtoken.cs (95%) rename {ZR.Tasks => DOAN.Tasks}/TaskSchedulerServer.cs (99%) rename {ZR.Tasks => DOAN.Tasks}/Test.cs (88%) rename ZRAdmin3.sln => DOAN.sln (74%) rename Infrastructure/{ZR.Infrastructure.csproj => DOAN.Infrastructure.csproj} (100%) diff --git a/ZR.Admin.WebApi/.config/dotnet-tools.json b/DOAN.Admin.WebApi/.config/dotnet-tools.json similarity index 100% rename from ZR.Admin.WebApi/.config/dotnet-tools.json rename to DOAN.Admin.WebApi/.config/dotnet-tools.json diff --git a/ZR.Admin.WebApi/Controllers/CommonController.cs b/DOAN.Admin.WebApi/Controllers/CommonController.cs similarity index 98% rename from ZR.Admin.WebApi/Controllers/CommonController.cs rename to DOAN.Admin.WebApi/Controllers/CommonController.cs index 08819eb..106fe23 100644 --- a/ZR.Admin.WebApi/Controllers/CommonController.cs +++ b/DOAN.Admin.WebApi/Controllers/CommonController.cs @@ -1,12 +1,12 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; using Newtonsoft.Json; -using ZR.Admin.WebApi.Filters; -using ZR.Model.System; -using ZR.Service.System; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.System; +using DOAN.Service.System; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 公共模块 diff --git a/ZR.Admin.WebApi/Controllers/MES/andon/AndonDataAnalysisController .cs b/DOAN.Admin.WebApi/Controllers/MES/andon/AndonDataAnalysisController .cs similarity index 94% rename from ZR.Admin.WebApi/Controllers/MES/andon/AndonDataAnalysisController .cs rename to DOAN.Admin.WebApi/Controllers/MES/andon/AndonDataAnalysisController .cs index 0d4ad9e..e1c72a3 100644 --- a/ZR.Admin.WebApi/Controllers/MES/andon/AndonDataAnalysisController .cs +++ b/DOAN.Admin.WebApi/Controllers/MES/andon/AndonDataAnalysisController .cs @@ -1,9 +1,9 @@ -using ZR.Admin.WebApi.Filters; +using DOAN.Admin.WebApi.Filters; using Microsoft.AspNetCore.Mvc; -using ZR.Service.MES.andon.IService; -using ZR.Model.MES.andon.Dto; -using ZR.Model.Dto; -using ZR.Service.MES.andon; +using DOAN.Service.MES.andon.IService; +using DOAN.Model.MES.andon.Dto; +using DOAN.Model.Dto; +using DOAN.Service.MES.andon; namespace DOAN.WebApi.Controllers.MES.andon { diff --git a/ZR.Admin.WebApi/Controllers/MES/andon/AndonFaultRecordController.cs b/DOAN.Admin.WebApi/Controllers/MES/andon/AndonFaultRecordController.cs similarity index 93% rename from ZR.Admin.WebApi/Controllers/MES/andon/AndonFaultRecordController.cs rename to DOAN.Admin.WebApi/Controllers/MES/andon/AndonFaultRecordController.cs index 4554cb2..9a05ce0 100644 --- a/ZR.Admin.WebApi/Controllers/MES/andon/AndonFaultRecordController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/andon/AndonFaultRecordController.cs @@ -1,12 +1,12 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Model.Dto; -using ZR.Model.MES.andon; -using ZR.Model.MES.andon.Dto; -using ZR.Service.MES.andon.IService; -using ZR.Admin.WebApi.Filters; +using DOAN.Model.Dto; +using DOAN.Model.MES.andon; +using DOAN.Model.MES.andon.Dto; +using DOAN.Service.MES.andon.IService; +using DOAN.Admin.WebApi.Filters; //创建时间：2024-06-20 -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 故障记录表 @@ -109,7 +109,7 @@ namespace ZR.Admin.WebApi.Controllers [Log(Title = "故障记录表", BusinessType = BusinessType.DELETE)] public IActionResult DeleteAndonFaultRecord(string ids) { - int[] idsArr = Tools.SpitIntArrary(ids); + long[] idsArr = Tools.SpitLongArrary(ids); if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } var response = _AndonFaultRecordService.Delete(idsArr); diff --git a/ZR.Admin.WebApi/Controllers/MES/andon/AndonInteractionController.cs b/DOAN.Admin.WebApi/Controllers/MES/andon/AndonInteractionController.cs similarity index 94% rename from ZR.Admin.WebApi/Controllers/MES/andon/AndonInteractionController.cs rename to DOAN.Admin.WebApi/Controllers/MES/andon/AndonInteractionController.cs index 9211b4c..2feb618 100644 --- a/ZR.Admin.WebApi/Controllers/MES/andon/AndonInteractionController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/andon/AndonInteractionController.cs @@ -1,8 +1,8 @@ -using ZR.Admin.WebApi.Filters; +using DOAN.Admin.WebApi.Filters; using Microsoft.AspNetCore.Mvc; -using ZR.Service.MES.andon.IService; -using ZR.Model.Dto; -using ZR.Model.MES.andon; +using DOAN.Service.MES.andon.IService; +using DOAN.Model.Dto; +using DOAN.Model.MES.andon; namespace DOAN.WebApi.Controllers.MES.andon { diff --git a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceAccountController.cs b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceAccountController.cs similarity index 97% rename from ZR.Admin.WebApi/Controllers/MES/dev/DeviceAccountController.cs rename to DOAN.Admin.WebApi/Controllers/MES/dev/DeviceAccountController.cs index 4858a80..ca4e232 100644 --- a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceAccountController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceAccountController.cs @@ -1,13 +1,13 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Model.Dto; -using ZR.Service.MES.dev.IService; -using ZR.Model.MES.dev.Dto; -using ZR.Admin.WebApi.Filters; -using ZR.Model.MES.dev.Dto; -using ZR.Model.MES.dev; +using DOAN.Model.Dto; +using DOAN.Service.MES.dev.IService; +using DOAN.Model.MES.dev.Dto; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.MES.dev.Dto; +using DOAN.Model.MES.dev; //创建时间：2024-05-20 -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 设备台账 diff --git a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceDataAnalysisController.cs b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceDataAnalysisController.cs similarity index 97% rename from ZR.Admin.WebApi/Controllers/MES/dev/DeviceDataAnalysisController.cs rename to DOAN.Admin.WebApi/Controllers/MES/dev/DeviceDataAnalysisController.cs index 6230fd4..20e298d 100644 --- a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceDataAnalysisController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceDataAnalysisController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Admin.WebApi.Filters; -using ZR.Model.MES.dev.Dto; -using ZR.Service.MES.dev.IService; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.MES.dev.Dto; +using DOAN.Service.MES.dev.IService; namespace DOAN.WebApi.Controllers.MES.dev { diff --git a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceFormConfigController.cs b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceFormConfigController.cs similarity index 95% rename from ZR.Admin.WebApi/Controllers/MES/dev/DeviceFormConfigController.cs rename to DOAN.Admin.WebApi/Controllers/MES/dev/DeviceFormConfigController.cs index 78f4662..51a7226 100644 --- a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceFormConfigController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceFormConfigController.cs @@ -1,13 +1,13 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Model.Dto; -using ZR.Service.MES.dev.IService; -using ZR.Model.MES.dev.Dto; -using ZR.Admin.WebApi.Filters; +using DOAN.Model.Dto; +using DOAN.Service.MES.dev.IService; +using DOAN.Model.MES.dev.Dto; +using DOAN.Admin.WebApi.Filters; -using ZR.Model.MES.dev; +using DOAN.Model.MES.dev; //创建时间：2024-05-22 -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 设备检查项表单配置表 diff --git a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceInspectController.cs b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceInspectController.cs similarity index 96% rename from ZR.Admin.WebApi/Controllers/MES/dev/DeviceInspectController.cs rename to DOAN.Admin.WebApi/Controllers/MES/dev/DeviceInspectController.cs index d2ef599..1678ea9 100644 --- a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceInspectController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceInspectController.cs @@ -1,15 +1,15 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Model.Dto; -using ZR.Service.MES.dev.IService; -using ZR.Model.MES.dev.Dto; -using ZR.Admin.WebApi.Filters; +using DOAN.Model.Dto; +using DOAN.Service.MES.dev.IService; +using DOAN.Model.MES.dev.Dto; +using DOAN.Admin.WebApi.Filters; -using ZR.Model.MES.dev; +using DOAN.Model.MES.dev; using Org.BouncyCastle.Crypto; using Aliyun.OSS; //创建时间：2024-05-21 -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 设备检查项 diff --git a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceMaintenanceRecordController.cs b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceMaintenanceRecordController.cs similarity index 94% rename from ZR.Admin.WebApi/Controllers/MES/dev/DeviceMaintenanceRecordController.cs rename to DOAN.Admin.WebApi/Controllers/MES/dev/DeviceMaintenanceRecordController.cs index 15706d8..f155322 100644 --- a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceMaintenanceRecordController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceMaintenanceRecordController.cs @@ -1,12 +1,12 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Service.MES.dev.IService; -using ZR.Model.MES.dev.Dto; -using ZR.Admin.WebApi.Filters; -using ZR.Model.MES.dev.Dto; -using ZR.Model.MES.dev; +using DOAN.Service.MES.dev.IService; +using DOAN.Model.MES.dev.Dto; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.MES.dev.Dto; +using DOAN.Model.MES.dev; //创建时间：2024-05-27 -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 维修记录 diff --git a/ZR.Admin.WebApi/Controllers/MES/dev/DevicePointInspectionPlanController.cs b/DOAN.Admin.WebApi/Controllers/MES/dev/DevicePointInspectionPlanController.cs similarity index 95% rename from ZR.Admin.WebApi/Controllers/MES/dev/DevicePointInspectionPlanController.cs rename to DOAN.Admin.WebApi/Controllers/MES/dev/DevicePointInspectionPlanController.cs index 2da9aa2..a9c7c45 100644 --- a/ZR.Admin.WebApi/Controllers/MES/dev/DevicePointInspectionPlanController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/dev/DevicePointInspectionPlanController.cs @@ -1,12 +1,12 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Service.MES.dev.IService; -using ZR.Model.MES.dev.Dto; -using ZR.Admin.WebApi.Filters; -using ZR.Model.MES.dev.Dto; -using ZR.Model.MES.dev; +using DOAN.Service.MES.dev.IService; +using DOAN.Model.MES.dev.Dto; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.MES.dev.Dto; +using DOAN.Model.MES.dev; //创建时间：2024-05-27 -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 点检任务 diff --git a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceRepairController.cs b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceRepairController.cs similarity index 94% rename from ZR.Admin.WebApi/Controllers/MES/dev/DeviceRepairController.cs rename to DOAN.Admin.WebApi/Controllers/MES/dev/DeviceRepairController.cs index 8b95a29..203410b 100644 --- a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceRepairController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceRepairController.cs @@ -1,12 +1,12 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Service.MES.dev.IService; -using ZR.Model.MES.dev.Dto; -using ZR.Admin.WebApi.Filters; -using ZR.Model.MES.dev.Dto; -using ZR.Model.MES.dev; +using DOAN.Service.MES.dev.IService; +using DOAN.Model.MES.dev.Dto; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.MES.dev.Dto; +using DOAN.Model.MES.dev; //创建时间：2024-05-28 -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 报修单 diff --git a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceRouteInspectionPlanController.cs b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceRouteInspectionPlanController.cs similarity index 95% rename from ZR.Admin.WebApi/Controllers/MES/dev/DeviceRouteInspectionPlanController.cs rename to DOAN.Admin.WebApi/Controllers/MES/dev/DeviceRouteInspectionPlanController.cs index e742792..3a84452 100644 --- a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceRouteInspectionPlanController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceRouteInspectionPlanController.cs @@ -1,12 +1,12 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Service.MES.dev.IService; -using ZR.Model.MES.dev.Dto; -using ZR.Admin.WebApi.Filters; -using ZR.Model.MES.dev.Dto; -using ZR.Model.MES.dev; +using DOAN.Service.MES.dev.IService; +using DOAN.Model.MES.dev.Dto; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.MES.dev.Dto; +using DOAN.Model.MES.dev; //创建时间：2024-05-27 -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 巡检计划 diff --git a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteController.cs b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteController.cs similarity index 97% rename from ZR.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteController.cs rename to DOAN.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteController.cs index f4824bc..06dfbf2 100644 --- a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteController.cs @@ -1,16 +1,16 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Model.Dto; +using DOAN.Model.Dto; -using ZR.Service.MES.dev.IService; -using ZR.Model.MES.dev.Dto; -using ZR.Admin.WebApi.Filters; +using DOAN.Service.MES.dev.IService; +using DOAN.Model.MES.dev.Dto; +using DOAN.Admin.WebApi.Filters; using MiniExcelLibs; -using ZR.Model.MES.dev.Dto; -using ZR.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; +using DOAN.Model.MES.dev; using Org.BouncyCastle.Crypto; //创建时间：2024-05-31 -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 任务执行 diff --git a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteResultController.cs b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteResultController.cs similarity index 95% rename from ZR.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteResultController.cs rename to DOAN.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteResultController.cs index da539a9..8437b29 100644 --- a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteResultController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceTaskExecuteResultController.cs @@ -1,14 +1,14 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Model.MES.dev.Dto; -using ZR.Model.MES.dev; -using ZR.Service.MES.dev.IService; -using ZR.Admin.WebApi.Filters; -using ZR.Service.MES.dev; +using DOAN.Model.MES.dev.Dto; +using DOAN.Model.MES.dev; +using DOAN.Service.MES.dev.IService; +using DOAN.Admin.WebApi.Filters; +using DOAN.Service.MES.dev; //创建时间：2024-06-11 -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 巡检/点检任务结果表 diff --git a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceTypeController.cs b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceTypeController.cs similarity index 94% rename from ZR.Admin.WebApi/Controllers/MES/dev/DeviceTypeController.cs rename to DOAN.Admin.WebApi/Controllers/MES/dev/DeviceTypeController.cs index 2dc6463..90d7c22 100644 --- a/ZR.Admin.WebApi/Controllers/MES/dev/DeviceTypeController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/dev/DeviceTypeController.cs @@ -1,10 +1,10 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Admin.WebApi.Filters; -using ZR.Model.MES.dev.Dto; -using ZR.Model.MES.dev; -using ZR.Service.MES.dev.IService; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.MES.dev.Dto; +using DOAN.Model.MES.dev; +using DOAN.Service.MES.dev.IService; -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 1.设备类型 diff --git a/ZR.Admin.WebApi/Controllers/MES/qu/upload/UploadController.cs b/DOAN.Admin.WebApi/Controllers/MES/qu/upload/UploadController.cs similarity index 94% rename from ZR.Admin.WebApi/Controllers/MES/qu/upload/UploadController.cs rename to DOAN.Admin.WebApi/Controllers/MES/qu/upload/UploadController.cs index 9b28d1d..b6aaf9d 100644 --- a/ZR.Admin.WebApi/Controllers/MES/qu/upload/UploadController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/qu/upload/UploadController.cs @@ -6,12 +6,12 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System.Collections.Generic; using System.IO; -using ZR.Admin.WebApi.Extensions; -using ZR.Admin.WebApi.Filters; -using ZR.Model; -using ZR.Model.MES.upload; -using ZR.Model.System; -using ZR.Service.quality.upload; +using DOAN.Admin.WebApi.Extensions; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model; +using DOAN.Model.MES.upload; +using DOAN.Model.System; +using DOAN.Service.quality.upload; using static System.Runtime.InteropServices.JavaScript.JSType; namespace DOAN.WebApi.Controllers.MES.quality.upload diff --git a/ZR.Admin.WebApi/Controllers/System/ArticleCategoryController.cs b/DOAN.Admin.WebApi/Controllers/System/ArticleCategoryController.cs similarity index 96% rename from ZR.Admin.WebApi/Controllers/System/ArticleCategoryController.cs rename to DOAN.Admin.WebApi/Controllers/System/ArticleCategoryController.cs index 5a81d8a..e9ccf6a 100644 --- a/ZR.Admin.WebApi/Controllers/System/ArticleCategoryController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/ArticleCategoryController.cs @@ -1,11 +1,11 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Admin.WebApi.Extensions; -using ZR.Admin.WebApi.Filters; -using ZR.Model.Dto; -using ZR.Model.System; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Extensions; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.Dto; +using DOAN.Model.System; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 文章目录Controller diff --git a/ZR.Admin.WebApi/Controllers/System/ArticleController.cs b/DOAN.Admin.WebApi/Controllers/System/ArticleController.cs similarity index 95% rename from ZR.Admin.WebApi/Controllers/System/ArticleController.cs rename to DOAN.Admin.WebApi/Controllers/System/ArticleController.cs index b111ace..6910724 100644 --- a/ZR.Admin.WebApi/Controllers/System/ArticleController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/ArticleController.cs @@ -1,12 +1,12 @@ using Microsoft.AspNetCore.Mvc; using SqlSugar; -using ZR.Admin.WebApi.Extensions; -using ZR.Admin.WebApi.Filters; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Extensions; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 文章管理 diff --git a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs b/DOAN.Admin.WebApi/Controllers/System/CodeGeneratorController.cs similarity index 96% rename from ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs rename to DOAN.Admin.WebApi/Controllers/System/CodeGeneratorController.cs index 61fb659..b08eb8b 100644 --- a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/CodeGeneratorController.cs @@ -1,16 +1,16 @@ using Microsoft.AspNetCore.Mvc; using SqlSugar; -using ZR.Admin.WebApi.Extensions; -using ZR.Admin.WebApi.Filters; -using ZR.CodeGenerator; -using ZR.CodeGenerator.Model; -using ZR.CodeGenerator.Service; -using ZR.Model; -using ZR.Model.System.Dto; -using ZR.Model.System.Generate; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Extensions; +using DOAN.Admin.WebApi.Filters; +using DOAN.CodeGenerator; +using DOAN.CodeGenerator.Model; +using DOAN.CodeGenerator.Service; +using DOAN.Model; +using DOAN.Model.System.Dto; +using DOAN.Model.System.Generate; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 代码生成 @@ -269,7 +269,7 @@ namespace ZR.Admin.WebApi.Controllers dto.GenCodePath = Path.Combine(dto.ZipPath, DateTime.Now.ToString("yyyyMMdd")); } //生成压缩包 - string zipReturnFileName = $"ZrAdmin.NET-{genTableInfo.TableComment}-{DateTime.Now:MMddHHmmss}.zip"; + string zipReturnFileName = $"DOANAdmin.NET-{genTableInfo.TableComment}-{DateTime.Now:MMddHHmmss}.zip"; //生成代码到指定文件夹 CodeGeneratorTool.Generate(dto); diff --git a/ZR.Admin.WebApi/Controllers/System/CommonLangController.cs b/DOAN.Admin.WebApi/Controllers/System/CommonLangController.cs similarity index 97% rename from ZR.Admin.WebApi/Controllers/System/CommonLangController.cs rename to DOAN.Admin.WebApi/Controllers/System/CommonLangController.cs index e24cb0e..34bd5b3 100644 --- a/ZR.Admin.WebApi/Controllers/System/CommonLangController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/CommonLangController.cs @@ -1,13 +1,13 @@ using Infrastructure.Extensions; using Microsoft.AspNetCore.Mvc; using MiniExcelLibs; -using ZR.Admin.WebApi.Filters; -using ZR.Model; -using ZR.Model.Dto; -using ZR.Model.Models; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model; +using DOAN.Model.Dto; +using DOAN.Model.Models; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 多语言配置Controller diff --git a/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs b/DOAN.Admin.WebApi/Controllers/System/SysConfigController.cs similarity index 96% rename from ZR.Admin.WebApi/Controllers/System/SysConfigController.cs rename to DOAN.Admin.WebApi/Controllers/System/SysConfigController.cs index 51bae9c..47979a1 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/SysConfigController.cs @@ -1,13 +1,13 @@ using Infrastructure.Extensions; using Microsoft.AspNetCore.Mvc; using SqlSugar; -using ZR.Admin.WebApi.Extensions; -using ZR.Admin.WebApi.Filters; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Extensions; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 参数配置Controller diff --git a/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs b/DOAN.Admin.WebApi/Controllers/System/SysDeptController.cs similarity index 97% rename from ZR.Admin.WebApi/Controllers/System/SysDeptController.cs rename to DOAN.Admin.WebApi/Controllers/System/SysDeptController.cs index 2b53ac6..4803ee9 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/SysDeptController.cs @@ -1,11 +1,11 @@ using Microsoft.AspNetCore.Mvc; using System.Collections; -using ZR.Admin.WebApi.Filters; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers.System +namespace DOAN.Admin.WebApi.Controllers.System { /// /// 部门 diff --git a/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs b/DOAN.Admin.WebApi/Controllers/System/SysDictDataController.cs similarity index 96% rename from ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs rename to DOAN.Admin.WebApi/Controllers/System/SysDictDataController.cs index 05d7dac..8cde49d 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/SysDictDataController.cs @@ -1,11 +1,11 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Admin.WebApi.Filters; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers.System +namespace DOAN.Admin.WebApi.Controllers.System { /// /// 数据字典信息 diff --git a/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs b/DOAN.Admin.WebApi/Controllers/System/SysDictTypeController.cs similarity index 94% rename from ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs rename to DOAN.Admin.WebApi/Controllers/System/SysDictTypeController.cs index a978d22..5cf8ac9 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/SysDictTypeController.cs @@ -1,12 +1,12 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Admin.WebApi.Extensions; -using ZR.Admin.WebApi.Filters; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Extensions; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers.System +namespace DOAN.Admin.WebApi.Controllers.System { /// /// 数据字典信息 diff --git a/ZR.Admin.WebApi/Controllers/System/SysFileController.cs b/DOAN.Admin.WebApi/Controllers/System/SysFileController.cs similarity index 95% rename from ZR.Admin.WebApi/Controllers/System/SysFileController.cs rename to DOAN.Admin.WebApi/Controllers/System/SysFileController.cs index b084c21..e320c14 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysFileController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/SysFileController.cs @@ -1,11 +1,11 @@ using Microsoft.AspNetCore.Mvc; using SqlSugar; -using ZR.Admin.WebApi.Filters; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 文件存储Controller diff --git a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs b/DOAN.Admin.WebApi/Controllers/System/SysLoginController.cs similarity index 98% rename from ZR.Admin.WebApi/Controllers/System/SysLoginController.cs rename to DOAN.Admin.WebApi/Controllers/System/SysLoginController.cs index 4122662..c26d95c 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/SysLoginController.cs @@ -1,13 +1,13 @@ using Lazy.Captcha.Core; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; -using ZR.Admin.WebApi.Filters; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Service.System; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Service.System; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers.System +namespace DOAN.Admin.WebApi.Controllers.System { /// /// 登录 diff --git a/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs b/DOAN.Admin.WebApi/Controllers/System/SysMenuController.cs similarity index 97% rename from ZR.Admin.WebApi/Controllers/System/SysMenuController.cs rename to DOAN.Admin.WebApi/Controllers/System/SysMenuController.cs index 13e9b84..7b7c5ab 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/SysMenuController.cs @@ -1,10 +1,10 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Admin.WebApi.Filters; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers.System +namespace DOAN.Admin.WebApi.Controllers.System { /// /// 系统菜单 diff --git a/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs b/DOAN.Admin.WebApi/Controllers/System/SysNoticeController.cs similarity index 96% rename from ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs rename to DOAN.Admin.WebApi/Controllers/System/SysNoticeController.cs index 18e304e..5422b4f 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/SysNoticeController.cs @@ -1,14 +1,14 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; using SqlSugar; -using ZR.Admin.WebApi.Filters; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Service.System.IService; -using ZR.ServiceCore.Signalr; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Service.System.IService; +using DOAN.ServiceCore.Signalr; -namespace ZR.Admin.WebApi.Controllers.System +namespace DOAN.Admin.WebApi.Controllers.System { /// /// 系统通知 diff --git a/ZR.Admin.WebApi/Controllers/System/SysPostController.cs b/DOAN.Admin.WebApi/Controllers/System/SysPostController.cs similarity index 96% rename from ZR.Admin.WebApi/Controllers/System/SysPostController.cs rename to DOAN.Admin.WebApi/Controllers/System/SysPostController.cs index 8e65053..e6dca7d 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysPostController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/SysPostController.cs @@ -1,11 +1,11 @@ using Microsoft.AspNetCore.Mvc; using SqlSugar; -using ZR.Admin.WebApi.Filters; -using ZR.Model; -using ZR.Model.System; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers.System +namespace DOAN.Admin.WebApi.Controllers.System { /// /// 岗位管理 diff --git a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs b/DOAN.Admin.WebApi/Controllers/System/SysProfileController.cs similarity index 96% rename from ZR.Admin.WebApi/Controllers/System/SysProfileController.cs rename to DOAN.Admin.WebApi/Controllers/System/SysProfileController.cs index 24f630f..aebb557 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/SysProfileController.cs @@ -1,10 +1,10 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Admin.WebApi.Filters; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers.System +namespace DOAN.Admin.WebApi.Controllers.System { /// /// 个人中心 diff --git a/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs b/DOAN.Admin.WebApi/Controllers/System/SysRoleController.cs similarity index 97% rename from ZR.Admin.WebApi/Controllers/System/SysRoleController.cs rename to DOAN.Admin.WebApi/Controllers/System/SysRoleController.cs index 790a8d9..8c6ae14 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/SysRoleController.cs @@ -1,11 +1,11 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Admin.WebApi.Filters; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers.System +namespace DOAN.Admin.WebApi.Controllers.System { /// /// 角色信息 diff --git a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs b/DOAN.Admin.WebApi/Controllers/System/SysUserController.cs similarity index 97% rename from ZR.Admin.WebApi/Controllers/System/SysUserController.cs rename to DOAN.Admin.WebApi/Controllers/System/SysUserController.cs index 9242360..1dd4d78 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/SysUserController.cs @@ -1,13 +1,13 @@ using Microsoft.AspNetCore.Mvc; using MiniExcelLibs; using SqlSugar; -using ZR.Admin.WebApi.Filters; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers.System +namespace DOAN.Admin.WebApi.Controllers.System { /// /// 用户管理 diff --git a/ZR.Admin.WebApi/Controllers/System/SysUserRoleController.cs b/DOAN.Admin.WebApi/Controllers/System/SysUserRoleController.cs similarity index 95% rename from ZR.Admin.WebApi/Controllers/System/SysUserRoleController.cs rename to DOAN.Admin.WebApi/Controllers/System/SysUserRoleController.cs index 366e1c2..738e0c7 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysUserRoleController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/SysUserRoleController.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Admin.WebApi.Filters; -using ZR.Model.System.Dto; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.System.Dto; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers.System +namespace DOAN.Admin.WebApi.Controllers.System { /// /// 用户角色管理 diff --git a/ZR.Admin.WebApi/Controllers/System/TasksController.cs b/DOAN.Admin.WebApi/Controllers/System/TasksController.cs similarity index 98% rename from ZR.Admin.WebApi/Controllers/System/TasksController.cs rename to DOAN.Admin.WebApi/Controllers/System/TasksController.cs index c5daacd..a623186 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/TasksController.cs @@ -1,13 +1,13 @@ using Microsoft.AspNetCore.Mvc; using Quartz; using SqlSugar; -using ZR.Admin.WebApi.Filters; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Service.System.IService; -using ZR.Tasks; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Service.System.IService; +using DOAN.Tasks; -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 计划任务 diff --git a/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs b/DOAN.Admin.WebApi/Controllers/System/TasksLogController.cs similarity index 94% rename from ZR.Admin.WebApi/Controllers/System/TasksLogController.cs rename to DOAN.Admin.WebApi/Controllers/System/TasksLogController.cs index 02dee80..37a034b 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/TasksLogController.cs @@ -1,12 +1,12 @@ using Microsoft.AspNetCore.Mvc; using SqlSugar; -using ZR.Admin.WebApi.Filters; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers.System +namespace DOAN.Admin.WebApi.Controllers.System { /// /// 任务日志 diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/MonitorController.cs b/DOAN.Admin.WebApi/Controllers/System/monitor/MonitorController.cs similarity index 98% rename from ZR.Admin.WebApi/Controllers/System/monitor/MonitorController.cs rename to DOAN.Admin.WebApi/Controllers/System/monitor/MonitorController.cs index e350369..c03cd73 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/MonitorController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/monitor/MonitorController.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Options; using System.Diagnostics; using System.Runtime.InteropServices; -namespace ZR.Admin.WebApi.Controllers.monitor +namespace DOAN.Admin.WebApi.Controllers.monitor { /// /// 系统监控 diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SqlDiffLogController.cs b/DOAN.Admin.WebApi/Controllers/System/monitor/SqlDiffLogController.cs similarity index 94% rename from ZR.Admin.WebApi/Controllers/System/monitor/SqlDiffLogController.cs rename to DOAN.Admin.WebApi/Controllers/System/monitor/SqlDiffLogController.cs index 7550e92..ef653ce 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SqlDiffLogController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/monitor/SqlDiffLogController.cs @@ -1,10 +1,10 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Admin.WebApi.Filters; -using ZR.Model.System.Dto; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.System.Dto; +using DOAN.Service.System.IService; //创建时间：2023-08-17 -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 数据差异日志 diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs b/DOAN.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs similarity index 94% rename from ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs rename to DOAN.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs index 712f022..9312b3f 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs @@ -1,12 +1,12 @@ using Microsoft.AspNetCore.Mvc; using SqlSugar; -using ZR.Admin.WebApi.Extensions; -using ZR.Admin.WebApi.Filters; -using ZR.Model; -using ZR.Model.System; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Extensions; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers.monitor +namespace DOAN.Admin.WebApi.Controllers.monitor { /// /// 系统访问记录 diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs b/DOAN.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs similarity index 94% rename from ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs rename to DOAN.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs index a30baeb..715fd4f 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs @@ -1,10 +1,10 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Admin.WebApi.Extensions; -using ZR.Admin.WebApi.Filters; -using ZR.Model.System.Dto; -using ZR.Service.System.IService; +using DOAN.Admin.WebApi.Extensions; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.System.Dto; +using DOAN.Service.System.IService; -namespace ZR.Admin.WebApi.Controllers.monitor +namespace DOAN.Admin.WebApi.Controllers.monitor { /// /// 操作日志记录 diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs b/DOAN.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs similarity index 93% rename from ZR.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs rename to DOAN.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs index e0d6109..a435989 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs +++ b/DOAN.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs @@ -1,11 +1,11 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; -using ZR.Admin.WebApi.Filters; -using ZR.Model; -using ZR.Model.System.Dto; -using ZR.ServiceCore.Signalr; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model; +using DOAN.Model.System.Dto; +using DOAN.ServiceCore.Signalr; -namespace ZR.Admin.WebApi.Controllers.monitor +namespace DOAN.Admin.WebApi.Controllers.monitor { /// /// 在线用户 diff --git a/ZR.Admin.WebApi/Controllers/WxOpenController.cs b/DOAN.Admin.WebApi/Controllers/WxOpenController.cs similarity index 96% rename from ZR.Admin.WebApi/Controllers/WxOpenController.cs rename to DOAN.Admin.WebApi/Controllers/WxOpenController.cs index 53bbc10..3323737 100644 --- a/ZR.Admin.WebApi/Controllers/WxOpenController.cs +++ b/DOAN.Admin.WebApi/Controllers/WxOpenController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using System.Web; -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 微信公众号 diff --git a/ZR.Admin.WebApi/DOAN.WebApi.csproj b/DOAN.Admin.WebApi/DOAN.WebApi.csproj similarity index 86% rename from ZR.Admin.WebApi/DOAN.WebApi.csproj rename to DOAN.Admin.WebApi/DOAN.WebApi.csproj index 20829eb..4f7f7a8 100644 --- a/ZR.Admin.WebApi/DOAN.WebApi.csproj +++ b/DOAN.Admin.WebApi/DOAN.WebApi.csproj @@ -18,12 +18,6 @@ - - - - - - @@ -38,6 +32,13 @@ + + + + + + + Always diff --git a/ZR.Admin.WebApi/DataProtection/key-42ad3d4b-cda9-464c-97c8-8b0a079cb299.xml b/DOAN.Admin.WebApi/DataProtection/key-42ad3d4b-cda9-464c-97c8-8b0a079cb299.xml similarity index 100% rename from ZR.Admin.WebApi/DataProtection/key-42ad3d4b-cda9-464c-97c8-8b0a079cb299.xml rename to DOAN.Admin.WebApi/DataProtection/key-42ad3d4b-cda9-464c-97c8-8b0a079cb299.xml diff --git a/ZR.Admin.WebApi/DataProtection/key-4d4871d6-d94d-4c2f-b6fc-bb969c0e11b5.xml b/DOAN.Admin.WebApi/DataProtection/key-4d4871d6-d94d-4c2f-b6fc-bb969c0e11b5.xml similarity index 100% rename from ZR.Admin.WebApi/DataProtection/key-4d4871d6-d94d-4c2f-b6fc-bb969c0e11b5.xml rename to DOAN.Admin.WebApi/DataProtection/key-4d4871d6-d94d-4c2f-b6fc-bb969c0e11b5.xml diff --git a/ZR.Admin.WebApi/DataProtection/key-84c046e6-be05-4390-8200-b37161a3cd29.xml b/DOAN.Admin.WebApi/DataProtection/key-84c046e6-be05-4390-8200-b37161a3cd29.xml similarity index 100% rename from ZR.Admin.WebApi/DataProtection/key-84c046e6-be05-4390-8200-b37161a3cd29.xml rename to DOAN.Admin.WebApi/DataProtection/key-84c046e6-be05-4390-8200-b37161a3cd29.xml diff --git a/ZR.Admin.WebApi/Dockerfile b/DOAN.Admin.WebApi/Dockerfile similarity index 73% rename from ZR.Admin.WebApi/Dockerfile rename to DOAN.Admin.WebApi/Dockerfile index d945070..3d64cdf 100644 --- a/ZR.Admin.WebApi/Dockerfile +++ b/DOAN.Admin.WebApi/Dockerfile @@ -17,5 +17,5 @@ RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime #COPY . app/ WORKDIR /app -#等价于 dotnet ZR.Admin.WebApi.dll，如果不指定启动端口默认在docker里面启动端口是80端口 -ENTRYPOINT ["dotnet", "ZR.Admin.WebApi.dll", "--server.urls","http://*:8888"] \ No newline at end of file +#等价于 dotnet DOAN.Admin.WebApi.dll，如果不指定启动端口默认在docker里面启动端口是80端口 +ENTRYPOINT ["dotnet", "DOAN.Admin.WebApi.dll", "--server.urls","http://*:8888"] \ No newline at end of file diff --git a/ZR.Admin.WebApi/Extensions/SwaggerExtension.cs b/DOAN.Admin.WebApi/Extensions/SwaggerExtension.cs similarity index 91% rename from ZR.Admin.WebApi/Extensions/SwaggerExtension.cs rename to DOAN.Admin.WebApi/Extensions/SwaggerExtension.cs index a8a7336..85aea90 100644 --- a/ZR.Admin.WebApi/Extensions/SwaggerExtension.cs +++ b/DOAN.Admin.WebApi/Extensions/SwaggerExtension.cs @@ -4,7 +4,7 @@ using Swashbuckle.AspNetCore.Filters; using Swashbuckle.AspNetCore.SwaggerUI; using System.Reflection; -namespace ZR.Admin.WebApi.Extensions +namespace DOAN.Admin.WebApi.Extensions { public static class SwaggerExtension { @@ -51,21 +51,21 @@ namespace ZR.Admin.WebApi.Extensions { c.SwaggerDoc("sys", new OpenApiInfo { - Title = "ZrAdmin.NET Api", + Title = "DOANAdmin.NET Api", Version = "v1", Description = "系统管理", - Contact = new OpenApiContact { Name = "ZRAdmin doc", Url = new Uri("https://www.izhaorui.cn/doc") } + Contact = new OpenApiContact { Name = "DOANAdmin doc", Url = new Uri("https://www.izhaorui.cn/doc") } }); c.SwaggerDoc("article", new OpenApiInfo { - Title = "ZrAdmin.NET Api", + Title = "DOANAdmin.NET Api", Version = "v1", Description = "文章管理", - Contact = new OpenApiContact { Name = "ZRAdmin doc", Url = new Uri("https://www.izhaorui.cn/doc") } + Contact = new OpenApiContact { Name = "DOANAdmin doc", Url = new Uri("https://www.izhaorui.cn/doc") } }); c.SwaggerDoc("v1", new OpenApiInfo { - Title = "ZrAdmin.NET Api", + Title = "DOANAdmin.NET Api", Version = "v1", Description = "", }); @@ -74,10 +74,10 @@ namespace ZR.Admin.WebApi.Extensions //var tempPath = hostEnvironment.ContentRootPath; //添加文档注释 var baseDir = AppContext.BaseDirectory; - c.IncludeXmlComments(Path.Combine(baseDir, "ZR.Model.xml"), true); - c.IncludeXmlComments(Path.Combine(baseDir, "ZR.ServiceCore.xml"), true); - c.IncludeXmlComments(Path.Combine(baseDir, "ZR.Service.xml"), true); - c.IncludeXmlComments(Path.Combine(baseDir, "ZR.Admin.WebApi.xml"), true); + c.IncludeXmlComments(Path.Combine(baseDir, "DOAN.Model.xml"), true); + c.IncludeXmlComments(Path.Combine(baseDir, "DOAN.ServiceCore.xml"), true); + c.IncludeXmlComments(Path.Combine(baseDir, "DOAN.Service.xml"), true); + c.IncludeXmlComments(Path.Combine(baseDir, "DOAN.Admin.WebApi.xml"), true); var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; var xmlPath = Path.Combine(baseDir, xmlFile); diff --git a/ZR.Admin.WebApi/Extensions/TasksExtension.cs b/DOAN.Admin.WebApi/Extensions/TasksExtension.cs similarity index 95% rename from ZR.Admin.WebApi/Extensions/TasksExtension.cs rename to DOAN.Admin.WebApi/Extensions/TasksExtension.cs index b1b11b1..fa609ac 100644 --- a/ZR.Admin.WebApi/Extensions/TasksExtension.cs +++ b/DOAN.Admin.WebApi/Extensions/TasksExtension.cs @@ -1,9 +1,9 @@ using Quartz.Spi; using SqlSugar.IOC; -using ZR.Model.System; -using ZR.Tasks; +using DOAN.Model.System; +using DOAN.Tasks; -namespace ZR.Admin.WebApi.Extensions +namespace DOAN.Admin.WebApi.Extensions { /// /// 定时任务扩展方法 diff --git a/ZR.Admin.WebApi/GlobalUsing.cs b/DOAN.Admin.WebApi/GlobalUsing.cs similarity index 80% rename from ZR.Admin.WebApi/GlobalUsing.cs rename to DOAN.Admin.WebApi/GlobalUsing.cs index 3a674ba..dc9dfc4 100644 --- a/ZR.Admin.WebApi/GlobalUsing.cs +++ b/DOAN.Admin.WebApi/GlobalUsing.cs @@ -1,4 +1,4 @@ -global using ZR.Common; +global using DOAN.Common; global using Microsoft.AspNetCore.Authorization; global using Infrastructure; global using Infrastructure.Attribute; @@ -7,4 +7,4 @@ global using Infrastructure.Model; global using Mapster; global using Infrastructure.Extensions; global using Infrastructure.Controllers; -global using ZR.ServiceCore.Middleware; \ No newline at end of file +global using DOAN.ServiceCore.Middleware; \ No newline at end of file diff --git a/ZR.Admin.WebApi/NLog.config b/DOAN.Admin.WebApi/NLog.config similarity index 100% rename from ZR.Admin.WebApi/NLog.config rename to DOAN.Admin.WebApi/NLog.config diff --git a/ZR.Admin.WebApi/Program.cs b/DOAN.Admin.WebApi/Program.cs similarity index 97% rename from ZR.Admin.WebApi/Program.cs rename to DOAN.Admin.WebApi/Program.cs index e7aa69a..04b25c4 100644 --- a/ZR.Admin.WebApi/Program.cs +++ b/DOAN.Admin.WebApi/Program.cs @@ -5,11 +5,11 @@ using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.FileProviders; using NLog.Web; using System.Text.Json; -using ZR.Admin.WebApi.Extensions; -using ZR.Common.Cache; -using ZR.Infrastructure.WebExtensions; -using ZR.ServiceCore.Signalr; -using ZR.ServiceCore.SqlSugar; +using DOAN.Admin.WebApi.Extensions; +using DOAN.Common.Cache; +using DOAN.Infrastructure.WebExtensions; +using DOAN.ServiceCore.Signalr; +using DOAN.ServiceCore.SqlSugar; var builder = WebApplication.CreateBuilder(args); // NLog: Setup NLog for Dependency injection diff --git a/ZR.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml b/DOAN.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml similarity index 100% rename from ZR.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml rename to DOAN.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml diff --git a/ZR.Admin.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml b/DOAN.Admin.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml similarity index 100% rename from ZR.Admin.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml rename to DOAN.Admin.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml diff --git a/ZR.Admin.WebApi/Properties/launchSettings.json b/DOAN.Admin.WebApi/Properties/launchSettings.json similarity index 95% rename from ZR.Admin.WebApi/Properties/launchSettings.json rename to DOAN.Admin.WebApi/Properties/launchSettings.json index 8ba95da..29d7455 100644 --- a/ZR.Admin.WebApi/Properties/launchSettings.json +++ b/DOAN.Admin.WebApi/Properties/launchSettings.json @@ -9,7 +9,7 @@ } }, "profiles": { - "ZR.Admin.WebApi": { + "DOAN.Admin.WebApi": { "commandName": "Project", "dotnetRunMessages": true, "launchUrl": "", diff --git a/ZR.Admin.WebApi/appsettings.Development.json b/DOAN.Admin.WebApi/appsettings.Development.json similarity index 95% rename from ZR.Admin.WebApi/appsettings.Development.json rename to DOAN.Admin.WebApi/appsettings.Development.json index 5ed9654..1fc1f23 100644 --- a/ZR.Admin.WebApi/appsettings.Development.json +++ b/DOAN.Admin.WebApi/appsettings.Development.json @@ -35,7 +35,7 @@ "RefreshTokenTime": 5, //分钟 "TokenType": "Bearer" }, - "InjectClass": [ "ZR.Repository", "ZR.Service", "ZR.Tasks", "ZR.ServiceCore" ], //自动注入类 + "InjectClass": [ "DOAN.Repository", "DOAN.Service", "DOAN.Tasks", "DOAN.ServiceCore" ], //自动注入类 "ShowDbLog": true, //是否打印db日志 "InitDb": false, //是否初始化db "DemoMode": false, //是否演示模式 @@ -76,7 +76,7 @@ "autoPre": true, "author": "admin", "tablePrefix": "sys_", //"表前缀（生成类名不会包含表前缀，多个用逗号分隔）", - "vuePath": "", //前端代码存储路径eg：D:\Work\ZRAdmin-Vue3 + "vuePath": "", //前端代码存储路径eg：D:\Work\DOANAdmin-Vue3 "csharpTypeArr": { "string": [ "varchar", "nvarchar", "text", "longtext" ], "int": [ "int", "integer", "smallint", "int4", "int8", "int2" ], @@ -145,7 +145,7 @@ //钉钉应用 "dingding": { "AppKey": "dingadx9vkznmxpz3zkc", - "AppSecret": "2fAF0Ntlkoc-sl8c4gLr-H4XtbhvCSVKrfOGZMuzr2ovwFpw8sqMQaUmSok2CacM", + "AppSecret": "2fAF0Ntlkoc-sl8c4gLr-H4XtbhvCSVKrfOGZMuDOAN2ovwFpw8sqMQaUmSok2CacM", "SystemToken": "J8C66JD12ZZE0XEW9ZVAHDQYT0JG2W6W56LNL9" }, //宜搭表单 diff --git a/ZR.Admin.WebApi/appsettings.Production.json b/DOAN.Admin.WebApi/appsettings.Production.json similarity index 95% rename from ZR.Admin.WebApi/appsettings.Production.json rename to DOAN.Admin.WebApi/appsettings.Production.json index 8c08bad..f79e1cf 100644 --- a/ZR.Admin.WebApi/appsettings.Production.json +++ b/DOAN.Admin.WebApi/appsettings.Production.json @@ -33,7 +33,7 @@ "RefreshTokenTime": 5, //分钟 "TokenType": "Bearer" }, - "InjectClass": [ "ZR.Repository", "ZR.Service", "ZR.Tasks", "ZR.ServiceCore" ], //自动注入类 + "InjectClass": [ "DOAN.Repository", "DOAN.Service", "DOAN.Tasks", "DOAN.ServiceCore" ], //自动注入类 "ShowDbLog": true, //是否打印db日志 "InitDb": false, //是否初始化db "DemoMode": false, //是否演示模式 @@ -74,7 +74,7 @@ "autoPre": true, "author": "admin", "tablePrefix": "sys_", //"表前缀（生成类名不会包含表前缀，多个用逗号分隔）", - "vuePath": "", //前端代码存储路径eg：D:\Work\ZRAdmin-Vue3 + "vuePath": "", //前端代码存储路径eg：D:\Work\DOANAdmin-Vue3 "csharpTypeArr": { "string": [ "varchar", "nvarchar", "text", "longtext" ], "int": [ "int", "integer", "smallint", "int4", "int8", "int2" ], @@ -142,7 +142,7 @@ //钉钉应用 "dingding": { "AppKey": "dingadx9vkznmxpz3zkc", - "AppSecret": "2fAF0Ntlkoc-sl8c4gLr-H4XtbhvCSVKrfOGZMuzr2ovwFpw8sqMQaUmSok2CacM", + "AppSecret": "2fAF0Ntlkoc-sl8c4gLr-H4XtbhvCSVKrfOGZMuDOAN2ovwFpw8sqMQaUmSok2CacM", "SystemToken": "J8C66JD12ZZE0XEW9ZVAHDQYT0JG2W6W56LNL9" }, //宜搭表单 diff --git a/ZR.Admin.WebApi/appsettings.json b/DOAN.Admin.WebApi/appsettings.json similarity index 100% rename from ZR.Admin.WebApi/appsettings.json rename to DOAN.Admin.WebApi/appsettings.json diff --git a/ZR.Admin.WebApi/ip2region.db b/DOAN.Admin.WebApi/ip2region.db similarity index 100% rename from ZR.Admin.WebApi/ip2region.db rename to DOAN.Admin.WebApi/ip2region.db diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/QueryForm.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/QueryForm.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/QueryForm.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/QueryForm.txt diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TableList.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TableList.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TableList.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TableList.txt diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplIService.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplIService.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplIService.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplIService.txt diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplRepository.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplRepository.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplRepository.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplRepository.txt diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/api.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/app/api.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/api.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/app/api.txt diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/sql/MySqlTemplate.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/sql/MySqlTemplate.txt similarity index 99% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/sql/MySqlTemplate.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/sql/MySqlTemplate.txt index 5d1703c..7231ab9 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/sql/MySqlTemplate.txt +++ b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/sql/MySqlTemplate.txt @@ -1,4 +1,4 @@ -use ZrAdmin; +use DOANAdmin; -- 菜单 INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by, create_time) diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/sql/Other.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/sql/Other.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/sql/Other.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/sql/Other.txt diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/sql/PgSql.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/sql/PgSql.txt similarity index 99% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/sql/PgSql.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/sql/PgSql.txt index 696d2f9..6a7b604 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/sql/PgSql.txt +++ b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/sql/PgSql.txt @@ -1,4 +1,4 @@ -use ZrAdmin; +use DOANAdmin; -- ${genTable.functionName}菜单 INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by, create_time) diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/sql/SqlTemplate.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/sql/SqlTemplate.txt similarity index 99% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/sql/SqlTemplate.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/sql/SqlTemplate.txt index 7067db0..50ad341 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/sql/SqlTemplate.txt +++ b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/sql/SqlTemplate.txt @@ -1,4 +1,4 @@ -use ZrAdmin; +use DOANAdmin; -- ${genTable.functionName}菜单 INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by, create_time) diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt rename to DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Admin.WebApi/Controllers/Business/DeviceTaskExecuteResult1Controller.cs b/DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Admin.WebApi/Controllers/Business/DeviceTaskExecuteResult1Controller.cs similarity index 95% rename from ZR.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Admin.WebApi/Controllers/Business/DeviceTaskExecuteResult1Controller.cs rename to DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Admin.WebApi/Controllers/Business/DeviceTaskExecuteResult1Controller.cs index be174a1..2c6aa47 100644 --- a/ZR.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Admin.WebApi/Controllers/Business/DeviceTaskExecuteResult1Controller.cs +++ b/DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Admin.WebApi/Controllers/Business/DeviceTaskExecuteResult1Controller.cs @@ -1,11 +1,11 @@ using Microsoft.AspNetCore.Mvc; -using ZR.Model.Dto; -using ZR.Model.Business; -using ZR.Service.Business.IBusinessService; -using ZR.Admin.WebApi.Filters; +using DOAN.Model.Dto; +using DOAN.Model.Business; +using DOAN.Service.Business.IBusinessService; +using DOAN.Admin.WebApi.Filters; //创建时间：2024-06-11 -namespace ZR.Admin.WebApi.Controllers +namespace DOAN.Admin.WebApi.Controllers { /// /// 巡检/点检任务结果表 diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Model/Dto/Business/DeviceTaskExecuteResult1Dto.cs b/DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Model/Dto/Business/DeviceTaskExecuteResult1Dto.cs similarity index 98% rename from ZR.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Model/Dto/Business/DeviceTaskExecuteResult1Dto.cs rename to DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Model/Dto/Business/DeviceTaskExecuteResult1Dto.cs index f281cf5..187d686 100644 --- a/ZR.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Model/Dto/Business/DeviceTaskExecuteResult1Dto.cs +++ b/DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Model/Dto/Business/DeviceTaskExecuteResult1Dto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ZR.Model.Dto +namespace DOAN.Model.Dto { /// /// 巡检/点检任务结果表查询对象 diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Model/Models/Business/DeviceTaskExecuteResult1.cs b/DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Model/Models/Business/DeviceTaskExecuteResult1.cs similarity index 99% rename from ZR.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Model/Models/Business/DeviceTaskExecuteResult1.cs rename to DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Model/Models/Business/DeviceTaskExecuteResult1.cs index 8900152..c4df608 100644 --- a/ZR.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Model/Models/Business/DeviceTaskExecuteResult1.cs +++ b/DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Model/Models/Business/DeviceTaskExecuteResult1.cs @@ -1,5 +1,5 @@ -namespace ZR.Model.Business +namespace DOAN.Model.Business { /// /// 巡检/点检任务结果表 diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Service/Business/DeviceTaskExecuteResult1Service.cs b/DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Service/Business/DeviceTaskExecuteResult1Service.cs similarity index 94% rename from ZR.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Service/Business/DeviceTaskExecuteResult1Service.cs rename to DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Service/Business/DeviceTaskExecuteResult1Service.cs index 60b84da..5ef9ef8 100644 --- a/ZR.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Service/Business/DeviceTaskExecuteResult1Service.cs +++ b/DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Service/Business/DeviceTaskExecuteResult1Service.cs @@ -2,14 +2,14 @@ using System; using SqlSugar; using Infrastructure.Attribute; using Infrastructure.Extensions; -using ZR.Model; -using ZR.Model.Dto; -using ZR.Model.Business; -using ZR.Repository; -using ZR.Service.Business.IBusinessService; +using DOAN.Model; +using DOAN.Model.Dto; +using DOAN.Model.Business; +using DOAN.Repository; +using DOAN.Service.Business.IBusinessService; using System.Linq; -namespace ZR.Service.Business +namespace DOAN.Service.Business { /// /// 巡检/点检任务结果表Service业务层处理 diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Service/Business/IBusinessService/IDeviceTaskExecuteResult1Service.cs b/DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Service/Business/IBusinessService/IDeviceTaskExecuteResult1Service.cs similarity index 83% rename from ZR.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Service/Business/IBusinessService/IDeviceTaskExecuteResult1Service.cs rename to DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Service/Business/IBusinessService/IDeviceTaskExecuteResult1Service.cs index d7bc6bd..634d9f3 100644 --- a/ZR.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Service/Business/IBusinessService/IDeviceTaskExecuteResult1Service.cs +++ b/DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZR.Service/Business/IBusinessService/IDeviceTaskExecuteResult1Service.cs @@ -1,10 +1,10 @@ using System; -using ZR.Model; -using ZR.Model.Dto; -using ZR.Model.Business; +using DOAN.Model; +using DOAN.Model.Dto; +using DOAN.Model.Business; using System.Collections.Generic; -namespace ZR.Service.Business.IBusinessService +namespace DOAN.Service.Business.IBusinessService { /// /// 巡检/点检任务结果表service接口 diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/20240611/ZRAdmin-vue/src/api/business/devicetaskexecuteresult1.js b/DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZRAdmin-vue/src/api/business/devicetaskexecuteresult1.js similarity index 100% rename from ZR.Admin.WebApi/wwwroot/Generatecode/20240611/ZRAdmin-vue/src/api/business/devicetaskexecuteresult1.js rename to DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZRAdmin-vue/src/api/business/devicetaskexecuteresult1.js diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/20240611/ZRAdmin-vue/src/views/business/DeviceTaskExecuteResult1.vue b/DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZRAdmin-vue/src/views/business/DeviceTaskExecuteResult1.vue similarity index 100% rename from ZR.Admin.WebApi/wwwroot/Generatecode/20240611/ZRAdmin-vue/src/views/business/DeviceTaskExecuteResult1.vue rename to DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/ZRAdmin-vue/src/views/business/DeviceTaskExecuteResult1.vue diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/20240611/sql/DeviceTaskExecuteResult1.sql b/DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/sql/DeviceTaskExecuteResult1.sql similarity index 98% rename from ZR.Admin.WebApi/wwwroot/Generatecode/20240611/sql/DeviceTaskExecuteResult1.sql rename to DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/sql/DeviceTaskExecuteResult1.sql index 79ab403..55ef5f5 100644 --- a/ZR.Admin.WebApi/wwwroot/Generatecode/20240611/sql/DeviceTaskExecuteResult1.sql +++ b/DOAN.Admin.WebApi/wwwroot/Generatecode/20240611/sql/DeviceTaskExecuteResult1.sql @@ -1,4 +1,4 @@ -use ZrAdmin; +use DOANAdmin; diff --git a/ZR.Admin.WebApi/wwwroot/ImportTemplate/lang.xlsx b/DOAN.Admin.WebApi/wwwroot/ImportTemplate/lang.xlsx similarity index 100% rename from ZR.Admin.WebApi/wwwroot/ImportTemplate/lang.xlsx rename to DOAN.Admin.WebApi/wwwroot/ImportTemplate/lang.xlsx diff --git a/ZR.Admin.WebApi/wwwroot/ImportTemplate/user.xlsx b/DOAN.Admin.WebApi/wwwroot/ImportTemplate/user.xlsx similarity index 100% rename from ZR.Admin.WebApi/wwwroot/ImportTemplate/user.xlsx rename to DOAN.Admin.WebApi/wwwroot/ImportTemplate/user.xlsx diff --git a/ZR.Admin.WebApi/wwwroot/data.xlsx b/DOAN.Admin.WebApi/wwwroot/data.xlsx similarity index 100% rename from ZR.Admin.WebApi/wwwroot/data.xlsx rename to DOAN.Admin.WebApi/wwwroot/data.xlsx diff --git a/ZR.Admin.WebApi/wwwroot/device/account/922E7DB8D42FBF55.png b/DOAN.Admin.WebApi/wwwroot/device/account/922E7DB8D42FBF55.png similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/account/922E7DB8D42FBF55.png rename to DOAN.Admin.WebApi/wwwroot/device/account/922E7DB8D42FBF55.png diff --git a/ZR.Admin.WebApi/wwwroot/device/account/F9259CC00753BA0C.png b/DOAN.Admin.WebApi/wwwroot/device/account/F9259CC00753BA0C.png similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/account/F9259CC00753BA0C.png rename to DOAN.Admin.WebApi/wwwroot/device/account/F9259CC00753BA0C.png diff --git a/ZR.Admin.WebApi/wwwroot/device/account/image/304D75DD9D78143B.jpg b/DOAN.Admin.WebApi/wwwroot/device/account/image/304D75DD9D78143B.jpg similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/account/image/304D75DD9D78143B.jpg rename to DOAN.Admin.WebApi/wwwroot/device/account/image/304D75DD9D78143B.jpg diff --git a/ZR.Admin.WebApi/wwwroot/device/account/image/730483BB4F27D736.png b/DOAN.Admin.WebApi/wwwroot/device/account/image/730483BB4F27D736.png similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/account/image/730483BB4F27D736.png rename to DOAN.Admin.WebApi/wwwroot/device/account/image/730483BB4F27D736.png diff --git a/ZR.Admin.WebApi/wwwroot/device/account/image/8C4CB663C1831A5E.png b/DOAN.Admin.WebApi/wwwroot/device/account/image/8C4CB663C1831A5E.png similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/account/image/8C4CB663C1831A5E.png rename to DOAN.Admin.WebApi/wwwroot/device/account/image/8C4CB663C1831A5E.png diff --git a/ZR.Admin.WebApi/wwwroot/device/account/image/B80940D211A74A50.png b/DOAN.Admin.WebApi/wwwroot/device/account/image/B80940D211A74A50.png similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/account/image/B80940D211A74A50.png rename to DOAN.Admin.WebApi/wwwroot/device/account/image/B80940D211A74A50.png diff --git a/ZR.Admin.WebApi/wwwroot/device/account/image/DF506194B85A4482.png b/DOAN.Admin.WebApi/wwwroot/device/account/image/DF506194B85A4482.png similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/account/image/DF506194B85A4482.png rename to DOAN.Admin.WebApi/wwwroot/device/account/image/DF506194B85A4482.png diff --git a/ZR.Admin.WebApi/wwwroot/device/inspect/196B997B26E1281A.png b/DOAN.Admin.WebApi/wwwroot/device/inspect/196B997B26E1281A.png similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/inspect/196B997B26E1281A.png rename to DOAN.Admin.WebApi/wwwroot/device/inspect/196B997B26E1281A.png diff --git a/ZR.Admin.WebApi/wwwroot/device/inspect/2F37290663D4B96E.jpg b/DOAN.Admin.WebApi/wwwroot/device/inspect/2F37290663D4B96E.jpg similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/inspect/2F37290663D4B96E.jpg rename to DOAN.Admin.WebApi/wwwroot/device/inspect/2F37290663D4B96E.jpg diff --git a/ZR.Admin.WebApi/wwwroot/device/inspect/7229789B881E15B9.jpg b/DOAN.Admin.WebApi/wwwroot/device/inspect/7229789B881E15B9.jpg similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/inspect/7229789B881E15B9.jpg rename to DOAN.Admin.WebApi/wwwroot/device/inspect/7229789B881E15B9.jpg diff --git a/ZR.Admin.WebApi/wwwroot/device/inspect/A820D850BBC51AC4.jpg b/DOAN.Admin.WebApi/wwwroot/device/inspect/A820D850BBC51AC4.jpg similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/inspect/A820D850BBC51AC4.jpg rename to DOAN.Admin.WebApi/wwwroot/device/inspect/A820D850BBC51AC4.jpg diff --git a/ZR.Admin.WebApi/wwwroot/device/inspect/AB81EC9BBF505757.jpg b/DOAN.Admin.WebApi/wwwroot/device/inspect/AB81EC9BBF505757.jpg similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/inspect/AB81EC9BBF505757.jpg rename to DOAN.Admin.WebApi/wwwroot/device/inspect/AB81EC9BBF505757.jpg diff --git a/ZR.Admin.WebApi/wwwroot/device/inspect/C72203D8D04E290A.jpg b/DOAN.Admin.WebApi/wwwroot/device/inspect/C72203D8D04E290A.jpg similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/inspect/C72203D8D04E290A.jpg rename to DOAN.Admin.WebApi/wwwroot/device/inspect/C72203D8D04E290A.jpg diff --git a/ZR.Admin.WebApi/wwwroot/device/inspect/E39A355D3449D8D0.jpg b/DOAN.Admin.WebApi/wwwroot/device/inspect/E39A355D3449D8D0.jpg similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/inspect/E39A355D3449D8D0.jpg rename to DOAN.Admin.WebApi/wwwroot/device/inspect/E39A355D3449D8D0.jpg diff --git a/ZR.Admin.WebApi/wwwroot/device/repair/file/FA08B4257BC2F06E.png b/DOAN.Admin.WebApi/wwwroot/device/repair/file/FA08B4257BC2F06E.png similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/repair/file/FA08B4257BC2F06E.png rename to DOAN.Admin.WebApi/wwwroot/device/repair/file/FA08B4257BC2F06E.png diff --git a/ZR.Admin.WebApi/wwwroot/device/task/execute/img/2561097D2300F495.png b/DOAN.Admin.WebApi/wwwroot/device/task/execute/img/2561097D2300F495.png similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/task/execute/img/2561097D2300F495.png rename to DOAN.Admin.WebApi/wwwroot/device/task/execute/img/2561097D2300F495.png diff --git a/ZR.Admin.WebApi/wwwroot/device/task/execute/img/29458E3F539DA4B1.png b/DOAN.Admin.WebApi/wwwroot/device/task/execute/img/29458E3F539DA4B1.png similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/task/execute/img/29458E3F539DA4B1.png rename to DOAN.Admin.WebApi/wwwroot/device/task/execute/img/29458E3F539DA4B1.png diff --git a/ZR.Admin.WebApi/wwwroot/device/task/execute/img/439F87303DE93732.png b/DOAN.Admin.WebApi/wwwroot/device/task/execute/img/439F87303DE93732.png similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/task/execute/img/439F87303DE93732.png rename to DOAN.Admin.WebApi/wwwroot/device/task/execute/img/439F87303DE93732.png diff --git a/ZR.Admin.WebApi/wwwroot/device/task/execute/img/56857FAF59F7AF43.png b/DOAN.Admin.WebApi/wwwroot/device/task/execute/img/56857FAF59F7AF43.png similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/task/execute/img/56857FAF59F7AF43.png rename to DOAN.Admin.WebApi/wwwroot/device/task/execute/img/56857FAF59F7AF43.png diff --git a/ZR.Admin.WebApi/wwwroot/device/task/execute/img/88E20F9434D1C65E.png b/DOAN.Admin.WebApi/wwwroot/device/task/execute/img/88E20F9434D1C65E.png similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/task/execute/img/88E20F9434D1C65E.png rename to DOAN.Admin.WebApi/wwwroot/device/task/execute/img/88E20F9434D1C65E.png diff --git a/ZR.Admin.WebApi/wwwroot/device/task/execute/img/C6D1B373E5DBEFD4.png b/DOAN.Admin.WebApi/wwwroot/device/task/execute/img/C6D1B373E5DBEFD4.png similarity index 100% rename from ZR.Admin.WebApi/wwwroot/device/task/execute/img/C6D1B373E5DBEFD4.png rename to DOAN.Admin.WebApi/wwwroot/device/task/execute/img/C6D1B373E5DBEFD4.png diff --git a/ZR.Admin.WebApi/wwwroot/logo.txt b/DOAN.Admin.WebApi/wwwroot/logo.txt similarity index 100% rename from ZR.Admin.WebApi/wwwroot/logo.txt rename to DOAN.Admin.WebApi/wwwroot/logo.txt diff --git a/ZR.CodeGenerator/CodeGenerateOption.cs b/DOAN.CodeGenerator/CodeGenerateOption.cs similarity index 98% rename from ZR.CodeGenerator/CodeGenerateOption.cs rename to DOAN.CodeGenerator/CodeGenerateOption.cs index ca906e2..74524c0 100644 --- a/ZR.CodeGenerator/CodeGenerateOption.cs +++ b/DOAN.CodeGenerator/CodeGenerateOption.cs @@ -1,4 +1,4 @@ -namespace ZR.CodeGenerator +namespace DOAN.CodeGenerator { public class CodeGenerateOption { diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/DOAN.CodeGenerator/CodeGenerateTemplate.cs similarity index 95% rename from ZR.CodeGenerator/CodeGenerateTemplate.cs rename to DOAN.CodeGenerator/CodeGenerateTemplate.cs index a0cc978..c803f43 100644 --- a/ZR.CodeGenerator/CodeGenerateTemplate.cs +++ b/DOAN.CodeGenerator/CodeGenerateTemplate.cs @@ -1,9 +1,9 @@ using System; using System.Linq; using System.Text; -using ZR.Model.System.Generate; +using DOAN.Model.System.Generate; -namespace ZR.CodeGenerator +namespace DOAN.CodeGenerator { /// /// 代码生成模板 diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/DOAN.CodeGenerator/CodeGeneratorTool.cs similarity index 99% rename from ZR.CodeGenerator/CodeGeneratorTool.cs rename to DOAN.CodeGenerator/CodeGeneratorTool.cs index feb82b7..f6c9d7b 100644 --- a/ZR.CodeGenerator/CodeGeneratorTool.cs +++ b/DOAN.CodeGenerator/CodeGeneratorTool.cs @@ -8,10 +8,10 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using ZR.CodeGenerator.Model; -using ZR.Model.System.Generate; +using DOAN.CodeGenerator.Model; +using DOAN.Model.System.Generate; -namespace ZR.CodeGenerator +namespace DOAN.CodeGenerator { /// /// 代码生成器 @@ -28,7 +28,7 @@ namespace ZR.CodeGenerator public static void Generate(GenerateDto dto) { var genOptions = AppSettings.Get("gen"); - dto.VueParentPath = dto.VueVersion == 3 ? "ZRAdmin-vue" : "ZR.Vue"; + dto.VueParentPath = dto.VueVersion == 3 ? "DOANAdmin-vue" : "DOAN.Vue"; if (!genOptions.VuePath.IsEmpty()) { dto.VueParentPath = genOptions.VuePath; @@ -431,7 +431,7 @@ namespace ZR.CodeGenerator GenTable genTable = new() { DbName = dbName, - BaseNameSpace = "ZR.",//导入默认命名空间前缀 + BaseNameSpace = "DOAN.",//导入默认命名空间前缀 ModuleName = "business",//导入默认模块名 ClassName = GetClassName(tableName), BusinessName = GetClassName(tableName), diff --git a/ZR.CodeGenerator/ZR.CodeGenerator.csproj b/DOAN.CodeGenerator/DOAN.CodeGenerator.csproj similarity index 59% rename from ZR.CodeGenerator/ZR.CodeGenerator.csproj rename to DOAN.CodeGenerator/DOAN.CodeGenerator.csproj index a1d5eac..00538d9 100644 --- a/ZR.CodeGenerator/ZR.CodeGenerator.csproj +++ b/DOAN.CodeGenerator/DOAN.CodeGenerator.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/ZR.CodeGenerator/DbProvider.cs b/DOAN.CodeGenerator/DbProvider.cs similarity index 98% rename from ZR.CodeGenerator/DbProvider.cs rename to DOAN.CodeGenerator/DbProvider.cs index e4a0191..4f6ffe7 100644 --- a/ZR.CodeGenerator/DbProvider.cs +++ b/DOAN.CodeGenerator/DbProvider.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Text.RegularExpressions; -namespace ZR.CodeGenerator +namespace DOAN.CodeGenerator { /// /// 代码生成数据库连接 diff --git a/ZR.CodeGenerator/GenConstants.cs b/DOAN.CodeGenerator/GenConstants.cs similarity index 99% rename from ZR.CodeGenerator/GenConstants.cs rename to DOAN.CodeGenerator/GenConstants.cs index 772cb2c..8f71713 100644 --- a/ZR.CodeGenerator/GenConstants.cs +++ b/DOAN.CodeGenerator/GenConstants.cs @@ -1,6 +1,6 @@  -namespace ZR.CodeGenerator +namespace DOAN.CodeGenerator { /// /// 代码生成常量 diff --git a/ZR.CodeGenerator/Model/GenerateDto.cs b/DOAN.CodeGenerator/Model/GenerateDto.cs similarity index 94% rename from ZR.CodeGenerator/Model/GenerateDto.cs rename to DOAN.CodeGenerator/Model/GenerateDto.cs index db1c48d..eba6052 100644 --- a/ZR.CodeGenerator/Model/GenerateDto.cs +++ b/DOAN.CodeGenerator/Model/GenerateDto.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using ZR.Model.System.Generate; +using DOAN.Model.System.Generate; -namespace ZR.CodeGenerator.Model +namespace DOAN.CodeGenerator.Model { public class GenerateDto { @@ -60,7 +60,7 @@ namespace ZR.CodeGenerator.Model /// /// uniapp存储路径 /// - public string AppVuePath { get; set; } = "ZRAdminn-app"; + public string AppVuePath { get; set; } = "DOANAdminn-app"; #endregion public ReplaceDto ReplaceDto { get; set; } } diff --git a/ZR.CodeGenerator/Model/OracleSeq.cs b/DOAN.CodeGenerator/Model/OracleSeq.cs similarity index 84% rename from ZR.CodeGenerator/Model/OracleSeq.cs rename to DOAN.CodeGenerator/Model/OracleSeq.cs index 6a56a30..138999f 100644 --- a/ZR.CodeGenerator/Model/OracleSeq.cs +++ b/DOAN.CodeGenerator/Model/OracleSeq.cs @@ -1,4 +1,4 @@ -namespace ZR.CodeGenerator.Model +namespace DOAN.CodeGenerator.Model { /// /// Oracle库序列 diff --git a/ZR.CodeGenerator/Model/ReplaceDto.cs b/DOAN.CodeGenerator/Model/ReplaceDto.cs similarity index 98% rename from ZR.CodeGenerator/Model/ReplaceDto.cs rename to DOAN.CodeGenerator/Model/ReplaceDto.cs index 3719e49..27eddae 100644 --- a/ZR.CodeGenerator/Model/ReplaceDto.cs +++ b/DOAN.CodeGenerator/Model/ReplaceDto.cs @@ -1,6 +1,6 @@ using System; -namespace ZR.CodeGenerator.Model +namespace DOAN.CodeGenerator.Model { public class ReplaceDto { diff --git a/ZR.CodeGenerator/Service/CodeGeneraterService.cs b/DOAN.CodeGenerator/Service/CodeGeneraterService.cs similarity index 97% rename from ZR.CodeGenerator/Service/CodeGeneraterService.cs rename to DOAN.CodeGenerator/Service/CodeGeneraterService.cs index 101a18e..f3c4832 100644 --- a/ZR.CodeGenerator/Service/CodeGeneraterService.cs +++ b/DOAN.CodeGenerator/Service/CodeGeneraterService.cs @@ -3,10 +3,10 @@ using Infrastructure.Model; using SqlSugar; using System.Collections.Generic; using System.Linq; -using ZR.CodeGenerator.Model; -using ZR.Model; +using DOAN.CodeGenerator.Model; +using DOAN.Model; -namespace ZR.CodeGenerator.Service +namespace DOAN.CodeGenerator.Service { public class CodeGeneraterService : DbProvider { diff --git a/ZR.Common/AliyunOssHelper.cs b/DOAN.Common/AliyunOssHelper.cs similarity index 99% rename from ZR.Common/AliyunOssHelper.cs rename to DOAN.Common/AliyunOssHelper.cs index b45c87a..2581bb7 100644 --- a/ZR.Common/AliyunOssHelper.cs +++ b/DOAN.Common/AliyunOssHelper.cs @@ -4,7 +4,7 @@ using Infrastructure; using System; using System.IO; -namespace ZR.Common +namespace DOAN.Common { public class AliyunOssHelper { diff --git a/ZR.Common/ZR.Common.csproj b/DOAN.Common/DOAN.Common.csproj similarity index 83% rename from ZR.Common/ZR.Common.csproj rename to DOAN.Common/DOAN.Common.csproj index 6fa6ad9..3d25a9d 100644 --- a/ZR.Common/ZR.Common.csproj +++ b/DOAN.Common/DOAN.Common.csproj @@ -11,6 +11,6 @@ - + diff --git a/ZR.Common/ExcelHelper.cs b/DOAN.Common/ExcelHelper.cs similarity index 99% rename from ZR.Common/ExcelHelper.cs rename to DOAN.Common/ExcelHelper.cs index 309b725..e357094 100644 --- a/ZR.Common/ExcelHelper.cs +++ b/DOAN.Common/ExcelHelper.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using System.Reflection; -namespace ZR.Common +namespace DOAN.Common { public class ExcelHelper where T : new() { diff --git a/ZR.Common/MailHelper.cs b/DOAN.Common/MailHelper.cs similarity index 99% rename from ZR.Common/MailHelper.cs rename to DOAN.Common/MailHelper.cs index a46cf48..5b35ae2 100644 --- a/ZR.Common/MailHelper.cs +++ b/DOAN.Common/MailHelper.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Generic; using System.IO; -namespace ZR.Common +namespace DOAN.Common { public class MailHelper { diff --git a/ZR.Common/Model/WxTokenResult.cs b/DOAN.Common/Model/WxTokenResult.cs similarity index 90% rename from ZR.Common/Model/WxTokenResult.cs rename to DOAN.Common/Model/WxTokenResult.cs index bea1614..d89b109 100644 --- a/ZR.Common/Model/WxTokenResult.cs +++ b/DOAN.Common/Model/WxTokenResult.cs @@ -1,4 +1,4 @@ -namespace ZR.Common.Model +namespace DOAN.Common.Model { public class WxTokenResult { diff --git a/ZR.Common/Tools.cs b/DOAN.Common/Tools.cs similarity index 99% rename from ZR.Common/Tools.cs rename to DOAN.Common/Tools.cs index d95c47f..000b578 100644 --- a/ZR.Common/Tools.cs +++ b/DOAN.Common/Tools.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.Text.RegularExpressions; -namespace ZR.Common +namespace DOAN.Common { public class Tools { diff --git a/ZR.Common/WxHelper.cs b/DOAN.Common/WxHelper.cs similarity index 98% rename from ZR.Common/WxHelper.cs rename to DOAN.Common/WxHelper.cs index 5063c8e..0971f82 100644 --- a/ZR.Common/WxHelper.cs +++ b/DOAN.Common/WxHelper.cs @@ -4,9 +4,9 @@ using Newtonsoft.Json; using System; using System.Security.Cryptography; using System.Text; -using ZR.Common.Model; +using DOAN.Common.Model; -namespace ZR.Common +namespace DOAN.Common { public class WxHelper { diff --git a/ZR.Common/WxNoticeHelper.cs b/DOAN.Common/WxNoticeHelper.cs similarity index 99% rename from ZR.Common/WxNoticeHelper.cs rename to DOAN.Common/WxNoticeHelper.cs index a89ab73..738dfb5 100644 --- a/ZR.Common/WxNoticeHelper.cs +++ b/DOAN.Common/WxNoticeHelper.cs @@ -1,9 +1,9 @@ using Infrastructure; using System.Collections.Generic; using System.Text.Json; -using ZR.Common.Model; +using DOAN.Common.Model; -namespace ZR.Common +namespace DOAN.Common { public class WxNoticeHelper { diff --git a/ZR.Common/YIDAHelper.cs b/DOAN.Common/YIDAHelper.cs similarity index 99% rename from ZR.Common/YIDAHelper.cs rename to DOAN.Common/YIDAHelper.cs index 5c750da..f42777f 100644 --- a/ZR.Common/YIDAHelper.cs +++ b/DOAN.Common/YIDAHelper.cs @@ -11,7 +11,7 @@ using Tea; using Tea.Utils; using static System.Runtime.InteropServices.JavaScript.JSType; -namespace ZR.Common +namespace DOAN.Common { public class YIDAHelper { diff --git a/ZR.Model/ZR.Model.csproj b/DOAN.Model/DOAN.Model.csproj similarity index 100% rename from ZR.Model/ZR.Model.csproj rename to DOAN.Model/DOAN.Model.csproj diff --git a/ZR.Model/GlobalUsing.cs b/DOAN.Model/GlobalUsing.cs similarity index 100% rename from ZR.Model/GlobalUsing.cs rename to DOAN.Model/GlobalUsing.cs diff --git a/ZR.Model/MES/andon/AndonFaultDict.cs b/DOAN.Model/MES/andon/AndonFaultDict.cs similarity index 98% rename from ZR.Model/MES/andon/AndonFaultDict.cs rename to DOAN.Model/MES/andon/AndonFaultDict.cs index 89580d2..49bf379 100644 --- a/ZR.Model/MES/andon/AndonFaultDict.cs +++ b/DOAN.Model/MES/andon/AndonFaultDict.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZR.Model.MES.andon +namespace DOAN.Model.MES.andon { /// /// 故障字典 diff --git a/ZR.Model/MES/andon/AndonFaultRecord.cs b/DOAN.Model/MES/andon/AndonFaultRecord.cs similarity index 98% rename from ZR.Model/MES/andon/AndonFaultRecord.cs rename to DOAN.Model/MES/andon/AndonFaultRecord.cs index 0f2d741..f6bd235 100644 --- a/ZR.Model/MES/andon/AndonFaultRecord.cs +++ b/DOAN.Model/MES/andon/AndonFaultRecord.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZR.Model.MES.andon +namespace DOAN.Model.MES.andon { /// /// 故障记录表 diff --git a/ZR.Model/MES/andon/Dto/AndonAnalysisQueryDto.cs b/DOAN.Model/MES/andon/Dto/AndonAnalysisQueryDto.cs similarity index 97% rename from ZR.Model/MES/andon/Dto/AndonAnalysisQueryDto.cs rename to DOAN.Model/MES/andon/Dto/AndonAnalysisQueryDto.cs index 7fb1298..6da0c95 100644 --- a/ZR.Model/MES/andon/Dto/AndonAnalysisQueryDto.cs +++ b/DOAN.Model/MES/andon/Dto/AndonAnalysisQueryDto.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using static System.Runtime.InteropServices.JavaScript.JSType; -namespace ZR.Model.MES.andon.Dto +namespace DOAN.Model.MES.andon.Dto { public class AndonAnalysisQueryDto { diff --git a/ZR.Model/MES/andon/Dto/AndonFaultDictDto.cs b/DOAN.Model/MES/andon/Dto/AndonFaultDictDto.cs similarity index 96% rename from ZR.Model/MES/andon/Dto/AndonFaultDictDto.cs rename to DOAN.Model/MES/andon/Dto/AndonFaultDictDto.cs index 5df8ebf..65f3c91 100644 --- a/ZR.Model/MES/andon/Dto/AndonFaultDictDto.cs +++ b/DOAN.Model/MES/andon/Dto/AndonFaultDictDto.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZR.Model.MES.andon.Dto +namespace DOAN.Model.MES.andon.Dto { diff --git a/ZR.Model/MES/andon/Dto/AndonFaultRecordDto.cs b/DOAN.Model/MES/andon/Dto/AndonFaultRecordDto.cs similarity index 98% rename from ZR.Model/MES/andon/Dto/AndonFaultRecordDto.cs rename to DOAN.Model/MES/andon/Dto/AndonFaultRecordDto.cs index a3c8271..ebf2f2a 100644 --- a/ZR.Model/MES/andon/Dto/AndonFaultRecordDto.cs +++ b/DOAN.Model/MES/andon/Dto/AndonFaultRecordDto.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZR.Model.Dto +namespace DOAN.Model.Dto { /// /// 安灯询问 diff --git a/ZR.Model/MES/dev/DeviceAccount.cs b/DOAN.Model/MES/dev/DeviceAccount.cs similarity index 98% rename from ZR.Model/MES/dev/DeviceAccount.cs rename to DOAN.Model/MES/dev/DeviceAccount.cs index ecfa2d4..8968617 100644 --- a/ZR.Model/MES/dev/DeviceAccount.cs +++ b/DOAN.Model/MES/dev/DeviceAccount.cs @@ -1,5 +1,5 @@ -namespace ZR.Model.MES.dev +namespace DOAN.Model.MES.dev { /// /// 设备台账 diff --git a/ZR.Model/MES/dev/DeviceFormConfig.cs b/DOAN.Model/MES/dev/DeviceFormConfig.cs similarity index 98% rename from ZR.Model/MES/dev/DeviceFormConfig.cs rename to DOAN.Model/MES/dev/DeviceFormConfig.cs index 9d792d0..533cb1b 100644 --- a/ZR.Model/MES/dev/DeviceFormConfig.cs +++ b/DOAN.Model/MES/dev/DeviceFormConfig.cs @@ -1,4 +1,4 @@ -namespace ZR.Model.MES.dev +namespace DOAN.Model.MES.dev { /// /// 设备检查项表单配置表 diff --git a/ZR.Model/MES/dev/DeviceInspect.cs b/DOAN.Model/MES/dev/DeviceInspect.cs similarity index 98% rename from ZR.Model/MES/dev/DeviceInspect.cs rename to DOAN.Model/MES/dev/DeviceInspect.cs index d678f3d..f3e174b 100644 --- a/ZR.Model/MES/dev/DeviceInspect.cs +++ b/DOAN.Model/MES/dev/DeviceInspect.cs @@ -1,5 +1,5 @@ -namespace ZR.Model.MES.dev +namespace DOAN.Model.MES.dev { /// /// 设备检查项 diff --git a/ZR.Model/MES/dev/DeviceMaintenanceRecord.cs b/DOAN.Model/MES/dev/DeviceMaintenanceRecord.cs similarity index 98% rename from ZR.Model/MES/dev/DeviceMaintenanceRecord.cs rename to DOAN.Model/MES/dev/DeviceMaintenanceRecord.cs index 290a242..9a1bf5c 100644 --- a/ZR.Model/MES/dev/DeviceMaintenanceRecord.cs +++ b/DOAN.Model/MES/dev/DeviceMaintenanceRecord.cs @@ -1,5 +1,5 @@ -namespace ZR.Model.MES.dev +namespace DOAN.Model.MES.dev { /// /// 维修记录 diff --git a/ZR.Model/MES/dev/DevicePointInspectionPlan.cs b/DOAN.Model/MES/dev/DevicePointInspectionPlan.cs similarity index 98% rename from ZR.Model/MES/dev/DevicePointInspectionPlan.cs rename to DOAN.Model/MES/dev/DevicePointInspectionPlan.cs index d592c05..46c3c17 100644 --- a/ZR.Model/MES/dev/DevicePointInspectionPlan.cs +++ b/DOAN.Model/MES/dev/DevicePointInspectionPlan.cs @@ -1,5 +1,5 @@ -namespace ZR.Model.MES.dev +namespace DOAN.Model.MES.dev { /// /// 点检任务 diff --git a/ZR.Model/MES/dev/DeviceRelAccountInspect.cs b/DOAN.Model/MES/dev/DeviceRelAccountInspect.cs similarity index 98% rename from ZR.Model/MES/dev/DeviceRelAccountInspect.cs rename to DOAN.Model/MES/dev/DeviceRelAccountInspect.cs index 7fe3af5..0767284 100644 --- a/ZR.Model/MES/dev/DeviceRelAccountInspect.cs +++ b/DOAN.Model/MES/dev/DeviceRelAccountInspect.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZR.Model.MES.dev +namespace DOAN.Model.MES.dev { /// /// 设备检查项与设备台账关联表 diff --git a/ZR.Model/MES/dev/DeviceRelPpAt.cs b/DOAN.Model/MES/dev/DeviceRelPpAt.cs similarity index 98% rename from ZR.Model/MES/dev/DeviceRelPpAt.cs rename to DOAN.Model/MES/dev/DeviceRelPpAt.cs index 17e151b..a849a4b 100644 --- a/ZR.Model/MES/dev/DeviceRelPpAt.cs +++ b/DOAN.Model/MES/dev/DeviceRelPpAt.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZR.Model.MES.dev +namespace DOAN.Model.MES.dev { /// /// 点检计划与设备关联表 diff --git a/ZR.Model/MES/dev/DeviceRelRpAt.cs b/DOAN.Model/MES/dev/DeviceRelRpAt.cs similarity index 98% rename from ZR.Model/MES/dev/DeviceRelRpAt.cs rename to DOAN.Model/MES/dev/DeviceRelRpAt.cs index 5f60b4d..fe9f851 100644 --- a/ZR.Model/MES/dev/DeviceRelRpAt.cs +++ b/DOAN.Model/MES/dev/DeviceRelRpAt.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZR.Model.MES.dev +namespace DOAN.Model.MES.dev { /// /// 巡检计划与设备关联表 diff --git a/ZR.Model/MES/dev/DeviceRepair.cs b/DOAN.Model/MES/dev/DeviceRepair.cs similarity index 98% rename from ZR.Model/MES/dev/DeviceRepair.cs rename to DOAN.Model/MES/dev/DeviceRepair.cs index c84f7b2..629743a 100644 --- a/ZR.Model/MES/dev/DeviceRepair.cs +++ b/DOAN.Model/MES/dev/DeviceRepair.cs @@ -1,5 +1,5 @@ -namespace ZR.Model.MES.dev +namespace DOAN.Model.MES.dev { /// /// 报修单 diff --git a/ZR.Model/MES/dev/DeviceRouteInspectionPlan.cs b/DOAN.Model/MES/dev/DeviceRouteInspectionPlan.cs similarity index 99% rename from ZR.Model/MES/dev/DeviceRouteInspectionPlan.cs rename to DOAN.Model/MES/dev/DeviceRouteInspectionPlan.cs index e46d4de..18c5fa1 100644 --- a/ZR.Model/MES/dev/DeviceRouteInspectionPlan.cs +++ b/DOAN.Model/MES/dev/DeviceRouteInspectionPlan.cs @@ -1,5 +1,5 @@ -namespace ZR.Model.MES.dev +namespace DOAN.Model.MES.dev { /// /// 巡检计划 diff --git a/ZR.Model/MES/dev/DeviceTaskExecute.cs b/DOAN.Model/MES/dev/DeviceTaskExecute.cs similarity index 98% rename from ZR.Model/MES/dev/DeviceTaskExecute.cs rename to DOAN.Model/MES/dev/DeviceTaskExecute.cs index c3e3250..0b7e2ac 100644 --- a/ZR.Model/MES/dev/DeviceTaskExecute.cs +++ b/DOAN.Model/MES/dev/DeviceTaskExecute.cs @@ -1,5 +1,5 @@ -namespace ZR.Model.MES.dev +namespace DOAN.Model.MES.dev { /// /// 任务执行 diff --git a/ZR.Model/MES/dev/DeviceTaskExecuteResult.cs b/DOAN.Model/MES/dev/DeviceTaskExecuteResult.cs similarity index 99% rename from ZR.Model/MES/dev/DeviceTaskExecuteResult.cs rename to DOAN.Model/MES/dev/DeviceTaskExecuteResult.cs index 3481d8f..d3f07b8 100644 --- a/ZR.Model/MES/dev/DeviceTaskExecuteResult.cs +++ b/DOAN.Model/MES/dev/DeviceTaskExecuteResult.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZR.Model.MES.dev +namespace DOAN.Model.MES.dev { /// /// 巡检/点检任务结果表 diff --git a/ZR.Model/MES/dev/DeviceType.cs b/DOAN.Model/MES/dev/DeviceType.cs similarity index 98% rename from ZR.Model/MES/dev/DeviceType.cs rename to DOAN.Model/MES/dev/DeviceType.cs index e8487e6..6bc0747 100644 --- a/ZR.Model/MES/dev/DeviceType.cs +++ b/DOAN.Model/MES/dev/DeviceType.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZR.Model.MES.dev +namespace DOAN.Model.MES.dev { /// /// 1.设备类型 diff --git a/ZR.Model/MES/dev/Dto/DeviceAccountDto.cs b/DOAN.Model/MES/dev/Dto/DeviceAccountDto.cs similarity index 98% rename from ZR.Model/MES/dev/Dto/DeviceAccountDto.cs rename to DOAN.Model/MES/dev/Dto/DeviceAccountDto.cs index b8ea8d4..1430488 100644 --- a/ZR.Model/MES/dev/Dto/DeviceAccountDto.cs +++ b/DOAN.Model/MES/dev/Dto/DeviceAccountDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ZR.Model.MES.dev.Dto +namespace DOAN.Model.MES.dev.Dto { /// /// 设备台账查询对象 diff --git a/ZR.Model/MES/dev/Dto/DeviceDefaultDto.cs b/DOAN.Model/MES/dev/Dto/DeviceDefaultDto.cs similarity index 97% rename from ZR.Model/MES/dev/Dto/DeviceDefaultDto.cs rename to DOAN.Model/MES/dev/Dto/DeviceDefaultDto.cs index e9d11a5..7e2553f 100644 --- a/ZR.Model/MES/dev/Dto/DeviceDefaultDto.cs +++ b/DOAN.Model/MES/dev/Dto/DeviceDefaultDto.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZR.Model.MES.dev.Dto +namespace DOAN.Model.MES.dev.Dto { public class DeviceDefaultDto { diff --git a/ZR.Model/MES/dev/Dto/DeviceFormConfigDto.cs b/DOAN.Model/MES/dev/Dto/DeviceFormConfigDto.cs similarity index 96% rename from ZR.Model/MES/dev/Dto/DeviceFormConfigDto.cs rename to DOAN.Model/MES/dev/Dto/DeviceFormConfigDto.cs index 5020455..3f4bc93 100644 --- a/ZR.Model/MES/dev/Dto/DeviceFormConfigDto.cs +++ b/DOAN.Model/MES/dev/Dto/DeviceFormConfigDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ZR.Model.MES.dev.Dto +namespace DOAN.Model.MES.dev.Dto { /// diff --git a/ZR.Model/MES/dev/Dto/DeviceInspectDto.cs b/DOAN.Model/MES/dev/Dto/DeviceInspectDto.cs similarity index 97% rename from ZR.Model/MES/dev/Dto/DeviceInspectDto.cs rename to DOAN.Model/MES/dev/Dto/DeviceInspectDto.cs index 74bf974..fd81b1a 100644 --- a/ZR.Model/MES/dev/Dto/DeviceInspectDto.cs +++ b/DOAN.Model/MES/dev/Dto/DeviceInspectDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ZR.Model.MES.dev.Dto +namespace DOAN.Model.MES.dev.Dto { /// diff --git a/ZR.Model/MES/dev/Dto/DeviceMaintenanceRecordDto.cs b/DOAN.Model/MES/dev/Dto/DeviceMaintenanceRecordDto.cs similarity index 96% rename from ZR.Model/MES/dev/Dto/DeviceMaintenanceRecordDto.cs rename to DOAN.Model/MES/dev/Dto/DeviceMaintenanceRecordDto.cs index 18e8f50..5f34f0a 100644 --- a/ZR.Model/MES/dev/Dto/DeviceMaintenanceRecordDto.cs +++ b/DOAN.Model/MES/dev/Dto/DeviceMaintenanceRecordDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ZR.Model.MES.dev.Dto +namespace DOAN.Model.MES.dev.Dto { /// /// 维修记录查询对象 diff --git a/ZR.Model/MES/dev/Dto/DevicePointInspectionPlanDto.cs b/DOAN.Model/MES/dev/Dto/DevicePointInspectionPlanDto.cs similarity index 96% rename from ZR.Model/MES/dev/Dto/DevicePointInspectionPlanDto.cs rename to DOAN.Model/MES/dev/Dto/DevicePointInspectionPlanDto.cs index c22ef0d..23dbebe 100644 --- a/ZR.Model/MES/dev/Dto/DevicePointInspectionPlanDto.cs +++ b/DOAN.Model/MES/dev/Dto/DevicePointInspectionPlanDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ZR.Model.MES.dev.Dto +namespace DOAN.Model.MES.dev.Dto { /// /// 点检任务查询对象 diff --git a/ZR.Model/MES/dev/Dto/DeviceRepairDto.cs b/DOAN.Model/MES/dev/Dto/DeviceRepairDto.cs similarity index 98% rename from ZR.Model/MES/dev/Dto/DeviceRepairDto.cs rename to DOAN.Model/MES/dev/Dto/DeviceRepairDto.cs index 50ff245..8f04500 100644 --- a/ZR.Model/MES/dev/Dto/DeviceRepairDto.cs +++ b/DOAN.Model/MES/dev/Dto/DeviceRepairDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ZR.Model.MES.dev.Dto +namespace DOAN.Model.MES.dev.Dto { /// /// 报修单查询对象 diff --git a/ZR.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs b/DOAN.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs similarity index 97% rename from ZR.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs rename to DOAN.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs index ee60743..bd865d9 100644 --- a/ZR.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs +++ b/DOAN.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ZR.Model.MES.dev.Dto +namespace DOAN.Model.MES.dev.Dto { /// /// 巡检计划查询对象 diff --git a/ZR.Model/MES/dev/Dto/DeviceStatusAnalysisDto.cs b/DOAN.Model/MES/dev/Dto/DeviceStatusAnalysisDto.cs similarity index 98% rename from ZR.Model/MES/dev/Dto/DeviceStatusAnalysisDto.cs rename to DOAN.Model/MES/dev/Dto/DeviceStatusAnalysisDto.cs index a5a5169..5f4b23a 100644 --- a/ZR.Model/MES/dev/Dto/DeviceStatusAnalysisDto.cs +++ b/DOAN.Model/MES/dev/Dto/DeviceStatusAnalysisDto.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZR.Model.MES.dev.Dto +namespace DOAN.Model.MES.dev.Dto { /// /// 设备状态分析 diff --git a/ZR.Model/MES/dev/Dto/DeviceStatusAnalysisResultDto.cs b/DOAN.Model/MES/dev/Dto/DeviceStatusAnalysisResultDto.cs similarity index 99% rename from ZR.Model/MES/dev/Dto/DeviceStatusAnalysisResultDto.cs rename to DOAN.Model/MES/dev/Dto/DeviceStatusAnalysisResultDto.cs index 2263d94..48fd50a 100644 --- a/ZR.Model/MES/dev/Dto/DeviceStatusAnalysisResultDto.cs +++ b/DOAN.Model/MES/dev/Dto/DeviceStatusAnalysisResultDto.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZR.Model.MES.dev.Dto +namespace DOAN.Model.MES.dev.Dto { public class DeviceStatusAnalysisResultDto { diff --git a/ZR.Model/MES/dev/Dto/DeviceTaskExecuteDto.cs b/DOAN.Model/MES/dev/Dto/DeviceTaskExecuteDto.cs similarity index 99% rename from ZR.Model/MES/dev/Dto/DeviceTaskExecuteDto.cs rename to DOAN.Model/MES/dev/Dto/DeviceTaskExecuteDto.cs index 17b8ac8..814ede8 100644 --- a/ZR.Model/MES/dev/Dto/DeviceTaskExecuteDto.cs +++ b/DOAN.Model/MES/dev/Dto/DeviceTaskExecuteDto.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using MiniExcelLibs.Attributes; -namespace ZR.Model.MES.dev.Dto +namespace DOAN.Model.MES.dev.Dto { /// /// 任务执行查询对象 diff --git a/ZR.Model/MES/dev/Dto/DeviceTaskExecuteResultDto.cs b/DOAN.Model/MES/dev/Dto/DeviceTaskExecuteResultDto.cs similarity index 98% rename from ZR.Model/MES/dev/Dto/DeviceTaskExecuteResultDto.cs rename to DOAN.Model/MES/dev/Dto/DeviceTaskExecuteResultDto.cs index b4ad762..265a754 100644 --- a/ZR.Model/MES/dev/Dto/DeviceTaskExecuteResultDto.cs +++ b/DOAN.Model/MES/dev/Dto/DeviceTaskExecuteResultDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ZR.Model.MES.dev.Dto +namespace DOAN.Model.MES.dev.Dto { /// /// 巡检/点检任务结果表查询对象 diff --git a/ZR.Model/MES/dev/Dto/DeviceTypeDto.cs b/DOAN.Model/MES/dev/Dto/DeviceTypeDto.cs similarity index 96% rename from ZR.Model/MES/dev/Dto/DeviceTypeDto.cs rename to DOAN.Model/MES/dev/Dto/DeviceTypeDto.cs index dc31ae6..e63a705 100644 --- a/ZR.Model/MES/dev/Dto/DeviceTypeDto.cs +++ b/DOAN.Model/MES/dev/Dto/DeviceTypeDto.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZR.Model.MES.dev.Dto +namespace DOAN.Model.MES.dev.Dto { /// /// 1.设备类型查询对象 diff --git a/ZR.Model/MES/upload/QcYidaExcel.cs b/DOAN.Model/MES/upload/QcYidaExcel.cs similarity index 99% rename from ZR.Model/MES/upload/QcYidaExcel.cs rename to DOAN.Model/MES/upload/QcYidaExcel.cs index d54014f..d32ca1f 100644 --- a/ZR.Model/MES/upload/QcYidaExcel.cs +++ b/DOAN.Model/MES/upload/QcYidaExcel.cs @@ -8,7 +8,7 @@ using SqlSugar; * @date : 2024-2-1 * @desc : 总装车间 */ -namespace ZR.Model.MES.upload +namespace DOAN.Model.MES.upload { /// /// 总装车间 diff --git a/ZR.Model/MES/upload/QcYidaForm.cs b/DOAN.Model/MES/upload/QcYidaForm.cs similarity index 98% rename from ZR.Model/MES/upload/QcYidaForm.cs rename to DOAN.Model/MES/upload/QcYidaForm.cs index eb6b0da..471af60 100644 --- a/ZR.Model/MES/upload/QcYidaForm.cs +++ b/DOAN.Model/MES/upload/QcYidaForm.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZR.Model.MES.upload +namespace DOAN.Model.MES.upload { public class QcYidaForm { diff --git a/ZR.Model/PagedInfo.cs b/DOAN.Model/PagedInfo.cs similarity index 98% rename from ZR.Model/PagedInfo.cs rename to DOAN.Model/PagedInfo.cs index b483b14..a66d4f2 100644 --- a/ZR.Model/PagedInfo.cs +++ b/DOAN.Model/PagedInfo.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ZR.Model +namespace DOAN.Model { /// /// 分页参数 diff --git a/ZR.Model/PagerInfo.cs b/DOAN.Model/PagerInfo.cs similarity index 97% rename from ZR.Model/PagerInfo.cs rename to DOAN.Model/PagerInfo.cs index fe94b18..9aea033 100644 --- a/ZR.Model/PagerInfo.cs +++ b/DOAN.Model/PagerInfo.cs @@ -1,4 +1,4 @@ -namespace ZR.Model +namespace DOAN.Model { public class PagerInfo { diff --git a/ZR.Model/TreeDto.cs b/DOAN.Model/TreeDto.cs similarity index 95% rename from ZR.Model/TreeDto.cs rename to DOAN.Model/TreeDto.cs index 79be3a6..ca506ff 100644 --- a/ZR.Model/TreeDto.cs +++ b/DOAN.Model/TreeDto.cs @@ -1,4 +1,4 @@ -namespace ZR.Model +namespace DOAN.Model { public class SelectTreeDto diff --git a/ZR.Repository/BaseRepository.cs b/DOAN.Repository/BaseRepository.cs similarity index 99% rename from ZR.Repository/BaseRepository.cs rename to DOAN.Repository/BaseRepository.cs index 01fa179..d15e0d7 100644 --- a/ZR.Repository/BaseRepository.cs +++ b/DOAN.Repository/BaseRepository.cs @@ -7,9 +7,9 @@ using System.Collections.Generic; using System.Data; using System.Linq.Expressions; using System.Reflection; -using ZR.Model; +using DOAN.Model; -namespace ZR.Repository +namespace DOAN.Repository { /// /// 数据仓库类 diff --git a/ZR.Repository/ZR.Repository.csproj b/DOAN.Repository/DOAN.Repository.csproj similarity index 75% rename from ZR.Repository/ZR.Repository.csproj rename to DOAN.Repository/DOAN.Repository.csproj index 4d68117..550979f 100644 --- a/ZR.Repository/ZR.Repository.csproj +++ b/DOAN.Repository/DOAN.Repository.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/ZR.Repository/IBaseRepository.cs b/DOAN.Repository/IBaseRepository.cs similarity index 98% rename from ZR.Repository/IBaseRepository.cs rename to DOAN.Repository/IBaseRepository.cs index 2e44a8e..dc8e83b 100644 --- a/ZR.Repository/IBaseRepository.cs +++ b/DOAN.Repository/IBaseRepository.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; using System.Data; using System.Linq.Expressions; -using ZR.Model; +using DOAN.Model; -namespace ZR.Repository +namespace DOAN.Repository { public interface IBaseRepository : ISimpleClient where T : class, new() { diff --git a/ZR.Service/ZR.Service.csproj b/DOAN.Service/DOAN.Service.csproj similarity index 87% rename from ZR.Service/ZR.Service.csproj rename to DOAN.Service/DOAN.Service.csproj index 4aeb1ae..d4ba27b 100644 --- a/ZR.Service/ZR.Service.csproj +++ b/DOAN.Service/DOAN.Service.csproj @@ -15,7 +15,7 @@ - + diff --git a/ZR.Service/GlobalUsing.cs b/DOAN.Service/GlobalUsing.cs similarity index 100% rename from ZR.Service/GlobalUsing.cs rename to DOAN.Service/GlobalUsing.cs diff --git a/ZR.Service/MES/andon/AndonDataAnalysisServcie.cs b/DOAN.Service/MES/andon/AndonDataAnalysisServcie.cs similarity index 97% rename from ZR.Service/MES/andon/AndonDataAnalysisServcie.cs rename to DOAN.Service/MES/andon/AndonDataAnalysisServcie.cs index 7513a91..92902de 100644 --- a/ZR.Service/MES/andon/AndonDataAnalysisServcie.cs +++ b/DOAN.Service/MES/andon/AndonDataAnalysisServcie.cs @@ -7,17 +7,17 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; -using ZR.Model.Dto; -using ZR.Model; -using ZR.Model.MES.andon; -using ZR.Model.MES.andon.Dto; -using ZR.Model.MES.dev; -using ZR.Repository; -using ZR.Service.MES.andon.IService; +using DOAN.Model.Dto; +using DOAN.Model; +using DOAN.Model.MES.andon; +using DOAN.Model.MES.andon.Dto; +using DOAN.Model.MES.dev; +using DOAN.Repository; +using DOAN.Service.MES.andon.IService; using static System.Runtime.InteropServices.JavaScript.JSType; using System.Security.Claims; -namespace ZR.Service.MES.andon +namespace DOAN.Service.MES.andon { [AppService(ServiceType = typeof(IAndonDataAnalysisServcie), ServiceLifetime = LifeTime.Transient)] public class AndonDataAnalysisServcie : BaseService, IAndonDataAnalysisServcie diff --git a/ZR.Service/MES/andon/AndonFaultRecordService.cs b/DOAN.Service/MES/andon/AndonFaultRecordService.cs similarity index 95% rename from ZR.Service/MES/andon/AndonFaultRecordService.cs rename to DOAN.Service/MES/andon/AndonFaultRecordService.cs index faeef17..8e848d2 100644 --- a/ZR.Service/MES/andon/AndonFaultRecordService.cs +++ b/DOAN.Service/MES/andon/AndonFaultRecordService.cs @@ -2,16 +2,16 @@ using System; using SqlSugar; using Infrastructure.Attribute; using Infrastructure.Extensions; -using ZR.Model; -using ZR.Model.Dto; -using ZR.Model.MES.andon; -using ZR.Model.MES.andon.Dto; -using ZR.Repository; -using ZR.Service.MES.andon.IService; +using DOAN.Model; +using DOAN.Model.Dto; +using DOAN.Model.MES.andon; +using DOAN.Model.MES.andon.Dto; +using DOAN.Repository; +using DOAN.Service.MES.andon.IService; using System.Linq; using Aliyun.OSS; -namespace ZR.Service.MES.andon +namespace DOAN.Service.MES.andon { /// /// 故障记录表Service业务层处理 diff --git a/ZR.Service/MES/andon/AndonInteractionService.cs b/DOAN.Service/MES/andon/AndonInteractionService.cs similarity index 97% rename from ZR.Service/MES/andon/AndonInteractionService.cs rename to DOAN.Service/MES/andon/AndonInteractionService.cs index f9adce9..3283628 100644 --- a/ZR.Service/MES/andon/AndonInteractionService.cs +++ b/DOAN.Service/MES/andon/AndonInteractionService.cs @@ -9,12 +9,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using ZR.Common; -using ZR.Model.Dto; -using ZR.Model.MES.andon; -using ZR.Service.MES.andon.IService; +using DOAN.Common; +using DOAN.Model.Dto; +using DOAN.Model.MES.andon; +using DOAN.Service.MES.andon.IService; -namespace ZR.Service.MES.andon +namespace DOAN.Service.MES.andon { [AppService(ServiceType = typeof(IAndonInteractionService), ServiceLifetime = LifeTime.Transient)] public class AndonInteractionService : BaseService, IAndonInteractionService diff --git a/ZR.Service/MES/andon/IService/IAndonDataAnalysisServcie.cs b/DOAN.Service/MES/andon/IService/IAndonDataAnalysisServcie.cs similarity index 81% rename from ZR.Service/MES/andon/IService/IAndonDataAnalysisServcie.cs rename to DOAN.Service/MES/andon/IService/IAndonDataAnalysisServcie.cs index 7862c58..4b346ac 100644 --- a/ZR.Service/MES/andon/IService/IAndonDataAnalysisServcie.cs +++ b/DOAN.Service/MES/andon/IService/IAndonDataAnalysisServcie.cs @@ -4,12 +4,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using ZR.Model.Dto; -using ZR.Model; -using ZR.Model.MES.andon; -using ZR.Model.MES.andon.Dto; +using DOAN.Model.Dto; +using DOAN.Model; +using DOAN.Model.MES.andon; +using DOAN.Model.MES.andon.Dto; -namespace ZR.Service.MES.andon.IService +namespace DOAN.Service.MES.andon.IService { public interface IAndonDataAnalysisServcie { diff --git a/ZR.Service/MES/andon/IService/IAndonFaultRecordService.cs b/DOAN.Service/MES/andon/IService/IAndonFaultRecordService.cs similarity index 78% rename from ZR.Service/MES/andon/IService/IAndonFaultRecordService.cs rename to DOAN.Service/MES/andon/IService/IAndonFaultRecordService.cs index 70ab77f..0b47dd6 100644 --- a/ZR.Service/MES/andon/IService/IAndonFaultRecordService.cs +++ b/DOAN.Service/MES/andon/IService/IAndonFaultRecordService.cs @@ -1,12 +1,12 @@ using System; -using ZR.Model; -using ZR.Model.Dto; -using ZR.Model.MES.andon; -using ZR.Model.MES.andon.Dto; +using DOAN.Model; +using DOAN.Model.Dto; +using DOAN.Model.MES.andon; +using DOAN.Model.MES.andon.Dto; using System.Collections.Generic; -namespace ZR.Service.MES.andon.IService +namespace DOAN.Service.MES.andon.IService { /// /// 故障记录表service接口 diff --git a/ZR.Service/MES/andon/IService/IAndonInteractionService.cs b/DOAN.Service/MES/andon/IService/IAndonInteractionService.cs similarity index 84% rename from ZR.Service/MES/andon/IService/IAndonInteractionService.cs rename to DOAN.Service/MES/andon/IService/IAndonInteractionService.cs index 2a31497..5b7dc08 100644 --- a/ZR.Service/MES/andon/IService/IAndonInteractionService.cs +++ b/DOAN.Service/MES/andon/IService/IAndonInteractionService.cs @@ -4,10 +4,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using ZR.Model.Dto; -using ZR.Model.MES.andon; +using DOAN.Model.Dto; +using DOAN.Model.MES.andon; -namespace ZR.Service.MES.andon.IService +namespace DOAN.Service.MES.andon.IService { public interface IAndonInteractionService { diff --git a/ZR.Service/MES/dev/DeviceAccountService.cs b/DOAN.Service/MES/dev/DeviceAccountService.cs similarity index 99% rename from ZR.Service/MES/dev/DeviceAccountService.cs rename to DOAN.Service/MES/dev/DeviceAccountService.cs index bce21fa..efc8778 100644 --- a/ZR.Service/MES/dev/DeviceAccountService.cs +++ b/DOAN.Service/MES/dev/DeviceAccountService.cs @@ -2,18 +2,18 @@ using System; using SqlSugar; using Infrastructure.Attribute; using Infrastructure.Extensions; -using ZR.Model; +using DOAN.Model; -using ZR.Repository; +using DOAN.Repository; using System.Linq; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev.Dto; -using ZR.Service.MES.dev.IService; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; +using DOAN.Service.MES.dev.IService; using System.ComponentModel; using System.Diagnostics; -namespace ZR.Service.MES.dev +namespace DOAN.Service.MES.dev { /// /// 设备台账Service业务层处理 diff --git a/ZR.Service/MES/dev/DeviceDataAnalysisService.cs b/DOAN.Service/MES/dev/DeviceDataAnalysisService.cs similarity index 99% rename from ZR.Service/MES/dev/DeviceDataAnalysisService.cs rename to DOAN.Service/MES/dev/DeviceDataAnalysisService.cs index 13920ad..ab7ced0 100644 --- a/ZR.Service/MES/dev/DeviceDataAnalysisService.cs +++ b/DOAN.Service/MES/dev/DeviceDataAnalysisService.cs @@ -6,12 +6,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev.Dto; -using ZR.Model.System; -using ZR.Service.MES.dev.IService; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; +using DOAN.Model.System; +using DOAN.Service.MES.dev.IService; -namespace ZR.Service.MES.dev +namespace DOAN.Service.MES.dev { /// /// 设备数据分析 diff --git a/ZR.Service/MES/dev/DeviceFormConfigService.cs b/DOAN.Service/MES/dev/DeviceFormConfigService.cs similarity index 93% rename from ZR.Service/MES/dev/DeviceFormConfigService.cs rename to DOAN.Service/MES/dev/DeviceFormConfigService.cs index fa45e93..82fa73d 100644 --- a/ZR.Service/MES/dev/DeviceFormConfigService.cs +++ b/DOAN.Service/MES/dev/DeviceFormConfigService.cs @@ -2,17 +2,17 @@ using System; using SqlSugar; using Infrastructure.Attribute; using Infrastructure.Extensions; -using ZR.Model; -using ZR.Model.Dto; +using DOAN.Model; +using DOAN.Model.Dto; -using ZR.Repository; +using DOAN.Repository; using System.Linq; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev.Dto; -using ZR.Service.MES.dev.IService; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; +using DOAN.Service.MES.dev.IService; -namespace ZR.Service.MES.dev +namespace DOAN.Service.MES.dev { /// /// 设备检查项表单配置表Service业务层处理 diff --git a/ZR.Service/MES/dev/DeviceInspectService.cs b/DOAN.Service/MES/dev/DeviceInspectService.cs similarity index 96% rename from ZR.Service/MES/dev/DeviceInspectService.cs rename to DOAN.Service/MES/dev/DeviceInspectService.cs index 5de2768..4b5373c 100644 --- a/ZR.Service/MES/dev/DeviceInspectService.cs +++ b/DOAN.Service/MES/dev/DeviceInspectService.cs @@ -2,19 +2,19 @@ using System; using SqlSugar; using Infrastructure.Attribute; using Infrastructure.Extensions; -using ZR.Model; +using DOAN.Model; -using ZR.Repository; +using DOAN.Repository; using System.Linq; -using ZR.Service.MES.dev.IService; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev.Dto; -using ZR.Service.MES.dev.IService; +using DOAN.Service.MES.dev.IService; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; +using DOAN.Service.MES.dev.IService; -namespace ZR.Service.MES.dev +namespace DOAN.Service.MES.dev { /// /// 设备检查项Service业务层处理 diff --git a/ZR.Service/MES/dev/DeviceMaintenanceRecordService.cs b/DOAN.Service/MES/dev/DeviceMaintenanceRecordService.cs similarity index 94% rename from ZR.Service/MES/dev/DeviceMaintenanceRecordService.cs rename to DOAN.Service/MES/dev/DeviceMaintenanceRecordService.cs index 116b6fd..19a5d4f 100644 --- a/ZR.Service/MES/dev/DeviceMaintenanceRecordService.cs +++ b/DOAN.Service/MES/dev/DeviceMaintenanceRecordService.cs @@ -2,17 +2,17 @@ using System; using SqlSugar; using Infrastructure.Attribute; using Infrastructure.Extensions; -using ZR.Model; -using ZR.Repository; +using DOAN.Model; +using DOAN.Repository; using System.Linq; using Aliyun.OSS; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev.Dto; -using ZR.Service.MES.dev.IService; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; +using DOAN.Service.MES.dev.IService; -namespace ZR.Service.MES.dev +namespace DOAN.Service.MES.dev { /// /// 维修记录Service业务层处理 diff --git a/ZR.Service/MES/dev/DevicePointInspectionPlanService.cs b/DOAN.Service/MES/dev/DevicePointInspectionPlanService.cs similarity index 94% rename from ZR.Service/MES/dev/DevicePointInspectionPlanService.cs rename to DOAN.Service/MES/dev/DevicePointInspectionPlanService.cs index 7466137..fa09e2c 100644 --- a/ZR.Service/MES/dev/DevicePointInspectionPlanService.cs +++ b/DOAN.Service/MES/dev/DevicePointInspectionPlanService.cs @@ -2,16 +2,16 @@ using System; using SqlSugar; using Infrastructure.Attribute; using Infrastructure.Extensions; -using ZR.Model; -using ZR.Repository; +using DOAN.Model; +using DOAN.Repository; using System.Linq; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev.Dto; -using ZR.Service.MES.dev.IService; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; +using DOAN.Service.MES.dev.IService; using System.Xml.Linq; -namespace ZR.Service.MES.dev +namespace DOAN.Service.MES.dev { /// /// 点检任务Service业务层处理 diff --git a/ZR.Service/MES/dev/DeviceRepairService.cs b/DOAN.Service/MES/dev/DeviceRepairService.cs similarity index 96% rename from ZR.Service/MES/dev/DeviceRepairService.cs rename to DOAN.Service/MES/dev/DeviceRepairService.cs index 68a4d7d..c5d5cde 100644 --- a/ZR.Service/MES/dev/DeviceRepairService.cs +++ b/DOAN.Service/MES/dev/DeviceRepairService.cs @@ -2,15 +2,15 @@ using System; using SqlSugar; using Infrastructure.Attribute; using Infrastructure.Extensions; -using ZR.Model; -using ZR.Repository; +using DOAN.Model; +using DOAN.Repository; using System.Linq; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev.Dto; -using ZR.Service.MES.dev.IService; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; +using DOAN.Service.MES.dev.IService; -namespace ZR.Service.MES.dev +namespace DOAN.Service.MES.dev { /// /// 报修单Service业务层处理 diff --git a/ZR.Service/MES/dev/DeviceRouteInspectionPlanService.cs b/DOAN.Service/MES/dev/DeviceRouteInspectionPlanService.cs similarity index 96% rename from ZR.Service/MES/dev/DeviceRouteInspectionPlanService.cs rename to DOAN.Service/MES/dev/DeviceRouteInspectionPlanService.cs index 54a7f9d..a549407 100644 --- a/ZR.Service/MES/dev/DeviceRouteInspectionPlanService.cs +++ b/DOAN.Service/MES/dev/DeviceRouteInspectionPlanService.cs @@ -2,16 +2,16 @@ using System; using SqlSugar; using Infrastructure.Attribute; using Infrastructure.Extensions; -using ZR.Model; -using ZR.Repository; +using DOAN.Model; +using DOAN.Repository; using System.Linq; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev.Dto; -using ZR.Service.MES.dev.IService; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; +using DOAN.Service.MES.dev.IService; using static System.Runtime.InteropServices.JavaScript.JSType; -namespace ZR.Service.MES.dev +namespace DOAN.Service.MES.dev { /// /// 巡检计划Service业务层处理 diff --git a/ZR.Service/MES/dev/DeviceTaskExecuteResultService.cs b/DOAN.Service/MES/dev/DeviceTaskExecuteResultService.cs similarity index 95% rename from ZR.Service/MES/dev/DeviceTaskExecuteResultService.cs rename to DOAN.Service/MES/dev/DeviceTaskExecuteResultService.cs index 60af968..7893f70 100644 --- a/ZR.Service/MES/dev/DeviceTaskExecuteResultService.cs +++ b/DOAN.Service/MES/dev/DeviceTaskExecuteResultService.cs @@ -2,17 +2,17 @@ using System; using SqlSugar; using Infrastructure.Attribute; using Infrastructure.Extensions; -using ZR.Model; +using DOAN.Model; -using ZR.Model.MES.dev.Dto; -using ZR.Model.MES.dev; -using ZR.Service.MES.dev.IService; -using ZR.Repository; +using DOAN.Model.MES.dev.Dto; +using DOAN.Model.MES.dev; +using DOAN.Service.MES.dev.IService; +using DOAN.Repository; using System.Linq; using static System.Runtime.InteropServices.JavaScript.JSType; -namespace ZR.Service.MES.dev +namespace DOAN.Service.MES.dev { /// /// 巡检/点检任务结果表Service业务层处理 diff --git a/ZR.Service/MES/dev/DeviceTaskExecuteService.cs b/DOAN.Service/MES/dev/DeviceTaskExecuteService.cs similarity index 99% rename from ZR.Service/MES/dev/DeviceTaskExecuteService.cs rename to DOAN.Service/MES/dev/DeviceTaskExecuteService.cs index ed50cf2..7acd59f 100644 --- a/ZR.Service/MES/dev/DeviceTaskExecuteService.cs +++ b/DOAN.Service/MES/dev/DeviceTaskExecuteService.cs @@ -2,23 +2,23 @@ using System; using SqlSugar; using Infrastructure.Attribute; using Infrastructure.Extensions; -using ZR.Model; +using DOAN.Model; -using ZR.Repository; +using DOAN.Repository; using System.Linq; using JinianNet.JNTemplate; using Microsoft.AspNetCore.Authentication; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev.Dto; -using ZR.Service.MES.dev.IService; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; +using DOAN.Service.MES.dev.IService; using Newtonsoft.Json.Linq; using JinianNet.JNTemplate.Nodes; using Mapster; -namespace ZR.Service.MES.dev +namespace DOAN.Service.MES.dev { /// /// 任务执行Service业务层处理 diff --git a/ZR.Service/MES/dev/DeviceTypeService.cs b/DOAN.Service/MES/dev/DeviceTypeService.cs similarity index 91% rename from ZR.Service/MES/dev/DeviceTypeService.cs rename to DOAN.Service/MES/dev/DeviceTypeService.cs index 11db466..2e009a8 100644 --- a/ZR.Service/MES/dev/DeviceTypeService.cs +++ b/DOAN.Service/MES/dev/DeviceTypeService.cs @@ -2,18 +2,18 @@ using SqlSugar; using Infrastructure.Attribute; using Infrastructure.Extensions; -using ZR.Model; -using ZR.Model.Dto; -using ZR.Repository; +using DOAN.Model; +using DOAN.Model.Dto; +using DOAN.Repository; using System.Linq; -using ZR.Service.MES.dev.IService; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev.Dto; +using DOAN.Service.MES.dev.IService; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; using Mapster; using System.Xml.Linq; -using ZR.Model.System.Vo; +using DOAN.Model.System.Vo; -namespace ZR.Service.MES.dev +namespace DOAN.Service.MES.dev { /// /// 1.设备类型Service业务层处理 diff --git a/ZR.Service/MES/dev/IService/IDeviceAccountService.cs b/DOAN.Service/MES/dev/IService/IDeviceAccountService.cs similarity index 89% rename from ZR.Service/MES/dev/IService/IDeviceAccountService.cs rename to DOAN.Service/MES/dev/IService/IDeviceAccountService.cs index 6d94bca..51eaa54 100644 --- a/ZR.Service/MES/dev/IService/IDeviceAccountService.cs +++ b/DOAN.Service/MES/dev/IService/IDeviceAccountService.cs @@ -1,12 +1,12 @@ using System; -using ZR.Model; -using ZR.Model.Dto; +using DOAN.Model; +using DOAN.Model.Dto; using System.Collections.Generic; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev.Dto; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; using Aliyun.OSS; -namespace ZR.Service.MES.dev.IService +namespace DOAN.Service.MES.dev.IService { /// /// 设备台账service接口 diff --git a/ZR.Service/MES/dev/IService/IDeviceDataAnalysisServcie.cs b/DOAN.Service/MES/dev/IService/IDeviceDataAnalysisServcie.cs similarity index 92% rename from ZR.Service/MES/dev/IService/IDeviceDataAnalysisServcie.cs rename to DOAN.Service/MES/dev/IService/IDeviceDataAnalysisServcie.cs index b4549db..36fb237 100644 --- a/ZR.Service/MES/dev/IService/IDeviceDataAnalysisServcie.cs +++ b/DOAN.Service/MES/dev/IService/IDeviceDataAnalysisServcie.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using ZR.Model.MES.dev.Dto; +using DOAN.Model.MES.dev.Dto; -namespace ZR.Service.MES.dev.IService +namespace DOAN.Service.MES.dev.IService { /// /// 设备数据分析 diff --git a/ZR.Service/MES/dev/IService/IDeviceFormConfigService.cs b/DOAN.Service/MES/dev/IService/IDeviceFormConfigService.cs similarity index 81% rename from ZR.Service/MES/dev/IService/IDeviceFormConfigService.cs rename to DOAN.Service/MES/dev/IService/IDeviceFormConfigService.cs index b8e94fb..f664a7f 100644 --- a/ZR.Service/MES/dev/IService/IDeviceFormConfigService.cs +++ b/DOAN.Service/MES/dev/IService/IDeviceFormConfigService.cs @@ -1,10 +1,10 @@ using System; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev.Dto; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; using System.Collections.Generic; -using ZR.Model; +using DOAN.Model; -namespace ZR.Service.MES.dev.IService +namespace DOAN.Service.MES.dev.IService { /// /// 设备检查项表单配置表service接口 diff --git a/ZR.Service/MES/dev/IService/IDeviceInspectService.cs b/DOAN.Service/MES/dev/IService/IDeviceInspectService.cs similarity index 86% rename from ZR.Service/MES/dev/IService/IDeviceInspectService.cs rename to DOAN.Service/MES/dev/IService/IDeviceInspectService.cs index e04f3fe..f582fb4 100644 --- a/ZR.Service/MES/dev/IService/IDeviceInspectService.cs +++ b/DOAN.Service/MES/dev/IService/IDeviceInspectService.cs @@ -1,12 +1,12 @@ using System; -using ZR.Model; +using DOAN.Model; using System.Collections.Generic; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev.Dto; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; using Microsoft.AspNetCore.Mvc; -namespace ZR.Service.MES.dev.IService +namespace DOAN.Service.MES.dev.IService { /// /// 设备检查项service接口 diff --git a/ZR.Service/MES/dev/IService/IDeviceMaintenanceRecordService.cs b/DOAN.Service/MES/dev/IService/IDeviceMaintenanceRecordService.cs similarity index 82% rename from ZR.Service/MES/dev/IService/IDeviceMaintenanceRecordService.cs rename to DOAN.Service/MES/dev/IService/IDeviceMaintenanceRecordService.cs index 13c4350..cb21621 100644 --- a/ZR.Service/MES/dev/IService/IDeviceMaintenanceRecordService.cs +++ b/DOAN.Service/MES/dev/IService/IDeviceMaintenanceRecordService.cs @@ -1,10 +1,10 @@ using System; -using ZR.Model; +using DOAN.Model; using System.Collections.Generic; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev.Dto; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; -namespace ZR.Service.MES.dev.IService +namespace DOAN.Service.MES.dev.IService { /// /// 维修记录service接口 diff --git a/ZR.Service/MES/dev/IService/IDevicePointInspectionPlanService.cs b/DOAN.Service/MES/dev/IService/IDevicePointInspectionPlanService.cs similarity index 83% rename from ZR.Service/MES/dev/IService/IDevicePointInspectionPlanService.cs rename to DOAN.Service/MES/dev/IService/IDevicePointInspectionPlanService.cs index 5e446b6..a49b956 100644 --- a/ZR.Service/MES/dev/IService/IDevicePointInspectionPlanService.cs +++ b/DOAN.Service/MES/dev/IService/IDevicePointInspectionPlanService.cs @@ -1,10 +1,10 @@ using System; -using ZR.Model; +using DOAN.Model; using System.Collections.Generic; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev.Dto; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; -namespace ZR.Service.MES.dev.IService +namespace DOAN.Service.MES.dev.IService { /// /// 点检任务service接口 diff --git a/ZR.Service/MES/dev/IService/IDeviceRepairService.cs b/DOAN.Service/MES/dev/IService/IDeviceRepairService.cs similarity index 78% rename from ZR.Service/MES/dev/IService/IDeviceRepairService.cs rename to DOAN.Service/MES/dev/IService/IDeviceRepairService.cs index 7cb9bd7..054f088 100644 --- a/ZR.Service/MES/dev/IService/IDeviceRepairService.cs +++ b/DOAN.Service/MES/dev/IService/IDeviceRepairService.cs @@ -1,10 +1,10 @@ using System; -using ZR.Model; +using DOAN.Model; using System.Collections.Generic; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev.Dto; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; -namespace ZR.Service.MES.dev.IService +namespace DOAN.Service.MES.dev.IService { /// /// 报修单service接口 diff --git a/ZR.Service/MES/dev/IService/IDeviceRouteInspectionPlanService.cs b/DOAN.Service/MES/dev/IService/IDeviceRouteInspectionPlanService.cs similarity index 83% rename from ZR.Service/MES/dev/IService/IDeviceRouteInspectionPlanService.cs rename to DOAN.Service/MES/dev/IService/IDeviceRouteInspectionPlanService.cs index 4e94512..46fb4ce 100644 --- a/ZR.Service/MES/dev/IService/IDeviceRouteInspectionPlanService.cs +++ b/DOAN.Service/MES/dev/IService/IDeviceRouteInspectionPlanService.cs @@ -1,10 +1,10 @@ using System; -using ZR.Model; +using DOAN.Model; using System.Collections.Generic; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev.Dto; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; -namespace ZR.Service.MES.dev.IService +namespace DOAN.Service.MES.dev.IService { /// /// 巡检计划service接口 diff --git a/ZR.Service/MES/dev/IService/IDeviceTaskExecuteResultService.cs b/DOAN.Service/MES/dev/IService/IDeviceTaskExecuteResultService.cs similarity index 80% rename from ZR.Service/MES/dev/IService/IDeviceTaskExecuteResultService.cs rename to DOAN.Service/MES/dev/IService/IDeviceTaskExecuteResultService.cs index 16f1849..0114323 100644 --- a/ZR.Service/MES/dev/IService/IDeviceTaskExecuteResultService.cs +++ b/DOAN.Service/MES/dev/IService/IDeviceTaskExecuteResultService.cs @@ -1,11 +1,11 @@ using System; -using ZR.Model; -using ZR.Model.Dto; -using ZR.Model.MES.dev.Dto; -using ZR.Model.MES.dev; +using DOAN.Model; +using DOAN.Model.Dto; +using DOAN.Model.MES.dev.Dto; +using DOAN.Model.MES.dev; using System.Collections.Generic; -namespace ZR.Service.MES.dev.IService +namespace DOAN.Service.MES.dev.IService { /// /// 巡检/点检任务结果表service接口 diff --git a/ZR.Service/MES/dev/IService/IDeviceTaskExecuteService.cs b/DOAN.Service/MES/dev/IService/IDeviceTaskExecuteService.cs similarity index 91% rename from ZR.Service/MES/dev/IService/IDeviceTaskExecuteService.cs rename to DOAN.Service/MES/dev/IService/IDeviceTaskExecuteService.cs index 58e1589..067eef2 100644 --- a/ZR.Service/MES/dev/IService/IDeviceTaskExecuteService.cs +++ b/DOAN.Service/MES/dev/IService/IDeviceTaskExecuteService.cs @@ -1,12 +1,12 @@ using System; -using ZR.Model; +using DOAN.Model; using System.Collections.Generic; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev.Dto; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; using Microsoft.AspNetCore.Mvc; -namespace ZR.Service.MES.dev.IService +namespace DOAN.Service.MES.dev.IService { /// /// 任务执行service接口 diff --git a/ZR.Service/MES/dev/IService/IDeviceTypeService.cs b/DOAN.Service/MES/dev/IService/IDeviceTypeService.cs similarity index 75% rename from ZR.Service/MES/dev/IService/IDeviceTypeService.cs rename to DOAN.Service/MES/dev/IService/IDeviceTypeService.cs index 7545491..75db0ea 100644 --- a/ZR.Service/MES/dev/IService/IDeviceTypeService.cs +++ b/DOAN.Service/MES/dev/IService/IDeviceTypeService.cs @@ -1,12 +1,12 @@ using System; -using ZR.Model; -using ZR.Model.Dto; +using DOAN.Model; +using DOAN.Model.Dto; using System.Collections.Generic; -using ZR.Model.MES.dev.Dto; -using ZR.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; +using DOAN.Model.MES.dev; -namespace ZR.Service.MES.dev.IService +namespace DOAN.Service.MES.dev.IService { /// /// 1.设备类型service接口 diff --git a/ZR.Service/MES/qu/upload/IUploadServive.cs b/DOAN.Service/MES/qu/upload/IUploadServive.cs similarity index 81% rename from ZR.Service/MES/qu/upload/IUploadServive.cs rename to DOAN.Service/MES/qu/upload/IUploadServive.cs index 2203161..b3a121e 100644 --- a/ZR.Service/MES/qu/upload/IUploadServive.cs +++ b/DOAN.Service/MES/qu/upload/IUploadServive.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using ZR.Model.MES.upload; -using ZR.Model; +using DOAN.Model.MES.upload; +using DOAN.Model; -namespace ZR.Service.quality.upload +namespace DOAN.Service.quality.upload { public interface IUploadServive { diff --git a/ZR.Service/MES/qu/upload/service/UploadService.cs b/DOAN.Service/MES/qu/upload/service/UploadService.cs similarity index 98% rename from ZR.Service/MES/qu/upload/service/UploadService.cs rename to DOAN.Service/MES/qu/upload/service/UploadService.cs index 53f0d7d..c2afda4 100644 --- a/ZR.Service/MES/qu/upload/service/UploadService.cs +++ b/DOAN.Service/MES/qu/upload/service/UploadService.cs @@ -10,11 +10,11 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Tea; -using ZR.Model; -using ZR.Model.MES.upload; -using ZR.Model.System; -using ZR.Repository; -using ZR.Service.System.IService; +using DOAN.Model; +using DOAN.Model.MES.upload; +using DOAN.Model.System; +using DOAN.Repository; +using DOAN.Service.System.IService; using Tea; using AlibabaCloud.SDK.Dingtalkoauth2_1_0.Models; using JinianNet.JNTemplate.Nodes; @@ -23,7 +23,7 @@ using AlibabaCloud.SDK.Dingtalkyida_1_0.Models; using NLog; using Microsoft.AspNetCore.Http.HttpResults; -namespace ZR.Service.quality.upload.service +namespace DOAN.Service.quality.upload.service { [AppService(ServiceType = typeof(IUploadServive), ServiceLifetime = LifeTime.Transient)] diff --git a/ZR.ServiceCore/BaseService.cs b/DOAN.ServiceCore/BaseService.cs similarity index 80% rename from ZR.ServiceCore/BaseService.cs rename to DOAN.ServiceCore/BaseService.cs index 94a06b4..cf6c86d 100644 --- a/ZR.ServiceCore/BaseService.cs +++ b/DOAN.ServiceCore/BaseService.cs @@ -1,6 +1,6 @@ -using ZR.Repository; +using DOAN.Repository; -namespace ZR.Service +namespace DOAN.Service { /// /// 基础服务定义 diff --git a/ZR.ServiceCore/ZR.ServiceCore.csproj b/DOAN.ServiceCore/DOAN.ServiceCore.csproj similarity index 75% rename from ZR.ServiceCore/ZR.ServiceCore.csproj rename to DOAN.ServiceCore/DOAN.ServiceCore.csproj index f0da37f..f41913c 100644 --- a/ZR.ServiceCore/ZR.ServiceCore.csproj +++ b/DOAN.ServiceCore/DOAN.ServiceCore.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/ZR.ServiceCore/Filters/ActionPermissionFilter.cs b/DOAN.ServiceCore/Filters/ActionPermissionFilter.cs similarity index 96% rename from ZR.ServiceCore/Filters/ActionPermissionFilter.cs rename to DOAN.ServiceCore/Filters/ActionPermissionFilter.cs index b6cec49..2841312 100644 --- a/ZR.ServiceCore/Filters/ActionPermissionFilter.cs +++ b/DOAN.ServiceCore/Filters/ActionPermissionFilter.cs @@ -2,11 +2,11 @@ using Infrastructure.Model; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using ZR.Model.System; -using ZR.Service.System; -using ZR.Service.System.IService; +using DOAN.Model.System; +using DOAN.Service.System; +using DOAN.Service.System.IService; -namespace ZR.ServiceCore.Middleware +namespace DOAN.ServiceCore.Middleware { /// /// API授权判断 diff --git a/ZR.ServiceCore/Filters/GlobalActionMonitor.cs b/DOAN.ServiceCore/Filters/GlobalActionMonitor.cs similarity index 98% rename from ZR.ServiceCore/Filters/GlobalActionMonitor.cs rename to DOAN.ServiceCore/Filters/GlobalActionMonitor.cs index 7047899..f771ce3 100644 --- a/ZR.ServiceCore/Filters/GlobalActionMonitor.cs +++ b/DOAN.ServiceCore/Filters/GlobalActionMonitor.cs @@ -7,10 +7,10 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; using NLog; -using ZR.Model.System; -using ZR.Service.System.IService; +using DOAN.Model.System; +using DOAN.Service.System.IService; -namespace ZR.ServiceCore.Middleware +namespace DOAN.ServiceCore.Middleware { public class GlobalActionMonitor : ActionFilterAttribute { diff --git a/ZR.ServiceCore/Filters/VerifyAttribute.cs b/DOAN.ServiceCore/Filters/VerifyAttribute.cs similarity index 98% rename from ZR.ServiceCore/Filters/VerifyAttribute.cs rename to DOAN.ServiceCore/Filters/VerifyAttribute.cs index 87948d4..70a0caa 100644 --- a/ZR.ServiceCore/Filters/VerifyAttribute.cs +++ b/DOAN.ServiceCore/Filters/VerifyAttribute.cs @@ -4,10 +4,10 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; -using ZR.Common; +using DOAN.Common; //本命名空间暂时先不改，改动比较大2023年9月2日 -namespace ZR.Admin.WebApi.Filters +namespace DOAN.Admin.WebApi.Filters { /// /// 授权校验访问 diff --git a/ZR.ServiceCore/GlobalUsing.cs b/DOAN.ServiceCore/GlobalUsing.cs similarity index 100% rename from ZR.ServiceCore/GlobalUsing.cs rename to DOAN.ServiceCore/GlobalUsing.cs diff --git a/ZR.ServiceCore/IBaseService.cs b/DOAN.ServiceCore/IBaseService.cs similarity index 80% rename from ZR.ServiceCore/IBaseService.cs rename to DOAN.ServiceCore/IBaseService.cs index 3bd68d1..c7d09c6 100644 --- a/ZR.ServiceCore/IBaseService.cs +++ b/DOAN.ServiceCore/IBaseService.cs @@ -1,6 +1,6 @@ -using ZR.Repository; +using DOAN.Repository; -namespace ZR.Service +namespace DOAN.Service { /// /// 基础服务定义 diff --git a/ZR.ServiceCore/Middleware/GlobalExceptionMiddleware.cs b/DOAN.ServiceCore/Middleware/GlobalExceptionMiddleware.cs similarity index 97% rename from ZR.ServiceCore/Middleware/GlobalExceptionMiddleware.cs rename to DOAN.ServiceCore/Middleware/GlobalExceptionMiddleware.cs index d32804d..14f6e65 100644 --- a/ZR.ServiceCore/Middleware/GlobalExceptionMiddleware.cs +++ b/DOAN.ServiceCore/Middleware/GlobalExceptionMiddleware.cs @@ -6,12 +6,12 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using NLog; using System.Text.Encodings.Web; -using ZR.Common; -using ZR.Model.System; -using ZR.Service.System.IService; +using DOAN.Common; +using DOAN.Model.System; +using DOAN.Service.System.IService; using textJson = System.Text.Json; -namespace ZR.ServiceCore.Middleware +namespace DOAN.ServiceCore.Middleware { /// /// 全局异常处理中间件 diff --git a/ZR.ServiceCore/Model/Article.cs b/DOAN.ServiceCore/Model/Article.cs similarity index 99% rename from ZR.ServiceCore/Model/Article.cs rename to DOAN.ServiceCore/Model/Article.cs index 7cb60f2..ab474c2 100644 --- a/ZR.ServiceCore/Model/Article.cs +++ b/DOAN.ServiceCore/Model/Article.cs @@ -1,4 +1,4 @@ -namespace ZR.Model.System +namespace DOAN.Model.System { /// /// 文章表 diff --git a/ZR.ServiceCore/Model/ArticleCategory.cs b/DOAN.ServiceCore/Model/ArticleCategory.cs similarity index 97% rename from ZR.ServiceCore/Model/ArticleCategory.cs rename to DOAN.ServiceCore/Model/ArticleCategory.cs index 934b257..b3a9b32 100644 --- a/ZR.ServiceCore/Model/ArticleCategory.cs +++ b/DOAN.ServiceCore/Model/ArticleCategory.cs @@ -3,7 +3,7 @@ using SqlSugar; using System; using System.Collections.Generic; -namespace ZR.Model.System +namespace DOAN.Model.System { /// /// 文章目录 diff --git a/ZR.ServiceCore/Model/CommonLang.cs b/DOAN.ServiceCore/Model/CommonLang.cs similarity index 98% rename from ZR.ServiceCore/Model/CommonLang.cs rename to DOAN.ServiceCore/Model/CommonLang.cs index 883e46e..33b979d 100644 --- a/ZR.ServiceCore/Model/CommonLang.cs +++ b/DOAN.ServiceCore/Model/CommonLang.cs @@ -3,7 +3,7 @@ using SqlSugar; using System; using System.ComponentModel; -namespace ZR.Model.Models +namespace DOAN.Model.Models { /// /// 多语言配置，数据实体对象 diff --git a/ZR.ServiceCore/Model/Dto/ArticleCategoryDto.cs b/DOAN.ServiceCore/Model/Dto/ArticleCategoryDto.cs similarity index 96% rename from ZR.ServiceCore/Model/Dto/ArticleCategoryDto.cs rename to DOAN.ServiceCore/Model/Dto/ArticleCategoryDto.cs index c109a19..f59d61f 100644 --- a/ZR.ServiceCore/Model/Dto/ArticleCategoryDto.cs +++ b/DOAN.ServiceCore/Model/Dto/ArticleCategoryDto.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace ZR.Model.Dto +namespace DOAN.Model.Dto { /// /// 文章目录输入对象 diff --git a/ZR.ServiceCore/Model/Dto/ArticleDto.cs b/DOAN.ServiceCore/Model/Dto/ArticleDto.cs similarity index 97% rename from ZR.ServiceCore/Model/Dto/ArticleDto.cs rename to DOAN.ServiceCore/Model/Dto/ArticleDto.cs index fd60a89..b978c3a 100644 --- a/ZR.ServiceCore/Model/Dto/ArticleDto.cs +++ b/DOAN.ServiceCore/Model/Dto/ArticleDto.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { public class ArticleQueryDto : PagerInfo { diff --git a/ZR.ServiceCore/Model/Dto/ChatMessageDto.cs b/DOAN.ServiceCore/Model/Dto/ChatMessageDto.cs similarity index 95% rename from ZR.ServiceCore/Model/Dto/ChatMessageDto.cs rename to DOAN.ServiceCore/Model/Dto/ChatMessageDto.cs index 2614b55..8ebaa10 100644 --- a/ZR.ServiceCore/Model/Dto/ChatMessageDto.cs +++ b/DOAN.ServiceCore/Model/Dto/ChatMessageDto.cs @@ -1,4 +1,4 @@ -namespace ZR.ServiceCore.Model.Dto +namespace DOAN.ServiceCore.Model.Dto { public class ChatMessageDto { diff --git a/ZR.ServiceCore/Model/Dto/CommonLangDto.cs b/DOAN.ServiceCore/Model/Dto/CommonLangDto.cs similarity index 97% rename from ZR.ServiceCore/Model/Dto/CommonLangDto.cs rename to DOAN.ServiceCore/Model/Dto/CommonLangDto.cs index 1e70d80..689b737 100644 --- a/ZR.ServiceCore/Model/Dto/CommonLangDto.cs +++ b/DOAN.ServiceCore/Model/Dto/CommonLangDto.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ZR.Model.Dto +namespace DOAN.Model.Dto { /// /// 多语言配置输入对象 diff --git a/ZR.ServiceCore/Model/Dto/GenTableDto.cs b/DOAN.ServiceCore/Model/Dto/GenTableDto.cs similarity index 97% rename from ZR.ServiceCore/Model/Dto/GenTableDto.cs rename to DOAN.ServiceCore/Model/Dto/GenTableDto.cs index ca73d06..9bc0c37 100644 --- a/ZR.ServiceCore/Model/Dto/GenTableDto.cs +++ b/DOAN.ServiceCore/Model/Dto/GenTableDto.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using ZR.Model.System.Generate; +using DOAN.Model.System.Generate; -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { public class GenTableDto { diff --git a/ZR.ServiceCore/Model/Dto/LockUserDto.cs b/DOAN.ServiceCore/Model/Dto/LockUserDto.cs similarity index 88% rename from ZR.ServiceCore/Model/Dto/LockUserDto.cs rename to DOAN.ServiceCore/Model/Dto/LockUserDto.cs index 868f260..758815e 100644 --- a/ZR.ServiceCore/Model/Dto/LockUserDto.cs +++ b/DOAN.ServiceCore/Model/Dto/LockUserDto.cs @@ -1,4 +1,4 @@ -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { public class LockUserDto { diff --git a/ZR.ServiceCore/Model/Dto/LoginBodyDto.cs b/DOAN.ServiceCore/Model/Dto/LoginBodyDto.cs similarity index 95% rename from ZR.ServiceCore/Model/Dto/LoginBodyDto.cs rename to DOAN.ServiceCore/Model/Dto/LoginBodyDto.cs index ba408a4..9b8f4da 100644 --- a/ZR.ServiceCore/Model/Dto/LoginBodyDto.cs +++ b/DOAN.ServiceCore/Model/Dto/LoginBodyDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { public class LoginBodyDto { diff --git a/ZR.ServiceCore/Model/Dto/MenuDto.cs b/DOAN.ServiceCore/Model/Dto/MenuDto.cs similarity index 98% rename from ZR.ServiceCore/Model/Dto/MenuDto.cs rename to DOAN.ServiceCore/Model/Dto/MenuDto.cs index 32ffaed..4b9ca90 100644 --- a/ZR.ServiceCore/Model/Dto/MenuDto.cs +++ b/DOAN.ServiceCore/Model/Dto/MenuDto.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { public class MenuDto { diff --git a/ZR.ServiceCore/Model/Dto/RegisterDto.cs b/DOAN.ServiceCore/Model/Dto/RegisterDto.cs similarity index 96% rename from ZR.ServiceCore/Model/Dto/RegisterDto.cs rename to DOAN.ServiceCore/Model/Dto/RegisterDto.cs index b2da1bd..7cc5445 100644 --- a/ZR.ServiceCore/Model/Dto/RegisterDto.cs +++ b/DOAN.ServiceCore/Model/Dto/RegisterDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { public class RegisterDto { diff --git a/ZR.ServiceCore/Model/Dto/RoleMenuExportDto.cs b/DOAN.ServiceCore/Model/Dto/RoleMenuExportDto.cs similarity index 93% rename from ZR.ServiceCore/Model/Dto/RoleMenuExportDto.cs rename to DOAN.ServiceCore/Model/Dto/RoleMenuExportDto.cs index b2e83ea..fc56dec 100644 --- a/ZR.ServiceCore/Model/Dto/RoleMenuExportDto.cs +++ b/DOAN.ServiceCore/Model/Dto/RoleMenuExportDto.cs @@ -1,8 +1,8 @@ using MiniExcelLibs.Attributes; using SqlSugar.DbConvert; -using ZR.Model.System.Enums; +using DOAN.Model.System.Enums; -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { public class RoleMenuExportDto { diff --git a/ZR.ServiceCore/Model/Dto/RoleUserDto.cs b/DOAN.ServiceCore/Model/Dto/RoleUserDto.cs similarity index 95% rename from ZR.ServiceCore/Model/Dto/RoleUserDto.cs rename to DOAN.ServiceCore/Model/Dto/RoleUserDto.cs index a336289..3d2efe5 100644 --- a/ZR.ServiceCore/Model/Dto/RoleUserDto.cs +++ b/DOAN.ServiceCore/Model/Dto/RoleUserDto.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { public class RoleUserQueryDto : PagerInfo { diff --git a/ZR.ServiceCore/Model/Dto/ScanDto.cs b/DOAN.ServiceCore/Model/Dto/ScanDto.cs similarity index 82% rename from ZR.ServiceCore/Model/Dto/ScanDto.cs rename to DOAN.ServiceCore/Model/Dto/ScanDto.cs index 063108e..ba088ca 100644 --- a/ZR.ServiceCore/Model/Dto/ScanDto.cs +++ b/DOAN.ServiceCore/Model/Dto/ScanDto.cs @@ -1,4 +1,4 @@ -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { public class ScanDto { diff --git a/ZR.ServiceCore/Model/Dto/SqlDiffLogDto.cs b/DOAN.ServiceCore/Model/Dto/SqlDiffLogDto.cs similarity index 98% rename from ZR.ServiceCore/Model/Dto/SqlDiffLogDto.cs rename to DOAN.ServiceCore/Model/Dto/SqlDiffLogDto.cs index 6eb8df6..67cd24a 100644 --- a/ZR.ServiceCore/Model/Dto/SqlDiffLogDto.cs +++ b/DOAN.ServiceCore/Model/Dto/SqlDiffLogDto.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using MiniExcelLibs.Attributes; -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { /// /// 数据差异日志查询对象 diff --git a/ZR.ServiceCore/Model/Dto/SysConfigDto.cs b/DOAN.ServiceCore/Model/Dto/SysConfigDto.cs similarity index 96% rename from ZR.ServiceCore/Model/Dto/SysConfigDto.cs rename to DOAN.ServiceCore/Model/Dto/SysConfigDto.cs index 8a57b53..7108647 100644 --- a/ZR.ServiceCore/Model/Dto/SysConfigDto.cs +++ b/DOAN.ServiceCore/Model/Dto/SysConfigDto.cs @@ -1,6 +1,6 @@ using System; -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { /// /// 参数配置输入对象模型 diff --git a/ZR.ServiceCore/Model/Dto/SysDeptDto.cs b/DOAN.ServiceCore/Model/Dto/SysDeptDto.cs similarity index 95% rename from ZR.ServiceCore/Model/Dto/SysDeptDto.cs rename to DOAN.ServiceCore/Model/Dto/SysDeptDto.cs index ee76ddf..d1bc363 100644 --- a/ZR.ServiceCore/Model/Dto/SysDeptDto.cs +++ b/DOAN.ServiceCore/Model/Dto/SysDeptDto.cs @@ -1,4 +1,4 @@ -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { public class SysDeptQueryDto : PagerInfo { diff --git a/ZR.ServiceCore/Model/Dto/SysDictTypeDto.cs b/DOAN.ServiceCore/Model/Dto/SysDictTypeDto.cs similarity index 96% rename from ZR.ServiceCore/Model/Dto/SysDictTypeDto.cs rename to DOAN.ServiceCore/Model/Dto/SysDictTypeDto.cs index 4a39430..c3f082b 100644 --- a/ZR.ServiceCore/Model/Dto/SysDictTypeDto.cs +++ b/DOAN.ServiceCore/Model/Dto/SysDictTypeDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { public class SysDictTypeDto { diff --git a/ZR.ServiceCore/Model/Dto/SysFileQueryDto.cs b/DOAN.ServiceCore/Model/Dto/SysFileQueryDto.cs similarity index 98% rename from ZR.ServiceCore/Model/Dto/SysFileQueryDto.cs rename to DOAN.ServiceCore/Model/Dto/SysFileQueryDto.cs index 40e4f95..a4dad95 100644 --- a/ZR.ServiceCore/Model/Dto/SysFileQueryDto.cs +++ b/DOAN.ServiceCore/Model/Dto/SysFileQueryDto.cs @@ -1,6 +1,6 @@ using System; -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { /// /// 文件存储输入对象 diff --git a/ZR.ServiceCore/Model/Dto/SysLogininfoDto.cs b/DOAN.ServiceCore/Model/Dto/SysLogininfoDto.cs similarity index 92% rename from ZR.ServiceCore/Model/Dto/SysLogininfoDto.cs rename to DOAN.ServiceCore/Model/Dto/SysLogininfoDto.cs index 54d4a18..9d938d4 100644 --- a/ZR.ServiceCore/Model/Dto/SysLogininfoDto.cs +++ b/DOAN.ServiceCore/Model/Dto/SysLogininfoDto.cs @@ -1,4 +1,4 @@ -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { public class SysLogininfoDto : SysBase { diff --git a/ZR.ServiceCore/Model/Dto/SysNoticeDto.cs b/DOAN.ServiceCore/Model/Dto/SysNoticeDto.cs similarity index 95% rename from ZR.ServiceCore/Model/Dto/SysNoticeDto.cs rename to DOAN.ServiceCore/Model/Dto/SysNoticeDto.cs index e770064..4ca80be 100644 --- a/ZR.ServiceCore/Model/Dto/SysNoticeDto.cs +++ b/DOAN.ServiceCore/Model/Dto/SysNoticeDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { /// /// 通知公告表输入对象 diff --git a/ZR.ServiceCore/Model/Dto/SysOperLogDto.cs b/DOAN.ServiceCore/Model/Dto/SysOperLogDto.cs similarity index 98% rename from ZR.ServiceCore/Model/Dto/SysOperLogDto.cs rename to DOAN.ServiceCore/Model/Dto/SysOperLogDto.cs index 36c6937..d721bec 100644 --- a/ZR.ServiceCore/Model/Dto/SysOperLogDto.cs +++ b/DOAN.ServiceCore/Model/Dto/SysOperLogDto.cs @@ -1,6 +1,6 @@ using System; -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { public class SysOperLogQueryDto : PagerInfo { diff --git a/ZR.ServiceCore/Model/Dto/SysRoleDto.cs b/DOAN.ServiceCore/Model/Dto/SysRoleDto.cs similarity index 96% rename from ZR.ServiceCore/Model/Dto/SysRoleDto.cs rename to DOAN.ServiceCore/Model/Dto/SysRoleDto.cs index 8ad6866..9e24cb0 100644 --- a/ZR.ServiceCore/Model/Dto/SysRoleDto.cs +++ b/DOAN.ServiceCore/Model/Dto/SysRoleDto.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { public class SysRoleDto : SysBase { diff --git a/ZR.ServiceCore/Model/Dto/SysRoleMenuDto.cs b/DOAN.ServiceCore/Model/Dto/SysRoleMenuDto.cs similarity index 93% rename from ZR.ServiceCore/Model/Dto/SysRoleMenuDto.cs rename to DOAN.ServiceCore/Model/Dto/SysRoleMenuDto.cs index fd801f1..94739c3 100644 --- a/ZR.ServiceCore/Model/Dto/SysRoleMenuDto.cs +++ b/DOAN.ServiceCore/Model/Dto/SysRoleMenuDto.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { public class SysRoleMenuDto { diff --git a/ZR.ServiceCore/Model/Dto/SysUserDto.cs b/DOAN.ServiceCore/Model/Dto/SysUserDto.cs similarity index 97% rename from ZR.ServiceCore/Model/Dto/SysUserDto.cs rename to DOAN.ServiceCore/Model/Dto/SysUserDto.cs index 9d07520..d9d8d23 100644 --- a/ZR.ServiceCore/Model/Dto/SysUserDto.cs +++ b/DOAN.ServiceCore/Model/Dto/SysUserDto.cs @@ -1,6 +1,6 @@ using System; -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { public class SysUserDto { diff --git a/ZR.ServiceCore/Model/Dto/SysdictDataDto.cs b/DOAN.ServiceCore/Model/Dto/SysdictDataDto.cs similarity index 87% rename from ZR.ServiceCore/Model/Dto/SysdictDataDto.cs rename to DOAN.ServiceCore/Model/Dto/SysdictDataDto.cs index 471a3f8..8d2928d 100644 --- a/ZR.ServiceCore/Model/Dto/SysdictDataDto.cs +++ b/DOAN.ServiceCore/Model/Dto/SysdictDataDto.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { public class SysdictDataDto { diff --git a/ZR.ServiceCore/Model/Dto/TasksDto.cs b/DOAN.ServiceCore/Model/Dto/TasksDto.cs similarity index 98% rename from ZR.ServiceCore/Model/Dto/TasksDto.cs rename to DOAN.ServiceCore/Model/Dto/TasksDto.cs index 6da320b..19349d1 100644 --- a/ZR.ServiceCore/Model/Dto/TasksDto.cs +++ b/DOAN.ServiceCore/Model/Dto/TasksDto.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { public class TasksQueryDto : PagerInfo { diff --git a/ZR.ServiceCore/Model/Dto/TasksLogDto.cs b/DOAN.ServiceCore/Model/Dto/TasksLogDto.cs similarity index 93% rename from ZR.ServiceCore/Model/Dto/TasksLogDto.cs rename to DOAN.ServiceCore/Model/Dto/TasksLogDto.cs index 2567dc7..17f2b2b 100644 --- a/ZR.ServiceCore/Model/Dto/TasksLogDto.cs +++ b/DOAN.ServiceCore/Model/Dto/TasksLogDto.cs @@ -1,6 +1,6 @@ using System; -namespace ZR.Model.System.Dto +namespace DOAN.Model.System.Dto { public class TasksLogQueryDto { diff --git a/ZR.ServiceCore/Model/Enums/MenuStatus.cs b/DOAN.ServiceCore/Model/Enums/MenuStatus.cs similarity index 88% rename from ZR.ServiceCore/Model/Enums/MenuStatus.cs rename to DOAN.ServiceCore/Model/Enums/MenuStatus.cs index b648ca1..143af2b 100644 --- a/ZR.ServiceCore/Model/Enums/MenuStatus.cs +++ b/DOAN.ServiceCore/Model/Enums/MenuStatus.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace ZR.Model.System.Enums +namespace DOAN.Model.System.Enums { /// /// 菜单状态（0正常 1停用） diff --git a/ZR.ServiceCore/Model/Enums/MenuType.cs b/DOAN.ServiceCore/Model/Enums/MenuType.cs similarity index 90% rename from ZR.ServiceCore/Model/Enums/MenuType.cs rename to DOAN.ServiceCore/Model/Enums/MenuType.cs index 4325223..37087f8 100644 --- a/ZR.ServiceCore/Model/Enums/MenuType.cs +++ b/DOAN.ServiceCore/Model/Enums/MenuType.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace ZR.Model.System.Enums +namespace DOAN.Model.System.Enums { /// /// M目录 C菜单 F按钮 L链接 diff --git a/ZR.ServiceCore/Model/Generate/GenTable.cs b/DOAN.ServiceCore/Model/Generate/GenTable.cs similarity index 99% rename from ZR.ServiceCore/Model/Generate/GenTable.cs rename to DOAN.ServiceCore/Model/Generate/GenTable.cs index 6e3199e..5814575 100644 --- a/ZR.ServiceCore/Model/Generate/GenTable.cs +++ b/DOAN.ServiceCore/Model/Generate/GenTable.cs @@ -1,7 +1,7 @@ using SqlSugar; using System.Collections.Generic; -namespace ZR.Model.System.Generate +namespace DOAN.Model.System.Generate { /// /// 代码生成表 diff --git a/ZR.ServiceCore/Model/Generate/GenTableColumn.cs b/DOAN.ServiceCore/Model/Generate/GenTableColumn.cs similarity index 99% rename from ZR.ServiceCore/Model/Generate/GenTableColumn.cs rename to DOAN.ServiceCore/Model/Generate/GenTableColumn.cs index 917fc78..be01ebe 100644 --- a/ZR.ServiceCore/Model/Generate/GenTableColumn.cs +++ b/DOAN.ServiceCore/Model/Generate/GenTableColumn.cs @@ -2,7 +2,7 @@ using System; using System.Linq; -namespace ZR.Model.System.Generate +namespace DOAN.Model.System.Generate { /// /// 代码生成表字段 diff --git a/ZR.ServiceCore/Model/SqlDiffLog.cs b/DOAN.ServiceCore/Model/SqlDiffLog.cs similarity index 98% rename from ZR.ServiceCore/Model/SqlDiffLog.cs rename to DOAN.ServiceCore/Model/SqlDiffLog.cs index 0b64277..d23d5ad 100644 --- a/ZR.ServiceCore/Model/SqlDiffLog.cs +++ b/DOAN.ServiceCore/Model/SqlDiffLog.cs @@ -1,4 +1,4 @@ -namespace ZR.Model.System +namespace DOAN.Model.System { [SugarTable("SqlDiffLog", "数据差异日志")] [Tenant("0")] diff --git a/ZR.ServiceCore/Model/SysBase.cs b/DOAN.ServiceCore/Model/SysBase.cs similarity index 98% rename from ZR.ServiceCore/Model/SysBase.cs rename to DOAN.ServiceCore/Model/SysBase.cs index b46ce8e..4f3a96c 100644 --- a/ZR.ServiceCore/Model/SysBase.cs +++ b/DOAN.ServiceCore/Model/SysBase.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json; using SqlSugar; using System; -namespace ZR.Model.System +namespace DOAN.Model.System { //[EpplusTable(PrintHeaders = true, AutofitColumns = true, AutoCalculate = true, ShowTotal = true)] public class SysBase diff --git a/ZR.ServiceCore/Model/SysConfig.cs b/DOAN.ServiceCore/Model/SysConfig.cs similarity index 97% rename from ZR.ServiceCore/Model/SysConfig.cs rename to DOAN.ServiceCore/Model/SysConfig.cs index 764cf52..a88c9eb 100644 --- a/ZR.ServiceCore/Model/SysConfig.cs +++ b/DOAN.ServiceCore/Model/SysConfig.cs @@ -1,6 +1,6 @@ using SqlSugar; -namespace ZR.Model.System +namespace DOAN.Model.System { /// /// 参数配置，数据实体对象 diff --git a/ZR.ServiceCore/Model/SysDept.cs b/DOAN.ServiceCore/Model/SysDept.cs similarity index 98% rename from ZR.ServiceCore/Model/SysDept.cs rename to DOAN.ServiceCore/Model/SysDept.cs index 1817f13..3174d00 100644 --- a/ZR.ServiceCore/Model/SysDept.cs +++ b/DOAN.ServiceCore/Model/SysDept.cs @@ -1,4 +1,4 @@ -namespace ZR.Model.System +namespace DOAN.Model.System { /// /// 部门表 diff --git a/ZR.ServiceCore/Model/SysDictData.cs b/DOAN.ServiceCore/Model/SysDictData.cs similarity index 98% rename from ZR.ServiceCore/Model/SysDictData.cs rename to DOAN.ServiceCore/Model/SysDictData.cs index 915b3ca..524d304 100644 --- a/ZR.ServiceCore/Model/SysDictData.cs +++ b/DOAN.ServiceCore/Model/SysDictData.cs @@ -1,6 +1,6 @@ using SqlSugar; -namespace ZR.Model.System +namespace DOAN.Model.System { /// /// 字典数据表 diff --git a/ZR.ServiceCore/Model/SysDictType.cs b/DOAN.ServiceCore/Model/SysDictType.cs similarity index 97% rename from ZR.ServiceCore/Model/SysDictType.cs rename to DOAN.ServiceCore/Model/SysDictType.cs index c323a63..ac93352 100644 --- a/ZR.ServiceCore/Model/SysDictType.cs +++ b/DOAN.ServiceCore/Model/SysDictType.cs @@ -1,6 +1,6 @@ using SqlSugar; -namespace ZR.Model.System +namespace DOAN.Model.System { /// /// 字典类型表 diff --git a/ZR.ServiceCore/Model/SysFile.cs b/DOAN.ServiceCore/Model/SysFile.cs similarity index 98% rename from ZR.ServiceCore/Model/SysFile.cs rename to DOAN.ServiceCore/Model/SysFile.cs index cc8eb1d..86d4342 100644 --- a/ZR.ServiceCore/Model/SysFile.cs +++ b/DOAN.ServiceCore/Model/SysFile.cs @@ -2,7 +2,7 @@ using SqlSugar; using System; -namespace ZR.Model.System +namespace DOAN.Model.System { [Tenant("0")] [SugarTable("sys_file", "文件存储表")] diff --git a/ZR.ServiceCore/Model/SysLogininfor.cs b/DOAN.ServiceCore/Model/SysLogininfor.cs similarity index 98% rename from ZR.ServiceCore/Model/SysLogininfor.cs rename to DOAN.ServiceCore/Model/SysLogininfor.cs index 79b979c..c4dd390 100644 --- a/ZR.ServiceCore/Model/SysLogininfor.cs +++ b/DOAN.ServiceCore/Model/SysLogininfor.cs @@ -1,7 +1,7 @@ using SqlSugar; using System; -namespace ZR.Model.System +namespace DOAN.Model.System { /// /// sys_logininfor 表 diff --git a/ZR.ServiceCore/Model/SysMenu.cs b/DOAN.ServiceCore/Model/SysMenu.cs similarity index 99% rename from ZR.ServiceCore/Model/SysMenu.cs rename to DOAN.ServiceCore/Model/SysMenu.cs index 59f590f..6aa4235 100644 --- a/ZR.ServiceCore/Model/SysMenu.cs +++ b/DOAN.ServiceCore/Model/SysMenu.cs @@ -1,7 +1,7 @@ using SqlSugar; using System.Collections.Generic; -namespace ZR.Model.System +namespace DOAN.Model.System { /// /// Sys_menu表 diff --git a/ZR.ServiceCore/Model/SysNotice.cs b/DOAN.ServiceCore/Model/SysNotice.cs similarity index 96% rename from ZR.ServiceCore/Model/SysNotice.cs rename to DOAN.ServiceCore/Model/SysNotice.cs index ff00e34..4915814 100644 --- a/ZR.ServiceCore/Model/SysNotice.cs +++ b/DOAN.ServiceCore/Model/SysNotice.cs @@ -1,11 +1,11 @@ using SqlSugar; -namespace ZR.Model.System +namespace DOAN.Model.System { /// /// 通知公告表 /// - /// @author zr + /// @author DOAN /// @date 2021-12-15 /// [SugarTable("sys_notice", "通知公告表")] diff --git a/ZR.ServiceCore/Model/SysOperLog.cs b/DOAN.ServiceCore/Model/SysOperLog.cs similarity index 99% rename from ZR.ServiceCore/Model/SysOperLog.cs rename to DOAN.ServiceCore/Model/SysOperLog.cs index 3eed289..5e4cef9 100644 --- a/ZR.ServiceCore/Model/SysOperLog.cs +++ b/DOAN.ServiceCore/Model/SysOperLog.cs @@ -3,7 +3,7 @@ using SqlSugar; using System; using System.ComponentModel; -namespace ZR.Model.System +namespace DOAN.Model.System { [SugarTable("sys_oper_log", "操作日志表")] [Tenant("0")] diff --git a/ZR.ServiceCore/Model/SysPost.cs b/DOAN.ServiceCore/Model/SysPost.cs similarity index 96% rename from ZR.ServiceCore/Model/SysPost.cs rename to DOAN.ServiceCore/Model/SysPost.cs index 26edfcf..5a4a8a2 100644 --- a/ZR.ServiceCore/Model/SysPost.cs +++ b/DOAN.ServiceCore/Model/SysPost.cs @@ -1,6 +1,6 @@ using SqlSugar; -namespace ZR.Model.System +namespace DOAN.Model.System { [SugarTable("sys_post", "岗位表")] [Tenant("0")] diff --git a/ZR.ServiceCore/Model/SysRole.cs b/DOAN.ServiceCore/Model/SysRole.cs similarity index 98% rename from ZR.ServiceCore/Model/SysRole.cs rename to DOAN.ServiceCore/Model/SysRole.cs index 3f48946..939610f 100644 --- a/ZR.ServiceCore/Model/SysRole.cs +++ b/DOAN.ServiceCore/Model/SysRole.cs @@ -1,6 +1,6 @@ using SqlSugar; -namespace ZR.Model.System +namespace DOAN.Model.System { /// /// 角色表 sys_role diff --git a/ZR.ServiceCore/Model/SysRoleDept.cs b/DOAN.ServiceCore/Model/SysRoleDept.cs similarity index 93% rename from ZR.ServiceCore/Model/SysRoleDept.cs rename to DOAN.ServiceCore/Model/SysRoleDept.cs index 168d048..1891db4 100644 --- a/ZR.ServiceCore/Model/SysRoleDept.cs +++ b/DOAN.ServiceCore/Model/SysRoleDept.cs @@ -1,6 +1,6 @@ using SqlSugar; -namespace ZR.Model.System +namespace DOAN.Model.System { [SugarTable("sys_role_dept", "角色部门")] [Tenant(0)] diff --git a/ZR.ServiceCore/Model/SysRoleMenu.cs b/DOAN.ServiceCore/Model/SysRoleMenu.cs similarity index 95% rename from ZR.ServiceCore/Model/SysRoleMenu.cs rename to DOAN.ServiceCore/Model/SysRoleMenu.cs index 9a037a4..30785f7 100644 --- a/ZR.ServiceCore/Model/SysRoleMenu.cs +++ b/DOAN.ServiceCore/Model/SysRoleMenu.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using SqlSugar; -namespace ZR.Model.System +namespace DOAN.Model.System { /// /// 角色菜单 diff --git a/ZR.ServiceCore/Model/SysTasks.cs b/DOAN.ServiceCore/Model/SysTasks.cs similarity index 99% rename from ZR.ServiceCore/Model/SysTasks.cs rename to DOAN.ServiceCore/Model/SysTasks.cs index b1a413c..322faa5 100644 --- a/ZR.ServiceCore/Model/SysTasks.cs +++ b/DOAN.ServiceCore/Model/SysTasks.cs @@ -2,7 +2,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace ZR.Model.System +namespace DOAN.Model.System { /// ///计划任务 diff --git a/ZR.ServiceCore/Model/SysTasksLog.cs b/DOAN.ServiceCore/Model/SysTasksLog.cs similarity index 98% rename from ZR.ServiceCore/Model/SysTasksLog.cs rename to DOAN.ServiceCore/Model/SysTasksLog.cs index 88fbcfc..10a6bf3 100644 --- a/ZR.ServiceCore/Model/SysTasksLog.cs +++ b/DOAN.ServiceCore/Model/SysTasksLog.cs @@ -1,7 +1,7 @@ using SqlSugar; using System; -namespace ZR.Model.System +namespace DOAN.Model.System { /// /// 任务日志 diff --git a/ZR.ServiceCore/Model/SysUser.cs b/DOAN.ServiceCore/Model/SysUser.cs similarity index 99% rename from ZR.ServiceCore/Model/SysUser.cs rename to DOAN.ServiceCore/Model/SysUser.cs index d82652f..0fe91a3 100644 --- a/ZR.ServiceCore/Model/SysUser.cs +++ b/DOAN.ServiceCore/Model/SysUser.cs @@ -1,6 +1,6 @@ using MiniExcelLibs.Attributes; -namespace ZR.Model.System +namespace DOAN.Model.System { /// /// 用户表 diff --git a/ZR.ServiceCore/Model/SysUserPost.cs b/DOAN.ServiceCore/Model/SysUserPost.cs similarity index 94% rename from ZR.ServiceCore/Model/SysUserPost.cs rename to DOAN.ServiceCore/Model/SysUserPost.cs index 7eadfd0..ff0d332 100644 --- a/ZR.ServiceCore/Model/SysUserPost.cs +++ b/DOAN.ServiceCore/Model/SysUserPost.cs @@ -1,6 +1,6 @@ using SqlSugar; -namespace ZR.Model.System +namespace DOAN.Model.System { /// /// 用户岗位 diff --git a/ZR.ServiceCore/Model/SysUserRole.cs b/DOAN.ServiceCore/Model/SysUserRole.cs similarity index 94% rename from ZR.ServiceCore/Model/SysUserRole.cs rename to DOAN.ServiceCore/Model/SysUserRole.cs index c1570dc..3e40c97 100644 --- a/ZR.ServiceCore/Model/SysUserRole.cs +++ b/DOAN.ServiceCore/Model/SysUserRole.cs @@ -1,6 +1,6 @@ using SqlSugar; -namespace ZR.Model.System +namespace DOAN.Model.System { /// /// 用户角色关联表 用户N-1 角色 diff --git a/ZR.ServiceCore/Model/UserConstants.cs b/DOAN.ServiceCore/Model/UserConstants.cs similarity index 98% rename from ZR.ServiceCore/Model/UserConstants.cs rename to DOAN.ServiceCore/Model/UserConstants.cs index e023591..4045887 100644 --- a/ZR.ServiceCore/Model/UserConstants.cs +++ b/DOAN.ServiceCore/Model/UserConstants.cs @@ -1,4 +1,4 @@ -namespace ZR.Model.System +namespace DOAN.Model.System { public class UserConstants { diff --git a/ZR.ServiceCore/Model/Vo/RouterVo.cs b/DOAN.ServiceCore/Model/Vo/RouterVo.cs similarity index 98% rename from ZR.ServiceCore/Model/Vo/RouterVo.cs rename to DOAN.ServiceCore/Model/Vo/RouterVo.cs index dae4a9c..5d783b2 100644 --- a/ZR.ServiceCore/Model/Vo/RouterVo.cs +++ b/DOAN.ServiceCore/Model/Vo/RouterVo.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using System.Collections.Generic; -namespace ZR.Model.System.Vo +namespace DOAN.Model.System.Vo { /// /// 路由展示 diff --git a/ZR.ServiceCore/Model/Vo/TreeSelectVo.cs b/DOAN.ServiceCore/Model/Vo/TreeSelectVo.cs similarity index 97% rename from ZR.ServiceCore/Model/Vo/TreeSelectVo.cs rename to DOAN.ServiceCore/Model/Vo/TreeSelectVo.cs index a12b62a..f590edc 100644 --- a/ZR.ServiceCore/Model/Vo/TreeSelectVo.cs +++ b/DOAN.ServiceCore/Model/Vo/TreeSelectVo.cs @@ -1,4 +1,4 @@ -namespace ZR.Model.System.Vo +namespace DOAN.Model.System.Vo { /// /// Treeselect树结构实体类 diff --git a/ZR.ServiceCore/ProteryConstant.cs b/DOAN.ServiceCore/ProteryConstant.cs similarity index 100% rename from ZR.ServiceCore/ProteryConstant.cs rename to DOAN.ServiceCore/ProteryConstant.cs diff --git a/ZR.ServiceCore/Services/ArticleCategoryService.cs b/DOAN.ServiceCore/Services/ArticleCategoryService.cs similarity index 92% rename from ZR.ServiceCore/Services/ArticleCategoryService.cs rename to DOAN.ServiceCore/Services/ArticleCategoryService.cs index 9f33e26..b867944 100644 --- a/ZR.ServiceCore/Services/ArticleCategoryService.cs +++ b/DOAN.ServiceCore/Services/ArticleCategoryService.cs @@ -1,13 +1,13 @@ using Infrastructure.Attribute; using SqlSugar; using System.Collections.Generic; -using ZR.Model; -using ZR.Model.Dto; -using ZR.Model.System; -using ZR.Repository; -using ZR.Service.System.IService; +using DOAN.Model; +using DOAN.Model.Dto; +using DOAN.Model.System; +using DOAN.Repository; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 文章目录Service业务层处理 diff --git a/ZR.ServiceCore/Services/ArticleService.cs b/DOAN.ServiceCore/Services/ArticleService.cs similarity index 94% rename from ZR.ServiceCore/Services/ArticleService.cs rename to DOAN.ServiceCore/Services/ArticleService.cs index 1889e89..4376050 100644 --- a/ZR.ServiceCore/Services/ArticleService.cs +++ b/DOAN.ServiceCore/Services/ArticleService.cs @@ -1,13 +1,13 @@ using Infrastructure.Attribute; using SqlSugar; using System; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Repository; -using ZR.Service.System.IService; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Repository; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// diff --git a/ZR.ServiceCore/Services/CacheService.cs b/DOAN.ServiceCore/Services/CacheService.cs similarity index 97% rename from ZR.ServiceCore/Services/CacheService.cs rename to DOAN.ServiceCore/Services/CacheService.cs index 7ba1ead..f819673 100644 --- a/ZR.ServiceCore/Services/CacheService.cs +++ b/DOAN.ServiceCore/Services/CacheService.cs @@ -1,7 +1,7 @@ using System; -using ZR.Common; +using DOAN.Common; -namespace ZR.Service.System +namespace DOAN.Service.System { public class CacheService { diff --git a/ZR.ServiceCore/Services/CommonLangService.cs b/DOAN.ServiceCore/Services/CommonLangService.cs similarity index 96% rename from ZR.ServiceCore/Services/CommonLangService.cs rename to DOAN.ServiceCore/Services/CommonLangService.cs index c4660b3..c7090e3 100644 --- a/ZR.ServiceCore/Services/CommonLangService.cs +++ b/DOAN.ServiceCore/Services/CommonLangService.cs @@ -2,18 +2,18 @@ using Infrastructure.Attribute; using SqlSugar; using System; using System.Linq; -using ZR.Model; -using ZR.Model.Dto; -using ZR.Model.Models; -using ZR.Repository; -using ZR.Service.System.IService; +using DOAN.Model; +using DOAN.Model.Dto; +using DOAN.Model.Models; +using DOAN.Repository; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 多语言配置Service业务层处理 /// - /// @author zr + /// @author DOAN /// @date 2022-05-06 /// [AppService(ServiceType = typeof(ICommonLangService), ServiceLifetime = LifeTime.Transient)] diff --git a/ZR.ServiceCore/Services/GenTableService.cs b/DOAN.ServiceCore/Services/GenTableService.cs similarity index 98% rename from ZR.ServiceCore/Services/GenTableService.cs rename to DOAN.ServiceCore/Services/GenTableService.cs index 958d8d7..f191057 100644 --- a/ZR.ServiceCore/Services/GenTableService.cs +++ b/DOAN.ServiceCore/Services/GenTableService.cs @@ -4,11 +4,11 @@ using SqlSugar; using System; using System.Collections.Generic; using System.Linq; -using ZR.Model; -using ZR.Model.System.Generate; -using ZR.Service.System.IService; +using DOAN.Model; +using DOAN.Model.System.Generate; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 代码生成表 diff --git a/ZR.ServiceCore/Services/IService/IArticleCategoryService.cs b/DOAN.ServiceCore/Services/IService/IArticleCategoryService.cs similarity index 76% rename from ZR.ServiceCore/Services/IService/IArticleCategoryService.cs rename to DOAN.ServiceCore/Services/IService/IArticleCategoryService.cs index 9ee2bc5..2128273 100644 --- a/ZR.ServiceCore/Services/IService/IArticleCategoryService.cs +++ b/DOAN.ServiceCore/Services/IService/IArticleCategoryService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using ZR.Model; -using ZR.Model.Dto; -using ZR.Model.System; +using DOAN.Model; +using DOAN.Model.Dto; +using DOAN.Model.System; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { public interface IArticleCategoryService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/IArticleService.cs b/DOAN.ServiceCore/Services/IService/IArticleService.cs similarity index 77% rename from ZR.ServiceCore/Services/IService/IArticleService.cs rename to DOAN.ServiceCore/Services/IService/IArticleService.cs index 0785ea6..b5ac1d3 100644 --- a/ZR.ServiceCore/Services/IService/IArticleService.cs +++ b/DOAN.ServiceCore/Services/IService/IArticleService.cs @@ -1,8 +1,8 @@ -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { public interface IArticleService : IBaseService
{ diff --git a/ZR.ServiceCore/Services/IService/ICommonLangService.cs b/DOAN.ServiceCore/Services/IService/ICommonLangService.cs similarity index 82% rename from ZR.ServiceCore/Services/IService/ICommonLangService.cs rename to DOAN.ServiceCore/Services/IService/ICommonLangService.cs index 7afd4d5..4e7cf75 100644 --- a/ZR.ServiceCore/Services/IService/ICommonLangService.cs +++ b/DOAN.ServiceCore/Services/IService/ICommonLangService.cs @@ -1,13 +1,13 @@ -using ZR.Model; -using ZR.Model.Dto; -using ZR.Model.Models; +using DOAN.Model; +using DOAN.Model.Dto; +using DOAN.Model.Models; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { /// /// 多语言配置service接口 /// - /// @author zr + /// @author DOAN /// @date 2022-05-06 /// public interface ICommonLangService : IBaseService diff --git a/ZR.ServiceCore/Services/IService/IGenTableService.cs b/DOAN.ServiceCore/Services/IService/IGenTableService.cs similarity index 92% rename from ZR.ServiceCore/Services/IService/IGenTableService.cs rename to DOAN.ServiceCore/Services/IService/IGenTableService.cs index eaafa58..f51eaf8 100644 --- a/ZR.ServiceCore/Services/IService/IGenTableService.cs +++ b/DOAN.ServiceCore/Services/IService/IGenTableService.cs @@ -1,9 +1,9 @@ using SqlSugar; using System.Collections.Generic; -using ZR.Model; -using ZR.Model.System.Generate; +using DOAN.Model; +using DOAN.Model.System.Generate; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { public interface IGenTableService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISqlDiffLogService.cs b/DOAN.ServiceCore/Services/IService/ISqlDiffLogService.cs similarity index 76% rename from ZR.ServiceCore/Services/IService/ISqlDiffLogService.cs rename to DOAN.ServiceCore/Services/IService/ISqlDiffLogService.cs index 2df07ce..5e51934 100644 --- a/ZR.ServiceCore/Services/IService/ISqlDiffLogService.cs +++ b/DOAN.ServiceCore/Services/IService/ISqlDiffLogService.cs @@ -1,8 +1,8 @@ -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { /// /// 数据差异日志service接口 diff --git a/ZR.ServiceCore/Services/IService/ISysConfigService.cs b/DOAN.ServiceCore/Services/IService/ISysConfigService.cs similarity index 81% rename from ZR.ServiceCore/Services/IService/ISysConfigService.cs rename to DOAN.ServiceCore/Services/IService/ISysConfigService.cs index ba8ddec..153de1e 100644 --- a/ZR.ServiceCore/Services/IService/ISysConfigService.cs +++ b/DOAN.ServiceCore/Services/IService/ISysConfigService.cs @@ -1,7 +1,7 @@ using System; -using ZR.Model.System; +using DOAN.Model.System; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { /// /// 参数配置service接口 diff --git a/ZR.ServiceCore/Services/IService/ISysDeptService.cs b/DOAN.ServiceCore/Services/IService/ISysDeptService.cs similarity index 88% rename from ZR.ServiceCore/Services/IService/ISysDeptService.cs rename to DOAN.ServiceCore/Services/IService/ISysDeptService.cs index 0559ee5..ed4cb63 100644 --- a/ZR.ServiceCore/Services/IService/ISysDeptService.cs +++ b/DOAN.ServiceCore/Services/IService/ISysDeptService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Model.System.Vo; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Model.System.Vo; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { public interface ISysDeptService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysDictDataService.cs b/DOAN.ServiceCore/Services/IService/ISysDictDataService.cs similarity index 90% rename from ZR.ServiceCore/Services/IService/ISysDictDataService.cs rename to DOAN.ServiceCore/Services/IService/ISysDictDataService.cs index b0db87d..933ceb0 100644 --- a/ZR.ServiceCore/Services/IService/ISysDictDataService.cs +++ b/DOAN.ServiceCore/Services/IService/ISysDictDataService.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using ZR.Model; -using ZR.Model.System; +using DOAN.Model; +using DOAN.Model.System; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { public interface ISysDictDataService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysDictService.cs b/DOAN.ServiceCore/Services/IService/ISysDictService.cs similarity index 94% rename from ZR.ServiceCore/Services/IService/ISysDictService.cs rename to DOAN.ServiceCore/Services/IService/ISysDictService.cs index 37be554..6e75c98 100644 --- a/ZR.ServiceCore/Services/IService/ISysDictService.cs +++ b/DOAN.ServiceCore/Services/IService/ISysDictService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Text; -using ZR.Model; -using ZR.Model.System; +using DOAN.Model; +using DOAN.Model.System; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { /// /// diff --git a/ZR.ServiceCore/Services/IService/ISysFileService.cs b/DOAN.ServiceCore/Services/IService/ISysFileService.cs similarity index 93% rename from ZR.ServiceCore/Services/IService/ISysFileService.cs rename to DOAN.ServiceCore/Services/IService/ISysFileService.cs index 3477de6..8fcebcf 100644 --- a/ZR.ServiceCore/Services/IService/ISysFileService.cs +++ b/DOAN.ServiceCore/Services/IService/ISysFileService.cs @@ -1,10 +1,10 @@ using Infrastructure.Attribute; using Microsoft.AspNetCore.Http; using System.Threading.Tasks; -using ZR.Model.Models; -using ZR.Model.System; +using DOAN.Model.Models; +using DOAN.Model.System; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { public interface ISysFileService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysLoginService.cs b/DOAN.ServiceCore/Services/IService/ISysLoginService.cs similarity index 92% rename from ZR.ServiceCore/Services/IService/ISysLoginService.cs rename to DOAN.ServiceCore/Services/IService/ISysLoginService.cs index 15d6ba8..83b645b 100644 --- a/ZR.ServiceCore/Services/IService/ISysLoginService.cs +++ b/DOAN.ServiceCore/Services/IService/ISysLoginService.cs @@ -1,10 +1,10 @@ using Infrastructure; using System; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { public interface ISysLoginService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysMenuService.cs b/DOAN.ServiceCore/Services/IService/ISysMenuService.cs similarity index 94% rename from ZR.ServiceCore/Services/IService/ISysMenuService.cs rename to DOAN.ServiceCore/Services/IService/ISysMenuService.cs index 5896af8..ecd846c 100644 --- a/ZR.ServiceCore/Services/IService/ISysMenuService.cs +++ b/DOAN.ServiceCore/Services/IService/ISysMenuService.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; -using ZR.Model.System.Dto; -using ZR.Model.System; -using ZR.Model.System.Vo; -using ZR.Model.System.Generate; +using DOAN.Model.System.Dto; +using DOAN.Model.System; +using DOAN.Model.System.Vo; +using DOAN.Model.System.Generate; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { public interface ISysMenuService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysNoticeService.cs b/DOAN.ServiceCore/Services/IService/ISysNoticeService.cs similarity index 71% rename from ZR.ServiceCore/Services/IService/ISysNoticeService.cs rename to DOAN.ServiceCore/Services/IService/ISysNoticeService.cs index 2544aa8..a4b5e53 100644 --- a/ZR.ServiceCore/Services/IService/ISysNoticeService.cs +++ b/DOAN.ServiceCore/Services/IService/ISysNoticeService.cs @@ -1,14 +1,14 @@ using System.Collections.Generic; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { /// /// 通知公告表service接口 /// - /// @author zr + /// @author DOAN /// @date 2021-12-15 /// public interface ISysNoticeService : IBaseService diff --git a/ZR.ServiceCore/Services/IService/ISysOperLogService.cs b/DOAN.ServiceCore/Services/IService/ISysOperLogService.cs similarity index 89% rename from ZR.ServiceCore/Services/IService/ISysOperLogService.cs rename to DOAN.ServiceCore/Services/IService/ISysOperLogService.cs index f96402e..9a9a748 100644 --- a/ZR.ServiceCore/Services/IService/ISysOperLogService.cs +++ b/DOAN.ServiceCore/Services/IService/ISysOperLogService.cs @@ -1,8 +1,8 @@ -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { public interface ISysOperLogService { diff --git a/ZR.ServiceCore/Services/IService/ISysPermissionService.cs b/DOAN.ServiceCore/Services/IService/ISysPermissionService.cs similarity index 82% rename from ZR.ServiceCore/Services/IService/ISysPermissionService.cs rename to DOAN.ServiceCore/Services/IService/ISysPermissionService.cs index f0ea833..d1be439 100644 --- a/ZR.ServiceCore/Services/IService/ISysPermissionService.cs +++ b/DOAN.ServiceCore/Services/IService/ISysPermissionService.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using ZR.Model.System; +using DOAN.Model.System; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { public interface ISysPermissionService { diff --git a/ZR.ServiceCore/Services/IService/ISysPostService.cs b/DOAN.ServiceCore/Services/IService/ISysPostService.cs similarity index 76% rename from ZR.ServiceCore/Services/IService/ISysPostService.cs rename to DOAN.ServiceCore/Services/IService/ISysPostService.cs index e65092a..e082ce2 100644 --- a/ZR.ServiceCore/Services/IService/ISysPostService.cs +++ b/DOAN.ServiceCore/Services/IService/ISysPostService.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using ZR.Model.System; -using ZR.Repository; +using DOAN.Model.System; +using DOAN.Repository; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { public interface ISysPostService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysRoleService.cs b/DOAN.ServiceCore/Services/IService/ISysRoleService.cs similarity index 97% rename from ZR.ServiceCore/Services/IService/ISysRoleService.cs rename to DOAN.ServiceCore/Services/IService/ISysRoleService.cs index 151b296..6ffb8eb 100644 --- a/ZR.ServiceCore/Services/IService/ISysRoleService.cs +++ b/DOAN.ServiceCore/Services/IService/ISysRoleService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { public interface ISysRoleService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysTasksLogService.cs b/DOAN.ServiceCore/Services/IService/ISysTasksLogService.cs similarity index 80% rename from ZR.ServiceCore/Services/IService/ISysTasksLogService.cs rename to DOAN.ServiceCore/Services/IService/ISysTasksLogService.cs index 381796a..0c97f44 100644 --- a/ZR.ServiceCore/Services/IService/ISysTasksLogService.cs +++ b/DOAN.ServiceCore/Services/IService/ISysTasksLogService.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; -using ZR.Model.System; -using ZR.Repository; +using DOAN.Model.System; +using DOAN.Repository; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { public interface ISysTasksLogService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysTasksQzService.cs b/DOAN.ServiceCore/Services/IService/ISysTasksQzService.cs similarity index 69% rename from ZR.ServiceCore/Services/IService/ISysTasksQzService.cs rename to DOAN.ServiceCore/Services/IService/ISysTasksQzService.cs index 959f757..24e8376 100644 --- a/ZR.ServiceCore/Services/IService/ISysTasksQzService.cs +++ b/DOAN.ServiceCore/Services/IService/ISysTasksQzService.cs @@ -1,8 +1,8 @@ -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { public interface ISysTasksQzService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysUserPostService.cs b/DOAN.ServiceCore/Services/IService/ISysUserPostService.cs similarity index 82% rename from ZR.ServiceCore/Services/IService/ISysUserPostService.cs rename to DOAN.ServiceCore/Services/IService/ISysUserPostService.cs index dc871a2..c90a49e 100644 --- a/ZR.ServiceCore/Services/IService/ISysUserPostService.cs +++ b/DOAN.ServiceCore/Services/IService/ISysUserPostService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using ZR.Model.System; +using DOAN.Model.System; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { public interface ISysUserPostService { diff --git a/ZR.ServiceCore/Services/IService/ISysUserRoleService.cs b/DOAN.ServiceCore/Services/IService/ISysUserRoleService.cs similarity index 94% rename from ZR.ServiceCore/Services/IService/ISysUserRoleService.cs rename to DOAN.ServiceCore/Services/IService/ISysUserRoleService.cs index 42d54eb..c25dbfb 100644 --- a/ZR.ServiceCore/Services/IService/ISysUserRoleService.cs +++ b/DOAN.ServiceCore/Services/IService/ISysUserRoleService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { public interface ISysUserRoleService : IBaseService { diff --git a/ZR.ServiceCore/Services/IService/ISysUserService.cs b/DOAN.ServiceCore/Services/IService/ISysUserService.cs similarity index 95% rename from ZR.ServiceCore/Services/IService/ISysUserService.cs rename to DOAN.ServiceCore/Services/IService/ISysUserService.cs index a074e85..3f0bd33 100644 --- a/ZR.ServiceCore/Services/IService/ISysUserService.cs +++ b/DOAN.ServiceCore/Services/IService/ISysUserService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; -namespace ZR.Service.System.IService +namespace DOAN.Service.System.IService { public interface ISysUserService : IBaseService { diff --git a/ZR.ServiceCore/Services/SeedDataService.cs b/DOAN.ServiceCore/Services/SeedDataService.cs similarity index 99% rename from ZR.ServiceCore/Services/SeedDataService.cs rename to DOAN.ServiceCore/Services/SeedDataService.cs index 72ac52e..cc959fb 100644 --- a/ZR.ServiceCore/Services/SeedDataService.cs +++ b/DOAN.ServiceCore/Services/SeedDataService.cs @@ -1,9 +1,9 @@ using MiniExcelLibs; using SqlSugar.IOC; -using ZR.Common; -using ZR.Model.System; +using DOAN.Common; +using DOAN.Model.System; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 种子数据处理 diff --git a/ZR.ServiceCore/Services/SqlDiffLogService.cs b/DOAN.ServiceCore/Services/SqlDiffLogService.cs similarity index 95% rename from ZR.ServiceCore/Services/SqlDiffLogService.cs rename to DOAN.ServiceCore/Services/SqlDiffLogService.cs index 0b88efd..e36e139 100644 --- a/ZR.ServiceCore/Services/SqlDiffLogService.cs +++ b/DOAN.ServiceCore/Services/SqlDiffLogService.cs @@ -2,13 +2,13 @@ using Infrastructure.Attribute; using Infrastructure.Extensions; using SqlSugar; using System; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Repository; -using ZR.Service.System.IService; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Repository; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 数据差异日志Service业务层处理 diff --git a/ZR.ServiceCore/Services/SysConfigService.cs b/DOAN.ServiceCore/Services/SysConfigService.cs similarity index 84% rename from ZR.ServiceCore/Services/SysConfigService.cs rename to DOAN.ServiceCore/Services/SysConfigService.cs index 308674d..e5319f0 100644 --- a/ZR.ServiceCore/Services/SysConfigService.cs +++ b/DOAN.ServiceCore/Services/SysConfigService.cs @@ -1,8 +1,8 @@ using Infrastructure.Attribute; -using ZR.Model.System; -using ZR.Service.System.IService; +using DOAN.Model.System; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 参数配置Service业务层处理 diff --git a/ZR.ServiceCore/Services/SysDeptService.cs b/DOAN.ServiceCore/Services/SysDeptService.cs similarity index 98% rename from ZR.ServiceCore/Services/SysDeptService.cs rename to DOAN.ServiceCore/Services/SysDeptService.cs index 3669322..952c199 100644 --- a/ZR.ServiceCore/Services/SysDeptService.cs +++ b/DOAN.ServiceCore/Services/SysDeptService.cs @@ -5,13 +5,13 @@ using SqlSugar; using System; using System.Collections.Generic; using System.Linq; -using ZR.Common; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Model.System.Vo; -using ZR.Service.System.IService; +using DOAN.Common; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Model.System.Vo; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 部门管理 diff --git a/ZR.ServiceCore/Services/SysDictDataService.cs b/DOAN.ServiceCore/Services/SysDictDataService.cs similarity index 97% rename from ZR.ServiceCore/Services/SysDictDataService.cs rename to DOAN.ServiceCore/Services/SysDictDataService.cs index f09917b..0176620 100644 --- a/ZR.ServiceCore/Services/SysDictDataService.cs +++ b/DOAN.ServiceCore/Services/SysDictDataService.cs @@ -3,12 +3,12 @@ using SqlSugar; using System; using System.Collections.Generic; using System.Linq; -using ZR.Common; -using ZR.Model; -using ZR.Model.System; -using ZR.Service.System.IService; +using DOAN.Common; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 字典数据类 diff --git a/ZR.ServiceCore/Services/SysDictService.cs b/DOAN.ServiceCore/Services/SysDictService.cs similarity index 97% rename from ZR.ServiceCore/Services/SysDictService.cs rename to DOAN.ServiceCore/Services/SysDictService.cs index 53e7785..20f35d4 100644 --- a/ZR.ServiceCore/Services/SysDictService.cs +++ b/DOAN.ServiceCore/Services/SysDictService.cs @@ -4,11 +4,11 @@ using SqlSugar; using System; using System.Collections.Generic; using System.Linq; -using ZR.Model; -using ZR.Model.System; -using ZR.Service.System.IService; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 字典类型 diff --git a/ZR.ServiceCore/Services/SysFileService.cs b/DOAN.ServiceCore/Services/SysFileService.cs similarity index 97% rename from ZR.ServiceCore/Services/SysFileService.cs rename to DOAN.ServiceCore/Services/SysFileService.cs index b82c768..a5b20c7 100644 --- a/ZR.ServiceCore/Services/SysFileService.cs +++ b/DOAN.ServiceCore/Services/SysFileService.cs @@ -7,11 +7,11 @@ using Microsoft.Extensions.Options; using System.Net; using System.Security.Cryptography; using System.Text; -using ZR.Common; -using ZR.Model.System; -using ZR.Service.System.IService; +using DOAN.Common; +using DOAN.Model.System; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 文件管理 diff --git a/ZR.ServiceCore/Services/SysLoginService.cs b/DOAN.ServiceCore/Services/SysLoginService.cs similarity index 96% rename from ZR.ServiceCore/Services/SysLoginService.cs rename to DOAN.ServiceCore/Services/SysLoginService.cs index 2a3dbd7..4705cc0 100644 --- a/ZR.ServiceCore/Services/SysLoginService.cs +++ b/DOAN.ServiceCore/Services/SysLoginService.cs @@ -3,13 +3,13 @@ using Infrastructure.Attribute; using Infrastructure.Extensions; using Microsoft.AspNetCore.Http; using UAParser; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Repository; -using ZR.Service.System.IService; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Repository; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 登录 diff --git a/ZR.ServiceCore/Services/SysMenuService.cs b/DOAN.ServiceCore/Services/SysMenuService.cs similarity index 99% rename from ZR.ServiceCore/Services/SysMenuService.cs rename to DOAN.ServiceCore/Services/SysMenuService.cs index 06858f7..055c0e6 100644 --- a/ZR.ServiceCore/Services/SysMenuService.cs +++ b/DOAN.ServiceCore/Services/SysMenuService.cs @@ -4,15 +4,15 @@ using SqlSugar; using System; using System.Collections.Generic; using System.Linq; -using ZR.Common; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Model.System.Enums; -using ZR.Model.System.Generate; -using ZR.Model.System.Vo; -using ZR.Service.System.IService; +using DOAN.Common; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Model.System.Enums; +using DOAN.Model.System.Generate; +using DOAN.Model.System.Vo; +using DOAN.Service.System.IService; -namespace ZR.Service +namespace DOAN.Service { /// /// 菜单 diff --git a/ZR.ServiceCore/Services/SysNoticeService.cs b/DOAN.ServiceCore/Services/SysNoticeService.cs similarity index 91% rename from ZR.ServiceCore/Services/SysNoticeService.cs rename to DOAN.ServiceCore/Services/SysNoticeService.cs index 7c938a0..b412b11 100644 --- a/ZR.ServiceCore/Services/SysNoticeService.cs +++ b/DOAN.ServiceCore/Services/SysNoticeService.cs @@ -1,17 +1,17 @@ using Infrastructure.Attribute; using SqlSugar; using System.Collections.Generic; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Service.System.IService; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 通知公告表Service业务层处理 /// - /// @author zr + /// @author DOAN /// @date 2021-12-15 /// [AppService(ServiceType = typeof(ISysNoticeService), ServiceLifetime = LifeTime.Transient)] diff --git a/ZR.ServiceCore/Services/SysOperLogService.cs b/DOAN.ServiceCore/Services/SysOperLogService.cs similarity index 94% rename from ZR.ServiceCore/Services/SysOperLogService.cs rename to DOAN.ServiceCore/Services/SysOperLogService.cs index dcfa2aa..4800ce6 100644 --- a/ZR.ServiceCore/Services/SysOperLogService.cs +++ b/DOAN.ServiceCore/Services/SysOperLogService.cs @@ -2,13 +2,13 @@ using Infrastructure.Attribute; using Infrastructure.Extensions; using SqlSugar; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Repository; -using ZR.Service.System.IService; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Repository; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 操作日志 diff --git a/ZR.ServiceCore/Services/SysPermissionService.cs b/DOAN.ServiceCore/Services/SysPermissionService.cs similarity index 95% rename from ZR.ServiceCore/Services/SysPermissionService.cs rename to DOAN.ServiceCore/Services/SysPermissionService.cs index 00beb93..7f755b4 100644 --- a/ZR.ServiceCore/Services/SysPermissionService.cs +++ b/DOAN.ServiceCore/Services/SysPermissionService.cs @@ -1,10 +1,10 @@ using Infrastructure; using Infrastructure.Attribute; using System.Collections.Generic; -using ZR.Model.System; -using ZR.Service.System.IService; +using DOAN.Model.System; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 角色权限 diff --git a/ZR.ServiceCore/Services/SysPostService.cs b/DOAN.ServiceCore/Services/SysPostService.cs similarity index 93% rename from ZR.ServiceCore/Services/SysPostService.cs rename to DOAN.ServiceCore/Services/SysPostService.cs index 21e832c..4df2b2b 100644 --- a/ZR.ServiceCore/Services/SysPostService.cs +++ b/DOAN.ServiceCore/Services/SysPostService.cs @@ -1,9 +1,9 @@ using Infrastructure.Attribute; using System.Collections.Generic; -using ZR.Model.System; -using ZR.Service.System.IService; +using DOAN.Model.System; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 岗位管理 diff --git a/ZR.ServiceCore/Services/SysRoleMenuService.cs b/DOAN.ServiceCore/Services/SysRoleMenuService.cs similarity index 94% rename from ZR.ServiceCore/Services/SysRoleMenuService.cs rename to DOAN.ServiceCore/Services/SysRoleMenuService.cs index dbd2b37..cc41d45 100644 --- a/ZR.ServiceCore/Services/SysRoleMenuService.cs +++ b/DOAN.ServiceCore/Services/SysRoleMenuService.cs @@ -1,8 +1,8 @@ using Infrastructure.Attribute; -using ZR.Model.System; -using ZR.Service.System.IService; +using DOAN.Model.System; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 角色菜单 diff --git a/ZR.ServiceCore/Services/SysRoleService.cs b/DOAN.ServiceCore/Services/SysRoleService.cs similarity index 98% rename from ZR.ServiceCore/Services/SysRoleService.cs rename to DOAN.ServiceCore/Services/SysRoleService.cs index 3f45fbb..8275e0d 100644 --- a/ZR.ServiceCore/Services/SysRoleService.cs +++ b/DOAN.ServiceCore/Services/SysRoleService.cs @@ -5,13 +5,13 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Repository; -using ZR.Service.System.IService; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Repository; +using DOAN.Service.System.IService; -namespace ZR.Service +namespace DOAN.Service { /// /// 角色 diff --git a/ZR.ServiceCore/Services/SysTasksLogService.cs b/DOAN.ServiceCore/Services/SysTasksLogService.cs similarity index 89% rename from ZR.ServiceCore/Services/SysTasksLogService.cs rename to DOAN.ServiceCore/Services/SysTasksLogService.cs index 61c9ec6..791ff98 100644 --- a/ZR.ServiceCore/Services/SysTasksLogService.cs +++ b/DOAN.ServiceCore/Services/SysTasksLogService.cs @@ -2,12 +2,12 @@ using System; using System.Linq.Expressions; using System.Threading.Tasks; -using ZR.Model; -using ZR.Model.System; -using ZR.Repository; -using ZR.Service.System.IService; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Repository; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 任务日志 diff --git a/ZR.ServiceCore/Services/SysTasksQzService.cs b/DOAN.ServiceCore/Services/SysTasksQzService.cs similarity index 91% rename from ZR.ServiceCore/Services/SysTasksQzService.cs rename to DOAN.ServiceCore/Services/SysTasksQzService.cs index 0d12a87..954c9ea 100644 --- a/ZR.ServiceCore/Services/SysTasksQzService.cs +++ b/DOAN.ServiceCore/Services/SysTasksQzService.cs @@ -3,13 +3,13 @@ using Infrastructure.Attribute; using Infrastructure.Extensions; using SqlSugar; using System; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Repository; -using ZR.Service.System.IService; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Repository; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 定时任务 @@ -55,13 +55,13 @@ namespace ZR.Service.System { if (parm.ApiUrl.IfNotEmpty() && parm.TaskType == 2) { - parm.AssemblyName = "ZR.Tasks"; + parm.AssemblyName = "DOAN.Tasks"; parm.ClassName = "TaskScheduler.Job_HttpRequest"; } if (parm.SqlText.IfNotEmpty() && parm.TaskType == 3) { - parm.AssemblyName = "ZR.Tasks"; + parm.AssemblyName = "DOAN.Tasks"; parm.ClassName = "TaskScheduler.Job_SqlExecute"; } } diff --git a/ZR.ServiceCore/Services/SysUserPostService.cs b/DOAN.ServiceCore/Services/SysUserPostService.cs similarity index 95% rename from ZR.ServiceCore/Services/SysUserPostService.cs rename to DOAN.ServiceCore/Services/SysUserPostService.cs index 110328a..5c40739 100644 --- a/ZR.ServiceCore/Services/SysUserPostService.cs +++ b/DOAN.ServiceCore/Services/SysUserPostService.cs @@ -1,10 +1,10 @@ using Infrastructure.Attribute; using SqlSugar; using System.Linq; -using ZR.Model.System; -using ZR.Service.System.IService; +using DOAN.Model.System; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 用户岗位 diff --git a/ZR.ServiceCore/Services/SysUserRoleService.cs b/DOAN.ServiceCore/Services/SysUserRoleService.cs similarity index 96% rename from ZR.ServiceCore/Services/SysUserRoleService.cs rename to DOAN.ServiceCore/Services/SysUserRoleService.cs index 40b70fd..afeca55 100644 --- a/ZR.ServiceCore/Services/SysUserRoleService.cs +++ b/DOAN.ServiceCore/Services/SysUserRoleService.cs @@ -2,13 +2,13 @@ using Infrastructure.Extensions; using SqlSugar; using System.Collections.Generic; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Repository; -using ZR.Service.System.IService; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Repository; +using DOAN.Service.System.IService; -namespace ZR.Service.System +namespace DOAN.Service.System { /// /// 用户角色 diff --git a/ZR.ServiceCore/Services/SysUserService.cs b/DOAN.ServiceCore/Services/SysUserService.cs similarity index 98% rename from ZR.ServiceCore/Services/SysUserService.cs rename to DOAN.ServiceCore/Services/SysUserService.cs index 7d7a4c3..2cb7369 100644 --- a/ZR.ServiceCore/Services/SysUserService.cs +++ b/DOAN.ServiceCore/Services/SysUserService.cs @@ -2,14 +2,14 @@ using Infrastructure; using Infrastructure.Attribute; using IPTools.Core; using System.Collections; -using ZR.Common; -using ZR.Model; -using ZR.Model.System; -using ZR.Model.System.Dto; -using ZR.Repository; -using ZR.Service.System.IService; +using DOAN.Common; +using DOAN.Model; +using DOAN.Model.System; +using DOAN.Model.System.Dto; +using DOAN.Repository; +using DOAN.Service.System.IService; -namespace ZR.Service +namespace DOAN.Service { /// /// 系统用户 diff --git a/ZR.ServiceCore/Signalr/HubsConstant.cs b/DOAN.ServiceCore/Signalr/HubsConstant.cs similarity index 92% rename from ZR.ServiceCore/Signalr/HubsConstant.cs rename to DOAN.ServiceCore/Signalr/HubsConstant.cs index ba22cf0..66bdd1d 100644 --- a/ZR.ServiceCore/Signalr/HubsConstant.cs +++ b/DOAN.ServiceCore/Signalr/HubsConstant.cs @@ -1,4 +1,4 @@ -namespace ZR.ServiceCore.Signalr +namespace DOAN.ServiceCore.Signalr { public class HubsConstant { diff --git a/ZR.ServiceCore/Signalr/MessageHub.cs b/DOAN.ServiceCore/Signalr/MessageHub.cs similarity index 98% rename from ZR.ServiceCore/Signalr/MessageHub.cs rename to DOAN.ServiceCore/Signalr/MessageHub.cs index 2fa1258..f484447 100644 --- a/ZR.ServiceCore/Signalr/MessageHub.cs +++ b/DOAN.ServiceCore/Signalr/MessageHub.cs @@ -5,10 +5,10 @@ using Mapster; using Microsoft.AspNetCore.SignalR; using System.Web; using UAParser; -using ZR.Service.System.IService; -using ZR.ServiceCore.Model.Dto; +using DOAN.Service.System.IService; +using DOAN.ServiceCore.Model.Dto; -namespace ZR.ServiceCore.Signalr +namespace DOAN.ServiceCore.Signalr { /// /// msghub diff --git a/ZR.ServiceCore/Signalr/OnlineUsers.cs b/DOAN.ServiceCore/Signalr/OnlineUsers.cs similarity index 98% rename from ZR.ServiceCore/Signalr/OnlineUsers.cs rename to DOAN.ServiceCore/Signalr/OnlineUsers.cs index 037c6c9..af43ac5 100644 --- a/ZR.ServiceCore/Signalr/OnlineUsers.cs +++ b/DOAN.ServiceCore/Signalr/OnlineUsers.cs @@ -1,4 +1,4 @@ -namespace ZR.ServiceCore.Signalr +namespace DOAN.ServiceCore.Signalr { public class OnlineUsers { diff --git a/ZR.ServiceCore/SqlSugar/DataPermi.cs b/DOAN.ServiceCore/SqlSugar/DataPermi.cs similarity index 98% rename from ZR.ServiceCore/SqlSugar/DataPermi.cs rename to DOAN.ServiceCore/SqlSugar/DataPermi.cs index e9cc866..d034acf 100644 --- a/ZR.ServiceCore/SqlSugar/DataPermi.cs +++ b/DOAN.ServiceCore/SqlSugar/DataPermi.cs @@ -1,8 +1,8 @@ using Infrastructure; using SqlSugar.IOC; -using ZR.Model.System; +using DOAN.Model.System; -namespace ZR.ServiceCore.SqlSugar +namespace DOAN.ServiceCore.SqlSugar { public enum DataPermiEnum { diff --git a/ZR.ServiceCore/SqlSugar/InitTable.cs b/DOAN.ServiceCore/SqlSugar/InitTable.cs similarity index 94% rename from ZR.ServiceCore/SqlSugar/InitTable.cs rename to DOAN.ServiceCore/SqlSugar/InitTable.cs index 88a4f90..4ef722c 100644 --- a/ZR.ServiceCore/SqlSugar/InitTable.cs +++ b/DOAN.ServiceCore/SqlSugar/InitTable.cs @@ -1,9 +1,9 @@ using SqlSugar.IOC; -using ZR.Model.Models; -using ZR.Model.System; -using ZR.Model.System.Generate; +using DOAN.Model.Models; +using DOAN.Model.System; +using DOAN.Model.System.Generate; -namespace ZR.ServiceCore.SqlSugar +namespace DOAN.ServiceCore.SqlSugar { /// /// 初始化表 diff --git a/ZR.ServiceCore/SqlSugar/SqlSugarCache.cs b/DOAN.ServiceCore/SqlSugar/SqlSugarCache.cs similarity index 96% rename from ZR.ServiceCore/SqlSugar/SqlSugarCache.cs rename to DOAN.ServiceCore/SqlSugar/SqlSugarCache.cs index c1e8f40..1af3854 100644 --- a/ZR.ServiceCore/SqlSugar/SqlSugarCache.cs +++ b/DOAN.ServiceCore/SqlSugar/SqlSugarCache.cs @@ -1,6 +1,6 @@ -using ZR.Common; +using DOAN.Common; -namespace ZR.ServiceCore.SqlSugar +namespace DOAN.ServiceCore.SqlSugar { public class SqlSugarCache : ICacheService { diff --git a/ZR.ServiceCore/SqlSugar/SqlsugarSetup.cs b/DOAN.ServiceCore/SqlSugar/SqlsugarSetup.cs similarity index 99% rename from ZR.ServiceCore/SqlSugar/SqlsugarSetup.cs rename to DOAN.ServiceCore/SqlSugar/SqlsugarSetup.cs index 6582814..9106a76 100644 --- a/ZR.ServiceCore/SqlSugar/SqlsugarSetup.cs +++ b/DOAN.ServiceCore/SqlSugar/SqlsugarSetup.cs @@ -4,9 +4,9 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using SqlSugar.IOC; -using ZR.Model.System; +using DOAN.Model.System; -namespace ZR.ServiceCore.SqlSugar +namespace DOAN.ServiceCore.SqlSugar { public static class SqlsugarSetup { diff --git a/ZR.Tasks/ZR.Tasks.csproj b/DOAN.Tasks/DOAN.Tasks.csproj similarity index 74% rename from ZR.Tasks/ZR.Tasks.csproj rename to DOAN.Tasks/DOAN.Tasks.csproj index 3256d3c..c0350c2 100644 --- a/ZR.Tasks/ZR.Tasks.csproj +++ b/DOAN.Tasks/DOAN.Tasks.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/ZR.Tasks/ITaskSchedulerServer.cs b/DOAN.Tasks/ITaskSchedulerServer.cs similarity index 93% rename from ZR.Tasks/ITaskSchedulerServer.cs rename to DOAN.Tasks/ITaskSchedulerServer.cs index f8f040e..ca81f93 100644 --- a/ZR.Tasks/ITaskSchedulerServer.cs +++ b/DOAN.Tasks/ITaskSchedulerServer.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; using System.Text; using System.Threading.Tasks; -using ZR.Model.System; +using DOAN.Model.System; -namespace ZR.Tasks +namespace DOAN.Tasks { public interface ITaskSchedulerServer { diff --git a/ZR.Tasks/JobFactory.cs b/DOAN.Tasks/JobFactory.cs similarity index 98% rename from ZR.Tasks/JobFactory.cs rename to DOAN.Tasks/JobFactory.cs index 1317ee3..66311d2 100644 --- a/ZR.Tasks/JobFactory.cs +++ b/DOAN.Tasks/JobFactory.cs @@ -3,7 +3,7 @@ using Quartz; using Quartz.Spi; using System; -namespace ZR.Tasks +namespace DOAN.Tasks { public class JobFactory : IJobFactory { diff --git a/ZR.Tasks/TaskScheduler/JobBase.cs b/DOAN.Tasks/TaskScheduler/JobBase.cs similarity index 96% rename from ZR.Tasks/TaskScheduler/JobBase.cs rename to DOAN.Tasks/TaskScheduler/JobBase.cs index 208473b..0aae8e4 100644 --- a/ZR.Tasks/TaskScheduler/JobBase.cs +++ b/DOAN.Tasks/TaskScheduler/JobBase.cs @@ -4,11 +4,11 @@ using Quartz; using System; using System.Diagnostics; using System.Threading.Tasks; -using ZR.Common; -using ZR.Model.System; -using ZR.Service.System.IService; +using DOAN.Common; +using DOAN.Model.System; +using DOAN.Service.System.IService; -namespace ZR.Tasks +namespace DOAN.Tasks { public class JobBase { diff --git a/ZR.Tasks/TaskScheduler/Job_Device_Execute.cs b/DOAN.Tasks/TaskScheduler/Job_Device_Execute.cs similarity index 91% rename from ZR.Tasks/TaskScheduler/Job_Device_Execute.cs rename to DOAN.Tasks/TaskScheduler/Job_Device_Execute.cs index 8bca54d..5b21f39 100644 --- a/ZR.Tasks/TaskScheduler/Job_Device_Execute.cs +++ b/DOAN.Tasks/TaskScheduler/Job_Device_Execute.cs @@ -10,12 +10,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using ZR.Model.System; -using ZR.Model.MES.dev; -using ZR.Model.MES.dev.Dto; -using ZR.Service.MES.dev.IService; +using DOAN.Model.System; +using DOAN.Model.MES.dev; +using DOAN.Model.MES.dev.Dto; +using DOAN.Service.MES.dev.IService; -namespace ZR.Tasks.TaskScheduler +namespace DOAN.Tasks.TaskScheduler { /// /// 设备管理 调度每日的巡检 diff --git a/ZR.Tasks/TaskScheduler/Job_Email_send.cs b/DOAN.Tasks/TaskScheduler/Job_Email_send.cs similarity index 94% rename from ZR.Tasks/TaskScheduler/Job_Email_send.cs rename to DOAN.Tasks/TaskScheduler/Job_Email_send.cs index df9b026..75dd301 100644 --- a/ZR.Tasks/TaskScheduler/Job_Email_send.cs +++ b/DOAN.Tasks/TaskScheduler/Job_Email_send.cs @@ -9,11 +9,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using ZR.Model.MES.dev; -using ZR.Model.System; -using ZR.Service.MES.andon.IService; +using DOAN.Model.MES.dev; +using DOAN.Model.System; +using DOAN.Service.MES.andon.IService; -namespace ZR.Tasks.TaskScheduler +namespace DOAN.Tasks.TaskScheduler { /// /// 超过一个小时就发送邮箱 diff --git a/ZR.Tasks/TaskScheduler/Job_HttpRequest.cs b/DOAN.Tasks/TaskScheduler/Job_HttpRequest.cs similarity index 95% rename from ZR.Tasks/TaskScheduler/Job_HttpRequest.cs rename to DOAN.Tasks/TaskScheduler/Job_HttpRequest.cs index e96b7ca..106ec78 100644 --- a/ZR.Tasks/TaskScheduler/Job_HttpRequest.cs +++ b/DOAN.Tasks/TaskScheduler/Job_HttpRequest.cs @@ -6,10 +6,10 @@ using Quartz.Impl.Triggers; using SqlSugar.IOC; using System; using System.Threading.Tasks; -using ZR.Model.System; -using ZR.Service.System.IService; +using DOAN.Model.System; +using DOAN.Service.System.IService; -namespace ZR.Tasks.TaskScheduler +namespace DOAN.Tasks.TaskScheduler { /// /// 定时任务http请求 diff --git a/ZR.Tasks/TaskScheduler/Job_SqlExecute.cs b/DOAN.Tasks/TaskScheduler/Job_SqlExecute.cs similarity index 95% rename from ZR.Tasks/TaskScheduler/Job_SqlExecute.cs rename to DOAN.Tasks/TaskScheduler/Job_SqlExecute.cs index 4296aef..9d6aa94 100644 --- a/ZR.Tasks/TaskScheduler/Job_SqlExecute.cs +++ b/DOAN.Tasks/TaskScheduler/Job_SqlExecute.cs @@ -7,9 +7,9 @@ using Quartz.Impl.Triggers; using SqlSugar.IOC; using System; using System.Threading.Tasks; -using ZR.Service.System.IService; +using DOAN.Service.System.IService; -namespace ZR.Tasks.TaskScheduler +namespace DOAN.Tasks.TaskScheduler { [AppService(ServiceType = typeof(Job_SqlExecute), ServiceLifetime = LifeTime.Scoped)] public class Job_SqlExecute : JobBase, IJob diff --git a/ZR.Tasks/TaskScheduler/Job_SyncTest.cs b/DOAN.Tasks/TaskScheduler/Job_SyncTest.cs similarity index 95% rename from ZR.Tasks/TaskScheduler/Job_SyncTest.cs rename to DOAN.Tasks/TaskScheduler/Job_SyncTest.cs index 5494c43..f6191b6 100644 --- a/ZR.Tasks/TaskScheduler/Job_SyncTest.cs +++ b/DOAN.Tasks/TaskScheduler/Job_SyncTest.cs @@ -2,7 +2,7 @@ using Quartz; using System.Threading.Tasks; -namespace ZR.Tasks.TaskScheduler +namespace DOAN.Tasks.TaskScheduler { /// /// 定时任务测试 diff --git a/ZR.Tasks/TaskScheduler/Job_YIDAtoken.cs b/DOAN.Tasks/TaskScheduler/Job_YIDAtoken.cs similarity index 95% rename from ZR.Tasks/TaskScheduler/Job_YIDAtoken.cs rename to DOAN.Tasks/TaskScheduler/Job_YIDAtoken.cs index e9519db..0cbb749 100644 --- a/ZR.Tasks/TaskScheduler/Job_YIDAtoken.cs +++ b/DOAN.Tasks/TaskScheduler/Job_YIDAtoken.cs @@ -6,9 +6,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using ZR.Common; +using DOAN.Common; -namespace ZR.Tasks.TaskScheduler +namespace DOAN.Tasks.TaskScheduler { /// /// 宜搭 token 定时获取2h50min diff --git a/ZR.Tasks/TaskSchedulerServer.cs b/DOAN.Tasks/TaskSchedulerServer.cs similarity index 99% rename from ZR.Tasks/TaskSchedulerServer.cs rename to DOAN.Tasks/TaskSchedulerServer.cs index 455c8a6..bfe8ac9 100644 --- a/ZR.Tasks/TaskSchedulerServer.cs +++ b/DOAN.Tasks/TaskSchedulerServer.cs @@ -11,9 +11,9 @@ using System.Collections.Specialized; using System.Linq; using System.Reflection; using System.Threading.Tasks; -using ZR.Model.System; +using DOAN.Model.System; -namespace ZR.Tasks +namespace DOAN.Tasks { /// /// 计划任务中心 @@ -58,7 +58,7 @@ namespace ZR.Tasks //{ "quartz.jobStore.driverDelegateType", "Quartz.Impl.AdoJobStore.MySQLDelegate, Quartz"}, //{ "quartz.jobStore.useProperties", "true"}, //{ "quartz.jobStore.dataSource", "myDS" }, - //{ "quartz.dataSource.myDS.connectionString", @"server=xxx.xxx.xxx.xxx;port=3306;database=Admin;uid=zrry;pwd=********;Charset=utf8;"}, + //{ "quartz.dataSource.myDS.connectionString", @"server=xxx.xxx.xxx.xxx;port=3306;database=Admin;uid=DOANry;pwd=********;Charset=utf8;"}, //{ "quartz.dataSource.myDS.provider", "MySql" }, }; diff --git a/ZR.Tasks/Test.cs b/DOAN.Tasks/Test.cs similarity index 88% rename from ZR.Tasks/Test.cs rename to DOAN.Tasks/Test.cs index 5f18204..9e9606a 100644 --- a/ZR.Tasks/Test.cs +++ b/DOAN.Tasks/Test.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZR.Tasks +namespace DOAN.Tasks { public class Test { diff --git a/ZRAdmin3.sln b/DOAN.sln similarity index 74% rename from ZRAdmin3.sln rename to DOAN.sln index 8402ecb..797d729 100644 --- a/ZRAdmin3.sln +++ b/DOAN.sln @@ -3,23 +3,23 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.1.32210.238 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DOAN.WebApi", "ZR.Admin.WebApi\DOAN.WebApi.csproj", "{E5497BB4-B0C1-4794-9FAE-163F626EC399}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DOAN.WebApi", "DOAN.Admin.WebApi\DOAN.WebApi.csproj", "{E5497BB4-B0C1-4794-9FAE-163F626EC399}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZR.Model", "ZR.Model\ZR.Model.csproj", "{B35D73B1-2E22-4636-B88B-10C5E6D8E524}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DOAN.Model", "DOAN.Model\DOAN.Model.csproj", "{B35D73B1-2E22-4636-B88B-10C5E6D8E524}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZR.Common", "ZR.Common\ZR.Common.csproj", "{42C84599-1E99-45B4-929B-417C37337EF8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DOAN.Common", "DOAN.Common\DOAN.Common.csproj", "{42C84599-1E99-45B4-929B-417C37337EF8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZR.Infrastructure", "Infrastructure\ZR.Infrastructure.csproj", "{5D740120-5491-4FE2-B5BE-8A9C48BFE3C5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DOAN.Infrastructure", "Infrastructure\DOAN.Infrastructure.csproj", "{5D740120-5491-4FE2-B5BE-8A9C48BFE3C5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZR.Tasks", "ZR.Tasks\ZR.Tasks.csproj", "{B657ED99-40E5-423A-AFE7-157C4EE576CB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DOAN.Tasks", "DOAN.Tasks\DOAN.Tasks.csproj", "{B657ED99-40E5-423A-AFE7-157C4EE576CB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZR.Service", "ZR.Service\ZR.Service.csproj", "{75ADA3C1-148D-4727-A718-79447D9B5EEE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DOAN.Service", "DOAN.Service\DOAN.Service.csproj", "{75ADA3C1-148D-4727-A718-79447D9B5EEE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZR.Repository", "ZR.Repository\ZR.Repository.csproj", "{17E277BF-B2B8-4111-AE43-38246128C83C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DOAN.Repository", "DOAN.Repository\DOAN.Repository.csproj", "{17E277BF-B2B8-4111-AE43-38246128C83C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZR.CodeGenerator", "ZR.CodeGenerator\ZR.CodeGenerator.csproj", "{B353DE0B-12C6-4C15-909A-DB68F71D5AE9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DOAN.CodeGenerator", "DOAN.CodeGenerator\DOAN.CodeGenerator.csproj", "{B353DE0B-12C6-4C15-909A-DB68F71D5AE9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZR.ServiceCore", "ZR.ServiceCore\ZR.ServiceCore.csproj", "{4E2CC4E4-F109-4876-8498-912E13905765}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DOAN.ServiceCore", "DOAN.ServiceCore\DOAN.ServiceCore.csproj", "{4E2CC4E4-F109-4876-8498-912E13905765}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Infrastructure/Cache/CacheHelper.cs b/Infrastructure/Cache/CacheHelper.cs index 5fa7d32..d361fac 100644 --- a/Infrastructure/Cache/CacheHelper.cs +++ b/Infrastructure/Cache/CacheHelper.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Collections; using System.Reflection; -namespace ZR.Common +namespace DOAN.Common { public class CacheHelper { diff --git a/Infrastructure/Cache/RedisServer.cs b/Infrastructure/Cache/RedisServer.cs index aa3312c..81add31 100644 --- a/Infrastructure/Cache/RedisServer.cs +++ b/Infrastructure/Cache/RedisServer.cs @@ -1,7 +1,7 @@ using CSRedis; using Infrastructure; -namespace ZR.Common.Cache +namespace DOAN.Common.Cache { public class RedisServer { diff --git a/Infrastructure/ZR.Infrastructure.csproj b/Infrastructure/DOAN.Infrastructure.csproj similarity index 100% rename from Infrastructure/ZR.Infrastructure.csproj rename to Infrastructure/DOAN.Infrastructure.csproj diff --git a/Infrastructure/WebExtensions/IPRateExtension.cs b/Infrastructure/WebExtensions/IPRateExtension.cs index bf7e45d..32f63ed 100644 --- a/Infrastructure/WebExtensions/IPRateExtension.cs +++ b/Infrastructure/WebExtensions/IPRateExtension.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using System; -namespace ZR.Infrastructure.WebExtensions +namespace DOAN.Infrastructure.WebExtensions { public static class IPRateExtension { diff --git a/Infrastructure/WebExtensions/JwtExtension.cs b/Infrastructure/WebExtensions/JwtExtension.cs index bd30ca1..e9c58de 100644 --- a/Infrastructure/WebExtensions/JwtExtension.cs +++ b/Infrastructure/WebExtensions/JwtExtension.cs @@ -5,7 +5,7 @@ using Microsoft.IdentityModel.Tokens; using System; using System.Threading.Tasks; -namespace ZR.Infrastructure.WebExtensions +namespace DOAN.Infrastructure.WebExtensions { public static class JwtExtension { diff --git a/LICENSE b/LICENSE index 365fbfe..8e2ff62 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021 zrry +Copyright (c) 2021 DOANry Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.en.md b/README.en.md index 1582c2a..82cfa38 100644 --- a/README.en.md +++ b/README.en.md @@ -1,10 +1,10 @@ -

ZR.Admin.NET Back-end management system

+

DOAN.Admin.NET Back-end management system

base .Net7 + vue2.x/vue3.x/uniapp Front-end and back-end separation of .NET rapid development framework

- -fork - + +fork +

@@ -38,7 +38,7 @@ If it helps you, you can click "Star" in the upper right corner to collect it, s | H5 | WeChat mini program | | -------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------ | -| ![alt](https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/qrcodeH5.png) | ![alt](https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/qrcode.jpg) | +| ![alt](https://gitee.com/izory/DOANAdminNetCore/raw/master/document/images/qrcodeH5.png) | ![alt](https://gitee.com/izory/DOANAdminNetCore/raw/master/document/images/qrcode.jpg) | ``` Since it is a personal project, the funds are limited, and the experience server is low-fied, please cherish it, poke it lightly, and appreciate it!! @@ -48,8 +48,8 @@ Since it is a personal project, the funds are limited, and the experience server | repository | Github | Gitee | | -------------- | ------------------------------------------------------ | ---------------------------------------------------------------- | -| Net7 | [Clone/Download](https://github.com/izhaorui/Zr.Admin.NET) | [Clone/Download](https://gitee.com/izory/ZrAdminNetCore) | -| Vue3(Hot) | [Clone/Download](https://github.com/izhaorui/ZR.Admin.Vue3) | [Clone/Download](https://gitee.com/izory/ZRAdmin-vue) | +| Net7 | [Clone/Download](https://github.com/izhaorui/DOAN.Admin.NET) | [Clone/Download](https://gitee.com/izory/DOANAdminNetCore) | +| Vue3(Hot) | [Clone/Download](https://github.com/izhaorui/DOAN.Admin.Vue3) | [Clone/Download](https://gitee.com/izory/DOANAdmin-vue) | ## 🍁 Front-end technology @@ -95,14 +95,14 @@ Vue Front-end technology stack: Based on Vue2.x/Vue3.x/UniApp, Vue, Vue-router, ## 🍻 Project structure ``` -├─ZR.Service ->[你的业务服务层类库]：提供WebApi接口调用； -├─ZR.ServiceCore ->[系统服务层类库]：提供WebApi接口调用； -├─ZR.Repository ->[仓库层类库]：方便提供有执行存储过程的操作； -├─ZR.Model ->[实体层类库]：提供项目中的数据库表、数据传输对象； -├─ZR.Admin.WebApi ->[webapi接口]：为Vue版或其他三方系统提供接口服务。 -├─ZR.Tasks ->[定时任务类库]：提供项目定时任务实现功能； -├─ZR.CodeGenerator ->[代码生成功能]：包含代码生成的模板、方法、代码生成的下载。 -├─ZR.Vue ->[前端UI]：vue2.0版本UI层(已经不再更新推荐使用vue3)。 +├─DOAN.Service ->[你的业务服务层类库]：提供WebApi接口调用； +├─DOAN.ServiceCore ->[系统服务层类库]：提供WebApi接口调用； +├─DOAN.Repository ->[仓库层类库]：方便提供有执行存储过程的操作； +├─DOAN.Model ->[实体层类库]：提供项目中的数据库表、数据传输对象； +├─DOAN.Admin.WebApi ->[webapi接口]：为Vue版或其他三方系统提供接口服务。 +├─DOAN.Tasks ->[定时任务类库]：提供项目定时任务实现功能； +├─DOAN.CodeGenerator ->[代码生成功能]：包含代码生成的模板、方法、代码生成的下载。 +├─DOAN.Vue ->[前端UI]：vue2.0版本UI层(已经不再更新推荐使用vue3)。 ├─document ->[文档]：数据库脚本 ``` @@ -110,44 +110,44 @@ Vue Front-end technology stack: Based on Vue2.x/Vue3.x/UniApp, Vue, Vue-router, - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +
@@ -155,23 +155,23 @@ Vue Front-end technology stack: Based on Vue2.x/Vue3.x/UniApp, Vue, Vue-router, - - + + - - + + - - + + - - + + - +
@@ -196,4 +196,4 @@ Vue Front-end technology stack: Based on Vue2.x/Vue3.x/UniApp, Vue, Vue-router, ## 🎀 donation If you feel that the project has helped you, you can ask the author for a cup of coffee as a sign of encouragement ☕️ - + diff --git a/README.md b/README.md index 2309d55..73da997 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -

ZR.Admin.NET后台管理系统

+

DOAN.Admin.NET后台管理系统

基于.Net7 + vue3

## 🍁 前端技术 @@ -48,17 +48,17 @@ Vue 版前端技术栈 ：基于 vue2.x/vue3.x/uniapp、vuex、vue-router 、vue ## 🍻 项目结构 -![alt](https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/kj.png) +![alt](https://gitee.com/izory/DOANAdminNetCore/raw/master/document/images/kj.png) ``` -├─ZR.Service ->[你的业务服务层类库]：提供WebApi接口调用； -├─ZR.ServiceCore ->[系统服务层类库]：提供WebApi接口调用； -├─ZR.Repository ->[仓库层类库]：方便提供有执行存储过程的操作； -├─ZR.Model ->[实体层类库]：提供项目中的数据库表、数据传输对象； -├─ZR.Admin.WebApi ->[webapi接口]：为Vue版或其他三方系统提供接口服务。 -├─ZR.Tasks ->[定时任务类库]：提供项目定时任务实现功能； -├─ZR.CodeGenerator ->[代码生成功能]：包含代码生成的模板、方法、代码生成的下载。 -├─ZR.Vue ->[前端UI]：vue2.0版本UI层(已经不再更新推荐使用vue3)。 +├─DOAN.Service ->[你的业务服务层类库]：提供WebApi接口调用； +├─DOAN.ServiceCore ->[系统服务层类库]：提供WebApi接口调用； +├─DOAN.Repository ->[仓库层类库]：方便提供有执行存储过程的操作； +├─DOAN.Model ->[实体层类库]：提供项目中的数据库表、数据传输对象； +├─DOAN.Admin.WebApi ->[webapi接口]：为Vue版或其他三方系统提供接口服务。 +├─DOAN.Tasks ->[定时任务类库]：提供项目定时任务实现功能； +├─DOAN.CodeGenerator ->[代码生成功能]：包含代码生成的模板、方法、代码生成的下载。 +├─DOAN.Vue ->[前端UI]：vue2.0版本UI层(已经不再更新推荐使用vue3)。 ├─document ->[文档]：数据库脚本 ``` @@ -66,47 +66,47 @@ Vue 版前端技术栈 ：基于 vue2.x/vue3.x/uniapp、vuex、vue-router 、vue - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - +
@@ -114,23 +114,23 @@ Vue 版前端技术栈 ：基于 vue2.x/vue3.x/uniapp、vuex、vue-router 、vue - - + + - - + + - - + + - - + + - +
@@ -157,4 +157,4 @@ Vue 版前端技术栈 ：基于 vue2.x/vue3.x/uniapp、vuex、vue-router 、vue ## 🎀 捐赠 如果你觉得这个项目帮助到了你，你可以请作者喝杯咖啡表示鼓励 ☕️ - + diff --git a/document/mysql/admin-mysql-初始化数据.sql b/document/mysql/admin-mysql-初始化数据.sql index 15595be..afa526b 100644 --- a/document/mysql/admin-mysql-初始化数据.sql +++ b/document/mysql/admin-mysql-初始化数据.sql @@ -2,12 +2,12 @@ -- ---------------------------- -- Records of sys_dept -- ---------------------------- -INSERT INTO `sys_dept` VALUES (100, 0, '0', 'A公司', 0, 'zr', '', '', 0, 0, 'admin', NULL, '', NULL, NULL); -INSERT INTO `sys_dept` VALUES (101, 100, '0,100', '研发部门', 1, 'zr', '', '', 0, 0, 'admin', NULL, '', NULL, NULL); -INSERT INTO `sys_dept` VALUES (102, 100, '0,100', '市场部门', 2, 'zr', '', '', 0, 0, 'admin', NULL, '', NULL, NULL); -INSERT INTO `sys_dept` VALUES (103, 100, '0,100', '测试部门', 3, 'zr', '', '', 0, 0, 'admin', NULL, '', NULL, NULL); -INSERT INTO `sys_dept` VALUES (104, 100, '0,100', '财务部门', 4, 'zr', '', '', 0, 0, 'admin', NULL, '', NULL, NULL); -INSERT INTO `sys_dept` VALUES (200, 0, '0', 'B公司', 0, 'zr', '', '', 0, 0, 'admin', NULL, '', NULL, NULL); +INSERT INTO `sys_dept` VALUES (100, 0, '0', 'A公司', 0, 'DOAN', '', '', 0, 0, 'admin', NULL, '', NULL, NULL); +INSERT INTO `sys_dept` VALUES (101, 100, '0,100', '研发部门', 1, 'DOAN', '', '', 0, 0, 'admin', NULL, '', NULL, NULL); +INSERT INTO `sys_dept` VALUES (102, 100, '0,100', '市场部门', 2, 'DOAN', '', '', 0, 0, 'admin', NULL, '', NULL, NULL); +INSERT INTO `sys_dept` VALUES (103, 100, '0,100', '测试部门', 3, 'DOAN', '', '', 0, 0, 'admin', NULL, '', NULL, NULL); +INSERT INTO `sys_dept` VALUES (104, 100, '0,100', '财务部门', 4, 'DOAN', '', '', 0, 0, 'admin', NULL, '', NULL, NULL); +INSERT INTO `sys_dept` VALUES (200, 0, '0', 'B公司', 0, 'DOAN', '', '', 0, 0, 'admin', NULL, '', NULL, NULL); -- ---------------------------- @@ -74,7 +74,7 @@ INSERT INTO `sys_dict_data` VALUES (34, 3, '繁体', 'zh-tw', 'sys_lang_type', INSERT INTO sys_menu VALUES (1, '系统管理', 0, 1, 'system', NULL, 0, 0, 'M', '0', '0', '', 'system', '', SYSDATE(), '', NULL, '系统管理目录', 'menu.system'); INSERT INTO sys_menu VALUES (2, '系统监控', 0, 2, 'monitor', NULL, 0, 0, 'M', '0', '0', '', 'monitor', '', SYSDATE(), '', NULL, '系统监控目录', 'menu.monitoring'); INSERT INTO sys_menu VALUES (3, '系统工具', 0, 3, 'tool', NULL, 0, 0, 'M', '0', '0', '', 'tool', '', SYSDATE(), '', NULL, '系统工具目录', 'menu.systemTools'); -INSERT INTO sys_menu VALUES (5, '官网地址', 0, 5, 'http://www.izhaorui.cn/doc', NULL, 1, 0, 'M', '0', '0', '', 'link', '', SYSDATE(), '', NULL, 'Zr官网地址', 'menu.officialWebsite'); +INSERT INTO sys_menu VALUES (5, '官网地址', 0, 5, 'http://www.izhaorui.cn/doc', NULL, 1, 0, 'M', '0', '0', '', 'link', '', SYSDATE(), '', NULL, 'DOAN官网地址', 'menu.officialWebsite'); INSERT INTO sys_menu VALUES (6, '控制台', 0, 0, 'dashboard', 'index_v1', 0, 0, 'C', '0', '0', '', 'dashboard', '', SYSDATE(), '', NULL, '', 'menu.dashboard'); -- 二级菜单 diff --git a/document/mysql/admin-mysql20230515.sql b/document/mysql/admin-mysql20230515.sql index de10f03..bd552d9 100644 --- a/document/mysql/admin-mysql20230515.sql +++ b/document/mysql/admin-mysql20230515.sql @@ -96,13 +96,13 @@ CREATE TABLE `sys_dept` ( -- ---------------------------- -- Records of sys_dept -- ---------------------------- -INSERT INTO `sys_dept` VALUES (100, 0, '0', 'A公司', 0, 'zr', '', '', '0', '0', 'admin', NULL, '', NULL, NULL); -INSERT INTO `sys_dept` VALUES (101, 100, '0,100', '研发部门', 1, 'zr', '', '', '0', '0', 'admin', NULL, '', NULL, NULL); -INSERT INTO `sys_dept` VALUES (102, 100, '0,100', '市场部门', 2, 'zr', '', '', '0', '0', 'admin', NULL, '', NULL, NULL); -INSERT INTO `sys_dept` VALUES (103, 100, '0,100', '测试部门', 3, 'zr', '', '', '0', '0', 'admin', NULL, '', NULL, NULL); -INSERT INTO `sys_dept` VALUES (104, 100, '0,100', '财务部门', 4, 'zr', '', '', '0', '0', 'admin', NULL, '', NULL, NULL); +INSERT INTO `sys_dept` VALUES (100, 0, '0', 'A公司', 0, 'DOAN', '', '', '0', '0', 'admin', NULL, '', NULL, NULL); +INSERT INTO `sys_dept` VALUES (101, 100, '0,100', '研发部门', 1, 'DOAN', '', '', '0', '0', 'admin', NULL, '', NULL, NULL); +INSERT INTO `sys_dept` VALUES (102, 100, '0,100', '市场部门', 2, 'DOAN', '', '', '0', '0', 'admin', NULL, '', NULL, NULL); +INSERT INTO `sys_dept` VALUES (103, 100, '0,100', '测试部门', 3, 'DOAN', '', '', '0', '0', 'admin', NULL, '', NULL, NULL); +INSERT INTO `sys_dept` VALUES (104, 100, '0,100', '财务部门', 4, 'DOAN', '', '', '0', '0', 'admin', NULL, '', NULL, NULL); -INSERT INTO `sys_dept` VALUES (200, 0, '0', 'B公司', 0, 'zr', '', '', '0', '0', 'admin', NULL, '', NULL, NULL); +INSERT INTO `sys_dept` VALUES (200, 0, '0', 'B公司', 0, 'DOAN', '', '', '0', '0', 'admin', NULL, '', NULL, NULL); -- ---------------------------- -- Table structure for sys_dict_data @@ -258,7 +258,7 @@ CREATE TABLE `sys_menu` ( INSERT INTO sys_menu VALUES (1, '系统管理', 0, 1, 'system', NULL, 0, 0, 'M', '0', '0', '', 'system', '', SYSDATE(), '', NULL, '系统管理目录', 'menu.system'); INSERT INTO sys_menu VALUES (2, '系统监控', 0, 2, 'monitor', NULL, 0, 0, 'M', '0', '0', '', 'monitor', '', SYSDATE(), '', NULL, '系统监控目录', 'menu.monitoring'); INSERT INTO sys_menu VALUES (3, '系统工具', 0, 3, 'tool', NULL, 0, 0, 'M', '0', '0', '', 'tool', '', SYSDATE(), '', NULL, '系统工具目录', 'menu.systemTools'); -INSERT INTO sys_menu VALUES (5, '官网地址', 0, 5, 'http://www.izhaorui.cn', NULL, 1, 0, 'M', '0', '0', '', 'link', '', SYSDATE(), '', NULL, 'Zr官网地址', 'menu.officialWebsite'); +INSERT INTO sys_menu VALUES (5, '官网地址', 0, 5, 'http://www.izhaorui.cn', NULL, 1, 0, 'M', '0', '0', '', 'link', '', SYSDATE(), '', NULL, 'DOAN官网地址', 'menu.officialWebsite'); INSERT INTO sys_menu VALUES (6, '控制台', 0, 0, 'dashboard', 'index_v1', 0, 0, 'C', '0', '0', '', 'dashboard', '', SYSDATE(), '', NULL, '', 'menu.dashboard'); -- 二级菜单 diff --git a/document/sqlserver/admin-sqlserver-初始化数据.sql b/document/sqlserver/admin-sqlserver-初始化数据.sql index daeb470..509c2d7 100644 --- a/document/sqlserver/admin-sqlserver-初始化数据.sql +++ b/document/sqlserver/admin-sqlserver-初始化数据.sql @@ -1,8 +1,8 @@ ---CREATE DATABASE ZrAdmin +--CREATE DATABASE DOANAdmin GO -USE ZrAdmin +USE DOANAdmin GO -INSERT INTO sys_tasks VALUES ('1410905433996136448', '测试任务', 'SYSTEM', '0 0/10 * * * ? ', 'ZR.Tasks', 'TaskScheduler.Job_SyncTest', NULL, 0, '2021-07-02 18:17:31', '9999-12-31 00:00:00', 1, 1, 1, NULL, '2021-07-02 18:17:23', '2021-07-02 18:17:31', 'admin', NULL, NULL, 1, '', '', ''); +INSERT INTO sys_tasks VALUES ('1410905433996136448', '测试任务', 'SYSTEM', '0 0/10 * * * ? ', 'DOAN.Tasks', 'TaskScheduler.Job_SyncTest', NULL, 0, '2021-07-02 18:17:31', '9999-12-31 00:00:00', 1, 1, 1, NULL, '2021-07-02 18:17:23', '2021-07-02 18:17:31', 'admin', NULL, NULL, 1, '', '', ''); GO INSERT INTO sys_dept(parentId, deptName, orderNum, status, delFlag, create_by, create_time) VALUES (0, 'XXX公司', 0,0, 0, 'admin', GETDATE() ); INSERT INTO sys_dept(parentId, deptName, orderNum, status, delFlag, create_by, create_time) VALUES (100, '研发部门',1,0, 0, 'admin', GETDATE()); diff --git a/document/sqlserver/admin-sqlserver-表字段说明导入.sql b/document/sqlserver/admin-sqlserver-表字段说明导入.sql index 44a4051..5405dde 100644 --- a/document/sqlserver/admin-sqlserver-表字段说明导入.sql +++ b/document/sqlserver/admin-sqlserver-表字段说明导入.sql @@ -1,6 +1,6 @@ ---CREATE DATABASE ZrAdmin +--CREATE DATABASE DOANAdmin GO -USE ZrAdmin +USE DOANAdmin GO EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'定时任务表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Sys_tasks' diff --git a/document/sqlserver/admin-sqlserver.sql b/document/sqlserver/admin-sqlserver.sql index f34e962..b4fd8f2 100644 --- a/document/sqlserver/admin-sqlserver.sql +++ b/document/sqlserver/admin-sqlserver.sql @@ -1,6 +1,6 @@ ---CREATE DATABASE ZrAdmin +--CREATE DATABASE DOANAdmin GO -USE ZrAdmin +USE DOANAdmin GO if OBJECT_ID(N'sys_tasks',N'U') is not NULL DROP TABLE sys_tasks GO diff --git a/document/sqlserver/admin-sqlserver20230515.sql b/document/sqlserver/admin-sqlserver20230515.sql index fb06eec..9a63a8d 100644 --- a/document/sqlserver/admin-sqlserver20230515.sql +++ b/document/sqlserver/admin-sqlserver20230515.sql @@ -1,6 +1,6 @@ ---CREATE DATABASE ZrAdmin +--CREATE DATABASE DOANAdmin GO -USE ZrAdmin +USE DOANAdmin GO if OBJECT_ID(N'sys_tasks',N'U') is not NULL DROP TABLE sys_tasks GO @@ -31,7 +31,7 @@ CREATE TABLE sys_tasks requestMethod VARCHAR(10) --请求方法 ) GO -INSERT INTO sys_tasks VALUES ('1410905433996136448', '测试任务', 'SYSTEM', '0 0/10 * * * ? ', 'ZR.Tasks', 'TaskScheduler.Job_SyncTest', NULL, 0, '2021-07-02 18:17:31', '9999-12-31 00:00:00', 1, 1, 1, NULL, '2021-07-02 18:17:23', '2021-07-02 18:17:31', 'admin', NULL, NULL, 1, '', '', ''); +INSERT INTO sys_tasks VALUES ('1410905433996136448', '测试任务', 'SYSTEM', '0 0/10 * * * ? ', 'DOAN.Tasks', 'TaskScheduler.Job_SyncTest', NULL, 0, '2021-07-02 18:17:31', '9999-12-31 00:00:00', 1, 1, 1, NULL, '2021-07-02 18:17:23', '2021-07-02 18:17:31', 'admin', NULL, NULL, 1, '', '', ''); GO if OBJECT_ID(N'sys_tasks_log',N'U') is not NULL DROP TABLE sys_tasks_log GO diff --git a/startup.bat b/startup.bat index 995577c..c0431b3 100644 --- a/startup.bat +++ b/startup.bat @@ -1 +1 @@ -dotnet watch --project ZR.Admin.WebApi run \ No newline at end of file +dotnet watch --project DOAN.Admin.WebApi run \ No newline at end of file