From cae21ff0339d487784bfb317a11a9a1d6fbe73dc Mon Sep 17 00:00:00 2001 From: wtp <1813748440@qq.com> Date: Tue, 27 Dec 2022 17:47:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8B=9B=E8=81=98=E8=80=85?= =?UTF-8?q?=E6=B1=82=E8=81=8C=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GDZZ.Application/Entity/Company.cs | 31 + GDZZ.Application/Entity/JobHunter.cs | 27 + .../Entity/JobhuntMessage.cs | 4 +- GDZZ.Application/Entity/RecruitMessage.cs | 63 + GDZZ.Application/Entity/SysArea.cs | 24 + .../GDZZ.Application.csproj | 8 +- GDZZ.Application/GDZZ.Application.xml | 667 + .../Magic.Application.xml | 52 +- .../README.md | 0 .../Service/Company/CompanyService.cs | 96 + .../Service/Company/Dto/CompanyDto.cs | 37 + .../Service/Company/Dto/CompanyInput.cs | 62 + .../Service/Company/Dto/CompanyOutput.cs | 36 + .../Service/Company/ICompanyService.cs | 16 + .../Service/JobHunter/Dto/JobHunterDto.cs | 32 + .../Service/JobHunter/Dto/JobHunterInput.cs | 57 + .../Service/JobHunter/Dto/JobHunterOutput.cs | 31 + .../Service/JobHunter/IJobHunterService.cs | 16 + .../Service/JobHunter/JobHunterService.cs | 96 + .../JobhuntMessage/Dto/JobhuntMessageDto.cs | 57 + .../JobhuntMessage/Dto/JobhuntMessageInput.cs | 100 + .../Dto/JobhuntMessageOutput.cs | 56 + .../JobhuntMessage/IJobhuntMessageService.cs | 16 + .../JobhuntMessage/JobhuntMessageService.cs | 99 + .../RecruitMessage/Dto/RecruitMessageDto.cs | 77 + .../RecruitMessage/Dto/RecruitMessageInput.cs | 114 + .../Dto/RecruitMessageOutput.cs | 76 + .../RecruitMessage/IRecruitMessageService.cs | 16 + .../RecruitMessage/RecruitMessageService.cs | 100 + .../Service/Test/ITestService.cs | 2 +- .../Service/Test/TestService.cs | 6 +- .../Startup.cs | 2 +- .../applicationsettings.json | 0 .../GDZZ.CodeFirst.csproj | 2 +- .../Program.cs | 18 +- .../SeedData/DocumentationSeedData.cs | 6 +- .../SeedData/ISqlSugarEntitySeedData.cs | 2 +- .../SeedData/SysAppSeedData.cs | 6 +- .../SeedData/SysCodeGenConfigSeedData.cs | 6 +- GDZZ.CodeFirst/SeedData/SysCodeGenSeedData.cs | 13 + .../SeedData/SysConfigSeedData.cs | 6 +- .../SeedData/SysDictDataSeedData.cs | 6 +- .../SeedData/SysDictTypeSeedData.cs | 6 +- .../SeedData/SysEmpPosSeedData.cs | 6 +- .../SeedData/SysEmpSeedData.cs | 6 +- .../SeedData/SysFileSeedData.cs | 6 +- .../SeedData/SysMenuSeedData.cs | 6 +- .../SeedData/SysNoticeSeedData.cs | 6 +- .../SeedData/SysNoticeUserSeedData.cs | 6 +- .../SeedData/SysOrgSeedData.cs | 6 +- .../SeedData/SysPosSeedData.cs | 6 +- .../SeedData/SysRoleDataScopeSeedData.cs | 6 +- .../SeedData/SysRoleMenuSeedData.cs | 6 +- .../SeedData/SysRoleSeedData.cs | 6 +- .../SeedData/SysTenantSeedData.cs | 6 +- .../SeedData/SysTestSeedData.cs | 6 +- .../SeedData/SysTimerSeedData.cs | 6 +- .../SeedData/SysUserDataScopeSeedData.cs | 6 +- .../SeedData/SysUserRoleSeedData.cs | 6 +- .../SeedData/SysUserSeedData.cs | 6 +- .../SqlSugarHelper.cs | 6 +- .../Attributes/OpLogAttribute.cs | 2 +- .../Attributes/SqlSugarUnitOfWorkAttribute.cs | 2 +- {Magic.Core => GDZZ.Core}/Cache/ICache.cs | 2 +- .../Cache/MemoryCache.cs | 2 +- {Magic.Core => GDZZ.Core}/Cache/RedisCache.cs | 2 +- .../Cache/SqlSugarCache.cs | 2 +- .../Captcha/ClickWord/ClickWordCaptcha.cs | 2 +- .../ClickWord/ClickWordCaptchaInput.cs | 2 +- .../ClickWord/ClickWordCaptchaResult.cs | 2 +- .../Captcha/ClickWord/IClickWordCaptcha.cs | 2 +- .../Captcha/General/GeneralCaptcha.cs | 2 +- .../Captcha/General/GeneralCaptchaInput.cs | 2 +- .../Captcha/General/IGeneralCaptcha.cs | 2 +- .../ConfigOption/ConfigOptions.cs | 2 +- {Magic.Core => GDZZ.Core}/Const/ClaimConst.cs | 2 +- .../Const/CommonConst.cs | 4 +- .../Entity/DBEntityTenant.cs | 2 +- .../Entity/DEntityBase.cs | 2 +- .../Entity/Documentation.cs | 2 +- {Magic.Core => GDZZ.Core}/Entity/SysApp.cs | 2 +- .../Entity/SysCodeGen.cs | 2 +- .../Entity/SysCodeGenConfig.cs | 2 +- {Magic.Core => GDZZ.Core}/Entity/SysConfig.cs | 2 +- .../Entity/SysDictData.cs | 2 +- .../Entity/SysDictType.cs | 2 +- {Magic.Core => GDZZ.Core}/Entity/SysEmp.cs | 2 +- .../Entity/SysEmpExtOrgPos.cs | 2 +- {Magic.Core => GDZZ.Core}/Entity/SysEmpPos.cs | 2 +- {Magic.Core => GDZZ.Core}/Entity/SysFile.cs | 2 +- .../Entity/SysLogAudit.cs | 2 +- {Magic.Core => GDZZ.Core}/Entity/SysLogEx.cs | 2 +- {Magic.Core => GDZZ.Core}/Entity/SysLogOp.cs | 2 +- {Magic.Core => GDZZ.Core}/Entity/SysLogVis.cs | 2 +- {Magic.Core => GDZZ.Core}/Entity/SysMenu.cs | 2 +- {Magic.Core => GDZZ.Core}/Entity/SysNotice.cs | 2 +- .../Entity/SysNoticeUser.cs | 2 +- .../Entity/SysOauthUser.cs | 2 +- .../Entity/SysOnlineUser.cs | 2 +- {Magic.Core => GDZZ.Core}/Entity/SysOrg.cs | 2 +- {Magic.Core => GDZZ.Core}/Entity/SysPos.cs | 2 +- {Magic.Core => GDZZ.Core}/Entity/SysRole.cs | 2 +- .../Entity/SysRoleDataScope.cs | 2 +- .../Entity/SysRoleMenu.cs | 2 +- {Magic.Core => GDZZ.Core}/Entity/SysTenant.cs | 2 +- {Magic.Core => GDZZ.Core}/Entity/SysTimer.cs | 4 +- {Magic.Core => GDZZ.Core}/Entity/SysUser.cs | 2 +- .../Entity/SysUserDataScope.cs | 2 +- .../Entity/SysUserRole.cs | 2 +- {Magic.Core => GDZZ.Core}/Entity/Test.cs | 2 +- {Magic.Core => GDZZ.Core}/Enum/AdminType.cs | 2 +- {Magic.Core => GDZZ.Core}/Enum/CacheType.cs | 2 +- .../Enum/CommonStatus.cs | 2 +- {Magic.Core => GDZZ.Core}/Enum/DataOpType.cs | 2 +- .../Enum/DataScopeType.cs | 2 +- .../Enum/DocumentType.cs | 2 +- {Magic.Core => GDZZ.Core}/Enum/ErrorCode.cs | 2 +- .../Enum/FileExtensionEnum.cs | 2 +- .../Enum/FileLocation.cs | 2 +- {Magic.Core => GDZZ.Core}/Enum/FilterType.cs | 2 +- {Magic.Core => GDZZ.Core}/Enum/Gender.cs | 2 +- .../Enum/HttpStatusCode.cs | 2 +- {Magic.Core => GDZZ.Core}/Enum/LoginType.cs | 2 +- .../Enum/MenuOpenType.cs | 2 +- {Magic.Core => GDZZ.Core}/Enum/MenuType.cs | 2 +- {Magic.Core => GDZZ.Core}/Enum/MenuWeight.cs | 2 +- .../Enum/NoticeStatus.cs | 2 +- {Magic.Core => GDZZ.Core}/Enum/NoticeType.cs | 2 +- .../Enum/NoticeUserStatus.cs | 2 +- .../Enum/QueryTypeEnum.cs | 2 +- .../Enum/RequestTypeEnum.cs | 2 +- {Magic.Core => GDZZ.Core}/Enum/RoleType.cs | 2 +- .../Enum/TenantTypeEnum.cs | 2 +- {Magic.Core => GDZZ.Core}/Enum/YesOrNot.cs | 2 +- .../EventSubscriber/LogEventSubscriber.cs | 4 +- .../Extension/BStyleServiceExtension.cs | 4 +- .../Extension/DataFilterExtensions.cs | 2 +- .../Extension/DictionaryExtensions.cs | 2 +- .../Extension/EnumExtensions.cs | 2 +- .../Extension/InputBase.cs | 2 +- .../Extension/PageInputOrder.cs | 2 +- .../Extension/PageResult.cs | 2 +- .../Extension/PagedQueryableExtensions.cs | 2 +- .../Extension/RestfulResultProvider.cs | 2 +- .../Filter/LogExceptionHandler.cs | 4 +- .../Filter/RequestActionFilter.cs | 4 +- .../Filter/SqlSugarUnitOfWorkFilter.cs | 2 +- .../GDZZ.Core.csproj | 8 +- GDZZ.Core/GDZZ.Core.xml | 10408 ++++++++++++++++ {Magic.Core => GDZZ.Core}/Hubs/ChatHub.cs | 6 +- {Magic.Core => GDZZ.Core}/Hubs/IChatClient.cs | 4 +- {Magic.Core => GDZZ.Core}/Job/LogJobWorker.cs | 6 +- .../JsonConverter/LongJsonConverter.cs | 2 +- .../Component/ConsoleForamtComponent.cs | 2 +- .../Logging/Component/LoggingFileComponent.cs | 2 +- .../Extensions/LoggingFileExtensions.cs | 2 +- .../Logging/Format/ConsoleForamt.cs | 2 +- .../Logging/Format/CustomColorOptions.cs | 2 +- .../Logging/Format/TextWriterExtensions.cs | 2 +- {Magic.Core => GDZZ.Core}/Magic.Core.xml | 3716 +++--- .../Manager/UserManager.cs | 2 +- .../OAuth/IWechatOAuth.cs | 2 +- {Magic.Core => GDZZ.Core}/OAuth/TokenModel.cs | 2 +- .../OAuth/UserInfoModel.cs | 2 +- .../OAuth/WechatOAuth.cs | 2 +- .../Service/App/Dto/AppInput.cs | 2 +- .../Service/App/Dto/AppOutput.cs | 2 +- .../Service/App/ISysAppService.cs | 4 +- .../Service/App/SysAppService.cs | 4 +- .../Service/Auth/AuthService.cs | 4 +- .../Service/Auth/Dto/LoginInput.cs | 2 +- .../Service/Auth/Dto/LoginOutput.cs | 2 +- .../Service/Auth/Dto/RegistInput.cs | 2 +- .../Service/Auth/IAuthService.cs | 2 +- .../Service/Cache/ISysCacheService.cs | 2 +- .../Service/Cache/SysCacheService.cs | 2 +- .../Service/CodeGen/CodeGenConfigService.cs | 4 +- .../Service/CodeGen/CodeGenService.cs | 8 +- .../Service/CodeGen/Dto/CodeGenConfig.cs | 2 +- .../Service/CodeGen/Dto/CodeGenInput.cs | 2 +- .../Service/CodeGen/Dto/CodeGenOutput.cs | 2 +- .../Service/CodeGen/Dto/TableColumnOuput.cs | 2 +- .../Service/CodeGen/Dto/TableOutput.cs | 2 +- .../Service/CodeGen/Dto/XnCodeGenOutput.cs | 4 +- .../Service/CodeGen/ICodeGenConfigService.cs | 4 +- .../Service/CodeGen/ICodeGenService.cs | 4 +- .../Service/Common/CommonService.cs | 2 +- .../Service/Common/ICommonService.cs | 2 +- .../Service/Config/Dto/ConfigInput.cs | 2 +- .../Service/Config/ISysConfigService.cs | 4 +- .../Service/Config/SysConfigService.cs | 4 +- .../Service/DataBase/DataBaseManager.cs | 8 +- .../Service/DataBase/Dto/CreateEntityInput.cs | 4 +- .../Service/DataBase/Dto/DbColumnInfoInput.cs | 2 +- .../DataBase/Dto/DbColumnInfoOutput.cs | 2 +- .../Service/DataBase/Dto/DbTableInfoInput.cs | 2 +- .../Service/DataBase/Dto/EditColumnInput.cs | 2 +- .../Service/DataBase/Dto/EditTableInput.cs | 2 +- .../Extension/DbMaintenanceExtension.cs | 2 +- .../Service/DataBase/IDataBaseManager.cs | 2 +- .../Service/Dict/Dto/DictDataInput.cs | 2 +- .../Service/Dict/Dto/DictDataOutput.cs | 2 +- .../Service/Dict/Dto/DictTreeOutput.cs | 2 +- .../Service/Dict/Dto/DictTypeInput.cs | 2 +- .../Service/Dict/ISysDictDataService.cs | 4 +- .../Service/Dict/ISysDictTypeService.cs | 2 +- .../Service/Dict/SysDictDataService.cs | 4 +- .../Service/Dict/SysDictTypeService.cs | 4 +- .../Service/Document/DocumentService.cs | 4 +- .../Service/Document/Dto/DocumentDto.cs | 2 +- .../Service/Document/Dto/DocumentInput.cs | 2 +- .../Service/Document/Dto/DocumentOutput.cs | 2 +- .../Service/Document/IDocumentService.cs | 4 +- .../Service/Emp/Dto/EmpExtOrgPosOutput.cs | 2 +- .../Service/Emp/Dto/EmpOutput.cs | 2 +- .../Service/Emp/Dto/EmpOutput2.cs | 2 +- .../Service/Emp/Dto/EmpPosOutput.cs | 2 +- .../Service/Emp/ISysEmpExtOrgPosService.cs | 2 +- .../Service/Emp/ISysEmpPosService.cs | 2 +- .../Service/Emp/ISysEmpService.cs | 4 +- .../Service/Emp/SysEmpExtOrgPosService.cs | 4 +- .../Service/Emp/SysEmpPosService.cs | 4 +- .../Service/Emp/SysEmpService.cs | 4 +- .../Service/Enum/Dto/EnumDataInput.cs | 2 +- .../Service/Enum/Dto/EnumDataOutput.cs | 2 +- .../Service/Enum/ISysEnumDataService.cs | 2 +- .../Service/Enum/SysEnumDataService.cs | 4 +- .../Service/File/Dto/FileInput.cs | 2 +- .../Service/File/Dto/FileOutput.cs | 2 +- .../Service/File/ISysFileService.cs | 4 +- .../Service/File/SysFileService.cs | 4 +- .../Service/Log/Dto/ExLogInput.cs | 2 +- .../Service/Log/Dto/ExLogOutput.cs | 2 +- .../Service/Log/Dto/OpLogInput.cs | 2 +- .../Service/Log/Dto/OpLogOutput.cs | 2 +- .../Service/Log/Dto/VisLogInput.cs | 2 +- .../Service/Log/Dto/VisLogOutput.cs | 2 +- .../Service/Log/ISysExLogService.cs | 2 +- .../Service/Log/ISysOpLogService.cs | 2 +- .../Service/Log/ISysVisLogService.cs | 2 +- .../Service/Log/SysExLogService.cs | 4 +- .../Service/Log/SysOpLogService.cs | 4 +- .../Service/Log/SysVisLogService.cs | 4 +- .../Service/Menu/Dto/AntDesignTreeNode.cs | 2 +- .../Service/Menu/Dto/MenuInput.cs | 2 +- .../Service/Menu/Dto/MenuOutput.cs | 2 +- .../Service/Menu/Dto/MenuTreeAppOutput.cs | 2 +- .../Service/Menu/Dto/MenuTreeOutput.cs | 2 +- .../Service/Menu/Dto/OwnMenuOutput.cs | 2 +- .../Service/Menu/ISysMenuService.cs | 2 +- .../Service/Menu/SysMenuService.cs | 4 +- .../Service/Monitor/IMachineService.cs | 2 +- .../Service/Monitor/MachineService.cs | 2 +- .../Service/Notice/Dto/NoticeBase.cs | 2 +- .../Service/Notice/Dto/NoticeDetailOutput.cs | 2 +- .../Service/Notice/Dto/NoticeInput.cs | 2 +- .../Service/Notice/Dto/NoticeReceiveOutput.cs | 2 +- .../Service/Notice/ISysNoticeService.cs | 2 +- .../Service/Notice/ISysNoticeUserService.cs | 4 +- .../Service/Notice/SysNoticeService.cs | 4 +- .../Service/Notice/SysNoticeUserService.cs | 4 +- .../Service/OAuth/ISysOauthService.cs | 2 +- .../Service/OAuth/SysOauthService.cs | 4 +- .../OnlineUser/ISysOnlineUserService.cs | 4 +- .../OnlineUser/SysOnlineUserService.cs | 6 +- .../Service/Org/Dto/OrgInput.cs | 2 +- .../Service/Org/Dto/OrgOutput.cs | 2 +- .../Service/Org/Dto/OrgTreeNode.cs | 2 +- .../Service/Org/ISysOrgService.cs | 4 +- .../Service/Org/SysOrgService.cs | 4 +- .../Service/Pos/Dto/PosInput.cs | 2 +- .../Service/Pos/ISysPosService.cs | 4 +- .../Service/Pos/SysPosService.cs | 4 +- .../Service/Role/Dto/RoleInput.cs | 2 +- .../Service/Role/Dto/RoleOutput.cs | 2 +- .../Service/Role/ISysRoleDataScopeService.cs | 2 +- .../Service/Role/ISysRoleMenuService.cs | 2 +- .../Service/Role/ISysRoleService.cs | 4 +- .../Service/Role/SysRoleDataScopeService.cs | 4 +- .../Service/Role/SysRoleMenuService.cs | 4 +- .../Service/Role/SysRoleService.cs | 4 +- .../Service/Tenant/Dto/TenantInput.cs | 2 +- .../Service/Tenant/Dto/TenantOutput.cs | 2 +- .../Service/Tenant/ISysTenantService.cs | 4 +- .../Service/Tenant/SysTenantService.cs | 4 +- .../Service/Timer/Dto/JobInput.cs | 2 +- .../Service/Timer/Dto/JobOutput.cs | 2 +- .../Service/Timer/ISysTimerService.cs | 2 +- .../Service/Timer/SysTimerService.cs | 4 +- .../Service/Trash/Dto/TrashDto.cs | 2 +- .../Service/Trash/Dto/TrashOutput.cs | 2 +- .../Service/Trash/ITrashService.cs | 2 +- .../Service/Trash/TrashService.cs | 4 +- .../Service/User/Dto/AuthToken.cs | 2 +- .../Service/User/Dto/AuthUserInput.cs | 2 +- .../Service/User/Dto/UserInput.cs | 2 +- .../Service/User/Dto/UserOutput.cs | 2 +- .../Service/User/ISysUserDataScopeService.cs | 2 +- .../Service/User/ISysUserRoleService.cs | 2 +- .../Service/User/ISysUserService.cs | 2 +- .../Service/User/SysUserDataScopeService.cs | 4 +- .../Service/User/SysUserRoleService.cs | 4 +- .../Service/User/SysUserService.cs | 4 +- .../SimpleQueue/SimpleQueue.cs | 2 +- .../SqlSugar/SqlSugarPagedList.cs | 2 +- .../SqlSugar/SqlSugarRepository.cs | 2 +- .../SqlSugar/SqlSugarSetup.cs | 4 +- {Magic.Core => GDZZ.Core}/Util/CodeGenUtil.cs | 2 +- .../Util/Enum/EnumEntity.cs | 2 +- .../Util/Enum/EnumUtil.cs | 2 +- .../Util/Extension/Extension.DateTime.cs | 2 +- .../Util/Extension/Extension.Validate.cs | 2 +- .../Util/Extension/Extensions.cs | 2 +- .../Util/Http/HttpNewUtil.cs | 2 +- .../Util/Http/WeatherUtil.cs | 2 +- .../Util/Image/ImageUtil.cs | 2 +- {Magic.Core => GDZZ.Core}/Util/JsonUtil.cs | 2 +- {Magic.Core => GDZZ.Core}/Util/MachineUtil.cs | 2 +- .../Util/MiniProgram/MiniProgramUtil.cs | 2 +- .../Util/OSSClientUtil.cs | 2 +- .../Util/ReflectionUtil.cs | 2 +- .../Util/String/Base64Util.cs | 2 +- .../Util/String/ValidatorUtil.cs | 2 +- .../Util/TreeBuildUtil.cs | 2 +- {Magic.Core => GDZZ.Core}/logo.png | Bin .../Entity/FlcCustomForm.cs | 2 +- .../Entity/FlcDBEntityTenant.cs | 2 +- .../Entity/FlcDEntityBase.cs | 2 +- .../Entity/FlcFlowInstanceOperationHistory.cs | 2 +- .../FlcFlowInstanceTransitionHistory.cs | 2 +- .../Entity/FlcFlowinstance.cs | 4 +- .../Entity/FlcFlowscheme.cs | 4 +- .../Entity/FlcForm.cs | 4 +- .../Entity/FlcInstanceEntity.cs | 2 +- .../Entity/Flow/Flow.cs | 2 +- .../Entity/Flow/FlowArea.cs | 2 +- .../Entity/Flow/FlowLine.cs | 2 +- .../Entity/Flow/FlowNode.cs | 2 +- .../Entity/Flow/FlowRuntime.cs | 4 +- .../Entity/Flow/FormUtil.cs | 4 +- .../Entity/Flow/FormValue.cs | 2 +- .../Entity/Flow/NodeDesignate.cs | 2 +- .../Entity/Flow/Verification.cs | 2 +- .../Enum/CommonFrmType.cs | 2 +- .../Flowinstance/Dto/FlcFlowinstanceDto.cs | 4 +- .../Flowinstance/Dto/FlcFlowinstanceInput.cs | 4 +- .../Flowinstance/Dto/FlcFlowinstanceOutput.cs | 6 +- .../Flowinstance/FlcCustomFormService.cs | 6 +- .../Flowinstance/FlcFlowinstanceService.cs | 14 +- .../Flowinstance/IFlcCustomFormService.cs | 2 +- .../Flowinstance/IFlcFlowinstanceService.cs | 4 +- .../Flowscheme/Dto/FlcFlowschemeInput.cs | 4 +- .../Flowscheme/Dto/FlcFlowschemeOutput.cs | 2 +- .../Flowscheme/FlcFlowschemeService.cs | 10 +- .../Flowscheme/IFlcFlowschemeService.cs | 2 +- .../FormManage/Dto/FlcFormInput.cs | 4 +- .../FormManage/Dto/FlcFormOutput.cs | 2 +- .../FormManage/FlcFormManageService.cs | 10 +- .../FormManage/IFlcFormManageService.cs | 4 +- .../GDZZ.FlowCenter.csproj | 4 +- GDZZ.FlowCenter/GDZZ.FlowCenter.xml | 1871 +++ .../Magic.FlowCenter.xml | 686 +- .../Startup.cs | 2 +- .../GDZZ.Web.Core.csproj | 12 +- .../GDZZ.Web.Core.xml | 8 +- .../Handlers/JwtHandler.cs | 6 +- {Magic.Web.Core => GDZZ.Web.Core}/Startup.cs | 6 +- .../applicationconfig.json | 10 +- GDZZ.Web.Core/dbsettings.json | 22 + .../.config/dotnet-tools.json | 0 .../Controllers/ValuesController.cs | 2 +- .../Dockerfile | 4 +- .../GDZZ.Web.Entry.csproj | 6 +- .../Magic.db => GDZZ.Web.Entry/GDZZ.db | Bin .../Program.cs | 2 +- .../Properties/launchSettings.json | 2 +- .../SingleFilePublish.cs | 10 +- .../appsettings.Development.json | 0 .../appsettings.json | 0 {Magic.Web.Entry => GDZZ.Web.Entry}/flow.db | Bin .../jenkins-docker.sh | 2 +- .../~0db08c10b01555b1d888f11248a2cc64.dll | Bin .../~159c422bcf43edda31a9bd75256b79f1.dll | Bin .../~19108359356e5efe42dcdf645a2eebfc.dll | Bin .../~2651e0999c391a0b5aba580191e2d6c6.dll | Bin .../~4a6ee469d4d39086077630dd2bed9f1e.dll | Bin .../~59a6eeb9747854ce8e0b0de6194ab0fa.dll | Bin .../~5d908a873d5ce8cd99e004db7bfaaf6c.dll | Bin .../~9e972f810c110f86c9fe70c0e0a4c1fc.dll | Bin .../~bc7b58f116bac34d7af4bef34a87f620.dll | Bin .../~c55ba40db5a21a311a7ab81fad6917a9.dll | Bin .../~dd0b7d0d8022b1fbe3eae0c827b159cf.dll | Bin .../~f322dcae78db006b53da5f26e21dba3b.dll | Bin .../~faa2e001498506525726c745a81c3bef.dll | Bin .../~fb1a575125f1424c84f5d49478aad029.dll | Bin .../~fe0c69bed93ec0b64ba42ef010e76497.dll | Bin .../wwwroot/Captcha/Font/zkkht.ttf | Bin .../wwwroot/Captcha/Image/1.jpg | Bin .../wwwroot/Captcha/Image/2.jpg | Bin .../wwwroot/Captcha/Image/3.jpg | Bin .../wwwroot/Captcha/Image/4.jpg | Bin .../wwwroot/Captcha/Image/5.jpg | Bin .../wwwroot/Captcha/Image/6.jpg | Bin .../wwwroot/Captcha/Image/7.jpg | Bin .../wwwroot/Captcha/Image/8.jpg | Bin .../wwwroot/Template/Dto.cs.vm | 2 +- .../wwwroot/Template/Entity.cs.vm | 4 +- .../wwwroot/Template/IService.cs.vm | 4 +- .../wwwroot/Template/Input.cs.vm | 2 +- .../wwwroot/Template/Manage.js.vm | 0 .../wwwroot/Template/Output.cs.vm | 0 .../wwwroot/Template/Service.cs.vm | 4 +- .../wwwroot/Template/addForm.vue.vm | 0 .../wwwroot/Template/editForm.vue.vm | 0 .../wwwroot/Template/index.vue.vm | 0 .../wwwroot/Upload/Avatar/167456009080901.png | Bin .../wwwroot/Upload/Avatar/167456254419013.png | Bin .../Upload/Avatar/175614800654405.jpeg | Bin .../wwwroot/Upload/Avatar/188632919339077.png | Bin .../wwwroot/Upload/Avatar/263006401138757.jpg | Bin .../Document/2022/4/27/282067842687045.png | Bin .../Document/2022/4/27/282118658961477.png | Bin Magic.sln => GDZZ.sln | 12 +- Magic.Application/Entity/RecruitMessage.cs | 63 - Magic.Application/Entity/SysArea.cs | 24 - .../SeedData/SysCodeGenSeedData.cs | 13 - Magic.Web.Core/dbsettings.json | 22 - 427 files changed, 17082 insertions(+), 2888 deletions(-) create mode 100644 GDZZ.Application/Entity/Company.cs create mode 100644 GDZZ.Application/Entity/JobHunter.cs rename {Magic.Application => GDZZ.Application}/Entity/JobhuntMessage.cs (96%) create mode 100644 GDZZ.Application/Entity/RecruitMessage.cs create mode 100644 GDZZ.Application/Entity/SysArea.cs rename Magic.Application/Magic.Application.csproj => GDZZ.Application/GDZZ.Application.csproj (69%) create mode 100644 GDZZ.Application/GDZZ.Application.xml rename {Magic.Application => GDZZ.Application}/Magic.Application.xml (54%) rename {Magic.Application => GDZZ.Application}/README.md (100%) create mode 100644 GDZZ.Application/Service/Company/CompanyService.cs create mode 100644 GDZZ.Application/Service/Company/Dto/CompanyDto.cs create mode 100644 GDZZ.Application/Service/Company/Dto/CompanyInput.cs create mode 100644 GDZZ.Application/Service/Company/Dto/CompanyOutput.cs create mode 100644 GDZZ.Application/Service/Company/ICompanyService.cs create mode 100644 GDZZ.Application/Service/JobHunter/Dto/JobHunterDto.cs create mode 100644 GDZZ.Application/Service/JobHunter/Dto/JobHunterInput.cs create mode 100644 GDZZ.Application/Service/JobHunter/Dto/JobHunterOutput.cs create mode 100644 GDZZ.Application/Service/JobHunter/IJobHunterService.cs create mode 100644 GDZZ.Application/Service/JobHunter/JobHunterService.cs create mode 100644 GDZZ.Application/Service/JobhuntMessage/Dto/JobhuntMessageDto.cs create mode 100644 GDZZ.Application/Service/JobhuntMessage/Dto/JobhuntMessageInput.cs create mode 100644 GDZZ.Application/Service/JobhuntMessage/Dto/JobhuntMessageOutput.cs create mode 100644 GDZZ.Application/Service/JobhuntMessage/IJobhuntMessageService.cs create mode 100644 GDZZ.Application/Service/JobhuntMessage/JobhuntMessageService.cs create mode 100644 GDZZ.Application/Service/RecruitMessage/Dto/RecruitMessageDto.cs create mode 100644 GDZZ.Application/Service/RecruitMessage/Dto/RecruitMessageInput.cs create mode 100644 GDZZ.Application/Service/RecruitMessage/Dto/RecruitMessageOutput.cs create mode 100644 GDZZ.Application/Service/RecruitMessage/IRecruitMessageService.cs create mode 100644 GDZZ.Application/Service/RecruitMessage/RecruitMessageService.cs rename {Magic.Application => GDZZ.Application}/Service/Test/ITestService.cs (83%) rename {Magic.Application => GDZZ.Application}/Service/Test/TestService.cs (95%) rename {Magic.Application => GDZZ.Application}/Startup.cs (86%) rename {Magic.Application => GDZZ.Application}/applicationsettings.json (100%) rename Magic.CodeFirst/Magic.CodeFirst.csproj => GDZZ.CodeFirst/GDZZ.CodeFirst.csproj (78%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/Program.cs (94%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/DocumentationSeedData.cs (96%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/ISqlSugarEntitySeedData.cs (84%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysAppSeedData.cs (95%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysCodeGenConfigSeedData.cs (99%) create mode 100644 GDZZ.CodeFirst/SeedData/SysCodeGenSeedData.cs rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysConfigSeedData.cs (99%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysDictDataSeedData.cs (99%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysDictTypeSeedData.cs (99%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysEmpPosSeedData.cs (83%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysEmpSeedData.cs (90%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysFileSeedData.cs (93%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysMenuSeedData.cs (99%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysNoticeSeedData.cs (99%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysNoticeUserSeedData.cs (96%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysOrgSeedData.cs (97%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysPosSeedData.cs (89%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysRoleDataScopeSeedData.cs (82%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysRoleMenuSeedData.cs (99%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysRoleSeedData.cs (96%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysTenantSeedData.cs (95%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysTestSeedData.cs (97%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysTimerSeedData.cs (96%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysUserDataScopeSeedData.cs (85%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysUserRoleSeedData.cs (87%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SeedData/SysUserSeedData.cs (97%) rename {Magic.CodeFirst => GDZZ.CodeFirst}/SqlSugarHelper.cs (95%) rename {Magic.Core => GDZZ.Core}/Attributes/OpLogAttribute.cs (91%) rename {Magic.Core => GDZZ.Core}/Attributes/SqlSugarUnitOfWorkAttribute.cs (98%) rename {Magic.Core => GDZZ.Core}/Cache/ICache.cs (99%) rename {Magic.Core => GDZZ.Core}/Cache/MemoryCache.cs (99%) rename {Magic.Core => GDZZ.Core}/Cache/RedisCache.cs (99%) rename {Magic.Core => GDZZ.Core}/Cache/SqlSugarCache.cs (98%) rename {Magic.Core => GDZZ.Core}/Captcha/ClickWord/ClickWordCaptcha.cs (99%) rename {Magic.Core => GDZZ.Core}/Captcha/ClickWord/ClickWordCaptchaInput.cs (96%) rename {Magic.Core => GDZZ.Core}/Captcha/ClickWord/ClickWordCaptchaResult.cs (98%) rename {Magic.Core => GDZZ.Core}/Captcha/ClickWord/IClickWordCaptcha.cs (89%) rename {Magic.Core => GDZZ.Core}/Captcha/General/GeneralCaptcha.cs (99%) rename {Magic.Core => GDZZ.Core}/Captcha/General/GeneralCaptchaInput.cs (96%) rename {Magic.Core => GDZZ.Core}/Captcha/General/IGeneralCaptcha.cs (84%) rename {Magic.Core => GDZZ.Core}/ConfigOption/ConfigOptions.cs (99%) rename {Magic.Core => GDZZ.Core}/Const/ClaimConst.cs (96%) rename {Magic.Core => GDZZ.Core}/Const/CommonConst.cs (93%) rename {Magic.Core => GDZZ.Core}/Entity/DBEntityTenant.cs (91%) rename {Magic.Core => GDZZ.Core}/Entity/DEntityBase.cs (99%) rename {Magic.Core => GDZZ.Core}/Entity/Documentation.cs (98%) rename {Magic.Core => GDZZ.Core}/Entity/SysApp.cs (97%) rename {Magic.Core => GDZZ.Core}/Entity/SysCodeGen.cs (98%) rename {Magic.Core => GDZZ.Core}/Entity/SysCodeGenConfig.cs (99%) rename {Magic.Core => GDZZ.Core}/Entity/SysConfig.cs (98%) rename {Magic.Core => GDZZ.Core}/Entity/SysDictData.cs (97%) rename {Magic.Core => GDZZ.Core}/Entity/SysDictType.cs (97%) rename {Magic.Core => GDZZ.Core}/Entity/SysEmp.cs (96%) rename {Magic.Core => GDZZ.Core}/Entity/SysEmpExtOrgPos.cs (95%) rename {Magic.Core => GDZZ.Core}/Entity/SysEmpPos.cs (94%) rename {Magic.Core => GDZZ.Core}/Entity/SysFile.cs (98%) rename {Magic.Core => GDZZ.Core}/Entity/SysLogAudit.cs (98%) rename {Magic.Core => GDZZ.Core}/Entity/SysLogEx.cs (98%) rename {Magic.Core => GDZZ.Core}/Entity/SysLogOp.cs (99%) rename {Magic.Core => GDZZ.Core}/Entity/SysLogVis.cs (98%) rename {Magic.Core => GDZZ.Core}/Entity/SysMenu.cs (99%) rename {Magic.Core => GDZZ.Core}/Entity/SysNotice.cs (98%) rename {Magic.Core => GDZZ.Core}/Entity/SysNoticeUser.cs (96%) rename {Magic.Core => GDZZ.Core}/Entity/SysOauthUser.cs (98%) rename {Magic.Core => GDZZ.Core}/Entity/SysOnlineUser.cs (98%) rename {Magic.Core => GDZZ.Core}/Entity/SysOrg.cs (98%) rename {Magic.Core => GDZZ.Core}/Entity/SysPos.cs (97%) rename {Magic.Core => GDZZ.Core}/Entity/SysRole.cs (98%) rename {Magic.Core => GDZZ.Core}/Entity/SysRoleDataScope.cs (94%) rename {Magic.Core => GDZZ.Core}/Entity/SysRoleMenu.cs (94%) rename {Magic.Core => GDZZ.Core}/Entity/SysTenant.cs (98%) rename {Magic.Core => GDZZ.Core}/Entity/SysTimer.cs (97%) rename {Magic.Core => GDZZ.Core}/Entity/SysUser.cs (98%) rename {Magic.Core => GDZZ.Core}/Entity/SysUserDataScope.cs (94%) rename {Magic.Core => GDZZ.Core}/Entity/SysUserRole.cs (94%) rename {Magic.Core => GDZZ.Core}/Entity/Test.cs (98%) rename {Magic.Core => GDZZ.Core}/Enum/AdminType.cs (95%) rename {Magic.Core => GDZZ.Core}/Enum/CacheType.cs (93%) rename {Magic.Core => GDZZ.Core}/Enum/CommonStatus.cs (94%) rename {Magic.Core => GDZZ.Core}/Enum/DataOpType.cs (97%) rename {Magic.Core => GDZZ.Core}/Enum/DataScopeType.cs (96%) rename {Magic.Core => GDZZ.Core}/Enum/DocumentType.cs (93%) rename {Magic.Core => GDZZ.Core}/Enum/ErrorCode.cs (99%) rename {Magic.Core => GDZZ.Core}/Enum/FileExtensionEnum.cs (95%) rename {Magic.Core => GDZZ.Core}/Enum/FileLocation.cs (96%) rename {Magic.Core => GDZZ.Core}/Enum/FilterType.cs (91%) rename {Magic.Core => GDZZ.Core}/Enum/Gender.cs (94%) rename {Magic.Core => GDZZ.Core}/Enum/HttpStatusCode.cs (99%) rename {Magic.Core => GDZZ.Core}/Enum/LoginType.cs (96%) rename {Magic.Core => GDZZ.Core}/Enum/MenuOpenType.cs (95%) rename {Magic.Core => GDZZ.Core}/Enum/MenuType.cs (94%) rename {Magic.Core => GDZZ.Core}/Enum/MenuWeight.cs (93%) rename {Magic.Core => GDZZ.Core}/Enum/NoticeStatus.cs (95%) rename {Magic.Core => GDZZ.Core}/Enum/NoticeType.cs (94%) rename {Magic.Core => GDZZ.Core}/Enum/NoticeUserStatus.cs (93%) rename {Magic.Core => GDZZ.Core}/Enum/QueryTypeEnum.cs (97%) rename {Magic.Core => GDZZ.Core}/Enum/RequestTypeEnum.cs (94%) rename {Magic.Core => GDZZ.Core}/Enum/RoleType.cs (94%) rename {Magic.Core => GDZZ.Core}/Enum/TenantTypeEnum.cs (88%) rename {Magic.Core => GDZZ.Core}/Enum/YesOrNot.cs (92%) rename {Magic.Core => GDZZ.Core}/EventSubscriber/LogEventSubscriber.cs (97%) rename {Magic.Core => GDZZ.Core}/Extension/BStyleServiceExtension.cs (94%) rename {Magic.Core => GDZZ.Core}/Extension/DataFilterExtensions.cs (99%) rename {Magic.Core => GDZZ.Core}/Extension/DictionaryExtensions.cs (98%) rename {Magic.Core => GDZZ.Core}/Extension/EnumExtensions.cs (99%) rename {Magic.Core => GDZZ.Core}/Extension/InputBase.cs (98%) rename {Magic.Core => GDZZ.Core}/Extension/PageInputOrder.cs (97%) rename {Magic.Core => GDZZ.Core}/Extension/PageResult.cs (97%) rename {Magic.Core => GDZZ.Core}/Extension/PagedQueryableExtensions.cs (97%) rename {Magic.Core => GDZZ.Core}/Extension/RestfulResultProvider.cs (99%) rename {Magic.Core => GDZZ.Core}/Filter/LogExceptionHandler.cs (97%) rename {Magic.Core => GDZZ.Core}/Filter/RequestActionFilter.cs (98%) rename {Magic.Core => GDZZ.Core}/Filter/SqlSugarUnitOfWorkFilter.cs (99%) rename Magic.Core/Magic.Core.csproj => GDZZ.Core/GDZZ.Core.csproj (93%) create mode 100644 GDZZ.Core/GDZZ.Core.xml rename {Magic.Core => GDZZ.Core}/Hubs/ChatHub.cs (96%) rename {Magic.Core => GDZZ.Core}/Hubs/IChatClient.cs (73%) rename {Magic.Core => GDZZ.Core}/Job/LogJobWorker.cs (99%) rename {Magic.Core => GDZZ.Core}/JsonConverter/LongJsonConverter.cs (98%) rename {Magic.Core => GDZZ.Core}/Logging/Component/ConsoleForamtComponent.cs (96%) rename {Magic.Core => GDZZ.Core}/Logging/Component/LoggingFileComponent.cs (98%) rename {Magic.Core => GDZZ.Core}/Logging/Extensions/LoggingFileExtensions.cs (98%) rename {Magic.Core => GDZZ.Core}/Logging/Format/ConsoleForamt.cs (99%) rename {Magic.Core => GDZZ.Core}/Logging/Format/CustomColorOptions.cs (92%) rename {Magic.Core => GDZZ.Core}/Logging/Format/TextWriterExtensions.cs (99%) rename {Magic.Core => GDZZ.Core}/Magic.Core.xml (63%) rename {Magic.Core => GDZZ.Core}/Manager/UserManager.cs (97%) rename {Magic.Core => GDZZ.Core}/OAuth/IWechatOAuth.cs (93%) rename {Magic.Core => GDZZ.Core}/OAuth/TokenModel.cs (98%) rename {Magic.Core => GDZZ.Core}/OAuth/UserInfoModel.cs (98%) rename {Magic.Core => GDZZ.Core}/OAuth/WechatOAuth.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/App/Dto/AppInput.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/App/Dto/AppOutput.cs (94%) rename {Magic.Core => GDZZ.Core}/Service/App/ISysAppService.cs (90%) rename {Magic.Core => GDZZ.Core}/Service/App/SysAppService.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/Auth/AuthService.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/Auth/Dto/LoginInput.cs (96%) rename {Magic.Core => GDZZ.Core}/Service/Auth/Dto/LoginOutput.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/Auth/Dto/RegistInput.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/Auth/IAuthService.cs (94%) rename {Magic.Core => GDZZ.Core}/Service/Cache/ISysCacheService.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/Cache/SysCacheService.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/CodeGen/CodeGenConfigService.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/CodeGen/CodeGenService.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/CodeGen/Dto/CodeGenConfig.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/CodeGen/Dto/CodeGenInput.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/CodeGen/Dto/CodeGenOutput.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/CodeGen/Dto/TableColumnOuput.cs (94%) rename {Magic.Core => GDZZ.Core}/Service/CodeGen/Dto/TableOutput.cs (95%) rename {Magic.Core => GDZZ.Core}/Service/CodeGen/Dto/XnCodeGenOutput.cs (94%) rename {Magic.Core => GDZZ.Core}/Service/CodeGen/ICodeGenConfigService.cs (89%) rename {Magic.Core => GDZZ.Core}/Service/CodeGen/ICodeGenService.cs (90%) rename {Magic.Core => GDZZ.Core}/Service/Common/CommonService.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Common/ICommonService.cs (88%) rename {Magic.Core => GDZZ.Core}/Service/Config/Dto/ConfigInput.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Config/ISysConfigService.cs (91%) rename {Magic.Core => GDZZ.Core}/Service/Config/SysConfigService.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/DataBase/DataBaseManager.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/DataBase/Dto/CreateEntityInput.cs (89%) rename {Magic.Core => GDZZ.Core}/Service/DataBase/Dto/DbColumnInfoInput.cs (96%) rename {Magic.Core => GDZZ.Core}/Service/DataBase/Dto/DbColumnInfoOutput.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/DataBase/Dto/DbTableInfoInput.cs (90%) rename {Magic.Core => GDZZ.Core}/Service/DataBase/Dto/EditColumnInput.cs (91%) rename {Magic.Core => GDZZ.Core}/Service/DataBase/Dto/EditTableInput.cs (90%) rename {Magic.Core => GDZZ.Core}/Service/DataBase/Extension/DbMaintenanceExtension.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/DataBase/IDataBaseManager.cs (95%) rename {Magic.Core => GDZZ.Core}/Service/Dict/Dto/DictDataInput.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Dict/Dto/DictDataOutput.cs (85%) rename {Magic.Core => GDZZ.Core}/Service/Dict/Dto/DictTreeOutput.cs (95%) rename {Magic.Core => GDZZ.Core}/Service/Dict/Dto/DictTypeInput.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Dict/ISysDictDataService.cs (92%) rename {Magic.Core => GDZZ.Core}/Service/Dict/ISysDictTypeService.cs (95%) rename {Magic.Core => GDZZ.Core}/Service/Dict/SysDictDataService.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/Dict/SysDictTypeService.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/Document/DocumentService.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/Document/Dto/DocumentDto.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/Document/Dto/DocumentInput.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/Document/Dto/DocumentOutput.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Document/IDocumentService.cs (86%) rename {Magic.Core => GDZZ.Core}/Service/Emp/Dto/EmpExtOrgPosOutput.cs (96%) rename {Magic.Core => GDZZ.Core}/Service/Emp/Dto/EmpOutput.cs (96%) rename {Magic.Core => GDZZ.Core}/Service/Emp/Dto/EmpOutput2.cs (96%) rename {Magic.Core => GDZZ.Core}/Service/Emp/Dto/EmpPosOutput.cs (93%) rename {Magic.Core => GDZZ.Core}/Service/Emp/ISysEmpExtOrgPosService.cs (93%) rename {Magic.Core => GDZZ.Core}/Service/Emp/ISysEmpPosService.cs (92%) rename {Magic.Core => GDZZ.Core}/Service/Emp/ISysEmpService.cs (89%) rename {Magic.Core => GDZZ.Core}/Service/Emp/SysEmpExtOrgPosService.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Emp/SysEmpPosService.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Emp/SysEmpService.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/Enum/Dto/EnumDataInput.cs (95%) rename {Magic.Core => GDZZ.Core}/Service/Enum/Dto/EnumDataOutput.cs (89%) rename {Magic.Core => GDZZ.Core}/Service/Enum/ISysEnumDataService.cs (90%) rename {Magic.Core => GDZZ.Core}/Service/Enum/SysEnumDataService.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/File/Dto/FileInput.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/File/Dto/FileOutput.cs (84%) rename {Magic.Core => GDZZ.Core}/Service/File/ISysFileService.cs (93%) rename {Magic.Core => GDZZ.Core}/Service/File/SysFileService.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/Log/Dto/ExLogInput.cs (96%) rename {Magic.Core => GDZZ.Core}/Service/Log/Dto/ExLogOutput.cs (74%) rename {Magic.Core => GDZZ.Core}/Service/Log/Dto/OpLogInput.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Log/Dto/OpLogOutput.cs (74%) rename {Magic.Core => GDZZ.Core}/Service/Log/Dto/VisLogInput.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/Log/Dto/VisLogOutput.cs (74%) rename {Magic.Core => GDZZ.Core}/Service/Log/ISysExLogService.cs (86%) rename {Magic.Core => GDZZ.Core}/Service/Log/ISysOpLogService.cs (86%) rename {Magic.Core => GDZZ.Core}/Service/Log/ISysVisLogService.cs (86%) rename {Magic.Core => GDZZ.Core}/Service/Log/SysExLogService.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/Log/SysOpLogService.cs (96%) rename {Magic.Core => GDZZ.Core}/Service/Log/SysVisLogService.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/Menu/Dto/AntDesignTreeNode.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Menu/Dto/MenuInput.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Menu/Dto/MenuOutput.cs (95%) rename {Magic.Core => GDZZ.Core}/Service/Menu/Dto/MenuTreeAppOutput.cs (87%) rename {Magic.Core => GDZZ.Core}/Service/Menu/Dto/MenuTreeOutput.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/Menu/Dto/OwnMenuOutput.cs (92%) rename {Magic.Core => GDZZ.Core}/Service/Menu/ISysMenuService.cs (96%) rename {Magic.Core => GDZZ.Core}/Service/Menu/SysMenuService.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/Monitor/IMachineService.cs (86%) rename {Magic.Core => GDZZ.Core}/Service/Monitor/MachineService.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/Notice/Dto/NoticeBase.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/Notice/Dto/NoticeDetailOutput.cs (96%) rename {Magic.Core => GDZZ.Core}/Service/Notice/Dto/NoticeInput.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Notice/Dto/NoticeReceiveOutput.cs (93%) rename {Magic.Core => GDZZ.Core}/Service/Notice/ISysNoticeService.cs (94%) rename {Magic.Core => GDZZ.Core}/Service/Notice/ISysNoticeUserService.cs (88%) rename {Magic.Core => GDZZ.Core}/Service/Notice/SysNoticeService.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/Notice/SysNoticeUserService.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/OAuth/ISysOauthService.cs (91%) rename {Magic.Core => GDZZ.Core}/Service/OAuth/SysOauthService.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/OnlineUser/ISysOnlineUserService.cs (81%) rename {Magic.Core => GDZZ.Core}/Service/OnlineUser/SysOnlineUserService.cs (96%) rename {Magic.Core => GDZZ.Core}/Service/Org/Dto/OrgInput.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Org/Dto/OrgOutput.cs (84%) rename {Magic.Core => GDZZ.Core}/Service/Org/Dto/OrgTreeNode.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/Org/ISysOrgService.cs (91%) rename {Magic.Core => GDZZ.Core}/Service/Org/SysOrgService.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/Pos/Dto/PosInput.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Pos/ISysPosService.cs (87%) rename {Magic.Core => GDZZ.Core}/Service/Pos/SysPosService.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Role/Dto/RoleInput.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Role/Dto/RoleOutput.cs (91%) rename {Magic.Core => GDZZ.Core}/Service/Role/ISysRoleDataScopeService.cs (92%) rename {Magic.Core => GDZZ.Core}/Service/Role/ISysRoleMenuService.cs (93%) rename {Magic.Core => GDZZ.Core}/Service/Role/ISysRoleService.cs (93%) rename {Magic.Core => GDZZ.Core}/Service/Role/SysRoleDataScopeService.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Role/SysRoleMenuService.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Role/SysRoleService.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/Tenant/Dto/TenantInput.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Tenant/Dto/TenantOutput.cs (96%) rename {Magic.Core => GDZZ.Core}/Service/Tenant/ISysTenantService.cs (92%) rename {Magic.Core => GDZZ.Core}/Service/Tenant/SysTenantService.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/Timer/Dto/JobInput.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Timer/Dto/JobOutput.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/Timer/ISysTimerService.cs (94%) rename {Magic.Core => GDZZ.Core}/Service/Timer/SysTimerService.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/Trash/Dto/TrashDto.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/Trash/Dto/TrashOutput.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/Trash/ITrashService.cs (87%) rename {Magic.Core => GDZZ.Core}/Service/Trash/TrashService.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/User/Dto/AuthToken.cs (96%) rename {Magic.Core => GDZZ.Core}/Service/User/Dto/AuthUserInput.cs (94%) rename {Magic.Core => GDZZ.Core}/Service/User/Dto/UserInput.cs (99%) rename {Magic.Core => GDZZ.Core}/Service/User/Dto/UserOutput.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/User/ISysUserDataScopeService.cs (91%) rename {Magic.Core => GDZZ.Core}/Service/User/ISysUserRoleService.cs (92%) rename {Magic.Core => GDZZ.Core}/Service/User/ISysUserService.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/User/SysUserDataScopeService.cs (97%) rename {Magic.Core => GDZZ.Core}/Service/User/SysUserRoleService.cs (98%) rename {Magic.Core => GDZZ.Core}/Service/User/SysUserService.cs (99%) rename {Magic.Core => GDZZ.Core}/SimpleQueue/SimpleQueue.cs (97%) rename {Magic.Core => GDZZ.Core}/SqlSugar/SqlSugarPagedList.cs (97%) rename {Magic.Core => GDZZ.Core}/SqlSugar/SqlSugarRepository.cs (99%) rename {Magic.Core => GDZZ.Core}/SqlSugar/SqlSugarSetup.cs (99%) rename {Magic.Core => GDZZ.Core}/Util/CodeGenUtil.cs (99%) rename {Magic.Core => GDZZ.Core}/Util/Enum/EnumEntity.cs (94%) rename {Magic.Core => GDZZ.Core}/Util/Enum/EnumUtil.cs (99%) rename {Magic.Core => GDZZ.Core}/Util/Extension/Extension.DateTime.cs (99%) rename {Magic.Core => GDZZ.Core}/Util/Extension/Extension.Validate.cs (98%) rename {Magic.Core => GDZZ.Core}/Util/Extension/Extensions.cs (99%) rename {Magic.Core => GDZZ.Core}/Util/Http/HttpNewUtil.cs (99%) rename {Magic.Core => GDZZ.Core}/Util/Http/WeatherUtil.cs (99%) rename {Magic.Core => GDZZ.Core}/Util/Image/ImageUtil.cs (99%) rename {Magic.Core => GDZZ.Core}/Util/JsonUtil.cs (99%) rename {Magic.Core => GDZZ.Core}/Util/MachineUtil.cs (99%) rename {Magic.Core => GDZZ.Core}/Util/MiniProgram/MiniProgramUtil.cs (99%) rename {Magic.Core => GDZZ.Core}/Util/OSSClientUtil.cs (99%) rename {Magic.Core => GDZZ.Core}/Util/ReflectionUtil.cs (96%) rename {Magic.Core => GDZZ.Core}/Util/String/Base64Util.cs (99%) rename {Magic.Core => GDZZ.Core}/Util/String/ValidatorUtil.cs (99%) rename {Magic.Core => GDZZ.Core}/Util/TreeBuildUtil.cs (98%) rename {Magic.Core => GDZZ.Core}/logo.png (100%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Entity/FlcCustomForm.cs (96%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Entity/FlcDBEntityTenant.cs (96%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Entity/FlcDEntityBase.cs (99%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Entity/FlcFlowInstanceOperationHistory.cs (96%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Entity/FlcFlowInstanceTransitionHistory.cs (98%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Entity/FlcFlowinstance.cs (99%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Entity/FlcFlowscheme.cs (97%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Entity/FlcForm.cs (97%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Entity/FlcInstanceEntity.cs (88%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Entity/Flow/Flow.cs (97%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Entity/Flow/FlowArea.cs (95%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Entity/Flow/FlowLine.cs (99%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Entity/Flow/FlowNode.cs (99%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Entity/Flow/FlowRuntime.cs (99%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Entity/Flow/FormUtil.cs (95%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Entity/Flow/FormValue.cs (96%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Entity/Flow/NodeDesignate.cs (94%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Entity/Flow/Verification.cs (95%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Enum/CommonFrmType.cs (91%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Flowinstance/Dto/FlcFlowinstanceDto.cs (97%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Flowinstance/Dto/FlcFlowinstanceInput.cs (98%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Flowinstance/Dto/FlcFlowinstanceOutput.cs (75%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Flowinstance/FlcCustomFormService.cs (94%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Flowinstance/FlcFlowinstanceService.cs (99%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Flowinstance/IFlcCustomFormService.cs (83%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Flowinstance/IFlcFlowinstanceService.cs (90%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Flowscheme/Dto/FlcFlowschemeInput.cs (95%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Flowscheme/Dto/FlcFlowschemeOutput.cs (96%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Flowscheme/FlcFlowschemeService.cs (98%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Flowscheme/IFlcFlowschemeService.cs (93%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/FormManage/Dto/FlcFormInput.cs (96%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/FormManage/Dto/FlcFormOutput.cs (82%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/FormManage/FlcFormManageService.cs (96%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/FormManage/IFlcFormManageService.cs (86%) rename Magic.FlowCenter/Magic.FlowCenter.csproj => GDZZ.FlowCenter/GDZZ.FlowCenter.csproj (63%) create mode 100644 GDZZ.FlowCenter/GDZZ.FlowCenter.xml rename {Magic.FlowCenter => GDZZ.FlowCenter}/Magic.FlowCenter.xml (58%) rename {Magic.FlowCenter => GDZZ.FlowCenter}/Startup.cs (88%) rename Magic.Web.Core/Magic.Web.Core.csproj => GDZZ.Web.Core/GDZZ.Web.Core.csproj (59%) rename Magic.Web.Core/Magic.Web.Core.xml => GDZZ.Web.Core/GDZZ.Web.Core.xml (60%) rename {Magic.Web.Core => GDZZ.Web.Core}/Handlers/JwtHandler.cs (96%) rename {Magic.Web.Core => GDZZ.Web.Core}/Startup.cs (98%) rename {Magic.Web.Core => GDZZ.Web.Core}/applicationconfig.json (94%) create mode 100644 GDZZ.Web.Core/dbsettings.json rename {Magic.Web.Entry => GDZZ.Web.Entry}/.config/dotnet-tools.json (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/Controllers/ValuesController.cs (84%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/Dockerfile (77%) rename Magic.Web.Entry/Magic.Web.Entry.csproj => GDZZ.Web.Entry/GDZZ.Web.Entry.csproj (95%) rename Magic.Web.Entry/Magic.db => GDZZ.Web.Entry/GDZZ.db (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/Program.cs (84%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/Properties/launchSettings.json (96%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/SingleFilePublish.cs (85%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/appsettings.Development.json (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/appsettings.json (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/flow.db (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/jenkins-docker.sh (96%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/templates/~0db08c10b01555b1d888f11248a2cc64.dll (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/templates/~159c422bcf43edda31a9bd75256b79f1.dll (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/templates/~19108359356e5efe42dcdf645a2eebfc.dll (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/templates/~2651e0999c391a0b5aba580191e2d6c6.dll (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/templates/~4a6ee469d4d39086077630dd2bed9f1e.dll (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/templates/~59a6eeb9747854ce8e0b0de6194ab0fa.dll (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/templates/~5d908a873d5ce8cd99e004db7bfaaf6c.dll (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/templates/~9e972f810c110f86c9fe70c0e0a4c1fc.dll (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/templates/~bc7b58f116bac34d7af4bef34a87f620.dll (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/templates/~c55ba40db5a21a311a7ab81fad6917a9.dll (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/templates/~dd0b7d0d8022b1fbe3eae0c827b159cf.dll (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/templates/~f322dcae78db006b53da5f26e21dba3b.dll (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/templates/~faa2e001498506525726c745a81c3bef.dll (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/templates/~fb1a575125f1424c84f5d49478aad029.dll (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/templates/~fe0c69bed93ec0b64ba42ef010e76497.dll (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Captcha/Font/zkkht.ttf (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Captcha/Image/1.jpg (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Captcha/Image/2.jpg (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Captcha/Image/3.jpg (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Captcha/Image/4.jpg (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Captcha/Image/5.jpg (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Captcha/Image/6.jpg (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Captcha/Image/7.jpg (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Captcha/Image/8.jpg (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Template/Dto.cs.vm (97%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Template/Entity.cs.vm (96%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Template/IService.cs.vm (91%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Template/Input.cs.vm (98%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Template/Manage.js.vm (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Template/Output.cs.vm (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Template/Service.cs.vm (98%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Template/addForm.vue.vm (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Template/editForm.vue.vm (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Template/index.vue.vm (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Upload/Avatar/167456009080901.png (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Upload/Avatar/167456254419013.png (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Upload/Avatar/175614800654405.jpeg (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Upload/Avatar/188632919339077.png (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Upload/Avatar/263006401138757.jpg (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Upload/Document/2022/4/27/282067842687045.png (100%) rename {Magic.Web.Entry => GDZZ.Web.Entry}/wwwroot/Upload/Document/2022/4/27/282118658961477.png (100%) rename Magic.sln => GDZZ.sln (74%) delete mode 100644 Magic.Application/Entity/RecruitMessage.cs delete mode 100644 Magic.Application/Entity/SysArea.cs delete mode 100644 Magic.CodeFirst/SeedData/SysCodeGenSeedData.cs delete mode 100644 Magic.Web.Core/dbsettings.json diff --git a/GDZZ.Application/Entity/Company.cs b/GDZZ.Application/Entity/Company.cs new file mode 100644 index 0000000..2717617 --- /dev/null +++ b/GDZZ.Application/Entity/Company.cs @@ -0,0 +1,31 @@ +using System; +using SqlSugar; +using System.ComponentModel; +using GDZZ.Core.Entity; +namespace GDZZ.Application.Entity +{ + /// + /// 招聘公司 + /// + [SugarTable("company")] + [Description("招聘公司")] + public class Company : DEntityBase + { + /// + /// 租户Id + /// + public long TenantId { get; set; } + /// + /// 地址 + /// + public string Address { get; set; } + /// + /// 联系电话 + /// + public string Phone { get; set; } + /// + /// 公司详情 + /// + public string Profile { get; set; } + } +} \ No newline at end of file diff --git a/GDZZ.Application/Entity/JobHunter.cs b/GDZZ.Application/Entity/JobHunter.cs new file mode 100644 index 0000000..33e850d --- /dev/null +++ b/GDZZ.Application/Entity/JobHunter.cs @@ -0,0 +1,27 @@ +using System; +using SqlSugar; +using System.ComponentModel; +using GDZZ.Core.Entity; +namespace GDZZ.Application.Entity +{ + /// + /// 求职者 + /// + [SugarTable("jobhunter")] + [Description("求职者")] + public class JobHunter : DEntityBase + { + /// + /// 租户Id + /// + public long TenantId { get; set; } + /// + /// 联系电话 + /// + public string Phone { get; set; } + /// + /// 性别 + /// + public Int16 Gender { get; set; } + } +} \ No newline at end of file diff --git a/Magic.Application/Entity/JobhuntMessage.cs b/GDZZ.Application/Entity/JobhuntMessage.cs similarity index 96% rename from Magic.Application/Entity/JobhuntMessage.cs rename to GDZZ.Application/Entity/JobhuntMessage.cs index f5a65ea..1e890ae 100644 --- a/Magic.Application/Entity/JobhuntMessage.cs +++ b/GDZZ.Application/Entity/JobhuntMessage.cs @@ -1,8 +1,8 @@ using System; using SqlSugar; using System.ComponentModel; -using Magic.Core.Entity; -namespace Magic.Application.Entity +using GDZZ.Core.Entity; +namespace GDZZ.Application.Entity { /// /// 求职信息 diff --git a/GDZZ.Application/Entity/RecruitMessage.cs b/GDZZ.Application/Entity/RecruitMessage.cs new file mode 100644 index 0000000..17d096a --- /dev/null +++ b/GDZZ.Application/Entity/RecruitMessage.cs @@ -0,0 +1,63 @@ +using System; +using SqlSugar; +using System.ComponentModel; +using GDZZ.Core.Entity; +namespace GDZZ.Application.Entity +{ + /// + /// 招聘消息 + /// + [SugarTable("recruit_message")] + [Description("招聘消息")] + public class RecruitMessage : DEntityBase + { + /// + /// 租户Id + /// + public long TenantId { get; set; } + /// + /// 职位详情 + /// + public string PositionInfo { get; set; } + /// + /// 标题 + /// + public string Title { get; set; } + /// + /// 状态 + /// + public int Status { get; set; } + /// + /// 省份 + /// + public int ProvinceId { get; set; } + /// + /// 城市 + /// + public int CityId { get; set; } + /// + /// 区 + /// + public int AreaId { get; set; } + /// + /// 详细地址 + /// + public int Address { get; set; } + /// + /// 联系电话 + /// + public string Phone { get; set; } + /// + /// 标签 + /// + public string Tag { get; set; } + /// + /// 学历 + /// + public int Education { get; set; } + /// + /// 经验 + /// + public int Experience { get; set; } + } +} \ No newline at end of file diff --git a/GDZZ.Application/Entity/SysArea.cs b/GDZZ.Application/Entity/SysArea.cs new file mode 100644 index 0000000..40d3209 --- /dev/null +++ b/GDZZ.Application/Entity/SysArea.cs @@ -0,0 +1,24 @@ +using System; +using SqlSugar; +using System.ComponentModel; +using GDZZ.Core.Entity; +namespace GDZZ.Application.Entity +{ + /// + /// 系统地区数据 + /// + [SugarTable("sys_area")] + [Description("系统地区数据")] + public class SysArea : AutoIncrementEntity + { + + /// + /// 父级ID + /// + public Int16 parent_id { get; set; } + /// + /// 地区名 + /// + public string name { get; set; } + } +} \ No newline at end of file diff --git a/Magic.Application/Magic.Application.csproj b/GDZZ.Application/GDZZ.Application.csproj similarity index 69% rename from Magic.Application/Magic.Application.csproj rename to GDZZ.Application/GDZZ.Application.csproj index 91a5fc4..3285226 100644 --- a/Magic.Application/Magic.Application.csproj +++ b/GDZZ.Application/GDZZ.Application.csproj @@ -3,23 +3,23 @@ net7.0 1701;1702;1591 - Magic.Application.xml + GDZZ.Application.xml - + PreserveNewest - + - + diff --git a/GDZZ.Application/GDZZ.Application.xml b/GDZZ.Application/GDZZ.Application.xml new file mode 100644 index 0000000..009708e --- /dev/null +++ b/GDZZ.Application/GDZZ.Application.xml @@ -0,0 +1,667 @@ + + + + GDZZ.Application + + + + + 招聘公司 + + + + + 租户Id + + + + + 地址 + + + + + 联系电话 + + + + + 公司详情 + + + + + 求职者 + + + + + 租户Id + + + + + 联系电话 + + + + + 性别 + + + + + 求职信息 + + + + + 租户Id + + + + + 求职详情 + + + + + 求职标题 + + + + + 求职状态 + + + + + 经验 + + + + + 标签 + + + + + 省份 + + + + + 城市 + + + + + 招聘消息 + + + + + 租户Id + + + + + 职位详情 + + + + + 标题 + + + + + 状态 + + + + + 省份 + + + + + 城市 + + + + + 区 + + + + + 详细地址 + + + + + 联系电话 + + + + + 标签 + + + + + 学历 + + + + + 经验 + + + + + 系统地区数据 + + + + + 父级ID + + + + + 地区名 + + + + + 求职信息输出参数 + + + + + 主键Id + + + + + 租户Id + + + + + 求职详情 + + + + + 求职标题 + + + + + 求职状态 + + + + + 经验 + + + + + 标签 + + + + + 省份 + + + + + 城市 + + + + + 求职信息输入参数 + + + + + 租户Id + + + + + 求职详情 + + + + + 求职标题 + + + + + 求职状态 + + + + + 经验 + + + + + 标签 + + + + + 省份 + + + + + 城市 + + + + + 租户Id + + + + + 求职详情 + + + + + 求职标题 + + + + + 主键Id + + + + + 主键Id + + + + + 求职信息输出参数 + + + + + 主键Id + + + + + 租户Id + + + + + 求职详情 + + + + + 求职标题 + + + + + 求职状态 + + + + + 经验 + + + + + 标签 + + + + + 省份 + + + + + 城市 + + + + + 求职信息服务 + + + + + 分页查询求职信息 + + + + + + + 增加求职信息 + + + + + + + 删除求职信息 + + + + + + + 更新求职信息 + + + + + + + 获取求职信息 + + + + + + + 获取求职信息列表 + + + + + + + 招聘消息输出参数 + + + + + 主键Id + + + + + 租户Id + + + + + 职位详情 + + + + + 标题 + + + + + 状态 + + + + + 省份 + + + + + 城市 + + + + + 区 + + + + + 详细地址 + + + + + 联系电话 + + + + + 标签 + + + + + 学历 + + + + + 经验 + + + + + 招聘消息输入参数 + + + + + 租户Id + + + + + 职位详情 + + + + + 标题 + + + + + 状态 + + + + + 省份 + + + + + 城市 + + + + + 区 + + + + + 详细地址 + + + + + 联系电话 + + + + + 标签 + + + + + 学历 + + + + + 经验 + + + + + 职位详情 + + + + + 标题 + + + + + 主键Id + + + + + 主键Id + + + + + 招聘消息输出参数 + + + + + 主键Id + + + + + 租户Id + + + + + 职位详情 + + + + + 标题 + + + + + 状态 + + + + + 省份 + + + + + 城市 + + + + + 区 + + + + + 详细地址 + + + + + 联系电话 + + + + + 标签 + + + + + 学历 + + + + + 经验 + + + + + 招聘消息服务 + + + + + 分页查询招聘消息 + + + + + + + 增加招聘消息 + + + + + + + 删除招聘消息 + + + + + + + 更新招聘消息 + + + + + + + 获取招聘消息 + + + + + + + 获取招聘消息列表 + + + + + + diff --git a/Magic.Application/Magic.Application.xml b/GDZZ.Application/Magic.Application.xml similarity index 54% rename from Magic.Application/Magic.Application.xml rename to GDZZ.Application/Magic.Application.xml index 3f6f27c..9e88be0 100644 --- a/Magic.Application/Magic.Application.xml +++ b/GDZZ.Application/Magic.Application.xml @@ -1,130 +1,130 @@ - Magic.Application + GDZZ.Application - + 求职信息 - + 租户Id - + 求职详情 - + 求职标题 - + 求职状态 - + 经验 - + 标签 - + 省份 - + 城市 - + 招聘消息 - + 租户Id - + 职位详情 - + 标题 - + 状态 - + 省份 - + 城市 - + 区 - + 详细地址 - + 联系电话 - + 标签 - + 学历 - + 经验 - + 系统地区数据 - + 父级ID - + 地区名 diff --git a/Magic.Application/README.md b/GDZZ.Application/README.md similarity index 100% rename from Magic.Application/README.md rename to GDZZ.Application/README.md diff --git a/GDZZ.Application/Service/Company/CompanyService.cs b/GDZZ.Application/Service/Company/CompanyService.cs new file mode 100644 index 0000000..533d138 --- /dev/null +++ b/GDZZ.Application/Service/Company/CompanyService.cs @@ -0,0 +1,96 @@ +using GDZZ.Core; +using Furion.DependencyInjection; +using Furion.DynamicApiController; +using Mapster; +using Microsoft.AspNetCore.Mvc; +using SqlSugar; +using System.Linq; +using System.Threading.Tasks; +using GDZZ.Application.Entity; +namespace GDZZ.Application +{ + /// + /// 招聘公司服务 + /// + [ApiDescriptionSettings("Application",Name = "Company", Order = 1)] + public class CompanyService : ICompanyService, IDynamicApiController, ITransient + { + private readonly SqlSugarRepository _rep; + + public CompanyService(SqlSugarRepository rep) + { + _rep = rep; + } + + /// + /// 分页查询招聘公司 + /// + /// + /// + [HttpGet("/Company/page")] + public async Task Page([FromQuery] CompanyInput input) + { + var entities = await _rep.AsQueryable() + .ToPagedListAsync(input.PageNo, input.PageSize); + return entities.XnPagedResult(); + } + + /// + /// 增加招聘公司 + /// + /// + /// + [HttpPost("/Company/add")] + public async Task Add(AddCompanyInput input) + { + var entity = input.Adapt(); + await _rep.InsertAsync(entity); + } + + /// + /// 删除招聘公司 + /// + /// + /// + [HttpPost("/Company/delete")] + public async Task Delete(DeleteCompanyInput input) + { + var entity = await _rep.FirstOrDefaultAsync(u => u.Id == input.Id); + await _rep.DeleteAsync(entity); + } + + /// + /// 更新招聘公司 + /// + /// + /// + [HttpPost("/Company/edit")] + public async Task Update(UpdateCompanyInput input) + { + var entity = input.Adapt(); + await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns:true).ExecuteCommandAsync(); + } + + /// + /// 获取招聘公司 + /// + /// + /// + [HttpGet("/Company/detail")] + public async Task Get([FromQuery] QueryeCompanyInput input) + { + return await _rep.FirstOrDefaultAsync(u => u.Id == input.Id); + } + + /// + /// 获取招聘公司列表 + /// + /// + /// + [HttpGet("/Company/list")] + public async Task List([FromQuery] CompanyInput input) + { + return await _rep.ToListAsync(); + } + } +} diff --git a/GDZZ.Application/Service/Company/Dto/CompanyDto.cs b/GDZZ.Application/Service/Company/Dto/CompanyDto.cs new file mode 100644 index 0000000..d7dff11 --- /dev/null +++ b/GDZZ.Application/Service/Company/Dto/CompanyDto.cs @@ -0,0 +1,37 @@ +using System; +using GDZZ.Core; + +namespace GDZZ.Application +{ + /// + /// 招聘公司输出参数 + /// + public class CompanyDto + { + /// + /// 主键Id + /// + public long Id { get; set; } + + /// + /// 租户Id + /// + public long TenantId { get; set; } + + /// + /// 地址 + /// + public string Address { get; set; } + + /// + /// 联系电话 + /// + public string Phone { get; set; } + + /// + /// 公司详情 + /// + public string Profile { get; set; } + + } +} diff --git a/GDZZ.Application/Service/Company/Dto/CompanyInput.cs b/GDZZ.Application/Service/Company/Dto/CompanyInput.cs new file mode 100644 index 0000000..3c4d65d --- /dev/null +++ b/GDZZ.Application/Service/Company/Dto/CompanyInput.cs @@ -0,0 +1,62 @@ +using GDZZ.Core; +using System; +using System.ComponentModel.DataAnnotations; + +namespace GDZZ.Application +{ + /// + /// 招聘公司输入参数 + /// + public class CompanyInput : PageInputBase + { + /// + /// 租户Id + /// + public virtual long TenantId { get; set; } + + /// + /// 地址 + /// + public virtual string Address { get; set; } + + /// + /// 联系电话 + /// + public virtual string Phone { get; set; } + + /// + /// 公司详情 + /// + public virtual string Profile { get; set; } + + } + + public class AddCompanyInput : CompanyInput + { + } + + public class DeleteCompanyInput + { + /// + /// 主键Id + /// + [Required(ErrorMessage = "主键Id不能为空")] + public long Id { get; set; } + + } + + public class UpdateCompanyInput : CompanyInput + { + /// + /// 主键Id + /// + [Required(ErrorMessage = "主键Id不能为空")] + public long Id { get; set; } + + } + + public class QueryeCompanyInput : DeleteCompanyInput + { + + } +} diff --git a/GDZZ.Application/Service/Company/Dto/CompanyOutput.cs b/GDZZ.Application/Service/Company/Dto/CompanyOutput.cs new file mode 100644 index 0000000..e6c1c05 --- /dev/null +++ b/GDZZ.Application/Service/Company/Dto/CompanyOutput.cs @@ -0,0 +1,36 @@ +using System; + +namespace GDZZ.Application +{ + /// + /// 招聘公司输出参数 + /// + public class CompanyOutput + { + /// + /// 主键Id + /// + public long Id { get; set; } + + /// + /// 租户Id + /// + public long TenantId { get; set; } + + /// + /// 地址 + /// + public string Address { get; set; } + + /// + /// 联系电话 + /// + public string Phone { get; set; } + + /// + /// 公司详情 + /// + public string Profile { get; set; } + + } +} diff --git a/GDZZ.Application/Service/Company/ICompanyService.cs b/GDZZ.Application/Service/Company/ICompanyService.cs new file mode 100644 index 0000000..aaad75d --- /dev/null +++ b/GDZZ.Application/Service/Company/ICompanyService.cs @@ -0,0 +1,16 @@ +using GDZZ.Core; +using Microsoft.AspNetCore.Mvc; +using System.Threading.Tasks; +using GDZZ.Application.Entity; +namespace GDZZ.Application +{ + public interface ICompanyService + { + Task Add(AddCompanyInput input); + Task Delete(DeleteCompanyInput input); + Task Get([FromQuery] QueryeCompanyInput input); + Task List([FromQuery] CompanyInput input); + Task Page([FromQuery] CompanyInput input); + Task Update(UpdateCompanyInput input); + } +} \ No newline at end of file diff --git a/GDZZ.Application/Service/JobHunter/Dto/JobHunterDto.cs b/GDZZ.Application/Service/JobHunter/Dto/JobHunterDto.cs new file mode 100644 index 0000000..069aa6d --- /dev/null +++ b/GDZZ.Application/Service/JobHunter/Dto/JobHunterDto.cs @@ -0,0 +1,32 @@ +using System; +using GDZZ.Core; + +namespace GDZZ.Application +{ + /// + /// 求职者输出参数 + /// + public class JobHunterDto + { + /// + /// 主键Id + /// + public long Id { get; set; } + + /// + /// 租户Id + /// + public long TenantId { get; set; } + + /// + /// 联系电话 + /// + public string Phone { get; set; } + + /// + /// 性别 + /// + public Int16 Gender { get; set; } + + } +} diff --git a/GDZZ.Application/Service/JobHunter/Dto/JobHunterInput.cs b/GDZZ.Application/Service/JobHunter/Dto/JobHunterInput.cs new file mode 100644 index 0000000..2f0c24a --- /dev/null +++ b/GDZZ.Application/Service/JobHunter/Dto/JobHunterInput.cs @@ -0,0 +1,57 @@ +using GDZZ.Core; +using System; +using System.ComponentModel.DataAnnotations; + +namespace GDZZ.Application +{ + /// + /// 求职者输入参数 + /// + public class JobHunterInput : PageInputBase + { + /// + /// 租户Id + /// + public virtual long TenantId { get; set; } + + /// + /// 联系电话 + /// + public virtual string Phone { get; set; } + + /// + /// 性别 + /// + public virtual Int16 Gender { get; set; } + + } + + public class AddJobHunterInput : JobHunterInput + { + } + + public class DeleteJobHunterInput + { + /// + /// 主键Id + /// + [Required(ErrorMessage = "主键Id不能为空")] + public long Id { get; set; } + + } + + public class UpdateJobHunterInput : JobHunterInput + { + /// + /// 主键Id + /// + [Required(ErrorMessage = "主键Id不能为空")] + public long Id { get; set; } + + } + + public class QueryeJobHunterInput : DeleteJobHunterInput + { + + } +} diff --git a/GDZZ.Application/Service/JobHunter/Dto/JobHunterOutput.cs b/GDZZ.Application/Service/JobHunter/Dto/JobHunterOutput.cs new file mode 100644 index 0000000..70fcaa5 --- /dev/null +++ b/GDZZ.Application/Service/JobHunter/Dto/JobHunterOutput.cs @@ -0,0 +1,31 @@ +using System; + +namespace GDZZ.Application +{ + /// + /// 求职者输出参数 + /// + public class JobHunterOutput + { + /// + /// 主键Id + /// + public long Id { get; set; } + + /// + /// 租户Id + /// + public long TenantId { get; set; } + + /// + /// 联系电话 + /// + public string Phone { get; set; } + + /// + /// 性别 + /// + public Int16 Gender { get; set; } + + } +} diff --git a/GDZZ.Application/Service/JobHunter/IJobHunterService.cs b/GDZZ.Application/Service/JobHunter/IJobHunterService.cs new file mode 100644 index 0000000..6871f34 --- /dev/null +++ b/GDZZ.Application/Service/JobHunter/IJobHunterService.cs @@ -0,0 +1,16 @@ +using GDZZ.Core; +using Microsoft.AspNetCore.Mvc; +using System.Threading.Tasks; +using GDZZ.Application.Entity; +namespace GDZZ.Application +{ + public interface IJobHunterService + { + Task Add(AddJobHunterInput input); + Task Delete(DeleteJobHunterInput input); + Task Get([FromQuery] QueryeJobHunterInput input); + Task List([FromQuery] JobHunterInput input); + Task Page([FromQuery] JobHunterInput input); + Task Update(UpdateJobHunterInput input); + } +} \ No newline at end of file diff --git a/GDZZ.Application/Service/JobHunter/JobHunterService.cs b/GDZZ.Application/Service/JobHunter/JobHunterService.cs new file mode 100644 index 0000000..5b907bd --- /dev/null +++ b/GDZZ.Application/Service/JobHunter/JobHunterService.cs @@ -0,0 +1,96 @@ +using GDZZ.Core; +using Furion.DependencyInjection; +using Furion.DynamicApiController; +using Mapster; +using Microsoft.AspNetCore.Mvc; +using SqlSugar; +using System.Linq; +using System.Threading.Tasks; +using GDZZ.Application.Entity; +namespace GDZZ.Application +{ + /// + /// 求职者服务 + /// + [ApiDescriptionSettings("Application",Name = "JobHunter", Order = 1)] + public class JobHunterService : IJobHunterService, IDynamicApiController, ITransient + { + private readonly SqlSugarRepository _rep; + + public JobHunterService(SqlSugarRepository rep) + { + _rep = rep; + } + + /// + /// 分页查询求职者 + /// + /// + /// + [HttpGet("/JobHunter/page")] + public async Task Page([FromQuery] JobHunterInput input) + { + var entities = await _rep.AsQueryable() + .ToPagedListAsync(input.PageNo, input.PageSize); + return entities.XnPagedResult(); + } + + /// + /// 增加求职者 + /// + /// + /// + [HttpPost("/JobHunter/add")] + public async Task Add(AddJobHunterInput input) + { + var entity = input.Adapt(); + await _rep.InsertAsync(entity); + } + + /// + /// 删除求职者 + /// + /// + /// + [HttpPost("/JobHunter/delete")] + public async Task Delete(DeleteJobHunterInput input) + { + var entity = await _rep.FirstOrDefaultAsync(u => u.Id == input.Id); + await _rep.DeleteAsync(entity); + } + + /// + /// 更新求职者 + /// + /// + /// + [HttpPost("/JobHunter/edit")] + public async Task Update(UpdateJobHunterInput input) + { + var entity = input.Adapt(); + await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns:true).ExecuteCommandAsync(); + } + + /// + /// 获取求职者 + /// + /// + /// + [HttpGet("/JobHunter/detail")] + public async Task Get([FromQuery] QueryeJobHunterInput input) + { + return await _rep.FirstOrDefaultAsync(u => u.Id == input.Id); + } + + /// + /// 获取求职者列表 + /// + /// + /// + [HttpGet("/JobHunter/list")] + public async Task List([FromQuery] JobHunterInput input) + { + return await _rep.ToListAsync(); + } + } +} diff --git a/GDZZ.Application/Service/JobhuntMessage/Dto/JobhuntMessageDto.cs b/GDZZ.Application/Service/JobhuntMessage/Dto/JobhuntMessageDto.cs new file mode 100644 index 0000000..f48ab56 --- /dev/null +++ b/GDZZ.Application/Service/JobhuntMessage/Dto/JobhuntMessageDto.cs @@ -0,0 +1,57 @@ +using System; +using GDZZ.Core; + +namespace GDZZ.Application +{ + /// + /// 求职信息输出参数 + /// + public class JobhuntMessageDto + { + /// + /// 主键Id + /// + public long Id { get; set; } + + /// + /// 租户Id + /// + public long TenantId { get; set; } + + /// + /// 求职详情 + /// + public string PositionInfo { get; set; } + + /// + /// 求职标题 + /// + public string Title { get; set; } + + /// + /// 求职状态 + /// + public int Status { get; set; } + + /// + /// 经验 + /// + public int Experience { get; set; } + + /// + /// 标签 + /// + public string Tag { get; set; } + + /// + /// 省份 + /// + public int ProvinceId { get; set; } + + /// + /// 城市 + /// + public int CityId { get; set; } + + } +} diff --git a/GDZZ.Application/Service/JobhuntMessage/Dto/JobhuntMessageInput.cs b/GDZZ.Application/Service/JobhuntMessage/Dto/JobhuntMessageInput.cs new file mode 100644 index 0000000..82fa8fd --- /dev/null +++ b/GDZZ.Application/Service/JobhuntMessage/Dto/JobhuntMessageInput.cs @@ -0,0 +1,100 @@ +using GDZZ.Core; +using System; +using System.ComponentModel.DataAnnotations; + +namespace GDZZ.Application +{ + /// + /// 求职信息输入参数 + /// + public class JobhuntMessageInput : PageInputBase + { + /// + /// 租户Id + /// + public virtual long TenantId { get; set; } + + /// + /// 求职详情 + /// + public virtual string PositionInfo { get; set; } + + /// + /// 求职标题 + /// + public virtual string Title { get; set; } + + /// + /// 求职状态 + /// + public virtual int Status { get; set; } + + /// + /// 经验 + /// + public virtual int Experience { get; set; } + + /// + /// 标签 + /// + public virtual string Tag { get; set; } + + /// + /// 省份 + /// + public virtual int ProvinceId { get; set; } + + /// + /// 城市 + /// + public virtual int CityId { get; set; } + + } + + public class AddJobhuntMessageInput : JobhuntMessageInput + { + /// + /// 租户Id + /// + [Required(ErrorMessage = "租户Id不能为空")] + public override long TenantId { get; set; } + + /// + /// 求职详情 + /// + [Required(ErrorMessage = "求职详情不能为空")] + public override string PositionInfo { get; set; } + + /// + /// 求职标题 + /// + [Required(ErrorMessage = "求职标题不能为空")] + public override string Title { get; set; } + + } + + public class DeleteJobhuntMessageInput + { + /// + /// 主键Id + /// + [Required(ErrorMessage = "主键Id不能为空")] + public long Id { get; set; } + + } + + public class UpdateJobhuntMessageInput : JobhuntMessageInput + { + /// + /// 主键Id + /// + [Required(ErrorMessage = "主键Id不能为空")] + public long Id { get; set; } + + } + + public class QueryeJobhuntMessageInput : DeleteJobhuntMessageInput + { + + } +} diff --git a/GDZZ.Application/Service/JobhuntMessage/Dto/JobhuntMessageOutput.cs b/GDZZ.Application/Service/JobhuntMessage/Dto/JobhuntMessageOutput.cs new file mode 100644 index 0000000..b763deb --- /dev/null +++ b/GDZZ.Application/Service/JobhuntMessage/Dto/JobhuntMessageOutput.cs @@ -0,0 +1,56 @@ +using System; + +namespace GDZZ.Application +{ + /// + /// 求职信息输出参数 + /// + public class JobhuntMessageOutput + { + /// + /// 主键Id + /// + public long Id { get; set; } + + /// + /// 租户Id + /// + public long TenantId { get; set; } + + /// + /// 求职详情 + /// + public string PositionInfo { get; set; } + + /// + /// 求职标题 + /// + public string Title { get; set; } + + /// + /// 求职状态 + /// + public int Status { get; set; } + + /// + /// 经验 + /// + public int Experience { get; set; } + + /// + /// 标签 + /// + public string Tag { get; set; } + + /// + /// 省份 + /// + public int ProvinceId { get; set; } + + /// + /// 城市 + /// + public int CityId { get; set; } + + } +} diff --git a/GDZZ.Application/Service/JobhuntMessage/IJobhuntMessageService.cs b/GDZZ.Application/Service/JobhuntMessage/IJobhuntMessageService.cs new file mode 100644 index 0000000..8b4eaf7 --- /dev/null +++ b/GDZZ.Application/Service/JobhuntMessage/IJobhuntMessageService.cs @@ -0,0 +1,16 @@ +using GDZZ.Core; +using Microsoft.AspNetCore.Mvc; +using System.Threading.Tasks; +using GDZZ.Application.Entity; +namespace GDZZ.Application +{ + public interface IJobhuntMessageService + { + Task Add(AddJobhuntMessageInput input); + Task Delete(DeleteJobhuntMessageInput input); + Task Get([FromQuery] QueryeJobhuntMessageInput input); + Task List([FromQuery] JobhuntMessageInput input); + Task Page([FromQuery] JobhuntMessageInput input); + Task Update(UpdateJobhuntMessageInput input); + } +} \ No newline at end of file diff --git a/GDZZ.Application/Service/JobhuntMessage/JobhuntMessageService.cs b/GDZZ.Application/Service/JobhuntMessage/JobhuntMessageService.cs new file mode 100644 index 0000000..549dbed --- /dev/null +++ b/GDZZ.Application/Service/JobhuntMessage/JobhuntMessageService.cs @@ -0,0 +1,99 @@ +using GDZZ.Core; +using Furion.DependencyInjection; +using Furion.DynamicApiController; +using Mapster; +using Microsoft.AspNetCore.Mvc; +using SqlSugar; +using System.Linq; +using System.Threading.Tasks; +using GDZZ.Application.Entity; +namespace GDZZ.Application +{ + /// + /// 求职信息服务 + /// + [ApiDescriptionSettings("Application",Name = "JobhuntMessage", Order = 1)] + public class JobhuntMessageService : IJobhuntMessageService, IDynamicApiController, ITransient + { + private readonly SqlSugarRepository _rep; + + public JobhuntMessageService(SqlSugarRepository rep) + { + _rep = rep; + } + + /// + /// 分页查询求职信息 + /// + /// + /// + [HttpGet("/JobhuntMessage/page")] + public async Task Page([FromQuery] JobhuntMessageInput input) + { + var entities = await _rep.AsQueryable() + .WhereIF(!string.IsNullOrWhiteSpace(input.PositionInfo), u => u.PositionInfo == input.PositionInfo) + .WhereIF(!string.IsNullOrWhiteSpace(input.Title), u => u.Title == input.Title) + .WhereIF(!string.IsNullOrWhiteSpace(input.Tag), u => u.Tag == input.Tag) + .ToPagedListAsync(input.PageNo, input.PageSize); + return entities.XnPagedResult(); + } + + /// + /// 增加求职信息 + /// + /// + /// + [HttpPost("/JobhuntMessage/add")] + public async Task Add(AddJobhuntMessageInput input) + { + var entity = input.Adapt(); + await _rep.InsertAsync(entity); + } + + /// + /// 删除求职信息 + /// + /// + /// + [HttpPost("/JobhuntMessage/delete")] + public async Task Delete(DeleteJobhuntMessageInput input) + { + var entity = await _rep.FirstOrDefaultAsync(u => u.Id == input.Id); + await _rep.DeleteAsync(entity); + } + + /// + /// 更新求职信息 + /// + /// + /// + [HttpPost("/JobhuntMessage/edit")] + public async Task Update(UpdateJobhuntMessageInput input) + { + var entity = input.Adapt(); + await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns:true).ExecuteCommandAsync(); + } + + /// + /// 获取求职信息 + /// + /// + /// + [HttpGet("/JobhuntMessage/detail")] + public async Task Get([FromQuery] QueryeJobhuntMessageInput input) + { + return await _rep.FirstOrDefaultAsync(u => u.Id == input.Id); + } + + /// + /// 获取求职信息列表 + /// + /// + /// + [HttpGet("/JobhuntMessage/list")] + public async Task List([FromQuery] JobhuntMessageInput input) + { + return await _rep.ToListAsync(); + } + } +} diff --git a/GDZZ.Application/Service/RecruitMessage/Dto/RecruitMessageDto.cs b/GDZZ.Application/Service/RecruitMessage/Dto/RecruitMessageDto.cs new file mode 100644 index 0000000..3b6c3dc --- /dev/null +++ b/GDZZ.Application/Service/RecruitMessage/Dto/RecruitMessageDto.cs @@ -0,0 +1,77 @@ +using System; +using GDZZ.Core; + +namespace GDZZ.Application +{ + /// + /// 招聘消息输出参数 + /// + public class RecruitMessageDto + { + /// + /// 主键Id + /// + public long Id { get; set; } + + /// + /// 租户Id + /// + public long TenantId { get; set; } + + /// + /// 职位详情 + /// + public string PositionInfo { get; set; } + + /// + /// 标题 + /// + public string Title { get; set; } + + /// + /// 状态 + /// + public int Status { get; set; } + + /// + /// 省份 + /// + public int ProvinceId { get; set; } + + /// + /// 城市 + /// + public int CityId { get; set; } + + /// + /// 区 + /// + public int AreaId { get; set; } + + /// + /// 详细地址 + /// + public int Address { get; set; } + + /// + /// 联系电话 + /// + public string Phone { get; set; } + + /// + /// 标签 + /// + public string Tag { get; set; } + + /// + /// 学历 + /// + public int Education { get; set; } + + /// + /// 经验 + /// + public int Experience { get; set; } + + } +} diff --git a/GDZZ.Application/Service/RecruitMessage/Dto/RecruitMessageInput.cs b/GDZZ.Application/Service/RecruitMessage/Dto/RecruitMessageInput.cs new file mode 100644 index 0000000..9561608 --- /dev/null +++ b/GDZZ.Application/Service/RecruitMessage/Dto/RecruitMessageInput.cs @@ -0,0 +1,114 @@ +using GDZZ.Core; +using System; +using System.ComponentModel.DataAnnotations; + +namespace GDZZ.Application +{ + /// + /// 招聘消息输入参数 + /// + public class RecruitMessageInput : PageInputBase + { + /// + /// 租户Id + /// + public virtual long TenantId { get; set; } + + /// + /// 职位详情 + /// + public virtual string PositionInfo { get; set; } + + /// + /// 标题 + /// + public virtual string Title { get; set; } + + /// + /// 状态 + /// + public virtual int Status { get; set; } + + /// + /// 省份 + /// + public virtual int ProvinceId { get; set; } + + /// + /// 城市 + /// + public virtual int CityId { get; set; } + + /// + /// 区 + /// + public virtual int AreaId { get; set; } + + /// + /// 详细地址 + /// + public virtual int Address { get; set; } + + /// + /// 联系电话 + /// + public virtual string Phone { get; set; } + + /// + /// 标签 + /// + public virtual string Tag { get; set; } + + /// + /// 学历 + /// + public virtual int Education { get; set; } + + /// + /// 经验 + /// + public virtual int Experience { get; set; } + + } + + public class AddRecruitMessageInput : RecruitMessageInput + { + /// + /// 职位详情 + /// + [Required(ErrorMessage = "职位详情不能为空")] + public override string PositionInfo { get; set; } + + /// + /// 标题 + /// + [Required(ErrorMessage = "标题不能为空")] + public override string Title { get; set; } + + } + + public class DeleteRecruitMessageInput + { + /// + /// 主键Id + /// + [Required(ErrorMessage = "主键Id不能为空")] + public long Id { get; set; } + + } + + public class UpdateRecruitMessageInput : RecruitMessageInput + { + /// + /// 主键Id + /// + [Required(ErrorMessage = "主键Id不能为空")] + public long Id { get; set; } + + } + + public class QueryeRecruitMessageInput : DeleteRecruitMessageInput + { + + } +} diff --git a/GDZZ.Application/Service/RecruitMessage/Dto/RecruitMessageOutput.cs b/GDZZ.Application/Service/RecruitMessage/Dto/RecruitMessageOutput.cs new file mode 100644 index 0000000..995831b --- /dev/null +++ b/GDZZ.Application/Service/RecruitMessage/Dto/RecruitMessageOutput.cs @@ -0,0 +1,76 @@ +using System; + +namespace GDZZ.Application +{ + /// + /// 招聘消息输出参数 + /// + public class RecruitMessageOutput + { + /// + /// 主键Id + /// + public long Id { get; set; } + + /// + /// 租户Id + /// + public long TenantId { get; set; } + + /// + /// 职位详情 + /// + public string PositionInfo { get; set; } + + /// + /// 标题 + /// + public string Title { get; set; } + + /// + /// 状态 + /// + public int Status { get; set; } + + /// + /// 省份 + /// + public int ProvinceId { get; set; } + + /// + /// 城市 + /// + public int CityId { get; set; } + + /// + /// 区 + /// + public int AreaId { get; set; } + + /// + /// 详细地址 + /// + public int Address { get; set; } + + /// + /// 联系电话 + /// + public string Phone { get; set; } + + /// + /// 标签 + /// + public string Tag { get; set; } + + /// + /// 学历 + /// + public int Education { get; set; } + + /// + /// 经验 + /// + public int Experience { get; set; } + + } +} diff --git a/GDZZ.Application/Service/RecruitMessage/IRecruitMessageService.cs b/GDZZ.Application/Service/RecruitMessage/IRecruitMessageService.cs new file mode 100644 index 0000000..f9ceb8e --- /dev/null +++ b/GDZZ.Application/Service/RecruitMessage/IRecruitMessageService.cs @@ -0,0 +1,16 @@ +using GDZZ.Core; +using Microsoft.AspNetCore.Mvc; +using System.Threading.Tasks; +using GDZZ.Application.Entity; +namespace GDZZ.Application +{ + public interface IRecruitMessageService + { + Task Add(AddRecruitMessageInput input); + Task Delete(DeleteRecruitMessageInput input); + Task Get([FromQuery] QueryeRecruitMessageInput input); + Task List([FromQuery] RecruitMessageInput input); + Task Page([FromQuery] RecruitMessageInput input); + Task Update(UpdateRecruitMessageInput input); + } +} \ No newline at end of file diff --git a/GDZZ.Application/Service/RecruitMessage/RecruitMessageService.cs b/GDZZ.Application/Service/RecruitMessage/RecruitMessageService.cs new file mode 100644 index 0000000..e43e016 --- /dev/null +++ b/GDZZ.Application/Service/RecruitMessage/RecruitMessageService.cs @@ -0,0 +1,100 @@ +using GDZZ.Core; +using Furion.DependencyInjection; +using Furion.DynamicApiController; +using Mapster; +using Microsoft.AspNetCore.Mvc; +using SqlSugar; +using System.Linq; +using System.Threading.Tasks; +using GDZZ.Application.Entity; +namespace GDZZ.Application +{ + /// + /// 招聘消息服务 + /// + [ApiDescriptionSettings("Application",Name = "RecruitMessage", Order = 1)] + public class RecruitMessageService : IRecruitMessageService, IDynamicApiController, ITransient + { + private readonly SqlSugarRepository _rep; + + public RecruitMessageService(SqlSugarRepository rep) + { + _rep = rep; + } + + /// + /// 分页查询招聘消息 + /// + /// + /// + [HttpGet("/RecruitMessage/page")] + public async Task Page([FromQuery] RecruitMessageInput input) + { + var entities = await _rep.AsQueryable() + .WhereIF(!string.IsNullOrWhiteSpace(input.PositionInfo), u => u.PositionInfo == input.PositionInfo) + .WhereIF(!string.IsNullOrWhiteSpace(input.Title), u => u.Title == input.Title) + .WhereIF(!string.IsNullOrWhiteSpace(input.Phone), u => u.Phone == input.Phone) + .WhereIF(!string.IsNullOrWhiteSpace(input.Tag), u => u.Tag == input.Tag) + .ToPagedListAsync(input.PageNo, input.PageSize); + return entities.XnPagedResult(); + } + + /// + /// 增加招聘消息 + /// + /// + /// + [HttpPost("/RecruitMessage/add")] + public async Task Add(AddRecruitMessageInput input) + { + var entity = input.Adapt(); + await _rep.InsertAsync(entity); + } + + /// + /// 删除招聘消息 + /// + /// + /// + [HttpPost("/RecruitMessage/delete")] + public async Task Delete(DeleteRecruitMessageInput input) + { + var entity = await _rep.FirstOrDefaultAsync(u => u.Id == input.Id); + await _rep.DeleteAsync(entity); + } + + /// + /// 更新招聘消息 + /// + /// + /// + [HttpPost("/RecruitMessage/edit")] + public async Task Update(UpdateRecruitMessageInput input) + { + var entity = input.Adapt(); + await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns:true).ExecuteCommandAsync(); + } + + /// + /// 获取招聘消息 + /// + /// + /// + [HttpGet("/RecruitMessage/detail")] + public async Task Get([FromQuery] QueryeRecruitMessageInput input) + { + return await _rep.FirstOrDefaultAsync(u => u.Id == input.Id); + } + + /// + /// 获取招聘消息列表 + /// + /// + /// + [HttpGet("/RecruitMessage/list")] + public async Task List([FromQuery] RecruitMessageInput input) + { + return await _rep.ToListAsync(); + } + } +} diff --git a/Magic.Application/Service/Test/ITestService.cs b/GDZZ.Application/Service/Test/ITestService.cs similarity index 83% rename from Magic.Application/Service/Test/ITestService.cs rename to GDZZ.Application/Service/Test/ITestService.cs index d842f76..b0a3850 100644 --- a/Magic.Application/Service/Test/ITestService.cs +++ b/GDZZ.Application/Service/Test/ITestService.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Magic.Application.Service; +namespace GDZZ.Application.Service; public interface ITestService { diff --git a/Magic.Application/Service/Test/TestService.cs b/GDZZ.Application/Service/Test/TestService.cs similarity index 95% rename from Magic.Application/Service/Test/TestService.cs rename to GDZZ.Application/Service/Test/TestService.cs index ba57fa6..d1a3faa 100644 --- a/Magic.Application/Service/Test/TestService.cs +++ b/GDZZ.Application/Service/Test/TestService.cs @@ -3,15 +3,15 @@ using Furion.DynamicApiController; using Furion.FriendlyException; using Furion.JsonSerialization; using Furion.Logging.Extensions; -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using System; using System.Text.Json; using System.Threading.Tasks; -namespace Magic.Application.Service; +namespace GDZZ.Application.Service; [ApiDescriptionSettings("Application",Name = "Test", Order = 1)] public class TestService : ITestService, IDynamicApiController, ITransient diff --git a/Magic.Application/Startup.cs b/GDZZ.Application/Startup.cs similarity index 86% rename from Magic.Application/Startup.cs rename to GDZZ.Application/Startup.cs index e32791e..5d94e10 100644 --- a/Magic.Application/Startup.cs +++ b/GDZZ.Application/Startup.cs @@ -1,7 +1,7 @@ using Furion; using Microsoft.Extensions.DependencyInjection; -namespace Magic.Application; +namespace GDZZ.Application; public class Startup : AppStartup { diff --git a/Magic.Application/applicationsettings.json b/GDZZ.Application/applicationsettings.json similarity index 100% rename from Magic.Application/applicationsettings.json rename to GDZZ.Application/applicationsettings.json diff --git a/Magic.CodeFirst/Magic.CodeFirst.csproj b/GDZZ.CodeFirst/GDZZ.CodeFirst.csproj similarity index 78% rename from Magic.CodeFirst/Magic.CodeFirst.csproj rename to GDZZ.CodeFirst/GDZZ.CodeFirst.csproj index 6bb0c8e..b6a15fd 100644 --- a/Magic.CodeFirst/Magic.CodeFirst.csproj +++ b/GDZZ.CodeFirst/GDZZ.CodeFirst.csproj @@ -8,7 +8,7 @@ - + diff --git a/Magic.CodeFirst/Program.cs b/GDZZ.CodeFirst/Program.cs similarity index 94% rename from Magic.CodeFirst/Program.cs rename to GDZZ.CodeFirst/Program.cs index 59eba81..c493ba4 100644 --- a/Magic.CodeFirst/Program.cs +++ b/GDZZ.CodeFirst/Program.cs @@ -3,9 +3,9 @@ -using Magic.CodeFirst; -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.CodeFirst; +using GDZZ.Core; +using GDZZ.Core.Entity; using Microsoft.Extensions.Configuration; using SqlSugar; using System.Collections; @@ -16,7 +16,7 @@ using System.Text; -var assembles = new string[] { "Magic.FlowCenter.dll", "Magic.Core.dll" }; +var assembles = new string[] { "GDZZ.FlowCenter.dll", "GDZZ.Core.dll" }; //首先创建数据库 CreateDatabase(); //初始化表结构 @@ -102,7 +102,7 @@ static void CreateSeedData(string[] assembles) MethodInfo curMethod = staticDoWorkMethod.MakeGenericMethod(curType); var list = curMethod.Invoke(null, null); if (list == null) continue; - var path = Path.Combine(@"D:\Workspace\admin-net-sqlsugar\backend\Magic.CodeFirst\SeedData", $"{curType.Name}SeedData.cs"); + var path = Path.Combine(@"D:\Workspace\admin-net-sqlsugar\backend\GDZZ.CodeFirst\SeedData", $"{curType.Name}SeedData.cs"); if (File.Exists(path)) @@ -110,10 +110,10 @@ static void CreateSeedData(string[] assembles) FileStream fs = new FileStream(path, FileMode.CreateNew, FileAccess.ReadWrite); StreamWriter sw = new StreamWriter(fs); - StringBuilder sb = new StringBuilder($@"using Magic.Core; -using Magic.Core.Entity; + StringBuilder sb = new StringBuilder($@"using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class {curType.Name}SeedData : ISeedData , ISqlSugarEntitySeedData<{curType.Name}> {{ public IEnumerable<{curType.Name}> HasData() @@ -144,7 +144,7 @@ static void InsertData() { var baseType = typeof(ISeedData); var path = AppDomain.CurrentDomain.RelativeSearchPath ?? AppDomain.CurrentDomain.BaseDirectory; - var referencedAssemblies = System.IO.Directory.GetFiles(path, "Magic.CodeFirst.dll").Select(Assembly.LoadFrom).ToArray(); + var referencedAssemblies = System.IO.Directory.GetFiles(path, "GDZZ.CodeFirst.dll").Select(Assembly.LoadFrom).ToArray(); var seedDataTypes = referencedAssemblies .SelectMany(a => a.DefinedTypes) .Select(type => type.AsType()) diff --git a/Magic.CodeFirst/SeedData/DocumentationSeedData.cs b/GDZZ.CodeFirst/SeedData/DocumentationSeedData.cs similarity index 96% rename from Magic.CodeFirst/SeedData/DocumentationSeedData.cs rename to GDZZ.CodeFirst/SeedData/DocumentationSeedData.cs index 1e67a2d..3096645 100644 --- a/Magic.CodeFirst/SeedData/DocumentationSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/DocumentationSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class DocumentationSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/ISqlSugarEntitySeedData.cs b/GDZZ.CodeFirst/SeedData/ISqlSugarEntitySeedData.cs similarity index 84% rename from Magic.CodeFirst/SeedData/ISqlSugarEntitySeedData.cs rename to GDZZ.CodeFirst/SeedData/ISqlSugarEntitySeedData.cs index a936b06..affabad 100644 --- a/Magic.CodeFirst/SeedData/ISqlSugarEntitySeedData.cs +++ b/GDZZ.CodeFirst/SeedData/ISqlSugarEntitySeedData.cs @@ -1,4 +1,4 @@ -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; /// /// 实体种子数据接口 diff --git a/Magic.CodeFirst/SeedData/SysAppSeedData.cs b/GDZZ.CodeFirst/SeedData/SysAppSeedData.cs similarity index 95% rename from Magic.CodeFirst/SeedData/SysAppSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysAppSeedData.cs index 7e64dfb..7dd308a 100644 --- a/Magic.CodeFirst/SeedData/SysAppSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysAppSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysAppSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysCodeGenConfigSeedData.cs b/GDZZ.CodeFirst/SeedData/SysCodeGenConfigSeedData.cs similarity index 99% rename from Magic.CodeFirst/SeedData/SysCodeGenConfigSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysCodeGenConfigSeedData.cs index 77dbf5b..f117fe1 100644 --- a/Magic.CodeFirst/SeedData/SysCodeGenConfigSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysCodeGenConfigSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysCodeGenConfigSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/GDZZ.CodeFirst/SeedData/SysCodeGenSeedData.cs b/GDZZ.CodeFirst/SeedData/SysCodeGenSeedData.cs new file mode 100644 index 0000000..b274bd8 --- /dev/null +++ b/GDZZ.CodeFirst/SeedData/SysCodeGenSeedData.cs @@ -0,0 +1,13 @@ +using GDZZ.Core; +using GDZZ.Core.Entity; + +namespace GDZZ.CodeFirst; + +public class SysCodeGenSeedData : ISeedData , ISqlSugarEntitySeedData +{ public IEnumerable HasData() + { string json = @"[{""AuthorName"":""GDZZ"",""TablePrefix"":null,""GenerateType"":""2"",""TableName"":""Test"",""NameSpace"":""GDZZ.Application"",""BusName"":""测试"",""MenuApplication"":""busiapp"",""MenuPid"":0,""CreatedTime"":""2022-05-25T09:15:02.367"",""UpdatedTime"":null,""CreatedUserId"":142307070910551,""CreatedUserName"":""超级管理员"",""UpdatedUserId"":null,""UpdatedUserName"":null,""IsDeleted"":false,""Id"":291946907033669}] +"; + List list = JsonUtil.ToObject>(json); + + return list; +}} diff --git a/Magic.CodeFirst/SeedData/SysConfigSeedData.cs b/GDZZ.CodeFirst/SeedData/SysConfigSeedData.cs similarity index 99% rename from Magic.CodeFirst/SeedData/SysConfigSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysConfigSeedData.cs index b19666d..a102748 100644 --- a/Magic.CodeFirst/SeedData/SysConfigSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysConfigSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysConfigSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysDictDataSeedData.cs b/GDZZ.CodeFirst/SeedData/SysDictDataSeedData.cs similarity index 99% rename from Magic.CodeFirst/SeedData/SysDictDataSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysDictDataSeedData.cs index 151eecd..8562a45 100644 --- a/Magic.CodeFirst/SeedData/SysDictDataSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysDictDataSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysDictDataSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysDictTypeSeedData.cs b/GDZZ.CodeFirst/SeedData/SysDictTypeSeedData.cs similarity index 99% rename from Magic.CodeFirst/SeedData/SysDictTypeSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysDictTypeSeedData.cs index 1c15e32..9032da7 100644 --- a/Magic.CodeFirst/SeedData/SysDictTypeSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysDictTypeSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysDictTypeSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysEmpPosSeedData.cs b/GDZZ.CodeFirst/SeedData/SysEmpPosSeedData.cs similarity index 83% rename from Magic.CodeFirst/SeedData/SysEmpPosSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysEmpPosSeedData.cs index ef0b584..313b4cc 100644 --- a/Magic.CodeFirst/SeedData/SysEmpPosSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysEmpPosSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysEmpPosSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysEmpSeedData.cs b/GDZZ.CodeFirst/SeedData/SysEmpSeedData.cs similarity index 90% rename from Magic.CodeFirst/SeedData/SysEmpSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysEmpSeedData.cs index d62649d..842f2e1 100644 --- a/Magic.CodeFirst/SeedData/SysEmpSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysEmpSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysEmpSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysFileSeedData.cs b/GDZZ.CodeFirst/SeedData/SysFileSeedData.cs similarity index 93% rename from Magic.CodeFirst/SeedData/SysFileSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysFileSeedData.cs index ae853a0..aa98595 100644 --- a/Magic.CodeFirst/SeedData/SysFileSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysFileSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysFileSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysMenuSeedData.cs b/GDZZ.CodeFirst/SeedData/SysMenuSeedData.cs similarity index 99% rename from Magic.CodeFirst/SeedData/SysMenuSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysMenuSeedData.cs index 1d0eb46..f0e0a66 100644 --- a/Magic.CodeFirst/SeedData/SysMenuSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysMenuSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysMenuSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysNoticeSeedData.cs b/GDZZ.CodeFirst/SeedData/SysNoticeSeedData.cs similarity index 99% rename from Magic.CodeFirst/SeedData/SysNoticeSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysNoticeSeedData.cs index 43f70b0..ca3d046 100644 --- a/Magic.CodeFirst/SeedData/SysNoticeSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysNoticeSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysNoticeSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysNoticeUserSeedData.cs b/GDZZ.CodeFirst/SeedData/SysNoticeUserSeedData.cs similarity index 96% rename from Magic.CodeFirst/SeedData/SysNoticeUserSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysNoticeUserSeedData.cs index 7ad6194..c5275d6 100644 --- a/Magic.CodeFirst/SeedData/SysNoticeUserSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysNoticeUserSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysNoticeUserSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysOrgSeedData.cs b/GDZZ.CodeFirst/SeedData/SysOrgSeedData.cs similarity index 97% rename from Magic.CodeFirst/SeedData/SysOrgSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysOrgSeedData.cs index 27ca7ca..8cf8d53 100644 --- a/Magic.CodeFirst/SeedData/SysOrgSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysOrgSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysOrgSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysPosSeedData.cs b/GDZZ.CodeFirst/SeedData/SysPosSeedData.cs similarity index 89% rename from Magic.CodeFirst/SeedData/SysPosSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysPosSeedData.cs index d4fb43f..5ab97f0 100644 --- a/Magic.CodeFirst/SeedData/SysPosSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysPosSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysPosSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysRoleDataScopeSeedData.cs b/GDZZ.CodeFirst/SeedData/SysRoleDataScopeSeedData.cs similarity index 82% rename from Magic.CodeFirst/SeedData/SysRoleDataScopeSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysRoleDataScopeSeedData.cs index 687d016..03c02e3 100644 --- a/Magic.CodeFirst/SeedData/SysRoleDataScopeSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysRoleDataScopeSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysRoleDataScopeSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysRoleMenuSeedData.cs b/GDZZ.CodeFirst/SeedData/SysRoleMenuSeedData.cs similarity index 99% rename from Magic.CodeFirst/SeedData/SysRoleMenuSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysRoleMenuSeedData.cs index 0d03e7f..18b037c 100644 --- a/Magic.CodeFirst/SeedData/SysRoleMenuSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysRoleMenuSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysRoleMenuSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysRoleSeedData.cs b/GDZZ.CodeFirst/SeedData/SysRoleSeedData.cs similarity index 96% rename from Magic.CodeFirst/SeedData/SysRoleSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysRoleSeedData.cs index d4c5b50..334e6c1 100644 --- a/Magic.CodeFirst/SeedData/SysRoleSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysRoleSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysRoleSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysTenantSeedData.cs b/GDZZ.CodeFirst/SeedData/SysTenantSeedData.cs similarity index 95% rename from Magic.CodeFirst/SeedData/SysTenantSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysTenantSeedData.cs index eaeade2..0947aa7 100644 --- a/Magic.CodeFirst/SeedData/SysTenantSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysTenantSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysTenantSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysTestSeedData.cs b/GDZZ.CodeFirst/SeedData/SysTestSeedData.cs similarity index 97% rename from Magic.CodeFirst/SeedData/SysTestSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysTestSeedData.cs index b29f73e..25a7282 100644 --- a/Magic.CodeFirst/SeedData/SysTestSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysTestSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysTestSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysTimerSeedData.cs b/GDZZ.CodeFirst/SeedData/SysTimerSeedData.cs similarity index 96% rename from Magic.CodeFirst/SeedData/SysTimerSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysTimerSeedData.cs index c80de1c..a4c5c8c 100644 --- a/Magic.CodeFirst/SeedData/SysTimerSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysTimerSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysTimerSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysUserDataScopeSeedData.cs b/GDZZ.CodeFirst/SeedData/SysUserDataScopeSeedData.cs similarity index 85% rename from Magic.CodeFirst/SeedData/SysUserDataScopeSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysUserDataScopeSeedData.cs index 3631bc5..fab6ce9 100644 --- a/Magic.CodeFirst/SeedData/SysUserDataScopeSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysUserDataScopeSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysUserDataScopeSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysUserRoleSeedData.cs b/GDZZ.CodeFirst/SeedData/SysUserRoleSeedData.cs similarity index 87% rename from Magic.CodeFirst/SeedData/SysUserRoleSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysUserRoleSeedData.cs index c417436..7065696 100644 --- a/Magic.CodeFirst/SeedData/SysUserRoleSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysUserRoleSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysUserRoleSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SeedData/SysUserSeedData.cs b/GDZZ.CodeFirst/SeedData/SysUserSeedData.cs similarity index 97% rename from Magic.CodeFirst/SeedData/SysUserSeedData.cs rename to GDZZ.CodeFirst/SeedData/SysUserSeedData.cs index e96b02d..c091d82 100644 --- a/Magic.CodeFirst/SeedData/SysUserSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysUserSeedData.cs @@ -1,7 +1,7 @@ -using Magic.Core; -using Magic.Core.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SysUserSeedData : ISeedData , ISqlSugarEntitySeedData { public IEnumerable HasData() diff --git a/Magic.CodeFirst/SqlSugarHelper.cs b/GDZZ.CodeFirst/SqlSugarHelper.cs similarity index 95% rename from Magic.CodeFirst/SqlSugarHelper.cs rename to GDZZ.CodeFirst/SqlSugarHelper.cs index d92870c..19f41c9 100644 --- a/Magic.CodeFirst/SqlSugarHelper.cs +++ b/GDZZ.CodeFirst/SqlSugarHelper.cs @@ -1,4 +1,4 @@ -using Magic.Core; +using GDZZ.Core; using Microsoft.Extensions.Configuration; using SqlSugar; using System; @@ -7,14 +7,14 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Magic.CodeFirst; +namespace GDZZ.CodeFirst; public class SqlSugarHelper { //用单例模式 // public static SqlSugarScope Db = new SqlSugarScope(new ConnectionConfig() // { - // ConnectionString = "Server=.;Database=MagicCodeFirst;User=sa;Password=123456;MultipleActiveResultSets=True;",//连接符字串 + // ConnectionString = "Server=.;Database=GDZZCodeFirst;User=sa;Password=123456;MultipleActiveResultSets=True;",//连接符字串 // DbType = DbType.SqlServer,//数据库类型 // IsAutoCloseConnection = true //不设成true要手动close // }, diff --git a/Magic.Core/Attributes/OpLogAttribute.cs b/GDZZ.Core/Attributes/OpLogAttribute.cs similarity index 91% rename from Magic.Core/Attributes/OpLogAttribute.cs rename to GDZZ.Core/Attributes/OpLogAttribute.cs index 9faeefc..5f3715a 100644 --- a/Magic.Core/Attributes/OpLogAttribute.cs +++ b/GDZZ.Core/Attributes/OpLogAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 启用用操作日志 diff --git a/Magic.Core/Attributes/SqlSugarUnitOfWorkAttribute.cs b/GDZZ.Core/Attributes/SqlSugarUnitOfWorkAttribute.cs similarity index 98% rename from Magic.Core/Attributes/SqlSugarUnitOfWorkAttribute.cs rename to GDZZ.Core/Attributes/SqlSugarUnitOfWorkAttribute.cs index b14829e..0448a26 100644 --- a/Magic.Core/Attributes/SqlSugarUnitOfWorkAttribute.cs +++ b/GDZZ.Core/Attributes/SqlSugarUnitOfWorkAttribute.cs @@ -1,7 +1,7 @@ using System; using System.Data; -namespace Magic.Core; +namespace GDZZ.Core; /// /// SqlSugar 工作单元配置特性 diff --git a/Magic.Core/Cache/ICache.cs b/GDZZ.Core/Cache/ICache.cs similarity index 99% rename from Magic.Core/Cache/ICache.cs rename to GDZZ.Core/Cache/ICache.cs index fef584e..0d61e78 100644 --- a/Magic.Core/Cache/ICache.cs +++ b/GDZZ.Core/Cache/ICache.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 缓存接口 diff --git a/Magic.Core/Cache/MemoryCache.cs b/GDZZ.Core/Cache/MemoryCache.cs similarity index 99% rename from Magic.Core/Cache/MemoryCache.cs rename to GDZZ.Core/Cache/MemoryCache.cs index baa6565..6c5a051 100644 --- a/Magic.Core/Cache/MemoryCache.cs +++ b/GDZZ.Core/Cache/MemoryCache.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 内存缓存 diff --git a/Magic.Core/Cache/RedisCache.cs b/GDZZ.Core/Cache/RedisCache.cs similarity index 99% rename from Magic.Core/Cache/RedisCache.cs rename to GDZZ.Core/Cache/RedisCache.cs index a434a9d..9d43b25 100644 --- a/Magic.Core/Cache/RedisCache.cs +++ b/GDZZ.Core/Cache/RedisCache.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Magic.Core; +namespace GDZZ.Core; /// /// Redis缓存 diff --git a/Magic.Core/Cache/SqlSugarCache.cs b/GDZZ.Core/Cache/SqlSugarCache.cs similarity index 98% rename from Magic.Core/Cache/SqlSugarCache.cs rename to GDZZ.Core/Cache/SqlSugarCache.cs index 0347377..6070452 100644 --- a/Magic.Core/Cache/SqlSugarCache.cs +++ b/GDZZ.Core/Cache/SqlSugarCache.cs @@ -4,7 +4,7 @@ using SqlSugar; using System; using System.Collections.Generic; -namespace Magic.Core; +namespace GDZZ.Core; public class SqlSugarCache : ICacheService { diff --git a/Magic.Core/Captcha/ClickWord/ClickWordCaptcha.cs b/GDZZ.Core/Captcha/ClickWord/ClickWordCaptcha.cs similarity index 99% rename from Magic.Core/Captcha/ClickWord/ClickWordCaptcha.cs rename to GDZZ.Core/Captcha/ClickWord/ClickWordCaptcha.cs index ac65b35..d606951 100644 --- a/Magic.Core/Captcha/ClickWord/ClickWordCaptcha.cs +++ b/GDZZ.Core/Captcha/ClickWord/ClickWordCaptcha.cs @@ -10,7 +10,7 @@ using System.IO; using System.Linq; using Yitter.IdGenerator; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 点选验证码 diff --git a/Magic.Core/Captcha/ClickWord/ClickWordCaptchaInput.cs b/GDZZ.Core/Captcha/ClickWord/ClickWordCaptchaInput.cs similarity index 96% rename from Magic.Core/Captcha/ClickWord/ClickWordCaptchaInput.cs rename to GDZZ.Core/Captcha/ClickWord/ClickWordCaptchaInput.cs index 0c81e5f..2b667df 100644 --- a/Magic.Core/Captcha/ClickWord/ClickWordCaptchaInput.cs +++ b/GDZZ.Core/Captcha/ClickWord/ClickWordCaptchaInput.cs @@ -1,7 +1,7 @@ using Furion.DependencyInjection; using System.ComponentModel.DataAnnotations; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 点击验证码输入参数 diff --git a/Magic.Core/Captcha/ClickWord/ClickWordCaptchaResult.cs b/GDZZ.Core/Captcha/ClickWord/ClickWordCaptchaResult.cs similarity index 98% rename from Magic.Core/Captcha/ClickWord/ClickWordCaptchaResult.cs rename to GDZZ.Core/Captcha/ClickWord/ClickWordCaptchaResult.cs index 1644f19..f54bc79 100644 --- a/Magic.Core/Captcha/ClickWord/ClickWordCaptchaResult.cs +++ b/GDZZ.Core/Captcha/ClickWord/ClickWordCaptchaResult.cs @@ -1,7 +1,7 @@ using Furion.DependencyInjection; using System.Collections.Generic; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 验证码输出参数 diff --git a/Magic.Core/Captcha/ClickWord/IClickWordCaptcha.cs b/GDZZ.Core/Captcha/ClickWord/IClickWordCaptcha.cs similarity index 89% rename from Magic.Core/Captcha/ClickWord/IClickWordCaptcha.cs rename to GDZZ.Core/Captcha/ClickWord/IClickWordCaptcha.cs index b596462..dff0f0d 100644 --- a/Magic.Core/Captcha/ClickWord/IClickWordCaptcha.cs +++ b/GDZZ.Core/Captcha/ClickWord/IClickWordCaptcha.cs @@ -1,4 +1,4 @@ -namespace Magic.Core; +namespace GDZZ.Core; public interface IClickWordCaptcha { diff --git a/Magic.Core/Captcha/General/GeneralCaptcha.cs b/GDZZ.Core/Captcha/General/GeneralCaptcha.cs similarity index 99% rename from Magic.Core/Captcha/General/GeneralCaptcha.cs rename to GDZZ.Core/Captcha/General/GeneralCaptcha.cs index 82e7c19..7040684 100644 --- a/Magic.Core/Captcha/General/GeneralCaptcha.cs +++ b/GDZZ.Core/Captcha/General/GeneralCaptcha.cs @@ -7,7 +7,7 @@ using System.Drawing.Imaging; using System.IO; using System.Text; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 常规验证码 diff --git a/Magic.Core/Captcha/General/GeneralCaptchaInput.cs b/GDZZ.Core/Captcha/General/GeneralCaptchaInput.cs similarity index 96% rename from Magic.Core/Captcha/General/GeneralCaptchaInput.cs rename to GDZZ.Core/Captcha/General/GeneralCaptchaInput.cs index a2ccebc..55bf5db 100644 --- a/Magic.Core/Captcha/General/GeneralCaptchaInput.cs +++ b/GDZZ.Core/Captcha/General/GeneralCaptchaInput.cs @@ -1,7 +1,7 @@ using Furion.DependencyInjection; using System.ComponentModel.DataAnnotations; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 常规验证码输入 diff --git a/Magic.Core/Captcha/General/IGeneralCaptcha.cs b/GDZZ.Core/Captcha/General/IGeneralCaptcha.cs similarity index 84% rename from Magic.Core/Captcha/General/IGeneralCaptcha.cs rename to GDZZ.Core/Captcha/General/IGeneralCaptcha.cs index 119a96d..d3db42e 100644 --- a/Magic.Core/Captcha/General/IGeneralCaptcha.cs +++ b/GDZZ.Core/Captcha/General/IGeneralCaptcha.cs @@ -1,4 +1,4 @@ -namespace Magic.Core; +namespace GDZZ.Core; public interface IGeneralCaptcha { diff --git a/Magic.Core/ConfigOption/ConfigOptions.cs b/GDZZ.Core/ConfigOption/ConfigOptions.cs similarity index 99% rename from Magic.Core/ConfigOption/ConfigOptions.cs rename to GDZZ.Core/ConfigOption/ConfigOptions.cs index 19a8b47..b6dc2f3 100644 --- a/Magic.Core/ConfigOption/ConfigOptions.cs +++ b/GDZZ.Core/ConfigOption/ConfigOptions.cs @@ -1,7 +1,7 @@ using Furion.ConfigurableOptions; using System.Collections.Generic; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 缓存配置 diff --git a/Magic.Core/Const/ClaimConst.cs b/GDZZ.Core/Const/ClaimConst.cs similarity index 96% rename from Magic.Core/Const/ClaimConst.cs rename to GDZZ.Core/Const/ClaimConst.cs index 9bdcc6b..5bb1565 100644 --- a/Magic.Core/Const/ClaimConst.cs +++ b/GDZZ.Core/Const/ClaimConst.cs @@ -1,4 +1,4 @@ -namespace Magic.Core; +namespace GDZZ.Core; public class ClaimConst { diff --git a/Magic.Core/Const/CommonConst.cs b/GDZZ.Core/Const/CommonConst.cs similarity index 93% rename from Magic.Core/Const/CommonConst.cs rename to GDZZ.Core/Const/CommonConst.cs index 2933a99..7c3b88a 100644 --- a/Magic.Core/Const/CommonConst.cs +++ b/GDZZ.Core/Const/CommonConst.cs @@ -1,4 +1,4 @@ -namespace Magic.Core; +namespace GDZZ.Core; public class CommonConst { @@ -43,7 +43,7 @@ public class CommonConst /// /// 程序集 /// - public static string[] ENTITY_ASSEMBLY_NAME = new string[] { "Magic.Core", "Magic.Application", "Magic.FlowCenter" }; + public static string[] ENTITY_ASSEMBLY_NAME = new string[] { "GDZZ.Core", "GDZZ.Application", "GDZZ.FlowCenter" }; /// /// 删除字段 /// diff --git a/Magic.Core/Entity/DBEntityTenant.cs b/GDZZ.Core/Entity/DBEntityTenant.cs similarity index 91% rename from Magic.Core/Entity/DBEntityTenant.cs rename to GDZZ.Core/Entity/DBEntityTenant.cs index 44b7f2f..521ff03 100644 --- a/Magic.Core/Entity/DBEntityTenant.cs +++ b/GDZZ.Core/Entity/DBEntityTenant.cs @@ -1,7 +1,7 @@  using SqlSugar; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 自定义租户基类实体 diff --git a/Magic.Core/Entity/DEntityBase.cs b/GDZZ.Core/Entity/DEntityBase.cs similarity index 99% rename from Magic.Core/Entity/DEntityBase.cs rename to GDZZ.Core/Entity/DEntityBase.cs index f580024..5a1bb56 100644 --- a/Magic.Core/Entity/DEntityBase.cs +++ b/GDZZ.Core/Entity/DEntityBase.cs @@ -2,7 +2,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 自定义实体基类 diff --git a/Magic.Core/Entity/Documentation.cs b/GDZZ.Core/Entity/Documentation.cs similarity index 98% rename from Magic.Core/Entity/Documentation.cs rename to GDZZ.Core/Entity/Documentation.cs index 94d579c..39e8a72 100644 --- a/Magic.Core/Entity/Documentation.cs +++ b/GDZZ.Core/Entity/Documentation.cs @@ -1,7 +1,7 @@ using SqlSugar; using System.Collections.Generic; using System.ComponentModel; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 文档表 diff --git a/Magic.Core/Entity/SysApp.cs b/GDZZ.Core/Entity/SysApp.cs similarity index 97% rename from Magic.Core/Entity/SysApp.cs rename to GDZZ.Core/Entity/SysApp.cs index f88e0d2..c510290 100644 --- a/Magic.Core/Entity/SysApp.cs +++ b/GDZZ.Core/Entity/SysApp.cs @@ -2,7 +2,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 系统应用表 diff --git a/Magic.Core/Entity/SysCodeGen.cs b/GDZZ.Core/Entity/SysCodeGen.cs similarity index 98% rename from Magic.Core/Entity/SysCodeGen.cs rename to GDZZ.Core/Entity/SysCodeGen.cs index 336b02b..5f5017e 100644 --- a/Magic.Core/Entity/SysCodeGen.cs +++ b/GDZZ.Core/Entity/SysCodeGen.cs @@ -2,7 +2,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 代码生成表 diff --git a/Magic.Core/Entity/SysCodeGenConfig.cs b/GDZZ.Core/Entity/SysCodeGenConfig.cs similarity index 99% rename from Magic.Core/Entity/SysCodeGenConfig.cs rename to GDZZ.Core/Entity/SysCodeGenConfig.cs index 4263dc2..e1eab95 100644 --- a/Magic.Core/Entity/SysCodeGenConfig.cs +++ b/GDZZ.Core/Entity/SysCodeGenConfig.cs @@ -2,7 +2,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 代码生成字段配置表 diff --git a/Magic.Core/Entity/SysConfig.cs b/GDZZ.Core/Entity/SysConfig.cs similarity index 98% rename from Magic.Core/Entity/SysConfig.cs rename to GDZZ.Core/Entity/SysConfig.cs index 2a33d51..4f3d233 100644 --- a/Magic.Core/Entity/SysConfig.cs +++ b/GDZZ.Core/Entity/SysConfig.cs @@ -2,7 +2,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 参数配置表 diff --git a/Magic.Core/Entity/SysDictData.cs b/GDZZ.Core/Entity/SysDictData.cs similarity index 97% rename from Magic.Core/Entity/SysDictData.cs rename to GDZZ.Core/Entity/SysDictData.cs index d86aa94..fef3f28 100644 --- a/Magic.Core/Entity/SysDictData.cs +++ b/GDZZ.Core/Entity/SysDictData.cs @@ -1,7 +1,7 @@ using SqlSugar; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 字典值表 diff --git a/Magic.Core/Entity/SysDictType.cs b/GDZZ.Core/Entity/SysDictType.cs similarity index 97% rename from Magic.Core/Entity/SysDictType.cs rename to GDZZ.Core/Entity/SysDictType.cs index a664ce6..3c8ebeb 100644 --- a/Magic.Core/Entity/SysDictType.cs +++ b/GDZZ.Core/Entity/SysDictType.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 字典类型表 diff --git a/Magic.Core/Entity/SysEmp.cs b/GDZZ.Core/Entity/SysEmp.cs similarity index 96% rename from Magic.Core/Entity/SysEmp.cs rename to GDZZ.Core/Entity/SysEmp.cs index 67336e0..5ee1496 100644 --- a/Magic.Core/Entity/SysEmp.cs +++ b/GDZZ.Core/Entity/SysEmp.cs @@ -1,7 +1,7 @@ using SqlSugar; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 员工表 diff --git a/Magic.Core/Entity/SysEmpExtOrgPos.cs b/GDZZ.Core/Entity/SysEmpExtOrgPos.cs similarity index 95% rename from Magic.Core/Entity/SysEmpExtOrgPos.cs rename to GDZZ.Core/Entity/SysEmpExtOrgPos.cs index baab5f6..72d1062 100644 --- a/Magic.Core/Entity/SysEmpExtOrgPos.cs +++ b/GDZZ.Core/Entity/SysEmpExtOrgPos.cs @@ -1,6 +1,6 @@ using SqlSugar; using System.ComponentModel; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 员工附属机构职位表 diff --git a/Magic.Core/Entity/SysEmpPos.cs b/GDZZ.Core/Entity/SysEmpPos.cs similarity index 94% rename from Magic.Core/Entity/SysEmpPos.cs rename to GDZZ.Core/Entity/SysEmpPos.cs index 95f010a..6197882 100644 --- a/Magic.Core/Entity/SysEmpPos.cs +++ b/GDZZ.Core/Entity/SysEmpPos.cs @@ -1,7 +1,7 @@ using SqlSugar; using System.ComponentModel; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 员工职位表 diff --git a/Magic.Core/Entity/SysFile.cs b/GDZZ.Core/Entity/SysFile.cs similarity index 98% rename from Magic.Core/Entity/SysFile.cs rename to GDZZ.Core/Entity/SysFile.cs index 34f2a92..bb7e5f5 100644 --- a/Magic.Core/Entity/SysFile.cs +++ b/GDZZ.Core/Entity/SysFile.cs @@ -1,7 +1,7 @@ using SqlSugar; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 文件信息表 diff --git a/Magic.Core/Entity/SysLogAudit.cs b/GDZZ.Core/Entity/SysLogAudit.cs similarity index 98% rename from Magic.Core/Entity/SysLogAudit.cs rename to GDZZ.Core/Entity/SysLogAudit.cs index 90bda73..f1e9174 100644 --- a/Magic.Core/Entity/SysLogAudit.cs +++ b/GDZZ.Core/Entity/SysLogAudit.cs @@ -3,7 +3,7 @@ using SqlSugar; using System; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 系统操作/审计日志表 diff --git a/Magic.Core/Entity/SysLogEx.cs b/GDZZ.Core/Entity/SysLogEx.cs similarity index 98% rename from Magic.Core/Entity/SysLogEx.cs rename to GDZZ.Core/Entity/SysLogEx.cs index 93dce64..ebc31cc 100644 --- a/Magic.Core/Entity/SysLogEx.cs +++ b/GDZZ.Core/Entity/SysLogEx.cs @@ -3,7 +3,7 @@ using SqlSugar; using System; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 异常日志 diff --git a/Magic.Core/Entity/SysLogOp.cs b/GDZZ.Core/Entity/SysLogOp.cs similarity index 99% rename from Magic.Core/Entity/SysLogOp.cs rename to GDZZ.Core/Entity/SysLogOp.cs index 637f6f5..0b55bb9 100644 --- a/Magic.Core/Entity/SysLogOp.cs +++ b/GDZZ.Core/Entity/SysLogOp.cs @@ -2,7 +2,7 @@ using SqlSugar; using System; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 操作日志表 diff --git a/Magic.Core/Entity/SysLogVis.cs b/GDZZ.Core/Entity/SysLogVis.cs similarity index 98% rename from Magic.Core/Entity/SysLogVis.cs rename to GDZZ.Core/Entity/SysLogVis.cs index 43c7fab..e56a269 100644 --- a/Magic.Core/Entity/SysLogVis.cs +++ b/GDZZ.Core/Entity/SysLogVis.cs @@ -2,7 +2,7 @@ using System; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 访问日志表 diff --git a/Magic.Core/Entity/SysMenu.cs b/GDZZ.Core/Entity/SysMenu.cs similarity index 99% rename from Magic.Core/Entity/SysMenu.cs rename to GDZZ.Core/Entity/SysMenu.cs index dd435c9..2c069ee 100644 --- a/Magic.Core/Entity/SysMenu.cs +++ b/GDZZ.Core/Entity/SysMenu.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 菜单表 diff --git a/Magic.Core/Entity/SysNotice.cs b/GDZZ.Core/Entity/SysNotice.cs similarity index 98% rename from Magic.Core/Entity/SysNotice.cs rename to GDZZ.Core/Entity/SysNotice.cs index a6b92b1..6f9f315 100644 --- a/Magic.Core/Entity/SysNotice.cs +++ b/GDZZ.Core/Entity/SysNotice.cs @@ -2,7 +2,7 @@ using System; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 通知公告表 diff --git a/Magic.Core/Entity/SysNoticeUser.cs b/GDZZ.Core/Entity/SysNoticeUser.cs similarity index 96% rename from Magic.Core/Entity/SysNoticeUser.cs rename to GDZZ.Core/Entity/SysNoticeUser.cs index bd1a620..54d95dc 100644 --- a/Magic.Core/Entity/SysNoticeUser.cs +++ b/GDZZ.Core/Entity/SysNoticeUser.cs @@ -2,7 +2,7 @@ using System; using System.ComponentModel; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 通知公告用户表 diff --git a/Magic.Core/Entity/SysOauthUser.cs b/GDZZ.Core/Entity/SysOauthUser.cs similarity index 98% rename from Magic.Core/Entity/SysOauthUser.cs rename to GDZZ.Core/Entity/SysOauthUser.cs index 359b395..2ce393c 100644 --- a/Magic.Core/Entity/SysOauthUser.cs +++ b/GDZZ.Core/Entity/SysOauthUser.cs @@ -1,7 +1,7 @@ using SqlSugar; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// Oauth登录用户表 diff --git a/Magic.Core/Entity/SysOnlineUser.cs b/GDZZ.Core/Entity/SysOnlineUser.cs similarity index 98% rename from Magic.Core/Entity/SysOnlineUser.cs rename to GDZZ.Core/Entity/SysOnlineUser.cs index b53e5b9..6392e71 100644 --- a/Magic.Core/Entity/SysOnlineUser.cs +++ b/GDZZ.Core/Entity/SysOnlineUser.cs @@ -3,7 +3,7 @@ using System; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 在线用户表 diff --git a/Magic.Core/Entity/SysOrg.cs b/GDZZ.Core/Entity/SysOrg.cs similarity index 98% rename from Magic.Core/Entity/SysOrg.cs rename to GDZZ.Core/Entity/SysOrg.cs index 0d12e4b..c5a3cb8 100644 --- a/Magic.Core/Entity/SysOrg.cs +++ b/GDZZ.Core/Entity/SysOrg.cs @@ -1,7 +1,7 @@ using SqlSugar; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 组织机构表 diff --git a/Magic.Core/Entity/SysPos.cs b/GDZZ.Core/Entity/SysPos.cs similarity index 97% rename from Magic.Core/Entity/SysPos.cs rename to GDZZ.Core/Entity/SysPos.cs index 34c55c8..1e8fb11 100644 --- a/Magic.Core/Entity/SysPos.cs +++ b/GDZZ.Core/Entity/SysPos.cs @@ -1,7 +1,7 @@ using SqlSugar; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 职位表 diff --git a/Magic.Core/Entity/SysRole.cs b/GDZZ.Core/Entity/SysRole.cs similarity index 98% rename from Magic.Core/Entity/SysRole.cs rename to GDZZ.Core/Entity/SysRole.cs index 2a77376..ffd833d 100644 --- a/Magic.Core/Entity/SysRole.cs +++ b/GDZZ.Core/Entity/SysRole.cs @@ -1,7 +1,7 @@ using SqlSugar; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 角色表 diff --git a/Magic.Core/Entity/SysRoleDataScope.cs b/GDZZ.Core/Entity/SysRoleDataScope.cs similarity index 94% rename from Magic.Core/Entity/SysRoleDataScope.cs rename to GDZZ.Core/Entity/SysRoleDataScope.cs index 4b68b4e..73b7606 100644 --- a/Magic.Core/Entity/SysRoleDataScope.cs +++ b/GDZZ.Core/Entity/SysRoleDataScope.cs @@ -1,7 +1,7 @@ using SqlSugar; using System.ComponentModel; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 角色数据范围表 diff --git a/Magic.Core/Entity/SysRoleMenu.cs b/GDZZ.Core/Entity/SysRoleMenu.cs similarity index 94% rename from Magic.Core/Entity/SysRoleMenu.cs rename to GDZZ.Core/Entity/SysRoleMenu.cs index 0a25ddd..929858e 100644 --- a/Magic.Core/Entity/SysRoleMenu.cs +++ b/GDZZ.Core/Entity/SysRoleMenu.cs @@ -1,7 +1,7 @@ using SqlSugar; using System.ComponentModel; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 角色菜单表 diff --git a/Magic.Core/Entity/SysTenant.cs b/GDZZ.Core/Entity/SysTenant.cs similarity index 98% rename from Magic.Core/Entity/SysTenant.cs rename to GDZZ.Core/Entity/SysTenant.cs index 669fdb3..d35f0d4 100644 --- a/Magic.Core/Entity/SysTenant.cs +++ b/GDZZ.Core/Entity/SysTenant.cs @@ -1,7 +1,7 @@ using SqlSugar; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 租户表 diff --git a/Magic.Core/Entity/SysTimer.cs b/GDZZ.Core/Entity/SysTimer.cs similarity index 97% rename from Magic.Core/Entity/SysTimer.cs rename to GDZZ.Core/Entity/SysTimer.cs index b5e2270..ab69080 100644 --- a/Magic.Core/Entity/SysTimer.cs +++ b/GDZZ.Core/Entity/SysTimer.cs @@ -2,7 +2,7 @@ using SqlSugar; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 定时任务 @@ -14,7 +14,7 @@ public class SysTimer : DEntityBase /// /// 任务名称 /// - /// magic + /// GDZZ [Required, MaxLength(20)] [SugarColumn(ColumnDescription = "任务名称")] public string JobName { get; set; } diff --git a/Magic.Core/Entity/SysUser.cs b/GDZZ.Core/Entity/SysUser.cs similarity index 98% rename from Magic.Core/Entity/SysUser.cs rename to GDZZ.Core/Entity/SysUser.cs index fe4ad84..7670333 100644 --- a/Magic.Core/Entity/SysUser.cs +++ b/GDZZ.Core/Entity/SysUser.cs @@ -2,7 +2,7 @@ using SqlSugar; using System; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 用户表 diff --git a/Magic.Core/Entity/SysUserDataScope.cs b/GDZZ.Core/Entity/SysUserDataScope.cs similarity index 94% rename from Magic.Core/Entity/SysUserDataScope.cs rename to GDZZ.Core/Entity/SysUserDataScope.cs index 65395c0..06be194 100644 --- a/Magic.Core/Entity/SysUserDataScope.cs +++ b/GDZZ.Core/Entity/SysUserDataScope.cs @@ -1,7 +1,7 @@ using SqlSugar; using System.ComponentModel; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 用户数据范围表 diff --git a/Magic.Core/Entity/SysUserRole.cs b/GDZZ.Core/Entity/SysUserRole.cs similarity index 94% rename from Magic.Core/Entity/SysUserRole.cs rename to GDZZ.Core/Entity/SysUserRole.cs index 3a6a1c2..615637d 100644 --- a/Magic.Core/Entity/SysUserRole.cs +++ b/GDZZ.Core/Entity/SysUserRole.cs @@ -1,7 +1,7 @@ using SqlSugar; using System.ComponentModel; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 用户角色表 diff --git a/Magic.Core/Entity/Test.cs b/GDZZ.Core/Entity/Test.cs similarity index 98% rename from Magic.Core/Entity/Test.cs rename to GDZZ.Core/Entity/Test.cs index d45697b..5459727 100644 --- a/Magic.Core/Entity/Test.cs +++ b/GDZZ.Core/Entity/Test.cs @@ -2,7 +2,7 @@ using SqlSugar; using System; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Entity; +namespace GDZZ.Core.Entity; /// /// 用户表 diff --git a/Magic.Core/Enum/AdminType.cs b/GDZZ.Core/Enum/AdminType.cs similarity index 95% rename from Magic.Core/Enum/AdminType.cs rename to GDZZ.Core/Enum/AdminType.cs index 71b0532..c410ef0 100644 --- a/Magic.Core/Enum/AdminType.cs +++ b/GDZZ.Core/Enum/AdminType.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 账号类型 diff --git a/Magic.Core/Enum/CacheType.cs b/GDZZ.Core/Enum/CacheType.cs similarity index 93% rename from Magic.Core/Enum/CacheType.cs rename to GDZZ.Core/Enum/CacheType.cs index b081dae..b6b7193 100644 --- a/Magic.Core/Enum/CacheType.cs +++ b/GDZZ.Core/Enum/CacheType.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 缓存类型 diff --git a/Magic.Core/Enum/CommonStatus.cs b/GDZZ.Core/Enum/CommonStatus.cs similarity index 94% rename from Magic.Core/Enum/CommonStatus.cs rename to GDZZ.Core/Enum/CommonStatus.cs index 2eb0b0e..40af754 100644 --- a/Magic.Core/Enum/CommonStatus.cs +++ b/GDZZ.Core/Enum/CommonStatus.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 公共状态 diff --git a/Magic.Core/Enum/DataOpType.cs b/GDZZ.Core/Enum/DataOpType.cs similarity index 97% rename from Magic.Core/Enum/DataOpType.cs rename to GDZZ.Core/Enum/DataOpType.cs index 76056d6..b9893f0 100644 --- a/Magic.Core/Enum/DataOpType.cs +++ b/GDZZ.Core/Enum/DataOpType.cs @@ -1,4 +1,4 @@ -namespace Magic.Core; +namespace GDZZ.Core; /// /// 数据操作类型 diff --git a/Magic.Core/Enum/DataScopeType.cs b/GDZZ.Core/Enum/DataScopeType.cs similarity index 96% rename from Magic.Core/Enum/DataScopeType.cs rename to GDZZ.Core/Enum/DataScopeType.cs index 0642798..8755e4c 100644 --- a/Magic.Core/Enum/DataScopeType.cs +++ b/GDZZ.Core/Enum/DataScopeType.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Magic.Core; +namespace GDZZ.Core; public enum DataScopeType { diff --git a/Magic.Core/Enum/DocumentType.cs b/GDZZ.Core/Enum/DocumentType.cs similarity index 93% rename from Magic.Core/Enum/DocumentType.cs rename to GDZZ.Core/Enum/DocumentType.cs index 7fc7d66..25d61c0 100644 --- a/Magic.Core/Enum/DocumentType.cs +++ b/GDZZ.Core/Enum/DocumentType.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 文档类型 diff --git a/Magic.Core/Enum/ErrorCode.cs b/GDZZ.Core/Enum/ErrorCode.cs similarity index 99% rename from Magic.Core/Enum/ErrorCode.cs rename to GDZZ.Core/Enum/ErrorCode.cs index 5127691..fb36f36 100644 --- a/Magic.Core/Enum/ErrorCode.cs +++ b/GDZZ.Core/Enum/ErrorCode.cs @@ -1,6 +1,6 @@ using Furion.FriendlyException; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 系统错误码 diff --git a/Magic.Core/Enum/FileExtensionEnum.cs b/GDZZ.Core/Enum/FileExtensionEnum.cs similarity index 95% rename from Magic.Core/Enum/FileExtensionEnum.cs rename to GDZZ.Core/Enum/FileExtensionEnum.cs index 0bec446..cf90e55 100644 --- a/Magic.Core/Enum/FileExtensionEnum.cs +++ b/GDZZ.Core/Enum/FileExtensionEnum.cs @@ -1,4 +1,4 @@ -namespace Magic.Core; +namespace GDZZ.Core; /// /// 文件扩展枚举 diff --git a/Magic.Core/Enum/FileLocation.cs b/GDZZ.Core/Enum/FileLocation.cs similarity index 96% rename from Magic.Core/Enum/FileLocation.cs rename to GDZZ.Core/Enum/FileLocation.cs index b3c6181..df1c9a7 100644 --- a/Magic.Core/Enum/FileLocation.cs +++ b/GDZZ.Core/Enum/FileLocation.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 文件存储位置 diff --git a/Magic.Core/Enum/FilterType.cs b/GDZZ.Core/Enum/FilterType.cs similarity index 91% rename from Magic.Core/Enum/FilterType.cs rename to GDZZ.Core/Enum/FilterType.cs index 07a6702..1523cdd 100644 --- a/Magic.Core/Enum/FilterType.cs +++ b/GDZZ.Core/Enum/FilterType.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Magic.Core; +namespace GDZZ.Core; public enum FilterType { diff --git a/Magic.Core/Enum/Gender.cs b/GDZZ.Core/Enum/Gender.cs similarity index 94% rename from Magic.Core/Enum/Gender.cs rename to GDZZ.Core/Enum/Gender.cs index 044ebdd..f49edca 100644 --- a/Magic.Core/Enum/Gender.cs +++ b/GDZZ.Core/Enum/Gender.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 性别 diff --git a/Magic.Core/Enum/HttpStatusCode.cs b/GDZZ.Core/Enum/HttpStatusCode.cs similarity index 99% rename from Magic.Core/Enum/HttpStatusCode.cs rename to GDZZ.Core/Enum/HttpStatusCode.cs index 4742608..83c1f45 100644 --- a/Magic.Core/Enum/HttpStatusCode.cs +++ b/GDZZ.Core/Enum/HttpStatusCode.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Magic.Core; +namespace GDZZ.Core; /// /// HTTP状态码 diff --git a/Magic.Core/Enum/LoginType.cs b/GDZZ.Core/Enum/LoginType.cs similarity index 96% rename from Magic.Core/Enum/LoginType.cs rename to GDZZ.Core/Enum/LoginType.cs index a621ee2..e184d85 100644 --- a/Magic.Core/Enum/LoginType.cs +++ b/GDZZ.Core/Enum/LoginType.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 登陆类型 diff --git a/Magic.Core/Enum/MenuOpenType.cs b/GDZZ.Core/Enum/MenuOpenType.cs similarity index 95% rename from Magic.Core/Enum/MenuOpenType.cs rename to GDZZ.Core/Enum/MenuOpenType.cs index 847bcd7..dc8c4e8 100644 --- a/Magic.Core/Enum/MenuOpenType.cs +++ b/GDZZ.Core/Enum/MenuOpenType.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 系统菜单类型 diff --git a/Magic.Core/Enum/MenuType.cs b/GDZZ.Core/Enum/MenuType.cs similarity index 94% rename from Magic.Core/Enum/MenuType.cs rename to GDZZ.Core/Enum/MenuType.cs index abc68ed..1b64754 100644 --- a/Magic.Core/Enum/MenuType.cs +++ b/GDZZ.Core/Enum/MenuType.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 系统菜单类型 diff --git a/Magic.Core/Enum/MenuWeight.cs b/GDZZ.Core/Enum/MenuWeight.cs similarity index 93% rename from Magic.Core/Enum/MenuWeight.cs rename to GDZZ.Core/Enum/MenuWeight.cs index b05b6d6..9c8e437 100644 --- a/Magic.Core/Enum/MenuWeight.cs +++ b/GDZZ.Core/Enum/MenuWeight.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 菜单权重 diff --git a/Magic.Core/Enum/NoticeStatus.cs b/GDZZ.Core/Enum/NoticeStatus.cs similarity index 95% rename from Magic.Core/Enum/NoticeStatus.cs rename to GDZZ.Core/Enum/NoticeStatus.cs index e4abf2d..4b127af 100644 --- a/Magic.Core/Enum/NoticeStatus.cs +++ b/GDZZ.Core/Enum/NoticeStatus.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 通知公告状态 diff --git a/Magic.Core/Enum/NoticeType.cs b/GDZZ.Core/Enum/NoticeType.cs similarity index 94% rename from Magic.Core/Enum/NoticeType.cs rename to GDZZ.Core/Enum/NoticeType.cs index a3966f0..cff6825 100644 --- a/Magic.Core/Enum/NoticeType.cs +++ b/GDZZ.Core/Enum/NoticeType.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Magic.Core; +namespace GDZZ.Core; public enum NoticeType { diff --git a/Magic.Core/Enum/NoticeUserStatus.cs b/GDZZ.Core/Enum/NoticeUserStatus.cs similarity index 93% rename from Magic.Core/Enum/NoticeUserStatus.cs rename to GDZZ.Core/Enum/NoticeUserStatus.cs index 39d19b6..c94d585 100644 --- a/Magic.Core/Enum/NoticeUserStatus.cs +++ b/GDZZ.Core/Enum/NoticeUserStatus.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 通知公告用户状态 diff --git a/Magic.Core/Enum/QueryTypeEnum.cs b/GDZZ.Core/Enum/QueryTypeEnum.cs similarity index 97% rename from Magic.Core/Enum/QueryTypeEnum.cs rename to GDZZ.Core/Enum/QueryTypeEnum.cs index ee04aed..c67b705 100644 --- a/Magic.Core/Enum/QueryTypeEnum.cs +++ b/GDZZ.Core/Enum/QueryTypeEnum.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 查询类型的枚举 diff --git a/Magic.Core/Enum/RequestTypeEnum.cs b/GDZZ.Core/Enum/RequestTypeEnum.cs similarity index 94% rename from Magic.Core/Enum/RequestTypeEnum.cs rename to GDZZ.Core/Enum/RequestTypeEnum.cs index 275c2ed..f5cadd0 100644 --- a/Magic.Core/Enum/RequestTypeEnum.cs +++ b/GDZZ.Core/Enum/RequestTypeEnum.cs @@ -1,4 +1,4 @@ -namespace Magic.Core; +namespace GDZZ.Core; /// /// http请求类型 diff --git a/Magic.Core/Enum/RoleType.cs b/GDZZ.Core/Enum/RoleType.cs similarity index 94% rename from Magic.Core/Enum/RoleType.cs rename to GDZZ.Core/Enum/RoleType.cs index 2f5e606..19fa7c7 100644 --- a/Magic.Core/Enum/RoleType.cs +++ b/GDZZ.Core/Enum/RoleType.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 账号类型 diff --git a/Magic.Core/Enum/TenantTypeEnum.cs b/GDZZ.Core/Enum/TenantTypeEnum.cs similarity index 88% rename from Magic.Core/Enum/TenantTypeEnum.cs rename to GDZZ.Core/Enum/TenantTypeEnum.cs index 9a18ce3..6ac4ad0 100644 --- a/Magic.Core/Enum/TenantTypeEnum.cs +++ b/GDZZ.Core/Enum/TenantTypeEnum.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Magic.Core; +namespace GDZZ.Core; public enum TenantTypeEnum { diff --git a/Magic.Core/Enum/YesOrNot.cs b/GDZZ.Core/Enum/YesOrNot.cs similarity index 92% rename from Magic.Core/Enum/YesOrNot.cs rename to GDZZ.Core/Enum/YesOrNot.cs index d81a3f1..49d2593 100644 --- a/Magic.Core/Enum/YesOrNot.cs +++ b/GDZZ.Core/Enum/YesOrNot.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 菜单激活类型 diff --git a/Magic.Core/EventSubscriber/LogEventSubscriber.cs b/GDZZ.Core/EventSubscriber/LogEventSubscriber.cs similarity index 97% rename from Magic.Core/EventSubscriber/LogEventSubscriber.cs rename to GDZZ.Core/EventSubscriber/LogEventSubscriber.cs index 492dd90..1a2f17f 100644 --- a/Magic.Core/EventSubscriber/LogEventSubscriber.cs +++ b/GDZZ.Core/EventSubscriber/LogEventSubscriber.cs @@ -1,10 +1,10 @@ using Furion.EventBus; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.Extensions.DependencyInjection; using System; using System.Threading.Tasks; -namespace Magic.Core; +namespace GDZZ.Core; public class LogEventSubscriber : IEventSubscriber { diff --git a/Magic.Core/Extension/BStyleServiceExtension.cs b/GDZZ.Core/Extension/BStyleServiceExtension.cs similarity index 94% rename from Magic.Core/Extension/BStyleServiceExtension.cs rename to GDZZ.Core/Extension/BStyleServiceExtension.cs index 45a334f..83b70e7 100644 --- a/Magic.Core/Extension/BStyleServiceExtension.cs +++ b/GDZZ.Core/Extension/BStyleServiceExtension.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.DependencyInjection; using System; -namespace Magic.Core; +namespace GDZZ.Core; /// /// B格 @@ -30,7 +30,7 @@ public class BStyleServiceBuilder Console.ForegroundColor = ConsoleColor.Red; Console.WriteLine(@" -gitee: https://gitee.com/zhengguojing/magic-net"); +gitee: https://gitee.com/zhengguojing/GDZZ-net"); Console.ForegroundColor = ConsoleColor.Yellow; Console.WriteLine(@"期待您的PR，让.net更好！ diff --git a/Magic.Core/Extension/DataFilterExtensions.cs b/GDZZ.Core/Extension/DataFilterExtensions.cs similarity index 99% rename from Magic.Core/Extension/DataFilterExtensions.cs rename to GDZZ.Core/Extension/DataFilterExtensions.cs index f78cc74..f16badf 100644 --- a/Magic.Core/Extension/DataFilterExtensions.cs +++ b/GDZZ.Core/Extension/DataFilterExtensions.cs @@ -9,7 +9,7 @@ using System.Linq.Expressions; using System.Reflection; using System.Threading.Tasks; -namespace Magic.Core; +namespace GDZZ.Core; public static class DataFilterExtensions { diff --git a/Magic.Core/Extension/DictionaryExtensions.cs b/GDZZ.Core/Extension/DictionaryExtensions.cs similarity index 98% rename from Magic.Core/Extension/DictionaryExtensions.cs rename to GDZZ.Core/Extension/DictionaryExtensions.cs index bc6759e..67df22a 100644 --- a/Magic.Core/Extension/DictionaryExtensions.cs +++ b/GDZZ.Core/Extension/DictionaryExtensions.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Text; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 字典扩展 diff --git a/Magic.Core/Extension/EnumExtensions.cs b/GDZZ.Core/Extension/EnumExtensions.cs similarity index 99% rename from Magic.Core/Extension/EnumExtensions.cs rename to GDZZ.Core/Extension/EnumExtensions.cs index 2ce9493..5e10bef 100644 --- a/Magic.Core/Extension/EnumExtensions.cs +++ b/GDZZ.Core/Extension/EnumExtensions.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Reflection; using Furion.FriendlyException; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 枚举扩展 diff --git a/Magic.Core/Extension/InputBase.cs b/GDZZ.Core/Extension/InputBase.cs similarity index 98% rename from Magic.Core/Extension/InputBase.cs rename to GDZZ.Core/Extension/InputBase.cs index 62d9c7e..37ef1e9 100644 --- a/Magic.Core/Extension/InputBase.cs +++ b/GDZZ.Core/Extension/InputBase.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 通用输入扩展参数（带权限） diff --git a/Magic.Core/Extension/PageInputOrder.cs b/GDZZ.Core/Extension/PageInputOrder.cs similarity index 97% rename from Magic.Core/Extension/PageInputOrder.cs rename to GDZZ.Core/Extension/PageInputOrder.cs index 89e0d63..138b9e4 100644 --- a/Magic.Core/Extension/PageInputOrder.cs +++ b/GDZZ.Core/Extension/PageInputOrder.cs @@ -1,4 +1,4 @@ -namespace Magic.Core; +namespace GDZZ.Core; /// /// 通用输入帮助类 diff --git a/Magic.Core/Extension/PageResult.cs b/GDZZ.Core/Extension/PageResult.cs similarity index 97% rename from Magic.Core/Extension/PageResult.cs rename to GDZZ.Core/Extension/PageResult.cs index 55c96f8..7c570d1 100644 --- a/Magic.Core/Extension/PageResult.cs +++ b/GDZZ.Core/Extension/PageResult.cs @@ -2,7 +2,7 @@ using Mapster; using SqlSugar; -namespace Magic.Core; +namespace GDZZ.Core; public class PageResult { diff --git a/Magic.Core/Extension/PagedQueryableExtensions.cs b/GDZZ.Core/Extension/PagedQueryableExtensions.cs similarity index 97% rename from Magic.Core/Extension/PagedQueryableExtensions.cs rename to GDZZ.Core/Extension/PagedQueryableExtensions.cs index 6d450dc..3b0c44a 100644 --- a/Magic.Core/Extension/PagedQueryableExtensions.cs +++ b/GDZZ.Core/Extension/PagedQueryableExtensions.cs @@ -2,7 +2,7 @@ using SqlSugar; using System; using System.Threading.Tasks; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 分页拓展类 diff --git a/Magic.Core/Extension/RestfulResultProvider.cs b/GDZZ.Core/Extension/RestfulResultProvider.cs similarity index 99% rename from Magic.Core/Extension/RestfulResultProvider.cs rename to GDZZ.Core/Extension/RestfulResultProvider.cs index 0e8c4f7..ace74de 100644 --- a/Magic.Core/Extension/RestfulResultProvider.cs +++ b/GDZZ.Core/Extension/RestfulResultProvider.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using System; using System.Threading.Tasks; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 规范化RESTful风格返回值 diff --git a/Magic.Core/Filter/LogExceptionHandler.cs b/GDZZ.Core/Filter/LogExceptionHandler.cs similarity index 97% rename from Magic.Core/Filter/LogExceptionHandler.cs rename to GDZZ.Core/Filter/LogExceptionHandler.cs index f47dbf2..69a1086 100644 --- a/Magic.Core/Filter/LogExceptionHandler.cs +++ b/GDZZ.Core/Filter/LogExceptionHandler.cs @@ -3,14 +3,14 @@ using Furion.DependencyInjection; using Furion.EventBus; using Furion.FriendlyException; using Furion.Logging.Extensions; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.AspNetCore.Mvc.Filters; using System; using System.Security.Claims; using System.Text.RegularExpressions; using System.Threading.Tasks; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 全局异常处理 diff --git a/Magic.Core/Filter/RequestActionFilter.cs b/GDZZ.Core/Filter/RequestActionFilter.cs similarity index 98% rename from Magic.Core/Filter/RequestActionFilter.cs rename to GDZZ.Core/Filter/RequestActionFilter.cs index f8a0875..2feac82 100644 --- a/Magic.Core/Filter/RequestActionFilter.cs +++ b/GDZZ.Core/Filter/RequestActionFilter.cs @@ -5,14 +5,14 @@ using System.Threading.Tasks; using Furion; using Furion.EventBus; using Furion.JsonSerialization; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; using UAParser; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 请求日志拦截 diff --git a/Magic.Core/Filter/SqlSugarUnitOfWorkFilter.cs b/GDZZ.Core/Filter/SqlSugarUnitOfWorkFilter.cs similarity index 99% rename from Magic.Core/Filter/SqlSugarUnitOfWorkFilter.cs rename to GDZZ.Core/Filter/SqlSugarUnitOfWorkFilter.cs index 67181ef..c7fdac0 100644 --- a/Magic.Core/Filter/SqlSugarUnitOfWorkFilter.cs +++ b/GDZZ.Core/Filter/SqlSugarUnitOfWorkFilter.cs @@ -4,7 +4,7 @@ using SqlSugar; using System.Linq; using System.Threading.Tasks; -namespace Magic.Core; +namespace GDZZ.Core; /// /// SqlSugar 工作单元拦截器 diff --git a/Magic.Core/Magic.Core.csproj b/GDZZ.Core/GDZZ.Core.csproj similarity index 93% rename from Magic.Core/Magic.Core.csproj rename to GDZZ.Core/GDZZ.Core.csproj index 5771de8..a6178ac 100644 --- a/Magic.Core/Magic.Core.csproj +++ b/GDZZ.Core/GDZZ.Core.csproj @@ -3,7 +3,7 @@ net7.0 1701;1702;1591 - Magic.Core.xml + GDZZ.Core.xml 1.0.0 @@ -16,7 +16,7 @@ - Magic.Core + GDZZ.Core false @@ -36,13 +36,13 @@ - + - + diff --git a/GDZZ.Core/GDZZ.Core.xml b/GDZZ.Core/GDZZ.Core.xml new file mode 100644 index 0000000..9e0afbf --- /dev/null +++ b/GDZZ.Core/GDZZ.Core.xml @@ -0,0 +1,10408 @@ + + + + GDZZ.Core + + + + + 启用用操作日志 + + + + + SqlSugar 工作单元配置特性 + + + + + 构造函数 + + + + + 构造函数 + + + 支持传入事务隔离级别 参数值 + + 事务隔离级别 + + + + 事务隔离级别 + + + 默认：，参见： + 说明：当事务A更新某条数据的时候，不容许其他事务来更新该数据，但可以进行读取操作 + + + + + 缓存接口 + + + + + 用于在 key 存在时删除 key + + 键 + + + + 用于在 key 存在时删除 key + + 键 + + + + + 用于在 key 模板存在时删除 + + key模板 + + + + + 检查给定 key 是否存在 + + 键 + + + + + 检查给定 key 是否存在 + + 键 + + + + + 获取指定 key 的值 + + 键 + + + + + 获取指定 key 的值 + + byte[] 或其他类型 + 键 + + + + + 获取指定 key 的值 + + 键 + + + + + 获取指定 key 的值 + + byte[] 或其他类型 + 键 + + + + + 设置指定 key 的值，所有写入参数object都支持string | byte[] | 数值 | 对象 + + 键 + 值 + + + + 设置指定 key 的值，所有写入参数object都支持string | byte[] | 数值 | 对象 + + 键 + 值 + 有效期 + + + + 设置指定 key 的值，所有写入参数object都支持string | byte[] | 数值 | 对象 + + 键 + 值 + + + + + 设置指定 key 的值，所有写入参数object都支持string | byte[] | 数值 | 对象 + + 键 + 值 + 有效期 + + + + + 获取所有缓存 + + + + + + 内存缓存 + + + + + Redis缓存 + + + + + 点选验证码 + + + + + 生成验证码图片 + + + + + + + + + 转换为相对于图片的百分比单位 + + 图片宽高 + 相对于图片的绝对尺寸 + (int:xPercent, int:yPercent) + + + + 加载字体 + + 字体文件路径,包含字体文件名和后缀名 + 大小 + 字形(常规/粗体/斜体/粗斜体) + + + + 随机绘制字符串 + + + + + + + 验证码验证 + + + + + + + 记录正确位置 + + + + + 点击验证码输入参数 + + + + + 验证码类型 + + + + + 坐标点集合 + + + + + Token + + + + + 验证码输出参数 + + + + + 常规验证码 + + + + + 生成验证码图片 + + + + + + + 验证码验证 + + + + + + + 常规验证码输入 + + + + + 验证码类型 + + + + + 验证码字符 + + + + + Token + + + + + 缓存配置 + + + + + 缓存类型 + + + + + Redis配置 + + + + + 系统配置 + + + + + 超管是否可以查看所有租户的数据 + + + + + 是否开启全局请求日志 + + + + + 雪花Id配置 + + + + + 取值范围0~63,默认1 + + + + + 第三方配置 + + + + + 微信 + + + + + 上传文件 + + + + + 阿里云 + + + + + 头像 + + + + + 文档 + + + + + 商店 + + + + + 编辑器 + + + + + 默认 + + + + + 数据库配置 + + + + + 默认数据库编号 + + + + + 默认数据库类型 + + + + + 默认数据库连接字符串 + + + + + 业务库集合 + + + + + JWT配置 + + + + + 是否验证密钥 + + + + + 密钥 + + + + + 是否验证签发方 + + + + + 签发方 + + + + + 是否验证签收方 + + + + + 签收方 + + + + + 是否验证过期时间 + + + + + 过期时间 + + + + + 过期时间容错值 + + + + + 数据库参数 + + + + + 数据库编号 + + + + + 数据库类型 + + + + + 数据库连接字符串 + + + + + 文件参数 + + + + + 路径 + + + + + 大小 + + + + + 类型 + + + + + 第三方参数 + + + + + id + + + + + key + + + + + 回调地址 + + + + + scope + + + + + 用户Id + + + + + 账号 + + + + + 名称 + + + + + 是否超级管理 + + + + + 租户Id + + + + + 租户类型 + + + + + 租户名称 + + + + + 用户缓存 + + + + + 菜单缓存 + + + + + 权限缓存 + + + + + 数据范围缓存 + + + + + 验证码缓存 + + + + + 库表实体信息缓存 + + + + + 所有权限缓存 + + + + + 程序集 + + + + + 删除字段 + + + + + 自定义租户基类实体 + + + + + 租户id + + + + + 自定义实体基类 + + + + + 创建时间 + + + + + 更新时间 + + + + + 创建者Id + + + + + 创建者名称 + + + + + 修改者Id + + + + + 修改者名称 + + + + + 软删除 + + + + + 更新信息列 + + + + + + 假删除的列，包含更新信息 + + + + + + 递增主键实体基类 + + + + + 主键Id + + + + + 主键实体基类 + + + + + 主键Id + + + + + 文档表 + + + + + 父Id + + + + + 父ID列表 + + + + + 名称 + + + + + 文档类型:文件、文件夹 + + + + + 文件后缀 + + + + + 文件大小kb + + + + + 文件路径 + + + + + 存储后的文件名 + + + + + 标签 + + + + + 备注 + + + + + 是否可见 + + + + + 系统应用表 + + + + + 名称 + + + + + 编码 + + + + + 是否默认激活（Y-是，N-否）,只能有一个系统默认激活 + 用户登录后默认展示此系统菜单 + + + + + 状态（字典 0正常 1停用 2删除） + + + + + 排序 + + + + + 代码生成表 + + + + + 作者姓名 + + + + + 是否移除表前缀 + + + + + 生成方式 + + + + + 数据库表名 + + + + + 命名空间 + + + + + 业务名 + + + + + 菜单应用分类（应用编码） + + + + + 菜单编码 + + + + + 代码生成字段配置表 + + + + + 代码生成主表ID + + + + + 数据库字段名 + + + + + 字段描述 + + + + + .NET数据类型 + + + + + 作用类型（字典） + + + + + 外键实体名称 + + + + + 外键显示字段 + + + + + 外键显示字段.NET类型 + + + + + 字典code + + + + + 列表是否缩进（字典） + + + + + 是否必填（字典） + + + + + 是否是查询条件 + + + + + 查询方式 + + + + + 列表显示 + + + + + 增改 + + + + + 主键 + + + + + 数据库中类型（物理类型） + + + + + 是否通用字段 + + + + + 参数配置表 + + + + + 名称 + + + + + 编码 + + + + + 属性值 + + + + + 是否是系统参数（Y-是，N-否） + + + + + 备注 + + + + + 状态（字典 0正常 1停用 2删除） + + + + + 常量所属分类的编码，来自于“常量的分类”字典 + + + + + 字典值表 + + + + + 字典类型Id + + + + + 值 + + + + + 编码 + + + + + 排序 + + + + + 备注 + + + + + 状态（字典 0正常 1停用 2删除） + + + + + 字典类型表 + + + + + 名称 + + + + + 编码 + + + + + 排序 + + + + + 备注 + + + + + 状态（字典 0正常 1停用 2删除） + + + + + 员工表 + + + + + 工号 + + + + + 机构Id + + + + + 机构名称 + + + + + 员工附属机构职位表 + + + + + 员工Id + + + + + 机构Id + + + + + 职位Id + + + + + 员工职位表 + + + + + 员工Id + + + + + 职位Id + + + + + 文件信息表 + + + + + 文件存储位置（1:阿里云，2:腾讯云，3:minio，4:本地） + + + + + 文件仓库 + + + + + 文件名称（上传时候的文件名） + + + + + 文件后缀 + + + + + 文件大小kb + + + + + 文件大小信息，计算后的 + + + + + 存储到bucket的名称（文件唯一标识id） + + + + + 存储路径 + + + + + 系统操作/审计日志表 + + + + + 表名 + + + + + 列名 + + + + + 新值 + + + + + 旧值 + + + + + 操作时间 + + + + + 操作人Id + + + + + 操作人名称 + + + + + 操作方式：新增、更新、删除 + + + + + 异常日志 + + + + + 操作人 + + + + + 名称 + + + + + 类名 + + + + + 方法名 + + + + + 异常名称 + + + + + 异常信息 + + + + + 异常源 + + + + + 堆栈信息 + + + + + 参数对象 + + + + + 异常时间 + + + + + 操作日志表 + + + + + 名称 + + + + + 是否执行成功（Y-是，N-否） + + + + + 具体消息 + + + + + IP + + + + + 地址 + + + + + 浏览器 + + + + + 操作系统 + + + + + 请求地址 + + + + + 类名称 + + + + + 方法名称 + + + + + 请求方式（GET POST PUT DELETE) + + + + + 请求参数 + + + + + 返回结果 + + + + + 耗时（毫秒） + + + + + 操作时间 + + + + + 操作人 + + + + + 访问日志表 + + + + + 名称 + + + + + 是否执行成功（Y-是，N-否） + + + + + 具体消息 + + + + + IP + + + + + 地址 + + + + + 浏览器 + + + + + 操作系统 + + + + + 访问类型 + + + + + 访问时间 + + + + + 访问人 + + + + + 菜单表 + + + + + 父Id + + + + + 父Ids + + + + + 名称 + + + + + 编码 + + + + + 菜单类型（字典 0目录 1菜单 2按钮） + + + + + 图标 + + + + + 路由地址 + + + + + 组件地址 + + + + + 权限标识 + + + + + 应用分类（应用编码） + + + + + 打开方式（字典 0无 1组件 2内链 3外链） + + + + + 是否可见（Y-是，N-否） + + + + + 内链地址 + + + + + 重定向地址 + + + + + 权重（字典 1系统权重 2业务权重） + + + + + 排序 + + + + + 备注 + + + + + 状态（字典 0正常 1停用 2删除） + + + + + 通知公告表 + + + + + 标题 + + + + + 内容 + + + + + 类型（字典 1通知 2公告） + + + + + 发布人Id + + + + + 发布人姓名 + + + + + 发布机构Id + + + + + 发布机构名称 + + + + + 发布时间 + + + + + 撤回时间 + + + + + 状态（字典 0草稿 1发布 2撤回 3删除） + + + + + 通知公告用户表 + + + + + 通知公告Id + + + + + 用户Id + + + + + 阅读时间 + + + + + 状态（字典 0未读 1已读） + + + + + Oauth登录用户表 + + + + + 第三方平台的用户唯一Id + + + + + 用户授权的token + + + + + 昵称 + + + + + 头像 + + + + + 性别 + + + + + 电话 + + + + + 邮箱 + + + + + 位置 + + + + + 用户网址 + + + + + 所在公司 + + + + + 用户来源 + + + + + 用户备注（各平台中的用户个人介绍） + + + + + 在线用户表 + + + + + 连接Id + + + + + 用户Id + + + + + 账号 + + + + + 姓名 + + + + + 最后连接时间 + + + + + 最后登录IP + + + + + 租户id + + + + + 组织机构表 + + + + + 父Id + + + + + 父Ids + + + + + 名称 + + + + + 编码 + + + + + 联系人 + + + + + 电话 + + + + + 排序 + + + + + 备注 + + + + + 状态（字典 0正常 1停用 2删除） + + + + + 职位表 + + + + + 名称 + + + + + 编码 + + + + + 排序 + + + + + 备注 + + + + + 状态（字典 0正常 1停用 2删除） + + + + + 角色表 + + + + + 名称 + + + + + 编码 + + + + + 排序 + + + + + 数据范围类型（字典 1全部数据 2本部门及以下数据 3本部门数据 4仅本人数据 5自定义数据） + + + + + 备注 + + + + + 状态（字典 0正常 1停用 2删除） + + + + + 管理员类型-超级管理员_1、非管理员_2 + + + + + 角色数据范围表 + + + + + 角色Id + + + + + 机构Id + + + + + 角色菜单表 + + + + + 角色Id + + + + + 菜单Id + + + + + 租户表 + + + + + 公司名称 + + + + + 管理员名称 + + + + + 主机 + + + + + 电子邮箱 + + + + + 电话 + + + + + 数据库连接 + + + + + 架构 + + + + + 备注 + + + + + 租户类型 + + + + + 定时任务 + + + + + 任务名称 + + GDZZ + + + + 只执行一次 + + + + + 立即执行（默认等待启动） + + + + + 执行类型(并行、列队) + + + + + 执行间隔时间（单位秒） + + 5 + + + + Cron表达式 + + + + + + 定时器类型 + + + + + 请求url + + + + + 请求参数（Post，Put请求用） + + + + + Headers(可以包含如：Authorization授权认证) + 格式：{"Authorization":"userpassword.."} + + + + + 请求类型 + + 2 + + + + 备注 + + + + + 用户表 + + + + + 账号 + + + + + 密码（默认MD5加密） + + + + + 昵称 + + + + + 姓名 + + + + + 头像 + + + + + 生日 + + + + + 性别-男_1、女_2 + + + + + 邮箱 + + + + + 手机 + + + + + 电话 + + + + + 最后登录IP + + + + + 最后登录时间 + + + + + 管理员类型-超级管理员_1、非管理员_2 + + + + + 状态-正常_0、停用_1、删除_2 + + + + + 用户数据范围表 + + + + + 用户Id + + + + + 机构Id + + + + + 用户角色表 + + + + + 用户Id + + + + + 系统角色Id + + + + + 用户表 + + + + + 账号 + + + + + 密码（默认MD5加密） + + + + + 昵称 + + + + + 姓名 + + + + + 头像 + + + + + 生日 + + + + + 性别-男_1、女_2 + + + + + 邮箱 + + + + + 手机 + + + + + 电话 + + + + + 最后登录IP + + + + + 最后登录时间 + + + + + 管理员类型-超级管理员_1、非管理员_2 + + + + + 状态-正常_0、停用_1、删除_2 + + + + + 账号类型 + + + + + 超级管理员 + + + + + 管理员 + + + + + 普通账号 + + + + + 缓存类型 + + + + + 内存缓存 + + + + + Redis缓存 + + + + + 公共状态 + + + + + 正常 + + + + + 停用 + + + + + 删除 + + + + + 数据操作类型 + + + + + 其它 + + + + + 增加 + + + + + 删除 + + + + + 编辑 + + + + + 更新 + + + + + 查询 + + + + + 详情 + + + + + 树 + + + + + 导入 + + + + + 导出 + + + + + 授权 + + + + + 强退 + + + + + 清空 + + + + + 修改状态 + + + + + 全部数据 + + + + + 本部门及以下数据 + + + + + 本部门数据 + + + + + 仅本人数据 + + + + + 自定义数据 + + + + + 文档类型 + + + + + 文件夹 + + + + + 文件 + + + + + 系统错误码 + + + + + 用户名或密码不正确 + + + + + 非法操作！禁止删除自己 + + + + + 记录不存在 + + + + + 账号已存在 + + + + + 旧密码不匹配 + + + + + 测试数据禁止更改admin密码 + + + + + 数据已存在 + + + + + 数据不存在或含有关联引用，禁止删除 + + + + + 禁止为管理员分配角色 + + + + + 重复数据或记录含有不存在数据 + + + + + 禁止为超级管理员角色分配权限 + + + + + 非法数据 + + + + + Id不能为空 + + + + + 所属机构不在自己的数据范围内 + + + + + 禁止删除超级管理员 + + + + + 禁止修改超级管理员状态 + + + + + 没有权限 + + + + + 账号已冻结 + + + + + 父机构不存在 + + + + + 当前机构Id不能与父机构Id相同 + + + + + 已有相同组织机构,编码或名称相同 + + + + + 没有权限操作机构 + + + + + 该机构下有员工禁止删除 + + + + + 附属机构下有员工禁止删除 + + + + + 只能增加下级机构 + + + + + 字典类型不存在 + + + + + 字典类型已存在 + + + + + 字典类型下面有字典值禁止删除 + + + + + 字典值已存在 + + + + + 字典值不存在 + + + + + 字典状态错误 + + + + + 菜单已存在 + + + + + 路由地址为空 + + + + + 打开方式为空 + + + + + 权限标识格式为空 + + + + + 权限标识格式错误 + + + + + 权限不存在 + + + + + 父级菜单不能为当前节点，请重新选择父级菜单 + + + + + 不能移动根节点 + + + + + 已存在同名或同编码应用 + + + + + 默认激活系统只能有一个 + + + + + 该应用下有菜单禁止删除 + + + + + 已存在同名或同编码应用 + + + + + 已存在同名或同编码职位 + + + + + 该职位下有员工禁止删除 + + + + + 通知公告状态错误 + + + + + 通知公告删除失败 + + + + + 通知公告编辑失败 + + + + + 文件不存在 + + + + + 已存在同名或同编码参数配置 + + + + + 禁止删除系统参数 + + + + + 已存在同名任务调度 + + + + + 任务调度不存在 + + + + + 演示环境禁止修改数据 + + + + + 已存在同名或同主机租户 + + + + + 该表代码模板已经生成过 + + + + + 该类型不存在 + + + + + 该字段不存在 + + + + + 该类型不是枚举类型 + + + + + 该实体不存在 + + + + + 父菜单不存在 + + + + + 已存在同名或同编码项目 + + + + + 已存在相同证件号码人员 + + + + + 检测数据不存在 + + + + + 表单不存在 + + + + + 文件扩展枚举 + + + + + 文件存储位置 + + + + + 阿里云 + + + + + 腾讯云 + + + + + minio服务器 + + + + + 本地 + + + + + 用户 + + + + + 组织 + + + + + 性别 + + + + + 男 + + + + + 女 + + + + + 未知 + + + + + HTTP状态码 + + + + + 客户端可能继续其请求 + + + + + 正在更改协议版本或协议 + + + + + 请求成功，且请求的信息包含在响应中 + + + + + 请求导致在响应被发送前创建新资源 + + + + + 请求已被接受做进一步处理 + + + + + 返回的元信息来自缓存副本而不是原始服务器，因此可能不正确 + + + + + 已成功处理请求并且响应已被设定为无内容 + + + + + 客户端应重置（或重新加载）当前资源 + + + + + 响应是包括字节范围的 GET请求所请求的部分响应 + + + + + 请求的信息有多种表示形式，默认操作是将此状态视为重定向 + + + + + 请求的信息已移到 Location头中指定的 URI 处 + + + + + 请求的信息位于 Location 头中指定的 URI 处 + + + + + 将客户端自动重定向到 Location 头中指定的 URI + + + + + 客户端的缓存副本是最新的 + + + + + 请求应使用位于 Location 头中指定的 URI 的代理服务器 + + + + + 服务器未能识别请求 + + + + + 请求的资源要求身份验证 + + + + + 需要付费 + + + + + 服务器拒绝满足请求 + + + + + 请求的资源不在服务器上 + + + + + 请求的资源上不允许请求方法（POST或 GET） + + + + + 客户端已用 Accept 头指示将不接受资源的任何可用表示形式 + + + + + 请求的代理要求身份验证 + Proxy-authenticate 头包含如何执行身份验证的详细信息 + + + + + 客户端没有在服务器期望请求的时间内发送请求 + + + + + 由于服务器上的冲突而未能执行请求 + + + + + 请求的资源不再可用 + + + + + 缺少必需的 Content-length + + + + + 为此请求设置的条件失败，且无法执行此请求 + 条件是用条件请求标头（如 If-Match、If-None-Match 或 If-Unmodified-Since）设置的。 + + + + + 请求太大，服务器无法处理 + + + + + URI 太长 + + + + + 请求是不支持的类型 + + + + + 无法返回从资源请求的数据范围，因为范围的开头在资源的开头之前，或因为范围的结尾在资源的结尾之后 + + + + + 服务器未能符合Expect头中给定的预期值 + + + + + 服务器拒绝处理客户端使用当前协议发送的请求，但是可以接受其使用升级后的协议发送的请求 + + + + + 服务器上发生了一般错误 + + + + + 服务器不支持请求的函数 + + + + + 中间代理服务器从另一代理或原始服务器接收到错误响应 + + + + + 服务器暂时不可用，通常是由于过多加载或维护 + + + + + 中间代理服务器在等待来自另一个代理或原始服务器的响应时已超时 + + + + + 服务器不支持请求的HTTP版本 + + + + + 登陆类型 + + + + + 登陆 + + + + + 登出 + + + + + 注册 + + + + + 改密 + + + + + 三方授权登陆 + + + + + 系统菜单类型 + + + + + 无 + + + + + 组件 + + + + + 内链 + + + + + 外链 + + + + + 系统菜单类型 + + + + + 目录 + + + + + 菜单 + + + + + 按钮 + + + + + 菜单权重 + + + + + 系统权重 + + + + + 业务权重 + + + + + 通知公告状态 + + + + + 草稿 + + + + + 发布 + + + + + 撤回 + + + + + 删除 + + + + + 通知 + + + + + 公告 + + + + + 通知公告用户状态 + + + + + 未读 + + + + + 已读 + + + + + 查询类型的枚举 + + + + + 等于 + + + + + 模糊 + + + + + 大于 + + + + + 小于 + + + + + 不等于 + + + + + 大于等于 + + + + + 小于等于 + + + + + 不为空 + + + + + http请求类型 + + + + + 执行内部方法 + + + + + GET请求 + + + + + POST请求 + + + + + PUT请求 + + + + + DELETE请求 + + + + + 账号类型 + + + + + 租户管理员角色 + + + + + 租户普通角色 + + + + + 菜单激活类型 + + + + + 是 + + + + + 否 + + + + + B格 + + + + + 数据过滤,默认用户集合 + + ISugarQueryable + 目标表的parameter + 默认用户集合 + 需要过滤的用户id字段,默认CreatedUserId和OrgId + + + + + 检查数据权限,默认用户集合 + + 检测的id + 默认用户集合 + + + + 获取当前数据权限,默认用户集合 + + 默认用户集合 + + + + + 字典扩展 + + + + + 将一个字典转化为 QueryString + + + + + + + + 将一个字符串 URL 编码 + + + + + + + 移除空值项 + + + + + + 枚举扩展 + + + + + 获取枚举对象Key与名称的字典（缓存） + + + + + + + 获取枚举对象Key与名称的字典 + + + + + + + 获取枚举类型key与描述的字典（缓存） + + + + + + + + 获取枚举类型key与描述的字典（没有描述则获取name） + + + + + + + + 从程序集中查找指定枚举类型 + + + + + + + + 从程序集中加载所有枚举类型 + + + + + + + 通用输入扩展参数（带权限） + + + + + 授权菜单 + + + + + 授权角色 + + + + + 授权数据 + + + + + 通用分页输入参数 + + + + + 搜索值 + + + + + 当前页码 + + + + + 页码容量 + + + + + 搜索开始时间 + + + + + 搜索结束时间 + + + + + 排序字段 + + + + + 排序方法,默认升序,否则降序(配合antd前端,约定参数为 Ascend,Dscend) + + + + + 降序排序(不要问我为什么是descend不是desc，前端约定参数就是这样) + + + + + 分页拓展类 + + + + + 分页拓展 + + + + + + + + + 通用输入帮助类 + + + + + 排序方式(默认降序) + + + 是否降序 + + + + + 小诺分页列表结果 + + + + + 替换sqlsugar分页 + + + + + + + 规范化RESTful风格返回值 + + + + + RESTful风格---XIAONUO返回格式 + + + + + + 执行成功 + + + + + 状态码 + + + + + 错误信息 + + + + + 数据 + + + + + 附加数据 + + + + + 时间戳 + + + + + 全局异常处理 + + + + + 请求日志拦截 + + + + + SqlSugar 工作单元拦截器 + + + + + 过滤器排序 + + + + + 排序属性 + + + + + SqlSugar 对象 + + + + + 构造函数 + + + + + + + + + + + + + + 聊天集线器 + + + + + 连接 + + + + + + 断开 + + + + + + + 日志定时任务类 + + + + + 定期删除异常日志 + + + + + + + 定期删除操作日志 + + + + + + + 定期删除访问日志 + + + + + + + 后台批量写错误日志 + + + + + + + 后台批量写操作日志 + + + + + + + 后台批量写访问日志 + + + + + + + 写日志 + + + + + + + + + + 根据条件删除日志 + + + + + + + Long 类型Json返回处理 + + + + Reads and converts the JSON to type . + The reader. + The type to convert. + An object that specifies serialization options to use. + The converted value. + + + Writes a specified value as JSON. + The writer to write to. + The value to convert to JSON. + An object that specifies serialization options to use. + + + + 日志写入文件的组件 + + + + + 日志写入文件扩展 + + + + + 添加workerservice项目控制台日志格式化扩展 + + + + + + + 添加api项目控制台日志格式化扩展 + + + + + + + 用户管理 + + + + + 用户id + + + + + 账号 + + + + + 昵称 + + + + + 是否超级管理员 + + + + + 是否租户管理员 + + + + + AccessToken参数 + + + + + 用户标识 + + + + + Token 类型 + + + + + AccessToken + + + + + 用于刷新 AccessToken 的 Token + + + + + 此 AccessToken 对应的权限 + + + + + AccessToken 过期时间 + + + + + 错误的详细描述 + + + + + 获取的Token是否包含错误 + + + + + + + 微信用户参数 + + + + + 用户特权信息，json 数组，如微信沃卡用户为（chinaunicom） + + + + + 获取的用户是否包含错误 + + + + + + + 发起授权 + + + + + + + 获取微信Token + + + + + + + + 获取微信用户基本信息 + + + + + + + + 刷新微信Token + + + + + + + 系统应用参数 + + + + + 名称 + + + + + 编码 + + + + + 是否默认激活（Y-是，N-否）,只能有一个系统默认激活 + 用户登录后默认展示此系统菜单 + + + + + 状态（字典 0正常 1停用 2删除） + + + + + 排序 + + + + + 名称 + + + + + 编码 + + + + + 应用Id + + + + + 应用Id + + + + + 系统应用参数 + + + + + 应用Id + + + + + 名称 + + + + + 编码 + + + + + 是否默认 + + + + + 排序 + + + + + 系统应用服务 + + + + + 获取用户应用相关信息 + + + + + + + 分页查询系统应用 + + + + + + + 增加系统应用 + + + + + + + 删除系统应用 + + + + + + + 更新系统应用 + + + + + + + 获取系统应用 + + + + + + + 获取系统应用列表 + + + + + + + 设为默认应用 + + + + + + + 修改用户状态 + + + + + + + 登录授权相关服务 + + + + + 用户登录 + + + 默认用户名/密码：admin/admin + + + + + 模拟租户登录 + + + 默认用户名/密码：admin/admin + + + + + 获取当前登录用户信息 + + + + + + 退出 + + + + + + 获取验证码开关 + + + + + + 获取验证码（默认点选模式） + + + + + + 校验验证码 + + + + + + + 登录输入参数 + + + + + 租户id + + superAdmin + + + + 用户名 + + superAdmin + + + + 密码 + + 123456 + + + + 用户登录输出参数 + + + + + 主键 + + + + + 账号 + + + + + 昵称 + + + + + 姓名 + + + + + 头像 + + + + + 生日 + + + + + 性别(字典 1男 2女) + + + + + 邮箱 + + + + + 手机 + + + + + 电话 + + + + + 管理员类型（0超级管理员 1非管理员） + + + + + 最后登陆IP + + + + + 最后登陆时间 + + + + + 最后登陆地址 + + + + + 最后登陆所用浏览器 + + + + + 最后登陆所用系统 + + + + + 员工信息 + + + + + 具备应用信息 + + + + + 角色信息 + + + + + 权限信息 + + + + + 登录菜单信息---AntDesign版本菜单 + + + + + 数据范围（机构）信息 + + + + + 注册输入参数 + + + + + 用户名 + + superAdmin + + + + 公司名 + + superAdmin + + + + 密码 + + 123456 + + + + 系统缓存服务 + + + + + 获取数据范围缓存（机构Id集合） + + + + + + + 获取数据范围缓存（用户Id集合） + + + + + + + 缓存数据范围（机构Id集合） + + + + + + + + 缓存数据范围（用户Id集合） + + + + + + + + 获取菜单缓存 + + + + + + + + 缓存菜单 + + + + + + + + + 获取权限缓存（按钮） + + + + + + + 缓存权限 + + + + + + + + 获取所有缓存关键字 + + + + + + 获取所有按钮权限 + + + + + + 设置所有按钮权限 + + + + + + + 删除指定关键字缓存 + + + + + + + 删除指定关键字缓存 + + + + + + + 删除某特征关键字缓存 + + + + + + + 设置缓存 + + + + + + + + 设置缓存 + + + + + + + + 获取缓存 + + + + + + + 获取缓存 + + + + + + + 获取缓存 + + + + + + + + 获取缓存 + + + + + + + + 检查给定 key 是否存在 + + 键 + + + + + 检查给定 key 是否存在 + + 键 + + + + + 代码生成详细配置服务 + + + + + 代码生成详细配置列表 + + + + + + + 增加 + + + + + + + 删除 + + + + + + + 更新 + + + + + + + 详情 + + + + + + + 批量增加 + + + + + + + 代码生成器服务 + + + + + 分页查询 + + + + + + + 增加 + + + + + + + 删除 + + + + + + + 更新 + + + + + + + 详情 + + + + + + + 获取数据库表(实体)集合 + + + + + + 根据表名获取列 + + + + + + 获取数据表列（实体属性）集合 + + + + + + 代码生成_本地项目 + + + + + + 获取模板文件路径集合 + + + + + + 设置生成文件路径 + + + + + + + 代码生成详细配置参数 + + + + + 主键Id + + + + + 代码生成主表ID + + + + + 数据库字段名 + + + + + 数据库字段名(首字母小写) + + + + + 字段描述 + + + + + .NET类型 + + + + + 作用类型（字典） + + + + + 外键实体名称 + + + + + 外键实体名称(首字母小写) + + + + + 外键显示字段 + + + + + 外键显示字段(首字母小写) + + + + + 外键显示字段.NET类型 + + + + + 字典code + + + + + 列表是否缩进（字典） + + + + + 是否必填（字典） + + + + + 是否是查询条件 + + + + + 查询方式 + + + + + 列表显示 + + + + + 增改 + + + + + 主外键 + + + + + 数据库中类型（物理类型） + + + + + 是否是通用字段 + + + + + 代码生成参数类 + + + + + 作者姓名 + + + + + 类名 + + + + + 是否移除表前缀 + + + + + 生成方式 + + + + + 数据库表名 + + + + + 命名空间 + + + + + 业务名（业务代码包名称） + + + + + 功能名（数据库表名称） + + + + + 菜单应用分类（应用编码） + + + + + 菜单父级 + + + + + 数据库表名 + + + + + 业务名（业务代码包名称） + + + + + 命名空间 + + + + + 作者姓名 + + + + + 生成方式 + + + + + 菜单应用分类（应用编码） + + + + + 菜单父级 + + + + + 代码生成器Id + + + + + 代码生成器Id + + + + + 代码生成参数类 + + + + + 代码生成器Id + + + + + 作者姓名 + + + + + 类名 + + + + + 是否移除表前缀 + + + + + 生成方式 + + + + + 数据库表名 + + + + + 包名 + + + + + 业务名（业务代码包名称） + + + + + 功能名（数据库表名称） + + + + + 菜单应用分类（应用编码） + + + + + 菜单父级 + + + + + 数据库表列 + + + + + 字段名 + + + + + 数据库中类型 + + + + + .NET字段类型 + + + + + 字段描述 + + + + + 主外键 + + + + + 数据库表列表参数 + + + + + 表名（字母形式的） + + + + + 实体名称 + + + + + 创建时间 + + + + + 更新时间 + + + + + 表名称描述（注释）（功能名） + + + + + 作者姓名 + + + + + 是否移除表前缀 + + + + + 生成方式 + + + + + 数据库表名 + + + + + 数据库表名（经过组装的） + + + + + 代码包名 + + + + + 生成时间（string类型的） + + + + + 数据库表中字段集合 + + + + + 业务名 + + + + + 获取库表信息 + + + + + + + 参数配置 + + + + + 名称 + + + + + 编码 + + + + + 属性值 + + + + + 是否是系统参数（Y-是，N-否） + + + + + 备注 + + + + + 状态（字典 0正常 1停用 2删除） + + + + + 常量所属分类的编码，来自于“常量的分类”字典 + + + + + 名称 + + + + + 编码 + + + + + 应用Id + + + + + 应用Id + + + + + 系统参数配置服务 + + + + + 分页获取系统参数配置 + + + + + + + 获取系统参数配置列表 + + + + + + + 增加系统参数配置 + + + + + + + 删除系统参数配置 + + + + + + + 更新系统参数配置 + + + + + + + 获取系统参数配置 + + + + + + + 获取配置信息 + + + + + + + 更新配置缓存 + + + + + + + + 获取演示环境开关是否开启，默认为false + + + + + + 获取验证码开关标识 + + + + + + 获取默认密码 + + + + + + 数据库管理 + + + + + 添加列 + + + + + + 删除列 + + + + + + 编辑列 + + + + + + 获取表字段 + + + + + + + 获取所有表 + + + + + + 新增表 + + + + + + 删除表 + + + + + + 编辑表 + + + + + + 生成实体 + + + + + + 获取模板文件路径集合 + + + + + + 设置生成文件路径 + + + + + + + + + student + + + + + + Student + + + + + + AutoIncrementEntity + + + + + + GDZZ.Application + + + + 字典值参数 + + + + + 字典类型Id + + + + + 值 + + + + + 编码 + + + + + 排序 + + + + + 备注 + + + + + 状态（字典 0正常 1停用 2删除） + + + + + 字典类型Id + + + + + 字典类型Id + + + + + 值 + + + + + 编码 + + + + + 字典值Id + + + + + 字典值Id + + + + + 字典值参数 + + + + + 字典Id + + + + + 字典类型与字典值构造的树 + + + + + Id + + + + + 父Id + + + + + 编码-对应字典值的编码 + + + + + 名称-对应字典值的value + + + + + 子节点集合 + + + + + 字典类型参数 + + + + + 名称 + + + + + 编码 + + + + + 排序 + + + + + 备注 + + + + + 状态（字典 0正常 1停用 2删除） + + + + + 名称 + + + + + 编码 + + + + + 编号Id + + + + + Id + + + + + 编码 + + + + + 字典值服务 + + + + + 分页查询字典值 + + + + + + + 获取某个字典类型下字典值列表 + + + + + + 增加字典值 + + + + + + + 删除字典值 + + + + + + + 更新字典值 + + + + + + + 字典值详情 + + + + + + + 修改字典值状态 + + + + + + + 根据字典类型Id获取字典值集合 + + + + + + + 删除字典下所有值 + + + + + + 根据字典Code返回字典值列表 + + + + + + + 字典类型服务 + + + + + 分页查询字典类型 + + + + + + 获取字典类型列表 + + + + + + 获取字典类型下所有字典值 + + + + + + + 添加字典类型 + + + + + + + 删除字典类型 + + + + + + + 更新字典类型 + + + + + + + 字典类型详情 + + + + + + + 更新字典类型状态 + + + + + + + 字典类型与字典值构造的字典树 + + + + + + 文档服务 + + + + + 分页查询文档 + + + + + + + 文件夹树 + + + + + + 上传文件 + + + + + + + 上传文件夹 + + + + + + + 新建文件夹 + + + + + + + 删除文档 + + + + + + + 批量删除 + + + + + + + 移动文档 + + + + + + + 更新文件夹 + + + + + + + 获取文档 + + + + + + + 下载文件 + + + + + + + 预览文件 + + + + + + + 创建Pids格式 + 如果pid是0顶级节点，pids就是 [0]; + 如果pid不是顶级节点，pids就是 pid文档的 pids + [pid] + , + + + + + + + 获取文件大小 + + + + + + + 上传文件 + + + + + + + + 获取父级 + + + + + + + 文档输出参数 + + + + + Id + + + + + 父Id + + + + + 名称 + + + + + 文档类型:文件、文件夹 + + + + + 文件后缀 + + + + + 文件大小kb + + + + + 标签 + + + + + 备注 + + + + + 文档输入参数 + + + + + 父Id + + + + + 父ID列表 + + + + + 名称 + + + + + 文档类型:文件、文件夹 + + + + + 文件后缀 + + + + + 文件大小kb + + + + + 存储后的文件名 + + + + + 标签 + + + + + 备注 + + + + + 创建开始时间 + + + + + 创建结束时间 + + + + + 修改结束时间 + + + + + 修改结束时间 + + + + + 文件类型 + + + + + 是否删除 + + + + + 上传文件输入参数 + + + + + Id + + + + + 批量删除入参 + + + + + Id列表 + + + + + 移动入参 + + + + + Id列表 + + + + + 父Id + + + + + Id + + + + + 文档输出参数 + + + + + Id + + + + + 父Id + + + + + 名称 + + + + + 文档类型:文件、文件夹 + + + + + 文件类型 + + + + + 文件后缀 + + + + + 文件大小kb + + + + + 文件大小kb + + + + + 标签 + + + + + 标签数组 + + + + + 备注 + + + + + 创建时间 + + + + + 更新时间 + + + + + 创建用户ID + + + + + 创建人用户名 + + + + + 修改人ID + + + + + 修改人用户名 + + + + + 树查询输出 + + + + + Id + + + + + 父Id + + + + + 名称 + + + + + 附属机构和职位参数 + + + + + 员工Id + + + + + 附属机构id + + + + + 附属机构编码 + + + + + 附属机构名称 + + + + + 附属职位id + + + + + 附属职位编码 + + + + + 附属职位名称 + + + + + 员工信息参数 + + + + + 员工Id + + + + + 工号 + + + + + 机构id + + + + + 机构名称 + + + + + 机构与职位信息 + + + + + 职位信息 + + + + + 员工信息参数2 + + + + + 员工Id + + + + + 工号 + + + + + 机构Id + + + + + 机构名称 + + + + + 附属机构 + + + + + 职位集合 + + + + + 员工职位参数 + + + + + 员工Id + + + + + 职位Id + + + + + 职位编码 + + + + + 职位名称 + + + + + 员工附属机构和职位服务 + + + + + 保存或编辑附属机构相关信息 + + + + + + 获取附属机构和职位信息 + + + + + + + 根据机构Id判断该附属机构下是否有员工 + + + + + + + 根据职位Id判断该附属职位下是否有员工 + + + + + + + 根据员工Id删除对应的员工-附属信息 + + + + + + + 员工职位服务 + + + + + 增加或编辑员工职位相关信息 + + 员工Id（用户Id） + 职位id集合 + + + + + 获取所属职位信息 + + 员工Id（用户Id） + + + + 根据职位Id判断该职位下是否有员工 + + + + + + + 根据员工Id删除对用的员工-职位信息 + + + + + + + 员工服务 + + + + + 获取用户员工相关信息（包括登录） + + + + + + + 获取用户员工相关信息 + + + + + + + 增加或编辑员工相关信息 + + + + + + 修改员工相关机构信息 + + + + + + + + 根据机构Id判断该机构下是否有员工 + + + + + + + 根据员工Id删除对应的员工表信息 + + + + + + + 获取员工机构Id + + + + + + + 获取子机构用户 + + + + + + + 枚举输入参数 + + + + + 枚举类型名称 + + Gender + + + + 实体名称 + + + + + 字段名称 + + + + + 枚举输出参数 + + + + + 字典Id + + + + + 字典值 + + + + + 枚举值服务 + + + + + 获取所有枚举值 + + + + + + 通过枚举类型获取枚举值集合 + + + + + + + 通过实体字段类型获取相关集合（目前仅支持枚举类型） + + + + + + + 上传文件参数 + + + + + 文件存储位置（1:阿里云，2:腾讯云，3:minio，4:本地） + + + + + 文件仓库 + + + + + 文件名称（上传时候的文件名） + + + + + 文件后缀 + + + + + 文件大小kb + + + + + 文件大小信息，计算后的 + + + + + 存储到bucket的名称（文件唯一标识id） + + + + + 存储路径 + + + + + 文件Id + + + + + 上传文件参数 + + + + + 文件Id + + + + + 文件服务 + + + + + 分页获取文件列表 + + + + + + + 获取文件列表 + + + + + + + 删除文件 + + + + + + + 获取文件详情 + + + + + + + 预览文件 + + + + + + + 上传文件 + + + + + + + 下载文件 + + + + + + + 上传头像 + + + + + + + 上传文档 + + + + + + + 上传富文本图片 + + + + + + + 上传商店图片 + + + + + + + 上传文件 + + + + + + + + 上传文件 + + 文件 + 存储路径 + 文件存储位置 + + + + + 异常日志参数 + + + + + 操作人 + + + + + 名称 + + + + + 类名 + + + + + 方法名 + + + + + 异常名称 + + + + + 异常信息 + + + + + 异常时间 + + + + + 异常日志参数 + + + + + 请求日志参数 + + + + + 名称 + + + + + 是否执行成功（Y-是，N-否） + + + + + 具体消息 + + + + + ip + + + + + 地址 + + + + + 浏览器 + + + + + 操作系统 + + + + + 请求地址 + + + + + 类名称 + + + + + 方法名称 + + + + + 请求方式（GET POST PUT DELETE) + + + + + 请求参数 + + + + + 返回结果 + + + + + 耗时（毫秒） + + + + + 操作时间 + + + + + 操作人 + + + + + 请求日志参数 + + + + + 访问日志参数 + + + + + 名称 + + + + + 是否执行成功（Y-是，N-否） + + + + + 具体消息 + + + + + IP + + + + + 地址 + + + + + 浏览器 + + + + + 操作系统 + + + + + 访问类型 + + + + + 访问时间 + + + + + 访问人 + + + + + 访问日志参数 + + + + + 异常日志服务 + + + + + 分页查询异常日志 + + + + + + + 清空异常日志 + + + + + + 操作日志服务 + + + + + 分页查询操作日志 + + + + + + + 清空操作日志 + + + + + + 访问日志服务 + + + + + 分页查询访问日志 + + + + + + + 清空访问日志 + + + + + + 登录菜单-AntDesign菜单类型 + + + + + 所属应用 + + + + + id + + + + + 父id + + + + + 路由名称, 必须设置,且不能重名 + + + + + 组件 + + + + + 重定向地址, 访问这个路由时, 自定进行重定向 + + + + + 路由元信息（路由附带扩展信息） + + + + + 路径 + + + + + 控制路由和子路由是否显示在 sidebar + + + + + 路由元信息内部类 + + + + + 路由标题, 用于显示面包屑, 页面标题 *推荐设置 + + + + + 图标 + + + + + 是否可见 + + + + + 如需外部打开，增加：_blank + + + + + 内链打开http链接 + + + + + 菜单参数 + + + + + 父Id + + + + + 名称 + + + + + 编码 + + + + + 菜单类型（字典 0目录 1菜单 2按钮） + + + + + 图标 + + + + + 路由地址 + + + + + 组件地址 + + + + + 权限标识 + + + + + 应用分类（应用编码） + + + + + 打开方式（字典 0无 1组件 2内链 3外链） + + + + + 是否可见（Y-是，N-否） + + + + + 内链地址 + + + + + 重定向地址 + + + + + 权重（字典 1系统权重 2业务权重） + + + + + 排序 + + + + + 备注 + + + + + 菜单类型（字典 0目录 1菜单 2按钮） + + + + + 菜单Id + + + + + 菜单Id + + + + + 父Id + DeleteMenuInput + + + + 应用编码 + DeleteMenuInput + + + + 菜单树（列表形式） + + + + + 菜单Id + + + + + 子节点 + + + + + 应用名称 + + + + + 应用编码 + + + + + 菜单树---授权、新增编辑时选择 + + + + + 主键 + + + + + 父Id + + + + + 名称 + + + + + 值 + + + + + 排序，越小优先级越高 + + + + + 子节点 + + + + + 应用名称 + + + + + 应用编码 + + + + + 引用排序 + + + + + 应用编码 + + + + + 菜单Id集合 + + + + + 系统菜单服务 + + + + + 获取用户权限(按钮权限标识集合) + + + + + + + 获取所有权限集合 + + + + + + 获取用户AntDesign菜单集合 + + + + + + + + 获取用户菜单所属的应用编码集合 + + + + + + + 系统菜单列表（树表） + + + + + + + 创建Pids格式 + 如果pid是0顶级节点，pids就是 [0]; + 如果pid不是顶级节点，pids就是 pid菜单的 pids + [pid] + , + + + + + + + 增加和编辑时检查参数 + + + + + + 增加系统菜单 + + + + + + + 删除系统菜单 + + + + + + + 更新系统菜单 + + + + + + + 获取系统菜单 + + + + + + + 获取系统菜单树，用于新增、编辑时选择上级节点 + + + + + + + 获取系统菜单树，用于给角色授权时选择 + + + + + + + 根据应用编码判断该机构下是否有状态为正常的菜单 + + + + + + + 根据系统应用切换菜单 + + + + + + + 服务器信息服务 + + + + + 获取服务器资源信息 + + + + + + 获取服务器基本参数 + + + + + + 动态获取网络信息 + + + + + + 通知公告参数 + + + + + 标题 + + + + + 内容 + + + + + 类型（字典 1通知 2公告） + + + + + 发布人Id + + + + + 发布人姓名 + + + + + 发布机构Id + + + + + 发布机构名称 + + + + + 发布时间 + + + + + 撤回时间 + + + + + 状态（字典 0草稿 1发布 2撤回 3删除） + + + + + 系统通知公告详情参数 + + + + + 通知到的用户Id集合 + + + + + 通知到的用户阅读信息集合 + + + + + 用户Id + + + + + 用户名称 + + + + + 状态（字典 0未读 1已读） + + + + + 阅读时间 + + + + + 通知公告参数 + + + + + 标题 + + + + + 内容 + + + + + 类型（字典 1通知 2公告） + + + + + 状态（字典 0草稿 1发布 2撤回 3删除） + + + + + 通知到的人 + + + + + 标题 + + + + + 内容 + + + + + 类型（字典 1通知 2公告） + + + + + 状态（字典 0草稿 1发布 2撤回 3删除） + + + + + 通知到的人 + + + + + Id + + + + + Id + + + + + 状态（字典 0草稿 1发布 2撤回 3删除） + + + + + 通知公告接收参数 + + + + + Id + + + + + 阅读状态（字典 0未读 1已读） + + + + + 阅读时间 + + + + + 通知公告服务 + + + + + 分页查询通知公告 + + + + + + + 增加通知公告 + + + + + + + 删除通知公告 + + + + + + + 更新通知公告 + + + + + + + 获取通知公告详情 + + + + + + + 修改通知公告状态 + + + + + + + 获取接收的通知公告 + + + + + + + 未处理消息 + + + + + + + 更新发布信息 + + + + + + 通知公告用户 + + + + + 增加 + + + + + + + + + 更新 + + + + + + + + + 获取通知公告用户列表 + + + + + + + 设置通知公告读取状态 + + + + + + + + + OAuth服务 + + + + + 微信登录授权 + + + + + 微信登录授权回调 + + + + + + + + + 获取微信用户基本信息 + + + + + + + + 在线用户服务 + + + + + 获取在线用户信息 + + + + + + 组织机构参数 + + + + + 父Id + + + + + 父Ids + + + + + 名称 + + + + + 编码 + + + + + 电话 + + + + + 排序 + + + + + 备注 + + + + + 状态（字典 0正常 1停用 2删除） + + + + + 名称 + + + + + 编码 + + + + + 机构Id + + + + + 机构Id + + + + + 组织机构参数 + + + + + 机构Id + + + + + 组织机构树 + + + + + Id + + + + + 父Id + + + + + 名称 + + + + + 值 + + + + + 排序，越小优先级越高 + + + + + 子节点 + + + + + 上一级Id + + + + + 组织机构服务 + + + + + 分页查询组织机构 + + + + + + + (非管理员)获取当前用户数据范围（机构Id） + + + + + + + 获取组织机构列表 + + + + + + + 增加组织机构 + + + + + + + 填充父Ids字段 + + + + + + + 删除组织机构 + + + + + + + 更新组织机构 + + + + + + + 获取组织机构信息 + + + + + + + 根据节点Id获取所有子节点Id集合，包含自己 + + + + + + + 获取组织机构树 + + + + + + 根据数据范围类型获取当前用户的数据范围（机构Id）集合 + + + + + + + + 获取所有的机构组织Id集合 + + + + + + 职位参数 + + + + + 名称 + + + + + 编码 + + + + + 排序 + + + + + 备注 + + + + + 状态（字典 0正常 1停用 2删除） + + + + + 当前页码 + + + + + 页码容量 + + + + + 名称 + + + + + 编码 + + + + + 职位Id + + + + + 职位Id + + + + + 职位服务 + + + + + 分页获取职位 + + + + + + + 获取职位列表 + + + + + + 增加职位 + + + + + + + 删除职位 + + + + + + + 更新职位 + + + + + + + 获取职位 + + + + + + + 角色参数 + + + + + 名称 + + + + + 编码 + + + + + 排序 + + + + + 数据范围类型（字典 1全部数据 2本部门及以下数据 3本部门数据 4仅本人数据 5自定义数据） + + + + + 备注 + + + + + 名称 + + + + + 编码 + + + + + 角色Id + + + + + 角色Id + + + + + 角色Id + + + + + 登录用户角色参数 + + + + + Id + + + + + 编码 + + + + + 名称 + + + + + 角色数据范围服务 + + + + + 授权角色数据范围 + + + + + + + 根据角色Id集合获取角色数据范围集合 + + + + + + + 根据机构Id集合删除对应的角色-数据范围关联信息 + + + + + + + 根据角色Id删除对应的角色-数据范围关联信息 + + + + + + + 角色菜单 + + + + + 获取角色的菜单Id集合 + + + + + + + 授权角色菜单 + + + + + + + 根据菜单Id集合删除对应的角色-菜单表信息 + + + + + + + 根据角色Id删除对应的角色-菜单表关联信息 + + + + + + + 清理租户下角色的权限 + + 租户id + 租户管理员的角色id + + + + + 角色服务 + + + + + 获取用户角色相关信息（登录） + + + + + + + 分页获取角色列表 + + + + + + + 获取角色列表 + + + + + + + 角色下拉（用于授权角色时选择） + + + + + + 增加角色 + + + + + + + 删除角色 + + + + + + + 更新角色 + + + + + + + 获取角色 + + + + + + + 授权角色菜单 + + + + + + + 授权角色数据范围 + + + + + + + 根据角色Id集合获取数据范围Id集合 + + + + + + + + 根据角色Id获取角色名称 + + + + + + + 获取角色拥有菜单Id集合 + + + + + + + 获取角色拥有数据Id集合 + + + + + + + 租户参数 + + + + + 公司名称 + + + + + 管理员名称 + + + + + 主机 + + + + + 电子邮箱 + + + + + 电话号码 + + + + + 模式 + + + + + 数据库连接 + + + + + 备注 + + + + + 创建时间 + + + + + 公司名称 + + + + + 管理员名称 + + + + + 主机名称 + + + + + 数据库连接 + + + + + 电子邮箱 + + + + + 租户Id + + + + + 租户Id + + + + + 租户参数 + + + + + 租户Id + + + + + 名称 + + + + + 名称 + + + + + 主机 + + + + + 电子邮箱 + + + + + 电话号码 + + + + + 模式 + + + + + 数据库连接 + + + + + 备注 + + + + + 创建时间 + + + + + 租户服务 + + + + + 分页查询租户 + + + + + + + 增加租户 + + + + + + + 新增租户时，初始化数据 + + + + + + 删除租户 + + + + + + + 更新租户 + + + + + + + 获取租户 + + + + + + + 授权租户管理员角色菜单 + + + + + + + 获取租户管理员角色拥有菜单Id集合 + + + + + + + 重置租户管理员密码 + + + + + + + 获取租户管理员用户 + + + + + + + 任务调度参数 + + + + + 任务名称 + + + + + 只执行一次 + + + + + 立即执行（默认等待启动） + + + + + 执行类型(并行、列队) + + + + + 执行间隔时间（单位秒） + + 5 + + + + Cron表达式 + + + + + 定时器类型 + + + + + 请求url + + + + + 请求参数（Post，Put请求用） + + + + + Headers(可以包含如：Authorization授权认证) + 格式：{"Authorization":"userpassword.."} + + + + + 请求类型 + + + + + 备注 + + + + + 任务Id + + + + + 任务信息---任务详情 + + + + + Id + + + + + 已执行次数 + + + + + 定时器状态 + + + + + 异常信息 + + + + + 本地任务信息 + + + + + 任务名称 + + + + + 只执行一次 + + + + + 立即执行（默认等待启动） + + + + + 执行类型(并行、列队) + + + + + 执行间隔时间（单位秒） + + + + + Cron表达式 + + + + + 定时器类型 + + + + + 请求url + + + + + 请求类型 + + 2 + + + + 备注 + + + + + 任务方法信息 + + + + + 方法名 + + + + + 方法所属类的Type对象 + + + + + 任务调度服务 + + + + + 分页获取任务列表 + + + + + + + 获取所有本地任务 + + + + + + 增加任务 + + + + + + + 删除任务 + + + + + + + 修改任务 + + + + + + + 查看任务 + + + + + + + 停止任务 + + + + + + + 启动任务 + + + + + + + 新增定时任务 + + + + + + 启动自启动任务 + + + + + 获取所有本地任务 + + + + + + 回收站输出参数 + + + + + Id + + + + + 父Id + + + + + 父ID列表 + + + + + 名称 + + + + + 类型 + + + + + 文件后缀 + + + + + 文件大小kb + + + + + 存储后的文件名 + + + + + 标签 + + + + + 备注 + + + + + 回收站输出参数 + + + + + Id + + + + + 父Id + + + + + 父ID列表 + + + + + 名称 + + + + + 类型 + + + + + 文件后缀 + + + + + 文件大小kb + + + + + 存储后的文件名 + + + + + 标签 + + + + + 备注 + + + + + 回收站服务 + + + + + 分页查询回收站 + + + + + + + 恢复一个 + + + + + + + 恢复多个 + + + + + + + 永久删除 + + + + + + + 批量删除 + + + + + + + 清空 + + + + + + 重命名 + + + + + + + + AuthToken参数 + + + + + OAuth用户参数 + + + + + 用户参数 + + + + + 账号 + + + + + 密码 + + + + + 昵称 + + + + + 姓名 + + + + + 头像 + + + + + 生日 + + + + + 性别-男_1、女_2 + + + + + 邮箱 + + + + + 手机 + + + + + 电话 + + + + + 状态-正常_0、停用_1、删除_2 + + + + + 员工信息 + + + + + 搜索状态（字典 0正常 1停用 2删除） + + + + + 账号 + + + + + 密码 + + + + + 确认密码 + + + + + 用户Id + + + + + 用户Id + + + + + 用户Id + + + + + 密码 + + + + + 新密码 + + + + + 确认密码 + + + + + 用户Id + + + + + 头像文件路径标识 + + + + + 用户参数 + + + + + Id + + + + + 账号 + + + + + 昵称 + + + + + 姓名 + + + + + 头像 + + + + + 生日 + + + + + 性别-男_1、女_2 + + + + + 邮箱 + + + + + 手机 + + + + + 电话 + + + + + 状态-正常_0、停用_1、删除_2 + + + + + 员工信息 + + + + + 所属租户 + + + + + 用户数据范围服务 + + + + + 授权用户数据 + + + + + + + 获取用户的数据范围Id集合 + + + + + + + 根据机构Id集合删除对应的用户-数据范围关联信息 + + + + + + + 根据用户Id删除对应的用户-数据范围关联信息 + + + + + + + 用户角色服务 + + + + + 获取用户的角色Id集合 + + + + + + + 授权用户角色 + + + + + + + 获取用户所有角色的数据范围（组织机构Id集合） + + + + + + + + 根据角色Id删除对应的用户-角色表关联信息 + + + + + + + 根据用户Id删除对应的用户-角色表关联信息 + + + + + + + 用户服务 + + + + + 分页查询用户 + + + + + + + 增加用户 + + + + + + + 删除用户 + + + + + + + 更新用户 + + + + + + + 查看用户 + + + + + + + 修改用户状态 + + + + + + + 授权用户角色 + + + + + + + 授权用户数据范围 + + + + + + + 更新用户信息 + + + + + + + 修改用户密码 + + + + + + + 获取用户拥有角色 + + + + + + + 获取用户拥有数据 + + + + + + + 重置用户密码 + + + + + + + 修改用户头像 + + + + + + + 获取用户选择器 + + + + + + + 用户导出 + + + + + + + 用户导入 + + + + + + + 根据用户Id获取用户 + + + + + + + 将OAuth账号转换成账号 + + + + + + + + 获取用户数据范围（机构Id集合）并缓存 + + + + + + + 检查普通用户数据范围 + + + + + + + 获取用户数据范围（用户Id集合） + + + + + + 检查普通用户数据范围 + + + + + + + 简单泛型队列 + + + + + 新增 + + + + + + 取出 + + + + + + + 总数 + + + + + + 清理 + + + + + 分页泛型集合 + + + + + + 页码 + + + + + 页容量 + + + + + 总条数 + + + + + 总页数 + + + + + 当前页集合 + + + + + 是否有上一页 + + + + + 是否有下一页 + + + + + 分页集合 + + + + + SqlSugar 仓储实现类 + + + + + + 初始化 SqlSugar 客户端 + + + + + 数据库上下文 + + + + + 独立数据库上下文 + + + + + 构造函数 + + + + + + 实体集合 + + + + + 原生 Ado 对象 + + + + + 获取总数 + + + + + + + 获取总数 + + + + + + + 检查是否存在 + + + + + + + 检查是否存在 + + + + + + + 通过主键获取实体 + + + + + + + 获取一个实体 + + + + + + + 获取一个实体 + + + + + + + 获取一个实体 + + + + + + + 获取一个实体 + + + + + + + 获取列表 + + + + + + 获取列表 + + + + + + + 获取列表 + + + + + + + + + 获取列表 + + + + + + 获取列表 + + + + + + + 获取列表 + + + + + + + + + 新增一条记录 + + + + + + + 新增多条记录 + + + + + + + 新增多条记录 + + + + + + + 新增一条记录返回自增Id + + + + + + + 新增一条记录返回雪花Id + + + + + + + 新增一条记录返回实体 + + + + + + + 新增一条记录 + + + + + + + 新增多条记录 + + + + + + + 新增多条记录 + + + + + + + 新增一条记录返回自增Id + + + + + + + 新增一条记录返回雪花Id + + + + + + + 新增一条记录返回实体 + + + + + + + 更新一条记录 + + + + + + + 更新多条记录 + + + + + + + 更新多条记录 + + + + + + + 更新一条记录 + + + + + + + 更新记录 + + 更新的条件 + 更新的内容 + + + + + 更新记录 + + 更新的条件 + 更新的内容 + + + + + 更新多条记录 + + + + + + + 更新多条记录 + + + + + + + 删除一条记录 + + + + + + + 删除一条记录 + + + + + + + 删除多条记录 + + + + + + + 自定义条件删除记录 + + + + + + + 删除一条记录 + + + + + + + 删除一条记录 + + + + + + + 删除多条记录 + + + + + + + 自定义条件删除记录 + + + + + + + 根据表达式查询多条记录 + + + + + + + 根据表达式查询多条记录 + + + + + + + + 构建查询分析器 + + + + + + 构建查询分析器 + + + + + + + 直接返回数据库结果 + + + + + + 直接返回数据库结果 + + + + + + + 直接返回数据库结果 + + + + + + 直接返回数据库结果 + + + + + + + 切换仓储(注意使用环境) + + 实体类型 + 仓储 + + + + 当前db + + + + + 当前db + + + + + 当前db + + + + + 所有db + + + + + 所有db + + + + + 所有db + + + + + SqlsugarScope的配置 + Scope必须用单例注入 + 不可以用Action委托注入 + + + + + + 获取当前租户id + + + + + + 判断是不是超级管理员 + + + + + + 添加 SqlSugar 拓展 + + + + + + + + + 添加 SqlSugar 拓展 + + + + + + + + + 代码生成帮助类 + + + + + 数据类型转显示类型 + + + + + + + 枚举的Entity类 + + + + + 枚举的描述 + + + + + 枚举名称 + + + + + 枚举对象的值 + + + + + 枚举工具类 + + + + + 获取枚举对象Key与名称的字典（缓存） + + + + + + + 获取枚举对象Key与名称的字典 + + + + + + + 获取枚举类型key与描述的字典（缓存） + + + + + + + + 获取枚举类型key与描述的字典（没有描述则获取name） + + + + + + + + 从程序集中查找指定枚举类型 + + + + + + + + 从程序集中加载所有枚举类型 + + + + + + + 获取枚举的Description + + + + + + + 获取枚举的Description + + + + + + + 将枚举转成枚举信息集合 + + + + + + + 枚举ToList + + + + + + + + DateTime扩展 + + + 验证扩展类 + + + 转换扩展类 + + + + + 得到问好 + + + + + + 获取指定年月的第一天 + + + + + + + + + 获取指定年月的第一天 + + + + + + + + + 获取指定年月的最后一天 + + + + + + + + + 获取指定年月的最后一天 + + + + + + + + + 获取当前月的第一天 + + + + + + + 获取当前月的最后一天 + + + + + + + 获取上月的第一天 + + + + + + + 获取上月的最后一天 + + + + + + + 获取本周时间 + + + + + + + 获取上周时间 + + + + + + + 获取当天时间 + + + + + + + 获取昨天时间 + + + + + + + 计算两个时间的差 + + + + + + + + + 检查 Object 是否为 NULL + + + + + + + 检查 Object 是否为 NULL 或者 0 + + + + + + + 检查是否为 AJAX 请求 + + + + + + + 将object转换为long，若转换失败，则返回0。不抛出异常。 + + + + + + + 将object转换为long，若转换失败，则返回指定值。不抛出异常。 + + + + + + + + 将object转换为int，若转换失败，则返回0。不抛出异常。 + + + + + + + 将object转换为int，若转换失败，则返回指定值。不抛出异常。 + null返回默认值 + + + + + + + + 将object转换为short，若转换失败，则返回0。不抛出异常。 + + + + + + + 将object转换为short，若转换失败，则返回指定值。不抛出异常。 + + + + + + + + 将object转换为demical，若转换失败，则返回指定值。不抛出异常。 + + + + + + + + 将object转换为demical，若转换失败，则返回0。不抛出异常。 + + + + + + + 将object转换为bool，若转换失败，则返回false。不抛出异常。 + + + + + + + 将object转换为bool，若转换失败，则返回指定值。不抛出异常。 + + + + + + + + 将object转换为float，若转换失败，则返回0。不抛出异常。 + + + + + + + 将object转换为float，若转换失败，则返回指定值。不抛出异常。 + + + + + + + + 将string转换为Guid，若转换失败，则返回Guid.Empty。不抛出异常。 + + + + + + + 将string转换为DateTime，若转换失败，则返回日期最小值。不抛出异常。 + + + + + + + 将string转换为DateTime，若转换失败，则返回默认值。 + + + + + + + + 将object转换为string，若转换失败，则返回""。不抛出异常。 + + + + + + + + + + + + + + + 将object转换为double，若转换失败，则返回0。不抛出异常。 + + + + + + + 将object转换为double，若转换失败，则返回指定值。不抛出异常。 + + + + + + + + 强制转换类型 + + + + + + + + HTTP网络工具 + + + + + 客户端IP地址 + + + + + 得到客户端IP地址 + + + + + + 得到局域网IP地址 + + + + + + 得到远程Ip地址 + + + + + + 请求UserAgent信息 + + + + + 请求Url + + + + + 得到操作系统版本 + + + + + + 公网信息 + 慎用，如果不是直接请求接口，而是通过代理转发，拿到的是服务器的公网信息 + + + + + + 根据IP地址获取公网信息 + + + + + + UserAgent信息 + + + + + + 远程路径Encode处理,会保证开头是/，结尾也是/ + + + + + + + 标准化远程目录路径,会保证开头是/，结尾也是/ ,如果命名不规范，存在保留字符，会返回空字符 + + 要标准化的远程路径 + + + + + 万网Ip信息Model类 + + + + + Ip地址 + + + + + 省份 + + + + + 省份邮政编码 + + + + + 城市 + + + + + 城市邮政编码 + + + + + 地理信息 + + + + + 运营商 + + + + + UserAgent 信息Model类 + + + + + 手机型号 + + + + + 操作系统（版本） + + + + + 浏览器（版本） + + + + + 天气预报工具类 + + + + + 天气信息 + + + + + 时间 + + + + + 最高温度 + + + + + 风力 + + + + + 最低温度 + + + + + 分向 + + + + + 类型 + + + + + 昨日天气 + + + + + 城市 + + + + + 未来五天天气 + + + + + 感冒 + + + + + 温度 + + + + + 是否成功 + + + + + 失败描述 + + + + + 数据 + + + + + 状态 + + + + + 描述 + + + + + 图片工具类 + + + + + 获取外网Url图片的二进制数组 + + + + + + + 保存二进制流到文件 + + + + + + + 保存外网Url到文件 + + 外网图片Url + 要保存的文件名称 + + + + + 删除文件夹里面所有的文件 + + + + + + + 无损压缩图片 + + 原图片地址 + 压缩后保存图片地址 + 压缩后宽度 + 压缩后高度 + 压缩质量（数字越小压缩率越高） + 压缩后图片的最大大小 + 是否为第一次调用 + + + + + Json序列化工具类 + + + + + JSON 字符串转 Object + + + + + + + + JSON 字符串转 Object + + + + + + + Object 转 JSON字符串 + + + + + + + JSON 字符串转 JObject + + + + + + + Dictionary 字符串转 Object + + + + + + + + 把数组转为逗号连接的字符串 + + + + + + + + 判断是否有交集 + + + + + + + + + 获取服务器信息 + + + + + 获取资源使用信息 + + + + + + 获取基本参数 + + + + + + 动态获取网络信息 + + + + + + 是否Linux + + + + + + 获取CPU使用率 + + + + + + 获取系统运行时间 + + + + + + 获取内存信息 + + + + + + 毫秒转天时分秒 + + + + + + + 获取外网IP和地理位置 + + + + + + 系统Shell命令 + + + + + Bash命令 + + + + + + + cmd命令 + + + + + + + + + + + + + 当前正在联网的网卡信息 + + + + + + 获取当前网卡的网络速度 + + + + + + + 小程序工具类 + + + + + 解密数据获取小程序用户信息 + + 包括敏感数据在内的完整用户信息的加密数据 + auth.code2Session获取的session_key + 加密算法的初始向量 + 如遇异常返回 "" + + + + 基础解析 + + 包括敏感数据在内的完整用户信息的加密数据 + auth.code2Session获取的session_key + 加密算法的初始向量 + + + + + 小程序登录解密后的用户信息Model + + + + + 手机号 + + + + + 纯手机号 + + + + + 区号 + + + + + 阿里云oss文件上传工具类 + + + + + 上传本地文件(走阿里云内网传输) + + + + + + + + 上传一个图片 + + 图片经过base64加密后的结果 + 文件名,例如:Emplyoee/dzzBack.jpg + + + + 上传本地文件 + + + + 返回参数说明 1.本地文件不存在 2.文件oss上已存在 3.上传失败 4.上传成功 + + + + + 上传一个图片 + + 图片字节 + 文件名,例如:Emplyoee/dzzBack.jpg + + + + + 获取鉴权后的URL,URL有效日期默认一小时 + + 文件名,例如:Emplyoee/dzzBack.jpg + + + + + 获取鉴权后的URL + + 文件名,例如:Emplyoee/dzzBack.jpg + URL有效日期,例如:DateTime.Now.AddHours(1) + + + + + 将文件转换成byte[] 数组 + + 文件路径文件名称 + byte[] + + + + 删除文件 + + 文件id + 文件url + + + + 删除文件夹 + + 文件id + 文件url + + + + 判断文件是否存在 + + + + + + + 类型转换 + + + + + + 反射工具 + + + + + 获取字段特性 + + + + + + + + 普通 字符串 转换为 base64 字符串 + + + + + base64 字符串 转换为 普通 字符串 + + + + + 字符串验证帮助类 + + + + + 验证输入字符串为带小数点正数 + + 输入字符 + 返回一个bool类型的值 + + + + 验证输入字符串为带小数点正负数 + + 输入字符 + 返回一个bool类型的值 + + + + 验证中国电话格式是否有效，格式010-85849685 + + 输入字符 + 返回一个bool类型的值 + + + + 验证输入字符串为电话号码 + + 输入字符 + 返回一个bool类型的值 + + + + 验证是否是有效传真号码 + + 输入字符 + 返回一个bool类型的值 + + + + 验证手机号是否合法 号段为13,14,15,16,17,18,19 0，86开头将自动识别 + + 输入字符 + 返回一个bool类型的值 + + + + 验证身份证是否有效 + + 输入字符 + 返回一个bool类型的值 + + + + 验证输入字符串为18位的身份证号码 + + 输入字符 + 返回一个bool类型的值 + + + + 验证输入字符串为15位的身份证号码 + + 输入字符 + 返回一个bool类型的值 + + + + 验证是否是有效邮箱地址 + + 输入字符 + 返回一个bool类型的值 + + + + 验证是否是有效QQ邮箱地址 + + 输入字符 + 返回一个bool类型的值 + + + + 验证是否只含有汉字 + + 输入字符 + + + + + 是否有多余的字符 防止SQL注入 + + 输入字符 + + + + + 是否由数字、26个英文字母或者下划线組成的字串 + + 输入字符 + + + + + 由数字、26个英文字母、汉字組成的字串 + + 输入字符 + + + + + 是否由数字、26个英文字母組成的字串 + + 输入字符 + + + + + 验证输入字符串为邮政编码 + + 输入字符 + 返回一个bool类型的值 + + + + 检查对象的输入长度 + + 输入字符 + 指定的长度 + false 太长，true -太短 + + + + 判断用户输入是否为日期 + + 输入字符 + 返回一个bool类型的值 + + 可判断格式如下（其中-可替换为/，不影响验证) + YYYY | YYYY-MM | YYYY-MM-DD | YYYY-MM-DD HH:MM:SS | YYYY-MM-DD HH:MM:SS.FFF + + + + + 树基类 + + + + + 获取节点id + + + + + + 获取节点父id + + + + + + 设置Children + + + + + + 递归工具类，用于遍历有父子关系的节点，例如菜单树，字典树等等 + + + + + + 顶级节点的父节点Id(默认0) + + + + + 构造树节点 + + + + + + + 构造子节点集合 + + + + + + + diff --git a/Magic.Core/Hubs/ChatHub.cs b/GDZZ.Core/Hubs/ChatHub.cs similarity index 96% rename from Magic.Core/Hubs/ChatHub.cs rename to GDZZ.Core/Hubs/ChatHub.cs index 7690d81..3a36cba 100644 --- a/Magic.Core/Hubs/ChatHub.cs +++ b/GDZZ.Core/Hubs/ChatHub.cs @@ -1,12 +1,12 @@ using Furion.DataEncryption; -using Magic.Core.Entity; -using Magic.Core.Service; +using GDZZ.Core.Entity; +using GDZZ.Core.Service; using Microsoft.AspNetCore.SignalR; using System; using System.Linq; using System.Threading.Tasks; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 聊天集线器 diff --git a/Magic.Core/Hubs/IChatClient.cs b/GDZZ.Core/Hubs/IChatClient.cs similarity index 73% rename from Magic.Core/Hubs/IChatClient.cs rename to GDZZ.Core/Hubs/IChatClient.cs index f1478e6..37f1a09 100644 --- a/Magic.Core/Hubs/IChatClient.cs +++ b/GDZZ.Core/Hubs/IChatClient.cs @@ -1,7 +1,7 @@ -using Magic.Core.Entity; +using GDZZ.Core.Entity; using System.Threading.Tasks; -namespace Magic.Core; +namespace GDZZ.Core; public interface IChatClient { diff --git a/Magic.Core/Job/LogJobWorker.cs b/GDZZ.Core/Job/LogJobWorker.cs similarity index 99% rename from Magic.Core/Job/LogJobWorker.cs rename to GDZZ.Core/Job/LogJobWorker.cs index 4adb0a3..ca2de4d 100644 --- a/Magic.Core/Job/LogJobWorker.cs +++ b/GDZZ.Core/Job/LogJobWorker.cs @@ -1,8 +1,8 @@ using Furion; using Furion.DependencyInjection; using Furion.TaskScheduler; -using Magic.Core.Entity; -using Magic.Core.Service; +using GDZZ.Core.Entity; +using GDZZ.Core.Service; using Microsoft.Extensions.DependencyInjection; using SqlSugar; using System; @@ -10,7 +10,7 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -namespace Magic.Core.Job; +namespace GDZZ.Core.Job; /// /// 日志定时任务类 diff --git a/Magic.Core/JsonConverter/LongJsonConverter.cs b/GDZZ.Core/JsonConverter/LongJsonConverter.cs similarity index 98% rename from Magic.Core/JsonConverter/LongJsonConverter.cs rename to GDZZ.Core/JsonConverter/LongJsonConverter.cs index 1b5db42..5296287 100644 --- a/Magic.Core/JsonConverter/LongJsonConverter.cs +++ b/GDZZ.Core/JsonConverter/LongJsonConverter.cs @@ -2,7 +2,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace Magic.Core; +namespace GDZZ.Core; /// /// Long 类型Json返回处理 diff --git a/Magic.Core/Logging/Component/ConsoleForamtComponent.cs b/GDZZ.Core/Logging/Component/ConsoleForamtComponent.cs similarity index 96% rename from Magic.Core/Logging/Component/ConsoleForamtComponent.cs rename to GDZZ.Core/Logging/Component/ConsoleForamtComponent.cs index e9116b2..994636b 100644 --- a/Magic.Core/Logging/Component/ConsoleForamtComponent.cs +++ b/GDZZ.Core/Logging/Component/ConsoleForamtComponent.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Console; using System; -namespace Magic.Core; +namespace GDZZ.Core; public sealed class ConsoleForamtComponent : IWebComponent { diff --git a/Magic.Core/Logging/Component/LoggingFileComponent.cs b/GDZZ.Core/Logging/Component/LoggingFileComponent.cs similarity index 98% rename from Magic.Core/Logging/Component/LoggingFileComponent.cs rename to GDZZ.Core/Logging/Component/LoggingFileComponent.cs index 2653925..99b77ab 100644 --- a/Magic.Core/Logging/Component/LoggingFileComponent.cs +++ b/GDZZ.Core/Logging/Component/LoggingFileComponent.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging; using System; using System.Text; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 日志写入文件的组件 diff --git a/Magic.Core/Logging/Extensions/LoggingFileExtensions.cs b/GDZZ.Core/Logging/Extensions/LoggingFileExtensions.cs similarity index 98% rename from Magic.Core/Logging/Extensions/LoggingFileExtensions.cs rename to GDZZ.Core/Logging/Extensions/LoggingFileExtensions.cs index f9aacf0..97802af 100644 --- a/Magic.Core/Logging/Extensions/LoggingFileExtensions.cs +++ b/GDZZ.Core/Logging/Extensions/LoggingFileExtensions.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Console; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 日志写入文件扩展 diff --git a/Magic.Core/Logging/Format/ConsoleForamt.cs b/GDZZ.Core/Logging/Format/ConsoleForamt.cs similarity index 99% rename from Magic.Core/Logging/Format/ConsoleForamt.cs rename to GDZZ.Core/Logging/Format/ConsoleForamt.cs index 303acad..e1cd823 100644 --- a/Magic.Core/Logging/Format/ConsoleForamt.cs +++ b/GDZZ.Core/Logging/Format/ConsoleForamt.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.Options; using System; using System.IO; -namespace Magic.Core; +namespace GDZZ.Core; public class ConsoleForamt : ConsoleFormatter, IDisposable { diff --git a/Magic.Core/Logging/Format/CustomColorOptions.cs b/GDZZ.Core/Logging/Format/CustomColorOptions.cs similarity index 92% rename from Magic.Core/Logging/Format/CustomColorOptions.cs rename to GDZZ.Core/Logging/Format/CustomColorOptions.cs index 8717616..2c27157 100644 --- a/Magic.Core/Logging/Format/CustomColorOptions.cs +++ b/GDZZ.Core/Logging/Format/CustomColorOptions.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Magic.Core; +namespace GDZZ.Core; public class CustomColorOptions : SimpleConsoleFormatterOptions { diff --git a/Magic.Core/Logging/Format/TextWriterExtensions.cs b/GDZZ.Core/Logging/Format/TextWriterExtensions.cs similarity index 99% rename from Magic.Core/Logging/Format/TextWriterExtensions.cs rename to GDZZ.Core/Logging/Format/TextWriterExtensions.cs index 1496e28..b364436 100644 --- a/Magic.Core/Logging/Format/TextWriterExtensions.cs +++ b/GDZZ.Core/Logging/Format/TextWriterExtensions.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace Magic.Core; +namespace GDZZ.Core; public static class TextWriterExtensions { const string DefaultForegroundColor = "\x1B[39m\x1B[22m"; diff --git a/Magic.Core/Magic.Core.xml b/GDZZ.Core/Magic.Core.xml similarity index 63% rename from Magic.Core/Magic.Core.xml rename to GDZZ.Core/Magic.Core.xml index fe796fb..9e0afbf 100644 --- a/Magic.Core/Magic.Core.xml +++ b/GDZZ.Core/Magic.Core.xml @@ -1,89 +1,89 @@ - Magic.Core + GDZZ.Core - + 启用用操作日志 - + SqlSugar 工作单元配置特性 - + 构造函数 - + 构造函数 - 支持传入事务隔离级别 参数值 + 支持传入事务隔离级别 参数值 事务隔离级别 - + 事务隔离级别 - 默认：，参见： + 默认：，参见： 说明：当事务A更新某条数据的时候，不容许其他事务来更新该数据，但可以进行读取操作 - + 缓存接口 - + 用于在 key 存在时删除 key 键 - + 用于在 key 存在时删除 key 键 - + 用于在 key 模板存在时删除 key模板 - + 检查给定 key 是否存在 键 - + 检查给定 key 是否存在 键 - + 获取指定 key 的值 键 - + 获取指定 key 的值 @@ -91,14 +91,14 @@ 键 - + 获取指定 key 的值 键 - + 获取指定 key 的值 @@ -106,14 +106,14 @@ 键 - + 设置指定 key 的值，所有写入参数object都支持string | byte[] | 数值 | 对象 键 值 - + 设置指定 key 的值，所有写入参数object都支持string | byte[] | 数值 | 对象 @@ -121,7 +121,7 @@ 值 有效期 - + 设置指定 key 的值，所有写入参数object都支持string | byte[] | 数值 | 对象 @@ -129,7 +129,7 @@ 值 - + 设置指定 key 的值，所有写入参数object都支持string | byte[] | 数值 | 对象 @@ -138,28 +138,28 @@ 有效期 - + 获取所有缓存 - + 内存缓存 - + Redis缓存 - + 点选验证码 - + 生成验证码图片 @@ -168,7 +168,7 @@ - + 转换为相对于图片的百分比单位 @@ -176,7 +176,7 @@ 相对于图片的绝对尺寸 (int:xPercent, int:yPercent) - + 加载字体 @@ -184,2900 +184,2900 @@ 大小 字形(常规/粗体/斜体/粗斜体) - + 随机绘制字符串 - + 验证码验证 - + 记录正确位置 - + 点击验证码输入参数 - + 验证码类型 - + 坐标点集合 - + Token - + 验证码输出参数 - + 常规验证码 - + 生成验证码图片 - + 验证码验证 - + 常规验证码输入 - + 验证码类型 - + 验证码字符 - + Token - + 缓存配置 - + 缓存类型 - + Redis配置 - + 系统配置 - + 超管是否可以查看所有租户的数据 - + 是否开启全局请求日志 - + 雪花Id配置 - + 取值范围0~63,默认1 - + 第三方配置 - + 微信 - + 上传文件 - + 阿里云 - + 头像 - + 文档 - + 商店 - + 编辑器 - + 默认 - + 数据库配置 - + 默认数据库编号 - + 默认数据库类型 - + 默认数据库连接字符串 - + 业务库集合 - + JWT配置 - + 是否验证密钥 - + 密钥 - + 是否验证签发方 - + 签发方 - + 是否验证签收方 - + 签收方 - + 是否验证过期时间 - + 过期时间 - + 过期时间容错值 - + 数据库参数 - + 数据库编号 - + 数据库类型 - + 数据库连接字符串 - + 文件参数 - + 路径 - + 大小 - + 类型 - + 第三方参数 - + id - + key - + 回调地址 - + scope - + 用户Id - + 账号 - + 名称 - + 是否超级管理 - + 租户Id - + 租户类型 - + 租户名称 - + 用户缓存 - + 菜单缓存 - + 权限缓存 - + 数据范围缓存 - + 验证码缓存 - + 库表实体信息缓存 - + 所有权限缓存 - + 程序集 - + 删除字段 - + 自定义租户基类实体 - + 租户id - + 自定义实体基类 - + 创建时间 - + 更新时间 - + 创建者Id - + 创建者名称 - + 修改者Id - + 修改者名称 - + 软删除 - + 更新信息列 - + 假删除的列，包含更新信息 - + 递增主键实体基类 - + 主键Id - + 主键实体基类 - + 主键Id - + 文档表 - + 父Id - + 父ID列表 - + 名称 - + 文档类型:文件、文件夹 - + 文件后缀 - + 文件大小kb - + 文件路径 - + 存储后的文件名 - + 标签 - + 备注 - + 是否可见 - + 系统应用表 - + 名称 - + 编码 - + 是否默认激活（Y-是，N-否）,只能有一个系统默认激活 用户登录后默认展示此系统菜单 - + 状态（字典 0正常 1停用 2删除） - + 排序 - + 代码生成表 - + 作者姓名 - + 是否移除表前缀 - + 生成方式 - + 数据库表名 - + 命名空间 - + 业务名 - + 菜单应用分类（应用编码） - + 菜单编码 - + 代码生成字段配置表 - + 代码生成主表ID - + 数据库字段名 - + 字段描述 - + .NET数据类型 - + 作用类型（字典） - + 外键实体名称 - + 外键显示字段 - + 外键显示字段.NET类型 - + 字典code - + 列表是否缩进（字典） - + 是否必填（字典） - + 是否是查询条件 - + 查询方式 - + 列表显示 - + 增改 - + 主键 - + 数据库中类型（物理类型） - + 是否通用字段 - + 参数配置表 - + 名称 - + 编码 - + 属性值 - + 是否是系统参数（Y-是，N-否） - + 备注 - + 状态（字典 0正常 1停用 2删除） - + 常量所属分类的编码，来自于“常量的分类”字典 - + 字典值表 - + 字典类型Id - + 值 - + 编码 - + 排序 - + 备注 - + 状态（字典 0正常 1停用 2删除） - + 字典类型表 - + 名称 - + 编码 - + 排序 - + 备注 - + 状态（字典 0正常 1停用 2删除） - + 员工表 - + 工号 - + 机构Id - + 机构名称 - + 员工附属机构职位表 - + 员工Id - + 机构Id - + 职位Id - + 员工职位表 - + 员工Id - + 职位Id - + 文件信息表 - + 文件存储位置（1:阿里云，2:腾讯云，3:minio，4:本地） - + 文件仓库 - + 文件名称（上传时候的文件名） - + 文件后缀 - + 文件大小kb - + 文件大小信息，计算后的 - + 存储到bucket的名称（文件唯一标识id） - + 存储路径 - + 系统操作/审计日志表 - + 表名 - + 列名 - + 新值 - + 旧值 - + 操作时间 - + 操作人Id - + 操作人名称 - + 操作方式：新增、更新、删除 - + 异常日志 - + 操作人 - + 名称 - + 类名 - + 方法名 - + 异常名称 - + 异常信息 - + 异常源 - + 堆栈信息 - + 参数对象 - + 异常时间 - + 操作日志表 - + 名称 - + 是否执行成功（Y-是，N-否） - + 具体消息 - + IP - + 地址 - + 浏览器 - + 操作系统 - + 请求地址 - + 类名称 - + 方法名称 - + 请求方式（GET POST PUT DELETE) - + 请求参数 - + 返回结果 - + 耗时（毫秒） - + 操作时间 - + 操作人 - + 访问日志表 - + 名称 - + 是否执行成功（Y-是，N-否） - + 具体消息 - + IP - + 地址 - + 浏览器 - + 操作系统 - + 访问类型 - + 访问时间 - + 访问人 - + 菜单表 - + 父Id - + 父Ids - + 名称 - + 编码 - + 菜单类型（字典 0目录 1菜单 2按钮） - + 图标 - + 路由地址 - + 组件地址 - + 权限标识 - + 应用分类（应用编码） - + 打开方式（字典 0无 1组件 2内链 3外链） - + 是否可见（Y-是，N-否） - + 内链地址 - + 重定向地址 - + 权重（字典 1系统权重 2业务权重） - + 排序 - + 备注 - + 状态（字典 0正常 1停用 2删除） - + 通知公告表 - + 标题 - + 内容 - + 类型（字典 1通知 2公告） - + 发布人Id - + 发布人姓名 - + 发布机构Id - + 发布机构名称 - + 发布时间 - + 撤回时间 - + 状态（字典 0草稿 1发布 2撤回 3删除） - + 通知公告用户表 - + 通知公告Id - + 用户Id - + 阅读时间 - + 状态（字典 0未读 1已读） - + Oauth登录用户表 - + 第三方平台的用户唯一Id - + 用户授权的token - + 昵称 - + 头像 - + 性别 - + 电话 - + 邮箱 - + 位置 - + 用户网址 - + 所在公司 - + 用户来源 - + 用户备注（各平台中的用户个人介绍） - + 在线用户表 - + 连接Id - + 用户Id - + 账号 - + 姓名 - + 最后连接时间 - + 最后登录IP - + 租户id - + 组织机构表 - + 父Id - + 父Ids - + 名称 - + 编码 - + 联系人 - + 电话 - + 排序 - + 备注 - + 状态（字典 0正常 1停用 2删除） - + 职位表 - + 名称 - + 编码 - + 排序 - + 备注 - + 状态（字典 0正常 1停用 2删除） - + 角色表 - + 名称 - + 编码 - + 排序 - + 数据范围类型（字典 1全部数据 2本部门及以下数据 3本部门数据 4仅本人数据 5自定义数据） - + 备注 - + 状态（字典 0正常 1停用 2删除） - + 管理员类型-超级管理员_1、非管理员_2 - + 角色数据范围表 - + 角色Id - + 机构Id - + 角色菜单表 - + 角色Id - + 菜单Id - + 租户表 - + 公司名称 - + 管理员名称 - + 主机 - + 电子邮箱 - + 电话 - + 数据库连接 - + 架构 - + 备注 - + 租户类型 - + 定时任务 - + 任务名称 - magic + GDZZ - + 只执行一次 - + 立即执行（默认等待启动） - + 执行类型(并行、列队) - + 执行间隔时间（单位秒） 5 - + Cron表达式 - + 定时器类型 - + 请求url - + 请求参数（Post，Put请求用） - + Headers(可以包含如：Authorization授权认证) 格式：{"Authorization":"userpassword.."} - + 请求类型 2 - + 备注 - + 用户表 - + 账号 - + 密码（默认MD5加密） - + 昵称 - + 姓名 - + 头像 - + 生日 - + 性别-男_1、女_2 - + 邮箱 - + 手机 - + 电话 - + 最后登录IP - + 最后登录时间 - + 管理员类型-超级管理员_1、非管理员_2 - + 状态-正常_0、停用_1、删除_2 - + 用户数据范围表 - + 用户Id - + 机构Id - + 用户角色表 - + 用户Id - + 系统角色Id - + 用户表 - + 账号 - + 密码（默认MD5加密） - + 昵称 - + 姓名 - + 头像 - + 生日 - + 性别-男_1、女_2 - + 邮箱 - + 手机 - + 电话 - + 最后登录IP - + 最后登录时间 - + 管理员类型-超级管理员_1、非管理员_2 - + 状态-正常_0、停用_1、删除_2 - + 账号类型 - + 超级管理员 - + 管理员 - + 普通账号 - + 缓存类型 - + 内存缓存 - + Redis缓存 - + 公共状态 - + 正常 - + 停用 - + 删除 - + 数据操作类型 - + 其它 - + 增加 - + 删除 - + 编辑 - + 更新 - + 查询 - + 详情 - + 树 - + 导入 - + 导出 - + 授权 - + 强退 - + 清空 - + 修改状态 - + 全部数据 - + 本部门及以下数据 - + 本部门数据 - + 仅本人数据 - + 自定义数据 - + 文档类型 - + 文件夹 - + 文件 - + 系统错误码 - + 用户名或密码不正确 - + 非法操作！禁止删除自己 - + 记录不存在 - + 账号已存在 - + 旧密码不匹配 - + 测试数据禁止更改admin密码 - + 数据已存在 - + 数据不存在或含有关联引用，禁止删除 - + 禁止为管理员分配角色 - + 重复数据或记录含有不存在数据 - + 禁止为超级管理员角色分配权限 - + 非法数据 - + Id不能为空 - + 所属机构不在自己的数据范围内 - + 禁止删除超级管理员 - + 禁止修改超级管理员状态 - + 没有权限 - + 账号已冻结 - + 父机构不存在 - + 当前机构Id不能与父机构Id相同 - + 已有相同组织机构,编码或名称相同 - + 没有权限操作机构 - + 该机构下有员工禁止删除 - + 附属机构下有员工禁止删除 - + 只能增加下级机构 - + 字典类型不存在 - + 字典类型已存在 - + 字典类型下面有字典值禁止删除 - + 字典值已存在 - + 字典值不存在 - + 字典状态错误 - + 菜单已存在 - + 路由地址为空 - + 打开方式为空 - + 权限标识格式为空 - + 权限标识格式错误 - + 权限不存在 - + 父级菜单不能为当前节点，请重新选择父级菜单 - + 不能移动根节点 - + 已存在同名或同编码应用 - + 默认激活系统只能有一个 - + 该应用下有菜单禁止删除 - + 已存在同名或同编码应用 - + 已存在同名或同编码职位 - + 该职位下有员工禁止删除 - + 通知公告状态错误 - + 通知公告删除失败 - + 通知公告编辑失败 - + 文件不存在 - + 已存在同名或同编码参数配置 - + 禁止删除系统参数 - + 已存在同名任务调度 - + 任务调度不存在 - + 演示环境禁止修改数据 - + 已存在同名或同主机租户 - + 该表代码模板已经生成过 - + 该类型不存在 - + 该字段不存在 - + 该类型不是枚举类型 - + 该实体不存在 - + 父菜单不存在 - + 已存在同名或同编码项目 - + 已存在相同证件号码人员 - + 检测数据不存在 - + 表单不存在 - + 文件扩展枚举 - + 文件存储位置 - + 阿里云 - + 腾讯云 - + minio服务器 - + 本地 - + 用户 - + 组织 - + 性别 - + 男 - + 女 - + 未知 - + HTTP状态码 - + 客户端可能继续其请求 - + 正在更改协议版本或协议 - + 请求成功，且请求的信息包含在响应中 - + 请求导致在响应被发送前创建新资源 - + 请求已被接受做进一步处理 - + 返回的元信息来自缓存副本而不是原始服务器，因此可能不正确 - + 已成功处理请求并且响应已被设定为无内容 - + 客户端应重置（或重新加载）当前资源 - + 响应是包括字节范围的 GET请求所请求的部分响应 - + 请求的信息有多种表示形式，默认操作是将此状态视为重定向 - + 请求的信息已移到 Location头中指定的 URI 处 - + 请求的信息位于 Location 头中指定的 URI 处 - + 将客户端自动重定向到 Location 头中指定的 URI - + 客户端的缓存副本是最新的 - + 请求应使用位于 Location 头中指定的 URI 的代理服务器 - + 服务器未能识别请求 - + 请求的资源要求身份验证 - + 需要付费 - + 服务器拒绝满足请求 - + 请求的资源不在服务器上 - + 请求的资源上不允许请求方法（POST或 GET） - + 客户端已用 Accept 头指示将不接受资源的任何可用表示形式 - + 请求的代理要求身份验证 Proxy-authenticate 头包含如何执行身份验证的详细信息 - + 客户端没有在服务器期望请求的时间内发送请求 - + 由于服务器上的冲突而未能执行请求 - + 请求的资源不再可用 - + 缺少必需的 Content-length - + 为此请求设置的条件失败，且无法执行此请求 条件是用条件请求标头（如 If-Match、If-None-Match 或 If-Unmodified-Since）设置的。 - + 请求太大，服务器无法处理 - + URI 太长 - + 请求是不支持的类型 - + 无法返回从资源请求的数据范围，因为范围的开头在资源的开头之前，或因为范围的结尾在资源的结尾之后 - + 服务器未能符合Expect头中给定的预期值 - + 服务器拒绝处理客户端使用当前协议发送的请求，但是可以接受其使用升级后的协议发送的请求 - + 服务器上发生了一般错误 - + 服务器不支持请求的函数 - + 中间代理服务器从另一代理或原始服务器接收到错误响应 - + 服务器暂时不可用，通常是由于过多加载或维护 - + 中间代理服务器在等待来自另一个代理或原始服务器的响应时已超时 - + 服务器不支持请求的HTTP版本 - + 登陆类型 - + 登陆 - + 登出 - + 注册 - + 改密 - + 三方授权登陆 - + 系统菜单类型 - + 无 - + 组件 - + 内链 - + 外链 - + 系统菜单类型 - + 目录 - + 菜单 - + 按钮 - + 菜单权重 - + 系统权重 - + 业务权重 - + 通知公告状态 - + 草稿 - + 发布 - + 撤回 - + 删除 - + 通知 - + 公告 - + 通知公告用户状态 - + 未读 - + 已读 - + 查询类型的枚举 - + 等于 - + 模糊 - + 大于 - + 小于 - + 不等于 - + 大于等于 - + 小于等于 - + 不为空 - + http请求类型 - + 执行内部方法 - + GET请求 - + POST请求 - + PUT请求 - + DELETE请求 - + 账号类型 - + 租户管理员角色 - + 租户普通角色 - + 菜单激活类型 - + 是 - + 否 - + B格 - + 数据过滤,默认用户集合 @@ -3087,26 +3087,26 @@ 需要过滤的用户id字段,默认CreatedUserId和OrgId - + 检查数据权限,默认用户集合 检测的id 默认用户集合 - + 获取当前数据权限,默认用户集合 默认用户集合 - + 字典扩展 - + 将一个字典转化为 QueryString @@ -3114,39 +3114,39 @@ - + 将一个字符串 URL 编码 - + 移除空值项 - + 枚举扩展 - + 获取枚举对象Key与名称的字典（缓存） - + 获取枚举对象Key与名称的字典 - + 获取枚举类型key与描述的字典（缓存） @@ -3154,7 +3154,7 @@ - + 获取枚举类型key与描述的字典（没有描述则获取name） @@ -3162,7 +3162,7 @@ - + 从程序集中查找指定枚举类型 @@ -3170,84 +3170,84 @@ - + 从程序集中加载所有枚举类型 - + 通用输入扩展参数（带权限） - + 授权菜单 - + 授权角色 - + 授权数据 - + 通用分页输入参数 - + 搜索值 - + 当前页码 - + 页码容量 - + 搜索开始时间 - + 搜索结束时间 - + 排序字段 - + 排序方法,默认升序,否则降序(配合antd前端,约定参数为 Ascend,Dscend) - + 降序排序(不要问我为什么是descend不是desc，前端约定参数就是这样) - + 分页拓展类 - + 分页拓展 @@ -3256,12 +3256,12 @@ - + 通用输入帮助类 - + 排序方式(默认降序) @@ -3269,96 +3269,96 @@ 是否降序 - + 小诺分页列表结果 - + 替换sqlsugar分页 - + 规范化RESTful风格返回值 - + RESTful风格---XIAONUO返回格式 - + 执行成功 - + 状态码 - + 错误信息 - + 数据 - + 附加数据 - + 时间戳 - + 全局异常处理 - + 请求日志拦截 - + SqlSugar 工作单元拦截器 - + 过滤器排序 - + 排序属性 - + SqlSugar 对象 - + 构造函数 - + @@ -3366,72 +3366,72 @@ - + 聊天集线器 - + 连接 - + 断开 - + 日志定时任务类 - + 定期删除异常日志 - + 定期删除操作日志 - + 定期删除访问日志 - + 后台批量写错误日志 - + 后台批量写操作日志 - + 后台批量写访问日志 - + 写日志 @@ -3441,157 +3441,157 @@ - + 根据条件删除日志 - + Long 类型Json返回处理 - + Reads and converts the JSON to type . The reader. The type to convert. An object that specifies serialization options to use. The converted value. - + Writes a specified value as JSON. The writer to write to. The value to convert to JSON. An object that specifies serialization options to use. - + 日志写入文件的组件 - + 日志写入文件扩展 - + 添加workerservice项目控制台日志格式化扩展 - + 添加api项目控制台日志格式化扩展 - + 用户管理 - + 用户id - + 账号 - + 昵称 - + 是否超级管理员 - + 是否租户管理员 - + AccessToken参数 - + 用户标识 - + Token 类型 - + AccessToken - + 用于刷新 AccessToken 的 Token - + 此 AccessToken 对应的权限 - + AccessToken 过期时间 - + 错误的详细描述 - + 获取的Token是否包含错误 - + 微信用户参数 - + 用户特权信息，json 数组，如微信沃卡用户为（chinaunicom） - + 获取的用户是否包含错误 - + 发起授权 - + 获取微信Token @@ -3599,7 +3599,7 @@ - + 获取微信用户基本信息 @@ -3607,168 +3607,168 @@ - + 刷新微信Token - + 系统应用参数 - + 名称 - + 编码 - + 是否默认激活（Y-是，N-否）,只能有一个系统默认激活 用户登录后默认展示此系统菜单 - + 状态（字典 0正常 1停用 2删除） - + 排序 - + 名称 - + 编码 - + 应用Id - + 应用Id - + 系统应用参数 - + 应用Id - + 名称 - + 编码 - + 是否默认 - + 排序 - + 系统应用服务 - + 获取用户应用相关信息 - + 分页查询系统应用 - + 增加系统应用 - + 删除系统应用 - + 更新系统应用 - + 获取系统应用 - + 获取系统应用列表 - + 设为默认应用 - + 修改用户状态 - + 登录授权相关服务 - + 用户登录 @@ -3776,7 +3776,7 @@ 默认用户名/密码：admin/admin - + 模拟租户登录 @@ -3784,218 +3784,218 @@ 默认用户名/密码：admin/admin - + 获取当前登录用户信息 - + 退出 - + 获取验证码开关 - + 获取验证码（默认点选模式） - + 校验验证码 - + 登录输入参数 - + 租户id superAdmin - + 用户名 superAdmin - + 密码 123456 - + 用户登录输出参数 - + 主键 - + 账号 - + 昵称 - + 姓名 - + 头像 - + 生日 - + 性别(字典 1男 2女) - + 邮箱 - + 手机 - + 电话 - + 管理员类型（0超级管理员 1非管理员） - + 最后登陆IP - + 最后登陆时间 - + 最后登陆地址 - + 最后登陆所用浏览器 - + 最后登陆所用系统 - + 员工信息 - + 具备应用信息 - + 角色信息 - + 权限信息 - + 登录菜单信息---AntDesign版本菜单 - + 数据范围（机构）信息 - + 注册输入参数 - + 用户名 superAdmin - + 公司名 superAdmin - + 密码 123456 - + 系统缓存服务 - + 获取数据范围缓存（机构Id集合） - + 获取数据范围缓存（用户Id集合） - + 缓存数据范围（机构Id集合） @@ -4003,7 +4003,7 @@ - + 缓存数据范围（用户Id集合） @@ -4011,7 +4011,7 @@ - + 获取菜单缓存 @@ -4019,7 +4019,7 @@ - + 缓存菜单 @@ -4028,14 +4028,14 @@ - + 获取权限缓存（按钮） - + 缓存权限 @@ -4043,47 +4043,47 @@ - + 获取所有缓存关键字 - + 获取所有按钮权限 - + 设置所有按钮权限 - + 删除指定关键字缓存 - + 删除指定关键字缓存 - + 删除某特征关键字缓存 - + 设置缓存 @@ -4091,7 +4091,7 @@ - + 设置缓存 @@ -4099,21 +4099,21 @@ - + 获取缓存 - + 获取缓存 - + 获取缓存 @@ -4121,7 +4121,7 @@ - + 获取缓存 @@ -4129,646 +4129,646 @@ - + 检查给定 key 是否存在 键 - + 检查给定 key 是否存在 键 - + 代码生成详细配置服务 - + 代码生成详细配置列表 - + 增加 - + 删除 - + 更新 - + 详情 - + 批量增加 - + 代码生成器服务 - + 分页查询 - + 增加 - + 删除 - + 更新 - + 详情 - + 获取数据库表(实体)集合 - + 根据表名获取列 - + 获取数据表列（实体属性）集合 - + 代码生成_本地项目 - + 获取模板文件路径集合 - + 设置生成文件路径 - + 代码生成详细配置参数 - + 主键Id - + 代码生成主表ID - + 数据库字段名 - + 数据库字段名(首字母小写) - + 字段描述 - + .NET类型 - + 作用类型（字典） - + 外键实体名称 - + 外键实体名称(首字母小写) - + 外键显示字段 - + 外键显示字段(首字母小写) - + 外键显示字段.NET类型 - + 字典code - + 列表是否缩进（字典） - + 是否必填（字典） - + 是否是查询条件 - + 查询方式 - + 列表显示 - + 增改 - + 主外键 - + 数据库中类型（物理类型） - + 是否是通用字段 - + 代码生成参数类 - + 作者姓名 - + 类名 - + 是否移除表前缀 - + 生成方式 - + 数据库表名 - + 命名空间 - + 业务名（业务代码包名称） - + 功能名（数据库表名称） - + 菜单应用分类（应用编码） - + 菜单父级 - + 数据库表名 - + 业务名（业务代码包名称） - + 命名空间 - + 作者姓名 - + 生成方式 - + 菜单应用分类（应用编码） - + 菜单父级 - + 代码生成器Id - + 代码生成器Id - + 代码生成参数类 - + 代码生成器Id - + 作者姓名 - + 类名 - + 是否移除表前缀 - + 生成方式 - + 数据库表名 - + 包名 - + 业务名（业务代码包名称） - + 功能名（数据库表名称） - + 菜单应用分类（应用编码） - + 菜单父级 - + 数据库表列 - + 字段名 - + 数据库中类型 - + .NET字段类型 - + 字段描述 - + 主外键 - + 数据库表列表参数 - + 表名（字母形式的） - + 实体名称 - + 创建时间 - + 更新时间 - + 表名称描述（注释）（功能名） - + 作者姓名 - + 是否移除表前缀 - + 生成方式 - + 数据库表名 - + 数据库表名（经过组装的） - + 代码包名 - + 生成时间（string类型的） - + 数据库表中字段集合 - + 业务名 - + 获取库表信息 - + 参数配置 - + 名称 - + 编码 - + 属性值 - + 是否是系统参数（Y-是，N-否） - + 备注 - + 状态（字典 0正常 1停用 2删除） - + 常量所属分类的编码，来自于“常量的分类”字典 - + 名称 - + 编码 - + 应用Id - + 应用Id - + 系统参数配置服务 - + 分页获取系统参数配置 - + 获取系统参数配置列表 - + 增加系统参数配置 - + 删除系统参数配置 - + 更新系统参数配置 - + 获取系统参数配置 - + 获取配置信息 - + 更新配置缓存 @@ -4776,508 +4776,508 @@ - + 获取演示环境开关是否开启，默认为false - + 获取验证码开关标识 - + 获取默认密码 - + 数据库管理 - + 添加列 - + 删除列 - + 编辑列 - + 获取表字段 - + 获取所有表 - + 新增表 - + 删除表 - + 编辑表 - + 生成实体 - + 获取模板文件路径集合 - + 设置生成文件路径 - + student - + Student - + AutoIncrementEntity - + - Magic.Application + GDZZ.Application - + 字典值参数 - + 字典类型Id - + 值 - + 编码 - + 排序 - + 备注 - + 状态（字典 0正常 1停用 2删除） - + 字典类型Id - + 字典类型Id - + 值 - + 编码 - + 字典值Id - + 字典值Id - + 字典值参数 - + 字典Id - + 字典类型与字典值构造的树 - + Id - + 父Id - + 编码-对应字典值的编码 - + 名称-对应字典值的value - + 子节点集合 - + 字典类型参数 - + 名称 - + 编码 - + 排序 - + 备注 - + 状态（字典 0正常 1停用 2删除） - + 名称 - + 编码 - + 编号Id - + Id - + 编码 - + 字典值服务 - + 分页查询字典值 - + 获取某个字典类型下字典值列表 - + 增加字典值 - + 删除字典值 - + 更新字典值 - + 字典值详情 - + 修改字典值状态 - + 根据字典类型Id获取字典值集合 - + 删除字典下所有值 - + 根据字典Code返回字典值列表 - + 字典类型服务 - + 分页查询字典类型 - + 获取字典类型列表 - + 获取字典类型下所有字典值 - + 添加字典类型 - + 删除字典类型 - + 更新字典类型 - + 字典类型详情 - + 更新字典类型状态 - + 字典类型与字典值构造的字典树 - + 文档服务 - + 分页查询文档 - + 文件夹树 - + 上传文件 - + 上传文件夹 - + 新建文件夹 - + 删除文档 - + 批量删除 - + 移动文档 - + 更新文件夹 - + 获取文档 - + 下载文件 - + 预览文件 - + 创建Pids格式 如果pid是0顶级节点，pids就是 [0]; @@ -5286,14 +5286,14 @@ - + 获取文件大小 - + 上传文件 @@ -5301,468 +5301,468 @@ - + 获取父级 - + 文档输出参数 - + Id - + 父Id - + 名称 - + 文档类型:文件、文件夹 - + 文件后缀 - + 文件大小kb - + 标签 - + 备注 - + 文档输入参数 - + 父Id - + 父ID列表 - + 名称 - + 文档类型:文件、文件夹 - + 文件后缀 - + 文件大小kb - + 存储后的文件名 - + 标签 - + 备注 - + 创建开始时间 - + 创建结束时间 - + 修改结束时间 - + 修改结束时间 - + 文件类型 - + 是否删除 - + 上传文件输入参数 - + Id - + 批量删除入参 - + Id列表 - + 移动入参 - + Id列表 - + 父Id - + Id - + 文档输出参数 - + Id - + 父Id - + 名称 - + 文档类型:文件、文件夹 - + 文件类型 - + 文件后缀 - + 文件大小kb - + 文件大小kb - + 标签 - + 标签数组 - + 备注 - + 创建时间 - + 更新时间 - + 创建用户ID - + 创建人用户名 - + 修改人ID - + 修改人用户名 - + 树查询输出 - + Id - + 父Id - + 名称 - + 附属机构和职位参数 - + 员工Id - + 附属机构id - + 附属机构编码 - + 附属机构名称 - + 附属职位id - + 附属职位编码 - + 附属职位名称 - + 员工信息参数 - + 员工Id - + 工号 - + 机构id - + 机构名称 - + 机构与职位信息 - + 职位信息 - + 员工信息参数2 - + 员工Id - + 工号 - + 机构Id - + 机构名称 - + 附属机构 - + 职位集合 - + 员工职位参数 - + 员工Id - + 职位Id - + 职位编码 - + 职位名称 - + 员工附属机构和职位服务 - + 保存或编辑附属机构相关信息 - + 获取附属机构和职位信息 - + 根据机构Id判断该附属机构下是否有员工 - + 根据职位Id判断该附属职位下是否有员工 - + 根据员工Id删除对应的员工-附属信息 - + 员工职位服务 - + 增加或编辑员工职位相关信息 @@ -5770,52 +5770,52 @@ 职位id集合 - + 获取所属职位信息 员工Id（用户Id） - + 根据职位Id判断该职位下是否有员工 - + 根据员工Id删除对用的员工-职位信息 - + 员工服务 - + 获取用户员工相关信息（包括登录） - + 获取用户员工相关信息 - + 增加或编辑员工相关信息 - + 修改员工相关机构信息 @@ -5823,238 +5823,238 @@ - + 根据机构Id判断该机构下是否有员工 - + 根据员工Id删除对应的员工表信息 - + 获取员工机构Id - + 获取子机构用户 - + 枚举输入参数 - + 枚举类型名称 Gender - + 实体名称 - + 字段名称 - + 枚举输出参数 - + 字典Id - + 字典值 - + 枚举值服务 - + 获取所有枚举值 - + 通过枚举类型获取枚举值集合 - + 通过实体字段类型获取相关集合（目前仅支持枚举类型） - + 上传文件参数 - + 文件存储位置（1:阿里云，2:腾讯云，3:minio，4:本地） - + 文件仓库 - + 文件名称（上传时候的文件名） - + 文件后缀 - + 文件大小kb - + 文件大小信息，计算后的 - + 存储到bucket的名称（文件唯一标识id） - + 存储路径 - + 文件Id - + 上传文件参数 - + 文件Id - + 文件服务 - + 分页获取文件列表 - + 获取文件列表 - + 删除文件 - + 获取文件详情 - + 预览文件 - + 上传文件 - + 下载文件 - + 上传头像 - + 上传文档 - + 上传富文本图片 - + 上传商店图片 - + 上传文件 @@ -6062,7 +6062,7 @@ - + 上传文件 @@ -6071,549 +6071,549 @@ 文件存储位置 - + 异常日志参数 - + 操作人 - + 名称 - + 类名 - + 方法名 - + 异常名称 - + 异常信息 - + 异常时间 - + 异常日志参数 - + 请求日志参数 - + 名称 - + 是否执行成功（Y-是，N-否） - + 具体消息 - + ip - + 地址 - + 浏览器 - + 操作系统 - + 请求地址 - + 类名称 - + 方法名称 - + 请求方式（GET POST PUT DELETE) - + 请求参数 - + 返回结果 - + 耗时（毫秒） - + 操作时间 - + 操作人 - + 请求日志参数 - + 访问日志参数 - + 名称 - + 是否执行成功（Y-是，N-否） - + 具体消息 - + IP - + 地址 - + 浏览器 - + 操作系统 - + 访问类型 - + 访问时间 - + 访问人 - + 访问日志参数 - + 异常日志服务 - + 分页查询异常日志 - + 清空异常日志 - + 操作日志服务 - + 分页查询操作日志 - + 清空操作日志 - + 访问日志服务 - + 分页查询访问日志 - + 清空访问日志 - + 登录菜单-AntDesign菜单类型 - + 所属应用 - + id - + 父id - + 路由名称, 必须设置,且不能重名 - + 组件 - + 重定向地址, 访问这个路由时, 自定进行重定向 - + 路由元信息（路由附带扩展信息） - + 路径 - + 控制路由和子路由是否显示在 sidebar - + 路由元信息内部类 - + 路由标题, 用于显示面包屑, 页面标题 *推荐设置 - + 图标 - + 是否可见 - + 如需外部打开，增加：_blank - + 内链打开http链接 - + 菜单参数 - + 父Id - + 名称 - + 编码 - + 菜单类型（字典 0目录 1菜单 2按钮） - + 图标 - + 路由地址 - + 组件地址 - + 权限标识 - + 应用分类（应用编码） - + 打开方式（字典 0无 1组件 2内链 3外链） - + 是否可见（Y-是，N-否） - + 内链地址 - + 重定向地址 - + 权重（字典 1系统权重 2业务权重） - + 排序 - + 备注 - + 菜单类型（字典 0目录 1菜单 2按钮） - + 菜单Id - + 菜单Id - + 父Id DeleteMenuInput - + 应用编码 DeleteMenuInput - + 菜单树（列表形式） - + 菜单Id - + 子节点 - + 应用名称 - + 应用编码 - + 菜单树---授权、新增编辑时选择 - + 主键 - + 父Id - + 名称 - + 值 - + 排序，越小优先级越高 - + 子节点 - + 应用名称 - + 应用编码 - + 引用排序 - + 应用编码 - + 菜单Id集合 - + 系统菜单服务 - + 获取用户权限(按钮权限标识集合) - + 获取所有权限集合 - + 获取用户AntDesign菜单集合 @@ -6621,21 +6621,21 @@ - + 获取用户菜单所属的应用编码集合 - + 系统菜单列表（树表） - + 创建Pids格式 如果pid是0顶级节点，pids就是 [0]; @@ -6644,344 +6644,344 @@ - + 增加和编辑时检查参数 - + 增加系统菜单 - + 删除系统菜单 - + 更新系统菜单 - + 获取系统菜单 - + 获取系统菜单树，用于新增、编辑时选择上级节点 - + 获取系统菜单树，用于给角色授权时选择 - + 根据应用编码判断该机构下是否有状态为正常的菜单 - + 根据系统应用切换菜单 - + 服务器信息服务 - + 获取服务器资源信息 - + 获取服务器基本参数 - + 动态获取网络信息 - + 通知公告参数 - + 标题 - + 内容 - + 类型（字典 1通知 2公告） - + 发布人Id - + 发布人姓名 - + 发布机构Id - + 发布机构名称 - + 发布时间 - + 撤回时间 - + 状态（字典 0草稿 1发布 2撤回 3删除） - + 系统通知公告详情参数 - + 通知到的用户Id集合 - + 通知到的用户阅读信息集合 - + 用户Id - + 用户名称 - + 状态（字典 0未读 1已读） - + 阅读时间 - + 通知公告参数 - + 标题 - + 内容 - + 类型（字典 1通知 2公告） - + 状态（字典 0草稿 1发布 2撤回 3删除） - + 通知到的人 - + 标题 - + 内容 - + 类型（字典 1通知 2公告） - + 状态（字典 0草稿 1发布 2撤回 3删除） - + 通知到的人 - + Id - + Id - + 状态（字典 0草稿 1发布 2撤回 3删除） - + 通知公告接收参数 - + Id - + 阅读状态（字典 0未读 1已读） - + 阅读时间 - + 通知公告服务 - + 分页查询通知公告 - + 增加通知公告 - + 删除通知公告 - + 更新通知公告 - + 获取通知公告详情 - + 修改通知公告状态 - + 获取接收的通知公告 - + 未处理消息 - + 更新发布信息 - + 通知公告用户 - + 增加 @@ -6990,7 +6990,7 @@ - + 更新 @@ -6999,14 +6999,14 @@ - + 获取通知公告用户列表 - + 设置通知公告读取状态 @@ -7015,17 +7015,17 @@ - + OAuth服务 - + 微信登录授权 - + 微信登录授权回调 @@ -7034,7 +7034,7 @@ - + 获取微信用户基本信息 @@ -7042,207 +7042,207 @@ - + 在线用户服务 - + 获取在线用户信息 - + 组织机构参数 - + 父Id - + 父Ids - + 名称 - + 编码 - + 电话 - + 排序 - + 备注 - + 状态（字典 0正常 1停用 2删除） - + 名称 - + 编码 - + 机构Id - + 机构Id - + 组织机构参数 - + 机构Id - + 组织机构树 - + Id - + 父Id - + 名称 - + 值 - + 排序，越小优先级越高 - + 子节点 - + 上一级Id - + 组织机构服务 - + 分页查询组织机构 - + (非管理员)获取当前用户数据范围（机构Id） - + 获取组织机构列表 - + 增加组织机构 - + 填充父Ids字段 - + 删除组织机构 - + 更新组织机构 - + 获取组织机构信息 - + 根据节点Id获取所有子节点Id集合，包含自己 - + 获取组织机构树 - + 根据数据范围类型获取当前用户的数据范围（机构Id）集合 @@ -7250,260 +7250,260 @@ - + 获取所有的机构组织Id集合 - + 职位参数 - + 名称 - + 编码 - + 排序 - + 备注 - + 状态（字典 0正常 1停用 2删除） - + 当前页码 - + 页码容量 - + 名称 - + 编码 - + 职位Id - + 职位Id - + 职位服务 - + 分页获取职位 - + 获取职位列表 - + 增加职位 - + 删除职位 - + 更新职位 - + 获取职位 - + 角色参数 - + 名称 - + 编码 - + 排序 - + 数据范围类型（字典 1全部数据 2本部门及以下数据 3本部门数据 4仅本人数据 5自定义数据） - + 备注 - + 名称 - + 编码 - + 角色Id - + 角色Id - + 角色Id - + 登录用户角色参数 - + Id - + 编码 - + 名称 - + 角色数据范围服务 - + 授权角色数据范围 - + 根据角色Id集合获取角色数据范围集合 - + 根据机构Id集合删除对应的角色-数据范围关联信息 - + 根据角色Id删除对应的角色-数据范围关联信息 - + 角色菜单 - + 获取角色的菜单Id集合 - + 授权角色菜单 - + 根据菜单Id集合删除对应的角色-菜单表信息 - + 根据角色Id删除对应的角色-菜单表关联信息 - + 清理租户下角色的权限 @@ -7511,81 +7511,81 @@ 租户管理员的角色id - + 角色服务 - + 获取用户角色相关信息（登录） - + 分页获取角色列表 - + 获取角色列表 - + 角色下拉（用于授权角色时选择） - + 增加角色 - + 删除角色 - + 更新角色 - + 获取角色 - + 授权角色菜单 - + 授权角色数据范围 - + 根据角色Id集合获取数据范围Id集合 @@ -7593,643 +7593,643 @@ - + 根据角色Id获取角色名称 - + 获取角色拥有菜单Id集合 - + 获取角色拥有数据Id集合 - + 租户参数 - + 公司名称 - + 管理员名称 - + 主机 - + 电子邮箱 - + 电话号码 - + 模式 - + 数据库连接 - + 备注 - + 创建时间 - + 公司名称 - + 管理员名称 - + 主机名称 - + 数据库连接 - + 电子邮箱 - + 租户Id - + 租户Id - + 租户参数 - + 租户Id - + 名称 - + 名称 - + 主机 - + 电子邮箱 - + 电话号码 - + 模式 - + 数据库连接 - + 备注 - + 创建时间 - + 租户服务 - + 分页查询租户 - + 增加租户 - + 新增租户时，初始化数据 - + 删除租户 - + 更新租户 - + 获取租户 - + 授权租户管理员角色菜单 - + 获取租户管理员角色拥有菜单Id集合 - + 重置租户管理员密码 - + 获取租户管理员用户 - + 任务调度参数 - + 任务名称 - + 只执行一次 - + 立即执行（默认等待启动） - + 执行类型(并行、列队) - + 执行间隔时间（单位秒） 5 - + Cron表达式 - + 定时器类型 - + 请求url - + 请求参数（Post，Put请求用） - + Headers(可以包含如：Authorization授权认证) 格式：{"Authorization":"userpassword.."} - + 请求类型 - + 备注 - + 任务Id - + 任务信息---任务详情 - + Id - + 已执行次数 - + 定时器状态 - + 异常信息 - + 本地任务信息 - + 任务名称 - + 只执行一次 - + 立即执行（默认等待启动） - + 执行类型(并行、列队) - + 执行间隔时间（单位秒） - + Cron表达式 - + 定时器类型 - + 请求url - + 请求类型 2 - + 备注 - + 任务方法信息 - + 方法名 - + 方法所属类的Type对象 - + 任务调度服务 - + 分页获取任务列表 - + 获取所有本地任务 - + 增加任务 - + 删除任务 - + 修改任务 - + 查看任务 - + 停止任务 - + 启动任务 - + 新增定时任务 - + 启动自启动任务 - + 获取所有本地任务 - + 回收站输出参数 - + Id - + 父Id - + 父ID列表 - + 名称 - + 类型 - + 文件后缀 - + 文件大小kb - + 存储后的文件名 - + 标签 - + 备注 - + 回收站输出参数 - + Id - + 父Id - + 父ID列表 - + 名称 - + 类型 - + 文件后缀 - + 文件大小kb - + 存储后的文件名 - + 标签 - + 备注 - + 回收站服务 - + 分页查询回收站 - + 恢复一个 - + 恢复多个 - + 永久删除 - + 批量删除 - + 清空 - + 重命名 @@ -8237,264 +8237,264 @@ - + AuthToken参数 - + OAuth用户参数 - + 用户参数 - + 账号 - + 密码 - + 昵称 - + 姓名 - + 头像 - + 生日 - + 性别-男_1、女_2 - + 邮箱 - + 手机 - + 电话 - + 状态-正常_0、停用_1、删除_2 - + 员工信息 - + 搜索状态（字典 0正常 1停用 2删除） - + 账号 - + 密码 - + 确认密码 - + 用户Id - + 用户Id - + 用户Id - + 密码 - + 新密码 - + 确认密码 - + 用户Id - + 头像文件路径标识 - + 用户参数 - + Id - + 账号 - + 昵称 - + 姓名 - + 头像 - + 生日 - + 性别-男_1、女_2 - + 邮箱 - + 手机 - + 电话 - + 状态-正常_0、停用_1、删除_2 - + 员工信息 - + 所属租户 - + 用户数据范围服务 - + 授权用户数据 - + 获取用户的数据范围Id集合 - + 根据机构Id集合删除对应的用户-数据范围关联信息 - + 根据用户Id删除对应的用户-数据范围关联信息 - + 用户角色服务 - + 获取用户的角色Id集合 - + 授权用户角色 - + 获取用户所有角色的数据范围（组织机构Id集合） @@ -8502,152 +8502,152 @@ - + 根据角色Id删除对应的用户-角色表关联信息 - + 根据用户Id删除对应的用户-角色表关联信息 - + 用户服务 - + 分页查询用户 - + 增加用户 - + 删除用户 - + 更新用户 - + 查看用户 - + 修改用户状态 - + 授权用户角色 - + 授权用户数据范围 - + 更新用户信息 - + 修改用户密码 - + 获取用户拥有角色 - + 获取用户拥有数据 - + 重置用户密码 - + 修改用户头像 - + 获取用户选择器 - + 用户导出 - + 用户导入 - + 根据用户Id获取用户 - + 将OAuth账号转换成账号 @@ -8655,222 +8655,222 @@ - + 获取用户数据范围（机构Id集合）并缓存 - + 检查普通用户数据范围 - + 获取用户数据范围（用户Id集合） - + 检查普通用户数据范围 - + 简单泛型队列 - + 新增 - + 取出 - + 总数 - + 清理 - + 分页泛型集合 - + 页码 - + 页容量 - + 总条数 - + 总页数 - + 当前页集合 - + 是否有上一页 - + 是否有下一页 - + 分页集合 - + SqlSugar 仓储实现类 - + 初始化 SqlSugar 客户端 - + 数据库上下文 - + 独立数据库上下文 - + 构造函数 - + 实体集合 - + 原生 Ado 对象 - + 获取总数 - + 获取总数 - + 检查是否存在 - + 检查是否存在 - + 通过主键获取实体 - + 获取一个实体 - + 获取一个实体 - + 获取一个实体 - + 获取一个实体 - + 获取列表 - + 获取列表 - + 获取列表 @@ -8879,20 +8879,20 @@ - + 获取列表 - + 获取列表 - + 获取列表 @@ -8901,119 +8901,119 @@ - + 新增一条记录 - + 新增多条记录 - + 新增多条记录 - + 新增一条记录返回自增Id - + 新增一条记录返回雪花Id - + 新增一条记录返回实体 - + 新增一条记录 - + 新增多条记录 - + 新增多条记录 - + 新增一条记录返回自增Id - + 新增一条记录返回雪花Id - + 新增一条记录返回实体 - + 更新一条记录 - + 更新多条记录 - + 更新多条记录 - + 更新一条记录 - + 更新记录 @@ -9021,7 +9021,7 @@ 更新的内容 - + 更新记录 @@ -9029,84 +9029,84 @@ 更新的内容 - + 更新多条记录 - + 更新多条记录 - + 删除一条记录 - + 删除一条记录 - + 删除多条记录 - + 自定义条件删除记录 - + 删除一条记录 - + 删除一条记录 - + 删除多条记录 - + 自定义条件删除记录 - + 根据表达式查询多条记录 - + 根据表达式查询多条记录 @@ -9114,83 +9114,83 @@ - + 构建查询分析器 - + 构建查询分析器 - + 直接返回数据库结果 - + 直接返回数据库结果 - + 直接返回数据库结果 - + 直接返回数据库结果 - + 切换仓储(注意使用环境) 实体类型 仓储 - + 当前db - + 当前db - + 当前db - + 所有db - + 所有db - + 所有db - + SqlsugarScope的配置 Scope必须用单例注入 @@ -9198,19 +9198,19 @@ - + 获取当前租户id - + 判断是不是超级管理员 - + 添加 SqlSugar 拓展 @@ -9219,7 +9219,7 @@ - + 添加 SqlSugar 拓展 @@ -9228,58 +9228,58 @@ - + 代码生成帮助类 - + 数据类型转显示类型 - + 枚举的Entity类 - + 枚举的描述 - + 枚举名称 - + 枚举对象的值 - + 枚举工具类 - + 获取枚举对象Key与名称的字典（缓存） - + 获取枚举对象Key与名称的字典 - + 获取枚举类型key与描述的字典（缓存） @@ -9287,7 +9287,7 @@ - + 获取枚举类型key与描述的字典（没有描述则获取name） @@ -9295,7 +9295,7 @@ - + 从程序集中查找指定枚举类型 @@ -9303,35 +9303,35 @@ - + 从程序集中加载所有枚举类型 - + 获取枚举的Description - + 获取枚举的Description - + 将枚举转成枚举信息集合 - + 枚举ToList @@ -9339,7 +9339,7 @@ - + DateTime扩展 @@ -9350,13 +9350,13 @@ 转换扩展类 - + 得到问好 - + 获取指定年月的第一天 @@ -9365,7 +9365,7 @@ - + 获取指定年月的第一天 @@ -9374,7 +9374,7 @@ - + 获取指定年月的最后一天 @@ -9383,7 +9383,7 @@ - + 获取指定年月的最后一天 @@ -9392,63 +9392,63 @@ - + 获取当前月的第一天 - + 获取当前月的最后一天 - + 获取上月的第一天 - + 获取上月的最后一天 - + 获取本周时间 - + 获取上周时间 - + 获取当天时间 - + 获取昨天时间 - + 计算两个时间的差 @@ -9457,35 +9457,35 @@ - + 检查 Object 是否为 NULL - + 检查 Object 是否为 NULL 或者 0 - + 检查是否为 AJAX 请求 - + 将object转换为long，若转换失败，则返回0。不抛出异常。 - + 将object转换为long，若转换失败，则返回指定值。不抛出异常。 @@ -9493,14 +9493,14 @@ - + 将object转换为int，若转换失败，则返回0。不抛出异常。 - + 将object转换为int，若转换失败，则返回指定值。不抛出异常。 null返回默认值 @@ -9509,14 +9509,14 @@ - + 将object转换为short，若转换失败，则返回0。不抛出异常。 - + 将object转换为short，若转换失败，则返回指定值。不抛出异常。 @@ -9524,7 +9524,7 @@ - + 将object转换为demical，若转换失败，则返回指定值。不抛出异常。 @@ -9532,21 +9532,21 @@ - + 将object转换为demical，若转换失败，则返回0。不抛出异常。 - + 将object转换为bool，若转换失败，则返回false。不抛出异常。 - + 将object转换为bool，若转换失败，则返回指定值。不抛出异常。 @@ -9554,14 +9554,14 @@ - + 将object转换为float，若转换失败，则返回0。不抛出异常。 - + 将object转换为float，若转换失败，则返回指定值。不抛出异常。 @@ -9569,21 +9569,21 @@ - + 将string转换为Guid，若转换失败，则返回Guid.Empty。不抛出异常。 - + 将string转换为DateTime，若转换失败，则返回日期最小值。不抛出异常。 - + 将string转换为DateTime，若转换失败，则返回默认值。 @@ -9591,14 +9591,14 @@ - + 将object转换为string，若转换失败，则返回""。不抛出异常。 - + @@ -9606,14 +9606,14 @@ - + 将object转换为double，若转换失败，则返回0。不抛出异常。 - + 将object转换为double，若转换失败，则返回指定值。不抛出异常。 @@ -9621,7 +9621,7 @@ - + 强制转换类型 @@ -9629,253 +9629,253 @@ - + HTTP网络工具 - + 客户端IP地址 - + 得到客户端IP地址 - + 得到局域网IP地址 - + 得到远程Ip地址 - + 请求UserAgent信息 - + 请求Url - + 得到操作系统版本 - + 公网信息 慎用，如果不是直接请求接口，而是通过代理转发，拿到的是服务器的公网信息 - + 根据IP地址获取公网信息 - + UserAgent信息 - + 远程路径Encode处理,会保证开头是/，结尾也是/ - + 标准化远程目录路径,会保证开头是/，结尾也是/ ,如果命名不规范，存在保留字符，会返回空字符 要标准化的远程路径 - + 万网Ip信息Model类 - + Ip地址 - + 省份 - + 省份邮政编码 - + 城市 - + 城市邮政编码 - + 地理信息 - + 运营商 - + UserAgent 信息Model类 - + 手机型号 - + 操作系统（版本） - + 浏览器（版本） - + 天气预报工具类 - + 天气信息 - + 时间 - + 最高温度 - + 风力 - + 最低温度 - + 分向 - + 类型 - + 昨日天气 - + 城市 - + 未来五天天气 - + 感冒 - + 温度 - + 是否成功 - + 失败描述 - + 数据 - + 状态 - + 描述 - + 图片工具类 - + 获取外网Url图片的二进制数组 - + 保存二进制流到文件 - + 保存外网Url到文件 @@ -9883,14 +9883,14 @@ 要保存的文件名称 - + 删除文件夹里面所有的文件 - + 无损压缩图片 @@ -9903,12 +9903,12 @@ 是否为第一次调用 - + Json序列化工具类 - + JSON 字符串转 Object @@ -9916,28 +9916,28 @@ - + JSON 字符串转 Object - + Object 转 JSON字符串 - + JSON 字符串转 JObject - + Dictionary 字符串转 Object @@ -9945,7 +9945,7 @@ - + 把数组转为逗号连接的字符串 @@ -9953,7 +9953,7 @@ - + 判断是否有交集 @@ -9962,79 +9962,79 @@ - + 获取服务器信息 - + 获取资源使用信息 - + 获取基本参数 - + 动态获取网络信息 - + 是否Linux - + 获取CPU使用率 - + 获取系统运行时间 - + 获取内存信息 - + 毫秒转天时分秒 - + 获取外网IP和地理位置 - + 系统Shell命令 - + Bash命令 - + cmd命令 @@ -10042,30 +10042,30 @@ - + - + 当前正在联网的网卡信息 - + 获取当前网卡的网络速度 - + 小程序工具类 - + 解密数据获取小程序用户信息 @@ -10074,7 +10074,7 @@ 加密算法的初始向量 如遇异常返回 "" - + 基础解析 @@ -10083,32 +10083,32 @@ 加密算法的初始向量 - + 小程序登录解密后的用户信息Model - + 手机号 - + 纯手机号 - + 区号 - + 阿里云oss文件上传工具类 - + 上传本地文件(走阿里云内网传输) @@ -10116,14 +10116,14 @@ - + 上传一个图片 图片经过base64加密后的结果 文件名,例如:Emplyoee/dzzBack.jpg - + 上传本地文件 @@ -10132,7 +10132,7 @@ 返回参数说明 1.本地文件不存在 2.文件oss上已存在 3.上传失败 4.上传成功 - + 上传一个图片 @@ -10140,14 +10140,14 @@ 文件名,例如:Emplyoee/dzzBack.jpg - + 获取鉴权后的URL,URL有效日期默认一小时 文件名,例如:Emplyoee/dzzBack.jpg - + 获取鉴权后的URL @@ -10155,46 +10155,46 @@ URL有效日期,例如:DateTime.Now.AddHours(1) - + 将文件转换成byte[] 数组 文件路径文件名称 byte[] - + 删除文件 文件id 文件url - + 删除文件夹 文件id 文件url - + 判断文件是否存在 - + 类型转换 - + 反射工具 - + 获取字段特性 @@ -10202,141 +10202,141 @@ - + 普通 字符串 转换为 base64 字符串 - + base64 字符串 转换为 普通 字符串 - + 字符串验证帮助类 - + 验证输入字符串为带小数点正数 输入字符 返回一个bool类型的值 - + 验证输入字符串为带小数点正负数 输入字符 返回一个bool类型的值 - + 验证中国电话格式是否有效，格式010-85849685 输入字符 返回一个bool类型的值 - + 验证输入字符串为电话号码 输入字符 返回一个bool类型的值 - + 验证是否是有效传真号码 输入字符 返回一个bool类型的值 - + 验证手机号是否合法 号段为13,14,15,16,17,18,19 0，86开头将自动识别 输入字符 返回一个bool类型的值 - + 验证身份证是否有效 输入字符 返回一个bool类型的值 - + 验证输入字符串为18位的身份证号码 输入字符 返回一个bool类型的值 - + 验证输入字符串为15位的身份证号码 输入字符 返回一个bool类型的值 - + 验证是否是有效邮箱地址 输入字符 返回一个bool类型的值 - + 验证是否是有效QQ邮箱地址 输入字符 返回一个bool类型的值 - + 验证是否只含有汉字 输入字符 - + 是否有多余的字符 防止SQL注入 输入字符 - + 是否由数字、26个英文字母或者下划线組成的字串 输入字符 - + 由数字、26个英文字母、汉字組成的字串 输入字符 - + 是否由数字、26个英文字母組成的字串 输入字符 - + 验证输入字符串为邮政编码 输入字符 返回一个bool类型的值 - + 检查对象的输入长度 @@ -10344,7 +10344,7 @@ 指定的长度 false 太长，true -太短 - + 判断用户输入是否为日期 @@ -10355,48 +10355,48 @@ YYYY | YYYY-MM | YYYY-MM-DD | YYYY-MM-DD HH:MM:SS | YYYY-MM-DD HH:MM:SS.FFF - + 树基类 - + 获取节点id - + 获取节点父id - + 设置Children - + 递归工具类，用于遍历有父子关系的节点，例如菜单树，字典树等等 - + 顶级节点的父节点Id(默认0) - + 构造树节点 - + 构造子节点集合 diff --git a/Magic.Core/Manager/UserManager.cs b/GDZZ.Core/Manager/UserManager.cs similarity index 97% rename from Magic.Core/Manager/UserManager.cs rename to GDZZ.Core/Manager/UserManager.cs index 389533a..bf3d844 100644 --- a/Magic.Core/Manager/UserManager.cs +++ b/GDZZ.Core/Manager/UserManager.cs @@ -1,7 +1,7 @@  using Furion; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 用户管理 diff --git a/Magic.Core/OAuth/IWechatOAuth.cs b/GDZZ.Core/OAuth/IWechatOAuth.cs similarity index 93% rename from Magic.Core/OAuth/IWechatOAuth.cs rename to GDZZ.Core/OAuth/IWechatOAuth.cs index 0e0fefa..2f3ef35 100644 --- a/Magic.Core/OAuth/IWechatOAuth.cs +++ b/GDZZ.Core/OAuth/IWechatOAuth.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace Magic.Core; +namespace GDZZ.Core; public interface IWechatOAuth { diff --git a/Magic.Core/OAuth/TokenModel.cs b/GDZZ.Core/OAuth/TokenModel.cs similarity index 98% rename from Magic.Core/OAuth/TokenModel.cs rename to GDZZ.Core/OAuth/TokenModel.cs index 2643219..c273b26 100644 --- a/Magic.Core/OAuth/TokenModel.cs +++ b/GDZZ.Core/OAuth/TokenModel.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace Magic.Core; +namespace GDZZ.Core; /// /// AccessToken参数 diff --git a/Magic.Core/OAuth/UserInfoModel.cs b/GDZZ.Core/OAuth/UserInfoModel.cs similarity index 98% rename from Magic.Core/OAuth/UserInfoModel.cs rename to GDZZ.Core/OAuth/UserInfoModel.cs index 8bd15eb..56ed050 100644 --- a/Magic.Core/OAuth/UserInfoModel.cs +++ b/GDZZ.Core/OAuth/UserInfoModel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 微信用户参数 diff --git a/Magic.Core/OAuth/WechatOAuth.cs b/GDZZ.Core/OAuth/WechatOAuth.cs similarity index 99% rename from Magic.Core/OAuth/WechatOAuth.cs rename to GDZZ.Core/OAuth/WechatOAuth.cs index b3b33c8..3985ce0 100644 --- a/Magic.Core/OAuth/WechatOAuth.cs +++ b/GDZZ.Core/OAuth/WechatOAuth.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.Options; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core; +namespace GDZZ.Core; public class WechatOAuth : IWechatOAuth, ISingleton { diff --git a/Magic.Core/Service/App/Dto/AppInput.cs b/GDZZ.Core/Service/App/Dto/AppInput.cs similarity index 98% rename from Magic.Core/Service/App/Dto/AppInput.cs rename to GDZZ.Core/Service/App/Dto/AppInput.cs index 5033ba6..3c2b985 100644 --- a/Magic.Core/Service/App/Dto/AppInput.cs +++ b/GDZZ.Core/Service/App/Dto/AppInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 系统应用参数 diff --git a/Magic.Core/Service/App/Dto/AppOutput.cs b/GDZZ.Core/Service/App/Dto/AppOutput.cs similarity index 94% rename from Magic.Core/Service/App/Dto/AppOutput.cs rename to GDZZ.Core/Service/App/Dto/AppOutput.cs index d034015..844c643 100644 --- a/Magic.Core/Service/App/Dto/AppOutput.cs +++ b/GDZZ.Core/Service/App/Dto/AppOutput.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 系统应用参数 diff --git a/Magic.Core/Service/App/ISysAppService.cs b/GDZZ.Core/Service/App/ISysAppService.cs similarity index 90% rename from Magic.Core/Service/App/ISysAppService.cs rename to GDZZ.Core/Service/App/ISysAppService.cs index fd71842..7102891 100644 --- a/Magic.Core/Service/App/ISysAppService.cs +++ b/GDZZ.Core/Service/App/ISysAppService.cs @@ -1,8 +1,8 @@ -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysAppService { diff --git a/Magic.Core/Service/App/SysAppService.cs b/GDZZ.Core/Service/App/SysAppService.cs similarity index 99% rename from Magic.Core/Service/App/SysAppService.cs rename to GDZZ.Core/Service/App/SysAppService.cs index 6553b31..aceff76 100644 --- a/Magic.Core/Service/App/SysAppService.cs +++ b/GDZZ.Core/Service/App/SysAppService.cs @@ -3,7 +3,7 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Mapster; using Microsoft.AspNetCore.Mvc; @@ -11,7 +11,7 @@ using SqlSugar; using System; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 系统应用服务 diff --git a/Magic.Core/Service/Auth/AuthService.cs b/GDZZ.Core/Service/Auth/AuthService.cs similarity index 99% rename from Magic.Core/Service/Auth/AuthService.cs rename to GDZZ.Core/Service/Auth/AuthService.cs index a419c5a..f379e12 100644 --- a/Magic.Core/Service/Auth/AuthService.cs +++ b/GDZZ.Core/Service/Auth/AuthService.cs @@ -4,7 +4,7 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.EventBus; using Furion.FriendlyException; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Mapster; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; @@ -16,7 +16,7 @@ using System.Linq; using System.Threading.Tasks; using UAParser; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 登录授权相关服务 diff --git a/Magic.Core/Service/Auth/Dto/LoginInput.cs b/GDZZ.Core/Service/Auth/Dto/LoginInput.cs similarity index 96% rename from Magic.Core/Service/Auth/Dto/LoginInput.cs rename to GDZZ.Core/Service/Auth/Dto/LoginInput.cs index 3fa447f..b2743b9 100644 --- a/Magic.Core/Service/Auth/Dto/LoginInput.cs +++ b/GDZZ.Core/Service/Auth/Dto/LoginInput.cs @@ -1,7 +1,7 @@ using Furion.DependencyInjection; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 登录输入参数 diff --git a/Magic.Core/Service/Auth/Dto/LoginOutput.cs b/GDZZ.Core/Service/Auth/Dto/LoginOutput.cs similarity index 99% rename from Magic.Core/Service/Auth/Dto/LoginOutput.cs rename to GDZZ.Core/Service/Auth/Dto/LoginOutput.cs index c07e2fa..91078a9 100644 --- a/Magic.Core/Service/Auth/Dto/LoginOutput.cs +++ b/GDZZ.Core/Service/Auth/Dto/LoginOutput.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 用户登录输出参数 diff --git a/Magic.Core/Service/Auth/Dto/RegistInput.cs b/GDZZ.Core/Service/Auth/Dto/RegistInput.cs similarity index 97% rename from Magic.Core/Service/Auth/Dto/RegistInput.cs rename to GDZZ.Core/Service/Auth/Dto/RegistInput.cs index a42e1e5..1a56ff0 100644 --- a/Magic.Core/Service/Auth/Dto/RegistInput.cs +++ b/GDZZ.Core/Service/Auth/Dto/RegistInput.cs @@ -1,7 +1,7 @@ using Furion.DependencyInjection; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Service +namespace GDZZ.Core.Service { /// /// 注册输入参数 diff --git a/Magic.Core/Service/Auth/IAuthService.cs b/GDZZ.Core/Service/Auth/IAuthService.cs similarity index 94% rename from Magic.Core/Service/Auth/IAuthService.cs rename to GDZZ.Core/Service/Auth/IAuthService.cs index 9cd86f6..cd5d075 100644 --- a/Magic.Core/Service/Auth/IAuthService.cs +++ b/GDZZ.Core/Service/Auth/IAuthService.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface IAuthService { diff --git a/Magic.Core/Service/Cache/ISysCacheService.cs b/GDZZ.Core/Service/Cache/ISysCacheService.cs similarity index 97% rename from Magic.Core/Service/Cache/ISysCacheService.cs rename to GDZZ.Core/Service/Cache/ISysCacheService.cs index 5d20fa1..dc7b840 100644 --- a/Magic.Core/Service/Cache/ISysCacheService.cs +++ b/GDZZ.Core/Service/Cache/ISysCacheService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysCacheService { diff --git a/Magic.Core/Service/Cache/SysCacheService.cs b/GDZZ.Core/Service/Cache/SysCacheService.cs similarity index 99% rename from Magic.Core/Service/Cache/SysCacheService.cs rename to GDZZ.Core/Service/Cache/SysCacheService.cs index 9dc27f7..551ebf1 100644 --- a/Magic.Core/Service/Cache/SysCacheService.cs +++ b/GDZZ.Core/Service/Cache/SysCacheService.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 系统缓存服务 diff --git a/Magic.Core/Service/CodeGen/CodeGenConfigService.cs b/GDZZ.Core/Service/CodeGen/CodeGenConfigService.cs similarity index 98% rename from Magic.Core/Service/CodeGen/CodeGenConfigService.cs rename to GDZZ.Core/Service/CodeGen/CodeGenConfigService.cs index 5553cab..833accb 100644 --- a/Magic.Core/Service/CodeGen/CodeGenConfigService.cs +++ b/GDZZ.Core/Service/CodeGen/CodeGenConfigService.cs @@ -2,7 +2,7 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Mapster; using Microsoft.AspNetCore.Mvc; @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 代码生成详细配置服务 diff --git a/Magic.Core/Service/CodeGen/CodeGenService.cs b/GDZZ.Core/Service/CodeGen/CodeGenService.cs similarity index 98% rename from Magic.Core/Service/CodeGen/CodeGenService.cs rename to GDZZ.Core/Service/CodeGen/CodeGenService.cs index 9cc4def..fd225ba 100644 --- a/Magic.Core/Service/CodeGen/CodeGenService.cs +++ b/GDZZ.Core/Service/CodeGen/CodeGenService.cs @@ -3,7 +3,7 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; using Furion.ViewEngine; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Mapster; using Microsoft.AspNetCore.Mvc; using SqlSugar; @@ -13,7 +13,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 代码生成器服务 @@ -232,7 +232,7 @@ public class CodeGenService : ICodeGenService, IDynamicApiController, ITransient private async Task AddMenu(string className, string busName, string application, long pid) { // 定义菜单编码前缀 - var codePrefix = "magic_" + className.ToLower(); + var codePrefix = "GDZZ_" + className.ToLower(); // 先删除该表已生成的菜单列表 await _sysMenuRep.DeleteAsync(u => u.Code.StartsWith(codePrefix)); @@ -368,7 +368,7 @@ public class CodeGenService : ICodeGenService, IDynamicApiController, ITransient /// private List GetTargetPathList(SysCodeGen input) { - var backendPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.FullName, "Magic.Application", "Service", input.TableName); + var backendPath = Path.Combine(new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.FullName, "GDZZ.Application", "Service", input.TableName); var servicePath = Path.Combine(backendPath, input.TableName + "Service.cs"); var iservicePath = Path.Combine(backendPath, "I" + input.TableName + "Service.cs"); var inputPath = Path.Combine(backendPath, "Dto", input.TableName + "Input.cs"); diff --git a/Magic.Core/Service/CodeGen/Dto/CodeGenConfig.cs b/GDZZ.Core/Service/CodeGen/Dto/CodeGenConfig.cs similarity index 98% rename from Magic.Core/Service/CodeGen/Dto/CodeGenConfig.cs rename to GDZZ.Core/Service/CodeGen/Dto/CodeGenConfig.cs index a6e63a4..a9302be 100644 --- a/Magic.Core/Service/CodeGen/Dto/CodeGenConfig.cs +++ b/GDZZ.Core/Service/CodeGen/Dto/CodeGenConfig.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 代码生成详细配置参数 diff --git a/Magic.Core/Service/CodeGen/Dto/CodeGenInput.cs b/GDZZ.Core/Service/CodeGen/Dto/CodeGenInput.cs similarity index 99% rename from Magic.Core/Service/CodeGen/Dto/CodeGenInput.cs rename to GDZZ.Core/Service/CodeGen/Dto/CodeGenInput.cs index 5d1af10..7abae7b 100644 --- a/Magic.Core/Service/CodeGen/Dto/CodeGenInput.cs +++ b/GDZZ.Core/Service/CodeGen/Dto/CodeGenInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 代码生成参数类 diff --git a/Magic.Core/Service/CodeGen/Dto/CodeGenOutput.cs b/GDZZ.Core/Service/CodeGen/Dto/CodeGenOutput.cs similarity index 97% rename from Magic.Core/Service/CodeGen/Dto/CodeGenOutput.cs rename to GDZZ.Core/Service/CodeGen/Dto/CodeGenOutput.cs index a67baff..384d446 100644 --- a/Magic.Core/Service/CodeGen/Dto/CodeGenOutput.cs +++ b/GDZZ.Core/Service/CodeGen/Dto/CodeGenOutput.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 代码生成参数类 diff --git a/Magic.Core/Service/CodeGen/Dto/TableColumnOuput.cs b/GDZZ.Core/Service/CodeGen/Dto/TableColumnOuput.cs similarity index 94% rename from Magic.Core/Service/CodeGen/Dto/TableColumnOuput.cs rename to GDZZ.Core/Service/CodeGen/Dto/TableColumnOuput.cs index 91cedb4..2d14c7a 100644 --- a/Magic.Core/Service/CodeGen/Dto/TableColumnOuput.cs +++ b/GDZZ.Core/Service/CodeGen/Dto/TableColumnOuput.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 数据库表列 diff --git a/Magic.Core/Service/CodeGen/Dto/TableOutput.cs b/GDZZ.Core/Service/CodeGen/Dto/TableOutput.cs similarity index 95% rename from Magic.Core/Service/CodeGen/Dto/TableOutput.cs rename to GDZZ.Core/Service/CodeGen/Dto/TableOutput.cs index b55a608..c04284b 100644 --- a/Magic.Core/Service/CodeGen/Dto/TableOutput.cs +++ b/GDZZ.Core/Service/CodeGen/Dto/TableOutput.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 数据库表列表参数 diff --git a/Magic.Core/Service/CodeGen/Dto/XnCodeGenOutput.cs b/GDZZ.Core/Service/CodeGen/Dto/XnCodeGenOutput.cs similarity index 94% rename from Magic.Core/Service/CodeGen/Dto/XnCodeGenOutput.cs rename to GDZZ.Core/Service/CodeGen/Dto/XnCodeGenOutput.cs index b315628..3f68e80 100644 --- a/Magic.Core/Service/CodeGen/Dto/XnCodeGenOutput.cs +++ b/GDZZ.Core/Service/CodeGen/Dto/XnCodeGenOutput.cs @@ -1,7 +1,7 @@ -using Magic.Core.Entity; +using GDZZ.Core.Entity; using System.Collections.Generic; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public class XnCodeGenOutput { diff --git a/Magic.Core/Service/CodeGen/ICodeGenConfigService.cs b/GDZZ.Core/Service/CodeGen/ICodeGenConfigService.cs similarity index 89% rename from Magic.Core/Service/CodeGen/ICodeGenConfigService.cs rename to GDZZ.Core/Service/CodeGen/ICodeGenConfigService.cs index 0b48b77..15c3831 100644 --- a/Magic.Core/Service/CodeGen/ICodeGenConfigService.cs +++ b/GDZZ.Core/Service/CodeGen/ICodeGenConfigService.cs @@ -1,9 +1,9 @@ -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ICodeGenConfigService { diff --git a/Magic.Core/Service/CodeGen/ICodeGenService.cs b/GDZZ.Core/Service/CodeGen/ICodeGenService.cs similarity index 90% rename from Magic.Core/Service/CodeGen/ICodeGenService.cs rename to GDZZ.Core/Service/CodeGen/ICodeGenService.cs index b06bdbe..02bc461 100644 --- a/Magic.Core/Service/CodeGen/ICodeGenService.cs +++ b/GDZZ.Core/Service/CodeGen/ICodeGenService.cs @@ -1,9 +1,9 @@ -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ICodeGenService { diff --git a/Magic.Core/Service/Common/CommonService.cs b/GDZZ.Core/Service/Common/CommonService.cs similarity index 98% rename from Magic.Core/Service/Common/CommonService.cs rename to GDZZ.Core/Service/Common/CommonService.cs index bfec08f..9aa888e 100644 --- a/Magic.Core/Service/Common/CommonService.cs +++ b/GDZZ.Core/Service/Common/CommonService.cs @@ -10,7 +10,7 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public class CommonService : ICommonService, IScoped { diff --git a/Magic.Core/Service/Common/ICommonService.cs b/GDZZ.Core/Service/Common/ICommonService.cs similarity index 88% rename from Magic.Core/Service/Common/ICommonService.cs rename to GDZZ.Core/Service/Common/ICommonService.cs index 3f595fe..f6c62fc 100644 --- a/Magic.Core/Service/Common/ICommonService.cs +++ b/GDZZ.Core/Service/Common/ICommonService.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ICommonService { diff --git a/Magic.Core/Service/Config/Dto/ConfigInput.cs b/GDZZ.Core/Service/Config/Dto/ConfigInput.cs similarity index 98% rename from Magic.Core/Service/Config/Dto/ConfigInput.cs rename to GDZZ.Core/Service/Config/Dto/ConfigInput.cs index c72c57f..56ab5d3 100644 --- a/Magic.Core/Service/Config/Dto/ConfigInput.cs +++ b/GDZZ.Core/Service/Config/Dto/ConfigInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 参数配置 diff --git a/Magic.Core/Service/Config/ISysConfigService.cs b/GDZZ.Core/Service/Config/ISysConfigService.cs similarity index 91% rename from Magic.Core/Service/Config/ISysConfigService.cs rename to GDZZ.Core/Service/Config/ISysConfigService.cs index f8d2dfb..31f54f5 100644 --- a/Magic.Core/Service/Config/ISysConfigService.cs +++ b/GDZZ.Core/Service/Config/ISysConfigService.cs @@ -1,8 +1,8 @@ -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysConfigService { diff --git a/Magic.Core/Service/Config/SysConfigService.cs b/GDZZ.Core/Service/Config/SysConfigService.cs similarity index 99% rename from Magic.Core/Service/Config/SysConfigService.cs rename to GDZZ.Core/Service/Config/SysConfigService.cs index 597797b..6579895 100644 --- a/Magic.Core/Service/Config/SysConfigService.cs +++ b/GDZZ.Core/Service/Config/SysConfigService.cs @@ -3,7 +3,7 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Mapster; using Microsoft.AspNetCore.Mvc; @@ -11,7 +11,7 @@ using SqlSugar; using System.Linq; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 系统参数配置服务 diff --git a/Magic.Core/Service/DataBase/DataBaseManager.cs b/GDZZ.Core/Service/DataBase/DataBaseManager.cs similarity index 97% rename from Magic.Core/Service/DataBase/DataBaseManager.cs rename to GDZZ.Core/Service/DataBase/DataBaseManager.cs index 7085b67..4e2b41c 100644 --- a/Magic.Core/Service/DataBase/DataBaseManager.cs +++ b/GDZZ.Core/Service/DataBase/DataBaseManager.cs @@ -3,7 +3,7 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; using Furion.ViewEngine; -using Magic.Core.Service.DataBase.Extension; +using GDZZ.Core.Service.DataBase.Extension; using Mapster; using Microsoft.AspNetCore.Mvc; using SqlSugar; @@ -13,7 +13,7 @@ using System.IO; using System.Linq; using System.Text; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 数据库管理 @@ -172,14 +172,14 @@ public class DataBaseManager : IDataBaseManager, IDynamicApiController, ITransie [HttpPost("/table/createEntity")] public void CreateEntity(CreateEntityInput input) { - Type baseType = Type.GetType($"Magic.Core.Entity.{input.BaseClassName}"); + Type baseType = Type.GetType($"GDZZ.Core.Entity.{input.BaseClassName}"); if (baseType.IsNullOrZero()) throw Oops.Oh("父类不存在"); var baseTypeProperties = baseType.GetProperties().Select(m => m.Name).ToList(); - input.Position = string.IsNullOrWhiteSpace(input.Position) ? "Magic.Application" : input.Position; + input.Position = string.IsNullOrWhiteSpace(input.Position) ? "GDZZ.Application" : input.Position; input.BaseClassName = string.IsNullOrWhiteSpace(input.BaseClassName) ? "" : $" : {input.BaseClassName}"; var templatePath = GetTemplatePath(); var targetPath = GetTargetPath(input); diff --git a/Magic.Core/Service/DataBase/Dto/CreateEntityInput.cs b/GDZZ.Core/Service/DataBase/Dto/CreateEntityInput.cs similarity index 89% rename from Magic.Core/Service/DataBase/Dto/CreateEntityInput.cs rename to GDZZ.Core/Service/DataBase/Dto/CreateEntityInput.cs index 4a3e4f2..47855c8 100644 --- a/Magic.Core/Service/DataBase/Dto/CreateEntityInput.cs +++ b/GDZZ.Core/Service/DataBase/Dto/CreateEntityInput.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public class CreateEntityInput { @@ -29,6 +29,6 @@ public class CreateEntityInput /// /// /// - /// Magic.Application + /// GDZZ.Application public string Position { get; set; } } diff --git a/Magic.Core/Service/DataBase/Dto/DbColumnInfoInput.cs b/GDZZ.Core/Service/DataBase/Dto/DbColumnInfoInput.cs similarity index 96% rename from Magic.Core/Service/DataBase/Dto/DbColumnInfoInput.cs rename to GDZZ.Core/Service/DataBase/Dto/DbColumnInfoInput.cs index 2ef2b52..d849c50 100644 --- a/Magic.Core/Service/DataBase/Dto/DbColumnInfoInput.cs +++ b/GDZZ.Core/Service/DataBase/Dto/DbColumnInfoInput.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public class DbColumnInfoInput { diff --git a/Magic.Core/Service/DataBase/Dto/DbColumnInfoOutput.cs b/GDZZ.Core/Service/DataBase/Dto/DbColumnInfoOutput.cs similarity index 97% rename from Magic.Core/Service/DataBase/Dto/DbColumnInfoOutput.cs rename to GDZZ.Core/Service/DataBase/Dto/DbColumnInfoOutput.cs index 94349ce..f1fa800 100644 --- a/Magic.Core/Service/DataBase/Dto/DbColumnInfoOutput.cs +++ b/GDZZ.Core/Service/DataBase/Dto/DbColumnInfoOutput.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public class DbColumnInfoOutput { diff --git a/Magic.Core/Service/DataBase/Dto/DbTableInfoInput.cs b/GDZZ.Core/Service/DataBase/Dto/DbTableInfoInput.cs similarity index 90% rename from Magic.Core/Service/DataBase/Dto/DbTableInfoInput.cs rename to GDZZ.Core/Service/DataBase/Dto/DbTableInfoInput.cs index 1182c73..f85776a 100644 --- a/Magic.Core/Service/DataBase/Dto/DbTableInfoInput.cs +++ b/GDZZ.Core/Service/DataBase/Dto/DbTableInfoInput.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public class DbTableInfoInput { diff --git a/Magic.Core/Service/DataBase/Dto/EditColumnInput.cs b/GDZZ.Core/Service/DataBase/Dto/EditColumnInput.cs similarity index 91% rename from Magic.Core/Service/DataBase/Dto/EditColumnInput.cs rename to GDZZ.Core/Service/DataBase/Dto/EditColumnInput.cs index 1e1ce9d..2be7c67 100644 --- a/Magic.Core/Service/DataBase/Dto/EditColumnInput.cs +++ b/GDZZ.Core/Service/DataBase/Dto/EditColumnInput.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public class EditColumnInput { diff --git a/Magic.Core/Service/DataBase/Dto/EditTableInput.cs b/GDZZ.Core/Service/DataBase/Dto/EditTableInput.cs similarity index 90% rename from Magic.Core/Service/DataBase/Dto/EditTableInput.cs rename to GDZZ.Core/Service/DataBase/Dto/EditTableInput.cs index 8accfe4..665be06 100644 --- a/Magic.Core/Service/DataBase/Dto/EditTableInput.cs +++ b/GDZZ.Core/Service/DataBase/Dto/EditTableInput.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public class EditTableInput { diff --git a/Magic.Core/Service/DataBase/Extension/DbMaintenanceExtension.cs b/GDZZ.Core/Service/DataBase/Extension/DbMaintenanceExtension.cs similarity index 98% rename from Magic.Core/Service/DataBase/Extension/DbMaintenanceExtension.cs rename to GDZZ.Core/Service/DataBase/Extension/DbMaintenanceExtension.cs index 98b970b..e7dc010 100644 --- a/Magic.Core/Service/DataBase/Extension/DbMaintenanceExtension.cs +++ b/GDZZ.Core/Service/DataBase/Extension/DbMaintenanceExtension.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Magic.Core.Service.DataBase.Extension +namespace GDZZ.Core.Service.DataBase.Extension { internal static class DbMaintenanceExtension { diff --git a/Magic.Core/Service/DataBase/IDataBaseManager.cs b/GDZZ.Core/Service/DataBase/IDataBaseManager.cs similarity index 95% rename from Magic.Core/Service/DataBase/IDataBaseManager.cs rename to GDZZ.Core/Service/DataBase/IDataBaseManager.cs index f8b4254..27cbbeb 100644 --- a/Magic.Core/Service/DataBase/IDataBaseManager.cs +++ b/GDZZ.Core/Service/DataBase/IDataBaseManager.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface IDataBaseManager { diff --git a/Magic.Core/Service/Dict/Dto/DictDataInput.cs b/GDZZ.Core/Service/Dict/Dto/DictDataInput.cs similarity index 98% rename from Magic.Core/Service/Dict/Dto/DictDataInput.cs rename to GDZZ.Core/Service/Dict/Dto/DictDataInput.cs index aa89d23..f582c58 100644 --- a/Magic.Core/Service/Dict/Dto/DictDataInput.cs +++ b/GDZZ.Core/Service/Dict/Dto/DictDataInput.cs @@ -1,7 +1,7 @@ using Furion.DataValidation; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 字典值参数 diff --git a/Magic.Core/Service/Dict/Dto/DictDataOutput.cs b/GDZZ.Core/Service/Dict/Dto/DictDataOutput.cs similarity index 85% rename from Magic.Core/Service/Dict/Dto/DictDataOutput.cs rename to GDZZ.Core/Service/Dict/Dto/DictDataOutput.cs index 37818d4..8208f2b 100644 --- a/Magic.Core/Service/Dict/Dto/DictDataOutput.cs +++ b/GDZZ.Core/Service/Dict/Dto/DictDataOutput.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 字典值参数 diff --git a/Magic.Core/Service/Dict/Dto/DictTreeOutput.cs b/GDZZ.Core/Service/Dict/Dto/DictTreeOutput.cs similarity index 95% rename from Magic.Core/Service/Dict/Dto/DictTreeOutput.cs rename to GDZZ.Core/Service/Dict/Dto/DictTreeOutput.cs index 730eab6..c090fcc 100644 --- a/Magic.Core/Service/Dict/Dto/DictTreeOutput.cs +++ b/GDZZ.Core/Service/Dict/Dto/DictTreeOutput.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 字典类型与字典值构造的树 diff --git a/Magic.Core/Service/Dict/Dto/DictTypeInput.cs b/GDZZ.Core/Service/Dict/Dto/DictTypeInput.cs similarity index 98% rename from Magic.Core/Service/Dict/Dto/DictTypeInput.cs rename to GDZZ.Core/Service/Dict/Dto/DictTypeInput.cs index 5271a38..9508315 100644 --- a/Magic.Core/Service/Dict/Dto/DictTypeInput.cs +++ b/GDZZ.Core/Service/Dict/Dto/DictTypeInput.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 字典类型参数 diff --git a/Magic.Core/Service/Dict/ISysDictDataService.cs b/GDZZ.Core/Service/Dict/ISysDictDataService.cs similarity index 92% rename from Magic.Core/Service/Dict/ISysDictDataService.cs rename to GDZZ.Core/Service/Dict/ISysDictDataService.cs index 304a437..77c8952 100644 --- a/Magic.Core/Service/Dict/ISysDictDataService.cs +++ b/GDZZ.Core/Service/Dict/ISysDictDataService.cs @@ -1,9 +1,9 @@ -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysDictDataService { diff --git a/Magic.Core/Service/Dict/ISysDictTypeService.cs b/GDZZ.Core/Service/Dict/ISysDictTypeService.cs similarity index 95% rename from Magic.Core/Service/Dict/ISysDictTypeService.cs rename to GDZZ.Core/Service/Dict/ISysDictTypeService.cs index 4509593..ff05cc6 100644 --- a/Magic.Core/Service/Dict/ISysDictTypeService.cs +++ b/GDZZ.Core/Service/Dict/ISysDictTypeService.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysDictTypeService { diff --git a/Magic.Core/Service/Dict/SysDictDataService.cs b/GDZZ.Core/Service/Dict/SysDictDataService.cs similarity index 99% rename from Magic.Core/Service/Dict/SysDictDataService.cs rename to GDZZ.Core/Service/Dict/SysDictDataService.cs index 3343ae1..9b994a6 100644 --- a/Magic.Core/Service/Dict/SysDictDataService.cs +++ b/GDZZ.Core/Service/Dict/SysDictDataService.cs @@ -3,7 +3,7 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Mapster; using Microsoft.AspNetCore.Mvc; @@ -13,7 +13,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 字典值服务 diff --git a/Magic.Core/Service/Dict/SysDictTypeService.cs b/GDZZ.Core/Service/Dict/SysDictTypeService.cs similarity index 99% rename from Magic.Core/Service/Dict/SysDictTypeService.cs rename to GDZZ.Core/Service/Dict/SysDictTypeService.cs index e315c28..f041b59 100644 --- a/Magic.Core/Service/Dict/SysDictTypeService.cs +++ b/GDZZ.Core/Service/Dict/SysDictTypeService.cs @@ -3,7 +3,7 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Mapster; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -14,7 +14,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 字典类型服务 diff --git a/Magic.Core/Service/Document/DocumentService.cs b/GDZZ.Core/Service/Document/DocumentService.cs similarity index 99% rename from Magic.Core/Service/Document/DocumentService.cs rename to GDZZ.Core/Service/Document/DocumentService.cs index 337471e..0d41fcf 100644 --- a/Magic.Core/Service/Document/DocumentService.cs +++ b/GDZZ.Core/Service/Document/DocumentService.cs @@ -2,7 +2,7 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Mapster; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -19,7 +19,7 @@ using System.Web; using Yitter.IdGenerator; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 文档服务 diff --git a/Magic.Core/Service/Document/Dto/DocumentDto.cs b/GDZZ.Core/Service/Document/Dto/DocumentDto.cs similarity index 97% rename from Magic.Core/Service/Document/Dto/DocumentDto.cs rename to GDZZ.Core/Service/Document/Dto/DocumentDto.cs index 0912814..e422cb7 100644 --- a/Magic.Core/Service/Document/Dto/DocumentDto.cs +++ b/GDZZ.Core/Service/Document/Dto/DocumentDto.cs @@ -1,7 +1,7 @@ using System; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 文档输出参数 diff --git a/Magic.Core/Service/Document/Dto/DocumentInput.cs b/GDZZ.Core/Service/Document/Dto/DocumentInput.cs similarity index 99% rename from Magic.Core/Service/Document/Dto/DocumentInput.cs rename to GDZZ.Core/Service/Document/Dto/DocumentInput.cs index 80e5f20..2e46eea 100644 --- a/Magic.Core/Service/Document/Dto/DocumentInput.cs +++ b/GDZZ.Core/Service/Document/Dto/DocumentInput.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 文档输入参数 diff --git a/Magic.Core/Service/Document/Dto/DocumentOutput.cs b/GDZZ.Core/Service/Document/Dto/DocumentOutput.cs similarity index 98% rename from Magic.Core/Service/Document/Dto/DocumentOutput.cs rename to GDZZ.Core/Service/Document/Dto/DocumentOutput.cs index 8cdd03a..1f1a553 100644 --- a/Magic.Core/Service/Document/Dto/DocumentOutput.cs +++ b/GDZZ.Core/Service/Document/Dto/DocumentOutput.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 文档输出参数 diff --git a/Magic.Core/Service/Document/IDocumentService.cs b/GDZZ.Core/Service/Document/IDocumentService.cs similarity index 86% rename from Magic.Core/Service/Document/IDocumentService.cs rename to GDZZ.Core/Service/Document/IDocumentService.cs index 4de0918..5877aad 100644 --- a/Magic.Core/Service/Document/IDocumentService.cs +++ b/GDZZ.Core/Service/Document/IDocumentService.cs @@ -1,8 +1,8 @@  -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface IDocumentService { diff --git a/Magic.Core/Service/Emp/Dto/EmpExtOrgPosOutput.cs b/GDZZ.Core/Service/Emp/Dto/EmpExtOrgPosOutput.cs similarity index 96% rename from Magic.Core/Service/Emp/Dto/EmpExtOrgPosOutput.cs rename to GDZZ.Core/Service/Emp/Dto/EmpExtOrgPosOutput.cs index 9f8bbbc..b8634d3 100644 --- a/Magic.Core/Service/Emp/Dto/EmpExtOrgPosOutput.cs +++ b/GDZZ.Core/Service/Emp/Dto/EmpExtOrgPosOutput.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 附属机构和职位参数 diff --git a/Magic.Core/Service/Emp/Dto/EmpOutput.cs b/GDZZ.Core/Service/Emp/Dto/EmpOutput.cs similarity index 96% rename from Magic.Core/Service/Emp/Dto/EmpOutput.cs rename to GDZZ.Core/Service/Emp/Dto/EmpOutput.cs index 4a205a8..5c30e2f 100644 --- a/Magic.Core/Service/Emp/Dto/EmpOutput.cs +++ b/GDZZ.Core/Service/Emp/Dto/EmpOutput.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 员工信息参数 diff --git a/Magic.Core/Service/Emp/Dto/EmpOutput2.cs b/GDZZ.Core/Service/Emp/Dto/EmpOutput2.cs similarity index 96% rename from Magic.Core/Service/Emp/Dto/EmpOutput2.cs rename to GDZZ.Core/Service/Emp/Dto/EmpOutput2.cs index 17c4e21..6489877 100644 --- a/Magic.Core/Service/Emp/Dto/EmpOutput2.cs +++ b/GDZZ.Core/Service/Emp/Dto/EmpOutput2.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 员工信息参数2 diff --git a/Magic.Core/Service/Emp/Dto/EmpPosOutput.cs b/GDZZ.Core/Service/Emp/Dto/EmpPosOutput.cs similarity index 93% rename from Magic.Core/Service/Emp/Dto/EmpPosOutput.cs rename to GDZZ.Core/Service/Emp/Dto/EmpPosOutput.cs index 64fc1cc..db85c69 100644 --- a/Magic.Core/Service/Emp/Dto/EmpPosOutput.cs +++ b/GDZZ.Core/Service/Emp/Dto/EmpPosOutput.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 员工职位参数 diff --git a/Magic.Core/Service/Emp/ISysEmpExtOrgPosService.cs b/GDZZ.Core/Service/Emp/ISysEmpExtOrgPosService.cs similarity index 93% rename from Magic.Core/Service/Emp/ISysEmpExtOrgPosService.cs rename to GDZZ.Core/Service/Emp/ISysEmpExtOrgPosService.cs index 914ffbc..4726d83 100644 --- a/Magic.Core/Service/Emp/ISysEmpExtOrgPosService.cs +++ b/GDZZ.Core/Service/Emp/ISysEmpExtOrgPosService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysEmpExtOrgPosService { diff --git a/Magic.Core/Service/Emp/ISysEmpPosService.cs b/GDZZ.Core/Service/Emp/ISysEmpPosService.cs similarity index 92% rename from Magic.Core/Service/Emp/ISysEmpPosService.cs rename to GDZZ.Core/Service/Emp/ISysEmpPosService.cs index 908639c..d6b57a9 100644 --- a/Magic.Core/Service/Emp/ISysEmpPosService.cs +++ b/GDZZ.Core/Service/Emp/ISysEmpPosService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysEmpPosService { diff --git a/Magic.Core/Service/Emp/ISysEmpService.cs b/GDZZ.Core/Service/Emp/ISysEmpService.cs similarity index 89% rename from Magic.Core/Service/Emp/ISysEmpService.cs rename to GDZZ.Core/Service/Emp/ISysEmpService.cs index 3444e55..b1283a6 100644 --- a/Magic.Core/Service/Emp/ISysEmpService.cs +++ b/GDZZ.Core/Service/Emp/ISysEmpService.cs @@ -1,8 +1,8 @@ -using Magic.Core.Entity; +using GDZZ.Core.Entity; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysEmpService { diff --git a/Magic.Core/Service/Emp/SysEmpExtOrgPosService.cs b/GDZZ.Core/Service/Emp/SysEmpExtOrgPosService.cs similarity index 98% rename from Magic.Core/Service/Emp/SysEmpExtOrgPosService.cs rename to GDZZ.Core/Service/Emp/SysEmpExtOrgPosService.cs index 240e6d5..df06c7d 100644 --- a/Magic.Core/Service/Emp/SysEmpExtOrgPosService.cs +++ b/GDZZ.Core/Service/Emp/SysEmpExtOrgPosService.cs @@ -1,13 +1,13 @@  using Furion.DependencyInjection; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using SqlSugar; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 员工附属机构和职位服务 diff --git a/Magic.Core/Service/Emp/SysEmpPosService.cs b/GDZZ.Core/Service/Emp/SysEmpPosService.cs similarity index 98% rename from Magic.Core/Service/Emp/SysEmpPosService.cs rename to GDZZ.Core/Service/Emp/SysEmpPosService.cs index 588a97e..67887af 100644 --- a/Magic.Core/Service/Emp/SysEmpPosService.cs +++ b/GDZZ.Core/Service/Emp/SysEmpPosService.cs @@ -1,13 +1,13 @@  using Furion.DependencyInjection; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using SqlSugar; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 员工职位服务 diff --git a/Magic.Core/Service/Emp/SysEmpService.cs b/GDZZ.Core/Service/Emp/SysEmpService.cs similarity index 99% rename from Magic.Core/Service/Emp/SysEmpService.cs rename to GDZZ.Core/Service/Emp/SysEmpService.cs index 355505a..9a87414 100644 --- a/Magic.Core/Service/Emp/SysEmpService.cs +++ b/GDZZ.Core/Service/Emp/SysEmpService.cs @@ -1,7 +1,7 @@  using Furion.DependencyInjection; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Mapster; using SqlSugar; @@ -9,7 +9,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 员工服务 diff --git a/Magic.Core/Service/Enum/Dto/EnumDataInput.cs b/GDZZ.Core/Service/Enum/Dto/EnumDataInput.cs similarity index 95% rename from Magic.Core/Service/Enum/Dto/EnumDataInput.cs rename to GDZZ.Core/Service/Enum/Dto/EnumDataInput.cs index cf9e6eb..dc5186c 100644 --- a/Magic.Core/Service/Enum/Dto/EnumDataInput.cs +++ b/GDZZ.Core/Service/Enum/Dto/EnumDataInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 枚举输入参数 diff --git a/Magic.Core/Service/Enum/Dto/EnumDataOutput.cs b/GDZZ.Core/Service/Enum/Dto/EnumDataOutput.cs similarity index 89% rename from Magic.Core/Service/Enum/Dto/EnumDataOutput.cs rename to GDZZ.Core/Service/Enum/Dto/EnumDataOutput.cs index fa2e1c2..64ce526 100644 --- a/Magic.Core/Service/Enum/Dto/EnumDataOutput.cs +++ b/GDZZ.Core/Service/Enum/Dto/EnumDataOutput.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 枚举输出参数 diff --git a/Magic.Core/Service/Enum/ISysEnumDataService.cs b/GDZZ.Core/Service/Enum/ISysEnumDataService.cs similarity index 90% rename from Magic.Core/Service/Enum/ISysEnumDataService.cs rename to GDZZ.Core/Service/Enum/ISysEnumDataService.cs index 4115ad2..c75b31c 100644 --- a/Magic.Core/Service/Enum/ISysEnumDataService.cs +++ b/GDZZ.Core/Service/Enum/ISysEnumDataService.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysEnumDataService { diff --git a/Magic.Core/Service/Enum/SysEnumDataService.cs b/GDZZ.Core/Service/Enum/SysEnumDataService.cs similarity index 97% rename from Magic.Core/Service/Enum/SysEnumDataService.cs rename to GDZZ.Core/Service/Enum/SysEnumDataService.cs index 3d9d151..8f1c9c7 100644 --- a/Magic.Core/Service/Enum/SysEnumDataService.cs +++ b/GDZZ.Core/Service/Enum/SysEnumDataService.cs @@ -11,7 +11,7 @@ using System.ComponentModel; using System.Linq; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 枚举值服务 @@ -31,7 +31,7 @@ public class SysEnumDataService : ISysEnumDataService, IDynamicApiController, IT { List result = new List(); - var enumTypeList = App.EffectiveTypes.Where(t => t.IsEnum && t.FullName.StartsWith("Magic.")).ToList(); + var enumTypeList = App.EffectiveTypes.Where(t => t.IsEnum && t.FullName.StartsWith("GDZZ.")).ToList(); foreach (var item in enumTypeList) { diff --git a/Magic.Core/Service/File/Dto/FileInput.cs b/GDZZ.Core/Service/File/Dto/FileInput.cs similarity index 97% rename from Magic.Core/Service/File/Dto/FileInput.cs rename to GDZZ.Core/Service/File/Dto/FileInput.cs index 77de05a..f6e6ef7 100644 --- a/Magic.Core/Service/File/Dto/FileInput.cs +++ b/GDZZ.Core/Service/File/Dto/FileInput.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Http; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 上传文件参数 diff --git a/Magic.Core/Service/File/Dto/FileOutput.cs b/GDZZ.Core/Service/File/Dto/FileOutput.cs similarity index 84% rename from Magic.Core/Service/File/Dto/FileOutput.cs rename to GDZZ.Core/Service/File/Dto/FileOutput.cs index b37f560..0ae5ca8 100644 --- a/Magic.Core/Service/File/Dto/FileOutput.cs +++ b/GDZZ.Core/Service/File/Dto/FileOutput.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 上传文件参数 diff --git a/Magic.Core/Service/File/ISysFileService.cs b/GDZZ.Core/Service/File/ISysFileService.cs similarity index 93% rename from Magic.Core/Service/File/ISysFileService.cs rename to GDZZ.Core/Service/File/ISysFileService.cs index 7f00759..e7e6511 100644 --- a/Magic.Core/Service/File/ISysFileService.cs +++ b/GDZZ.Core/Service/File/ISysFileService.cs @@ -1,10 +1,10 @@ -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysFileService { diff --git a/Magic.Core/Service/File/SysFileService.cs b/GDZZ.Core/Service/File/SysFileService.cs similarity index 99% rename from Magic.Core/Service/File/SysFileService.cs rename to GDZZ.Core/Service/File/SysFileService.cs index a5d1f77..14f1c84 100644 --- a/Magic.Core/Service/File/SysFileService.cs +++ b/GDZZ.Core/Service/File/SysFileService.cs @@ -2,7 +2,7 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; @@ -14,7 +14,7 @@ using System.Threading.Tasks; using System.Web; using Yitter.IdGenerator; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 文件服务 diff --git a/Magic.Core/Service/Log/Dto/ExLogInput.cs b/GDZZ.Core/Service/Log/Dto/ExLogInput.cs similarity index 96% rename from Magic.Core/Service/Log/Dto/ExLogInput.cs rename to GDZZ.Core/Service/Log/Dto/ExLogInput.cs index 1579780..a24d9f8 100644 --- a/Magic.Core/Service/Log/Dto/ExLogInput.cs +++ b/GDZZ.Core/Service/Log/Dto/ExLogInput.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 异常日志参数 diff --git a/Magic.Core/Service/Log/Dto/ExLogOutput.cs b/GDZZ.Core/Service/Log/Dto/ExLogOutput.cs similarity index 74% rename from Magic.Core/Service/Log/Dto/ExLogOutput.cs rename to GDZZ.Core/Service/Log/Dto/ExLogOutput.cs index c2a9dd3..f3380f7 100644 --- a/Magic.Core/Service/Log/Dto/ExLogOutput.cs +++ b/GDZZ.Core/Service/Log/Dto/ExLogOutput.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 异常日志参数 diff --git a/Magic.Core/Service/Log/Dto/OpLogInput.cs b/GDZZ.Core/Service/Log/Dto/OpLogInput.cs similarity index 98% rename from Magic.Core/Service/Log/Dto/OpLogInput.cs rename to GDZZ.Core/Service/Log/Dto/OpLogInput.cs index bce4be1..e3028ae 100644 --- a/Magic.Core/Service/Log/Dto/OpLogInput.cs +++ b/GDZZ.Core/Service/Log/Dto/OpLogInput.cs @@ -1,6 +1,6 @@ using System; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 请求日志参数 diff --git a/Magic.Core/Service/Log/Dto/OpLogOutput.cs b/GDZZ.Core/Service/Log/Dto/OpLogOutput.cs similarity index 74% rename from Magic.Core/Service/Log/Dto/OpLogOutput.cs rename to GDZZ.Core/Service/Log/Dto/OpLogOutput.cs index b395ee3..69db03e 100644 --- a/Magic.Core/Service/Log/Dto/OpLogOutput.cs +++ b/GDZZ.Core/Service/Log/Dto/OpLogOutput.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 请求日志参数 diff --git a/Magic.Core/Service/Log/Dto/VisLogInput.cs b/GDZZ.Core/Service/Log/Dto/VisLogInput.cs similarity index 97% rename from Magic.Core/Service/Log/Dto/VisLogInput.cs rename to GDZZ.Core/Service/Log/Dto/VisLogInput.cs index 5cc57e9..387a151 100644 --- a/Magic.Core/Service/Log/Dto/VisLogInput.cs +++ b/GDZZ.Core/Service/Log/Dto/VisLogInput.cs @@ -1,6 +1,6 @@ using System; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 访问日志参数 diff --git a/Magic.Core/Service/Log/Dto/VisLogOutput.cs b/GDZZ.Core/Service/Log/Dto/VisLogOutput.cs similarity index 74% rename from Magic.Core/Service/Log/Dto/VisLogOutput.cs rename to GDZZ.Core/Service/Log/Dto/VisLogOutput.cs index 173201c..8a77242 100644 --- a/Magic.Core/Service/Log/Dto/VisLogOutput.cs +++ b/GDZZ.Core/Service/Log/Dto/VisLogOutput.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 访问日志参数 diff --git a/Magic.Core/Service/Log/ISysExLogService.cs b/GDZZ.Core/Service/Log/ISysExLogService.cs similarity index 86% rename from Magic.Core/Service/Log/ISysExLogService.cs rename to GDZZ.Core/Service/Log/ISysExLogService.cs index 9ebb15d..cef467c 100644 --- a/Magic.Core/Service/Log/ISysExLogService.cs +++ b/GDZZ.Core/Service/Log/ISysExLogService.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysExLogService { diff --git a/Magic.Core/Service/Log/ISysOpLogService.cs b/GDZZ.Core/Service/Log/ISysOpLogService.cs similarity index 86% rename from Magic.Core/Service/Log/ISysOpLogService.cs rename to GDZZ.Core/Service/Log/ISysOpLogService.cs index f43406a..7f92c55 100644 --- a/Magic.Core/Service/Log/ISysOpLogService.cs +++ b/GDZZ.Core/Service/Log/ISysOpLogService.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysOpLogService { diff --git a/Magic.Core/Service/Log/ISysVisLogService.cs b/GDZZ.Core/Service/Log/ISysVisLogService.cs similarity index 86% rename from Magic.Core/Service/Log/ISysVisLogService.cs rename to GDZZ.Core/Service/Log/ISysVisLogService.cs index 06c87e5..3df3afc 100644 --- a/Magic.Core/Service/Log/ISysVisLogService.cs +++ b/GDZZ.Core/Service/Log/ISysVisLogService.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysVisLogService { diff --git a/Magic.Core/Service/Log/SysExLogService.cs b/GDZZ.Core/Service/Log/SysExLogService.cs similarity index 97% rename from Magic.Core/Service/Log/SysExLogService.cs rename to GDZZ.Core/Service/Log/SysExLogService.cs index 986d4a3..09ca64a 100644 --- a/Magic.Core/Service/Log/SysExLogService.cs +++ b/GDZZ.Core/Service/Log/SysExLogService.cs @@ -2,13 +2,13 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.AspNetCore.Mvc; using SqlSugar; using System; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 异常日志服务 diff --git a/Magic.Core/Service/Log/SysOpLogService.cs b/GDZZ.Core/Service/Log/SysOpLogService.cs similarity index 96% rename from Magic.Core/Service/Log/SysOpLogService.cs rename to GDZZ.Core/Service/Log/SysOpLogService.cs index bfd5fd2..4bc55f9 100644 --- a/Magic.Core/Service/Log/SysOpLogService.cs +++ b/GDZZ.Core/Service/Log/SysOpLogService.cs @@ -2,14 +2,14 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.AspNetCore.Mvc; using SqlSugar; using System; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 操作日志服务 diff --git a/Magic.Core/Service/Log/SysVisLogService.cs b/GDZZ.Core/Service/Log/SysVisLogService.cs similarity index 97% rename from Magic.Core/Service/Log/SysVisLogService.cs rename to GDZZ.Core/Service/Log/SysVisLogService.cs index 6d78d31..12ad3f7 100644 --- a/Magic.Core/Service/Log/SysVisLogService.cs +++ b/GDZZ.Core/Service/Log/SysVisLogService.cs @@ -2,14 +2,14 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.AspNetCore.Mvc; using SqlSugar; using System; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 访问日志服务 diff --git a/Magic.Core/Service/Menu/Dto/AntDesignTreeNode.cs b/GDZZ.Core/Service/Menu/Dto/AntDesignTreeNode.cs similarity index 98% rename from Magic.Core/Service/Menu/Dto/AntDesignTreeNode.cs rename to GDZZ.Core/Service/Menu/Dto/AntDesignTreeNode.cs index 432b322..a5c4cdd 100644 --- a/Magic.Core/Service/Menu/Dto/AntDesignTreeNode.cs +++ b/GDZZ.Core/Service/Menu/Dto/AntDesignTreeNode.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 登录菜单-AntDesign菜单类型 diff --git a/Magic.Core/Service/Menu/Dto/MenuInput.cs b/GDZZ.Core/Service/Menu/Dto/MenuInput.cs similarity index 98% rename from Magic.Core/Service/Menu/Dto/MenuInput.cs rename to GDZZ.Core/Service/Menu/Dto/MenuInput.cs index dbf3556..5c971dd 100644 --- a/Magic.Core/Service/Menu/Dto/MenuInput.cs +++ b/GDZZ.Core/Service/Menu/Dto/MenuInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 菜单参数 diff --git a/Magic.Core/Service/Menu/Dto/MenuOutput.cs b/GDZZ.Core/Service/Menu/Dto/MenuOutput.cs similarity index 95% rename from Magic.Core/Service/Menu/Dto/MenuOutput.cs rename to GDZZ.Core/Service/Menu/Dto/MenuOutput.cs index 41a8320..a8319f9 100644 --- a/Magic.Core/Service/Menu/Dto/MenuOutput.cs +++ b/GDZZ.Core/Service/Menu/Dto/MenuOutput.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Collections.Generic; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 菜单树（列表形式） diff --git a/Magic.Core/Service/Menu/Dto/MenuTreeAppOutput.cs b/GDZZ.Core/Service/Menu/Dto/MenuTreeAppOutput.cs similarity index 87% rename from Magic.Core/Service/Menu/Dto/MenuTreeAppOutput.cs rename to GDZZ.Core/Service/Menu/Dto/MenuTreeAppOutput.cs index d2feb15..5786e67 100644 --- a/Magic.Core/Service/Menu/Dto/MenuTreeAppOutput.cs +++ b/GDZZ.Core/Service/Menu/Dto/MenuTreeAppOutput.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public class MenuTreeAppOutput { diff --git a/Magic.Core/Service/Menu/Dto/MenuTreeOutput.cs b/GDZZ.Core/Service/Menu/Dto/MenuTreeOutput.cs similarity index 97% rename from Magic.Core/Service/Menu/Dto/MenuTreeOutput.cs rename to GDZZ.Core/Service/Menu/Dto/MenuTreeOutput.cs index 653f490..c14d0b0 100644 --- a/Magic.Core/Service/Menu/Dto/MenuTreeOutput.cs +++ b/GDZZ.Core/Service/Menu/Dto/MenuTreeOutput.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Collections.Generic; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 菜单树---授权、新增编辑时选择 diff --git a/Magic.Core/Service/Menu/Dto/OwnMenuOutput.cs b/GDZZ.Core/Service/Menu/Dto/OwnMenuOutput.cs similarity index 92% rename from Magic.Core/Service/Menu/Dto/OwnMenuOutput.cs rename to GDZZ.Core/Service/Menu/Dto/OwnMenuOutput.cs index 922f0fc..e1c0db0 100644 --- a/Magic.Core/Service/Menu/Dto/OwnMenuOutput.cs +++ b/GDZZ.Core/Service/Menu/Dto/OwnMenuOutput.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public class OwnMenuOutput { diff --git a/Magic.Core/Service/Menu/ISysMenuService.cs b/GDZZ.Core/Service/Menu/ISysMenuService.cs similarity index 96% rename from Magic.Core/Service/Menu/ISysMenuService.cs rename to GDZZ.Core/Service/Menu/ISysMenuService.cs index 65f3464..a5294c7 100644 --- a/Magic.Core/Service/Menu/ISysMenuService.cs +++ b/GDZZ.Core/Service/Menu/ISysMenuService.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysMenuService { diff --git a/Magic.Core/Service/Menu/SysMenuService.cs b/GDZZ.Core/Service/Menu/SysMenuService.cs similarity index 99% rename from Magic.Core/Service/Menu/SysMenuService.cs rename to GDZZ.Core/Service/Menu/SysMenuService.cs index e2eb9e9..ae49971 100644 --- a/Magic.Core/Service/Menu/SysMenuService.cs +++ b/GDZZ.Core/Service/Menu/SysMenuService.cs @@ -3,7 +3,7 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Mapster; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -13,7 +13,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 系统菜单服务 diff --git a/Magic.Core/Service/Monitor/IMachineService.cs b/GDZZ.Core/Service/Monitor/IMachineService.cs similarity index 86% rename from Magic.Core/Service/Monitor/IMachineService.cs rename to GDZZ.Core/Service/Monitor/IMachineService.cs index 3db87f3..a836375 100644 --- a/Magic.Core/Service/Monitor/IMachineService.cs +++ b/GDZZ.Core/Service/Monitor/IMachineService.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface IMachineService { diff --git a/Magic.Core/Service/Monitor/MachineService.cs b/GDZZ.Core/Service/Monitor/MachineService.cs similarity index 97% rename from Magic.Core/Service/Monitor/MachineService.cs rename to GDZZ.Core/Service/Monitor/MachineService.cs index 9740f28..376395e 100644 --- a/Magic.Core/Service/Monitor/MachineService.cs +++ b/GDZZ.Core/Service/Monitor/MachineService.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 服务器信息服务 diff --git a/Magic.Core/Service/Notice/Dto/NoticeBase.cs b/GDZZ.Core/Service/Notice/Dto/NoticeBase.cs similarity index 97% rename from Magic.Core/Service/Notice/Dto/NoticeBase.cs rename to GDZZ.Core/Service/Notice/Dto/NoticeBase.cs index db3ac8c..a58385c 100644 --- a/Magic.Core/Service/Notice/Dto/NoticeBase.cs +++ b/GDZZ.Core/Service/Notice/Dto/NoticeBase.cs @@ -1,6 +1,6 @@ using System; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 通知公告参数 diff --git a/Magic.Core/Service/Notice/Dto/NoticeDetailOutput.cs b/GDZZ.Core/Service/Notice/Dto/NoticeDetailOutput.cs similarity index 96% rename from Magic.Core/Service/Notice/Dto/NoticeDetailOutput.cs rename to GDZZ.Core/Service/Notice/Dto/NoticeDetailOutput.cs index 6383940..b3481db 100644 --- a/Magic.Core/Service/Notice/Dto/NoticeDetailOutput.cs +++ b/GDZZ.Core/Service/Notice/Dto/NoticeDetailOutput.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 系统通知公告详情参数 diff --git a/Magic.Core/Service/Notice/Dto/NoticeInput.cs b/GDZZ.Core/Service/Notice/Dto/NoticeInput.cs similarity index 98% rename from Magic.Core/Service/Notice/Dto/NoticeInput.cs rename to GDZZ.Core/Service/Notice/Dto/NoticeInput.cs index dd59526..5e2d5e3 100644 --- a/Magic.Core/Service/Notice/Dto/NoticeInput.cs +++ b/GDZZ.Core/Service/Notice/Dto/NoticeInput.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 通知公告参数 diff --git a/Magic.Core/Service/Notice/Dto/NoticeReceiveOutput.cs b/GDZZ.Core/Service/Notice/Dto/NoticeReceiveOutput.cs similarity index 93% rename from Magic.Core/Service/Notice/Dto/NoticeReceiveOutput.cs rename to GDZZ.Core/Service/Notice/Dto/NoticeReceiveOutput.cs index 3cecf14..4a83d78 100644 --- a/Magic.Core/Service/Notice/Dto/NoticeReceiveOutput.cs +++ b/GDZZ.Core/Service/Notice/Dto/NoticeReceiveOutput.cs @@ -1,6 +1,6 @@ using System; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 通知公告接收参数 diff --git a/Magic.Core/Service/Notice/ISysNoticeService.cs b/GDZZ.Core/Service/Notice/ISysNoticeService.cs similarity index 94% rename from Magic.Core/Service/Notice/ISysNoticeService.cs rename to GDZZ.Core/Service/Notice/ISysNoticeService.cs index 85d3016..f18b3ac 100644 --- a/Magic.Core/Service/Notice/ISysNoticeService.cs +++ b/GDZZ.Core/Service/Notice/ISysNoticeService.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysNoticeService { diff --git a/Magic.Core/Service/Notice/ISysNoticeUserService.cs b/GDZZ.Core/Service/Notice/ISysNoticeUserService.cs similarity index 88% rename from Magic.Core/Service/Notice/ISysNoticeUserService.cs rename to GDZZ.Core/Service/Notice/ISysNoticeUserService.cs index d36f8b4..37aeab8 100644 --- a/Magic.Core/Service/Notice/ISysNoticeUserService.cs +++ b/GDZZ.Core/Service/Notice/ISysNoticeUserService.cs @@ -1,8 +1,8 @@ -using Magic.Core.Entity; +using GDZZ.Core.Entity; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysNoticeUserService { diff --git a/Magic.Core/Service/Notice/SysNoticeService.cs b/GDZZ.Core/Service/Notice/SysNoticeService.cs similarity index 99% rename from Magic.Core/Service/Notice/SysNoticeService.cs rename to GDZZ.Core/Service/Notice/SysNoticeService.cs index bc2013a..4c8d6c6 100644 --- a/Magic.Core/Service/Notice/SysNoticeService.cs +++ b/GDZZ.Core/Service/Notice/SysNoticeService.cs @@ -1,7 +1,7 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Mapster; using Microsoft.AspNetCore.Mvc; @@ -11,7 +11,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 通知公告服务 diff --git a/Magic.Core/Service/Notice/SysNoticeUserService.cs b/GDZZ.Core/Service/Notice/SysNoticeUserService.cs similarity index 97% rename from Magic.Core/Service/Notice/SysNoticeUserService.cs rename to GDZZ.Core/Service/Notice/SysNoticeUserService.cs index 8a4701e..8684c92 100644 --- a/Magic.Core/Service/Notice/SysNoticeUserService.cs +++ b/GDZZ.Core/Service/Notice/SysNoticeUserService.cs @@ -1,12 +1,12 @@  using Furion.DependencyInjection; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using System; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 通知公告用户 diff --git a/Magic.Core/Service/OAuth/ISysOauthService.cs b/GDZZ.Core/Service/OAuth/ISysOauthService.cs similarity index 91% rename from Magic.Core/Service/OAuth/ISysOauthService.cs rename to GDZZ.Core/Service/OAuth/ISysOauthService.cs index cdc5e48..0f3c708 100644 --- a/Magic.Core/Service/OAuth/ISysOauthService.cs +++ b/GDZZ.Core/Service/OAuth/ISysOauthService.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysOauthService { diff --git a/Magic.Core/Service/OAuth/SysOauthService.cs b/GDZZ.Core/Service/OAuth/SysOauthService.cs similarity index 97% rename from Magic.Core/Service/OAuth/SysOauthService.cs rename to GDZZ.Core/Service/OAuth/SysOauthService.cs index 09b1dc6..18769ac 100644 --- a/Magic.Core/Service/OAuth/SysOauthService.cs +++ b/GDZZ.Core/Service/OAuth/SysOauthService.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// OAuth服务 @@ -30,7 +30,7 @@ public class SysOauthService : ISysOauthService, IDynamicApiController, ITransie [HttpGet("oauth/wechat")] public Task WechatLogin() { - _httpContext.Response.Redirect(_wechatOAuth.GetAuthorizeUrl("Magic")); + _httpContext.Response.Redirect(_wechatOAuth.GetAuthorizeUrl("GDZZ")); return Task.CompletedTask; } diff --git a/Magic.Core/Service/OnlineUser/ISysOnlineUserService.cs b/GDZZ.Core/Service/OnlineUser/ISysOnlineUserService.cs similarity index 81% rename from Magic.Core/Service/OnlineUser/ISysOnlineUserService.cs rename to GDZZ.Core/Service/OnlineUser/ISysOnlineUserService.cs index 549ef1a..650c34e 100644 --- a/Magic.Core/Service/OnlineUser/ISysOnlineUserService.cs +++ b/GDZZ.Core/Service/OnlineUser/ISysOnlineUserService.cs @@ -1,8 +1,8 @@ -using Magic.Core.Entity; +using GDZZ.Core.Entity; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysOnlineUserService { diff --git a/Magic.Core/Service/OnlineUser/SysOnlineUserService.cs b/GDZZ.Core/Service/OnlineUser/SysOnlineUserService.cs similarity index 96% rename from Magic.Core/Service/OnlineUser/SysOnlineUserService.cs rename to GDZZ.Core/Service/OnlineUser/SysOnlineUserService.cs index 8431459..a5205ed 100644 --- a/Magic.Core/Service/OnlineUser/SysOnlineUserService.cs +++ b/GDZZ.Core/Service/OnlineUser/SysOnlineUserService.cs @@ -1,8 +1,8 @@  using Furion.DependencyInjection; using Furion.DynamicApiController; -using Magic.Core.Entity; -using Magic.Core.Service; +using GDZZ.Core.Entity; +using GDZZ.Core.Service; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; @@ -11,7 +11,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 在线用户服务 diff --git a/Magic.Core/Service/Org/Dto/OrgInput.cs b/GDZZ.Core/Service/Org/Dto/OrgInput.cs similarity index 98% rename from Magic.Core/Service/Org/Dto/OrgInput.cs rename to GDZZ.Core/Service/Org/Dto/OrgInput.cs index 9793a4b..8268dbb 100644 --- a/Magic.Core/Service/Org/Dto/OrgInput.cs +++ b/GDZZ.Core/Service/Org/Dto/OrgInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 组织机构参数 diff --git a/Magic.Core/Service/Org/Dto/OrgOutput.cs b/GDZZ.Core/Service/Org/Dto/OrgOutput.cs similarity index 84% rename from Magic.Core/Service/Org/Dto/OrgOutput.cs rename to GDZZ.Core/Service/Org/Dto/OrgOutput.cs index 279576d..5d7a592 100644 --- a/Magic.Core/Service/Org/Dto/OrgOutput.cs +++ b/GDZZ.Core/Service/Org/Dto/OrgOutput.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 组织机构参数 diff --git a/Magic.Core/Service/Org/Dto/OrgTreeNode.cs b/GDZZ.Core/Service/Org/Dto/OrgTreeNode.cs similarity index 97% rename from Magic.Core/Service/Org/Dto/OrgTreeNode.cs rename to GDZZ.Core/Service/Org/Dto/OrgTreeNode.cs index 2b7c28c..ef1991b 100644 --- a/Magic.Core/Service/Org/Dto/OrgTreeNode.cs +++ b/GDZZ.Core/Service/Org/Dto/OrgTreeNode.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Collections.Generic; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 组织机构树 diff --git a/Magic.Core/Service/Org/ISysOrgService.cs b/GDZZ.Core/Service/Org/ISysOrgService.cs similarity index 91% rename from Magic.Core/Service/Org/ISysOrgService.cs rename to GDZZ.Core/Service/Org/ISysOrgService.cs index d9a4a1c..54d1682 100644 --- a/Magic.Core/Service/Org/ISysOrgService.cs +++ b/GDZZ.Core/Service/Org/ISysOrgService.cs @@ -1,9 +1,9 @@ -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysOrgService { diff --git a/Magic.Core/Service/Org/SysOrgService.cs b/GDZZ.Core/Service/Org/SysOrgService.cs similarity index 99% rename from Magic.Core/Service/Org/SysOrgService.cs rename to GDZZ.Core/Service/Org/SysOrgService.cs index 0d38d8a..d4606ca 100644 --- a/Magic.Core/Service/Org/SysOrgService.cs +++ b/GDZZ.Core/Service/Org/SysOrgService.cs @@ -2,7 +2,7 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Mapster; using Microsoft.AspNetCore.Mvc; using SqlSugar; @@ -10,7 +10,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 组织机构服务 diff --git a/Magic.Core/Service/Pos/Dto/PosInput.cs b/GDZZ.Core/Service/Pos/Dto/PosInput.cs similarity index 98% rename from Magic.Core/Service/Pos/Dto/PosInput.cs rename to GDZZ.Core/Service/Pos/Dto/PosInput.cs index 44501f2..d8087c4 100644 --- a/Magic.Core/Service/Pos/Dto/PosInput.cs +++ b/GDZZ.Core/Service/Pos/Dto/PosInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 职位参数 diff --git a/Magic.Core/Service/Pos/ISysPosService.cs b/GDZZ.Core/Service/Pos/ISysPosService.cs similarity index 87% rename from Magic.Core/Service/Pos/ISysPosService.cs rename to GDZZ.Core/Service/Pos/ISysPosService.cs index f73975b..118c843 100644 --- a/Magic.Core/Service/Pos/ISysPosService.cs +++ b/GDZZ.Core/Service/Pos/ISysPosService.cs @@ -1,8 +1,8 @@ -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysPosService { diff --git a/Magic.Core/Service/Pos/SysPosService.cs b/GDZZ.Core/Service/Pos/SysPosService.cs similarity index 98% rename from Magic.Core/Service/Pos/SysPosService.cs rename to GDZZ.Core/Service/Pos/SysPosService.cs index 615fe99..642ce49 100644 --- a/Magic.Core/Service/Pos/SysPosService.cs +++ b/GDZZ.Core/Service/Pos/SysPosService.cs @@ -2,12 +2,12 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Mapster; using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 职位服务 diff --git a/Magic.Core/Service/Role/Dto/RoleInput.cs b/GDZZ.Core/Service/Role/Dto/RoleInput.cs similarity index 98% rename from Magic.Core/Service/Role/Dto/RoleInput.cs rename to GDZZ.Core/Service/Role/Dto/RoleInput.cs index 9dcec34..033d9ca 100644 --- a/Magic.Core/Service/Role/Dto/RoleInput.cs +++ b/GDZZ.Core/Service/Role/Dto/RoleInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 角色参数 diff --git a/Magic.Core/Service/Role/Dto/RoleOutput.cs b/GDZZ.Core/Service/Role/Dto/RoleOutput.cs similarity index 91% rename from Magic.Core/Service/Role/Dto/RoleOutput.cs rename to GDZZ.Core/Service/Role/Dto/RoleOutput.cs index 4e613b2..328c96e 100644 --- a/Magic.Core/Service/Role/Dto/RoleOutput.cs +++ b/GDZZ.Core/Service/Role/Dto/RoleOutput.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 登录用户角色参数 diff --git a/Magic.Core/Service/Role/ISysRoleDataScopeService.cs b/GDZZ.Core/Service/Role/ISysRoleDataScopeService.cs similarity index 92% rename from Magic.Core/Service/Role/ISysRoleDataScopeService.cs rename to GDZZ.Core/Service/Role/ISysRoleDataScopeService.cs index ff0b082..94ee3f7 100644 --- a/Magic.Core/Service/Role/ISysRoleDataScopeService.cs +++ b/GDZZ.Core/Service/Role/ISysRoleDataScopeService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysRoleDataScopeService { diff --git a/Magic.Core/Service/Role/ISysRoleMenuService.cs b/GDZZ.Core/Service/Role/ISysRoleMenuService.cs similarity index 93% rename from Magic.Core/Service/Role/ISysRoleMenuService.cs rename to GDZZ.Core/Service/Role/ISysRoleMenuService.cs index 9c5a064..a409afa 100644 --- a/Magic.Core/Service/Role/ISysRoleMenuService.cs +++ b/GDZZ.Core/Service/Role/ISysRoleMenuService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysRoleMenuService { diff --git a/Magic.Core/Service/Role/ISysRoleService.cs b/GDZZ.Core/Service/Role/ISysRoleService.cs similarity index 93% rename from Magic.Core/Service/Role/ISysRoleService.cs rename to GDZZ.Core/Service/Role/ISysRoleService.cs index 380c81e..d2f5753 100644 --- a/Magic.Core/Service/Role/ISysRoleService.cs +++ b/GDZZ.Core/Service/Role/ISysRoleService.cs @@ -1,9 +1,9 @@ -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysRoleService { diff --git a/Magic.Core/Service/Role/SysRoleDataScopeService.cs b/GDZZ.Core/Service/Role/SysRoleDataScopeService.cs similarity index 98% rename from Magic.Core/Service/Role/SysRoleDataScopeService.cs rename to GDZZ.Core/Service/Role/SysRoleDataScopeService.cs index d3d8c25..ae15a2b 100644 --- a/Magic.Core/Service/Role/SysRoleDataScopeService.cs +++ b/GDZZ.Core/Service/Role/SysRoleDataScopeService.cs @@ -1,11 +1,11 @@  using Furion.DependencyInjection; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 角色数据范围服务 diff --git a/Magic.Core/Service/Role/SysRoleMenuService.cs b/GDZZ.Core/Service/Role/SysRoleMenuService.cs similarity index 98% rename from Magic.Core/Service/Role/SysRoleMenuService.cs rename to GDZZ.Core/Service/Role/SysRoleMenuService.cs index c359d0b..427f3ca 100644 --- a/Magic.Core/Service/Role/SysRoleMenuService.cs +++ b/GDZZ.Core/Service/Role/SysRoleMenuService.cs @@ -1,11 +1,11 @@  using Furion.DependencyInjection; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 角色菜单 diff --git a/Magic.Core/Service/Role/SysRoleService.cs b/GDZZ.Core/Service/Role/SysRoleService.cs similarity index 99% rename from Magic.Core/Service/Role/SysRoleService.cs rename to GDZZ.Core/Service/Role/SysRoleService.cs index decb2dc..2889931 100644 --- a/Magic.Core/Service/Role/SysRoleService.cs +++ b/GDZZ.Core/Service/Role/SysRoleService.cs @@ -1,7 +1,7 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Mapster; using Microsoft.AspNetCore.Mvc; @@ -11,7 +11,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 角色服务 diff --git a/Magic.Core/Service/Tenant/Dto/TenantInput.cs b/GDZZ.Core/Service/Tenant/Dto/TenantInput.cs similarity index 98% rename from Magic.Core/Service/Tenant/Dto/TenantInput.cs rename to GDZZ.Core/Service/Tenant/Dto/TenantInput.cs index adab238..277ae09 100644 --- a/Magic.Core/Service/Tenant/Dto/TenantInput.cs +++ b/GDZZ.Core/Service/Tenant/Dto/TenantInput.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 租户参数 diff --git a/Magic.Core/Service/Tenant/Dto/TenantOutput.cs b/GDZZ.Core/Service/Tenant/Dto/TenantOutput.cs similarity index 96% rename from Magic.Core/Service/Tenant/Dto/TenantOutput.cs rename to GDZZ.Core/Service/Tenant/Dto/TenantOutput.cs index 58e0593..f1d13be 100644 --- a/Magic.Core/Service/Tenant/Dto/TenantOutput.cs +++ b/GDZZ.Core/Service/Tenant/Dto/TenantOutput.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 租户参数 diff --git a/Magic.Core/Service/Tenant/ISysTenantService.cs b/GDZZ.Core/Service/Tenant/ISysTenantService.cs similarity index 92% rename from Magic.Core/Service/Tenant/ISysTenantService.cs rename to GDZZ.Core/Service/Tenant/ISysTenantService.cs index 6d46002..f0a93d5 100644 --- a/Magic.Core/Service/Tenant/ISysTenantService.cs +++ b/GDZZ.Core/Service/Tenant/ISysTenantService.cs @@ -1,9 +1,9 @@ -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysTenantService { diff --git a/Magic.Core/Service/Tenant/SysTenantService.cs b/GDZZ.Core/Service/Tenant/SysTenantService.cs similarity index 99% rename from Magic.Core/Service/Tenant/SysTenantService.cs rename to GDZZ.Core/Service/Tenant/SysTenantService.cs index 9070c5f..11aa4a6 100644 --- a/Magic.Core/Service/Tenant/SysTenantService.cs +++ b/GDZZ.Core/Service/Tenant/SysTenantService.cs @@ -4,7 +4,7 @@ using Furion.DataEncryption; using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Mapster; using Microsoft.AspNetCore.Mvc; @@ -13,7 +13,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 租户服务 diff --git a/Magic.Core/Service/Timer/Dto/JobInput.cs b/GDZZ.Core/Service/Timer/Dto/JobInput.cs similarity index 98% rename from Magic.Core/Service/Timer/Dto/JobInput.cs rename to GDZZ.Core/Service/Timer/Dto/JobInput.cs index 7d6e9ae..e966f66 100644 --- a/Magic.Core/Service/Timer/Dto/JobInput.cs +++ b/GDZZ.Core/Service/Timer/Dto/JobInput.cs @@ -2,7 +2,7 @@ using Furion.TaskScheduler; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 任务调度参数 diff --git a/Magic.Core/Service/Timer/Dto/JobOutput.cs b/GDZZ.Core/Service/Timer/Dto/JobOutput.cs similarity index 98% rename from Magic.Core/Service/Timer/Dto/JobOutput.cs rename to GDZZ.Core/Service/Timer/Dto/JobOutput.cs index 8daea13..046c884 100644 --- a/Magic.Core/Service/Timer/Dto/JobOutput.cs +++ b/GDZZ.Core/Service/Timer/Dto/JobOutput.cs @@ -1,7 +1,7 @@ using Furion.TaskScheduler; using System; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 任务信息---任务详情 diff --git a/Magic.Core/Service/Timer/ISysTimerService.cs b/GDZZ.Core/Service/Timer/ISysTimerService.cs similarity index 94% rename from Magic.Core/Service/Timer/ISysTimerService.cs rename to GDZZ.Core/Service/Timer/ISysTimerService.cs index 2e1cce0..882b883 100644 --- a/Magic.Core/Service/Timer/ISysTimerService.cs +++ b/GDZZ.Core/Service/Timer/ISysTimerService.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysTimerService { diff --git a/Magic.Core/Service/Timer/SysTimerService.cs b/GDZZ.Core/Service/Timer/SysTimerService.cs similarity index 99% rename from Magic.Core/Service/Timer/SysTimerService.cs rename to GDZZ.Core/Service/Timer/SysTimerService.cs index 6a51b42..711d1c4 100644 --- a/Magic.Core/Service/Timer/SysTimerService.cs +++ b/GDZZ.Core/Service/Timer/SysTimerService.cs @@ -7,7 +7,7 @@ using Furion.FriendlyException; using Furion.JsonSerialization; using Furion.RemoteRequest.Extensions; using Furion.TaskScheduler; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Mapster; using Microsoft.AspNetCore.Mvc; using System; @@ -16,7 +16,7 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 任务调度服务 diff --git a/Magic.Core/Service/Trash/Dto/TrashDto.cs b/GDZZ.Core/Service/Trash/Dto/TrashDto.cs similarity index 97% rename from Magic.Core/Service/Trash/Dto/TrashDto.cs rename to GDZZ.Core/Service/Trash/Dto/TrashDto.cs index 3050679..4aec089 100644 --- a/Magic.Core/Service/Trash/Dto/TrashDto.cs +++ b/GDZZ.Core/Service/Trash/Dto/TrashDto.cs @@ -1,7 +1,7 @@ using System; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 回收站输出参数 diff --git a/Magic.Core/Service/Trash/Dto/TrashOutput.cs b/GDZZ.Core/Service/Trash/Dto/TrashOutput.cs similarity index 97% rename from Magic.Core/Service/Trash/Dto/TrashOutput.cs rename to GDZZ.Core/Service/Trash/Dto/TrashOutput.cs index 4be628f..abed626 100644 --- a/Magic.Core/Service/Trash/Dto/TrashOutput.cs +++ b/GDZZ.Core/Service/Trash/Dto/TrashOutput.cs @@ -1,6 +1,6 @@ using System; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 回收站输出参数 diff --git a/Magic.Core/Service/Trash/ITrashService.cs b/GDZZ.Core/Service/Trash/ITrashService.cs similarity index 87% rename from Magic.Core/Service/Trash/ITrashService.cs rename to GDZZ.Core/Service/Trash/ITrashService.cs index 6e736d6..5eb1cd1 100644 --- a/Magic.Core/Service/Trash/ITrashService.cs +++ b/GDZZ.Core/Service/Trash/ITrashService.cs @@ -1,7 +1,7 @@  using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ITrashService { diff --git a/Magic.Core/Service/Trash/TrashService.cs b/GDZZ.Core/Service/Trash/TrashService.cs similarity index 99% rename from Magic.Core/Service/Trash/TrashService.cs rename to GDZZ.Core/Service/Trash/TrashService.cs index a7935fa..bf9c5c8 100644 --- a/Magic.Core/Service/Trash/TrashService.cs +++ b/GDZZ.Core/Service/Trash/TrashService.cs @@ -3,7 +3,7 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.EventBus; using Furion.FriendlyException; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using SqlSugar; @@ -11,7 +11,7 @@ using System; using System.Linq; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 回收站服务 diff --git a/Magic.Core/Service/User/Dto/AuthToken.cs b/GDZZ.Core/Service/User/Dto/AuthToken.cs similarity index 96% rename from Magic.Core/Service/User/Dto/AuthToken.cs rename to GDZZ.Core/Service/User/Dto/AuthToken.cs index 55dd398..81ef45a 100644 --- a/Magic.Core/Service/User/Dto/AuthToken.cs +++ b/GDZZ.Core/Service/User/Dto/AuthToken.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// AuthToken参数 diff --git a/Magic.Core/Service/User/Dto/AuthUserInput.cs b/GDZZ.Core/Service/User/Dto/AuthUserInput.cs similarity index 94% rename from Magic.Core/Service/User/Dto/AuthUserInput.cs rename to GDZZ.Core/Service/User/Dto/AuthUserInput.cs index 63bf266..1f3d17a 100644 --- a/Magic.Core/Service/User/Dto/AuthUserInput.cs +++ b/GDZZ.Core/Service/User/Dto/AuthUserInput.cs @@ -1,4 +1,4 @@ -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// OAuth用户参数 diff --git a/Magic.Core/Service/User/Dto/UserInput.cs b/GDZZ.Core/Service/User/Dto/UserInput.cs similarity index 99% rename from Magic.Core/Service/User/Dto/UserInput.cs rename to GDZZ.Core/Service/User/Dto/UserInput.cs index ac25741..344e2e2 100644 --- a/Magic.Core/Service/User/Dto/UserInput.cs +++ b/GDZZ.Core/Service/User/Dto/UserInput.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 用户参数 diff --git a/Magic.Core/Service/User/Dto/UserOutput.cs b/GDZZ.Core/Service/User/Dto/UserOutput.cs similarity index 97% rename from Magic.Core/Service/User/Dto/UserOutput.cs rename to GDZZ.Core/Service/User/Dto/UserOutput.cs index 69fe960..87c925b 100644 --- a/Magic.Core/Service/User/Dto/UserOutput.cs +++ b/GDZZ.Core/Service/User/Dto/UserOutput.cs @@ -1,6 +1,6 @@ using System; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 用户参数 diff --git a/Magic.Core/Service/User/ISysUserDataScopeService.cs b/GDZZ.Core/Service/User/ISysUserDataScopeService.cs similarity index 91% rename from Magic.Core/Service/User/ISysUserDataScopeService.cs rename to GDZZ.Core/Service/User/ISysUserDataScopeService.cs index c2b3446..9bec7e6 100644 --- a/Magic.Core/Service/User/ISysUserDataScopeService.cs +++ b/GDZZ.Core/Service/User/ISysUserDataScopeService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysUserDataScopeService { diff --git a/Magic.Core/Service/User/ISysUserRoleService.cs b/GDZZ.Core/Service/User/ISysUserRoleService.cs similarity index 92% rename from Magic.Core/Service/User/ISysUserRoleService.cs rename to GDZZ.Core/Service/User/ISysUserRoleService.cs index 582ed2e..4857675 100644 --- a/Magic.Core/Service/User/ISysUserRoleService.cs +++ b/GDZZ.Core/Service/User/ISysUserRoleService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysUserRoleService { diff --git a/Magic.Core/Service/User/ISysUserService.cs b/GDZZ.Core/Service/User/ISysUserService.cs similarity index 97% rename from Magic.Core/Service/User/ISysUserService.cs rename to GDZZ.Core/Service/User/ISysUserService.cs index 0c6482f..40aa34c 100644 --- a/Magic.Core/Service/User/ISysUserService.cs +++ b/GDZZ.Core/Service/User/ISysUserService.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; public interface ISysUserService { diff --git a/Magic.Core/Service/User/SysUserDataScopeService.cs b/GDZZ.Core/Service/User/SysUserDataScopeService.cs similarity index 97% rename from Magic.Core/Service/User/SysUserDataScopeService.cs rename to GDZZ.Core/Service/User/SysUserDataScopeService.cs index 6552303..d67cc4b 100644 --- a/Magic.Core/Service/User/SysUserDataScopeService.cs +++ b/GDZZ.Core/Service/User/SysUserDataScopeService.cs @@ -1,11 +1,11 @@  using Furion.DependencyInjection; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 用户数据范围服务 diff --git a/Magic.Core/Service/User/SysUserRoleService.cs b/GDZZ.Core/Service/User/SysUserRoleService.cs similarity index 98% rename from Magic.Core/Service/User/SysUserRoleService.cs rename to GDZZ.Core/Service/User/SysUserRoleService.cs index 39f7689..f0b27de 100644 --- a/Magic.Core/Service/User/SysUserRoleService.cs +++ b/GDZZ.Core/Service/User/SysUserRoleService.cs @@ -1,11 +1,11 @@ using Furion.DependencyInjection; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 用户角色服务 diff --git a/Magic.Core/Service/User/SysUserService.cs b/GDZZ.Core/Service/User/SysUserService.cs similarity index 99% rename from Magic.Core/Service/User/SysUserService.cs rename to GDZZ.Core/Service/User/SysUserService.cs index cfdc401..991f40b 100644 --- a/Magic.Core/Service/User/SysUserService.cs +++ b/GDZZ.Core/Service/User/SysUserService.cs @@ -3,7 +3,7 @@ using Furion.DataEncryption; using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Mapster; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -16,7 +16,7 @@ using System.Linq; using System.Threading.Tasks; using Yitter.IdGenerator; -namespace Magic.Core.Service; +namespace GDZZ.Core.Service; /// /// 用户服务 diff --git a/Magic.Core/SimpleQueue/SimpleQueue.cs b/GDZZ.Core/SimpleQueue/SimpleQueue.cs similarity index 97% rename from Magic.Core/SimpleQueue/SimpleQueue.cs rename to GDZZ.Core/SimpleQueue/SimpleQueue.cs index 8d8e4d7..9c6bf48 100644 --- a/Magic.Core/SimpleQueue/SimpleQueue.cs +++ b/GDZZ.Core/SimpleQueue/SimpleQueue.cs @@ -1,7 +1,7 @@  using System.Collections.Concurrent; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 简单泛型队列 diff --git a/Magic.Core/SqlSugar/SqlSugarPagedList.cs b/GDZZ.Core/SqlSugar/SqlSugarPagedList.cs similarity index 97% rename from Magic.Core/SqlSugar/SqlSugarPagedList.cs rename to GDZZ.Core/SqlSugar/SqlSugarPagedList.cs index 95dcfe6..dfa2847 100644 --- a/Magic.Core/SqlSugar/SqlSugarPagedList.cs +++ b/GDZZ.Core/SqlSugar/SqlSugarPagedList.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 分页泛型集合 diff --git a/Magic.Core/SqlSugar/SqlSugarRepository.cs b/GDZZ.Core/SqlSugar/SqlSugarRepository.cs similarity index 99% rename from Magic.Core/SqlSugar/SqlSugarRepository.cs rename to GDZZ.Core/SqlSugar/SqlSugarRepository.cs index d204619..7621ccd 100644 --- a/Magic.Core/SqlSugar/SqlSugarRepository.cs +++ b/GDZZ.Core/SqlSugar/SqlSugarRepository.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; -namespace Magic.Core; +namespace GDZZ.Core; /// /// SqlSugar 仓储实现类 diff --git a/Magic.Core/SqlSugar/SqlSugarSetup.cs b/GDZZ.Core/SqlSugar/SqlSugarSetup.cs similarity index 99% rename from Magic.Core/SqlSugar/SqlSugarSetup.cs rename to GDZZ.Core/SqlSugar/SqlSugarSetup.cs index bb4302a..5d1548f 100644 --- a/Magic.Core/SqlSugar/SqlSugarSetup.cs +++ b/GDZZ.Core/SqlSugar/SqlSugarSetup.cs @@ -1,6 +1,6 @@ using Furion; using Furion.Logging.Extensions; -using Magic.Core.Entity; +using GDZZ.Core.Entity; using Microsoft.Extensions.DependencyInjection; using SqlSugar; using System; @@ -11,7 +11,7 @@ using System.Linq; using System.Linq.Dynamic.Core; using System.Linq.Expressions; -namespace Magic.Core; +namespace GDZZ.Core; public static class SqlSugarSetup { diff --git a/Magic.Core/Util/CodeGenUtil.cs b/GDZZ.Core/Util/CodeGenUtil.cs similarity index 99% rename from Magic.Core/Util/CodeGenUtil.cs rename to GDZZ.Core/Util/CodeGenUtil.cs index 3b580b4..95b84a4 100644 --- a/Magic.Core/Util/CodeGenUtil.cs +++ b/GDZZ.Core/Util/CodeGenUtil.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Text.RegularExpressions; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 代码生成帮助类 diff --git a/Magic.Core/Util/Enum/EnumEntity.cs b/GDZZ.Core/Util/Enum/EnumEntity.cs similarity index 94% rename from Magic.Core/Util/Enum/EnumEntity.cs rename to GDZZ.Core/Util/Enum/EnumEntity.cs index 180fd86..1ef06a3 100644 --- a/Magic.Core/Util/Enum/EnumEntity.cs +++ b/GDZZ.Core/Util/Enum/EnumEntity.cs @@ -1,4 +1,4 @@ -namespace Magic.Core; +namespace GDZZ.Core; /// /// 枚举的Entity类 diff --git a/Magic.Core/Util/Enum/EnumUtil.cs b/GDZZ.Core/Util/Enum/EnumUtil.cs similarity index 99% rename from Magic.Core/Util/Enum/EnumUtil.cs rename to GDZZ.Core/Util/Enum/EnumUtil.cs index 22df491..22cef10 100644 --- a/Magic.Core/Util/Enum/EnumUtil.cs +++ b/GDZZ.Core/Util/Enum/EnumUtil.cs @@ -5,7 +5,7 @@ using System.ComponentModel; using System.Linq; using System.Reflection; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 枚举工具类 diff --git a/Magic.Core/Util/Extension/Extension.DateTime.cs b/GDZZ.Core/Util/Extension/Extension.DateTime.cs similarity index 99% rename from Magic.Core/Util/Extension/Extension.DateTime.cs rename to GDZZ.Core/Util/Extension/Extension.DateTime.cs index f11ec6b..ce371f5 100644 --- a/Magic.Core/Util/Extension/Extension.DateTime.cs +++ b/GDZZ.Core/Util/Extension/Extension.DateTime.cs @@ -1,7 +1,7 @@ using System; using System.Globalization; -namespace Magic.Core; +namespace GDZZ.Core; /// /// DateTime扩展 diff --git a/Magic.Core/Util/Extension/Extension.Validate.cs b/GDZZ.Core/Util/Extension/Extension.Validate.cs similarity index 98% rename from Magic.Core/Util/Extension/Extension.Validate.cs rename to GDZZ.Core/Util/Extension/Extension.Validate.cs index 173953b..14c55ca 100644 --- a/Magic.Core/Util/Extension/Extension.Validate.cs +++ b/GDZZ.Core/Util/Extension/Extension.Validate.cs @@ -1,7 +1,7 @@ using System; using Microsoft.AspNetCore.Http; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 验证扩展类 diff --git a/Magic.Core/Util/Extension/Extensions.cs b/GDZZ.Core/Util/Extension/Extensions.cs similarity index 99% rename from Magic.Core/Util/Extension/Extensions.cs rename to GDZZ.Core/Util/Extension/Extensions.cs index 3c1c4a1..5bc4625 100644 --- a/Magic.Core/Util/Extension/Extensions.cs +++ b/GDZZ.Core/Util/Extension/Extensions.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 转换扩展类 diff --git a/Magic.Core/Util/Http/HttpNewUtil.cs b/GDZZ.Core/Util/Http/HttpNewUtil.cs similarity index 99% rename from Magic.Core/Util/Http/HttpNewUtil.cs rename to GDZZ.Core/Util/Http/HttpNewUtil.cs index fb3a2a0..6728fce 100644 --- a/Magic.Core/Util/Http/HttpNewUtil.cs +++ b/GDZZ.Core/Util/Http/HttpNewUtil.cs @@ -9,7 +9,7 @@ using Furion; using Furion.RemoteRequest.Extensions; using UAParser; -namespace Magic.Core; +namespace GDZZ.Core; /// /// HTTP网络工具 diff --git a/Magic.Core/Util/Http/WeatherUtil.cs b/GDZZ.Core/Util/Http/WeatherUtil.cs similarity index 99% rename from Magic.Core/Util/Http/WeatherUtil.cs rename to GDZZ.Core/Util/Http/WeatherUtil.cs index db15f4d..aefe206 100644 --- a/Magic.Core/Util/Http/WeatherUtil.cs +++ b/GDZZ.Core/Util/Http/WeatherUtil.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using Furion.RemoteRequest.Extensions; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 天气预报工具类 diff --git a/Magic.Core/Util/Image/ImageUtil.cs b/GDZZ.Core/Util/Image/ImageUtil.cs similarity index 99% rename from Magic.Core/Util/Image/ImageUtil.cs rename to GDZZ.Core/Util/Image/ImageUtil.cs index e840971..b8aaf34 100644 --- a/Magic.Core/Util/Image/ImageUtil.cs +++ b/GDZZ.Core/Util/Image/ImageUtil.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Threading.Tasks; using Furion.RemoteRequest.Extensions; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 图片工具类 diff --git a/Magic.Core/Util/JsonUtil.cs b/GDZZ.Core/Util/JsonUtil.cs similarity index 99% rename from Magic.Core/Util/JsonUtil.cs rename to GDZZ.Core/Util/JsonUtil.cs index bd97d9a..5a4a398 100644 --- a/Magic.Core/Util/JsonUtil.cs +++ b/GDZZ.Core/Util/JsonUtil.cs @@ -4,7 +4,7 @@ using Furion.JsonSerialization; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace Magic.Core; +namespace GDZZ.Core; /// /// Json序列化工具类 diff --git a/Magic.Core/Util/MachineUtil.cs b/GDZZ.Core/Util/MachineUtil.cs similarity index 99% rename from Magic.Core/Util/MachineUtil.cs rename to GDZZ.Core/Util/MachineUtil.cs index f46f0d7..5738a7d 100644 --- a/Magic.Core/Util/MachineUtil.cs +++ b/GDZZ.Core/Util/MachineUtil.cs @@ -10,7 +10,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 获取服务器信息 diff --git a/Magic.Core/Util/MiniProgram/MiniProgramUtil.cs b/GDZZ.Core/Util/MiniProgram/MiniProgramUtil.cs similarity index 99% rename from Magic.Core/Util/MiniProgram/MiniProgramUtil.cs rename to GDZZ.Core/Util/MiniProgram/MiniProgramUtil.cs index 3cc1c07..6011114 100644 --- a/Magic.Core/Util/MiniProgram/MiniProgramUtil.cs +++ b/GDZZ.Core/Util/MiniProgram/MiniProgramUtil.cs @@ -4,7 +4,7 @@ using System.Text; using System.Text.Json.Serialization; using Furion.JsonSerialization; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 小程序工具类 diff --git a/Magic.Core/Util/OSSClientUtil.cs b/GDZZ.Core/Util/OSSClientUtil.cs similarity index 99% rename from Magic.Core/Util/OSSClientUtil.cs rename to GDZZ.Core/Util/OSSClientUtil.cs index 5ad9ecb..b5dadd4 100644 --- a/Magic.Core/Util/OSSClientUtil.cs +++ b/GDZZ.Core/Util/OSSClientUtil.cs @@ -4,7 +4,7 @@ using System; using System.IO; using System.Net; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 阿里云oss文件上传工具类 diff --git a/Magic.Core/Util/ReflectionUtil.cs b/GDZZ.Core/Util/ReflectionUtil.cs similarity index 96% rename from Magic.Core/Util/ReflectionUtil.cs rename to GDZZ.Core/Util/ReflectionUtil.cs index a29ad75..eb0c4b0 100644 --- a/Magic.Core/Util/ReflectionUtil.cs +++ b/GDZZ.Core/Util/ReflectionUtil.cs @@ -1,7 +1,7 @@ using System; using System.Reflection; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 反射工具 diff --git a/Magic.Core/Util/String/Base64Util.cs b/GDZZ.Core/Util/String/Base64Util.cs similarity index 99% rename from Magic.Core/Util/String/Base64Util.cs rename to GDZZ.Core/Util/String/Base64Util.cs index ead5458..ed4f4f0 100644 --- a/Magic.Core/Util/String/Base64Util.cs +++ b/GDZZ.Core/Util/String/Base64Util.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading; using Newtonsoft.Json; -namespace Magic.Core; +namespace GDZZ.Core; public static class Base64Util { diff --git a/Magic.Core/Util/String/ValidatorUtil.cs b/GDZZ.Core/Util/String/ValidatorUtil.cs similarity index 99% rename from Magic.Core/Util/String/ValidatorUtil.cs rename to GDZZ.Core/Util/String/ValidatorUtil.cs index 06ab6e2..1ece580 100644 --- a/Magic.Core/Util/String/ValidatorUtil.cs +++ b/GDZZ.Core/Util/String/ValidatorUtil.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Text.RegularExpressions; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 字符串验证帮助类 diff --git a/Magic.Core/Util/TreeBuildUtil.cs b/GDZZ.Core/Util/TreeBuildUtil.cs similarity index 98% rename from Magic.Core/Util/TreeBuildUtil.cs rename to GDZZ.Core/Util/TreeBuildUtil.cs index 45ab72d..59475d2 100644 --- a/Magic.Core/Util/TreeBuildUtil.cs +++ b/GDZZ.Core/Util/TreeBuildUtil.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Collections.Generic; -namespace Magic.Core; +namespace GDZZ.Core; /// /// 树基类 diff --git a/Magic.Core/logo.png b/GDZZ.Core/logo.png similarity index 100% rename from Magic.Core/logo.png rename to GDZZ.Core/logo.png diff --git a/Magic.FlowCenter/Entity/FlcCustomForm.cs b/GDZZ.FlowCenter/Entity/FlcCustomForm.cs similarity index 96% rename from Magic.FlowCenter/Entity/FlcCustomForm.cs rename to GDZZ.FlowCenter/Entity/FlcCustomForm.cs index f80ae3a..1221b57 100644 --- a/Magic.FlowCenter/Entity/FlcCustomForm.cs +++ b/GDZZ.FlowCenter/Entity/FlcCustomForm.cs @@ -1,7 +1,7 @@ using SqlSugar; using System; -namespace Magic.FlowCenter.Entity; +namespace GDZZ.FlowCenter.Entity; /// /// 自定义表单 diff --git a/Magic.FlowCenter/Entity/FlcDBEntityTenant.cs b/GDZZ.FlowCenter/Entity/FlcDBEntityTenant.cs similarity index 96% rename from Magic.FlowCenter/Entity/FlcDBEntityTenant.cs rename to GDZZ.FlowCenter/Entity/FlcDBEntityTenant.cs index 9b39347..cd95ba7 100644 --- a/Magic.FlowCenter/Entity/FlcDBEntityTenant.cs +++ b/GDZZ.FlowCenter/Entity/FlcDBEntityTenant.cs @@ -1,6 +1,6 @@ using SqlSugar; -namespace Magic.FlowCenter.Entity; +namespace GDZZ.FlowCenter.Entity; /// /// 自定义租户基类实体 diff --git a/Magic.FlowCenter/Entity/FlcDEntityBase.cs b/GDZZ.FlowCenter/Entity/FlcDEntityBase.cs similarity index 99% rename from Magic.FlowCenter/Entity/FlcDEntityBase.cs rename to GDZZ.FlowCenter/Entity/FlcDEntityBase.cs index 18b5468..c8d0ae2 100644 --- a/Magic.FlowCenter/Entity/FlcDEntityBase.cs +++ b/GDZZ.FlowCenter/Entity/FlcDEntityBase.cs @@ -2,7 +2,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace Magic.FlowCenter.Entity; +namespace GDZZ.FlowCenter.Entity; /// /// 自定义实体基类 diff --git a/Magic.FlowCenter/Entity/FlcFlowInstanceOperationHistory.cs b/GDZZ.FlowCenter/Entity/FlcFlowInstanceOperationHistory.cs similarity index 96% rename from Magic.FlowCenter/Entity/FlcFlowInstanceOperationHistory.cs rename to GDZZ.FlowCenter/Entity/FlcFlowInstanceOperationHistory.cs index 03a47a4..ef9718d 100644 --- a/Magic.FlowCenter/Entity/FlcFlowInstanceOperationHistory.cs +++ b/GDZZ.FlowCenter/Entity/FlcFlowInstanceOperationHistory.cs @@ -1,7 +1,7 @@ using SqlSugar; using System; -namespace Magic.FlowCenter.Entity; +namespace GDZZ.FlowCenter.Entity; /// /// 工作流实例操作记录 diff --git a/Magic.FlowCenter/Entity/FlcFlowInstanceTransitionHistory.cs b/GDZZ.FlowCenter/Entity/FlcFlowInstanceTransitionHistory.cs similarity index 98% rename from Magic.FlowCenter/Entity/FlcFlowInstanceTransitionHistory.cs rename to GDZZ.FlowCenter/Entity/FlcFlowInstanceTransitionHistory.cs index 71de6e0..a2fe329 100644 --- a/Magic.FlowCenter/Entity/FlcFlowInstanceTransitionHistory.cs +++ b/GDZZ.FlowCenter/Entity/FlcFlowInstanceTransitionHistory.cs @@ -1,7 +1,7 @@ using System; using SqlSugar; -namespace Magic.FlowCenter.Entity; +namespace GDZZ.FlowCenter.Entity; /// /// 工作流实例流转历史记录 diff --git a/Magic.FlowCenter/Entity/FlcFlowinstance.cs b/GDZZ.FlowCenter/Entity/FlcFlowinstance.cs similarity index 99% rename from Magic.FlowCenter/Entity/FlcFlowinstance.cs rename to GDZZ.FlowCenter/Entity/FlcFlowinstance.cs index 823a913..66ef9be 100644 --- a/Magic.FlowCenter/Entity/FlcFlowinstance.cs +++ b/GDZZ.FlowCenter/Entity/FlcFlowinstance.cs @@ -1,8 +1,8 @@ using System.ComponentModel.DataAnnotations; -using Magic.Core; +using GDZZ.Core; using SqlSugar; -namespace Magic.FlowCenter.Entity; +namespace GDZZ.FlowCenter.Entity; /// /// 创 建：超级管理员 diff --git a/Magic.FlowCenter/Entity/FlcFlowscheme.cs b/GDZZ.FlowCenter/Entity/FlcFlowscheme.cs similarity index 97% rename from Magic.FlowCenter/Entity/FlcFlowscheme.cs rename to GDZZ.FlowCenter/Entity/FlcFlowscheme.cs index 1cd881e..24be468 100644 --- a/Magic.FlowCenter/Entity/FlcFlowscheme.cs +++ b/GDZZ.FlowCenter/Entity/FlcFlowscheme.cs @@ -1,6 +1,6 @@ -using Magic.Core; +using GDZZ.Core; using SqlSugar; -namespace Magic.FlowCenter.Entity; +namespace GDZZ.FlowCenter.Entity; /// /// 流程 diff --git a/Magic.FlowCenter/Entity/FlcForm.cs b/GDZZ.FlowCenter/Entity/FlcForm.cs similarity index 97% rename from Magic.FlowCenter/Entity/FlcForm.cs rename to GDZZ.FlowCenter/Entity/FlcForm.cs index a1bc1e3..0a3979e 100644 --- a/Magic.FlowCenter/Entity/FlcForm.cs +++ b/GDZZ.FlowCenter/Entity/FlcForm.cs @@ -1,6 +1,6 @@ -using Magic.Core; +using GDZZ.Core; using SqlSugar; -namespace Magic.FlowCenter.Entity; +namespace GDZZ.FlowCenter.Entity; /// /// 表单 diff --git a/Magic.FlowCenter/Entity/FlcInstanceEntity.cs b/GDZZ.FlowCenter/Entity/FlcInstanceEntity.cs similarity index 88% rename from Magic.FlowCenter/Entity/FlcInstanceEntity.cs rename to GDZZ.FlowCenter/Entity/FlcInstanceEntity.cs index c4f9f23..9b39f37 100644 --- a/Magic.FlowCenter/Entity/FlcInstanceEntity.cs +++ b/GDZZ.FlowCenter/Entity/FlcInstanceEntity.cs @@ -1,6 +1,6 @@ using SqlSugar; -namespace Magic.FlowCenter.Entity; +namespace GDZZ.FlowCenter.Entity; /// /// 自定义表单实体 diff --git a/Magic.FlowCenter/Entity/Flow/Flow.cs b/GDZZ.FlowCenter/Entity/Flow/Flow.cs similarity index 97% rename from Magic.FlowCenter/Entity/Flow/Flow.cs rename to GDZZ.FlowCenter/Entity/Flow/Flow.cs index 2e9e650..1bb2122 100644 --- a/Magic.FlowCenter/Entity/Flow/Flow.cs +++ b/GDZZ.FlowCenter/Entity/Flow/Flow.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Magic.FlowCenter.Entity; +namespace GDZZ.FlowCenter.Entity; /// /// 流程 diff --git a/Magic.FlowCenter/Entity/Flow/FlowArea.cs b/GDZZ.FlowCenter/Entity/Flow/FlowArea.cs similarity index 95% rename from Magic.FlowCenter/Entity/Flow/FlowArea.cs rename to GDZZ.FlowCenter/Entity/Flow/FlowArea.cs index 851f14e..8c31b95 100644 --- a/Magic.FlowCenter/Entity/Flow/FlowArea.cs +++ b/GDZZ.FlowCenter/Entity/Flow/FlowArea.cs @@ -1,4 +1,4 @@ -namespace Magic.FlowCenter.Entity; +namespace GDZZ.FlowCenter.Entity; /// /// 流程泳道 diff --git a/Magic.FlowCenter/Entity/Flow/FlowLine.cs b/GDZZ.FlowCenter/Entity/Flow/FlowLine.cs similarity index 99% rename from Magic.FlowCenter/Entity/Flow/FlowLine.cs rename to GDZZ.FlowCenter/Entity/Flow/FlowLine.cs index 9d88aef..2908cce 100644 --- a/Magic.FlowCenter/Entity/Flow/FlowLine.cs +++ b/GDZZ.FlowCenter/Entity/Flow/FlowLine.cs @@ -2,7 +2,7 @@ using System.Linq; using Newtonsoft.Json.Linq; -namespace Magic.FlowCenter.Entity; +namespace GDZZ.FlowCenter.Entity; /// /// 流程连线 diff --git a/Magic.FlowCenter/Entity/Flow/FlowNode.cs b/GDZZ.FlowCenter/Entity/Flow/FlowNode.cs similarity index 99% rename from Magic.FlowCenter/Entity/Flow/FlowNode.cs rename to GDZZ.FlowCenter/Entity/Flow/FlowNode.cs index d9de22c..bd12803 100644 --- a/Magic.FlowCenter/Entity/Flow/FlowNode.cs +++ b/GDZZ.FlowCenter/Entity/Flow/FlowNode.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Magic.FlowCenter.Entity; +namespace GDZZ.FlowCenter.Entity; /// /// 流程节点 diff --git a/Magic.FlowCenter/Entity/Flow/FlowRuntime.cs b/GDZZ.FlowCenter/Entity/Flow/FlowRuntime.cs similarity index 99% rename from Magic.FlowCenter/Entity/Flow/FlowRuntime.cs rename to GDZZ.FlowCenter/Entity/Flow/FlowRuntime.cs index e7989ed..56a1e92 100644 --- a/Magic.FlowCenter/Entity/Flow/FlowRuntime.cs +++ b/GDZZ.FlowCenter/Entity/Flow/FlowRuntime.cs @@ -3,13 +3,13 @@ // // *********************************************************************** -using Magic.Core; +using GDZZ.Core; using System; using System.Collections.Generic; using System.Linq; using System.Net.Http; using System.Text; -namespace Magic.FlowCenter.Entity; +namespace GDZZ.FlowCenter.Entity; /// /// 流程运行类 diff --git a/Magic.FlowCenter/Entity/Flow/FormUtil.cs b/GDZZ.FlowCenter/Entity/Flow/FormUtil.cs similarity index 95% rename from Magic.FlowCenter/Entity/Flow/FormUtil.cs rename to GDZZ.FlowCenter/Entity/Flow/FormUtil.cs index d10bf08..b866fc6 100644 --- a/Magic.FlowCenter/Entity/Flow/FormUtil.cs +++ b/GDZZ.FlowCenter/Entity/Flow/FormUtil.cs @@ -5,7 +5,7 @@ using System.IO; using System.Linq; using System.Reflection; -namespace Magic.FlowCenter.Entity; +namespace GDZZ.FlowCenter.Entity; /// /// 表单工具 @@ -59,7 +59,7 @@ namespace Magic.FlowCenter.Entity; var path = AppDomain.CurrentDomain.RelativeSearchPath ?? AppDomain.CurrentDomain.BaseDirectory; var referencedAssemblies = Directory.GetFiles(path, "*.dll").Select(Assembly.LoadFrom).ToArray(); var t = referencedAssemblies - .SelectMany(a => a.GetTypes().Where(t => t.FullName.Contains("Magic.FlowCenter"+"." + webForm))).First(); + .SelectMany(a => a.GetTypes().Where(t => t.FullName.Contains("GDZZ.FlowCenter"+"." + webForm))).First(); List temp = new List(); PropertyInfo[] pArray = t.GetProperties(); Array.ForEach(pArray, p => diff --git a/Magic.FlowCenter/Entity/Flow/FormValue.cs b/GDZZ.FlowCenter/Entity/Flow/FormValue.cs similarity index 96% rename from Magic.FlowCenter/Entity/Flow/FormValue.cs rename to GDZZ.FlowCenter/Entity/Flow/FormValue.cs index c21419b..b359545 100644 --- a/Magic.FlowCenter/Entity/Flow/FormValue.cs +++ b/GDZZ.FlowCenter/Entity/Flow/FormValue.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Magic.FlowCenter.Entity; +namespace GDZZ.FlowCenter.Entity; /// /// 表单设计类 diff --git a/Magic.FlowCenter/Entity/Flow/NodeDesignate.cs b/GDZZ.FlowCenter/Entity/Flow/NodeDesignate.cs similarity index 94% rename from Magic.FlowCenter/Entity/Flow/NodeDesignate.cs rename to GDZZ.FlowCenter/Entity/Flow/NodeDesignate.cs index 167d3de..0b3334b 100644 --- a/Magic.FlowCenter/Entity/Flow/NodeDesignate.cs +++ b/GDZZ.FlowCenter/Entity/Flow/NodeDesignate.cs @@ -1,4 +1,4 @@ -namespace Magic.FlowCenter.Entity; +namespace GDZZ.FlowCenter.Entity; /// /// 节点执行类 diff --git a/Magic.FlowCenter/Entity/Flow/Verification.cs b/GDZZ.FlowCenter/Entity/Flow/Verification.cs similarity index 95% rename from Magic.FlowCenter/Entity/Flow/Verification.cs rename to GDZZ.FlowCenter/Entity/Flow/Verification.cs index 733fd04..55a75a4 100644 --- a/Magic.FlowCenter/Entity/Flow/Verification.cs +++ b/GDZZ.FlowCenter/Entity/Flow/Verification.cs @@ -1,4 +1,4 @@ -namespace Magic.FlowCenter.Entity; +namespace GDZZ.FlowCenter.Entity; /// /// 流程审核类 diff --git a/Magic.FlowCenter/Enum/CommonFrmType.cs b/GDZZ.FlowCenter/Enum/CommonFrmType.cs similarity index 91% rename from Magic.FlowCenter/Enum/CommonFrmType.cs rename to GDZZ.FlowCenter/Enum/CommonFrmType.cs index dc6e82a..12a9948 100644 --- a/Magic.FlowCenter/Enum/CommonFrmType.cs +++ b/GDZZ.FlowCenter/Enum/CommonFrmType.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Magic.FlowCenter; +namespace GDZZ.FlowCenter; /// /// 表单类型 diff --git a/Magic.FlowCenter/Flowinstance/Dto/FlcFlowinstanceDto.cs b/GDZZ.FlowCenter/Flowinstance/Dto/FlcFlowinstanceDto.cs similarity index 97% rename from Magic.FlowCenter/Flowinstance/Dto/FlcFlowinstanceDto.cs rename to GDZZ.FlowCenter/Flowinstance/Dto/FlcFlowinstanceDto.cs index 02ea8fe..be57a54 100644 --- a/Magic.FlowCenter/Flowinstance/Dto/FlcFlowinstanceDto.cs +++ b/GDZZ.FlowCenter/Flowinstance/Dto/FlcFlowinstanceDto.cs @@ -1,7 +1,7 @@ using System; -using Magic.Core; +using GDZZ.Core; -namespace Magic.FlowCenter.Service; +namespace GDZZ.FlowCenter.Service; /// /// 工作流输出参数 diff --git a/Magic.FlowCenter/Flowinstance/Dto/FlcFlowinstanceInput.cs b/GDZZ.FlowCenter/Flowinstance/Dto/FlcFlowinstanceInput.cs similarity index 98% rename from Magic.FlowCenter/Flowinstance/Dto/FlcFlowinstanceInput.cs rename to GDZZ.FlowCenter/Flowinstance/Dto/FlcFlowinstanceInput.cs index 934f8cc..d57c17e 100644 --- a/Magic.FlowCenter/Flowinstance/Dto/FlcFlowinstanceInput.cs +++ b/GDZZ.FlowCenter/Flowinstance/Dto/FlcFlowinstanceInput.cs @@ -1,8 +1,8 @@ -using Magic.Core; +using GDZZ.Core; using System; using System.ComponentModel.DataAnnotations; -namespace Magic.FlowCenter.Service; +namespace GDZZ.FlowCenter.Service; /// /// 工作流输入参数 diff --git a/Magic.FlowCenter/Flowinstance/Dto/FlcFlowinstanceOutput.cs b/GDZZ.FlowCenter/Flowinstance/Dto/FlcFlowinstanceOutput.cs similarity index 75% rename from Magic.FlowCenter/Flowinstance/Dto/FlcFlowinstanceOutput.cs rename to GDZZ.FlowCenter/Flowinstance/Dto/FlcFlowinstanceOutput.cs index a79f7f6..7e52bde 100644 --- a/Magic.FlowCenter/Flowinstance/Dto/FlcFlowinstanceOutput.cs +++ b/GDZZ.FlowCenter/Flowinstance/Dto/FlcFlowinstanceOutput.cs @@ -1,8 +1,8 @@ -using Magic.Core; -using Magic.FlowCenter.Entity; +using GDZZ.Core; +using GDZZ.FlowCenter.Entity; using System.Collections.Generic; -namespace Magic.FlowCenter.Service; +namespace GDZZ.FlowCenter.Service; /// /// 工作流输出参数 diff --git a/Magic.FlowCenter/Flowinstance/FlcCustomFormService.cs b/GDZZ.FlowCenter/Flowinstance/FlcCustomFormService.cs similarity index 94% rename from Magic.FlowCenter/Flowinstance/FlcCustomFormService.cs rename to GDZZ.FlowCenter/Flowinstance/FlcCustomFormService.cs index 32893d1..00de9cb 100644 --- a/Magic.FlowCenter/Flowinstance/FlcCustomFormService.cs +++ b/GDZZ.FlowCenter/Flowinstance/FlcCustomFormService.cs @@ -1,11 +1,11 @@ using Furion.DependencyInjection; -using Magic.Core; -using Magic.FlowCenter.Entity; +using GDZZ.Core; +using GDZZ.FlowCenter.Entity; using System; using System.Threading.Tasks; using Yitter.IdGenerator; -namespace Magic.FlowCenter.Service; +namespace GDZZ.FlowCenter.Service; /// /// 自定义表格服务 diff --git a/Magic.FlowCenter/Flowinstance/FlcFlowinstanceService.cs b/GDZZ.FlowCenter/Flowinstance/FlcFlowinstanceService.cs similarity index 99% rename from Magic.FlowCenter/Flowinstance/FlcFlowinstanceService.cs rename to GDZZ.FlowCenter/Flowinstance/FlcFlowinstanceService.cs index fe401b0..b69b8fb 100644 --- a/Magic.FlowCenter/Flowinstance/FlcFlowinstanceService.cs +++ b/GDZZ.FlowCenter/Flowinstance/FlcFlowinstanceService.cs @@ -2,10 +2,10 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; -using Magic.Core; -using Magic.Core.Entity; -using Magic.Core.Service; -using Magic.FlowCenter.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; +using GDZZ.Core.Service; +using GDZZ.FlowCenter.Entity; using Mapster; using Microsoft.AspNetCore.Mvc; using SqlSugar; @@ -16,7 +16,7 @@ using System.Net.Http; using System.Threading.Tasks; using Yitter.IdGenerator; -namespace Magic.FlowCenter.Service; +namespace GDZZ.FlowCenter.Service; /// /// 工作流服务 @@ -751,7 +751,7 @@ public class FlcFlowinstanceService : IFlcFlowinstanceService, IDynamicApiContro if (entity.FrmType == FormType.CUSTOMFORM) { var t = App.Assemblies - .SelectMany(a => a.GetTypes().Where(t => t.FullName.Contains("Magic.FlowCenter.") && t.FullName.Contains("." + entity.DbName + "Service"))).First(); + .SelectMany(a => a.GetTypes().Where(t => t.FullName.Contains("GDZZ.FlowCenter.") && t.FullName.Contains("." + entity.DbName + "Service"))).First(); IFlcCustomFormService icf = (IFlcCustomFormService)App.GetService(t); await icf.Add(entity.Id, entity.FrmData); } @@ -860,7 +860,7 @@ public class FlcFlowinstanceService : IFlcFlowinstanceService, IDynamicApiContro if (entity.FrmType == FormType.CUSTOMFORM) { var t = App.Assemblies - .SelectMany(a => a.GetTypes().Where(t => t.FullName.Contains("Magic.FlowCenter.") && t.FullName.Contains("." + entity.DbName + "Service"))).First(); + .SelectMany(a => a.GetTypes().Where(t => t.FullName.Contains("GDZZ.FlowCenter.") && t.FullName.Contains("." + entity.DbName + "Service"))).First(); IFlcCustomFormService icf = (IFlcCustomFormService)App.GetService(t); await icf.Edit(entity.Id, entity.FrmData); diff --git a/Magic.FlowCenter/Flowinstance/IFlcCustomFormService.cs b/GDZZ.FlowCenter/Flowinstance/IFlcCustomFormService.cs similarity index 83% rename from Magic.FlowCenter/Flowinstance/IFlcCustomFormService.cs rename to GDZZ.FlowCenter/Flowinstance/IFlcCustomFormService.cs index 389de44..21f7b83 100644 --- a/Magic.FlowCenter/Flowinstance/IFlcCustomFormService.cs +++ b/GDZZ.FlowCenter/Flowinstance/IFlcCustomFormService.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace Magic.FlowCenter.Service; +namespace GDZZ.FlowCenter.Service; public interface IFlcCustomFormService { diff --git a/Magic.FlowCenter/Flowinstance/IFlcFlowinstanceService.cs b/GDZZ.FlowCenter/Flowinstance/IFlcFlowinstanceService.cs similarity index 90% rename from Magic.FlowCenter/Flowinstance/IFlcFlowinstanceService.cs rename to GDZZ.FlowCenter/Flowinstance/IFlcFlowinstanceService.cs index 112e53e..3e50312 100644 --- a/Magic.FlowCenter/Flowinstance/IFlcFlowinstanceService.cs +++ b/GDZZ.FlowCenter/Flowinstance/IFlcFlowinstanceService.cs @@ -1,8 +1,8 @@ -using Magic.FlowCenter.Entity; +using GDZZ.FlowCenter.Entity; using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.FlowCenter.Service; +namespace GDZZ.FlowCenter.Service; public interface IFlcFlowinstanceService { diff --git a/Magic.FlowCenter/Flowscheme/Dto/FlcFlowschemeInput.cs b/GDZZ.FlowCenter/Flowscheme/Dto/FlcFlowschemeInput.cs similarity index 95% rename from Magic.FlowCenter/Flowscheme/Dto/FlcFlowschemeInput.cs rename to GDZZ.FlowCenter/Flowscheme/Dto/FlcFlowschemeInput.cs index e92a5f4..d5c3e13 100644 --- a/Magic.FlowCenter/Flowscheme/Dto/FlcFlowschemeInput.cs +++ b/GDZZ.FlowCenter/Flowscheme/Dto/FlcFlowschemeInput.cs @@ -1,8 +1,8 @@ -using Magic.Core; +using GDZZ.Core; using System; using System.ComponentModel.DataAnnotations; -namespace Magic.FlowCenter.Service; +namespace GDZZ.FlowCenter.Service; /// /// 流程管理输入参数 diff --git a/Magic.FlowCenter/Flowscheme/Dto/FlcFlowschemeOutput.cs b/GDZZ.FlowCenter/Flowscheme/Dto/FlcFlowschemeOutput.cs similarity index 96% rename from Magic.FlowCenter/Flowscheme/Dto/FlcFlowschemeOutput.cs rename to GDZZ.FlowCenter/Flowscheme/Dto/FlcFlowschemeOutput.cs index ec8c7ab..0593823 100644 --- a/Magic.FlowCenter/Flowscheme/Dto/FlcFlowschemeOutput.cs +++ b/GDZZ.FlowCenter/Flowscheme/Dto/FlcFlowschemeOutput.cs @@ -1,6 +1,6 @@ using System; -namespace Magic.FlowCenter.Service; +namespace GDZZ.FlowCenter.Service; /// /// 流程管理输出参数 diff --git a/Magic.FlowCenter/Flowscheme/FlcFlowschemeService.cs b/GDZZ.FlowCenter/Flowscheme/FlcFlowschemeService.cs similarity index 98% rename from Magic.FlowCenter/Flowscheme/FlcFlowschemeService.cs rename to GDZZ.FlowCenter/Flowscheme/FlcFlowschemeService.cs index c954666..95ff10b 100644 --- a/Magic.FlowCenter/Flowscheme/FlcFlowschemeService.cs +++ b/GDZZ.FlowCenter/Flowscheme/FlcFlowschemeService.cs @@ -1,10 +1,10 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; -using Magic.Core; -using Magic.Core.Entity; -using Magic.Core.Service; -using Magic.FlowCenter.Entity; +using GDZZ.Core; +using GDZZ.Core.Entity; +using GDZZ.Core.Service; +using GDZZ.FlowCenter.Entity; using Mapster; using Microsoft.AspNetCore.Mvc; using SqlSugar; @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Magic.FlowCenter.Service; +namespace GDZZ.FlowCenter.Service; /// /// 流程管理服务 diff --git a/Magic.FlowCenter/Flowscheme/IFlcFlowschemeService.cs b/GDZZ.FlowCenter/Flowscheme/IFlcFlowschemeService.cs similarity index 93% rename from Magic.FlowCenter/Flowscheme/IFlcFlowschemeService.cs rename to GDZZ.FlowCenter/Flowscheme/IFlcFlowschemeService.cs index 273f9b5..bf20766 100644 --- a/Magic.FlowCenter/Flowscheme/IFlcFlowschemeService.cs +++ b/GDZZ.FlowCenter/Flowscheme/IFlcFlowschemeService.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.FlowCenter.Service; +namespace GDZZ.FlowCenter.Service; public interface IFlcFlowschemeService { diff --git a/Magic.FlowCenter/FormManage/Dto/FlcFormInput.cs b/GDZZ.FlowCenter/FormManage/Dto/FlcFormInput.cs similarity index 96% rename from Magic.FlowCenter/FormManage/Dto/FlcFormInput.cs rename to GDZZ.FlowCenter/FormManage/Dto/FlcFormInput.cs index 4d8e674..27dfa85 100644 --- a/Magic.FlowCenter/FormManage/Dto/FlcFormInput.cs +++ b/GDZZ.FlowCenter/FormManage/Dto/FlcFormInput.cs @@ -1,7 +1,7 @@ -using Magic.Core; +using GDZZ.Core; using System.ComponentModel.DataAnnotations; -namespace Magic.FlowCenter.Service; +namespace GDZZ.FlowCenter.Service; /// /// 组织机构参数 diff --git a/Magic.FlowCenter/FormManage/Dto/FlcFormOutput.cs b/GDZZ.FlowCenter/FormManage/Dto/FlcFormOutput.cs similarity index 82% rename from Magic.FlowCenter/FormManage/Dto/FlcFormOutput.cs rename to GDZZ.FlowCenter/FormManage/Dto/FlcFormOutput.cs index 0c5280b..0fc55fd 100644 --- a/Magic.FlowCenter/FormManage/Dto/FlcFormOutput.cs +++ b/GDZZ.FlowCenter/FormManage/Dto/FlcFormOutput.cs @@ -1,4 +1,4 @@ -namespace Magic.FlowCenter.Service; +namespace GDZZ.FlowCenter.Service; /// /// 组织机构参数 diff --git a/Magic.FlowCenter/FormManage/FlcFormManageService.cs b/GDZZ.FlowCenter/FormManage/FlcFormManageService.cs similarity index 96% rename from Magic.FlowCenter/FormManage/FlcFormManageService.cs rename to GDZZ.FlowCenter/FormManage/FlcFormManageService.cs index bdbb275..2550507 100644 --- a/Magic.FlowCenter/FormManage/FlcFormManageService.cs +++ b/GDZZ.FlowCenter/FormManage/FlcFormManageService.cs @@ -2,8 +2,8 @@ using Furion; using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; -using Magic.Core; -using Magic.FlowCenter.Entity; +using GDZZ.Core; +using GDZZ.FlowCenter.Entity; using Mapster; using Microsoft.AspNetCore.Mvc; using SqlSugar; @@ -13,7 +13,7 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; -namespace Magic.FlowCenter.Service; +namespace GDZZ.FlowCenter.Service; /// /// 表单管理 @@ -84,7 +84,7 @@ public class FlcFormManageService : IFlcFormManageService, IDynamicApiController { var dataname = input.WebId.Substring(0, 1).ToUpper() + input.WebId.Substring(1); var t = App.Assemblies - .SelectMany(a => a.GetTypes().Where(t => t.FullName.Contains("Magic.FlowCenter.Entity") && t.FullName.Contains("." + dataname))).First(); + .SelectMany(a => a.GetTypes().Where(t => t.FullName.Contains("GDZZ.FlowCenter.Entity") && t.FullName.Contains("." + dataname))).First(); List list = new List(); List parses = new List(); dynamic obj = Activator.CreateInstance(t); @@ -149,7 +149,7 @@ public class FlcFormManageService : IFlcFormManageService, IDynamicApiController { var dataname = input.WebId.Substring(0, 1).ToUpper() + input.WebId.Substring(1); var t = App.Assemblies - .SelectMany(a => a.GetTypes().Where(t => t.FullName.Contains("Magic.FlowCenter.Entity") && t.FullName.Contains("." + dataname))).First(); + .SelectMany(a => a.GetTypes().Where(t => t.FullName.Contains("GDZZ.FlowCenter.Entity") && t.FullName.Contains("." + dataname))).First(); List list = new List(); List parses = new List(); dynamic obj = Activator.CreateInstance(t); diff --git a/Magic.FlowCenter/FormManage/IFlcFormManageService.cs b/GDZZ.FlowCenter/FormManage/IFlcFormManageService.cs similarity index 86% rename from Magic.FlowCenter/FormManage/IFlcFormManageService.cs rename to GDZZ.FlowCenter/FormManage/IFlcFormManageService.cs index a34e741..ba24fd5 100644 --- a/Magic.FlowCenter/FormManage/IFlcFormManageService.cs +++ b/GDZZ.FlowCenter/FormManage/IFlcFormManageService.cs @@ -1,9 +1,9 @@ -using Magic.FlowCenter.Entity; +using GDZZ.FlowCenter.Entity; using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; using System.Threading.Tasks; -namespace Magic.FlowCenter.Service; +namespace GDZZ.FlowCenter.Service; public interface IFlcFormManageService { diff --git a/Magic.FlowCenter/Magic.FlowCenter.csproj b/GDZZ.FlowCenter/GDZZ.FlowCenter.csproj similarity index 63% rename from Magic.FlowCenter/Magic.FlowCenter.csproj rename to GDZZ.FlowCenter/GDZZ.FlowCenter.csproj index 25d47cc..e3167df 100644 --- a/Magic.FlowCenter/Magic.FlowCenter.csproj +++ b/GDZZ.FlowCenter/GDZZ.FlowCenter.csproj @@ -3,11 +3,11 @@ net7.0 True - Magic.FlowCenter.xml + GDZZ.FlowCenter.xml - + diff --git a/GDZZ.FlowCenter/GDZZ.FlowCenter.xml b/GDZZ.FlowCenter/GDZZ.FlowCenter.xml new file mode 100644 index 0000000..8c668af --- /dev/null +++ b/GDZZ.FlowCenter/GDZZ.FlowCenter.xml @@ -0,0 +1,1871 @@ + + + + GDZZ.FlowCenter + + + + + 自定义表单 + + + + + 名称 + + + + + 排序 + + + + + 备注 + + + + + 创建时间 + + + + + 创建者Id + + + + + 创建者名称 + + + + + 自定义租户基类实体 + + + + + 租户id + + + + + 自定义实体基类 + + + + + 创建时间 + + + + + 更新时间 + + + + + 创建者Id + + + + + 创建者名称 + + + + + 修改者Id + + + + + 修改者名称 + + + + + 软删除 + + + + + 更新信息列 + + + + + + 假删除的列，包含更新信息 + + + + + + 递增主键实体基类 + + + + + 主键Id + + + + + 主键实体基类 + + + + + 主键Id + + + + + 创 建：超级管理员 + 日 期：2020-07-14 09:18 + 描 述：我的流程实体类 + + + + + 流程实例模板Id + + + + + + 实例编号 + + + + + + 自定义名称 + + + + + + 当前节点ID + + + + + + 当前节点类型（0会签节点） + + + + + + 当前节点名称 + + + + + + 前一个ID + + + + + + 流程模板内容 + + + + + + 流程模板ID + + + + + + 数据库名称 + + + + + + 表单数据 + + + + + + 表单类型 + + + + + + 表单中的字段 + + + + + + 表单字段（冗余) + + + + + + 表单参数 + + + + + + 表单ID + + + + + + 流程类型 + + + + + + 等级 + + + + + + 是否完成 + + + + + + 执行人 + + + + + + 所属部门 + + + + + + 状态标识 + + + + + 如果下个执行节点是运行时指定执行者。需要传指定的类型 + 取值为RUNTIME_SPECIAL_ROLE、RUNTIME_SPECIAL_USER + + + + + 如果下个执行节点是运行时指定执行者。该值表示具体的执行者 + 如果NodeDesignateType为RUNTIME_SPECIAL_ROLE，则该值为指定的角色 + 如果NodeDesignateType为RUNTIME_SPECIAL_USER，则该值为指定的用户 + + + + + 下个节点执行人 + + + + + 当前节点执行人 + + + + + 当前节点执行类型 + + + + + 工作流实例操作记录 + + + + + 实例进程Id + + + + + 操作内容 + + + + + 创建时间 + + + + + 创建用户主键 + + + + + 创建用户 + + + + + 工作流实例流转历史记录 + + + + + 实例Id + + + + + 开始节点Id + + + + + 开始节点类型 + + + + + 开始节点名称 + + + + + 结束节点Id + + + + + 结束节点类型 + + + + + 结束节点名称 + + + + + 转化状态 + + + + + 是否结束 + + + + + 转化时间 + + + + + 创建用户主键 + + + + + 创建用户 + + + + + 流程 + + + + + 流程编号 + 默认值: + + + + + 流程名称 + 默认值: + + + + + 流程类型 + 默认值: + + + + + 流程版本 + 默认值: + + + + + 流程使用人 + 默认值: + + + + + 流程内容 + 默认值: + + + + + 表单Id + 默认值: + + + + + 表单类型 + 默认值: + + + + + 权限类型 + 默认值: + + + + + 组织Id + 默认值: + + + + + + 默认值: + + + + + 状态 + 默认值: + + + + + 排序 + 默认值: + + + + + 备注 + 默认值: + + + + + 表单 + + + + + 表单名称 + 默认值: + + + + + 表单类型 + 默认值: + + + + + 自定义表单 + 默认值: + + + + + 字段数 + 默认值: + + + + + 字段 + 默认值: + + + + + 字段格式化 + 默认值: + + + + + 表单内容 + 默认值: + + + + + 数据库备用 + 默认值: + + + + + 组织id + 默认值: + + + + + + 默认值: + + + + + 状态 + 默认值: + + + + + 排序 + 默认值: + + + + + 备注 + 默认值: + + + + + 自定义表单实体 + + + + + 申请流程Id + + + + + 流程 + + + + + 流程配置 + + + + + 参数 + + + + + 状态 + + + + + 连线 + + + + + 节点 + + + + + 泳道 + + + + + 流程配置 + + + + + 网格 + + + + + 文字 + + + + + 图标 + + + + + 参数 + + + + + 流程泳道 + + + + + 泳道Id + + + + + 名称 + + + + + 类型 + + + + + 图标 + + + + + x坐标 + + + + + y坐标 + + + + + 宽度 + + + + + 高度 + + + + + 流程连线 + + + + + 线Id + + + + + 显示 + + + + + 类型 + + + + + 源头节点 + + + + + 目标节点 + + + + + 名称 + + + + + 连接样式 + + + + 分支条件 + + + + 连线比较 + + + + + + + 分支条件 + + + + 操作类型比如大于/等于/小于 + + + form种的字段名称 + + + 字段类型："form"：为表单中的字段，后期扩展系统表等. + + + 实际的值 + + + + 实际值的显示值 + + + + + 显示值 + + + + + 条件关系 + + + + + 连接样式 + + + + + 连接类型 + + + + + 连接颜色 + + + + + + + + + + 流程节点 + + + + + id + + + + + 名称 + + + + + 类型 + + + + + 图标 + + + + + x坐标 + + + + + y左边 + + + + + 宽度 + + + + + 高度 + + + + + 节点的附加数据项 + + The set information. + + + + 节点详细 + + + + + 节点执行权限类型 + + + + + 选择值 + + + + + 选择显示 + + + + + 当前部门 + + + + + 节点编号 + + + + + 节点名称 + + + + + 流程执行时，三方回调的URL地址 + + + + + 驳回节点0"前一步"1"第一步"2"某一步" 3"不处理" + + + + + 节点状态 + + + + + 用户名称 + + + + + 用户Id + + + + + 描述 + + + + + 节点时间 + + + + + 节点会签方式，all/空：默认为全部通过，one ：至少有一个通过 + + + + + 会签通过的个数 + + + + + 会签拒绝的个数 + + + + + 节点执行结果标签 + + + + + 1: 通过 + 2：不通过 + 3：驳回 + + + + + 用户id + + + + + 用户名 + + + + + 描述 + + + + + 时间 + + + + + 1: 通过 + 2：不通过 + 3：驳回 + + + + + 流程运行类 + + + + + 构造函数 + + + + + 获取工作流信息 + + + + + + + 获取工作流节点的字典列表:key节点id + + + + + + + 获取下一个节点 + + + + + 获取上一个节点 + + + + + 获取下一个节点 + + + + + + + 获取实例接下来运行的状态 + + -1无法运行,0会签开始,1会签结束,2一般节点,4流程运行结束 + + + + 获取节点类型 0会签开始,1会签结束,2一般节点,开始节点,4流程运行结束 + + + + + + + 删除节点 + + + + + + 删除全部节点 + + + + + 节点会签审核 + + 会签时，currentNodeId是会签开始节点。这个表示当前正在处理的节点 + + -1不通过,1等待,其它通过 + + + + 获取上一个节点 + + + + + + + + 驳回 + + 驳回类型。null:使用节点配置的驳回类型/0:前一步/1:第一步/2：指定节点，使用NodeRejectStep + + + + + 标记节点1通过，2不通过，3驳回 + + + + + + 获取流程 + + + + + + 通知三方系统，节点执行情况 + + + + + 流程 + + + + + 运行实例的Id + + + + + 开始节点的ID + + + + + 当前节点的ID + + + + + 当前节点类型 0会签开始,1会签结束,2一般节点,开始节点,4流程运行结束 + + + + + 当前节点的对象 + + + + + 下一个节点 + + + + + 下一个节点类型 -1无法运行,0会签开始,1会签结束,2一般节点,4流程运行结束 + + The type of the next node. + + + + 下一个节点对象 + + + + + 上一个节点 + + + + + 实例节点集合 + + + + + 流程实例中所有的线段 + + + + + 从节点发出的线段集合 + + + + + 到达节点的线段集合 + + + + + 表单数据 + + + + + 表单工具 + + + + + 获取值 + + + System.String. + + + + 表单赋值 + + + + + + + + 自定义表单设值 + + + + + + + 表单设计类 + + + + + 表id + + + + + 说明 + + + + + 序号 + + + + + 标签 + + + + + 跨度 + + + + + 表单 + + + + + 名称 + + + + + 表单 + + + + + 跨度 + + + + + 表单设计列表 + + + + + 节点执行类 + + + + + 如果下个执行节点是运行时指定执行者。需要传指定的类型 + 取值为RUNTIME_SPECIAL_ROLE、RUNTIME_SPECIAL_USER + + + + + 如果下个执行节点是运行时指定执行者。该值表示具体的执行者 + 如果NodeDesignateType为RUNTIME_SPECIAL_ROLE，则该值为指定的角色 + 如果NodeDesignateType为RUNTIME_SPECIAL_USER，则该值为指定的用户 + + + + + 流程审核类 + + + + + 流程实例Id + + + + + 1:同意；2：不同意；3：驳回 + + + + + 审核意见 + + + + + 驳回的步骤，即驳回到的节点ID + + + + + 驳回类型。null:使用节点配置的驳回类型/0:前一步/1:第一步/2：指定节点，使用NodeRejectStep + + + + + 表单类型 + + + + + 正常 + + + + + 停用 + + + + + 工作流输出参数 + + + + + Id + + + + + InstanceSchemeId + + + + + Code + + + + + CustomName + + + + + ActivityId + + + + + ActivityType + + + + + ActivityName + + + + + PreviousId + + + + + SchemeContent + + + + + SchemeId + + + + + DbName + + + + + FrmData + + + + + FrmType + + + + + FrmContentData + + + + + FrmContentParse + + + + + FrmId + + + + + SchemeType + + + + + FlowLevel + + + + + IsFinish + + + + + FrmContent + + + + + MakerList + + + + + OrgId + + + + + Active + + + + + Remark + + + + + 工作流输入参数 + + + + + InstanceSchemeId + + + + + Code + + + + + CustomName + + + + + ActivityId + + + + + ActivityType + + + + + ActivityName + + + + + PreviousId + + + + + SchemeContent + + + + + SchemeId + + + + + DbName + + + + + FrmData + + + + + FrmType + + + + + FrmContentData + + + + + FrmContentParse + + + + + FrmId + + + + + SchemeType + + + + + FlowLevel + + + + + IsFinish + + + + + FrmContent + + + + + MakerList + + + + + OrgId + + + + + Active + + + + + Remark + + + + + Id + + + + + Id + + + + + 工作流输出参数 + + + + + 自定义表格服务 + + + + + 新增 + + + + + + + + 编辑 + + + + + + + + 工作流服务 + + + + + 分页查询工作流 + + + + + + + 获取工作流 + + + + + + + 获取工作流列表 + + + Verification + + + + 获取历史 + + + + + + + 驳回 + 如果NodeRejectStep不为空，优先使用；否则按照NodeRejectType驳回 + + + + + + 节点审核 + + + + + + + 寻找下一步的执行人 + 一般用于本节点审核完成后，修改流程实例的当前执行人，可以做到通知等功能 + + + + + + 获取会签开始节点的所有可执行者 + + + + + + + + + 寻找该节点执行人 + + + + + + + + 判定节点需要选择执行人或执行角色 + + + + + + + 返回用于处理流程节点 + + + + + + + 添加扭转记录 + + + + + 添加扭转记录 + + + + + 节点处理 + + + + + + + 新增流程实例 + + + + + + + + 编辑流程实例 + + + + + + + + 删除流程实例 + + + + + + + 撤销流程实例 + + + + + + + 流程管理输入参数 + + + + + 流程Id + + + + + 流程管理输出参数 + + + + + 流程Id + + + + + 如果下个执行节点是运行时指定执行者。需要传指定的类型 + 取值为RUNTIME_SPECIAL_ROLE、RUNTIME_SPECIAL_USER + + + + + 如果下个执行节点是运行时指定执行者。该值表示具体的执行者 + 如果NodeDesignateType为RUNTIME_SPECIAL_ROLE，则该值为指定的角色 + 如果NodeDesignateType为RUNTIME_SPECIAL_USER，则该值为指定的用户 + + + + + 流程管理服务 + + + + + 分页查询流程管理 + + + + + + + 增加流程管理 + + + + + + + 删除流程管理 + + + + + + + 更新流程管理 + + + + + + + 获取流程管理 + + + + + + + 获取流程管理列表 + + + + + + + 组织机构参数 + + + + + 组织Id + + + + + 名称 + + + + + 排序 + + + + + 备注 + + + + + 状态（字典 0正常 1停用 2删除） + + + + + 名称 + + + + + 机构Id + + + + + 机构Id + + + + + 组织机构参数 + + + + + 表单Id + + + + + 表单管理 + + + + + 分页查询表单 + + + + + + + 获取表单列表 + + + + + + + 增加表单 + + + + + + + 删除表单 + + + + + + + 更新表单 + + + + + + + 获取表单信息 + + + + + + diff --git a/Magic.FlowCenter/Magic.FlowCenter.xml b/GDZZ.FlowCenter/Magic.FlowCenter.xml similarity index 58% rename from Magic.FlowCenter/Magic.FlowCenter.xml rename to GDZZ.FlowCenter/Magic.FlowCenter.xml index 58fbb50..8c668af 100644 --- a/Magic.FlowCenter/Magic.FlowCenter.xml +++ b/GDZZ.FlowCenter/Magic.FlowCenter.xml @@ -1,1017 +1,1017 @@ - Magic.FlowCenter + GDZZ.FlowCenter - + 自定义表单 - + 名称 - + 排序 - + 备注 - + 创建时间 - + 创建者Id - + 创建者名称 - + 自定义租户基类实体 - + 租户id - + 自定义实体基类 - + 创建时间 - + 更新时间 - + 创建者Id - + 创建者名称 - + 修改者Id - + 修改者名称 - + 软删除 - + 更新信息列 - + 假删除的列，包含更新信息 - + 递增主键实体基类 - + 主键Id - + 主键实体基类 - + 主键Id - + 创 建：超级管理员 日 期：2020-07-14 09:18 描 述：我的流程实体类 - + 流程实例模板Id - + 实例编号 - + 自定义名称 - + 当前节点ID - + 当前节点类型（0会签节点） - + 当前节点名称 - + 前一个ID - + 流程模板内容 - + 流程模板ID - + 数据库名称 - + 表单数据 - + 表单类型 - + 表单中的字段 - + 表单字段（冗余) - + 表单参数 - + 表单ID - + 流程类型 - + 等级 - + 是否完成 - + 执行人 - + 所属部门 - + 状态标识 - + 如果下个执行节点是运行时指定执行者。需要传指定的类型 取值为RUNTIME_SPECIAL_ROLE、RUNTIME_SPECIAL_USER - + 如果下个执行节点是运行时指定执行者。该值表示具体的执行者 如果NodeDesignateType为RUNTIME_SPECIAL_ROLE，则该值为指定的角色 如果NodeDesignateType为RUNTIME_SPECIAL_USER，则该值为指定的用户 - + 下个节点执行人 - + 当前节点执行人 - + 当前节点执行类型 - + 工作流实例操作记录 - + 实例进程Id - + 操作内容 - + 创建时间 - + 创建用户主键 - + 创建用户 - + 工作流实例流转历史记录 - + 实例Id - + 开始节点Id - + 开始节点类型 - + 开始节点名称 - + 结束节点Id - + 结束节点类型 - + 结束节点名称 - + 转化状态 - + 是否结束 - + 转化时间 - + 创建用户主键 - + 创建用户 - + 流程 - + 流程编号 默认值: - + 流程名称 默认值: - + 流程类型 默认值: - + 流程版本 默认值: - + 流程使用人 默认值: - + 流程内容 默认值: - + 表单Id 默认值: - + 表单类型 默认值: - + 权限类型 默认值: - + 组织Id 默认值: - + 默认值: - + 状态 默认值: - + 排序 默认值: - + 备注 默认值: - + 表单 - + 表单名称 默认值: - + 表单类型 默认值: - + 自定义表单 默认值: - + 字段数 默认值: - + 字段 默认值: - + 字段格式化 默认值: - + 表单内容 默认值: - + 数据库备用 默认值: - + 组织id 默认值: - + 默认值: - + 状态 默认值: - + 排序 默认值: - + 备注 默认值: - + 自定义表单实体 - + 申请流程Id - + 流程 - + 流程配置 - + 参数 - + 状态 - + 连线 - + 节点 - + 泳道 - + 流程配置 - + 网格 - + 文字 - + 图标 - + 参数 - + 流程泳道 - + 泳道Id - + 名称 - + 类型 - + 图标 - + x坐标 - + y坐标 - + 宽度 - + 高度 - + 流程连线 - + 线Id - + 显示 - + 类型 - + 源头节点 - + 目标节点 - + 名称 - + 连接样式 - + 分支条件 - + 连线比较 - + 分支条件 - + 操作类型比如大于/等于/小于 - + form种的字段名称 - + 字段类型："form"：为表单中的字段，后期扩展系统表等. - + 实际的值 - + 实际值的显示值 - + 显示值 - + 条件关系 - + 连接样式 - + 连接类型 - + 连接颜色 - + - + 流程节点 - + id - + 名称 - + 类型 - + 图标 - + x坐标 - + y左边 - + 宽度 - + 高度 - + 节点的附加数据项 The set information. - + 节点详细 - + 节点执行权限类型 - + 选择值 - + 选择显示 - + 当前部门 - + 节点编号 - + 节点名称 - + 流程执行时，三方回调的URL地址 - + 驳回节点0"前一步"1"第一步"2"某一步" 3"不处理" - + 节点状态 - + 用户名称 - + 用户Id - + 描述 - + 节点时间 - + 节点会签方式，all/空：默认为全部通过，one ：至少有一个通过 - + 会签通过的个数 - + 会签拒绝的个数 - + 节点执行结果标签 - + 1: 通过 2：不通过 3：驳回 - + 用户id - + 用户名 - + 描述 - + 时间 - + 1: 通过 2：不通过 3：驳回 - + 流程运行类 - + 构造函数 - + 获取工作流信息 - + 获取工作流节点的字典列表:key节点id - + 获取下一个节点 - + 获取上一个节点 - + 获取下一个节点 - + 获取实例接下来运行的状态 -1无法运行,0会签开始,1会签结束,2一般节点,4流程运行结束 - + 获取节点类型 0会签开始,1会签结束,2一般节点,开始节点,4流程运行结束 - + 删除节点 - + 删除全部节点 - + 节点会签审核 @@ -1019,7 +1019,7 @@ -1不通过,1等待,其它通过 - + 获取上一个节点 @@ -1027,119 +1027,119 @@ - + 驳回 驳回类型。null:使用节点配置的驳回类型/0:前一步/1:第一步/2：指定节点，使用NodeRejectStep - + 标记节点1通过，2不通过，3驳回 - + 获取流程 - + 通知三方系统，节点执行情况 - + 流程 - + 运行实例的Id - + 开始节点的ID - + 当前节点的ID - + 当前节点类型 0会签开始,1会签结束,2一般节点,开始节点,4流程运行结束 - + 当前节点的对象 - + 下一个节点 - + 下一个节点类型 -1无法运行,0会签开始,1会签结束,2一般节点,4流程运行结束 The type of the next node. - + 下一个节点对象 - + 上一个节点 - + 实例节点集合 - + 流程实例中所有的线段 - + 从节点发出的线段集合 - + 到达节点的线段集合 - + 表单数据 - + 表单工具 - + 获取值 System.String. - + 表单赋值 @@ -1147,397 +1147,397 @@ - + 自定义表单设值 - + 表单设计类 - + 表id - + 说明 - + 序号 - + 标签 - + 跨度 - + 表单 - + 名称 - + 表单 - + 跨度 - + 表单设计列表 - + 节点执行类 - + 如果下个执行节点是运行时指定执行者。需要传指定的类型 取值为RUNTIME_SPECIAL_ROLE、RUNTIME_SPECIAL_USER - + 如果下个执行节点是运行时指定执行者。该值表示具体的执行者 如果NodeDesignateType为RUNTIME_SPECIAL_ROLE，则该值为指定的角色 如果NodeDesignateType为RUNTIME_SPECIAL_USER，则该值为指定的用户 - + 流程审核类 - + 流程实例Id - + 1:同意；2：不同意；3：驳回 - + 审核意见 - + 驳回的步骤，即驳回到的节点ID - + 驳回类型。null:使用节点配置的驳回类型/0:前一步/1:第一步/2：指定节点，使用NodeRejectStep - + 表单类型 - + 正常 - + 停用 - + 工作流输出参数 - + Id - + InstanceSchemeId - + Code - + CustomName - + ActivityId - + ActivityType - + ActivityName - + PreviousId - + SchemeContent - + SchemeId - + DbName - + FrmData - + FrmType - + FrmContentData - + FrmContentParse - + FrmId - + SchemeType - + FlowLevel - + IsFinish - + FrmContent - + MakerList - + OrgId - + Active - + Remark - + 工作流输入参数 - + InstanceSchemeId - + Code - + CustomName - + ActivityId - + ActivityType - + ActivityName - + PreviousId - + SchemeContent - + SchemeId - + DbName - + FrmData - + FrmType - + FrmContentData - + FrmContentParse - + FrmId - + SchemeType - + FlowLevel - + IsFinish - + FrmContent - + MakerList - + OrgId - + Active - + Remark - + Id - + Id - + 工作流输出参数 - + 自定义表格服务 - + 新增 @@ -1545,7 +1545,7 @@ - + 编辑 @@ -1553,61 +1553,61 @@ - + 工作流服务 - + 分页查询工作流 - + 获取工作流 - + 获取工作流列表 Verification - + 获取历史 - + 驳回 如果NodeRejectStep不为空，优先使用；否则按照NodeRejectType驳回 - + 节点审核 - + 寻找下一步的执行人 一般用于本节点审核完成后，修改流程实例的当前执行人，可以做到通知等功能 - + 获取会签开始节点的所有可执行者 @@ -1616,7 +1616,7 @@ - + 寻找该节点执行人 @@ -1624,38 +1624,38 @@ - + 判定节点需要选择执行人或执行角色 - + 返回用于处理流程节点 - + 添加扭转记录 - + 添加扭转记录 - + 节点处理 - + 新增流程实例 @@ -1663,7 +1663,7 @@ - + 编辑流程实例 @@ -1671,196 +1671,196 @@ - + 删除流程实例 - + 撤销流程实例 - + 流程管理输入参数 - + 流程Id - + 流程管理输出参数 - + 流程Id - + 如果下个执行节点是运行时指定执行者。需要传指定的类型 取值为RUNTIME_SPECIAL_ROLE、RUNTIME_SPECIAL_USER - + 如果下个执行节点是运行时指定执行者。该值表示具体的执行者 如果NodeDesignateType为RUNTIME_SPECIAL_ROLE，则该值为指定的角色 如果NodeDesignateType为RUNTIME_SPECIAL_USER，则该值为指定的用户 - + 流程管理服务 - + 分页查询流程管理 - + 增加流程管理 - + 删除流程管理 - + 更新流程管理 - + 获取流程管理 - + 获取流程管理列表 - + 组织机构参数 - + 组织Id - + 名称 - + 排序 - + 备注 - + 状态（字典 0正常 1停用 2删除） - + 名称 - + 机构Id - + 机构Id - + 组织机构参数 - + 表单Id - + 表单管理 - + 分页查询表单 - + 获取表单列表 - + 增加表单 - + 删除表单 - + 更新表单 - + 获取表单信息 diff --git a/Magic.FlowCenter/Startup.cs b/GDZZ.FlowCenter/Startup.cs similarity index 88% rename from Magic.FlowCenter/Startup.cs rename to GDZZ.FlowCenter/Startup.cs index b9f12ce..696ffcc 100644 --- a/Magic.FlowCenter/Startup.cs +++ b/GDZZ.FlowCenter/Startup.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using SqlSugar; using System.Linq; -namespace Magic.FlowCenter; +namespace GDZZ.FlowCenter; public class Startup : AppStartup { diff --git a/Magic.Web.Core/Magic.Web.Core.csproj b/GDZZ.Web.Core/GDZZ.Web.Core.csproj similarity index 59% rename from Magic.Web.Core/Magic.Web.Core.csproj rename to GDZZ.Web.Core/GDZZ.Web.Core.csproj index a3daf0f..0bc0119 100644 --- a/Magic.Web.Core/Magic.Web.Core.csproj +++ b/GDZZ.Web.Core/GDZZ.Web.Core.csproj @@ -3,21 +3,21 @@ net7.0 1701;1702;1591 - Magic.Web.Core.xml - Magic.Web.Core + GDZZ.Web.Core.xml + GDZZ.Web.Core - + - + - - + + diff --git a/Magic.Web.Core/Magic.Web.Core.xml b/GDZZ.Web.Core/GDZZ.Web.Core.xml similarity index 60% rename from Magic.Web.Core/Magic.Web.Core.xml rename to GDZZ.Web.Core/GDZZ.Web.Core.xml index eecef91..011289e 100644 --- a/Magic.Web.Core/Magic.Web.Core.xml +++ b/GDZZ.Web.Core/GDZZ.Web.Core.xml @@ -1,17 +1,17 @@ - Magic.Web.Core + GDZZ.Web.Core - + 重写 Handler 添加自动刷新 - + 授权判断逻辑，授权通过返回 true，否则返回 false @@ -19,7 +19,7 @@ - + 检查权限 diff --git a/Magic.Web.Core/Handlers/JwtHandler.cs b/GDZZ.Web.Core/Handlers/JwtHandler.cs similarity index 96% rename from Magic.Web.Core/Handlers/JwtHandler.cs rename to GDZZ.Web.Core/Handlers/JwtHandler.cs index 28364e0..559ee34 100644 --- a/Magic.Web.Core/Handlers/JwtHandler.cs +++ b/GDZZ.Web.Core/Handlers/JwtHandler.cs @@ -1,13 +1,13 @@ using Furion; using Furion.Authorization; using Furion.DataEncryption; -using Magic.Core; -using Magic.Core.Service; +using GDZZ.Core; +using GDZZ.Core.Service; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using System.Threading.Tasks; -namespace Magic.Web.Core; +namespace GDZZ.Web.Core; public class JwtHandler : AppAuthorizeHandler { diff --git a/Magic.Web.Core/Startup.cs b/GDZZ.Web.Core/Startup.cs similarity index 98% rename from Magic.Web.Core/Startup.cs rename to GDZZ.Web.Core/Startup.cs index 65a6f12..9fca1c7 100644 --- a/Magic.Web.Core/Startup.cs +++ b/GDZZ.Web.Core/Startup.cs @@ -1,6 +1,6 @@ using Furion; -using Magic.Core; -using Magic.Core.Service; +using GDZZ.Core; +using GDZZ.Core.Service; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http.Features; @@ -22,7 +22,7 @@ using System.Collections.Generic; using Newtonsoft.Json.Serialization; using Newtonsoft.Json; -namespace Magic.Web.Core; +namespace GDZZ.Web.Core; [AppStartup(9)] public class Startup : AppStartup diff --git a/Magic.Web.Core/applicationconfig.json b/GDZZ.Web.Core/applicationconfig.json similarity index 94% rename from Magic.Web.Core/applicationconfig.json rename to GDZZ.Web.Core/applicationconfig.json index 895f266..6d80600 100644 --- a/Magic.Web.Core/applicationconfig.json +++ b/GDZZ.Web.Core/applicationconfig.json @@ -15,12 +15,12 @@ "InjectSpecificationDocument": true //是否开启swagger }, "SpecificationDocumentSettings": { - "DocumentTitle": "Magic", + "DocumentTitle": "GDZZ", "DocExpansionState": "None", "GroupOpenApiInfos": [ { "Group": "Default", - "Title": "Magic.NET通用权限管理平台", + "Title": "GDZZ.NET通用权限管理平台", "Description": "前后端分离架构，开箱即用，紧随前沿技术。
作者By 蛋蛋,QQ群901868674
https://gitee.com/zhengguojing/admin-net-sqlsugar", "Version": "1.0.0" }, @@ -43,9 +43,9 @@ "ValidateIssuerSigningKey": true, // 是否验证密钥，bool 类型，默认true "IssuerSigningKey": "3c1cbc3f546eda35168c3aa3cb91780fbe703f0996c6d123ea96dc85c70bbc0a", // 密钥，string 类型，必须是复杂密钥，长度大于16 "ValidateIssuer": true, // 是否验证签发方，bool 类型，默认true - "ValidIssuer": "magic", // 签发方，string 类型 + "ValidIssuer": "GDZZ", // 签发方，string 类型 "ValidateAudience": true, // 是否验证签收方，bool 类型，默认true - "ValidAudience": "magic", // 签收方，string 类型 + "ValidAudience": "GDZZ", // 签收方，string 类型 "ValidateLifetime": true, // 是否验证过期时间，bool 类型，默认true，建议true "ExpiredTime": 1440, // 过期时间，long 类型，单位分钟，默认20分钟 "ClockSkew": 5 // 过期时间容错值，long 类型，单位秒，默认5秒 @@ -68,7 +68,7 @@ "UploadFile": { // 阿里云OSS配置 "Aliyun": { - "path": "Magic/Upload", + "path": "GDZZ/Upload", "maxSize": 1048576, "contentType": [ "image/jpg", "image/png", "image/jpeg", "image/gif", "image/bmp", "text/plain", "application/pdf", "application/msword", "application/vnd.ms-excel", "application/vnd.openxmlformats-officedocument.presentationml.presentation" ] }, diff --git a/GDZZ.Web.Core/dbsettings.json b/GDZZ.Web.Core/dbsettings.json new file mode 100644 index 0000000..327d3ed --- /dev/null +++ b/GDZZ.Web.Core/dbsettings.json @@ -0,0 +1,22 @@ +{ + "ConnectionStrings": { + "DefaultDbNumber": "0", + //"DefaultDbType": "Sqlite", + //"DefaultDbString": "Data Source=./GDZZ.db", + //"DefaultDbType": "SqlServer", + //"DefaultDbString": "Server=.;Database=GDZZCodeFirst;User=sa;Password=123456;MultipleActiveResultSets=True;", + "DefaultDbType": "MySql", + "DefaultDbString": "Data Source=127.0.0.1;Database=Magic;User ID=root;Password=zhongzhi2022;pooling=true;port=3306;sslmode=none;CharSet=utf8;Convert Zero Datetime=True;Allow Zero Datetime=True;", + "DbConfigs": [ + { + "DbNumber": "1", + "DbType": "Sqlite", + "DbString": "Data Source=./flow.db" + } + ] + } + //"Sqlite": "Data Source=./GDZZ.db" + //"SqlServer": "Server=.;Database=GDZZ;User=sa;Password=123456;MultipleActiveResultSets=True;", + //"MySql": "Data Source=localhost;Database=GDZZ;User ID=root;Password=123456;pooling=true;port=3306;sslmode=none;CharSet=utf8;Convert Zero Datetime=True;Allow Zero Datetime=True;" + +} \ No newline at end of file diff --git a/Magic.Web.Entry/.config/dotnet-tools.json b/GDZZ.Web.Entry/.config/dotnet-tools.json similarity index 100% rename from Magic.Web.Entry/.config/dotnet-tools.json rename to GDZZ.Web.Entry/.config/dotnet-tools.json diff --git a/Magic.Web.Entry/Controllers/ValuesController.cs b/GDZZ.Web.Entry/Controllers/ValuesController.cs similarity index 84% rename from Magic.Web.Entry/Controllers/ValuesController.cs rename to GDZZ.Web.Entry/Controllers/ValuesController.cs index 0659f1f..30ca7fc 100644 --- a/Magic.Web.Entry/Controllers/ValuesController.cs +++ b/GDZZ.Web.Entry/Controllers/ValuesController.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; -namespace Magic.Web.Entry.Controllers; +namespace GDZZ.Web.Entry.Controllers; [Route("api/[controller]")] [ApiController] diff --git a/Magic.Web.Entry/Dockerfile b/GDZZ.Web.Entry/Dockerfile similarity index 77% rename from Magic.Web.Entry/Dockerfile rename to GDZZ.Web.Entry/Dockerfile index 2217956..726d6d1 100644 --- a/Magic.Web.Entry/Dockerfile +++ b/GDZZ.Web.Entry/Dockerfile @@ -8,10 +8,10 @@ #COPY /wwwroot/Captcha/Font/zkkht.ttf /usr/share/fonts/zkkht.ttf ##安装libgdiplus #RUN apt-get update -y && apt-get install -y libgdiplus && apt-get clean && ln -s /usr/lib/libgdiplus.so /usr/lib/gdiplus.dll -#ENTRYPOINT ["dotnet", "Magic.Web.Entry.dll"] +#ENTRYPOINT ["dotnet", "GDZZ.Web.Entry.dll"] FROM mcr.microsoft.com/dotnet/aspnet:7.0 WORKDIR /app EXPOSE 80 COPY publish/ . -ENTRYPOINT ["dotnet", "Magic.Web.Entry.dll","--urls","http://*:5000"] \ No newline at end of file +ENTRYPOINT ["dotnet", "GDZZ.Web.Entry.dll","--urls","http://*:5000"] \ No newline at end of file diff --git a/Magic.Web.Entry/Magic.Web.Entry.csproj b/GDZZ.Web.Entry/GDZZ.Web.Entry.csproj similarity index 95% rename from Magic.Web.Entry/Magic.Web.Entry.csproj rename to GDZZ.Web.Entry/GDZZ.Web.Entry.csproj index 970e66f..17e577e 100644 --- a/Magic.Web.Entry/Magic.Web.Entry.csproj +++ b/GDZZ.Web.Entry/GDZZ.Web.Entry.csproj @@ -5,7 +5,7 @@ enable aa1cd362-1bdb-4ac9-ad5c-461b3b5b1003 en-US - Magic.Web.Entry + GDZZ.Web.Entry true @@ -29,7 +29,7 @@ Always - + Always @@ -86,7 +86,7 @@ - + diff --git a/Magic.Web.Entry/Magic.db b/GDZZ.Web.Entry/GDZZ.db similarity index 100% rename from Magic.Web.Entry/Magic.db rename to GDZZ.Web.Entry/GDZZ.db diff --git a/Magic.Web.Entry/Program.cs b/GDZZ.Web.Entry/Program.cs similarity index 84% rename from Magic.Web.Entry/Program.cs rename to GDZZ.Web.Entry/Program.cs index 2498402..95a0777 100644 --- a/Magic.Web.Entry/Program.cs +++ b/GDZZ.Web.Entry/Program.cs @@ -1,5 +1,5 @@ -using Magic.Core; +using GDZZ.Core; Serve.Run(RunOptions.Default.ConfigureBuilder(builder => { builder.UseLoggingFile(); diff --git a/Magic.Web.Entry/Properties/launchSettings.json b/GDZZ.Web.Entry/Properties/launchSettings.json similarity index 96% rename from Magic.Web.Entry/Properties/launchSettings.json rename to GDZZ.Web.Entry/Properties/launchSettings.json index 15b3871..2c562cd 100644 --- a/Magic.Web.Entry/Properties/launchSettings.json +++ b/GDZZ.Web.Entry/Properties/launchSettings.json @@ -15,7 +15,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "Magic.Web.Entry": { + "GDZZ.Web.Entry": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { diff --git a/Magic.Web.Entry/SingleFilePublish.cs b/GDZZ.Web.Entry/SingleFilePublish.cs similarity index 85% rename from Magic.Web.Entry/SingleFilePublish.cs rename to GDZZ.Web.Entry/SingleFilePublish.cs index fde3591..0807d98 100644 --- a/Magic.Web.Entry/SingleFilePublish.cs +++ b/GDZZ.Web.Entry/SingleFilePublish.cs @@ -1,7 +1,7 @@ using Furion; using System.Reflection; -namespace Magic.Web.Entry; +namespace GDZZ.Web.Entry; /// /// 解决单文件发布问题 @@ -29,10 +29,10 @@ public class SingleFilePublish : ISingleFilePublish // 需要 Furion 框架扫描哪些程序集就写上去即可 return new[] { - "Magic.Application", - "Magic.Core", - "Magic.FlowCenter", - "Magic.Web.Core" + "GDZZ.Application", + "GDZZ.Core", + "GDZZ.FlowCenter", + "GDZZ.Web.Core" }; } } \ No newline at end of file diff --git a/Magic.Web.Entry/appsettings.Development.json b/GDZZ.Web.Entry/appsettings.Development.json similarity index 100% rename from Magic.Web.Entry/appsettings.Development.json rename to GDZZ.Web.Entry/appsettings.Development.json diff --git a/Magic.Web.Entry/appsettings.json b/GDZZ.Web.Entry/appsettings.json similarity index 100% rename from Magic.Web.Entry/appsettings.json rename to GDZZ.Web.Entry/appsettings.json diff --git a/Magic.Web.Entry/flow.db b/GDZZ.Web.Entry/flow.db similarity index 100% rename from Magic.Web.Entry/flow.db rename to GDZZ.Web.Entry/flow.db diff --git a/Magic.Web.Entry/jenkins-docker.sh b/GDZZ.Web.Entry/jenkins-docker.sh similarity index 96% rename from Magic.Web.Entry/jenkins-docker.sh rename to GDZZ.Web.Entry/jenkins-docker.sh index 31acee9..5c92b95 100644 --- a/Magic.Web.Entry/jenkins-docker.sh +++ b/GDZZ.Web.Entry/jenkins-docker.sh @@ -55,6 +55,6 @@ fi ##启动镜像 echo '=====================run container===================' docker run -p 5000:5000 \ --v /data/magic-service/logs:/app/Logs \ +-v /data/GDZZ-service/logs:/app/Logs \ --restart=always \ --name ${_imageName} -d ${_imageName}:${_tag} diff --git a/Magic.Web.Entry/templates/~0db08c10b01555b1d888f11248a2cc64.dll b/GDZZ.Web.Entry/templates/~0db08c10b01555b1d888f11248a2cc64.dll similarity index 100% rename from Magic.Web.Entry/templates/~0db08c10b01555b1d888f11248a2cc64.dll rename to GDZZ.Web.Entry/templates/~0db08c10b01555b1d888f11248a2cc64.dll diff --git a/Magic.Web.Entry/templates/~159c422bcf43edda31a9bd75256b79f1.dll b/GDZZ.Web.Entry/templates/~159c422bcf43edda31a9bd75256b79f1.dll similarity index 100% rename from Magic.Web.Entry/templates/~159c422bcf43edda31a9bd75256b79f1.dll rename to GDZZ.Web.Entry/templates/~159c422bcf43edda31a9bd75256b79f1.dll diff --git a/Magic.Web.Entry/templates/~19108359356e5efe42dcdf645a2eebfc.dll b/GDZZ.Web.Entry/templates/~19108359356e5efe42dcdf645a2eebfc.dll similarity index 100% rename from Magic.Web.Entry/templates/~19108359356e5efe42dcdf645a2eebfc.dll rename to GDZZ.Web.Entry/templates/~19108359356e5efe42dcdf645a2eebfc.dll diff --git a/Magic.Web.Entry/templates/~2651e0999c391a0b5aba580191e2d6c6.dll b/GDZZ.Web.Entry/templates/~2651e0999c391a0b5aba580191e2d6c6.dll similarity index 100% rename from Magic.Web.Entry/templates/~2651e0999c391a0b5aba580191e2d6c6.dll rename to GDZZ.Web.Entry/templates/~2651e0999c391a0b5aba580191e2d6c6.dll diff --git a/Magic.Web.Entry/templates/~4a6ee469d4d39086077630dd2bed9f1e.dll b/GDZZ.Web.Entry/templates/~4a6ee469d4d39086077630dd2bed9f1e.dll similarity index 100% rename from Magic.Web.Entry/templates/~4a6ee469d4d39086077630dd2bed9f1e.dll rename to GDZZ.Web.Entry/templates/~4a6ee469d4d39086077630dd2bed9f1e.dll diff --git a/Magic.Web.Entry/templates/~59a6eeb9747854ce8e0b0de6194ab0fa.dll b/GDZZ.Web.Entry/templates/~59a6eeb9747854ce8e0b0de6194ab0fa.dll similarity index 100% rename from Magic.Web.Entry/templates/~59a6eeb9747854ce8e0b0de6194ab0fa.dll rename to GDZZ.Web.Entry/templates/~59a6eeb9747854ce8e0b0de6194ab0fa.dll diff --git a/Magic.Web.Entry/templates/~5d908a873d5ce8cd99e004db7bfaaf6c.dll b/GDZZ.Web.Entry/templates/~5d908a873d5ce8cd99e004db7bfaaf6c.dll similarity index 100% rename from Magic.Web.Entry/templates/~5d908a873d5ce8cd99e004db7bfaaf6c.dll rename to GDZZ.Web.Entry/templates/~5d908a873d5ce8cd99e004db7bfaaf6c.dll diff --git a/Magic.Web.Entry/templates/~9e972f810c110f86c9fe70c0e0a4c1fc.dll b/GDZZ.Web.Entry/templates/~9e972f810c110f86c9fe70c0e0a4c1fc.dll similarity index 100% rename from Magic.Web.Entry/templates/~9e972f810c110f86c9fe70c0e0a4c1fc.dll rename to GDZZ.Web.Entry/templates/~9e972f810c110f86c9fe70c0e0a4c1fc.dll diff --git a/Magic.Web.Entry/templates/~bc7b58f116bac34d7af4bef34a87f620.dll b/GDZZ.Web.Entry/templates/~bc7b58f116bac34d7af4bef34a87f620.dll similarity index 100% rename from Magic.Web.Entry/templates/~bc7b58f116bac34d7af4bef34a87f620.dll rename to GDZZ.Web.Entry/templates/~bc7b58f116bac34d7af4bef34a87f620.dll diff --git a/Magic.Web.Entry/templates/~c55ba40db5a21a311a7ab81fad6917a9.dll b/GDZZ.Web.Entry/templates/~c55ba40db5a21a311a7ab81fad6917a9.dll similarity index 100% rename from Magic.Web.Entry/templates/~c55ba40db5a21a311a7ab81fad6917a9.dll rename to GDZZ.Web.Entry/templates/~c55ba40db5a21a311a7ab81fad6917a9.dll diff --git a/Magic.Web.Entry/templates/~dd0b7d0d8022b1fbe3eae0c827b159cf.dll b/GDZZ.Web.Entry/templates/~dd0b7d0d8022b1fbe3eae0c827b159cf.dll similarity index 100% rename from Magic.Web.Entry/templates/~dd0b7d0d8022b1fbe3eae0c827b159cf.dll rename to GDZZ.Web.Entry/templates/~dd0b7d0d8022b1fbe3eae0c827b159cf.dll diff --git a/Magic.Web.Entry/templates/~f322dcae78db006b53da5f26e21dba3b.dll b/GDZZ.Web.Entry/templates/~f322dcae78db006b53da5f26e21dba3b.dll similarity index 100% rename from Magic.Web.Entry/templates/~f322dcae78db006b53da5f26e21dba3b.dll rename to GDZZ.Web.Entry/templates/~f322dcae78db006b53da5f26e21dba3b.dll diff --git a/Magic.Web.Entry/templates/~faa2e001498506525726c745a81c3bef.dll b/GDZZ.Web.Entry/templates/~faa2e001498506525726c745a81c3bef.dll similarity index 100% rename from Magic.Web.Entry/templates/~faa2e001498506525726c745a81c3bef.dll rename to GDZZ.Web.Entry/templates/~faa2e001498506525726c745a81c3bef.dll diff --git a/Magic.Web.Entry/templates/~fb1a575125f1424c84f5d49478aad029.dll b/GDZZ.Web.Entry/templates/~fb1a575125f1424c84f5d49478aad029.dll similarity index 100% rename from Magic.Web.Entry/templates/~fb1a575125f1424c84f5d49478aad029.dll rename to GDZZ.Web.Entry/templates/~fb1a575125f1424c84f5d49478aad029.dll diff --git a/Magic.Web.Entry/templates/~fe0c69bed93ec0b64ba42ef010e76497.dll b/GDZZ.Web.Entry/templates/~fe0c69bed93ec0b64ba42ef010e76497.dll similarity index 100% rename from Magic.Web.Entry/templates/~fe0c69bed93ec0b64ba42ef010e76497.dll rename to GDZZ.Web.Entry/templates/~fe0c69bed93ec0b64ba42ef010e76497.dll diff --git a/Magic.Web.Entry/wwwroot/Captcha/Font/zkkht.ttf b/GDZZ.Web.Entry/wwwroot/Captcha/Font/zkkht.ttf similarity index 100% rename from Magic.Web.Entry/wwwroot/Captcha/Font/zkkht.ttf rename to GDZZ.Web.Entry/wwwroot/Captcha/Font/zkkht.ttf diff --git a/Magic.Web.Entry/wwwroot/Captcha/Image/1.jpg b/GDZZ.Web.Entry/wwwroot/Captcha/Image/1.jpg similarity index 100% rename from Magic.Web.Entry/wwwroot/Captcha/Image/1.jpg rename to GDZZ.Web.Entry/wwwroot/Captcha/Image/1.jpg diff --git a/Magic.Web.Entry/wwwroot/Captcha/Image/2.jpg b/GDZZ.Web.Entry/wwwroot/Captcha/Image/2.jpg similarity index 100% rename from Magic.Web.Entry/wwwroot/Captcha/Image/2.jpg rename to GDZZ.Web.Entry/wwwroot/Captcha/Image/2.jpg diff --git a/Magic.Web.Entry/wwwroot/Captcha/Image/3.jpg b/GDZZ.Web.Entry/wwwroot/Captcha/Image/3.jpg similarity index 100% rename from Magic.Web.Entry/wwwroot/Captcha/Image/3.jpg rename to GDZZ.Web.Entry/wwwroot/Captcha/Image/3.jpg diff --git a/Magic.Web.Entry/wwwroot/Captcha/Image/4.jpg b/GDZZ.Web.Entry/wwwroot/Captcha/Image/4.jpg similarity index 100% rename from Magic.Web.Entry/wwwroot/Captcha/Image/4.jpg rename to GDZZ.Web.Entry/wwwroot/Captcha/Image/4.jpg diff --git a/Magic.Web.Entry/wwwroot/Captcha/Image/5.jpg b/GDZZ.Web.Entry/wwwroot/Captcha/Image/5.jpg similarity index 100% rename from Magic.Web.Entry/wwwroot/Captcha/Image/5.jpg rename to GDZZ.Web.Entry/wwwroot/Captcha/Image/5.jpg diff --git a/Magic.Web.Entry/wwwroot/Captcha/Image/6.jpg b/GDZZ.Web.Entry/wwwroot/Captcha/Image/6.jpg similarity index 100% rename from Magic.Web.Entry/wwwroot/Captcha/Image/6.jpg rename to GDZZ.Web.Entry/wwwroot/Captcha/Image/6.jpg diff --git a/Magic.Web.Entry/wwwroot/Captcha/Image/7.jpg b/GDZZ.Web.Entry/wwwroot/Captcha/Image/7.jpg similarity index 100% rename from Magic.Web.Entry/wwwroot/Captcha/Image/7.jpg rename to GDZZ.Web.Entry/wwwroot/Captcha/Image/7.jpg diff --git a/Magic.Web.Entry/wwwroot/Captcha/Image/8.jpg b/GDZZ.Web.Entry/wwwroot/Captcha/Image/8.jpg similarity index 100% rename from Magic.Web.Entry/wwwroot/Captcha/Image/8.jpg rename to GDZZ.Web.Entry/wwwroot/Captcha/Image/8.jpg diff --git a/Magic.Web.Entry/wwwroot/Template/Dto.cs.vm b/GDZZ.Web.Entry/wwwroot/Template/Dto.cs.vm similarity index 97% rename from Magic.Web.Entry/wwwroot/Template/Dto.cs.vm rename to GDZZ.Web.Entry/wwwroot/Template/Dto.cs.vm index 8f705cd..b928273 100644 --- a/Magic.Web.Entry/wwwroot/Template/Dto.cs.vm +++ b/GDZZ.Web.Entry/wwwroot/Template/Dto.cs.vm @@ -1,5 +1,5 @@ using System; -using Magic.Core; +using GDZZ.Core; namespace @Model.NameSpace { diff --git a/Magic.Web.Entry/wwwroot/Template/Entity.cs.vm b/GDZZ.Web.Entry/wwwroot/Template/Entity.cs.vm similarity index 96% rename from Magic.Web.Entry/wwwroot/Template/Entity.cs.vm rename to GDZZ.Web.Entry/wwwroot/Template/Entity.cs.vm index 98cadcd..9dffa73 100644 --- a/Magic.Web.Entry/wwwroot/Template/Entity.cs.vm +++ b/GDZZ.Web.Entry/wwwroot/Template/Entity.cs.vm @@ -1,8 +1,8 @@ using System; using SqlSugar; using System.ComponentModel; -using Magic.Core.Entity; -namespace Magic.Application.Entity +using GDZZ.Core.Entity; +namespace GDZZ.Application.Entity { /// /// @(@Model.Description) diff --git a/Magic.Web.Entry/wwwroot/Template/IService.cs.vm b/GDZZ.Web.Entry/wwwroot/Template/IService.cs.vm similarity index 91% rename from Magic.Web.Entry/wwwroot/Template/IService.cs.vm rename to GDZZ.Web.Entry/wwwroot/Template/IService.cs.vm index 63b0caa..5569d3a 100644 --- a/Magic.Web.Entry/wwwroot/Template/IService.cs.vm +++ b/GDZZ.Web.Entry/wwwroot/Template/IService.cs.vm @@ -1,7 +1,7 @@ -using Magic.Core; +using GDZZ.Core; using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -using Magic.Application.Entity; +using GDZZ.Application.Entity; namespace @Model.NameSpace { public interface I@(@Model.ClassName)Service diff --git a/Magic.Web.Entry/wwwroot/Template/Input.cs.vm b/GDZZ.Web.Entry/wwwroot/Template/Input.cs.vm similarity index 98% rename from Magic.Web.Entry/wwwroot/Template/Input.cs.vm rename to GDZZ.Web.Entry/wwwroot/Template/Input.cs.vm index e323180..b23f466 100644 --- a/Magic.Web.Entry/wwwroot/Template/Input.cs.vm +++ b/GDZZ.Web.Entry/wwwroot/Template/Input.cs.vm @@ -1,4 +1,4 @@ -using Magic.Core; +using GDZZ.Core; using System; using System.ComponentModel.DataAnnotations; diff --git a/Magic.Web.Entry/wwwroot/Template/Manage.js.vm b/GDZZ.Web.Entry/wwwroot/Template/Manage.js.vm similarity index 100% rename from Magic.Web.Entry/wwwroot/Template/Manage.js.vm rename to GDZZ.Web.Entry/wwwroot/Template/Manage.js.vm diff --git a/Magic.Web.Entry/wwwroot/Template/Output.cs.vm b/GDZZ.Web.Entry/wwwroot/Template/Output.cs.vm similarity index 100% rename from Magic.Web.Entry/wwwroot/Template/Output.cs.vm rename to GDZZ.Web.Entry/wwwroot/Template/Output.cs.vm diff --git a/Magic.Web.Entry/wwwroot/Template/Service.cs.vm b/GDZZ.Web.Entry/wwwroot/Template/Service.cs.vm similarity index 98% rename from Magic.Web.Entry/wwwroot/Template/Service.cs.vm rename to GDZZ.Web.Entry/wwwroot/Template/Service.cs.vm index 032b48e..20ebe2c 100644 --- a/Magic.Web.Entry/wwwroot/Template/Service.cs.vm +++ b/GDZZ.Web.Entry/wwwroot/Template/Service.cs.vm @@ -1,4 +1,4 @@ -using Magic.Core; +using GDZZ.Core; using Furion.DependencyInjection; using Furion.DynamicApiController; using Mapster; @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc; using SqlSugar; using System.Linq; using System.Threading.Tasks; -using Magic.Application.Entity; +using GDZZ.Application.Entity; namespace @Model.NameSpace { /// diff --git a/Magic.Web.Entry/wwwroot/Template/addForm.vue.vm b/GDZZ.Web.Entry/wwwroot/Template/addForm.vue.vm similarity index 100% rename from Magic.Web.Entry/wwwroot/Template/addForm.vue.vm rename to GDZZ.Web.Entry/wwwroot/Template/addForm.vue.vm diff --git a/Magic.Web.Entry/wwwroot/Template/editForm.vue.vm b/GDZZ.Web.Entry/wwwroot/Template/editForm.vue.vm similarity index 100% rename from Magic.Web.Entry/wwwroot/Template/editForm.vue.vm rename to GDZZ.Web.Entry/wwwroot/Template/editForm.vue.vm diff --git a/Magic.Web.Entry/wwwroot/Template/index.vue.vm b/GDZZ.Web.Entry/wwwroot/Template/index.vue.vm similarity index 100% rename from Magic.Web.Entry/wwwroot/Template/index.vue.vm rename to GDZZ.Web.Entry/wwwroot/Template/index.vue.vm diff --git a/Magic.Web.Entry/wwwroot/Upload/Avatar/167456009080901.png b/GDZZ.Web.Entry/wwwroot/Upload/Avatar/167456009080901.png similarity index 100% rename from Magic.Web.Entry/wwwroot/Upload/Avatar/167456009080901.png rename to GDZZ.Web.Entry/wwwroot/Upload/Avatar/167456009080901.png diff --git a/Magic.Web.Entry/wwwroot/Upload/Avatar/167456254419013.png b/GDZZ.Web.Entry/wwwroot/Upload/Avatar/167456254419013.png similarity index 100% rename from Magic.Web.Entry/wwwroot/Upload/Avatar/167456254419013.png rename to GDZZ.Web.Entry/wwwroot/Upload/Avatar/167456254419013.png diff --git a/Magic.Web.Entry/wwwroot/Upload/Avatar/175614800654405.jpeg b/GDZZ.Web.Entry/wwwroot/Upload/Avatar/175614800654405.jpeg similarity index 100% rename from Magic.Web.Entry/wwwroot/Upload/Avatar/175614800654405.jpeg rename to GDZZ.Web.Entry/wwwroot/Upload/Avatar/175614800654405.jpeg diff --git a/Magic.Web.Entry/wwwroot/Upload/Avatar/188632919339077.png b/GDZZ.Web.Entry/wwwroot/Upload/Avatar/188632919339077.png similarity index 100% rename from Magic.Web.Entry/wwwroot/Upload/Avatar/188632919339077.png rename to GDZZ.Web.Entry/wwwroot/Upload/Avatar/188632919339077.png diff --git a/Magic.Web.Entry/wwwroot/Upload/Avatar/263006401138757.jpg b/GDZZ.Web.Entry/wwwroot/Upload/Avatar/263006401138757.jpg similarity index 100% rename from Magic.Web.Entry/wwwroot/Upload/Avatar/263006401138757.jpg rename to GDZZ.Web.Entry/wwwroot/Upload/Avatar/263006401138757.jpg diff --git a/Magic.Web.Entry/wwwroot/Upload/Document/2022/4/27/282067842687045.png b/GDZZ.Web.Entry/wwwroot/Upload/Document/2022/4/27/282067842687045.png similarity index 100% rename from Magic.Web.Entry/wwwroot/Upload/Document/2022/4/27/282067842687045.png rename to GDZZ.Web.Entry/wwwroot/Upload/Document/2022/4/27/282067842687045.png diff --git a/Magic.Web.Entry/wwwroot/Upload/Document/2022/4/27/282118658961477.png b/GDZZ.Web.Entry/wwwroot/Upload/Document/2022/4/27/282118658961477.png similarity index 100% rename from Magic.Web.Entry/wwwroot/Upload/Document/2022/4/27/282118658961477.png rename to GDZZ.Web.Entry/wwwroot/Upload/Document/2022/4/27/282118658961477.png diff --git a/Magic.sln b/GDZZ.sln similarity index 74% rename from Magic.sln rename to GDZZ.sln index be696d4..d6824a4 100644 --- a/Magic.sln +++ b/GDZZ.sln @@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.32112.339 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magic.Web.Core", "Magic.Web.Core\Magic.Web.Core.csproj", "{9D14BB78-DA2A-4040-B9DB-5A515B599181}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GDZZ.Web.Core", "GDZZ.Web.Core\GDZZ.Web.Core.csproj", "{9D14BB78-DA2A-4040-B9DB-5A515B599181}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magic.Core", "Magic.Core\Magic.Core.csproj", "{4FB30091-15C7-4FD9-AB7D-266814F360F5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GDZZ.Core", "GDZZ.Core\GDZZ.Core.csproj", "{4FB30091-15C7-4FD9-AB7D-266814F360F5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magic.Web.Entry", "Magic.Web.Entry\Magic.Web.Entry.csproj", "{9826E365-EEE9-4721-A738-B02AB64D47E5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GDZZ.Web.Entry", "GDZZ.Web.Entry\GDZZ.Web.Entry.csproj", "{9826E365-EEE9-4721-A738-B02AB64D47E5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magic.Application", "Magic.Application\Magic.Application.csproj", "{3B7EE94A-0620-43AD-8A01-18A7771FDEEA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GDZZ.Application", "GDZZ.Application\GDZZ.Application.csproj", "{3B7EE94A-0620-43AD-8A01-18A7771FDEEA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magic.FlowCenter", "Magic.FlowCenter\Magic.FlowCenter.csproj", "{79C7E074-1029-4E65-B8AB-8ED26B4426AF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GDZZ.FlowCenter", "GDZZ.FlowCenter\GDZZ.FlowCenter.csproj", "{79C7E074-1029-4E65-B8AB-8ED26B4426AF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Magic.CodeFirst", "Magic.CodeFirst\Magic.CodeFirst.csproj", "{E75A7323-4369-4EC5-A8BE-5E127C0AC38E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GDZZ.CodeFirst", "GDZZ.CodeFirst\GDZZ.CodeFirst.csproj", "{E75A7323-4369-4EC5-A8BE-5E127C0AC38E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Magic.Application/Entity/RecruitMessage.cs b/Magic.Application/Entity/RecruitMessage.cs deleted file mode 100644 index 55eddd9..0000000 --- a/Magic.Application/Entity/RecruitMessage.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System; -using SqlSugar; -using System.ComponentModel; -using Magic.Core.Entity; -namespace Magic.Application.Entity -{ - /// - /// 招聘消息 - /// - [SugarTable("recruit_message")] - [Description("招聘消息")] - public class RecruitMessage : DEntityBase - { - /// - /// 租户Id - /// - public long TenantId { get; set; } - /// - /// 职位详情 - /// - public string PositionInfo { get; set; } - /// - /// 标题 - /// - public string Title { get; set; } - /// - /// 状态 - /// - public int Status { get; set; } - /// - /// 省份 - /// - public int ProvinceId { get; set; } - /// - /// 城市 - /// - public int CityId { get; set; } - /// - /// 区 - /// - public int AreaId { get; set; } - /// - /// 详细地址 - /// - public int Address { get; set; } - /// - /// 联系电话 - /// - public string Phone { get; set; } - /// - /// 标签 - /// - public string Tag { get; set; } - /// - /// 学历 - /// - public int Education { get; set; } - /// - /// 经验 - /// - public int Experience { get; set; } - } -} \ No newline at end of file diff --git a/Magic.Application/Entity/SysArea.cs b/Magic.Application/Entity/SysArea.cs deleted file mode 100644 index 8da7543..0000000 --- a/Magic.Application/Entity/SysArea.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using SqlSugar; -using System.ComponentModel; -using Magic.Core.Entity; -namespace Magic.Application.Entity -{ - /// - /// 系统地区数据 - /// - [SugarTable("sys_area")] - [Description("系统地区数据")] - public class SysArea : AutoIncrementEntity - { - - /// - /// 父级ID - /// - public Int16 parent_id { get; set; } - /// - /// 地区名 - /// - public string name { get; set; } - } -} \ No newline at end of file diff --git a/Magic.CodeFirst/SeedData/SysCodeGenSeedData.cs b/Magic.CodeFirst/SeedData/SysCodeGenSeedData.cs deleted file mode 100644 index 15e8112..0000000 --- a/Magic.CodeFirst/SeedData/SysCodeGenSeedData.cs +++ /dev/null @@ -1,13 +0,0 @@ -using Magic.Core; -using Magic.Core.Entity; - -namespace Magic.CodeFirst; - -public class SysCodeGenSeedData : ISeedData , ISqlSugarEntitySeedData -{ public IEnumerable HasData() - { string json = @"[{""AuthorName"":""Magic"",""TablePrefix"":null,""GenerateType"":""2"",""TableName"":""Test"",""NameSpace"":""Magic.Application"",""BusName"":""测试"",""MenuApplication"":""busiapp"",""MenuPid"":0,""CreatedTime"":""2022-05-25T09:15:02.367"",""UpdatedTime"":null,""CreatedUserId"":142307070910551,""CreatedUserName"":""超级管理员"",""UpdatedUserId"":null,""UpdatedUserName"":null,""IsDeleted"":false,""Id"":291946907033669}] -"; - List list = JsonUtil.ToObject>(json); - - return list; -}} diff --git a/Magic.Web.Core/dbsettings.json b/Magic.Web.Core/dbsettings.json deleted file mode 100644 index 002e9bd..0000000 --- a/Magic.Web.Core/dbsettings.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "ConnectionStrings": { - "DefaultDbNumber": "0", - //"DefaultDbType": "Sqlite", - //"DefaultDbString": "Data Source=./Magic.db", - //"DefaultDbType": "SqlServer", - //"DefaultDbString": "Server=.;Database=MagicCodeFirst;User=sa;Password=123456;MultipleActiveResultSets=True;", - "DefaultDbType": "MySql", - "DefaultDbString": "Data Source=127.0.0.1;Database=magic;User ID=root;Password=zhongzhi2022;pooling=true;port=3306;sslmode=none;CharSet=utf8;Convert Zero Datetime=True;Allow Zero Datetime=True;", - "DbConfigs": [ - { - "DbNumber": "1", - "DbType": "Sqlite", - "DbString": "Data Source=./flow.db" - } - ] - } - //"Sqlite": "Data Source=./Magic.db" - //"SqlServer": "Server=.;Database=Magic;User=sa;Password=123456;MultipleActiveResultSets=True;", - //"MySql": "Data Source=localhost;Database=Magic;User ID=root;Password=123456;pooling=true;port=3306;sslmode=none;CharSet=utf8;Convert Zero Datetime=True;Allow Zero Datetime=True;" - -} \ No newline at end of file