From a55367271f4cf3b0e7dea037928496345c3e3098 Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Tue, 28 Oct 2025 18:13:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{cpte => jeecg}/common/api/CommonAPI.java | 9 +- .../common/api/dto/AiragFlowDTO.java | 0 .../common/api/dto/DataLogDTO.java | 0 .../common/api/dto/FileDownDTO.java | 0 .../common/api/dto/FileUploadDTO.java | 0 .../common/api/dto/LogDTO.java | 1 - .../common/api/dto/OnlineAuthDTO.java | 0 .../common/api/dto/message/BusMessageDTO.java | 0 .../dto/message/BusTemplateMessageDTO.java | 0 .../common/api/dto/message/MessageDTO.java | 0 .../common/api/dto/message/TemplateDTO.java | 0 .../api/dto/message/TemplateMessageDTO.java | 0 .../{cpte => jeecg}/common/api/vo/Result.java | 0 .../common/aspect/AutoLogAspect.java | 7 +- .../common/aspect/DictAspect.java | 2 +- .../common/aspect/PermissionDataAspect.java | 0 .../common/aspect/UrlMatchEnum.java | 4 +- .../common/aspect/annotation/AutoDict.java | 0 .../common/aspect/annotation/AutoLog.java | 0 .../common/aspect/annotation/Dict.java | 0 .../aspect/annotation/DynamicTable.java | 0 .../common/aspect/annotation/OnlineAuth.java | 0 .../aspect/annotation/PermissionData.java | 0 .../common/constant/CommonConstant.java | 8 +- .../common/constant/CommonSendStatus.java | 20 +- .../common/constant/DataBaseConstant.java | 78 ++-- .../common/constant/DynamicTableConstant.java | 0 .../common/constant/FillRuleConstant.java | 0 .../common/constant/PasswordConstant.java | 0 .../common/constant/ProvinceCityArea.java | 7 +- .../common/constant/ServiceNameConstants.java | 0 .../common/constant/SymbolConstant.java | 0 .../common/constant/TenantConstant.java | 0 .../common/constant/VxeSocketConst.java | 0 .../common/constant/WebsocketConst.java | 0 .../common/constant/enums/CgformEnum.java | 0 .../enums/ClientTerminalTypeEnum.java | 4 +- .../common/constant/enums/DateRangeEnum.java | 0 .../constant/enums/DepartCategoryEnum.java | 0 .../common/constant/enums/DySmsEnum.java | 2 +- .../constant/enums/EmailTemplateEnum.java | 0 .../common/constant/enums/FileTypeEnum.java | 2 +- .../constant/enums/MessageTypeEnum.java | 0 .../common/constant/enums/ModuleType.java | 2 +- .../common/constant/enums/NoticeTypeEnum.java | 0 .../constant/enums/OperateTypeEnum.java | 0 .../constant/enums/PositionLevelEnum.java | 0 .../constant/enums/RoleIndexConfigEnum.java | 0 .../constant/enums/SysAnnmentTypeEnum.java | 0 .../constant/enums/Vue3MessageHrefEnum.java | 0 .../desensitization/SensitiveSerialize.java | 0 .../desensitization/annotation/Sensitive.java | 0 .../annotation/SensitiveDecode.java | 0 .../annotation/SensitiveEncode.java | 0 .../annotation/SensitiveField.java | 0 .../aspect/SensitiveDataAspect.java | 0 .../desensitization/enums/SensitiveEnum.java | 2 +- .../util/SensitiveInfoUtil.java | 7 +- .../common/es/JeecgElasticsearchTemplate.java | 2 +- .../common/es/QueryStringBuilder.java | 0 .../exception/JeecgBoot401Exception.java | 0 .../exception/JeecgBootAssertException.java | 0 .../exception/JeecgBootBizTipException.java | 0 .../common/exception/JeecgBootException.java | 0 .../exception/JeecgBootExceptionHandler.java | 0 .../exception/JeecgSqlInjectionException.java | 0 .../common/handler/IFillRuleHandler.java | 2 +- .../common/system/annotation/EnumDict.java | 0 .../base/controller/JeecgController.java | 0 .../system/base/entity/JeecgEntity.java | 0 .../system/base/service/JeecgService.java | 0 .../base/service/impl/JeecgServiceImpl.java | 0 .../system/enhance/UserFilterEnhance.java | 0 .../common/system/query/MatchTypeEnum.java | 4 +- .../common/system/query/QueryCondition.java | 0 .../common/system/query/QueryGenerator.java | 16 +- .../common/system/query/QueryRuleEnum.java | 0 .../system/util/JeecgDataAutorUtils.java | 4 +- .../common/system/util/JwtUtil.java | 19 +- .../common/system/util/ResourceUtil.java | 2 - .../common/system/util/SqlConcatUtil.java | 9 +- .../common/system/vo/ComboModel.java | 4 +- .../common/system/vo/DictModel.java | 0 .../common/system/vo/DictModelMany.java | 0 .../common/system/vo/DictQuery.java | 0 .../system/vo/DynamicDataSourceModel.java | 0 .../common/system/vo/LoginUser.java | 0 .../common/system/vo/SelectTreeModel.java | 0 .../common/system/vo/SysCategoryModel.java | 1 - .../common/system/vo/SysDepartModel.java | 0 .../common/system/vo/SysFilesModel.java | 0 .../system/vo/SysPermissionDataRuleModel.java | 6 - .../common/system/vo/SysUserCacheInfo.java | 0 .../common/system/vo/UserAccountInfo.java | 3 - .../common/util/AssertUtils.java | 0 .../common/util/BrowserType.java | 0 .../common/util/BrowserUtils.java | 11 +- .../common/util/CommonUtils.java | 13 +- .../common/util/DateRangeUtils.java | 0 .../common/util/DateUtils.java | 3 +- .../common/util/DySmsHelper.java | 0 .../common/util/DySmsLimit.java | 6 +- .../common/util/FileDownloadUtils.java | 16 +- .../common/util/FillRuleUtil.java | 0 .../common/util/HTMLUtils.java | 0 .../common/util/ImportExcelUtil.java | 0 .../{cpte => jeecg}/common/util/IpUtils.java | 2 +- .../{cpte => jeecg}/common/util/Md5Util.java | 2 +- .../common/util/MinioUtil.java | 3 +- .../common/util/MyClassLoader.java | 4 +- .../common/util/PasswordUtil.java | 5 +- .../{cpte => jeecg}/common/util/PmsUtil.java | 0 .../common/util/ReflectHelper.java | 20 +- .../common/util/RestDesformUtil.java | 0 .../{cpte => jeecg}/common/util/RestUtil.java | 0 .../common/util/ShiroThreadPoolExecutor.java | 0 .../common/util/SpringContextUtils.java | 0 .../common/util/SqlInjectionUtil.java | 20 +- .../common/util/TokenUtils.java | 0 .../common/util/UUIDGenerator.java | 6 +- .../common/util/YouBianCodeUtil.java | 4 +- .../util/dynamic/db/DataSourceCachePool.java | 2 +- .../common/util/dynamic/db/DbTypeUtils.java | 0 .../common/util/dynamic/db/DynamicDBUtil.java | 2 - .../dynamic/db/FreemarkerParseFactory.java | 8 +- .../util/encryption/AesEncryptUtil.java | 4 +- .../util/encryption/EncryptedString.java | 0 .../util/filter/SsrfFileTypeFilter.java | 2 +- .../common/util/filter/StrAttackFilter.java | 0 .../common/util/oConvertUtils.java | 75 ++-- .../common/util/oss/OssBootUtil.java | 3 +- .../AbstractQueryBlackListHandler.java | 9 +- .../util/security/JdbcSecurityUtil.java | 0 .../common/util/security/SecurityTools.java | 2 + .../util/security/entity/MyKeyPair.java | 0 .../util/security/entity/SecurityReq.java | 0 .../util/security/entity/SecurityResp.java | 0 .../util/security/entity/SecuritySignReq.java | 0 .../security/entity/SecuritySignResp.java | 0 .../sqlparse/JSqlParserAllTableManager.java | 0 .../common/util/sqlparse/JSqlParserUtils.java | 0 .../util/sqlparse/vo/SelectSqlInfo.java | 0 .../util/superSearch/ObjectParseUtil.java | 0 .../util/superSearch/QueryRuleEnum.java | 0 .../common/util/superSearch/QueryRuleVo.java | 0 .../{cpte => jeecg}/config/AutoPoiConfig.java | 0 .../config/AutoPoiDictConfig.java | 2 +- .../config/CorsFilterCondition.java | 5 +- .../{cpte => jeecg}/config/DruidConfig.java | 0 .../config/DruidWallConfigRegister.java | 2 +- .../config/JeecgBaseConfig.java | 4 +- .../config/JeecgCloudCondition.java | 5 +- .../config/JeecgGaodeBaseConfig.java | 0 .../config/JeecgSmsTemplateConfig.java | 0 .../config/RestTemplateConfig.java | 0 .../{cpte => jeecg}/config/StaticConfig.java | 0 .../config/Swagger2Config.java | 0 .../config/Swagger3Config.java | 0 .../config/UndertowCustomizer.java | 0 .../config/WebMvcConfiguration.java | 0 .../config/WebSocketConfig.java | 0 .../filter/RequestBodyReserveFilter.java | 3 +- .../config/filter/WebsocketFilter.java | 0 .../IDictTableWhiteListHandler.java | 0 .../SqlInjection/SysDictTableWhite.java | 0 .../interceptor/LowCodeModeConfiguration.java | 0 .../interceptor/LowCodeModeInterceptor.java | 0 .../interceptor/enums/LowCodeUrlsEnum.java | 0 .../config/mybatis/JeecgTenantParser.java | 0 .../config/mybatis/MybatisInterceptor.java | 5 +- .../config/mybatis/MybatisPlusSaasConfig.java | 0 .../config/mybatis/TenantContext.java | 0 .../config/mybatis/ThreadLocalDataHelper.java | 0 .../mybatis/aspect/DynamicTableAspect.java | 0 .../DynamicDatasourceInterceptor.java | 0 .../config/oss/MinioConfig.java | 1 - .../config/oss/OssConfiguration.java | 1 - .../config/shiro/IgnoreAuth.java | 0 .../config/shiro/JwtToken.java | 2 +- .../config/shiro/ShiroConfig.java | 1 - .../config/shiro/ShiroRealm.java | 0 .../filters/CustomShiroFilterFactoryBean.java | 2 +- .../config/shiro/filters/JwtFilter.java | 0 .../shiro/filters/ResourceCheckFilter.java | 0 .../shiro/ignore/IgnoreAuthPostProcessor.java | 0 .../shiro/ignore/InMemoryIgnoreAuth.java | 2 +- .../interceptor/SignAuthConfiguration.java | 0 .../sign/interceptor/SignAuthInterceptor.java | 0 .../BodyReaderHttpServletRequestWrapper.java | 5 +- .../config/sign/util/HttpUtils.java | 23 +- .../config/sign/util/SignUtil.java | 10 +- .../{cpte => jeecg}/config/vo/BaiduApi.java | 0 .../{cpte => jeecg}/config/vo/DomainUrl.java | 0 .../config/vo/Elasticsearch.java | 0 .../{cpte => jeecg}/config/vo/Firewall.java | 0 .../{cpte => jeecg}/config/vo/GaoDeApi.java | 0 .../org/{cpte => jeecg}/config/vo/Path.java | 1 - .../org/{cpte => jeecg}/config/vo/Shiro.java | 0 .../{cpte => jeecg}/config/vo/WeiXinPay.java | 0 .../modules/base/mapper/BaseCommonMapper.java | 0 .../base/mapper/xml/BaseCommonMapper.xml | 0 .../base/service/BaseCommonService.java | 0 .../service/impl/BaseCommonServiceImpl.java | 0 .../config/default-spring-doc.properties | 4 +- .../JeecgAiRagApplication.java | 0 .../modules/airag/app/consts/AiAppConsts.java | 2 +- .../modules/airag/app/consts/Prompts.java | 2 +- .../app/controller/AiragAppController.java | 12 +- .../app/controller/AiragChatController.java | 8 +- .../modules/airag/app/entity/AiragApp.java | 2 +- .../airag/app/mapper/AiragAppMapper.java | 4 +- .../airag/app/mapper/xml/AiragAppMapper.xml | 4 +- .../airag/app/service/IAiragAppService.java | 4 +- .../airag/app/service/IAiragChatService.java | 8 +- .../app/service/impl/AiragAppServiceImpl.java | 10 +- .../service/impl/AiragChatServiceImpl.java | 22 +- .../modules/airag/app/vo/AppDebugParams.java | 4 +- .../airag/app/vo/ChatConversation.java | 4 +- .../modules/airag/app/vo/ChatSendParams.java | 2 +- .../modules/airag/demo/JimuDataReader.java | 2 +- .../modules/airag/demo/TestAiragEnhance.java | 2 +- .../llm/config/EmbedStoreConfigBean.java | 2 +- .../airag/llm/config/KnowConfigBean.java | 2 +- .../modules/airag/llm/consts/LLMConsts.java | 2 +- .../controller/AiragKnowledgeController.java | 14 +- .../llm/controller/AiragModelController.java | 12 +- .../llm/document/TikaDocumentParser.java | 20 +- .../airag/llm/entity/AiragKnowledge.java | 2 +- .../airag/llm/entity/AiragKnowledgeDoc.java | 6 +- .../modules/airag/llm/entity/AiragModel.java | 7 +- .../airag/llm/handler/AIChatHandler.java | 8 +- .../airag/llm/handler/CommandExecUtil.java | 2 +- .../airag/llm/handler/EmbeddingHandler.java | 31 +- .../airag/llm/handler/JeecgToolsProvider.java | 4 +- .../llm/mapper/AiragKnowledgeDocMapper.java | 6 +- .../llm/mapper/AiragKnowledgeMapper.java | 4 +- .../airag/llm/mapper/AiragModelMapper.java | 4 +- .../mapper/xml/AiragKnowledgeDocMapper.xml | 2 +- .../llm/mapper/xml/AiragKnowledgeMapper.xml | 4 +- .../airag/llm/mapper/xml/AiragModelMapper.xml | 4 +- .../service/IAiragKnowledgeDocService.java | 4 +- .../llm/service/IAiragKnowledgeService.java | 4 +- .../airag/llm/service/IAiragModelService.java | 4 +- .../impl/AiragKnowledgeDocServiceImpl.java | 18 +- .../impl/AiragKnowledgeServiceImpl.java | 8 +- .../service/impl/AiragModelServiceImpl.java | 8 +- .../airag/ocr/controller/AiOcrController.java | 4 +- .../modules/airag/ocr/entity/AiOcr.java | 2 +- .../modules/airag/test/TestFileParse.java | 0 .../modules/airag/test/TestFlows.java | 0 .../modules/airag/test/TestLLM.java | 0 .../modules/airag/test/TestVector.java | 0 .../controller/JcloudDemoFeignController.java | 2 +- .../JcloudDemoProviderController.java | 2 +- .../demo/cloud/service/JcloudDemoService.java | 2 +- .../service/impl/JcloudDemoServiceImpl.java | 2 +- .../demo/cloud/xxljob/TestJobHandler.java | 2 +- .../modules/demo/mock/MockController.java | 7 +- .../modules/demo/mock/json/area.json | 0 .../modules/demo/mock/json/area_mini.json | 0 .../modules/demo/mock/json/area_options.json | 0 .../demo/mock/json/asyn_tree_list_0.json | 0 .../demo/mock/json/asyn_tree_list_1.json | 0 .../demo/mock/json/asyn_tree_list_2.json | 0 .../demo/mock/json/asyn_tree_list_3.json | 0 .../demo/mock/json/asyn_tree_list_31.json | 0 .../demo/mock/json/getCntrNoCountInfo.json | 0 .../modules/demo/mock/json/getTubiao.json | 0 .../demo/mock/json/graphreport_chart.json | 0 .../modules/demo/mock/json/permission.json | 0 .../demo/mock/json/permission_no_page.json | 0 .../modules/demo/mock/json/role.json | 0 .../modules/demo/mock/json/service.json | 0 .../modules/demo/mock/json/sysdatalog.json | 0 .../modules/demo/mock/json/task_process.json | 0 .../modules/demo/mock/json/user.json | 0 .../modules/demo/mock/json/user_info.json | 0 .../modules/demo/mock/json/userinfo.json | 0 .../demo/mock/json/workplace_activity.json | 0 .../demo/mock/json/workplace_projects.json | 0 .../demo/mock/json/workplace_radar.json | 0 .../demo/mock/json/workplace_teams.json | 0 .../vxe/controller/VxeMockController.java | 7 +- .../demo/mock/vxe/entity/MockEntity.java | 2 +- .../modules/demo/mock/vxe/json/ddjh.json | 0 .../modules/demo/mock/vxe/json/ddjh_s8.json | 0 .../modules/demo/mock/vxe/json/dlglong.json | 0 .../demo/mock/vxe/websocket/VxeSocket.java | 6 +- .../demo/online/OnlCgformDemoController.java | 0 .../BigScreenTemplatController.java | 6 +- .../test/controller/JeecgDemoController.java | 8 +- .../JeecgDynamicDataController.java | 8 +- .../JeecgOrderErpMainController.java | 4 +- .../controller/JeecgOrderMainController.java | 10 +- .../test/controller/JoaDemoController.java | 17 +- .../modules/demo/test/entity/JeecgDemo.java | 26 +- .../demo/test/entity/JeecgOrderCustomer.java | 20 +- .../demo/test/entity/JeecgOrderMain.java | 22 +- .../demo/test/entity/JeecgOrderTicket.java | 12 +- .../modules/demo/test/entity/JoaDemo.java | 16 +- .../demo/test/mapper/JeecgDemoMapper.java | 16 +- .../test/mapper/JeecgOrderCustomerMapper.java | 6 +- .../test/mapper/JeecgOrderMainMapper.java | 2 +- .../test/mapper/JeecgOrderTicketMapper.java | 6 +- .../demo/test/mapper/JoaDemoMapper.java | 2 +- .../demo/test/mapper/xml/JeecgDemoMapper.xml | 6 +- .../mapper/xml/JeecgOrderCustomerMapper.xml | 0 .../test/mapper/xml/JeecgOrderMainMapper.xml | 0 .../mapper/xml/JeecgOrderTicketMapper.xml | 0 .../demo/test/mapper/xml/JoaDemoMapper.xml | 0 .../demo/test/service/IJeecgDemoService.java | 14 +- .../service/IJeecgDynamicDataService.java | 8 +- .../service/IJeecgOrderCustomerService.java | 4 +- .../test/service/IJeecgOrderMainService.java | 12 +- .../service/IJeecgOrderTicketService.java | 4 +- .../demo/test/service/IJoaDemoService.java | 2 +- .../service/impl/JeecgDemoServiceImpl.java | 15 +- .../impl/JeecgDynamicDataServiceImpl.java | 8 +- .../impl/JeecgOrderCustomerServiceImpl.java | 2 +- .../impl/JeecgOrderMainServiceImpl.java | 2 +- .../impl/JeecgOrderTicketServiceImpl.java | 2 +- .../test/service/impl/JoaDemoServiceImpl.java | 2 +- .../demo/test/vo/JeecgOrderMainPage.java | 18 +- .../modules/demo/xxljob/TestJobHandler.java | 2 +- .../dlglong/controller/DlMockController.java | 7 +- .../modules/dlglong/entity/MockEntity.java | 2 +- .../modules/dlglong/json/CarLngLat.json | 0 .../modules/dlglong/json/CarTrace.json | 0 .../modules/dlglong/json/ddjh.json | 0 .../modules/dlglong/json/ddjh_s8.json | 0 .../modules/dlglong/json/dlglong.json | 0 cpte-boot-module/cpte-module-wms/pom.xml | 18 + .../java/org/cpte/modules/agvTask/eee.java | 4 + .../base/controller/AreaController.java | 186 ++++++++ .../base/controller/ItemController.java | 182 ++++++++ .../base/controller/PointController.java | 182 ++++++++ .../base/controller/StockController.java | 182 ++++++++ .../org/cpte/modules/base/entity/Area.java | 80 ++++ .../org/cpte/modules/base/entity/Item.java | 68 +++ .../org/cpte/modules/base/entity/Point.java | 92 ++++ .../org/cpte/modules/base/entity/Stock.java | 76 ++++ .../cpte/modules/base/mapper/AreaMapper.java | 17 + .../cpte/modules/base/mapper/ItemMapper.java | 17 + .../cpte/modules/base/mapper/PointMapper.java | 17 + .../cpte/modules/base/mapper/StockMapper.java | 17 + .../modules/base/mapper/xml/AreaMapper.xml | 2 +- .../modules/base/mapper/xml/ItemMapper.xml | 2 +- .../modules/base/mapper/xml/PointMapper.xml | 5 + .../modules/base/mapper/xml/StockMapper.xml | 5 + .../modules/base/service/IAreaService.java | 14 + .../modules/base/service/IItemService.java | 14 + .../modules/base/service/IPointService.java | 14 + .../modules/base/service/IStockService.java | 14 + .../base/service/impl/AreaServiceImpl.java | 19 + .../base/service/impl/ItemServiceImpl.java | 19 + .../base/service/impl/PointServiceImpl.java | 19 + .../base/service/impl/StockServiceImpl.java | 19 + cpte-boot-module/pom.xml | 1 + .../jeecg/common/system/api/ISysBaseAPI.java | 26 +- .../jeecg/common/system/api/ISysBaseAPI.java | 34 +- .../impl/DictTableWhiteListHandlerImpl.java | 13 +- .../config/init/CodeGenerateDbConfig.java | 2 +- .../config/init/CodeTemplateInitListener.java | 4 +- .../config/init/ShiroCacheClearRunner.java | 2 +- .../config/init/SystemInitListener.java | 4 +- .../config/init/TomcatFactoryConfig.java | 2 +- .../config/init/UndertowConfiguration.java | 0 .../JimuDragExternalServiceImpl.java | 2 +- .../jimureport/JimuReportTokenService.java | 4 +- .../modules/airag/JeecgBizToolsProvider.java | 20 +- .../modules/aop/TenantLog.java | 2 +- .../modules/aop/TenantPackUserLogAspect.java | 44 +- .../api/controller/SystemApiController.java | 17 +- .../cas/controller/CasClientController.java | 14 +- .../modules/cas/util/CasServiceUtil.java | 5 +- .../modules/cas/util/XmlUtils.java | 2 +- .../controller/SysMessageController.java | 6 +- .../SysMessageTemplateController.java | 10 +- .../controller/TestSocketController.java | 4 +- .../modules/message/entity/MsgParams.java | 2 +- .../modules/message/entity/SysMessage.java | 2 +- .../message/entity/SysMessageTemplate.java | 2 +- .../modules/message/enums/RangeDateEnum.java | 2 +- .../message/handle/ISendMsgHandle.java | 2 +- .../handle/enums/SendMsgStatusEnum.java | 4 +- .../message/handle/enums/SendMsgTypeEnum.java | 4 +- .../message/handle/impl/DdSendMsgHandle.java | 6 +- .../handle/impl/EmailSendMsgHandle.java | 21 +- .../handle/impl/QywxSendMsgHandle.java | 6 +- .../message/handle/impl/SmsSendMsgHandle.java | 4 +- .../handle/impl/SystemSendMsgHandle.java | 18 +- .../message/handle/impl/WxSendMsgHandle.java | 4 +- .../modules/message/job/SendMsgJob.java | 8 +- .../message/mapper/SysMessageMapper.java | 4 +- .../mapper/SysMessageTemplateMapper.java | 4 +- .../message/mapper/xml/SysMessageMapper.xml} | 2 +- .../mapper/xml/SysMessageTemplateMapper.xml | 2 +- .../message/service/ISysMessageService.java | 4 +- .../service/ISysMessageTemplateService.java | 4 +- .../service/impl/SysMessageServiceImpl.java | 8 +- .../impl/SysMessageTemplateServiceImpl.java | 8 +- .../modules/message/util/PushMsgUtil.java | 16 +- .../message/websocket/SocketHandler.java | 2 +- .../modules/message/websocket/WebSocket.java | 4 +- .../actuator/CustomActuatorConfig.java | 4 +- .../httptrace/CustomHttpTraceEndpoint.java | 2 +- .../CustomInMemoryHttpTraceRepository.java | 2 +- .../CustomUndertowMetricsHandler.java | 0 .../controller/ActuatorMemoryController.java | 7 +- .../controller/ActuatorRedisController.java | 6 +- .../modules/monitor/domain/RedisInfo.java | 4 +- .../exception/RedisConnectException.java | 2 +- .../modules/monitor/service/RedisService.java | 6 +- .../service/impl/MailHealthIndicator.java | 2 +- .../service/impl/RedisServiceImpl.java | 10 +- .../modules/ngalain/aop/LogRecordAspect.java | 0 .../ngalain/controller/NgAlainController.java | 0 .../ngalain/service/NgAlainService.java | 0 .../service/impl/NgAlainServiceImpl.java | 0 .../controller/OpenApiAuthController.java | 8 +- .../openapi/controller/OpenApiController.java | 24 +- .../controller/OpenApiIndexController.java | 2 +- .../controller/OpenApiLogController.java | 6 +- .../OpenApiPermissionController.java | 6 +- .../modules/openapi/entity/OpenApi.java | 2 +- .../modules/openapi/entity/OpenApiAuth.java | 2 +- .../modules/openapi/entity/OpenApiHeader.java | 2 +- .../modules/openapi/entity/OpenApiLog.java | 2 +- .../modules/openapi/entity/OpenApiParam.java | 2 +- .../openapi/entity/OpenApiPermission.java | 2 +- .../modules/openapi/filter/ApiAuthFilter.java | 21 +- .../openapi/filter/ApiFilterConfig.java | 2 +- .../openapi/generator/AKSKGenerator.java | 2 +- .../openapi/generator/PathGenerator.java | 2 +- .../openapi/mapper/OpenApiAuthMapper.java | 4 +- .../openapi/mapper/OpenApiLogMapper.java | 4 +- .../modules/openapi/mapper/OpenApiMapper.java | 4 +- .../mapper/OpenApiPermissionMapper.java | 4 +- .../openapi/service/OpenApiAuthService.java | 4 +- .../openapi/service/OpenApiLogService.java | 4 +- .../service/OpenApiPermissionService.java | 4 +- .../openapi/service/OpenApiService.java | 4 +- .../service/impl/OpenApiAuthServiceImpl.java | 8 +- .../service/impl/OpenApiLogServiceImpl.java | 8 +- .../impl/OpenApiPermissionServiceImpl.java | 12 +- .../service/impl/OpenApiServiceImpl.java | 8 +- .../openapi/swagger/SwaggerDefinition.java | 2 +- .../swagger/SwaggerDefinitionProperties.java | 2 +- .../modules/openapi/swagger/SwaggerInfo.java | 2 +- .../openapi/swagger/SwaggerInfoContact.java | 2 +- .../openapi/swagger/SwaggerInfoLicense.java | 2 +- .../modules/openapi/swagger/SwaggerModel.java | 2 +- .../openapi/swagger/SwaggerOperation.java | 2 +- .../swagger/SwaggerOperationParameter.java | 2 +- .../swagger/SwaggerOperationResponse.java | 2 +- .../openapi/swagger/SwaggerSchema.java | 2 +- .../modules/openapi/swagger/SwaggerTag.java | 2 +- .../oss/controller/OssFileController.java | 6 +- .../modules/oss/entity/OssFile.java | 2 +- .../modules/oss/mapper/OssFileMapper.java | 4 +- .../modules/oss/service/IOssFileService.java | 4 +- .../oss/service/impl/OssFileServiceImpl.java | 8 +- .../controller/QuartzJobController.java | 8 +- .../modules/quartz/entity/QuartzJob.java | 2 +- .../modules/quartz/job/AsyncJob.java | 2 +- .../modules/quartz/job/SampleJob.java | 2 +- .../modules/quartz/job/SampleParamJob.java | 2 +- .../quartz/mapper/QuartzJobMapper.java | 6 +- .../quartz/mapper/xml/QuartzJobMapper.xml | 4 +- .../quartz/service/IQuartzJobService.java | 4 +- .../service/impl/QuartzJobServiceImpl.java | 8 +- .../system/cache/AuthStateRedisCache.java | 2 +- .../system/config/AuthStateConfiguration.java | 4 +- .../system/constant/DefIndexConst.java | 2 +- .../system/controller/CommonController.java | 5 +- .../controller/DuplicateCheckController.java | 6 +- .../system/controller/LoginController.java | 24 +- .../controller/SysAnnouncementController.java | 22 +- .../SysAnnouncementSendController.java | 10 +- .../controller/SysAppVersionController.java | 6 +- .../controller/SysCategoryController.java | 8 +- .../controller/SysCheckRuleController.java | 9 +- .../controller/SysCommentController.java | 10 +- .../controller/SysDataLogController.java | 8 +- .../controller/SysDataSourceController.java | 8 +- .../controller/SysDepartController.java | 24 +- .../SysDepartPermissionController.java | 20 +- .../controller/SysDepartRoleController.java | 14 +- .../system/controller/SysDictController.java | 27 +- .../controller/SysDictItemController.java | 6 +- .../controller/SysFillRuleController.java | 6 +- .../controller/SysFormFileController.java | 6 +- .../controller/SysGatewayRouteController.java | 6 +- .../system/controller/SysLogController.java | 8 +- .../controller/SysPermissionController.java | 25 +- .../controller/SysPositionController.java | 37 +- .../system/controller/SysRoleController.java | 22 +- .../controller/SysRoleIndexController.java | 10 +- .../SysTableWhiteListController.java | 6 +- .../controller/SysTenantController.java | 26 +- .../controller/SysUploadController.java | 6 +- .../system/controller/SysUserController.java | 32 +- .../controller/SysUserOnlineController.java | 13 +- .../system/controller/ThirdAppController.java | 20 +- .../controller/ThirdLoginController.java | 143 +++--- .../controller/WechatVerifyController.java | 4 +- .../system/entity/SysAnnouncement.java | 2 +- .../system/entity/SysAnnouncementSend.java | 2 +- .../modules/system/entity/SysAppVersion.java | 2 +- .../modules/system/entity/SysCategory.java | 2 +- .../modules/system/entity/SysCheckRule.java | 2 +- .../modules/system/entity/SysComment.java | 2 +- .../modules/system/entity/SysDataLog.java | 2 +- .../modules/system/entity/SysDataSource.java | 2 +- .../modules/system/entity/SysDepart.java | 2 +- .../system/entity/SysDepartPermission.java | 2 +- .../modules/system/entity/SysDepartRole.java | 2 +- .../entity/SysDepartRolePermission.java | 2 +- .../system/entity/SysDepartRoleUser.java | 2 +- .../modules/system/entity/SysDict.java | 2 +- .../modules/system/entity/SysDictItem.java | 2 +- .../modules/system/entity/SysFillRule.java | 2 +- .../modules/system/entity/SysFormFile.java | 2 +- .../system/entity/SysGatewayRoute.java | 2 +- .../modules/system/entity/SysLog.java | 2 +- .../system/entity/SysPackPermission.java | 2 +- .../modules/system/entity/SysPermission.java | 4 +- .../system/entity/SysPermissionDataRule.java | 2 +- .../modules/system/entity/SysPosition.java | 2 +- .../modules/system/entity/SysRole.java | 2 +- .../modules/system/entity/SysRoleIndex.java | 2 +- .../system/entity/SysRolePermission.java | 2 +- .../system/entity/SysTableWhiteList.java | 2 +- .../modules/system/entity/SysTenant.java | 2 +- .../modules/system/entity/SysTenantPack.java | 2 +- .../system/entity/SysTenantPackUser.java | 2 +- .../system/entity/SysThirdAccount.java | 2 +- .../system/entity/SysThirdAppConfig.java | 2 +- .../modules/system/entity/SysUser.java | 2 +- .../modules/system/entity/SysUserDepPost.java | 2 +- .../modules/system/entity/SysUserDepart.java | 2 +- .../system/entity/SysUserPosition.java | 2 +- .../modules/system/entity/SysUserRole.java | 2 +- .../modules/system/entity/SysUserTenant.java | 2 +- .../excelstyle/ExcelExportSysUserStyle.java | 2 +- .../system/mapper/SysAnnouncementMapper.java | 4 +- .../mapper/SysAnnouncementSendMapper.java | 8 +- .../system/mapper/SysCategoryMapper.java | 10 +- .../system/mapper/SysCheckRuleMapper.java | 4 +- .../system/mapper/SysCommentMapper.java | 10 +- .../system/mapper/SysDataLogMapper.java | 6 +- .../system/mapper/SysDataSourceMapper.java | 4 +- .../system/mapper/SysDepartMapper.java | 26 +- .../mapper/SysDepartPermissionMapper.java | 4 +- .../system/mapper/SysDepartRoleMapper.java | 6 +- .../mapper/SysDepartRolePermissionMapper.java | 4 +- .../mapper/SysDepartRoleUserMapper.java | 4 +- .../system/mapper/SysDictItemMapper.java | 6 +- .../modules/system/mapper/SysDictMapper.java | 32 +- .../system/mapper/SysFillRuleMapper.java | 4 +- .../system/mapper/SysFormFileMapper.java | 4 +- .../system/mapper/SysGatewayRouteMapper.java | 4 +- .../modules/system/mapper/SysLogMapper.java | 6 +- .../mapper/SysPackPermissionMapper.java | 4 +- .../mapper/SysPermissionDataRuleMapper.java | 6 +- .../system/mapper/SysPermissionMapper.java | 20 +- .../system/mapper/SysPositionMapper.java | 4 +- .../system/mapper/SysRoleIndexMapper.java | 4 +- .../modules/system/mapper/SysRoleMapper.java | 8 +- .../mapper/SysRolePermissionMapper.java | 4 +- .../mapper/SysTableWhiteListMapper.java | 4 +- .../system/mapper/SysTenantMapper.java | 12 +- .../system/mapper/SysTenantPackMapper.java | 4 +- .../mapper/SysTenantPackUserMapper.java | 6 +- .../system/mapper/SysThirdAccountMapper.java | 6 +- .../mapper/SysThirdAppConfigMapper.java | 4 +- .../system/mapper/SysUserDepPostMapper.java | 4 +- .../system/mapper/SysUserDepartMapper.java | 6 +- .../modules/system/mapper/SysUserMapper.java | 18 +- .../system/mapper/SysUserPositionMapper.java | 8 +- .../system/mapper/SysUserRoleMapper.java | 4 +- .../system/mapper/SysUserTenantMapper.java | 12 +- .../mapper/xml/SysAnnouncementMapper.xml | 4 +- .../mapper/xml/SysAnnouncementSendMapper.xml | 4 +- .../system/mapper/xml/SysCategoryMapper.xml | 4 +- .../system/mapper/xml/SysCheckRuleMapper.xml} | 2 +- .../system/mapper/xml/SysCommentMapper.xml | 10 +- .../system/mapper/xml/SysDataLogMapper.xml | 2 +- .../system/mapper/xml/SysDataSourceMapper.xml | 5 + .../system/mapper/xml/SysDepartMapper.xml | 34 +- .../mapper/xml/SysDepartPermissionMapper.xml | 2 +- .../system/mapper/xml/SysDepartRoleMapper.xml | 4 +- .../xml/SysDepartRolePermissionMapper.xml | 2 +- .../mapper/xml/SysDepartRoleUserMapper.xml | 2 +- .../system/mapper/xml/SysDictItemMapper.xml | 2 +- .../system/mapper/xml/SysDictMapper.xml | 10 +- .../system/mapper/xml/SysFillRuleMapper.xml} | 2 +- .../mapper/xml/SysGatewayRouteMapper.xml | 2 +- .../system/mapper/xml/SysLogMapper.xml | 2 +- .../mapper/xml/SysPackPermissionMapper.xml | 2 +- .../xml/SysPermissionDataRuleMapper.xml | 2 +- .../system/mapper/xml/SysPermissionMapper.xml | 8 +- .../system/mapper/xml/SysPositionMapper.xml | 6 +- .../system/mapper/xml/SysRoleIndexMapper.xml | 5 + .../system/mapper/xml/SysRoleMapper.xml | 10 +- .../mapper/xml/SysTableWhiteListMapper.xml | 2 +- .../system/mapper/xml/SysTenantMapper.xml | 16 +- .../system/mapper/xml/SysTenantPackMapper.xml | 2 +- .../mapper/xml/SysTenantPackUserMapper.xml | 2 +- .../mapper/xml/SysThirdAccountMapper.xml | 6 +- .../mapper/xml/SysThirdAppConfigMapper.xml | 6 +- .../system/mapper/xml/SysUserDepartMapper.xml | 16 +- .../system/mapper/xml/SysUserMapper.xml | 34 +- .../mapper/xml/SysUserPositionMapper.xml | 6 +- .../system/mapper/xml/SysUserTenantMapper.xml | 14 +- .../system/model/AnnouncementSendModel.java | 2 +- .../modules/system/model/DepartIdModel.java | 4 +- .../system/model/DuplicateCheckVo.java | 2 +- .../system/model/SysDepartTreeModel.java | 10 +- .../modules/system/model/SysDictTree.java | 4 +- .../modules/system/model/SysLoginModel.java | 2 +- .../system/model/SysPermissionTree.java | 4 +- .../system/model/SysUserSysDepPostModel.java | 2 +- .../system/model/SysUserSysDepartModel.java | 2 +- .../modules/system/model/ThirdLoginModel.java | 2 +- .../modules/system/model/TreeModel.java | 4 +- .../modules/system/model/TreeSelectModel.java | 2 +- .../modules/system/rule/CategoryCodeRule.java | 8 +- .../modules/system/rule/OrderNumberRule.java | 2 +- .../modules/system/rule/OrgCodeRule.java | 6 +- .../security/DictQueryBlackListHandler.java | 7 +- .../service/ISysAnnouncementSendService.java | 8 +- .../service/ISysAnnouncementService.java | 16 +- .../system/service/ISysCategoryService.java | 18 +- .../system/service/ISysCheckRuleService.java | 4 +- .../system/service/ISysCommentService.java | 8 +- .../system/service/ISysDataLogService.java | 6 +- .../system/service/ISysDataSourceService.java | 4 +- .../service/ISysDepartPermissionService.java | 8 +- .../ISysDepartRolePermissionService.java | 6 +- .../system/service/ISysDepartRoleService.java | 4 +- .../service/ISysDepartRoleUserService.java | 4 +- .../system/service/ISysDepartService.java | 18 +- .../system/service/ISysDictItemService.java | 6 +- .../system/service/ISysDictService.java | 40 +- .../system/service/ISysFillRuleService.java | 4 +- .../system/service/ISysFormFileService.java | 4 +- .../service/ISysGatewayRouteService.java | 4 +- .../system/service/ISysLogService.java | 6 +- .../service/ISysPackPermissionService.java | 4 +- .../ISysPermissionDataRuleService.java | 8 +- .../system/service/ISysPermissionService.java | 28 +- .../system/service/ISysPositionService.java | 4 +- .../system/service/ISysRoleIndexService.java | 4 +- .../service/ISysRolePermissionService.java | 8 +- .../system/service/ISysRoleService.java | 8 +- .../service/ISysTableWhiteListService.java | 4 +- .../system/service/ISysTenantPackService.java | 6 +- .../system/service/ISysTenantService.java | 16 +- .../service/ISysThirdAccountService.java | 8 +- .../service/ISysThirdAppConfigService.java | 4 +- .../service/ISysUserDepPostService.java | 4 +- .../system/service/ISysUserDepartService.java | 8 +- .../service/ISysUserPositionService.java | 6 +- .../system/service/ISysUserRoleService.java | 4 +- .../system/service/ISysUserService.java | 48 +- .../system/service/ISysUserTenantService.java | 10 +- .../system/service/IThirdAppService.java | 4 +- .../service/impl/ImportFileServiceImpl.java | 2 +- .../impl/SysAnnouncementSendServiceImpl.java | 10 +- .../impl/SysAnnouncementServiceImpl.java | 20 +- .../system/service/impl/SysBaseApiImpl.java | 101 ++--- .../service/impl/SysCategoryServiceImpl.java | 10 +- .../service/impl/SysCheckRuleServiceImpl.java | 8 +- .../service/impl/SysCommentServiceImpl.java | 22 +- .../service/impl/SysDataLogServiceImpl.java | 8 +- .../impl/SysDataSourceServiceImpl.java | 10 +- .../impl/SysDepartPermissionServiceImpl.java | 20 +- .../SysDepartRolePermissionServiceImpl.java | 8 +- .../impl/SysDepartRoleServiceImpl.java | 12 +- .../impl/SysDepartRoleUserServiceImpl.java | 12 +- .../service/impl/SysDepartServiceImpl.java | 26 +- .../service/impl/SysDictItemServiceImpl.java | 8 +- .../service/impl/SysDictServiceImpl.java | 22 +- .../service/impl/SysFillRuleServiceImpl.java | 8 +- .../service/impl/SysFormFileServiceImpl.java | 8 +- .../impl/SysGatewayRouteServiceImpl.java | 8 +- .../service/impl/SysLogServiceImpl.java | 8 +- .../impl/SysPackPermissionServiceImpl.java | 8 +- .../impl/SysPermissionDataRuleImpl.java | 14 +- .../impl/SysPermissionServiceImpl.java | 36 +- .../service/impl/SysPositionServiceImpl.java | 8 +- .../service/impl/SysRoleIndexServiceImpl.java | 10 +- .../impl/SysRolePermissionServiceImpl.java | 8 +- .../service/impl/SysRoleServiceImpl.java | 10 +- .../impl/SysTableWhiteListServiceImpl.java | 10 +- .../impl/SysTenantPackServiceImpl.java | 16 +- .../service/impl/SysTenantServiceImpl.java | 21 +- .../impl/SysThirdAccountServiceImpl.java | 22 +- .../impl/SysThirdAppConfigServiceImpl.java | 8 +- .../impl/SysUserDepPostServiceImpl.java | 8 +- .../impl/SysUserDepartServiceImpl.java | 26 +- .../impl/SysUserPositionServiceImpl.java | 12 +- .../service/impl/SysUserRoleServiceImpl.java | 8 +- .../service/impl/SysUserServiceImpl.java | 52 +-- .../impl/SysUserTenantServiceImpl.java | 22 +- .../impl/ThirdAppDingtalkServiceImpl.java | 30 +- .../ThirdAppWechatEnterpriseServiceImpl.java | 28 +- .../system/util/FindsDepartsChildrenUtil.java | 8 +- .../system/util/ImportOldUserUtil.java | 14 +- .../system/util/ImportSysUserCache.java | 2 +- .../system/util/PermissionDataUtil.java | 8 +- .../modules/system/util/RandImageUtil.java | 2 +- .../modules/system/util/SecurityUtil.java | 4 +- .../modules/system/util/XssUtils.java | 6 +- .../modules/system/vo/SysCommentFileVo.java | 2 +- .../modules/system/vo/SysCommentVO.java | 2 +- .../modules/system/vo/SysDepartExportVo.java | 2 +- .../system/vo/SysDepartPositionVo.java | 2 +- .../modules/system/vo/SysDepartUsersVO.java | 2 +- .../modules/system/vo/SysDictPage.java | 4 +- .../system/vo/SysPositionSelectTreeVo.java | 16 +- .../modules/system/vo/SysUserDepVo.java | 2 +- .../modules/system/vo/SysUserExportVo.java | 2 +- .../modules/system/vo/SysUserImportVo.java | 2 +- .../modules/system/vo/SysUserOnlineVO.java | 2 +- .../modules/system/vo/SysUserPositionVo.java | 2 +- .../modules/system/vo/SysUserRoleCountVo.java | 2 +- .../modules/system/vo/SysUserRoleVO.java | 2 +- .../modules/system/vo/SysUserTenantVo.java | 2 +- .../modules/system/vo/UserAvatar.java | 4 +- .../system/vo/lowapp/AppExportUserVo.java | 2 +- .../system/vo/lowapp/DepartAndUserInfo.java | 4 +- .../modules/system/vo/lowapp/DepartInfo.java | 2 +- .../system/vo/lowapp/ExportDepartVo.java | 2 +- .../modules/system/vo/lowapp/SysDictVo.java | 4 +- .../system/vo/lowapp/UpdateDepartInfo.java | 4 +- .../vo/tenant/TenantDepartAuthInfo.java | 4 +- .../system/vo/tenant/TenantPackAuth.java | 2 +- .../system/vo/tenant/TenantPackModel.java | 2 +- .../system/vo/tenant/TenantPackUser.java | 2 +- .../system/vo/tenant/TenantPackUserCount.java | 2 +- .../modules/system/vo/tenant/UserDepart.java | 2 +- .../system/vo/tenant/UserPosition.java | 2 +- .../vo/thirdapp/JdtDepartmentTreeVo.java | 2 +- .../vo/thirdapp/JwDepartmentTreeVo.java | 2 +- .../system/vo/thirdapp/JwSysUserDepartVo.java | 2 +- .../system/vo/thirdapp/JwUserDepartVo.java | 2 +- .../system/vo/thirdapp/SyncInfoVo.java | 2 +- .../generic/web/locale/locale.properties | 416 +++++++++--------- cpte-module-system/cpte-system-start/pom.xml | 7 + .../CpteSystemApplication.java | 6 +- .../codegenerate/JeecgOneGUI.java | 2 +- .../codegenerate/JeecgOneToMainUtil.java | 2 +- .../config/flyway/FlywayConfig.java | 2 +- .../resources/jeecg/jeecg_config.properties | 11 +- .../resources/jeecg/jeecg_database.properties | 4 +- .../java/org/{cpte => jeecg}/TestMain.java | 2 +- .../modules/message/test/SendMessageTest.java | 4 +- .../openapi/test/SampleOpenApiTest.java | 7 +- .../system/test/MockControllerTest.java | 2 +- .../modules/system/test/SampleTest.java | 10 +- .../system/test/SysTableWhiteCheckTest.java | 4 +- .../modules/system/test/SysUserApiTest.java | 8 +- .../smallTools/TestSqlHandle.java | 2 +- .../{cpte => jeecg}/smallTools/TestStr.java | 2 +- pom.xml | 2 +- 767 files changed, 3568 insertions(+), 2404 deletions(-) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/api/CommonAPI.java (93%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/api/dto/AiragFlowDTO.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/api/dto/DataLogDTO.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/api/dto/FileDownDTO.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/api/dto/FileUploadDTO.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/api/dto/LogDTO.java (97%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/api/dto/OnlineAuthDTO.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/api/dto/message/BusMessageDTO.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/api/dto/message/BusTemplateMessageDTO.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/api/dto/message/MessageDTO.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/api/dto/message/TemplateDTO.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/api/dto/message/TemplateMessageDTO.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/api/vo/Result.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/aspect/AutoLogAspect.java (98%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/aspect/DictAspect.java (99%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/aspect/PermissionDataAspect.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/aspect/UrlMatchEnum.java (97%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/aspect/annotation/AutoDict.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/aspect/annotation/AutoLog.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/aspect/annotation/Dict.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/aspect/annotation/DynamicTable.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/aspect/annotation/OnlineAuth.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/aspect/annotation/PermissionData.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/CommonConstant.java (98%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/CommonSendStatus.java (59%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/DataBaseConstant.java (59%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/DynamicTableConstant.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/FillRuleConstant.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/PasswordConstant.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/ProvinceCityArea.java (97%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/ServiceNameConstants.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/SymbolConstant.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/TenantConstant.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/VxeSocketConst.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/WebsocketConst.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/enums/CgformEnum.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/enums/ClientTerminalTypeEnum.java (86%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/enums/DateRangeEnum.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/enums/DepartCategoryEnum.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/enums/DySmsEnum.java (95%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/enums/EmailTemplateEnum.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/enums/FileTypeEnum.java (96%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/enums/MessageTypeEnum.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/enums/ModuleType.java (94%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/enums/NoticeTypeEnum.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/enums/OperateTypeEnum.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/enums/PositionLevelEnum.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/enums/RoleIndexConfigEnum.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/enums/SysAnnmentTypeEnum.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/constant/enums/Vue3MessageHrefEnum.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/desensitization/SensitiveSerialize.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/desensitization/annotation/Sensitive.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/desensitization/annotation/SensitiveDecode.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/desensitization/annotation/SensitiveEncode.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/desensitization/annotation/SensitiveField.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/desensitization/aspect/SensitiveDataAspect.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/desensitization/enums/SensitiveEnum.java (97%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/desensitization/util/SensitiveInfoUtil.java (98%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/es/JeecgElasticsearchTemplate.java (99%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/es/QueryStringBuilder.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/exception/JeecgBoot401Exception.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/exception/JeecgBootAssertException.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/exception/JeecgBootBizTipException.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/exception/JeecgBootException.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/exception/JeecgBootExceptionHandler.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/exception/JeecgSqlInjectionException.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/handler/IFillRuleHandler.java (85%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/annotation/EnumDict.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/base/controller/JeecgController.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/base/entity/JeecgEntity.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/base/service/JeecgService.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/base/service/impl/JeecgServiceImpl.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/enhance/UserFilterEnhance.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/query/MatchTypeEnum.java (89%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/query/QueryCondition.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/query/QueryGenerator.java (98%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/query/QueryRuleEnum.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/util/JeecgDataAutorUtils.java (94%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/util/JwtUtil.java (91%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/util/ResourceUtil.java (98%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/util/SqlConcatUtil.java (97%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/vo/ComboModel.java (98%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/vo/DictModel.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/vo/DictModelMany.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/vo/DictQuery.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/vo/DynamicDataSourceModel.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/vo/LoginUser.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/vo/SelectTreeModel.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/vo/SysCategoryModel.java (94%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/vo/SysDepartModel.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/vo/SysFilesModel.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/vo/SysPermissionDataRuleModel.java (91%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/vo/SysUserCacheInfo.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/system/vo/UserAccountInfo.java (86%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/AssertUtils.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/BrowserType.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/BrowserUtils.java (93%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/CommonUtils.java (97%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/DateRangeUtils.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/DateUtils.java (99%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/DySmsHelper.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/DySmsLimit.java (91%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/FileDownloadUtils.java (96%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/FillRuleUtil.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/HTMLUtils.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/ImportExcelUtil.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/IpUtils.java (97%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/Md5Util.java (96%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/MinioUtil.java (98%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/MyClassLoader.java (97%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/PasswordUtil.java (96%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/PmsUtil.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/ReflectHelper.java (95%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/RestDesformUtil.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/RestUtil.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/ShiroThreadPoolExecutor.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/SpringContextUtils.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/SqlInjectionUtil.java (95%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/TokenUtils.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/UUIDGenerator.java (90%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/YouBianCodeUtil.java (99%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/dynamic/db/DataSourceCachePool.java (97%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/dynamic/db/DbTypeUtils.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/dynamic/db/DynamicDBUtil.java (99%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/dynamic/db/FreemarkerParseFactory.java (96%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/encryption/AesEncryptUtil.java (97%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/encryption/EncryptedString.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/filter/SsrfFileTypeFilter.java (99%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/filter/StrAttackFilter.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/oConvertUtils.java (95%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/oss/OssBootUtil.java (99%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/security/AbstractQueryBlackListHandler.java (97%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/security/JdbcSecurityUtil.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/security/SecurityTools.java (98%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/security/entity/MyKeyPair.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/security/entity/SecurityReq.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/security/entity/SecurityResp.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/security/entity/SecuritySignReq.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/security/entity/SecuritySignResp.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/sqlparse/JSqlParserAllTableManager.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/sqlparse/JSqlParserUtils.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/sqlparse/vo/SelectSqlInfo.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/superSearch/ObjectParseUtil.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/superSearch/QueryRuleEnum.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/common/util/superSearch/QueryRuleVo.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/AutoPoiConfig.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/AutoPoiDictConfig.java (97%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/CorsFilterCondition.java (89%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/DruidConfig.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/DruidWallConfigRegister.java (97%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/JeecgBaseConfig.java (97%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/JeecgCloudCondition.java (88%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/JeecgGaodeBaseConfig.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/JeecgSmsTemplateConfig.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/RestTemplateConfig.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/StaticConfig.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/Swagger2Config.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/Swagger3Config.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/UndertowCustomizer.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/WebMvcConfiguration.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/WebSocketConfig.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/filter/RequestBodyReserveFilter.java (89%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/filter/WebsocketFilter.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/firewall/SqlInjection/IDictTableWhiteListHandler.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/firewall/SqlInjection/SysDictTableWhite.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/firewall/interceptor/LowCodeModeConfiguration.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/firewall/interceptor/LowCodeModeInterceptor.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/firewall/interceptor/enums/LowCodeUrlsEnum.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/mybatis/JeecgTenantParser.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/mybatis/MybatisInterceptor.java (97%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/mybatis/MybatisPlusSaasConfig.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/mybatis/TenantContext.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/mybatis/ThreadLocalDataHelper.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/mybatis/aspect/DynamicTableAspect.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/mybatis/interceptor/DynamicDatasourceInterceptor.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/oss/MinioConfig.java (96%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/oss/OssConfiguration.java (95%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/shiro/IgnoreAuth.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/shiro/JwtToken.java (94%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/shiro/ShiroConfig.java (99%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/shiro/ShiroRealm.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/shiro/filters/CustomShiroFilterFactoryBean.java (96%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/shiro/filters/JwtFilter.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/shiro/filters/ResourceCheckFilter.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/shiro/ignore/IgnoreAuthPostProcessor.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/shiro/ignore/InMemoryIgnoreAuth.java (94%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/sign/interceptor/SignAuthConfiguration.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/sign/interceptor/SignAuthInterceptor.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/sign/util/BodyReaderHttpServletRequestWrapper.java (94%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/sign/util/HttpUtils.java (91%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/sign/util/SignUtil.java (85%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/vo/BaiduApi.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/vo/DomainUrl.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/vo/Elasticsearch.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/vo/Firewall.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/vo/GaoDeApi.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/vo/Path.java (93%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/vo/Shiro.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/config/vo/WeiXinPay.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/modules/base/mapper/BaseCommonMapper.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/modules/base/mapper/xml/BaseCommonMapper.xml (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/modules/base/service/BaseCommonService.java (100%) rename cpte-boot-base-core/src/main/java/org/{cpte => jeecg}/modules/base/service/impl/BaseCommonServiceImpl.java (100%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/JeecgAiRagApplication.java (100%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/app/consts/AiAppConsts.java (94%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/app/consts/Prompts.java (99%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/app/controller/AiragAppController.java (94%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/app/controller/AiragChatController.java (96%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/app/entity/AiragApp.java (99%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/app/mapper/AiragAppMapper.java (84%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/app/mapper/xml/AiragAppMapper.xml (57%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/app/service/IAiragAppService.java (82%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/app/service/IAiragChatService.java (91%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/app/service/impl/AiragAppServiceImpl.java (96%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/app/service/impl/AiragChatServiceImpl.java (98%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/app/vo/AppDebugParams.java (71%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/app/vo/ChatConversation.java (86%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/app/vo/ChatSendParams.java (95%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/demo/JimuDataReader.java (98%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/demo/TestAiragEnhance.java (94%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/config/EmbedStoreConfigBean.java (95%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/config/KnowConfigBean.java (93%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/consts/LLMConsts.java (97%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/controller/AiragKnowledgeController.java (97%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/controller/AiragModelController.java (95%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/document/TikaDocumentParser.java (91%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/entity/AiragKnowledge.java (98%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/entity/AiragKnowledgeDoc.java (93%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/entity/AiragModel.java (92%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/handler/AIChatHandler.java (98%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/handler/CommandExecUtil.java (99%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/handler/EmbeddingHandler.java (96%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/handler/JeecgToolsProvider.java (89%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/mapper/AiragKnowledgeDocMapper.java (69%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/mapper/AiragKnowledgeMapper.java (86%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/mapper/AiragModelMapper.java (86%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/mapper/xml/AiragKnowledgeDocMapper.xml (80%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/mapper/xml/AiragKnowledgeMapper.xml (56%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/mapper/xml/AiragModelMapper.xml (56%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/service/IAiragKnowledgeDocService.java (94%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/service/IAiragKnowledgeService.java (68%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/service/IAiragModelService.java (70%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/service/impl/AiragKnowledgeDocServiceImpl.java (97%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/service/impl/AiragKnowledgeServiceImpl.java (59%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/llm/service/impl/AiragModelServiceImpl.java (60%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/ocr/controller/AiOcrController.java (97%) rename cpte-boot-module/cpte-boot-module-airag/src/main/java/org/{cpte => jeecg}/modules/airag/ocr/entity/AiOcr.java (88%) rename cpte-boot-module/cpte-boot-module-airag/src/test/java/org/{cpte => jeecg}/modules/airag/test/TestFileParse.java (100%) rename cpte-boot-module/cpte-boot-module-airag/src/test/java/org/{cpte => jeecg}/modules/airag/test/TestFlows.java (100%) rename cpte-boot-module/cpte-boot-module-airag/src/test/java/org/{cpte => jeecg}/modules/airag/test/TestLLM.java (100%) rename cpte-boot-module/cpte-boot-module-airag/src/test/java/org/{cpte => jeecg}/modules/airag/test/TestVector.java (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/cloud/controller/JcloudDemoFeignController.java (95%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/cloud/controller/JcloudDemoProviderController.java (97%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/cloud/service/JcloudDemoService.java (93%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java (95%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/cloud/xxljob/TestJobHandler.java (97%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/MockController.java (97%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/area.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/area_mini.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/area_options.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/asyn_tree_list_0.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/asyn_tree_list_1.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/asyn_tree_list_2.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/asyn_tree_list_3.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/asyn_tree_list_31.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/getCntrNoCountInfo.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/getTubiao.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/graphreport_chart.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/permission.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/permission_no_page.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/role.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/service.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/sysdatalog.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/task_process.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/user.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/user_info.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/userinfo.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/workplace_activity.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/workplace_projects.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/workplace_radar.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/json/workplace_teams.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/vxe/controller/VxeMockController.java (99%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/vxe/entity/MockEntity.java (93%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/vxe/json/ddjh.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/vxe/json/ddjh_s8.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/vxe/json/dlglong.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/mock/vxe/websocket/VxeSocket.java (97%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/online/OnlCgformDemoController.java (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/controller/BigScreenTemplatController.java (90%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/controller/JeecgDemoController.java (98%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/controller/JeecgDynamicDataController.java (85%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/controller/JeecgOrderErpMainController.java (98%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/controller/JeecgOrderMainController.java (97%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/controller/JoaDemoController.java (94%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/entity/JeecgDemo.java (83%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/entity/JeecgOrderCustomer.java (80%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/entity/JeecgOrderMain.java (76%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/entity/JeecgOrderTicket.java (87%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/entity/JoaDemo.java (88%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/mapper/JeecgDemoMapper.java (63%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/mapper/JeecgOrderCustomerMapper.java (84%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/mapper/JeecgOrderMainMapper.java (94%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/mapper/JeecgOrderTicketMapper.java (85%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/mapper/JoaDemoMapper.java (92%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/mapper/xml/JeecgDemoMapper.xml (86%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/mapper/xml/JeecgOrderCustomerMapper.xml (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/mapper/xml/JeecgOrderMainMapper.xml (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/mapper/xml/JeecgOrderTicketMapper.xml (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/mapper/xml/JoaDemoMapper.xml (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/service/IJeecgDemoService.java (77%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/service/IJeecgDynamicDataService.java (65%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/service/IJeecgOrderCustomerService.java (84%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/service/IJeecgOrderMainService.java (67%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/service/IJeecgOrderTicketService.java (84%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/service/IJoaDemoService.java (92%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/service/impl/JeecgDemoServiceImpl.java (93%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/service/impl/JeecgDynamicDataServiceImpl.java (70%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java (97%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java (99%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.java (97%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/service/impl/JoaDemoServiceImpl.java (95%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/test/vo/JeecgOrderMainPage.java (76%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/demo/xxljob/TestJobHandler.java (98%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/dlglong/controller/DlMockController.java (99%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/dlglong/entity/MockEntity.java (93%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/dlglong/json/CarLngLat.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/dlglong/json/CarTrace.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/dlglong/json/ddjh.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/dlglong/json/ddjh_s8.json (100%) rename cpte-boot-module/cpte-module-demo/src/main/java/org/{cpte => jeecg}/modules/dlglong/json/dlglong.json (100%) create mode 100644 cpte-boot-module/cpte-module-wms/pom.xml create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/eee.java create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/AreaController.java create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/ItemController.java create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/PointController.java create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/StockController.java create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Area.java create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Item.java create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Point.java create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Stock.java create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/AreaMapper.java create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/ItemMapper.java create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/PointMapper.java create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/StockMapper.java rename cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysFillRuleMapper.xml => cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/xml/AreaMapper.xml (69%) rename cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/mapper/xml/SysMessageMapper.xml => cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/xml/ItemMapper.xml (69%) create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/xml/PointMapper.xml create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/xml/StockMapper.xml create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IAreaService.java create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IItemService.java create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IPointService.java create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IStockService.java create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/AreaServiceImpl.java create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/ItemServiceImpl.java create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/PointServiceImpl.java create mode 100644 cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/StockServiceImpl.java rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/config/firewall/SqlInjection/impl/DictTableWhiteListHandlerImpl.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/config/init/CodeGenerateDbConfig.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/config/init/CodeTemplateInitListener.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/config/init/ShiroCacheClearRunner.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/config/init/SystemInitListener.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/config/init/TomcatFactoryConfig.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/config/init/UndertowConfiguration.java (100%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/config/jimureport/JimuDragExternalServiceImpl.java (99%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/config/jimureport/JimuReportTokenService.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/airag/JeecgBizToolsProvider.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/aop/TenantLog.java (92%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/aop/TenantPackUserLogAspect.java (65%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/api/controller/SystemApiController.java (99%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/cas/controller/CasClientController.java (90%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/cas/util/CasServiceUtil.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/cas/util/XmlUtils.java (99%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/controller/SysMessageController.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/controller/SysMessageTemplateController.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/controller/TestSocketController.java (94%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/entity/MsgParams.java (91%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/entity/SysMessage.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/entity/SysMessageTemplate.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/enums/RangeDateEnum.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/handle/ISendMsgHandle.java (91%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/handle/enums/SendMsgStatusEnum.java (78%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/handle/enums/SendMsgTypeEnum.java (91%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/handle/impl/DdSendMsgHandle.java (83%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/handle/impl/EmailSendMsgHandle.java (94%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/handle/impl/QywxSendMsgHandle.java (83%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/handle/impl/SmsSendMsgHandle.java (75%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/handle/impl/SystemSendMsgHandle.java (92%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/handle/impl/WxSendMsgHandle.java (76%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/job/SendMsgJob.java (92%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/mapper/SysMessageMapper.java (69%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/mapper/SysMessageTemplateMapper.java (84%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte/modules/system/mapper/xml/SysCheckRuleMapper.xml => jeecg/modules/message/mapper/xml/SysMessageMapper.xml} (71%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/mapper/xml/SysMessageTemplateMapper.xml (66%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/service/ISysMessageService.java (70%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/service/ISysMessageTemplateService.java (80%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/service/impl/SysMessageServiceImpl.java (60%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/service/impl/SysMessageTemplateServiceImpl.java (73%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/util/PushMsgUtil.java (85%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/websocket/SocketHandler.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/message/websocket/WebSocket.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/monitor/actuator/CustomActuatorConfig.java (91%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/monitor/actuator/httptrace/CustomHttpTraceEndpoint.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/monitor/actuator/httptrace/CustomInMemoryHttpTraceRepository.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/monitor/actuator/undertow/CustomUndertowMetricsHandler.java (100%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/monitor/controller/ActuatorMemoryController.java (88%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/monitor/controller/ActuatorRedisController.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/monitor/domain/RedisInfo.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/monitor/exception/RedisConnectException.java (85%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/monitor/service/RedisService.java (86%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/monitor/service/impl/MailHealthIndicator.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/monitor/service/impl/RedisServiceImpl.java (94%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/ngalain/aop/LogRecordAspect.java (100%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/ngalain/controller/NgAlainController.java (100%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/ngalain/service/NgAlainService.java (100%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/ngalain/service/impl/NgAlainServiceImpl.java (100%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/controller/OpenApiAuthController.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/controller/OpenApiController.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/controller/OpenApiIndexController.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/controller/OpenApiLogController.java (94%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/controller/OpenApiPermissionController.java (78%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/entity/OpenApi.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/entity/OpenApiAuth.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/entity/OpenApiHeader.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/entity/OpenApiLog.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/entity/OpenApiParam.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/entity/OpenApiPermission.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/filter/ApiAuthFilter.java (91%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/filter/ApiFilterConfig.java (94%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/generator/AKSKGenerator.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/generator/PathGenerator.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/mapper/OpenApiAuthMapper.java (69%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/mapper/OpenApiLogMapper.java (69%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/mapper/OpenApiMapper.java (65%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/mapper/OpenApiPermissionMapper.java (69%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/service/OpenApiAuthService.java (68%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/service/OpenApiLogService.java (63%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/service/OpenApiPermissionService.java (79%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/service/OpenApiService.java (63%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/service/impl/OpenApiAuthServiceImpl.java (70%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/service/impl/OpenApiLogServiceImpl.java (55%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/service/impl/OpenApiPermissionServiceImpl.java (88%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/service/impl/OpenApiServiceImpl.java (69%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/swagger/SwaggerDefinition.java (82%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/swagger/SwaggerDefinitionProperties.java (81%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/swagger/SwaggerInfo.java (87%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/swagger/SwaggerInfoContact.java (73%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/swagger/SwaggerInfoLicense.java (77%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/swagger/SwaggerModel.java (91%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/swagger/SwaggerOperation.java (90%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/swagger/SwaggerOperationParameter.java (86%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/swagger/SwaggerOperationResponse.java (82%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/swagger/SwaggerSchema.java (83%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/openapi/swagger/SwaggerTag.java (72%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/oss/controller/OssFileController.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/oss/entity/OssFile.java (94%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/oss/mapper/OssFileMapper.java (68%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/oss/service/IOssFileService.java (86%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/oss/service/impl/OssFileServiceImpl.java (89%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/quartz/controller/QuartzJobController.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/quartz/entity/QuartzJob.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/quartz/job/AsyncJob.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/quartz/job/SampleJob.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/quartz/job/SampleParamJob.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/quartz/mapper/QuartzJobMapper.java (69%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/quartz/mapper/xml/QuartzJobMapper.xml (63%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/quartz/service/IQuartzJobService.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/quartz/service/impl/QuartzJobServiceImpl.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/cache/AuthStateRedisCache.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/config/AuthStateConfiguration.java (76%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/constant/DefIndexConst.java (94%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/CommonController.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/DuplicateCheckController.java (91%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/LoginController.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysAnnouncementController.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysAnnouncementSendController.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysAppVersionController.java (92%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysCategoryController.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysCheckRuleController.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysCommentController.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysDataLogController.java (94%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysDataSourceController.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysDepartController.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysDepartPermissionController.java (94%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysDepartRoleController.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysDictController.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysDictItemController.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysFillRuleController.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysFormFileController.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysGatewayRouteController.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysLogController.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysPermissionController.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysPositionController.java (91%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysRoleController.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysRoleIndexController.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysTableWhiteListController.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysTenantController.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysUploadController.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysUserController.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/SysUserOnlineController.java (92%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/ThirdAppController.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/ThirdLoginController.java (87%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/controller/WechatVerifyController.java (92%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysAnnouncement.java (99%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysAnnouncementSend.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysAppVersion.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysCategory.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysCheckRule.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysComment.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysDataLog.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysDataSource.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysDepart.java (99%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysDepartPermission.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysDepartRole.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysDepartRolePermission.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysDepartRoleUser.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysDict.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysDictItem.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysFillRule.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysFormFile.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysGatewayRoute.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysLog.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysPackPermission.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysPermission.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysPermissionDataRule.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysPosition.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysRole.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysRoleIndex.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysRolePermission.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysTableWhiteList.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysTenant.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysTenantPack.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysTenantPackUser.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysThirdAccount.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysThirdAppConfig.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysUser.java (99%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysUserDepPost.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysUserDepart.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysUserPosition.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysUserRole.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/entity/SysUserTenant.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/excelstyle/ExcelExportSysUserStyle.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysAnnouncementMapper.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysAnnouncementSendMapper.java (72%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysCategoryMapper.java (79%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysCheckRuleMapper.java (71%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysCommentMapper.java (78%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysDataLogMapper.java (64%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysDataSourceMapper.java (71%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysDepartMapper.java (89%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysDepartPermissionMapper.java (70%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysDepartRoleMapper.java (66%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysDepartRolePermissionMapper.java (78%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysDepartRoleUserMapper.java (79%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysDictItemMapper.java (76%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysDictMapper.java (82%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysFillRuleMapper.java (70%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysFormFileMapper.java (71%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysGatewayRouteMapper.java (88%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysLogMapper.java (92%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysPackPermissionMapper.java (87%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysPermissionDataRuleMapper.java (65%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysPermissionMapper.java (73%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysPositionMapper.java (92%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysRoleIndexMapper.java (71%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysRoleMapper.java (92%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysRolePermissionMapper.java (70%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysTableWhiteListMapper.java (70%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysTenantMapper.java (91%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysTenantPackMapper.java (90%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysTenantPackUserMapper.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysThirdAccountMapper.java (85%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysThirdAppConfigMapper.java (88%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysUserDepPostMapper.java (86%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysUserDepartMapper.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysUserMapper.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysUserPositionMapper.java (92%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysUserRoleMapper.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/SysUserTenantMapper.java (94%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysAnnouncementMapper.xml (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysAnnouncementSendMapper.xml (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysCategoryMapper.xml (89%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte/modules/system/mapper/xml/SysDataSourceMapper.xml => jeecg/modules/system/mapper/xml/SysCheckRuleMapper.xml} (72%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysCommentMapper.xml (87%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysDataLogMapper.xml (85%) create mode 100644 cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDataSourceMapper.xml rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysDepartMapper.xml (87%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysDepartPermissionMapper.xml (66%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysDepartRoleMapper.xml (72%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysDepartRolePermissionMapper.xml (82%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysDepartRoleUserMapper.xml (83%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysDictItemMapper.xml (68%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysDictMapper.xml (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte/modules/system/mapper/xml/SysRoleIndexMapper.xml => jeecg/modules/system/mapper/xml/SysFillRuleMapper.xml} (71%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysGatewayRouteMapper.xml (91%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysLogMapper.xml (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysPackPermissionMapper.xml (90%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysPermissionDataRuleMapper.xml (92%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysPermissionMapper.xml (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysPositionMapper.xml (72%) create mode 100644 cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleIndexMapper.xml rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysRoleMapper.xml (85%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysTableWhiteListMapper.xml (67%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysTenantMapper.xml (86%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysTenantPackMapper.xml (86%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysTenantPackUserMapper.xml (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysThirdAccountMapper.xml (79%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysThirdAppConfigMapper.xml (65%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysUserDepartMapper.xml (87%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysUserMapper.xml (91%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysUserPositionMapper.xml (89%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/mapper/xml/SysUserTenantMapper.xml (91%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/model/AnnouncementSendModel.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/model/DepartIdModel.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/model/DuplicateCheckVo.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/model/SysDepartTreeModel.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/model/SysDictTree.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/model/SysLoginModel.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/model/SysPermissionTree.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/model/SysUserSysDepPostModel.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/model/SysUserSysDepartModel.java (92%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/model/ThirdLoginModel.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/model/TreeModel.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/model/TreeSelectModel.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/rule/CategoryCodeRule.java (92%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/rule/OrderNumberRule.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/rule/OrgCodeRule.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/security/DictQueryBlackListHandler.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysAnnouncementSendService.java (65%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysAnnouncementService.java (78%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysCategoryService.java (78%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysCheckRuleService.java (88%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysCommentService.java (85%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysDataLogService.java (63%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysDataSourceService.java (87%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysDepartPermissionService.java (72%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysDepartRolePermissionService.java (68%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysDepartRoleService.java (86%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysDepartRoleUserService.java (87%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysDepartService.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysDictItemService.java (68%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysDictService.java (81%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysFillRuleService.java (70%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysFormFileService.java (71%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysGatewayRouteService.java (91%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysLogService.java (91%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysPackPermissionService.java (71%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysPermissionDataRuleService.java (81%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysPermissionService.java (68%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysPositionService.java (87%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysRoleIndexService.java (90%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysRolePermissionService.java (65%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysRoleService.java (89%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysTableWhiteListService.java (91%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysTenantPackService.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysTenantService.java (92%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysThirdAccountService.java (91%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysThirdAppConfigService.java (89%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysUserDepPostService.java (70%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysUserDepartService.java (92%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysUserPositionService.java (87%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysUserRoleService.java (70%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysUserService.java (87%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/ISysUserTenantService.java (92%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/IThirdAppService.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/ImportFileServiceImpl.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysAnnouncementSendServiceImpl.java (76%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysAnnouncementServiceImpl.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysBaseApiImpl.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysCategoryServiceImpl.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysCheckRuleServiceImpl.java (94%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysCommentServiceImpl.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysDataLogServiceImpl.java (81%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysDataSourceServiceImpl.java (94%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysDepartPermissionServiceImpl.java (88%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java (91%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysDepartRoleServiceImpl.java (77%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysDepartRoleUserServiceImpl.java (90%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysDepartServiceImpl.java (99%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysDictItemServiceImpl.java (74%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysDictServiceImpl.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysFillRuleServiceImpl.java (62%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysFormFileServiceImpl.java (61%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysGatewayRouteServiceImpl.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysLogServiceImpl.java (87%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysPackPermissionServiceImpl.java (61%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysPermissionDataRuleImpl.java (90%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysPermissionServiceImpl.java (92%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysPositionServiceImpl.java (85%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysRoleIndexServiceImpl.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysRolePermissionServiceImpl.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysRoleServiceImpl.java (94%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysTableWhiteListServiceImpl.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysTenantPackServiceImpl.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysTenantServiceImpl.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysThirdAccountServiceImpl.java (94%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysThirdAppConfigServiceImpl.java (85%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysUserDepPostServiceImpl.java (61%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysUserDepartServiceImpl.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysUserPositionServiceImpl.java (89%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysUserRoleServiceImpl.java (61%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysUserServiceImpl.java (99%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/SysUserTenantServiceImpl.java (91%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/util/FindsDepartsChildrenUtil.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/util/ImportOldUserUtil.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/util/ImportSysUserCache.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/util/PermissionDataUtil.java (94%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/util/RandImageUtil.java (99%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/util/SecurityUtil.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/util/XssUtils.java (89%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/SysCommentFileVo.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/SysCommentVO.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/SysDepartExportVo.java (97%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/SysDepartPositionVo.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/SysDepartUsersVO.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/SysDictPage.java (89%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/SysPositionSelectTreeVo.java (86%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/SysUserDepVo.java (92%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/SysUserExportVo.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/SysUserImportVo.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/SysUserOnlineVO.java (96%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/SysUserPositionVo.java (89%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/SysUserRoleCountVo.java (92%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/SysUserRoleVO.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/SysUserTenantVo.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/UserAvatar.java (83%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/lowapp/AppExportUserVo.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/lowapp/DepartAndUserInfo.java (81%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/lowapp/DepartInfo.java (87%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/lowapp/ExportDepartVo.java (89%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/lowapp/SysDictVo.java (86%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/lowapp/UpdateDepartInfo.java (87%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/tenant/TenantDepartAuthInfo.java (86%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/tenant/TenantPackAuth.java (89%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/tenant/TenantPackModel.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/tenant/TenantPackUser.java (95%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/tenant/TenantPackUserCount.java (87%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/tenant/UserDepart.java (85%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/tenant/UserPosition.java (85%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/thirdapp/JdtDepartmentTreeVo.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/thirdapp/JwDepartmentTreeVo.java (98%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/thirdapp/JwSysUserDepartVo.java (87%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/thirdapp/JwUserDepartVo.java (93%) rename cpte-module-system/cpte-system-biz/src/main/java/org/{cpte => jeecg}/modules/system/vo/thirdapp/SyncInfoVo.java (94%) rename cpte-module-system/cpte-system-start/src/main/java/org/{cpte => jeecg}/CpteSystemApplication.java (94%) rename cpte-module-system/cpte-system-start/src/main/java/org/{cpte => jeecg}/codegenerate/JeecgOneGUI.java (92%) rename cpte-module-system/cpte-system-start/src/main/java/org/{cpte => jeecg}/codegenerate/JeecgOneToMainUtil.java (98%) rename cpte-module-system/cpte-system-start/src/main/java/org/{cpte => jeecg}/config/flyway/FlywayConfig.java (99%) rename cpte-module-system/cpte-system-start/src/test/java/org/{cpte => jeecg}/TestMain.java (98%) rename cpte-module-system/cpte-system-start/src/test/java/org/{cpte => jeecg}/modules/message/test/SendMessageTest.java (98%) rename cpte-module-system/cpte-system-start/src/test/java/org/{cpte => jeecg}/modules/openapi/test/SampleOpenApiTest.java (95%) rename cpte-module-system/cpte-system-start/src/test/java/org/{cpte => jeecg}/modules/system/test/MockControllerTest.java (96%) rename cpte-module-system/cpte-system-start/src/test/java/org/{cpte => jeecg}/modules/system/test/SampleTest.java (86%) rename cpte-module-system/cpte-system-start/src/test/java/org/{cpte => jeecg}/modules/system/test/SysTableWhiteCheckTest.java (97%) rename cpte-module-system/cpte-system-start/src/test/java/org/{cpte => jeecg}/modules/system/test/SysUserApiTest.java (96%) rename cpte-module-system/cpte-system-start/src/test/java/org/{cpte => jeecg}/smallTools/TestSqlHandle.java (96%) rename cpte-module-system/cpte-system-start/src/test/java/org/{cpte => jeecg}/smallTools/TestStr.java (99%) diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/api/CommonAPI.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java similarity index 93% rename from cpte-boot-base-core/src/main/java/org/cpte/common/api/CommonAPI.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java index 85ec8ce..05a96ae 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/api/CommonAPI.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java @@ -2,6 +2,7 @@ package org.jeecg.common.api; import org.jeecg.common.api.dto.AiragFlowDTO; import org.jeecg.common.system.vo.*; +import org.jeecg.common.system.vo.*; import java.util.List; import java.util.Map; @@ -56,14 +57,14 @@ public interface CommonAPI { * @param username * @return */ - public LoginUser getUserByName(String username); + LoginUser getUserByName(String username); /** * 5根据用户账号查询用户Id * @param username * @return */ - public String getUserIdByName(String username); + String getUserIdByName(String username); /** @@ -106,14 +107,14 @@ public interface CommonAPI { * @param code * @return */ - public List queryDictItemsByCode(String code); + List queryDictItemsByCode(String code); /** * 获取有效的数据字典项 * @param code * @return */ - public List queryEnableDictItemsByCode(String code); + List queryEnableDictItemsByCode(String code); /** * 13获取表数据字典 diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/AiragFlowDTO.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/AiragFlowDTO.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/AiragFlowDTO.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/AiragFlowDTO.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/DataLogDTO.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/DataLogDTO.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/DataLogDTO.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/DataLogDTO.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/FileDownDTO.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileDownDTO.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/FileDownDTO.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileDownDTO.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/FileUploadDTO.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileUploadDTO.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/FileUploadDTO.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileUploadDTO.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/LogDTO.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java similarity index 97% rename from cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/LogDTO.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java index 5915880..f301058 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/LogDTO.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java @@ -1,6 +1,5 @@ package org.jeecg.common.api.dto; import lombok.Data; -import org.jeecg.common.aspect.annotation.Dict; import org.jeecg.common.system.vo.LoginUser; import java.io.Serializable; import java.util.Date; diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/OnlineAuthDTO.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/OnlineAuthDTO.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/OnlineAuthDTO.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/OnlineAuthDTO.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/message/BusMessageDTO.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusMessageDTO.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/message/BusMessageDTO.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusMessageDTO.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/message/BusTemplateMessageDTO.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusTemplateMessageDTO.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/message/BusTemplateMessageDTO.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusTemplateMessageDTO.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/message/MessageDTO.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/MessageDTO.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/message/MessageDTO.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/MessageDTO.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/message/TemplateDTO.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateDTO.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/message/TemplateDTO.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateDTO.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/message/TemplateMessageDTO.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateMessageDTO.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/api/dto/message/TemplateMessageDTO.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateMessageDTO.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/api/vo/Result.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/api/vo/Result.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/aspect/AutoLogAspect.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java similarity index 98% rename from cpte-boot-base-core/src/main/java/org/cpte/common/aspect/AutoLogAspect.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java index aaf0a61..28f7cab 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/aspect/AutoLogAspect.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java @@ -158,10 +158,7 @@ public class AutoLogAspect { if(value!=null && value.toString().length()>length){ return false; } - if(value instanceof MultipartFile){ - return false; - } - return true; + return !(value instanceof MultipartFile); } }; params = JSONObject.toJSONString(arguments, profilter); @@ -190,7 +187,7 @@ public class AutoLogAspect { * @return */ private String getOnlineLogContent(Object obj, String content){ - if (Result.class.isInstance(obj)){ + if (obj instanceof Result){ Result res = (Result)obj; String msg = res.getMessage(); String tableName = res.getOnlTable(); diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/aspect/DictAspect.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java similarity index 99% rename from cpte-boot-base-core/src/main/java/org/cpte/common/aspect/DictAspect.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java index 2796711..9aa0f7d 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/aspect/DictAspect.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java @@ -428,7 +428,7 @@ public class DictAspect { //update-end--Author:scott -- Date:20210531 ----for： !56 优化微服务应用下存在表字段需要字典翻译时加载缓慢问题----- if (tmpValue != null) { - if (!"".equals(textValue.toString())) { + if (!"".contentEquals(textValue)) { textValue.append(","); } textValue.append(tmpValue); diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/aspect/PermissionDataAspect.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/aspect/PermissionDataAspect.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/aspect/UrlMatchEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java similarity index 97% rename from cpte-boot-base-core/src/main/java/org/cpte/common/aspect/UrlMatchEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java index f7a0863..a36f7d5 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/aspect/UrlMatchEnum.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java @@ -29,11 +29,11 @@ public enum UrlMatchEnum { /** * Request 请求 URL前缀 */ - private String url; + private final String url; /** * 菜单路由 URL前缀 (对应菜单路径) */ - private String matchUrl; + private final String matchUrl; /** * 根据req url 获取到菜单配置路径（前端页面路由URL） diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/aspect/annotation/AutoDict.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoDict.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/aspect/annotation/AutoDict.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoDict.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/aspect/annotation/AutoLog.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/aspect/annotation/AutoLog.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/aspect/annotation/Dict.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/Dict.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/aspect/annotation/Dict.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/Dict.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/aspect/annotation/DynamicTable.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/DynamicTable.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/aspect/annotation/DynamicTable.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/DynamicTable.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/aspect/annotation/OnlineAuth.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/OnlineAuth.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/aspect/annotation/OnlineAuth.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/OnlineAuth.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/aspect/annotation/PermissionData.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/aspect/annotation/PermissionData.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/CommonConstant.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java similarity index 98% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/CommonConstant.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java index 74b43b3..56b0d2e 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/CommonConstant.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java @@ -88,7 +88,7 @@ public interface CommonConstant { Integer SC_JEECG_NO_AUTHZ=510; /** 登录用户Shiro权限缓存KEY前缀 */ - public static String PREFIX_USER_SHIRO_CACHE = "shiro:cache:org.jeecg.config.shiro.ShiroRealm.authorizationCache:"; + String PREFIX_USER_SHIRO_CACHE = "shiro:cache:org.jeecg.config.shiro.ShiroRealm.authorizationCache:"; /** 登录用户Token令牌缓存KEY前缀 */ String PREFIX_USER_TOKEN = "prefix_user_token:"; // /** Token缓存时间：3600秒即一小时 */ @@ -595,17 +595,17 @@ public interface CommonConstant { /** * 报表允许设计开发的角色 */ - public static String[] allowDevRoles = new String[]{"lowdeveloper", "admin"}; + String[] allowDevRoles = new String[]{"lowdeveloper", "admin"}; /** * 【对应积木报表的常量】 * 数据隔离模式： 按照创建人隔离 */ - public static final String SAAS_MODE_CREATED = "created"; + String SAAS_MODE_CREATED = "created"; /** * 【对应积木报表的常量】 * 数据隔离模式： 按照租户隔离 */ - public static final String SAAS_MODE_TENANT = "tenant"; + String SAAS_MODE_TENANT = "tenant"; //update-end---author:scott ---date::2023-09-10 for：积木报表常量---- //update-begin---author:wangshuai---date:2024-04-07---for:修改手机号常量--- diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/CommonSendStatus.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/CommonSendStatus.java similarity index 59% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/CommonSendStatus.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/CommonSendStatus.java index 0706b4a..3eef7ef 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/CommonSendStatus.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/CommonSendStatus.java @@ -10,39 +10,39 @@ public interface CommonSendStatus { /** * 未发布 */ - public static final String UNPUBLISHED_STATUS_0 = "0"; + String UNPUBLISHED_STATUS_0 = "0"; /** * 已发布 */ - public static final String PUBLISHED_STATUS_1 = "1"; + String PUBLISHED_STATUS_1 = "1"; /** * 撤销 */ - public static final String REVOKE_STATUS_2 = "2"; + String REVOKE_STATUS_2 = "2"; /** * app端推送会话标识后缀 */ - public static final String APP_SESSION_SUFFIX = "_app"; + String APP_SESSION_SUFFIX = "_app"; /**-----【流程相关通知模板code】------------------------------------------------------------*/ /**流程催办——系统通知消息模板*/ - public static final String TZMB_BPM_CUIBAN = "bpm_cuiban"; + String TZMB_BPM_CUIBAN = "bpm_cuiban"; /**流程抄送——系统通知消息模板*/ - public static final String TZMB_BPM_CC = "bpm_cc"; + String TZMB_BPM_CC = "bpm_cc"; /**流程催办——邮件通知消息模板*/ - public static final String TZMB_BPM_CUIBAN_EMAIL = "bpm_cuiban_email"; + String TZMB_BPM_CUIBAN_EMAIL = "bpm_cuiban_email"; /**标准模板—系统消息通知*/ - public static final String TZMB_SYS_TS_NOTE = "sys_ts_note"; + String TZMB_SYS_TS_NOTE = "sys_ts_note"; /**流程超时提醒——系统通知消息模板*/ - public static final String TZMB_BPM_CHAOSHI_TIP = "bpm_chaoshi_tip"; + String TZMB_BPM_CHAOSHI_TIP = "bpm_chaoshi_tip"; /**-----【流程相关通知模板code】-----------------------------------------------------------*/ /** * 系统通知拓展参数（比如：用于流程抄送和催办通知，这里额外传递流程跳转页面所需要的路由参数） */ - public static final String MSG_ABSTRACT_JSON = "msg_abstract"; + String MSG_ABSTRACT_JSON = "msg_abstract"; } diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/DataBaseConstant.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java similarity index 59% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/DataBaseConstant.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java index 0e0454e..f857ae2 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/DataBaseConstant.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java @@ -8,7 +8,7 @@ public interface DataBaseConstant { /** * 内置的系统变量键列表 */ - public static final String[] SYSTEM_KEYS = { + String[] SYSTEM_KEYS = { DataBaseConstant.SYS_ORG_CODE, DataBaseConstant.SYS_ORG_CODE_TABLE, DataBaseConstant.SYS_MULTI_ORG_CODE, DataBaseConstant.SYS_MULTI_ORG_CODE_TABLE, DataBaseConstant.SYS_ORG_ID, DataBaseConstant.SYS_ORG_ID_TABLE, DataBaseConstant.SYS_ROLE_CODE, DataBaseConstant.SYS_ROLE_CODE_TABLE, DataBaseConstant.SYS_USER_CODE, @@ -21,31 +21,31 @@ public interface DataBaseConstant { //*********数据库类型**************************************** /**MYSQL数据库*/ - public static final String DB_TYPE_MYSQL = "MYSQL"; + String DB_TYPE_MYSQL = "MYSQL"; /** ORACLE*/ - public static final String DB_TYPE_ORACLE = "ORACLE"; + String DB_TYPE_ORACLE = "ORACLE"; /**达梦数据库*/ - public static final String DB_TYPE_DM = "DM"; + String DB_TYPE_DM = "DM"; /**postgreSQL达梦数据库*/ - public static final String DB_TYPE_POSTGRESQL = "POSTGRESQL"; + String DB_TYPE_POSTGRESQL = "POSTGRESQL"; /**人大金仓数据库*/ - public static final String DB_TYPE_KINGBASEES = "KINGBASEES"; + String DB_TYPE_KINGBASEES = "KINGBASEES"; /**sqlserver数据库*/ - public static final String DB_TYPE_SQLSERVER = "SQLSERVER"; + String DB_TYPE_SQLSERVER = "SQLSERVER"; /**mariadb 数据库*/ - public static final String DB_TYPE_MARIADB = "MARIADB"; + String DB_TYPE_MARIADB = "MARIADB"; /**DB2 数据库*/ - public static final String DB_TYPE_DB2 = "DB2"; + String DB_TYPE_DB2 = "DB2"; /**HSQL 数据库*/ - public static final String DB_TYPE_HSQL = "HSQL"; + String DB_TYPE_HSQL = "HSQL"; // // 数据库类型，对应 database_type 字典 // public static final String DB_TYPE_MYSQL_NUM = "1"; @@ -59,79 +59,79 @@ public interface DataBaseConstant { /** * 数据-所属机构编码 */ - public static final String SYS_ORG_CODE = "sysOrgCode"; + String SYS_ORG_CODE = "sysOrgCode"; /** * 数据-所属机构编码 */ - public static final String SYS_ORG_CODE_TABLE = "sys_org_code"; + String SYS_ORG_CODE_TABLE = "sys_org_code"; /** * 数据-所属机构编码 */ - public static final String SYS_MULTI_ORG_CODE = "sysMultiOrgCode"; + String SYS_MULTI_ORG_CODE = "sysMultiOrgCode"; /** * 数据-所属机构编码 */ - public static final String SYS_MULTI_ORG_CODE_TABLE = "sys_multi_org_code"; + String SYS_MULTI_ORG_CODE_TABLE = "sys_multi_org_code"; /** * 数据-所属机构ID */ - public static final String SYS_ORG_ID = "sysOrgId"; + String SYS_ORG_ID = "sysOrgId"; /** * 数据-所属机构ID */ - public static final String SYS_ORG_ID_TABLE = "sys_org_id"; + String SYS_ORG_ID_TABLE = "sys_org_id"; /** * 数据-所属角色code（多个逗号分割） */ - public static final String SYS_ROLE_CODE = "sysRoleCode"; + String SYS_ROLE_CODE = "sysRoleCode"; /** * 数据-所属角色code（多个逗号分割） */ - public static final String SYS_ROLE_CODE_TABLE = "sys_role_code"; + String SYS_ROLE_CODE_TABLE = "sys_role_code"; /** * 数据-系统用户编码（对应登录用户账号） */ - public static final String SYS_USER_CODE = "sysUserCode"; + String SYS_USER_CODE = "sysUserCode"; /** * 数据-系统用户编码（对应登录用户账号） */ - public static final String SYS_USER_CODE_TABLE = "sys_user_code"; + String SYS_USER_CODE_TABLE = "sys_user_code"; /** * 登录用户ID */ - public static final String SYS_USER_ID = "sysUserId"; + String SYS_USER_ID = "sysUserId"; /** * 登录用户ID */ - public static final String SYS_USER_ID_TABLE = "sys_user_id"; + String SYS_USER_ID_TABLE = "sys_user_id"; /** * 登录用户真实姓名 */ - public static final String SYS_USER_NAME = "sysUserName"; + String SYS_USER_NAME = "sysUserName"; /** * 登录用户真实姓名 */ - public static final String SYS_USER_NAME_TABLE = "sys_user_name"; + String SYS_USER_NAME_TABLE = "sys_user_name"; /** * 系统日期"yyyy-MM-dd" */ - public static final String SYS_DATE = "sysDate"; + String SYS_DATE = "sysDate"; /** * 系统日期"yyyy-MM-dd" */ - public static final String SYS_DATE_TABLE = "sys_date"; + String SYS_DATE_TABLE = "sys_date"; /** * 系统时间"yyyy-MM-dd HH:mm" */ - public static final String SYS_TIME = "sysTime"; + String SYS_TIME = "sysTime"; /** * 系统时间"yyyy-MM-dd HH:mm" */ - public static final String SYS_TIME_TABLE = "sys_time"; + String SYS_TIME_TABLE = "sys_time"; /** * 数据-所属机构编码 */ - public static final String SYS_BASE_PATH = "sys_base_path"; + String SYS_BASE_PATH = "sys_base_path"; //*********系统上下文变量**************************************** @@ -139,44 +139,44 @@ public interface DataBaseConstant { /** * 创建者登录名称 */ - public static final String CREATE_BY_TABLE = "create_by"; + String CREATE_BY_TABLE = "create_by"; /** * 创建者登录名称 */ - public static final String CREATE_BY = "createBy"; + String CREATE_BY = "createBy"; /** * 创建日期时间 */ - public static final String CREATE_TIME_TABLE = "create_time"; + String CREATE_TIME_TABLE = "create_time"; /** * 创建日期时间 */ - public static final String CREATE_TIME = "createTime"; + String CREATE_TIME = "createTime"; /** * 更新用户登录名称 */ - public static final String UPDATE_BY_TABLE = "update_by"; + String UPDATE_BY_TABLE = "update_by"; /** * 更新用户登录名称 */ - public static final String UPDATE_BY = "updateBy"; + String UPDATE_BY = "updateBy"; /** * 更新日期时间 */ - public static final String UPDATE_TIME = "updateTime"; + String UPDATE_TIME = "updateTime"; /** * 更新日期时间 */ - public static final String UPDATE_TIME_TABLE = "update_time"; + String UPDATE_TIME_TABLE = "update_time"; /** * 业务流程状态 */ - public static final String BPM_STATUS = "bpmStatus"; + String BPM_STATUS = "bpmStatus"; /** * 业务流程状态 */ - public static final String BPM_STATUS_TABLE = "bpm_status"; + String BPM_STATUS_TABLE = "bpm_status"; //*********系统建表标准字段**************************************** /** diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/DynamicTableConstant.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/DynamicTableConstant.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/DynamicTableConstant.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/DynamicTableConstant.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/FillRuleConstant.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/FillRuleConstant.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/FillRuleConstant.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/FillRuleConstant.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/PasswordConstant.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/PasswordConstant.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/PasswordConstant.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/PasswordConstant.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/ProvinceCityArea.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java similarity index 97% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/ProvinceCityArea.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java index ca11580..1a124cb 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/ProvinceCityArea.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java @@ -3,15 +3,12 @@ package org.jeecg.common.constant; import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.util.oConvertUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.core.io.Resource; import org.springframework.stereotype.Component; import java.io.File; -import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Scanner; -import java.util.Set; import java.util.List; /** @@ -174,7 +171,7 @@ public class ProvinceCityArea { Scanner scanner = null; StringBuilder buffer = new StringBuilder(); try { - scanner = new Scanner(file, "utf-8"); + scanner = new Scanner(file, StandardCharsets.UTF_8); while (scanner.hasNextLine()) { buffer.append(scanner.nextLine()); } diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/ServiceNameConstants.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/ServiceNameConstants.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/ServiceNameConstants.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/ServiceNameConstants.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/SymbolConstant.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/SymbolConstant.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/TenantConstant.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/TenantConstant.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/TenantConstant.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/TenantConstant.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/VxeSocketConst.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/VxeSocketConst.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/VxeSocketConst.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/VxeSocketConst.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/WebsocketConst.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/WebsocketConst.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/WebsocketConst.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/WebsocketConst.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/CgformEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/CgformEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/ClientTerminalTypeEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/ClientTerminalTypeEnum.java similarity index 86% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/ClientTerminalTypeEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/ClientTerminalTypeEnum.java index 380decb..2e15b6a 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/ClientTerminalTypeEnum.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/ClientTerminalTypeEnum.java @@ -9,8 +9,8 @@ public enum ClientTerminalTypeEnum { H5("h5", "移动网页端"), APP("app", "手机app端"); - private String key; - private String text; + private final String key; + private final String text; ClientTerminalTypeEnum(String value, String text) { this.key = value; diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/DateRangeEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DateRangeEnum.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/DateRangeEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DateRangeEnum.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/DepartCategoryEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DepartCategoryEnum.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/DepartCategoryEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DepartCategoryEnum.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/DySmsEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java similarity index 95% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/DySmsEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java index 3834f29..778c40b 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/DySmsEnum.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java @@ -30,7 +30,7 @@ public enum DySmsEnum { */ private String keys; - private DySmsEnum(String templateCode,String signName,String keys) { + DySmsEnum(String templateCode, String signName, String keys) { this.templateCode = templateCode; this.signName = signName; this.keys = keys; diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/EmailTemplateEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/EmailTemplateEnum.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/EmailTemplateEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/EmailTemplateEnum.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/FileTypeEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/FileTypeEnum.java similarity index 96% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/FileTypeEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/FileTypeEnum.java index 626a47e..a4503f1 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/FileTypeEnum.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/FileTypeEnum.java @@ -32,7 +32,7 @@ public enum FileTypeEnum { private String type; private String value; private String text; - private FileTypeEnum(String type,String value,String text){ + FileTypeEnum(String type, String value, String text){ this.type = type; this.value = value; this.text = text; diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/MessageTypeEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/MessageTypeEnum.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/MessageTypeEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/MessageTypeEnum.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/ModuleType.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/ModuleType.java similarity index 94% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/ModuleType.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/ModuleType.java index ac42f61..2a3d51e 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/ModuleType.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/ModuleType.java @@ -14,5 +14,5 @@ public enum ModuleType { /** * online */ - ONLINE; + ONLINE } diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/NoticeTypeEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/NoticeTypeEnum.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/NoticeTypeEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/NoticeTypeEnum.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/OperateTypeEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/OperateTypeEnum.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/OperateTypeEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/OperateTypeEnum.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/PositionLevelEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/PositionLevelEnum.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/PositionLevelEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/PositionLevelEnum.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/RoleIndexConfigEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/RoleIndexConfigEnum.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/RoleIndexConfigEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/RoleIndexConfigEnum.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/SysAnnmentTypeEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/SysAnnmentTypeEnum.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/SysAnnmentTypeEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/SysAnnmentTypeEnum.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/Vue3MessageHrefEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/Vue3MessageHrefEnum.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/constant/enums/Vue3MessageHrefEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/constant/enums/Vue3MessageHrefEnum.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/desensitization/SensitiveSerialize.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/desensitization/SensitiveSerialize.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/desensitization/SensitiveSerialize.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/desensitization/SensitiveSerialize.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/desensitization/annotation/Sensitive.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/Sensitive.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/desensitization/annotation/Sensitive.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/Sensitive.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/desensitization/annotation/SensitiveDecode.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveDecode.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/desensitization/annotation/SensitiveDecode.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveDecode.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/desensitization/annotation/SensitiveEncode.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveEncode.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/desensitization/annotation/SensitiveEncode.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveEncode.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/desensitization/annotation/SensitiveField.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveField.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/desensitization/annotation/SensitiveField.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveField.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/desensitization/aspect/SensitiveDataAspect.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/desensitization/aspect/SensitiveDataAspect.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/desensitization/aspect/SensitiveDataAspect.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/desensitization/aspect/SensitiveDataAspect.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/desensitization/enums/SensitiveEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/desensitization/enums/SensitiveEnum.java similarity index 97% rename from cpte-boot-base-core/src/main/java/org/cpte/common/desensitization/enums/SensitiveEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/desensitization/enums/SensitiveEnum.java index bdffc75..76aed38 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/desensitization/enums/SensitiveEnum.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/desensitization/enums/SensitiveEnum.java @@ -49,7 +49,7 @@ public enum SensitiveEnum { /** * 公司开户银行联号 */ - CNAPS_CODE; + CNAPS_CODE } diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/desensitization/util/SensitiveInfoUtil.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/desensitization/util/SensitiveInfoUtil.java similarity index 98% rename from cpte-boot-base-core/src/main/java/org/cpte/common/desensitization/util/SensitiveInfoUtil.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/desensitization/util/SensitiveInfoUtil.java index 820047e..b6ee102 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/desensitization/util/SensitiveInfoUtil.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/desensitization/util/SensitiveInfoUtil.java @@ -40,8 +40,7 @@ public class SensitiveInfoUtil { break; }else{ // 对象里面是List<实体> - if(field.getGenericType() instanceof ParameterizedType){ - ParameterizedType pt = (ParameterizedType)field.getGenericType(); + if(field.getGenericType() instanceof ParameterizedType pt){ if(pt.getRawType().equals(List.class)){ if(pt.getActualTypeArguments()[0].equals(entity)){ field.setAccessible(true); @@ -67,7 +66,7 @@ public class SensitiveInfoUtil { return obj; } long startTime=System.currentTimeMillis(); - log.debug(" obj --> "+ obj.toString()); + log.debug(" obj --> "+ obj); // 判断是不是一个对象 Field[] fields = obj.getClass().getDeclaredFields(); @@ -83,7 +82,7 @@ public class SensitiveInfoUtil { continue; } SensitiveField sf = field.getAnnotation(SensitiveField.class); - if(isEncode==true){ + if(isEncode){ //加密 String value = SensitiveInfoUtil.getEncodeData(realValue, sf.type()); field.set(obj, value); diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/es/JeecgElasticsearchTemplate.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java similarity index 99% rename from cpte-boot-base-core/src/main/java/org/cpte/common/es/JeecgElasticsearchTemplate.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java index 525d461..5649159 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/es/JeecgElasticsearchTemplate.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java @@ -387,7 +387,7 @@ public class JeecgElasticsearchTemplate { data.remove("id"); bodySb.append(data.toJSONString()).append("\n"); } - System.out.println("+-+-+-: bodySb.toString(): " + bodySb.toString()); + System.out.println("+-+-+-: bodySb.toString(): " + bodySb); HttpHeaders headers = RestUtil.getHeaderApplicationJson(); RestUtil.request(url, HttpMethod.PUT, headers, null, bodySb, JSONObject.class); return true; diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/es/QueryStringBuilder.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/es/QueryStringBuilder.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/es/QueryStringBuilder.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/es/QueryStringBuilder.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/exception/JeecgBoot401Exception.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/exception/JeecgBoot401Exception.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/exception/JeecgBootAssertException.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootAssertException.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/exception/JeecgBootAssertException.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootAssertException.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/exception/JeecgBootBizTipException.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootBizTipException.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/exception/JeecgBootBizTipException.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootBizTipException.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/exception/JeecgBootException.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootException.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/exception/JeecgBootException.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootException.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/exception/JeecgBootExceptionHandler.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/exception/JeecgBootExceptionHandler.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/exception/JeecgSqlInjectionException.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgSqlInjectionException.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/exception/JeecgSqlInjectionException.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgSqlInjectionException.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/handler/IFillRuleHandler.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/handler/IFillRuleHandler.java similarity index 85% rename from cpte-boot-base-core/src/main/java/org/cpte/common/handler/IFillRuleHandler.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/handler/IFillRuleHandler.java index 7c6478b..50dec03 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/handler/IFillRuleHandler.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/handler/IFillRuleHandler.java @@ -16,7 +16,7 @@ public interface IFillRuleHandler { * @param formData 动态表单参数 * @return */ - public Object execute(JSONObject params, JSONObject formData); + Object execute(JSONObject params, JSONObject formData); } diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/annotation/EnumDict.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/annotation/EnumDict.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/annotation/EnumDict.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/annotation/EnumDict.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/base/controller/JeecgController.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/base/controller/JeecgController.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/base/entity/JeecgEntity.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/base/entity/JeecgEntity.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/base/service/JeecgService.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/base/service/JeecgService.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/base/service/JeecgService.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/base/service/JeecgService.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/base/service/impl/JeecgServiceImpl.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/base/service/impl/JeecgServiceImpl.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/enhance/UserFilterEnhance.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/enhance/UserFilterEnhance.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/enhance/UserFilterEnhance.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/enhance/UserFilterEnhance.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/query/MatchTypeEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java similarity index 89% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/query/MatchTypeEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java index d19342d..47b46aa 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/system/query/MatchTypeEnum.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java @@ -14,7 +14,7 @@ public enum MatchTypeEnum { /**查询链接规则 OR*/ OR("OR"); - private String value; + private final String value; MatchTypeEnum(String value) { this.value = value; @@ -36,7 +36,7 @@ public enum MatchTypeEnum { return null; } for (MatchTypeEnum val : values()) { - if (val.getValue().toLowerCase().equals(value.toLowerCase())) { + if (val.getValue().equalsIgnoreCase(value)) { return val; } } diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/query/QueryCondition.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryCondition.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/query/QueryCondition.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryCondition.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/query/QueryGenerator.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java similarity index 98% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/query/QueryGenerator.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java index 6765383..e87bcb3 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/system/query/QueryGenerator.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java @@ -4,6 +4,7 @@ import java.beans.PropertyDescriptor; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -21,6 +22,7 @@ import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.system.util.SqlConcatUtil; import org.jeecg.common.system.vo.SysPermissionDataRuleModel; import org.jeecg.common.util.*; +import org.jeecg.common.util.*; import org.springframework.util.NumberUtils; import com.alibaba.fastjson.JSON; @@ -171,7 +173,7 @@ public class QueryGenerator { //TODO 这种前后带逗号的支持分割后模糊查询(多选字段查询生效) 示例：,1,3, if (null != value && value.toString().startsWith(COMMA) && value.toString().endsWith(COMMA)) { String multiLikeval = value.toString().replace(",,", COMMA); - String[] vals = multiLikeval.substring(1, multiLikeval.length()).split(COMMA); + String[] vals = multiLikeval.substring(1).split(COMMA); final String field = oConvertUtils.camelToUnderline(column); if(vals.length>1) { queryWrapper.and(j -> { @@ -407,7 +409,7 @@ public class QueryGenerator { MatchTypeEnum matchType = MatchTypeEnum.getByValue(superQueryMatchType); // update-begin--Author:sunjianlei Date:20200325 for：高级查询的条件要用括号括起来，防止和用户的其他条件冲突 ------- try { - superQueryParams = URLDecoder.decode(superQueryParams, "UTF-8"); + superQueryParams = URLDecoder.decode(superQueryParams, StandardCharsets.UTF_8); List conditions = JSON.parseArray(superQueryParams, QueryCondition.class); if (conditions == null || conditions.size() == 0) { return; @@ -436,7 +438,7 @@ public class QueryGenerator { || "empty".equals(rule.getRule()) ) { - log.debug("SuperQuery ==> " + rule.toString()); + log.debug("SuperQuery ==> " + rule); //update-begin-author:taoyan date:20201228 for: 【高级查询】 oracle 日期等于查询报错 Object queryValue = rule.getVal(); @@ -490,8 +492,6 @@ public class QueryGenerator { } //return andWrapper; }); - } catch (UnsupportedEncodingException e) { - log.error("--高级查询参数转码失败：" + superQueryParams, e); } catch (Exception e) { log.error("--高级查询拼接失败：" + e.getMessage()); e.printStackTrace(); @@ -512,7 +512,7 @@ public class QueryGenerator { if (value == null) { return QueryRuleEnum.EQ; } - String val = (value + "").toString().trim(); + String val = (value + "").trim(); if (val.length() == 0) { return QueryRuleEnum.EQ; } @@ -591,7 +591,7 @@ public class QueryGenerator { if (! (value instanceof String)){ return value; } - String val = (value + "").toString().trim(); + String val = (value + "").trim(); //update-begin-author:taoyan date:20220302 for: 查询条件的值为等号（=）bug #3443 if(QueryRuleEnum.EQ.getValue().equals(val)){ return val; @@ -1004,7 +1004,7 @@ public class QueryGenerator { sb.append(sqlAnd+filedSql); } } - log.info("query auth sql is:"+sb.toString()); + log.info("query auth sql is:"+ sb); return sb.toString(); } diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/query/QueryRuleEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/query/QueryRuleEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/util/JeecgDataAutorUtils.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java similarity index 94% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/util/JeecgDataAutorUtils.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java index 66e48cc..9a9844e 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/system/util/JeecgDataAutorUtils.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java @@ -33,7 +33,7 @@ public class JeecgDataAutorUtils { public static synchronized void installDataSearchConditon(HttpServletRequest request, List dataRules) { @SuppressWarnings("unchecked") // 1.先从request获取MENU_DATA_AUTHOR_RULES，如果存则获取到LIST - List list = (List)loadDataSearchConditon(); + List list = loadDataSearchConditon(); if (list==null) { // 2.如果不存在，则new一个list list = new ArrayList(); @@ -72,7 +72,7 @@ public class JeecgDataAutorUtils { * @param sql */ public static synchronized void installDataSearchConditon(HttpServletRequest request, String sql) { - String ruleSql = (String) loadDataSearchConditonSqlString(); + String ruleSql = loadDataSearchConditonSqlString(); if (!StringUtils.hasText(ruleSql)) { request.setAttribute(MENU_DATA_AUTHOR_RULE_SQL,sql); } diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/util/JwtUtil.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java similarity index 91% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/util/JwtUtil.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java index 718580c..e892d6c 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/system/util/JwtUtil.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java @@ -6,15 +6,12 @@ import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.exceptions.JWTDecodeException; import com.auth0.jwt.interfaces.DecodedJWT; import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.common.base.Joiner; import java.io.IOException; -import java.io.OutputStream; import java.util.Date; import java.util.Objects; import java.util.stream.Collectors; -import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -211,15 +208,15 @@ public class JwtUtil { } //update-end---author:chenrui ---date:20250107 for：[QQYUN-10785]数据权限，查看自己拥有部门的权限中存在问题 #7288------------ //替换为当前系统时间(年月日) - if (key.equals(DataBaseConstant.SYS_DATE)|| key.toLowerCase().equals(DataBaseConstant.SYS_DATE_TABLE)) { + if (key.equals(DataBaseConstant.SYS_DATE)|| key.equalsIgnoreCase(DataBaseConstant.SYS_DATE_TABLE)) { returnValue = DateUtils.formatDate(); } //替换为当前系统时间（年月日时分秒） - else if (key.equals(DataBaseConstant.SYS_TIME)|| key.toLowerCase().equals(DataBaseConstant.SYS_TIME_TABLE)) { + else if (key.equals(DataBaseConstant.SYS_TIME)|| key.equalsIgnoreCase(DataBaseConstant.SYS_TIME_TABLE)) { returnValue = DateUtils.now(); } //流程状态默认值（默认未发起） - else if (key.equals(DataBaseConstant.BPM_STATUS)|| key.toLowerCase().equals(DataBaseConstant.BPM_STATUS_TABLE)) { + else if (key.equals(DataBaseConstant.BPM_STATUS)|| key.equalsIgnoreCase(DataBaseConstant.BPM_STATUS_TABLE)) { returnValue = "1"; } @@ -229,7 +226,7 @@ public class JwtUtil { } //替换为系统登录用户帐号 - if (key.equals(DataBaseConstant.SYS_USER_CODE)|| key.toLowerCase().equals(DataBaseConstant.SYS_USER_CODE_TABLE)) { + if (key.equals(DataBaseConstant.SYS_USER_CODE)|| key.equalsIgnoreCase(DataBaseConstant.SYS_USER_CODE_TABLE)) { if(user==null) { returnValue = sysUser.getUsername(); }else { @@ -247,7 +244,7 @@ public class JwtUtil { } //替换为系统登录用户真实名字 - else if (key.equals(DataBaseConstant.SYS_USER_NAME)|| key.toLowerCase().equals(DataBaseConstant.SYS_USER_NAME_TABLE)) { + else if (key.equals(DataBaseConstant.SYS_USER_NAME)|| key.equalsIgnoreCase(DataBaseConstant.SYS_USER_NAME_TABLE)) { if(user==null) { returnValue = sysUser.getRealname(); }else { @@ -256,7 +253,7 @@ public class JwtUtil { } //替换为系统用户登录所使用的机构编码 - else if (key.equals(DataBaseConstant.SYS_ORG_CODE)|| key.toLowerCase().equals(DataBaseConstant.SYS_ORG_CODE_TABLE)) { + else if (key.equals(DataBaseConstant.SYS_ORG_CODE)|| key.equalsIgnoreCase(DataBaseConstant.SYS_ORG_CODE_TABLE)) { if(user==null) { returnValue = sysUser.getOrgCode(); }else { @@ -274,7 +271,7 @@ public class JwtUtil { } //替换为系统用户所拥有的所有机构编码 - else if (key.equals(DataBaseConstant.SYS_MULTI_ORG_CODE)|| key.toLowerCase().equals(DataBaseConstant.SYS_MULTI_ORG_CODE_TABLE)) { + else if (key.equals(DataBaseConstant.SYS_MULTI_ORG_CODE)|| key.equalsIgnoreCase(DataBaseConstant.SYS_MULTI_ORG_CODE_TABLE)) { if(user==null){ //TODO 暂时使用用户登录部门，存在逻辑缺陷，不是用户所拥有的部门 returnValue = sysUser.getOrgCode(); @@ -316,7 +313,7 @@ public class JwtUtil { } //update-begin-author:taoyan date:20210330 for:多租户ID作为系统变量 - else if (key.equals(TenantConstant.TENANT_ID) || key.toLowerCase().equals(TenantConstant.TENANT_ID_TABLE)){ + else if (key.equals(TenantConstant.TENANT_ID) || key.equalsIgnoreCase(TenantConstant.TENANT_ID_TABLE)){ try { returnValue = SpringContextUtils.getHttpServletRequest().getHeader(CommonConstant.TENANT_ID); } catch (Exception e) { diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/util/ResourceUtil.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java similarity index 98% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/util/ResourceUtil.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java index 9d3ac56..5c42568 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/system/util/ResourceUtil.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java @@ -3,9 +3,7 @@ package org.jeecg.common.system.util; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.annotation.EnumDict; import org.jeecg.common.system.vo.DictModel; -import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; -import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver; diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/util/SqlConcatUtil.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/util/SqlConcatUtil.java similarity index 97% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/util/SqlConcatUtil.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/util/SqlConcatUtil.java index f1d6683..d72193e 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/system/util/SqlConcatUtil.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/util/SqlConcatUtil.java @@ -15,6 +15,7 @@ import org.jeecg.common.util.oConvertUtils; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -166,7 +167,7 @@ public class SqlConcatUtil { } return "("+String.join("," ,res)+")"; }else { - return "("+value.toString()+")"; + return "("+ value +")"; } //update-end-author:taoyan date:20210628 for: 查询条件如果输入,导致sql报错 } @@ -266,11 +267,7 @@ public class SqlConcatUtil { // 【TV360X-967】URL解码（微服务下需要） if (queryInfoString.contains("%22column%22")) { log.info("queryInfoString 原生 = {}", queryInfoString); - try { - queryInfoString = URLDecoder.decode(queryInfoString, "UTF-8"); - } catch (UnsupportedEncodingException e) { - throw new JeecgBootException(e); - } + queryInfoString = URLDecoder.decode(queryInfoString, StandardCharsets.UTF_8); log.info("queryInfoString 解码 = {}", queryInfoString); } JSONArray array = JSONArray.parseArray(queryInfoString); diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/ComboModel.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/ComboModel.java similarity index 98% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/ComboModel.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/ComboModel.java index da7d91c..cedcc29 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/ComboModel.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/ComboModel.java @@ -29,12 +29,12 @@ public class ComboModel implements Serializable { public ComboModel(){ - }; + } public ComboModel(String id,String title,boolean checked,String username){ this.id = id; this.title = title; this.checked = false; this.username = username; - }; + } } diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/DictModel.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModel.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/DictModel.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModel.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/DictModelMany.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModelMany.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/DictModelMany.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModelMany.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/DictQuery.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictQuery.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/DictQuery.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictQuery.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/DynamicDataSourceModel.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/DynamicDataSourceModel.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/DynamicDataSourceModel.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/DynamicDataSourceModel.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/LoginUser.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/LoginUser.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/SelectTreeModel.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/SelectTreeModel.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/SelectTreeModel.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/SelectTreeModel.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/SysCategoryModel.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java similarity index 94% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/SysCategoryModel.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java index 5499bef..4948150 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/SysCategoryModel.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java @@ -1,6 +1,5 @@ package org.jeecg.common.system.vo; -import org.jeecgframework.poi.excel.annotation.Excel; /** * @Author qinfeng diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/SysDepartModel.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysDepartModel.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/SysDepartModel.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysDepartModel.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/SysFilesModel.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysFilesModel.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/SysFilesModel.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysFilesModel.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/SysPermissionDataRuleModel.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java similarity index 91% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/SysPermissionDataRuleModel.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java index f9204d6..77f696f 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/SysPermissionDataRuleModel.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java @@ -1,12 +1,6 @@ package org.jeecg.common.system.vo; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import java.io.Serializable; import java.util.Date; /** diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/SysUserCacheInfo.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/SysUserCacheInfo.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/UserAccountInfo.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/UserAccountInfo.java similarity index 86% rename from cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/UserAccountInfo.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/UserAccountInfo.java index 3d44c41..7c49a80 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/system/vo/UserAccountInfo.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/system/vo/UserAccountInfo.java @@ -1,13 +1,10 @@ package org.jeecg.common.system.vo; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecg.common.desensitization.annotation.SensitiveField; -import org.springframework.format.annotation.DateTimeFormat; -import java.util.Date; /** *

diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/AssertUtils.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/AssertUtils.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/AssertUtils.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/AssertUtils.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/BrowserType.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/BrowserType.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/BrowserType.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/BrowserType.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/BrowserUtils.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java similarity index 93% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/BrowserUtils.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java index 479a917..f5c8f09 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/BrowserUtils.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java @@ -20,9 +20,8 @@ public class BrowserUtils { * @return */ public static boolean isIe(HttpServletRequest request) { - return (request.getHeader("USER-AGENT").toLowerCase().indexOf("msie") > 0 || request - .getHeader("USER-AGENT").toLowerCase().indexOf("rv:11.0") > 0) ? true - : false; + return request.getHeader("USER-AGENT").toLowerCase().indexOf("msie") > 0 || request + .getHeader("USER-AGENT").toLowerCase().indexOf("rv:11.0") > 0; } /** @@ -96,7 +95,7 @@ public class BrowserUtils { private static boolean getBrowserType(HttpServletRequest request, String brosertype) { return request.getHeader("USER-AGENT").toLowerCase() - .indexOf(brosertype) > 0 ? true : false; + .indexOf(brosertype) > 0; } private final static String IE11 = "rv:11.0"; @@ -170,7 +169,7 @@ public class BrowserUtils { } - private static Map langMap = new HashMap(); + private static final Map langMap = new HashMap(); private final static String ZH = "zh"; private final static String ZH_CN = "zh-cn"; @@ -187,7 +186,7 @@ public class BrowserUtils { public static String getBrowserLanguage(HttpServletRequest request) { String browserLang = request.getLocale().getLanguage(); - String browserLangCode = (String)langMap.get(browserLang); + String browserLangCode = langMap.get(browserLang); if(browserLangCode == null) { diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/CommonUtils.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java similarity index 97% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/CommonUtils.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java index b852723..d0019c0 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/CommonUtils.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java @@ -45,13 +45,13 @@ public class CommonUtils { /** * 中文正则 */ - private static Pattern ZHONGWEN_PATTERN = Pattern.compile("[\u4e00-\u9fa5]"); + private static final Pattern ZHONGWEN_PATTERN = Pattern.compile("[\u4e00-\u9fa5]"); /** * 文件名 正则字符串 * 文件名支持的字符串：字母数字中文.-_()（） 除此之外的字符将被删除 */ - private static String FILE_NAME_REGEX = "[^A-Za-z\\.\\(\\)\\-（）\\_0-9\\u4e00-\\u9fa5]"; + private static final String FILE_NAME_REGEX = "[^A-Za-z\\.\\(\\)\\-（）\\_0-9\\u4e00-\\u9fa5]"; public static String uploadOnlineImage(byte[] data,String basePath,String bizPath,String uploadType){ String dbPath = null; @@ -120,10 +120,7 @@ public class CommonUtils { return false; }else{ Matcher m = ZHONGWEN_PATTERN.matcher(str); - if (m.find()) { - return true; - } - return false; + return m.find(); } } @@ -266,7 +263,7 @@ public class CommonUtils { public static DataSourceProperty getDataSourceProperty(String sourceKey){ DynamicDataSourceProperties prop = SpringContextUtils.getApplicationContext().getBean(DynamicDataSourceProperties.class); Map map = prop.getDatasource(); - DataSourceProperty db = (DataSourceProperty)map.get(sourceKey); + DataSourceProperty db = map.get(sourceKey); return db; } @@ -282,7 +279,7 @@ public class CommonUtils { } DynamicDataSourceProperties prop = SpringContextUtils.getApplicationContext().getBean(DynamicDataSourceProperties.class); Map map = prop.getDatasource(); - DataSourceProperty db = (DataSourceProperty)map.get(sourceKey); + DataSourceProperty db = map.get(sourceKey); if(db==null){ return null; } diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/DateRangeUtils.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/DateRangeUtils.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/DateRangeUtils.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/DateRangeUtils.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/DateUtils.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java similarity index 99% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/DateUtils.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java index ebf13d0..87748f4 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/DateUtils.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java @@ -674,8 +674,7 @@ public class DateUtils extends PropertyEditorSupport { throw new IllegalArgumentException("Could not parse date, date format is error "); } } catch (ParseException ex) { - IllegalArgumentException iae = new IllegalArgumentException("Could not parse date: " + ex.getMessage()); - iae.initCause(ex); + IllegalArgumentException iae = new IllegalArgumentException("Could not parse date: " + ex.getMessage(), ex); throw iae; } } else { diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/DySmsHelper.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/DySmsHelper.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/DySmsLimit.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/DySmsLimit.java similarity index 91% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/DySmsLimit.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/DySmsLimit.java index b7a24c8..ff227d0 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/DySmsLimit.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/DySmsLimit.java @@ -26,9 +26,9 @@ public class DySmsLimit { // 一分钟内报警线最大短信数量，超了进黑名单（单一IP） private static final int MAX_TOTAL_MESSAGE_PER_MINUTE = 20; - private static ConcurrentHashMap ipLastRequestTime = new ConcurrentHashMap<>(); - private static ConcurrentHashMap ipRequestCount = new ConcurrentHashMap<>(); - private static ConcurrentHashMap ipBlacklist = new ConcurrentHashMap<>(); + private static final ConcurrentHashMap ipLastRequestTime = new ConcurrentHashMap<>(); + private static final ConcurrentHashMap ipRequestCount = new ConcurrentHashMap<>(); + private static final ConcurrentHashMap ipBlacklist = new ConcurrentHashMap<>(); /** * @param ip 请求发短信的IP地址 diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/FileDownloadUtils.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/FileDownloadUtils.java similarity index 96% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/FileDownloadUtils.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/FileDownloadUtils.java index 55fa080..662edba 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/FileDownloadUtils.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/FileDownloadUtils.java @@ -53,16 +53,12 @@ public class FileDownloadUtils { response.setHeader("content-type", "application/octet-stream"); response.setContentType("application/octet-stream"); // 下载文件能正常显示中文 - try { - response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8")); - response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); - } catch (UnsupportedEncodingException e) { - log.error(e.getMessage(), e); - } + response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, StandardCharsets.UTF_8)); + response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); // 实现文件下载 byte[] buffer = new byte[1024]; try (FileInputStream fis = new FileInputStream(file); - BufferedInputStream bis = new BufferedInputStream(fis);) { + BufferedInputStream bis = new BufferedInputStream(fis)) { OutputStream os = response.getOutputStream(); int i = bis.read(buffer); while (i != -1) { @@ -88,13 +84,13 @@ public class FileDownloadUtils { response.setCharacterEncoding("UTF-8"); response.setHeader("content-type", "application/octet-stream"); response.setContentType("application/octet-stream"); - response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(downloadName, "UTF-8")); + response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(downloadName, StandardCharsets.UTF_8)); response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); log.info("开始压缩文件:" + filesPath); //设置压缩流：直接写入response，实现边压缩边下载 try (ZipOutputStream zipOut = new ZipOutputStream(new BufferedOutputStream(response.getOutputStream())); - DataOutputStream os = new DataOutputStream(zipOut);) { + DataOutputStream os = new DataOutputStream(zipOut)) { //设置压缩方法 zipOut.setMethod(ZipOutputStream.DEFLATED); for (String filePath : filesPath) { @@ -141,7 +137,7 @@ public class FileDownloadUtils { // 确保目录存在 File file = ensureDestFileDir(storePath); try (InputStream inStream = conn.getInputStream(); - FileOutputStream fs = new FileOutputStream(file);) { + FileOutputStream fs = new FileOutputStream(file)) { int byteread; byte[] buffer = new byte[1204]; while ((byteread = inStream.read(buffer)) != -1) { diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/FillRuleUtil.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/FillRuleUtil.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/FillRuleUtil.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/FillRuleUtil.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/HTMLUtils.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/HTMLUtils.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/HTMLUtils.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/HTMLUtils.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/ImportExcelUtil.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/ImportExcelUtil.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/ImportExcelUtil.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/ImportExcelUtil.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/IpUtils.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java similarity index 97% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/IpUtils.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java index 7add5d2..eda4950 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/IpUtils.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java @@ -20,7 +20,7 @@ import java.util.regex.Pattern; * @Date 2019年01月14日 */ public class IpUtils { - private static Logger logger = LoggerFactory.getLogger(IpUtils.class); + private static final Logger logger = LoggerFactory.getLogger(IpUtils.class); /** * 获取IP地址 diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/Md5Util.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/Md5Util.java similarity index 96% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/Md5Util.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/Md5Util.java index e9cca64..deb2f10 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/Md5Util.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/Md5Util.java @@ -32,7 +32,7 @@ public class Md5Util { public static String md5Encode(String origin, String charsetname) { String resultString = null; try { - resultString = new String(origin); + resultString = origin; MessageDigest md = MessageDigest.getInstance("MD5"); if (charsetname == null || "".equals(charsetname)) { resultString = byteArrayToHexString(md.digest(resultString.getBytes())); diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/MinioUtil.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java similarity index 98% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/MinioUtil.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java index 61fef38..0aa2104 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/MinioUtil.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java @@ -10,6 +10,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.InputStream; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * minio文件上传工具类 @@ -167,7 +168,7 @@ public class MinioUtil { .expiry(expires).method(Method.GET).build(); //update-begin---author:liusq Date:20220121 for：获取文件外链报错提示method不能为空，导致文件下载和预览失败---- String url = minioClient.getPresignedObjectUrl(objectArgs); - return URLDecoder.decode(url,"UTF-8"); + return URLDecoder.decode(url, StandardCharsets.UTF_8); }catch (Exception e){ log.info("文件路径获取失败" + e.getMessage()); } diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/MyClassLoader.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java similarity index 97% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/MyClassLoader.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java index 20289b6..29e234c 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/MyClassLoader.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java @@ -2,6 +2,8 @@ package org.jeecg.common.util; import org.jeecg.common.constant.SymbolConstant; +import java.nio.charset.StandardCharsets; + /** * @Author 张代浩 */ @@ -96,7 +98,7 @@ public class MyClassLoader extends ClassLoader { 中文及空格路径 -------------------------------------------------------------*/ try { - realPath = java.net.URLDecoder.decode(realPath, "utf-8"); + realPath = java.net.URLDecoder.decode(realPath, StandardCharsets.UTF_8); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/PasswordUtil.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java similarity index 96% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/PasswordUtil.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java index 36ba96c..3eacb07 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/PasswordUtil.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java @@ -1,5 +1,6 @@ package org.jeecg.common.util; +import java.nio.charset.StandardCharsets; import java.security.Key; import java.security.SecureRandom; import javax.crypto.Cipher; @@ -100,7 +101,7 @@ public class PasswordUtil { cipher.init(Cipher.ENCRYPT_MODE, key, parameterSpec); //update-begin-author:sccott date:20180815 for:中文作为用户名时，加密的密码windows和linux会得到不同的结果 gitee/issues/IZUD7 - encipheredData = cipher.doFinal(plaintext.getBytes("utf-8")); + encipheredData = cipher.doFinal(plaintext.getBytes(StandardCharsets.UTF_8)); //update-end-author:sccott date:20180815 for:中文作为用户名时，加密的密码windows和linux会得到不同的结果 gitee/issues/IZUD7 } catch (Exception e) { } @@ -146,7 +147,7 @@ public class PasswordUtil { * @return */ public static String bytesToHexString(byte[] src) { - StringBuilder stringBuilder = new StringBuilder(""); + StringBuilder stringBuilder = new StringBuilder(); if (src == null || src.length <= 0) { return null; } diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/PmsUtil.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/PmsUtil.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/PmsUtil.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/PmsUtil.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/ReflectHelper.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/ReflectHelper.java similarity index 95% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/ReflectHelper.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/ReflectHelper.java index 832f6b9..fab0c2d 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/ReflectHelper.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/ReflectHelper.java @@ -22,7 +22,7 @@ public class ReflectHelper { /** * 传过来的对象 */ - private Object obj; + private final Object obj; /** * 存放get方法 @@ -85,7 +85,7 @@ public class ReflectHelper { m.invoke(obj, object); return true; } catch (Exception ex) { - log.info("invoke getter on " + property + " error: " + ex.toString()); + log.info("invoke getter on " + property + " error: " + ex); return false; } } @@ -103,10 +103,10 @@ public class ReflectHelper { /* * 调用obj类的setter函数 */ - value = m.invoke(obj, new Object[]{}); + value = m.invoke(obj); } catch (Exception ex) { - log.info("invoke getter on " + property + " error: " + ex.toString()); + log.info("invoke getter on " + property + " error: " + ex); } } return value; @@ -119,7 +119,7 @@ public class ReflectHelper { * @return */ public Object setAll(Map data) { - if (data == null || data.keySet().size() <= 0) { + if (data == null || data.size() <= 0) { return null; } for (Entry entry : data.entrySet()) { @@ -185,8 +185,8 @@ public class ReflectHelper { try { String firstLetter = fieldName.substring(0, 1).toUpperCase(); String getter = "get" + firstLetter + fieldName.substring(1); - Method method = o.getClass().getMethod(getter, new Class[]{}); - Object value = method.invoke(o, new Object[]{}); + Method method = o.getClass().getMethod(getter); + Object value = method.invoke(o); return value; } catch (Exception e) { e.printStackTrace(); @@ -282,9 +282,7 @@ public class ReflectHelper { Field[] fields; do{ fields = clazz.getDeclaredFields(); - for(int i = 0;i FULL_MATCHING_KEYWRODS = new ArrayList<>(); + private static final List FULL_MATCHING_KEYWRODS = new ArrayList<>(); static { FULL_MATCHING_KEYWRODS.add(";"); FULL_MATCHING_KEYWRODS.add("+"); @@ -133,8 +133,7 @@ public class SqlInjectionUtil { throw new JeecgSqlInjectionException(SqlInjectionUtil.SQL_INJECTION_TIP + value); } } - return; - } + } /** * 判断是否存在SQL注入关键词字符串 @@ -208,8 +207,7 @@ public class SqlInjectionUtil { } filterContent(val, customXssString); } - return; - } + } /** * 【提醒：不通用】 @@ -253,8 +251,7 @@ public class SqlInjectionUtil { throw new JeecgSqlInjectionException(SqlInjectionUtil.SQL_INJECTION_TIP + value); } } - return; - } + } /** * 【提醒：不通用】 @@ -297,8 +294,7 @@ public class SqlInjectionUtil { throw new JeecgSqlInjectionException(SqlInjectionUtil.SQL_INJECTION_TIP + value); } } - return; - } + } /** @@ -329,7 +325,7 @@ public class SqlInjectionUtil { * * @param table */ - private static Pattern tableNamePattern = Pattern.compile("^[a-zA-Z][a-zA-Z0-9_\\$]{0,63}$"); + private static final Pattern tableNamePattern = Pattern.compile("^[a-zA-Z][a-zA-Z0-9_\\$]{0,63}$"); public static String getSqlInjectTableName(String table) { if(oConvertUtils.isEmpty(table)){ return table; diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/TokenUtils.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/TokenUtils.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/UUIDGenerator.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/UUIDGenerator.java similarity index 90% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/UUIDGenerator.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/UUIDGenerator.java index 9893f25..a337ff2 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/UUIDGenerator.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/UUIDGenerator.java @@ -18,9 +18,9 @@ public class UUIDGenerator { */ public static String generate() { - return new StringBuilder(32).append(format(getIp())).append( - format(getJvm())).append(format(getHiTime())).append( - format(getLoTime())).append(format(getCount())).toString(); + return format(getIp()) + + format(getJvm()) + format(getHiTime()) + + format(getLoTime()) + format(getCount()); } diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/YouBianCodeUtil.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java similarity index 99% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/YouBianCodeUtil.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java index 3b939f5..e4774d9 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/YouBianCodeUtil.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java @@ -35,7 +35,7 @@ public class YouBianCodeUtil { newcode = zimu + num; } else { String beforeCode = code.substring(0, code.length() - 1- NUM_LENGTH); - String afterCode = code.substring(code.length() - 1 - NUM_LENGTH,code.length()); + String afterCode = code.substring(code.length() - 1 - NUM_LENGTH); char afterCodeZimu = afterCode.substring(0, 1).charAt(0); Integer afterCodeNum = Integer.parseInt(afterCode.substring(1)); // org.jeecgframework.core.util.LogUtil.info(after_code); @@ -128,7 +128,7 @@ public class YouBianCodeUtil { /** * 递增获取下个字母 * - * @param num + * @param zimu 字母 * @return */ private static char getNextZiMu(char zimu) { diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/dynamic/db/DataSourceCachePool.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java similarity index 97% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/dynamic/db/DataSourceCachePool.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java index 3093401..707ea39 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/dynamic/db/DataSourceCachePool.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java @@ -16,7 +16,7 @@ import java.util.Map; */ public class DataSourceCachePool { /** 数据源连接池缓存【本地 class缓存 - 不支持分布式】 */ - private static Map dbSources = new HashMap<>(); + private static final Map dbSources = new HashMap<>(); private static RedisTemplate redisTemplate; private static RedisTemplate getRedisTemplate() { diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/dynamic/db/DbTypeUtils.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DbTypeUtils.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/dynamic/db/DbTypeUtils.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DbTypeUtils.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/dynamic/db/DynamicDBUtil.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java similarity index 99% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/dynamic/db/DynamicDBUtil.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java index cf6a2eb..95bb042 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/dynamic/db/DynamicDBUtil.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java @@ -4,14 +4,12 @@ import com.alibaba.druid.pool.DruidDataSource; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ArrayUtils; import org.jeecg.common.exception.JeecgBootException; -import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.vo.DynamicDataSourceModel; import org.jeecg.common.util.ReflectHelper; import org.jeecg.common.util.oConvertUtils; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; -import javax.sql.DataSource; import java.sql.SQLException; import java.util.HashMap; import java.util.List; diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/dynamic/db/FreemarkerParseFactory.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java similarity index 96% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/dynamic/db/FreemarkerParseFactory.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java index 8f49769..07fcf23 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/dynamic/db/FreemarkerParseFactory.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java @@ -40,7 +40,7 @@ public class FreemarkerParseFactory { */ private static final Configuration SQL_CONFIG = new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS); - private static StringTemplateLoader stringTemplateLoader = new StringTemplateLoader(); + private static final StringTemplateLoader stringTemplateLoader = new StringTemplateLoader(); /**使用内嵌的(?ms)打开单行和多行模式*/ private final static Pattern NOTES_PATTERN = Pattern @@ -78,7 +78,7 @@ public class FreemarkerParseFactory { log.error(e.getMessage(), e.fillInStackTrace()); throw new Exception(e); } - log.debug("----isExistTemplate----" + e.toString()); + log.debug("----isExistTemplate----" + e); //update-end--Author:scott Date:20180320 for：解决问题 - 错误提示sql文件不存在，实际问题是sql freemarker用法错误------ return false; } @@ -179,13 +179,13 @@ public class FreemarkerParseFactory { int index = 0; while ((index = StringUtils.indexOfIgnoreCase(sql, whereAnd, index)) != -1) { sql = sql.substring(0, index + 5) - + sql.substring(index + 9, sql.length()); + + sql.substring(index + 9); } // 去掉 , where 这样的问题 index = 0; while ((index = StringUtils.indexOfIgnoreCase(sql, commaWhere, index)) != -1) { sql = sql.substring(0, index) - + sql.substring(index + 1, sql.length()); + + sql.substring(index + 1); } // 去掉 最后是 ,这样的问题 if (sql.endsWith(SymbolConstant.COMMA) || sql.endsWith(commaSpace)) { diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/encryption/AesEncryptUtil.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java similarity index 97% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/encryption/AesEncryptUtil.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java index bd86f98..020d1a7 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/encryption/AesEncryptUtil.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java @@ -15,8 +15,8 @@ public class AesEncryptUtil { /** * 使用AES-128-CBC加密模式 key和iv可以相同 */ - private static String KEY = EncryptedString.key; - private static String IV = EncryptedString.iv; + private static final String KEY = EncryptedString.key; + private static final String IV = EncryptedString.iv; /** * 加密方法 diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/encryption/EncryptedString.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/encryption/EncryptedString.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/encryption/EncryptedString.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/encryption/EncryptedString.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/filter/SsrfFileTypeFilter.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/filter/SsrfFileTypeFilter.java similarity index 99% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/filter/SsrfFileTypeFilter.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/filter/SsrfFileTypeFilter.java index e726137..e11fccc 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/filter/SsrfFileTypeFilter.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/filter/SsrfFileTypeFilter.java @@ -138,7 +138,7 @@ public class SsrfFileTypeFilter { * @description 通过文件后缀名获取文件类型 */ private static String getFileTypeBySuffix(String fileName) { - return fileName.substring(fileName.lastIndexOf(".") + 1, fileName.length()); + return fileName.substring(fileName.lastIndexOf(".") + 1); } diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/filter/StrAttackFilter.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/filter/StrAttackFilter.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/oConvertUtils.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java similarity index 95% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/oConvertUtils.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java index db60f36..6f40a06 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/oConvertUtils.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java @@ -18,7 +18,9 @@ import java.lang.reflect.Array; import java.lang.reflect.Field; import java.math.BigDecimal; import java.math.BigInteger; +import java.math.RoundingMode; import java.net.*; +import java.nio.charset.StandardCharsets; import java.sql.Date; import java.util.*; import java.util.regex.Matcher; @@ -38,18 +40,12 @@ public class oConvertUtils { if ("".equals(object)) { return (true); } - if (CommonConstant.STRING_NULL.equals(object)) { - return (true); - } - return (false); - } + return CommonConstant.STRING_NULL.equals(object); + } public static boolean isNotEmpty(Object object) { - if (object != null && !"".equals(object) && !object.equals(CommonConstant.STRING_NULL)) { - return (true); - } - return (false); - } + return object != null && !"".equals(object) && !object.equals(CommonConstant.STRING_NULL); + } /** @@ -64,7 +60,7 @@ public class oConvertUtils { } try { - inStr = URLDecoder.decode(inStr, "UTF-8"); + inStr = URLDecoder.decode(inStr, StandardCharsets.UTF_8); } catch (Exception e) { // 解决：URLDecoder: Illegal hex characters in escape (%) pattern - For input string: "自动" //e.printStackTrace(); @@ -81,7 +77,7 @@ public class oConvertUtils { public static String StrToUTF(String strIn, String sourceCode, String targetCode) { strIn = ""; try { - strIn = new String(strIn.getBytes("ISO-8859-1"), "GBK"); + strIn = new String(strIn.getBytes(StandardCharsets.ISO_8859_1), "GBK"); } catch (UnsupportedEncodingException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -224,7 +220,7 @@ public class oConvertUtils { Integer[] result = new Integer[len]; try { for (int i = 0; i < len; i++) { - result[i] = new Integer(object[i].trim()); + result[i] = Integer.parseInt(object[i].trim()); } return result; } catch (NumberFormatException e) { @@ -238,7 +234,7 @@ public class oConvertUtils { /** * 转义成Unicode编码 - * @param s + * @param * @return */ /*public static String escapeJava(Object s) { @@ -289,12 +285,13 @@ public class oConvertUtils { } public static long stringToLong(String str) { - Long test = new Long(0); + long test = 0L; try { - test = Long.valueOf(str); + test = Long.parseLong(str); } catch (Exception e) { + e.printStackTrace(); } - return test.longValue(); + return test; } /** @@ -501,7 +498,7 @@ public class oConvertUtils { /** * SET转换MAP * - * @param str + * @param setobj * @return */ public static Map setToMap(Set setobj) { @@ -593,7 +590,7 @@ public class oConvertUtils { * 如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。
* 例如：hello_world,test_id->helloWorld,testId * - * @param name + * @param names * 转换前的下划线大写方式命名的字符串 * @return 转换后的驼峰式命名的字符串 */ @@ -797,11 +794,7 @@ public class oConvertUtils { } } else { - if (oldVal == null && newVal == null) { - return true; - } else { - return false; - } + return oldVal == null && newVal == null; } } @@ -843,11 +836,7 @@ public class oConvertUtils { Object[] newValArray = newVal.toArray(); return equalityOfArrays(oldValArray,newValArray); } else { - if ((oldVal == null || oldVal.size() == 0) && (newVal == null || newVal.size() == 0)) { - return true; - } else { - return false; - } + return (oldVal == null || oldVal.size() == 0) && (newVal == null || newVal.size() == 0); } } @@ -890,17 +879,13 @@ public class oConvertUtils { * @param newVal * @return */ - public static boolean equalityOfArrays(Object[] oldVal, Object newVal[]) { + public static boolean equalityOfArrays(Object[] oldVal, Object[] newVal) { if (oldVal != null && newVal != null) { Arrays.sort(oldVal); Arrays.sort(newVal); return Arrays.equals(oldVal, newVal); } else { - if ((oldVal == null || oldVal.length == 0) && (newVal == null || newVal.length == 0)) { - return true; - } else { - return false; - } + return (oldVal == null || oldVal.length == 0) && (newVal == null || newVal.length == 0); } } @@ -934,7 +919,7 @@ public class oConvertUtils { try { //换个写法，解决springboot读取jar包中文件的问题 InputStream stream = oConvertUtils.class.getClassLoader().getResourceAsStream(url.replace("classpath:", "")); - json = IOUtils.toString(stream,"UTF-8"); + json = IOUtils.toString(stream, StandardCharsets.UTF_8); } catch (IOException e) { log.error(e.getMessage(),e); } @@ -1015,7 +1000,7 @@ public class oConvertUtils { BigDecimal bigDecimal = new BigDecimal(uploadCount); //换算成MB BigDecimal divide = bigDecimal.divide(new BigDecimal(1048576)); - count = divide.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + count = divide.setScale(2, RoundingMode.HALF_UP).doubleValue(); return count; } return count; @@ -1083,7 +1068,7 @@ public class oConvertUtils { * @return 是否为空 */ public static boolean isEmptyIterator(Iterator iterator) { - return null == iterator || false == iterator.hasNext(); + return null == iterator || !iterator.hasNext(); } @@ -1112,11 +1097,8 @@ public class oConvertUtils { if (null == src || null == des) { throw new IllegalArgumentException("参数不能为空"); } - if (src.doubleValue() > des.doubleValue()) { - return true; - } - return false; - } + return src.doubleValue() > des.doubleValue(); + } /** * 如果src大于等于des返回true @@ -1131,11 +1113,8 @@ public class oConvertUtils { if (null == src || null == des) { throw new IllegalArgumentException("参数不能为空"); } - if (src.doubleValue() < des.doubleValue()) { - return false; - } - return true; - } + return !(src.doubleValue() < des.doubleValue()); + } /** diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/oss/OssBootUtil.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java similarity index 99% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/oss/OssBootUtil.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java index 8a2f37a..d0b7282 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/oss/OssBootUtil.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java @@ -20,7 +20,6 @@ import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.net.URLDecoder; import java.util.Date; import java.util.UUID; @@ -339,7 +338,7 @@ public class OssBootUtil { } else { filePath = "https://" + bucketName + "." + endPoint + SymbolConstant.SINGLE_SLASH + fileUrl; } - PutObjectResult result = ossClient.putObject(bucketName, fileUrl.toString(),stream); + PutObjectResult result = ossClient.putObject(bucketName, fileUrl,stream); // 设置权限(公开读) ossClient.setBucketAcl(bucketName, CannedAccessControlList.PublicRead); if (result != null) { diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/security/AbstractQueryBlackListHandler.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java similarity index 97% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/security/AbstractQueryBlackListHandler.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java index 0e384bb..9d6f1fe 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/security/AbstractQueryBlackListHandler.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java @@ -63,9 +63,9 @@ public abstract class AbstractQueryBlackListHandler { if(list==null){ return true; } - log.info(" 获取sql信息 ：{} ", list.toString()); + log.info(" 获取sql信息 ：{} ", list); boolean flag = checkTableAndFieldsName(list); - if(flag == false){ + if(!flag){ return false; } Set xssTableSet = new HashSet<>(Arrays.asList(SqlInjectionUtil.XSS_STR_TABLE.split("\\|"))); @@ -138,10 +138,7 @@ public abstract class AbstractQueryBlackListHandler { */ private boolean hasSpecialString(String name){ Matcher m = ILLEGAL_NAME_REG.matcher(name); - if (m.find()) { - return true; - } - return false; + return m.find(); } diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/security/JdbcSecurityUtil.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/security/JdbcSecurityUtil.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/security/JdbcSecurityUtil.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/security/JdbcSecurityUtil.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/security/SecurityTools.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/security/SecurityTools.java similarity index 98% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/security/SecurityTools.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/security/SecurityTools.java index 26f9ac6..5e4c9f2 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/common/util/security/SecurityTools.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/security/SecurityTools.java @@ -10,6 +10,8 @@ import cn.hutool.crypto.asymmetric.SignAlgorithm; import cn.hutool.crypto.symmetric.AES; import org.jeecg.common.util.security.entity.*; import com.alibaba.fastjson.JSONObject; +import org.jeecg.common.util.security.entity.*; + import javax.crypto.SecretKey; import java.security.KeyPair; diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/security/entity/MyKeyPair.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/MyKeyPair.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/security/entity/MyKeyPair.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/MyKeyPair.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/security/entity/SecurityReq.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityReq.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/security/entity/SecurityReq.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityReq.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/security/entity/SecurityResp.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityResp.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/security/entity/SecurityResp.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityResp.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/security/entity/SecuritySignReq.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignReq.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/security/entity/SecuritySignReq.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignReq.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/security/entity/SecuritySignResp.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignResp.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/security/entity/SecuritySignResp.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignResp.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/sqlparse/JSqlParserAllTableManager.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/JSqlParserAllTableManager.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/sqlparse/JSqlParserAllTableManager.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/JSqlParserAllTableManager.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/sqlparse/JSqlParserUtils.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/JSqlParserUtils.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/sqlparse/JSqlParserUtils.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/JSqlParserUtils.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/sqlparse/vo/SelectSqlInfo.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/vo/SelectSqlInfo.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/sqlparse/vo/SelectSqlInfo.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/vo/SelectSqlInfo.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/superSearch/ObjectParseUtil.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/ObjectParseUtil.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/superSearch/ObjectParseUtil.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/ObjectParseUtil.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/superSearch/QueryRuleEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/superSearch/QueryRuleEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/common/util/superSearch/QueryRuleVo.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleVo.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/common/util/superSearch/QueryRuleVo.java rename to cpte-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleVo.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/AutoPoiConfig.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/AutoPoiConfig.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/AutoPoiConfig.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/AutoPoiConfig.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/AutoPoiDictConfig.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java similarity index 97% rename from cpte-boot-base-core/src/main/java/org/cpte/config/AutoPoiDictConfig.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java index 563689a..3274892 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/config/AutoPoiDictConfig.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java @@ -74,7 +74,7 @@ public class AutoPoiDictConfig implements AutoPoiDictServiceI { } } if (dictReplaces != null && dictReplaces.size() != 0) { - log.info("---AutoPoi--Get_DB_Dict------"+ dictReplaces.toString()); + log.info("---AutoPoi--Get_DB_Dict------"+ dictReplaces); return dictReplaces.toArray(new String[dictReplaces.size()]); } return null; diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/CorsFilterCondition.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/CorsFilterCondition.java similarity index 89% rename from cpte-boot-base-core/src/main/java/org/cpte/config/CorsFilterCondition.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/CorsFilterCondition.java index 18a608c..3d45f00 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/config/CorsFilterCondition.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/config/CorsFilterCondition.java @@ -15,9 +15,6 @@ public class CorsFilterCondition implements Condition { public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { Object object = context.getEnvironment().getProperty(CommonConstant.CLOUD_SERVER_KEY); //如果没有服务注册发现的配置 说明是单体应用 则加载跨域配置 返回true - if(object==null){ - return true; - } - return false; + return object == null; } } diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/DruidConfig.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/DruidConfig.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/DruidWallConfigRegister.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/DruidWallConfigRegister.java similarity index 97% rename from cpte-boot-base-core/src/main/java/org/cpte/config/DruidWallConfigRegister.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/DruidWallConfigRegister.java index 5dd2d9d..67383e3 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/config/DruidWallConfigRegister.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/config/DruidWallConfigRegister.java @@ -22,7 +22,7 @@ public class DruidWallConfigRegister implements SpringApplicationRunListener { public SpringApplication application; - private String[] args; + private final String[] args; /** diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/JeecgBaseConfig.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/JeecgBaseConfig.java similarity index 97% rename from cpte-boot-base-core/src/main/java/org/cpte/config/JeecgBaseConfig.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/JeecgBaseConfig.java index 90a026b..19d9f15 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/config/JeecgBaseConfig.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/config/JeecgBaseConfig.java @@ -1,9 +1,9 @@ package org.jeecg.config; +import org.jeecg.config.vo.*; import org.jeecg.config.vo.*; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Role; import org.springframework.stereotype.Component; @@ -74,7 +74,7 @@ public class JeecgBaseConfig { /** * 百度开放API配置 */ - private BaiduApi baiduApi; + private BaiduApi baiduApi; public String getCustomResourcePrefixPath() { return customResourcePrefixPath; diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/JeecgCloudCondition.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java similarity index 88% rename from cpte-boot-base-core/src/main/java/org/cpte/config/JeecgCloudCondition.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java index b6a6048..82d8382 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/config/JeecgCloudCondition.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java @@ -15,9 +15,6 @@ public class JeecgCloudCondition implements Condition { public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { Object object = context.getEnvironment().getProperty(CommonConstant.CLOUD_SERVER_KEY); //如果没有服务注册发现的配置 说明是单体应用 - if(object==null){ - return false; - } - return true; + return object != null; } } diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/JeecgGaodeBaseConfig.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/JeecgGaodeBaseConfig.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/JeecgGaodeBaseConfig.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/JeecgGaodeBaseConfig.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/JeecgSmsTemplateConfig.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/JeecgSmsTemplateConfig.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/JeecgSmsTemplateConfig.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/JeecgSmsTemplateConfig.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/RestTemplateConfig.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/RestTemplateConfig.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/RestTemplateConfig.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/RestTemplateConfig.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/StaticConfig.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/StaticConfig.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/StaticConfig.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/StaticConfig.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/Swagger2Config.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/Swagger2Config.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/Swagger3Config.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/Swagger3Config.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/UndertowCustomizer.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/UndertowCustomizer.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/UndertowCustomizer.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/UndertowCustomizer.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/WebMvcConfiguration.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/WebMvcConfiguration.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/WebSocketConfig.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/WebSocketConfig.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/WebSocketConfig.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/WebSocketConfig.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/filter/RequestBodyReserveFilter.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/filter/RequestBodyReserveFilter.java similarity index 89% rename from cpte-boot-base-core/src/main/java/org/cpte/config/filter/RequestBodyReserveFilter.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/filter/RequestBodyReserveFilter.java index 050c174..73f2cd5 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/config/filter/RequestBodyReserveFilter.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/config/filter/RequestBodyReserveFilter.java @@ -18,8 +18,7 @@ public class RequestBodyReserveFilter implements Filter { public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { ServletRequest requestWrapper = null; - if(servletRequest instanceof HttpServletRequest) { - HttpServletRequest req = (HttpServletRequest) servletRequest; + if(servletRequest instanceof HttpServletRequest req) { // POST请求类型，才获取POST请求体 if(CommonConstant.HTTP_POST.equals(req.getMethod())){ requestWrapper = new BodyReaderHttpServletRequestWrapper(req); diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/filter/WebsocketFilter.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/filter/WebsocketFilter.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/firewall/SqlInjection/IDictTableWhiteListHandler.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/firewall/SqlInjection/IDictTableWhiteListHandler.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/firewall/SqlInjection/IDictTableWhiteListHandler.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/firewall/SqlInjection/IDictTableWhiteListHandler.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/firewall/SqlInjection/SysDictTableWhite.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/firewall/SqlInjection/SysDictTableWhite.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/firewall/SqlInjection/SysDictTableWhite.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/firewall/SqlInjection/SysDictTableWhite.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/firewall/interceptor/LowCodeModeConfiguration.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeConfiguration.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/firewall/interceptor/LowCodeModeConfiguration.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeConfiguration.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/firewall/interceptor/LowCodeModeInterceptor.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeInterceptor.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/firewall/interceptor/LowCodeModeInterceptor.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeInterceptor.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/firewall/interceptor/enums/LowCodeUrlsEnum.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/enums/LowCodeUrlsEnum.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/firewall/interceptor/enums/LowCodeUrlsEnum.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/enums/LowCodeUrlsEnum.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/mybatis/JeecgTenantParser.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/mybatis/JeecgTenantParser.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/mybatis/JeecgTenantParser.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/mybatis/JeecgTenantParser.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/mybatis/MybatisInterceptor.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java similarity index 97% rename from cpte-boot-base-core/src/main/java/org/cpte/config/mybatis/MybatisInterceptor.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java index aef2266..58a85d6 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/config/mybatis/MybatisInterceptor.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java @@ -127,9 +127,8 @@ public class MybatisInterceptor implements Interceptor { if (SqlCommandType.UPDATE == sqlCommandType) { LoginUser sysUser = this.getLoginUser(); Field[] fields = null; - if (parameter instanceof ParamMap) { - ParamMap p = (ParamMap) parameter; - //update-begin-author:scott date:20190729 for:批量更新报错issues/IZA3Q-- + if (parameter instanceof ParamMap p) { + //update-begin-author:scott date:20190729 for:批量更新报错issues/IZA3Q-- String et = "et"; if (p.containsKey(et)) { parameter = p.get(et); diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/mybatis/MybatisPlusSaasConfig.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/mybatis/MybatisPlusSaasConfig.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/mybatis/TenantContext.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/mybatis/TenantContext.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/mybatis/TenantContext.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/mybatis/TenantContext.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/mybatis/ThreadLocalDataHelper.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/mybatis/ThreadLocalDataHelper.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/mybatis/ThreadLocalDataHelper.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/mybatis/ThreadLocalDataHelper.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/mybatis/aspect/DynamicTableAspect.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/mybatis/aspect/DynamicTableAspect.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/mybatis/aspect/DynamicTableAspect.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/mybatis/aspect/DynamicTableAspect.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/mybatis/interceptor/DynamicDatasourceInterceptor.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/mybatis/interceptor/DynamicDatasourceInterceptor.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/mybatis/interceptor/DynamicDatasourceInterceptor.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/mybatis/interceptor/DynamicDatasourceInterceptor.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/oss/MinioConfig.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/oss/MinioConfig.java similarity index 96% rename from cpte-boot-base-core/src/main/java/org/cpte/config/oss/MinioConfig.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/oss/MinioConfig.java index 022e50e..2233854 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/config/oss/MinioConfig.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/config/oss/MinioConfig.java @@ -7,7 +7,6 @@ import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.util.MinioUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/oss/OssConfiguration.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java similarity index 95% rename from cpte-boot-base-core/src/main/java/org/cpte/config/oss/OssConfiguration.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java index 2637757..12fb202 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/config/oss/OssConfiguration.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java @@ -4,7 +4,6 @@ import jakarta.annotation.PostConstruct; import org.jeecg.common.util.oss.OssBootUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/shiro/IgnoreAuth.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/IgnoreAuth.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/shiro/IgnoreAuth.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/IgnoreAuth.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/shiro/JwtToken.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java similarity index 94% rename from cpte-boot-base-core/src/main/java/org/cpte/config/shiro/JwtToken.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java index 0507c54..9ba990e 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/config/shiro/JwtToken.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java @@ -10,7 +10,7 @@ import org.apache.shiro.authc.AuthenticationToken; public class JwtToken implements AuthenticationToken { private static final long serialVersionUID = 1L; - private String token; + private final String token; public JwtToken(String token) { this.token = token; diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/shiro/ShiroConfig.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java similarity index 99% rename from cpte-boot-base-core/src/main/java/org/cpte/config/shiro/ShiroConfig.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index c8b06ec..b821302 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/config/shiro/ShiroConfig.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -21,7 +21,6 @@ import org.jeecg.config.shiro.filters.CustomShiroFilterFactoryBean; import org.jeecg.config.shiro.filters.JwtFilter; import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.boot.autoconfigure.data.redis.RedisProperties; import org.springframework.boot.web.servlet.FilterRegistrationBean; diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/shiro/ShiroRealm.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/shiro/ShiroRealm.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/shiro/filters/CustomShiroFilterFactoryBean.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java similarity index 96% rename from cpte-boot-base-core/src/main/java/org/cpte/config/shiro/filters/CustomShiroFilterFactoryBean.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java index b84b76f..b51b05d 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/config/shiro/filters/CustomShiroFilterFactoryBean.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java @@ -61,7 +61,7 @@ public class CustomShiroFilterFactoryBean extends ShiroFilterFactoryBean { } private static final class MySpringShiroFilter extends AbstractShiroFilter { - protected MySpringShiroFilter(WebSecurityManager webSecurityManager, FilterChainResolver resolver) { + private MySpringShiroFilter(WebSecurityManager webSecurityManager, FilterChainResolver resolver) { if (webSecurityManager == null) { throw new IllegalArgumentException("WebSecurityManager property cannot be null."); } else { diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/shiro/filters/JwtFilter.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/shiro/filters/JwtFilter.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/shiro/filters/ResourceCheckFilter.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/shiro/filters/ResourceCheckFilter.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/shiro/ignore/IgnoreAuthPostProcessor.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/ignore/IgnoreAuthPostProcessor.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/shiro/ignore/IgnoreAuthPostProcessor.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/ignore/IgnoreAuthPostProcessor.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/shiro/ignore/InMemoryIgnoreAuth.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/ignore/InMemoryIgnoreAuth.java similarity index 94% rename from cpte-boot-base-core/src/main/java/org/cpte/config/shiro/ignore/InMemoryIgnoreAuth.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/ignore/InMemoryIgnoreAuth.java index 6d6ac5e..6f7e1a9 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/config/shiro/ignore/InMemoryIgnoreAuth.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/config/shiro/ignore/InMemoryIgnoreAuth.java @@ -14,7 +14,7 @@ import java.util.List; public class InMemoryIgnoreAuth { private static final List IGNORE_AUTH_LIST = new ArrayList<>(); - private static PathMatcher MATCHER = new AntPathMatcher(); + private static final PathMatcher MATCHER = new AntPathMatcher(); public InMemoryIgnoreAuth() {} public static void set(List list) { diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/sign/interceptor/SignAuthConfiguration.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthConfiguration.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/sign/interceptor/SignAuthConfiguration.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthConfiguration.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/sign/interceptor/SignAuthInterceptor.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/sign/interceptor/SignAuthInterceptor.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/sign/util/BodyReaderHttpServletRequestWrapper.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.java similarity index 94% rename from cpte-boot-base-core/src/main/java/org/cpte/config/sign/util/BodyReaderHttpServletRequestWrapper.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.java index f766262..7ab0faa 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/config/sign/util/BodyReaderHttpServletRequestWrapper.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.java @@ -7,6 +7,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; import java.io.*; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; /** * 保存过滤器里面的流 @@ -22,7 +23,7 @@ public class BodyReaderHttpServletRequestWrapper extends HttpServletRequestWrapp super(request); String sessionStream = getBodyString(request); - body = sessionStream.getBytes(Charset.forName("UTF-8")); + body = sessionStream.getBytes(StandardCharsets.UTF_8); } /** @@ -35,7 +36,7 @@ public class BodyReaderHttpServletRequestWrapper extends HttpServletRequestWrapp StringBuilder sb = new StringBuilder(); try (InputStream inputStream = cloneInputStream(request.getInputStream()); - BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8")))) { + BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))) { String line; while ((line = reader.readLine()) != null) { sb.append(line); diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/sign/util/HttpUtils.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java similarity index 91% rename from cpte-boot-base-core/src/main/java/org/cpte/config/sign/util/HttpUtils.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java index 3a541e5..efcbb5f 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/config/sign/util/HttpUtils.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java @@ -5,6 +5,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; import java.util.SortedMap; @@ -42,12 +43,12 @@ public class HttpUtils { String pathVariable = request.getRequestURI().substring(request.getRequestURI().lastIndexOf("/") + 1); if (pathVariable.contains(SymbolConstant.COMMA)) { log.info(" pathVariable: {}",pathVariable); - String deString = URLDecoder.decode(pathVariable, "UTF-8"); + String deString = URLDecoder.decode(pathVariable, StandardCharsets.UTF_8); //https://www.52dianzi.com/category/article/37/565371.html if(deString.contains("%")){ try { - deString = URLDecoder.decode(deString, "UTF-8"); + deString = URLDecoder.decode(deString, StandardCharsets.UTF_8); log.info("存在%情况下，执行两次解码 — pathVariable decode: {}",deString); } catch (Exception e) { //e.printStackTrace(); @@ -92,11 +93,11 @@ public class HttpUtils { String pathVariable = url.substring(url.lastIndexOf("/") + 1); if (pathVariable.contains(SymbolConstant.COMMA)) { log.info(" pathVariable: {}",pathVariable); - String deString = URLDecoder.decode(pathVariable, "UTF-8"); + String deString = URLDecoder.decode(pathVariable, StandardCharsets.UTF_8); //https://www.52dianzi.com/category/article/37/565371.html if(deString.contains("%")){ - deString = URLDecoder.decode(deString, "UTF-8"); + deString = URLDecoder.decode(deString, StandardCharsets.UTF_8); log.info("存在%情况下，执行两次解码 — pathVariable decode: {}",deString); } log.info(" pathVariable decode: {}",deString); @@ -152,7 +153,7 @@ public class HttpUtils { } String wholeStr = new String(body); // 转化成json对象 - return JSONObject.parseObject(wholeStr.toString(), Map.class); + return JSONObject.parseObject(wholeStr, Map.class); } /** @@ -166,11 +167,7 @@ public class HttpUtils { return result; } String param = ""; - try { - param = URLDecoder.decode(request.getQueryString(), "utf-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } + param = URLDecoder.decode(request.getQueryString(), StandardCharsets.UTF_8); String[] params = param.split("&"); for (String s : params) { int index = s.indexOf("="); @@ -194,11 +191,7 @@ public class HttpUtils { return result; } String param = ""; - try { - param = URLDecoder.decode(queryString, "utf-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } + param = URLDecoder.decode(queryString, StandardCharsets.UTF_8); String[] params = param.split("&"); for (String s : params) { int index = s.indexOf("="); diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/sign/util/SignUtil.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/sign/util/SignUtil.java similarity index 85% rename from cpte-boot-base-core/src/main/java/org/cpte/config/sign/util/SignUtil.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/sign/util/SignUtil.java index a85a466..0034ec3 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/config/sign/util/SignUtil.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/config/sign/util/SignUtil.java @@ -11,6 +11,7 @@ import org.springframework.util.DigestUtils; import org.springframework.util.StringUtils; import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; import java.util.SortedMap; /** @@ -55,12 +56,7 @@ public class SignUtil { if(oConvertUtils.isEmpty(signatureSecret) || signatureSecret.contains(curlyBracket)){ throw new JeecgBootException("签名密钥 ${jeecg.signatureSecret} 缺少配置 ！！"); } - try { - //【issues/I484RW】2.4.6部署后，下拉搜索框提示“sign签名检验失败” - return DigestUtils.md5DigestAsHex((paramsJsonStr + signatureSecret).getBytes("UTF-8")).toUpperCase(); - } catch (UnsupportedEncodingException e) { - log.error(e.getMessage(),e); - return null; - } + //【issues/I484RW】2.4.6部署后，下拉搜索框提示“sign签名检验失败” + return DigestUtils.md5DigestAsHex((paramsJsonStr + signatureSecret).getBytes(StandardCharsets.UTF_8)).toUpperCase(); } } \ No newline at end of file diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/vo/BaiduApi.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/vo/BaiduApi.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/vo/BaiduApi.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/vo/BaiduApi.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/vo/DomainUrl.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/vo/DomainUrl.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/vo/DomainUrl.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/vo/DomainUrl.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/vo/Elasticsearch.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/vo/Elasticsearch.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/vo/Elasticsearch.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/vo/Elasticsearch.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/vo/Firewall.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/vo/Firewall.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/vo/Firewall.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/vo/Firewall.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/vo/GaoDeApi.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/vo/GaoDeApi.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/vo/GaoDeApi.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/vo/GaoDeApi.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/vo/Path.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/vo/Path.java similarity index 93% rename from cpte-boot-base-core/src/main/java/org/cpte/config/vo/Path.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/vo/Path.java index 9227a84..92ff11c 100644 --- a/cpte-boot-base-core/src/main/java/org/cpte/config/vo/Path.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/config/vo/Path.java @@ -1,6 +1,5 @@ package org.jeecg.config.vo; -import javax.print.DocFlavor; /** * diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/vo/Shiro.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/vo/Shiro.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/vo/Shiro.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/vo/Shiro.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/config/vo/WeiXinPay.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/vo/WeiXinPay.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/config/vo/WeiXinPay.java rename to cpte-boot-base-core/src/main/java/org/jeecg/config/vo/WeiXinPay.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/modules/base/mapper/BaseCommonMapper.java b/cpte-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/BaseCommonMapper.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/modules/base/mapper/BaseCommonMapper.java rename to cpte-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/BaseCommonMapper.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/modules/base/mapper/xml/BaseCommonMapper.xml b/cpte-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/xml/BaseCommonMapper.xml similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/modules/base/mapper/xml/BaseCommonMapper.xml rename to cpte-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/xml/BaseCommonMapper.xml diff --git a/cpte-boot-base-core/src/main/java/org/cpte/modules/base/service/BaseCommonService.java b/cpte-boot-base-core/src/main/java/org/jeecg/modules/base/service/BaseCommonService.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/modules/base/service/BaseCommonService.java rename to cpte-boot-base-core/src/main/java/org/jeecg/modules/base/service/BaseCommonService.java diff --git a/cpte-boot-base-core/src/main/java/org/cpte/modules/base/service/impl/BaseCommonServiceImpl.java b/cpte-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java similarity index 100% rename from cpte-boot-base-core/src/main/java/org/cpte/modules/base/service/impl/BaseCommonServiceImpl.java rename to cpte-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java diff --git a/cpte-boot-base-core/src/main/resources/config/default-spring-doc.properties b/cpte-boot-base-core/src/main/resources/config/default-spring-doc.properties index 91f214b..6742841 100644 --- a/cpte-boot-base-core/src/main/resources/config/default-spring-doc.properties +++ b/cpte-boot-base-core/src/main/resources/config/default-spring-doc.properties @@ -1,2 +1,2 @@ -springdoc.auto-tag-classes: false -springdoc.packages-to-scan: org.jeecg \ No newline at end of file +springdoc.auto-tag-classes= false +springdoc.packages-to-scan= org.jeecg \ No newline at end of file diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/JeecgAiRagApplication.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/JeecgAiRagApplication.java similarity index 100% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/JeecgAiRagApplication.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/JeecgAiRagApplication.java diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/consts/AiAppConsts.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/consts/AiAppConsts.java similarity index 94% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/consts/AiAppConsts.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/consts/AiAppConsts.java index 133ea43..b862694 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/consts/AiAppConsts.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/consts/AiAppConsts.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.app.consts; +package org.jeecg.modules.airag.app.consts; /** * AI应用常量类 diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/consts/Prompts.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/consts/Prompts.java similarity index 99% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/consts/Prompts.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/consts/Prompts.java index 3d94aea..fb4a537 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/consts/Prompts.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/consts/Prompts.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.app.consts; +package org.jeecg.modules.airag.app.consts; /** * @Description: 提示词常量 diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/controller/AiragAppController.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/controller/AiragAppController.java similarity index 94% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/controller/AiragAppController.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/controller/AiragAppController.java index f12ff8a..f50aefd 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/controller/AiragAppController.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/controller/AiragAppController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.app.controller; +package org.jeecg.modules.airag.app.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -12,11 +12,11 @@ import org.jeecg.common.util.AssertUtils; import org.jeecg.common.util.TokenUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; import org.jeecg.config.shiro.IgnoreAuth; -import org.cpte.modules.airag.app.consts.AiAppConsts; -import org.cpte.modules.airag.app.entity.AiragApp; -import org.cpte.modules.airag.app.service.IAiragAppService; -import org.cpte.modules.airag.app.service.IAiragChatService; -import org.cpte.modules.airag.app.vo.AppDebugParams; +import org.jeecg.modules.airag.app.consts.AiAppConsts; +import org.jeecg.modules.airag.app.entity.AiragApp; +import org.jeecg.modules.airag.app.service.IAiragAppService; +import org.jeecg.modules.airag.app.service.IAiragChatService; +import org.jeecg.modules.airag.app.vo.AppDebugParams; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/controller/AiragChatController.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/controller/AiragChatController.java similarity index 96% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/controller/AiragChatController.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/controller/AiragChatController.java index 6df49d2..5fe7e00 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/controller/AiragChatController.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/controller/AiragChatController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.app.controller; +package org.jeecg.modules.airag.app.controller; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -7,9 +7,9 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.util.CommonUtils; import org.jeecg.config.shiro.IgnoreAuth; -import org.cpte.modules.airag.app.service.IAiragChatService; -import org.cpte.modules.airag.app.vo.ChatConversation; -import org.cpte.modules.airag.app.vo.ChatSendParams; +import org.jeecg.modules.airag.app.service.IAiragChatService; +import org.jeecg.modules.airag.app.vo.ChatConversation; +import org.jeecg.modules.airag.app.vo.ChatSendParams; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/entity/AiragApp.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/entity/AiragApp.java similarity index 99% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/entity/AiragApp.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/entity/AiragApp.java index e909b1c..d0180f2 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/entity/AiragApp.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/entity/AiragApp.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.app.entity; +package org.jeecg.modules.airag.app.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/mapper/AiragAppMapper.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/mapper/AiragAppMapper.java similarity index 84% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/mapper/AiragAppMapper.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/mapper/AiragAppMapper.java index 387c7fe..54c3a09 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/mapper/AiragAppMapper.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/mapper/AiragAppMapper.java @@ -1,8 +1,8 @@ -package org.cpte.modules.airag.app.mapper; +package org.jeecg.modules.airag.app.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.cpte.modules.airag.app.entity.AiragApp; +import org.jeecg.modules.airag.app.entity.AiragApp; /** * @Description: AI应用 diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/mapper/xml/AiragAppMapper.xml b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/mapper/xml/AiragAppMapper.xml similarity index 57% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/mapper/xml/AiragAppMapper.xml rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/mapper/xml/AiragAppMapper.xml index 1372d40..f3f9da6 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/mapper/xml/AiragAppMapper.xml +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/mapper/xml/AiragAppMapper.xml @@ -1,8 +1,8 @@ - + - SELECT * FROM airag_app WHERE id = #{id} diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/service/IAiragAppService.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/IAiragAppService.java similarity index 82% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/service/IAiragAppService.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/IAiragAppService.java index e1e5fc4..48e84f6 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/service/IAiragAppService.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/IAiragAppService.java @@ -1,7 +1,7 @@ -package org.cpte.modules.airag.app.service; +package org.jeecg.modules.airag.app.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.airag.app.entity.AiragApp; +import org.jeecg.modules.airag.app.entity.AiragApp; /** * @Description: AI应用 diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/service/IAiragChatService.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/IAiragChatService.java similarity index 91% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/service/IAiragChatService.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/IAiragChatService.java index e593a43..9850408 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/service/IAiragChatService.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/IAiragChatService.java @@ -1,9 +1,9 @@ -package org.cpte.modules.airag.app.service; +package org.jeecg.modules.airag.app.service; import org.jeecg.common.api.vo.Result; -import org.cpte.modules.airag.app.vo.AppDebugParams; -import org.cpte.modules.airag.app.vo.ChatConversation; -import org.cpte.modules.airag.app.vo.ChatSendParams; +import org.jeecg.modules.airag.app.vo.AppDebugParams; +import org.jeecg.modules.airag.app.vo.ChatConversation; +import org.jeecg.modules.airag.app.vo.ChatSendParams; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; /** diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/service/impl/AiragAppServiceImpl.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/impl/AiragAppServiceImpl.java similarity index 96% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/service/impl/AiragAppServiceImpl.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/impl/AiragAppServiceImpl.java index 4125277..65a10e9 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/service/impl/AiragAppServiceImpl.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/impl/AiragAppServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.app.service.impl; +package org.jeecg.modules.airag.app.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -12,10 +12,10 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.AssertUtils; import org.jeecg.common.util.UUIDGenerator; -import org.cpte.modules.airag.app.consts.Prompts; -import org.cpte.modules.airag.app.entity.AiragApp; -import org.cpte.modules.airag.app.mapper.AiragAppMapper; -import org.cpte.modules.airag.app.service.IAiragAppService; +import org.jeecg.modules.airag.app.consts.Prompts; +import org.jeecg.modules.airag.app.entity.AiragApp; +import org.jeecg.modules.airag.app.mapper.AiragAppMapper; +import org.jeecg.modules.airag.app.service.IAiragAppService; import org.jeecg.modules.airag.common.consts.AiragConsts; import org.jeecg.modules.airag.common.handler.AIChatParams; import org.jeecg.modules.airag.common.handler.IAIChatHandler; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/service/impl/AiragChatServiceImpl.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/impl/AiragChatServiceImpl.java similarity index 98% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/service/impl/AiragChatServiceImpl.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/impl/AiragChatServiceImpl.java index 5947f62..6fff5d9 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/service/impl/AiragChatServiceImpl.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/service/impl/AiragChatServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.app.service.impl; +package org.jeecg.modules.airag.app.service.impl; import com.alibaba.fastjson.JSONObject; import dev.langchain4j.data.image.Image; @@ -12,13 +12,13 @@ import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.*; -import org.cpte.modules.airag.app.consts.AiAppConsts; -import org.cpte.modules.airag.app.entity.AiragApp; -import org.cpte.modules.airag.app.mapper.AiragAppMapper; -import org.cpte.modules.airag.app.service.IAiragChatService; -import org.cpte.modules.airag.app.vo.AppDebugParams; -import org.cpte.modules.airag.app.vo.ChatConversation; -import org.cpte.modules.airag.app.vo.ChatSendParams; +import org.jeecg.modules.airag.app.consts.AiAppConsts; +import org.jeecg.modules.airag.app.entity.AiragApp; +import org.jeecg.modules.airag.app.mapper.AiragAppMapper; +import org.jeecg.modules.airag.app.service.IAiragChatService; +import org.jeecg.modules.airag.app.vo.AppDebugParams; +import org.jeecg.modules.airag.app.vo.ChatConversation; +import org.jeecg.modules.airag.app.vo.ChatSendParams; import org.jeecg.modules.airag.common.consts.AiragConsts; import org.jeecg.modules.airag.common.handler.AIChatParams; import org.jeecg.modules.airag.common.handler.IAIChatHandler; @@ -30,9 +30,9 @@ import org.jeecg.modules.airag.common.vo.event.EventMessageData; import org.jeecg.modules.airag.flow.consts.FlowConsts; import org.jeecg.modules.airag.flow.service.IAiragFlowService; import org.jeecg.modules.airag.flow.vo.api.FlowRunParams; -import org.cpte.modules.airag.llm.entity.AiragModel; -import org.cpte.modules.airag.llm.handler.AIChatHandler; -import org.cpte.modules.airag.llm.handler.JeecgToolsProvider; +import org.jeecg.modules.airag.llm.entity.AiragModel; +import org.jeecg.modules.airag.llm.handler.AIChatHandler; +import org.jeecg.modules.airag.llm.handler.JeecgToolsProvider; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.BoundValueOperations; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/vo/AppDebugParams.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/vo/AppDebugParams.java similarity index 71% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/vo/AppDebugParams.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/vo/AppDebugParams.java index 9c9f399..7394510 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/vo/AppDebugParams.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/vo/AppDebugParams.java @@ -1,7 +1,7 @@ -package org.cpte.modules.airag.app.vo; +package org.jeecg.modules.airag.app.vo; import lombok.Data; -import org.cpte.modules.airag.app.entity.AiragApp; +import org.jeecg.modules.airag.app.entity.AiragApp; /** * @Description: 应用调试入参 diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/vo/ChatConversation.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/vo/ChatConversation.java similarity index 86% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/vo/ChatConversation.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/vo/ChatConversation.java index a94dc8c..c89dd6d 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/vo/ChatConversation.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/vo/ChatConversation.java @@ -1,7 +1,7 @@ -package org.cpte.modules.airag.app.vo; +package org.jeecg.modules.airag.app.vo; import lombok.Data; -import org.cpte.modules.airag.app.entity.AiragApp; +import org.jeecg.modules.airag.app.entity.AiragApp; import org.jeecg.modules.airag.common.vo.MessageHistory; import java.util.Date; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/vo/ChatSendParams.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/vo/ChatSendParams.java similarity index 95% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/vo/ChatSendParams.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/vo/ChatSendParams.java index b7d47e2..7fd832f 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/app/vo/ChatSendParams.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/app/vo/ChatSendParams.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.app.vo; +package org.jeecg.modules.airag.app.vo; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/demo/JimuDataReader.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/demo/JimuDataReader.java similarity index 98% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/demo/JimuDataReader.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/demo/JimuDataReader.java index 57c4159..12355f8 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/demo/JimuDataReader.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/demo/JimuDataReader.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.demo; +package org.jeecg.modules.airag.demo; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.exception.JeecgBootBizTipException; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/demo/TestAiragEnhance.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/demo/TestAiragEnhance.java similarity index 94% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/demo/TestAiragEnhance.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/demo/TestAiragEnhance.java index 239e1dc..0cbd702 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/demo/TestAiragEnhance.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/demo/TestAiragEnhance.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.demo; +package org.jeecg.modules.airag.demo; import org.jeecg.modules.airag.flow.component.enhance.IAiRagEnhanceJava; import org.springframework.stereotype.Component; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/config/EmbedStoreConfigBean.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/config/EmbedStoreConfigBean.java similarity index 95% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/config/EmbedStoreConfigBean.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/config/EmbedStoreConfigBean.java index 94ec6d3..5a66579 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/config/EmbedStoreConfigBean.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/config/EmbedStoreConfigBean.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.llm.config; +package org.jeecg.modules.airag.llm.config; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/config/KnowConfigBean.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/config/KnowConfigBean.java similarity index 93% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/config/KnowConfigBean.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/config/KnowConfigBean.java index 07f85d6..466e6d4 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/config/KnowConfigBean.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/config/KnowConfigBean.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.llm.config; +package org.jeecg.modules.airag.llm.config; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/consts/LLMConsts.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/consts/LLMConsts.java similarity index 97% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/consts/LLMConsts.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/consts/LLMConsts.java index 168f37a..ef3f393 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/consts/LLMConsts.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/consts/LLMConsts.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.llm.consts; +package org.jeecg.modules.airag.llm.consts; import java.util.regex.Pattern; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/controller/AiragKnowledgeController.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/controller/AiragKnowledgeController.java similarity index 97% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/controller/AiragKnowledgeController.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/controller/AiragKnowledgeController.java index ba66c7d..6de3191 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/controller/AiragKnowledgeController.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/controller/AiragKnowledgeController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.llm.controller; +package org.jeecg.modules.airag.llm.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -11,12 +11,12 @@ import org.jeecg.common.util.AssertUtils; import org.jeecg.common.util.TokenUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; import org.jeecg.modules.airag.common.vo.knowledge.KnowledgeSearchResult; -import org.cpte.modules.airag.llm.consts.LLMConsts; -import org.cpte.modules.airag.llm.entity.AiragKnowledge; -import org.cpte.modules.airag.llm.entity.AiragKnowledgeDoc; -import org.cpte.modules.airag.llm.handler.EmbeddingHandler; -import org.cpte.modules.airag.llm.service.IAiragKnowledgeDocService; -import org.cpte.modules.airag.llm.service.IAiragKnowledgeService; +import org.jeecg.modules.airag.llm.consts.LLMConsts; +import org.jeecg.modules.airag.llm.entity.AiragKnowledge; +import org.jeecg.modules.airag.llm.entity.AiragKnowledgeDoc; +import org.jeecg.modules.airag.llm.handler.EmbeddingHandler; +import org.jeecg.modules.airag.llm.service.IAiragKnowledgeDocService; +import org.jeecg.modules.airag.llm.service.IAiragKnowledgeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/controller/AiragModelController.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/controller/AiragModelController.java similarity index 95% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/controller/AiragModelController.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/controller/AiragModelController.java index 538520c..9424391 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/controller/AiragModelController.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/controller/AiragModelController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.llm.controller; +package org.jeecg.modules.airag.llm.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -17,11 +17,11 @@ import org.jeecg.common.util.AssertUtils; import org.jeecg.common.util.TokenUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.cpte.modules.airag.llm.consts.LLMConsts; -import org.cpte.modules.airag.llm.entity.AiragModel; -import org.cpte.modules.airag.llm.handler.AIChatHandler; -import org.cpte.modules.airag.llm.handler.EmbeddingHandler; -import org.cpte.modules.airag.llm.service.IAiragModelService; +import org.jeecg.modules.airag.llm.consts.LLMConsts; +import org.jeecg.modules.airag.llm.entity.AiragModel; +import org.jeecg.modules.airag.llm.handler.AIChatHandler; +import org.jeecg.modules.airag.llm.handler.EmbeddingHandler; +import org.jeecg.modules.airag.llm.service.IAiragModelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/document/TikaDocumentParser.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/document/TikaDocumentParser.java similarity index 91% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/document/TikaDocumentParser.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/document/TikaDocumentParser.java index 8499e45..f7e48a0 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/document/TikaDocumentParser.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/document/TikaDocumentParser.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package org.cpte.modules.airag.llm.document; +package org.jeecg.modules.airag.llm.document; import dev.langchain4j.data.document.BlankDocumentException; import dev.langchain4j.data.document.Document; @@ -53,15 +53,15 @@ public class TikaDocumentParser { private final Supplier parseContextSupplier; public TikaDocumentParser() { - this((Supplier) ((Supplier) null), (Supplier) null, (Supplier) null, (Supplier) null); + this(null, null, null, null); } public TikaDocumentParser(Supplier parserSupplier, Supplier contentHandlerSupplier, Supplier metadataSupplier, Supplier parseContextSupplier) { - this.parserSupplier = (Supplier) Utils.getOrDefault(parserSupplier, () -> DEFAULT_PARSER_SUPPLIER); - this.contentHandlerSupplier = (Supplier) Utils.getOrDefault(contentHandlerSupplier, () -> DEFAULT_CONTENT_HANDLER_SUPPLIER); - this.metadataSupplier = (Supplier) Utils.getOrDefault(metadataSupplier, () -> DEFAULT_METADATA_SUPPLIER); - this.parseContextSupplier = (Supplier) Utils.getOrDefault(parseContextSupplier, () -> DEFAULT_PARSE_CONTEXT_SUPPLIER); + this.parserSupplier = Utils.getOrDefault(parserSupplier, () -> DEFAULT_PARSER_SUPPLIER); + this.contentHandlerSupplier = Utils.getOrDefault(contentHandlerSupplier, () -> DEFAULT_CONTENT_HANDLER_SUPPLIER); + this.metadataSupplier = Utils.getOrDefault(metadataSupplier, () -> DEFAULT_METADATA_SUPPLIER); + this.parseContextSupplier = Utils.getOrDefault(parseContextSupplier, () -> DEFAULT_PARSE_CONTEXT_SUPPLIER); } public Document parse(File file) { @@ -120,10 +120,10 @@ public class TikaDocumentParser { */ private Document extractByTika(InputStream inputStream) { try { - Parser parser = (Parser) this.parserSupplier.get(); - ContentHandler contentHandler = (ContentHandler) this.contentHandlerSupplier.get(); - Metadata metadata = (Metadata) this.metadataSupplier.get(); - ParseContext parseContext = (ParseContext) this.parseContextSupplier.get(); + Parser parser = this.parserSupplier.get(); + ContentHandler contentHandler = this.contentHandlerSupplier.get(); + Metadata metadata = this.metadataSupplier.get(); + ParseContext parseContext = this.parseContextSupplier.get(); parser.parse(inputStream, contentHandler, metadata, parseContext); String text = contentHandler.toString(); if (Utils.isNullOrBlank(text)) { diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/entity/AiragKnowledge.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/entity/AiragKnowledge.java similarity index 98% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/entity/AiragKnowledge.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/entity/AiragKnowledge.java index edacec4..23c4d23 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/entity/AiragKnowledge.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/entity/AiragKnowledge.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.llm.entity; +package org.jeecg.modules.airag.llm.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/entity/AiragKnowledgeDoc.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/entity/AiragKnowledgeDoc.java similarity index 93% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/entity/AiragKnowledgeDoc.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/entity/AiragKnowledgeDoc.java index 35ba38a..07cce1e 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/entity/AiragKnowledgeDoc.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/entity/AiragKnowledgeDoc.java @@ -1,11 +1,9 @@ -package org.cpte.modules.airag.llm.entity; +package org.jeecg.modules.airag.llm.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.*; import org.jeecg.common.aspect.annotation.Dict; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -16,8 +14,6 @@ import java.util.Date; import io.swagger.v3.oas.annotations.media.Schema; -import java.io.UnsupportedEncodingException; - /** * @Description: airag知识库文档 * @author: cpte diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/entity/AiragModel.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/entity/AiragModel.java similarity index 92% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/entity/AiragModel.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/entity/AiragModel.java index 069b197..c41172a 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/entity/AiragModel.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/entity/AiragModel.java @@ -1,16 +1,11 @@ -package org.cpte.modules.airag.llm.entity; +package org.jeecg.modules.airag.llm.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; import java.util.Date; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/handler/AIChatHandler.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/AIChatHandler.java similarity index 98% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/handler/AIChatHandler.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/AIChatHandler.java index c082793..6b11f51 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/handler/AIChatHandler.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/AIChatHandler.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.llm.handler; +package org.jeecg.modules.airag.llm.handler; import com.alibaba.fastjson.JSONObject; import dev.langchain4j.data.message.*; @@ -11,9 +11,9 @@ import org.jeecg.common.util.AssertUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.airag.common.handler.AIChatParams; import org.jeecg.modules.airag.common.handler.IAIChatHandler; -import org.cpte.modules.airag.llm.consts.LLMConsts; -import org.cpte.modules.airag.llm.entity.AiragModel; -import org.cpte.modules.airag.llm.mapper.AiragModelMapper; +import org.jeecg.modules.airag.llm.consts.LLMConsts; +import org.jeecg.modules.airag.llm.entity.AiragModel; +import org.jeecg.modules.airag.llm.mapper.AiragModelMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/handler/CommandExecUtil.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/CommandExecUtil.java similarity index 99% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/handler/CommandExecUtil.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/CommandExecUtil.java index 5157a2f..cef1c1a 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/handler/CommandExecUtil.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/CommandExecUtil.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.llm.handler; +package org.jeecg.modules.airag.llm.handler; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.ArrayUtils; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/handler/EmbeddingHandler.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/EmbeddingHandler.java similarity index 96% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/handler/EmbeddingHandler.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/EmbeddingHandler.java index 26ba4fa..47843eb 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/handler/EmbeddingHandler.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/EmbeddingHandler.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.llm.handler; +package org.jeecg.modules.airag.llm.handler; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; @@ -21,22 +21,25 @@ import dev.langchain4j.store.embedding.pgvector.PgVectorEmbeddingStore; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FilenameUtils; import org.apache.tika.parser.AutoDetectParser; +import org.jeecg.common.util.AssertUtils; +import org.jeecg.common.util.FileDownloadUtils; +import org.jeecg.common.util.UUIDGenerator; +import org.jeecg.common.util.oConvertUtils; import org.jeecg.ai.factory.AiModelFactory; import org.jeecg.ai.factory.AiModelOptions; import org.jeecg.common.exception.JeecgBootException; -import org.jeecg.common.util.*; import org.jeecg.modules.airag.common.handler.IEmbeddingHandler; import org.jeecg.modules.airag.common.vo.knowledge.KnowledgeSearchResult; -import org.cpte.modules.airag.llm.config.EmbedStoreConfigBean; -import org.cpte.modules.airag.llm.config.KnowConfigBean; -import org.cpte.modules.airag.llm.consts.LLMConsts; -import org.cpte.modules.airag.llm.document.TikaDocumentParser; -import org.cpte.modules.airag.llm.entity.AiragKnowledge; -import org.cpte.modules.airag.llm.entity.AiragKnowledgeDoc; -import org.cpte.modules.airag.llm.entity.AiragModel; -import org.cpte.modules.airag.llm.mapper.AiragKnowledgeMapper; -import org.cpte.modules.airag.llm.mapper.AiragModelMapper; -import org.cpte.modules.airag.llm.service.IAiragKnowledgeService; +import org.jeecg.modules.airag.llm.config.EmbedStoreConfigBean; +import org.jeecg.modules.airag.llm.config.KnowConfigBean; +import org.jeecg.modules.airag.llm.consts.LLMConsts; +import org.jeecg.modules.airag.llm.document.TikaDocumentParser; +import org.jeecg.modules.airag.llm.entity.AiragKnowledge; +import org.jeecg.modules.airag.llm.entity.AiragKnowledgeDoc; +import org.jeecg.modules.airag.llm.entity.AiragModel; +import org.jeecg.modules.airag.llm.mapper.AiragKnowledgeMapper; +import org.jeecg.modules.airag.llm.mapper.AiragModelMapper; +import org.jeecg.modules.airag.llm.service.IAiragKnowledgeService; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -52,8 +55,8 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import static dev.langchain4j.store.embedding.filter.MetadataFilterBuilder.metadataKey; -import static org.cpte.modules.airag.llm.consts.LLMConsts.KNOWLEDGE_DOC_TYPE_FILE; -import static org.cpte.modules.airag.llm.consts.LLMConsts.KNOWLEDGE_DOC_TYPE_WEB; +import static org.jeecg.modules.airag.llm.consts.LLMConsts.KNOWLEDGE_DOC_TYPE_FILE; +import static org.jeecg.modules.airag.llm.consts.LLMConsts.KNOWLEDGE_DOC_TYPE_WEB; /** * 向量工具类 diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/handler/JeecgToolsProvider.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/JeecgToolsProvider.java similarity index 89% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/handler/JeecgToolsProvider.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/JeecgToolsProvider.java index fd434c4..b686555 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/handler/JeecgToolsProvider.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/handler/JeecgToolsProvider.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.llm.handler; +package org.jeecg.modules.airag.llm.handler; import dev.langchain4j.agent.tool.ToolSpecification; import dev.langchain4j.service.tool.ToolExecutor; @@ -20,7 +20,7 @@ public interface JeecgToolsProvider { * @author chenrui * @date 2025/8/27 09:49 */ - public Map getDefaultTools(); + Map getDefaultTools(); /** * jeecgLlm工具类 diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/mapper/AiragKnowledgeDocMapper.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/AiragKnowledgeDocMapper.java similarity index 69% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/mapper/AiragKnowledgeDocMapper.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/AiragKnowledgeDocMapper.java index c9f6684..9cc74ff 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/mapper/AiragKnowledgeDocMapper.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/AiragKnowledgeDocMapper.java @@ -1,8 +1,8 @@ -package org.cpte.modules.airag.llm.mapper; +package org.jeecg.modules.airag.llm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; -import org.cpte.modules.airag.llm.entity.AiragKnowledgeDoc; +import org.jeecg.modules.airag.llm.entity.AiragKnowledgeDoc; /** * @Description: airag知识库文档 @@ -18,6 +18,6 @@ public interface AiragKnowledgeDocMapper extends BaseMapper { * @param mainId 主表id * @return boolean */ - public boolean deleteByMainId(@Param("mainId") String mainId); + boolean deleteByMainId(@Param("mainId") String mainId); } diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/mapper/AiragKnowledgeMapper.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/AiragKnowledgeMapper.java similarity index 86% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/mapper/AiragKnowledgeMapper.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/AiragKnowledgeMapper.java index c2839c6..cc9c76b 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/mapper/AiragKnowledgeMapper.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/AiragKnowledgeMapper.java @@ -1,8 +1,8 @@ -package org.cpte.modules.airag.llm.mapper; +package org.jeecg.modules.airag.llm.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.cpte.modules.airag.llm.entity.AiragKnowledge; +import org.jeecg.modules.airag.llm.entity.AiragKnowledge; /** * @Description: AIRag知识库 diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/mapper/AiragModelMapper.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/AiragModelMapper.java similarity index 86% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/mapper/AiragModelMapper.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/AiragModelMapper.java index aae4b68..bf0f67f 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/mapper/AiragModelMapper.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/AiragModelMapper.java @@ -1,8 +1,8 @@ -package org.cpte.modules.airag.llm.mapper; +package org.jeecg.modules.airag.llm.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.cpte.modules.airag.llm.entity.AiragModel; +import org.jeecg.modules.airag.llm.entity.AiragModel; /** * @Description: AiRag模型配置 diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/mapper/xml/AiragKnowledgeDocMapper.xml b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/xml/AiragKnowledgeDocMapper.xml similarity index 80% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/mapper/xml/AiragKnowledgeDocMapper.xml rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/xml/AiragKnowledgeDocMapper.xml index 9f8c8f1..4c69e23 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/mapper/xml/AiragKnowledgeDocMapper.xml +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/xml/AiragKnowledgeDocMapper.xml @@ -1,6 +1,6 @@ - + DELETE diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/mapper/xml/AiragKnowledgeMapper.xml b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/xml/AiragKnowledgeMapper.xml similarity index 56% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/mapper/xml/AiragKnowledgeMapper.xml rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/xml/AiragKnowledgeMapper.xml index 87a327b..7dfded2 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/mapper/xml/AiragKnowledgeMapper.xml +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/xml/AiragKnowledgeMapper.xml @@ -1,8 +1,8 @@ - + - SELECT * FROM airag_knowledge WHERE id = #{id} diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/mapper/xml/AiragModelMapper.xml b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/xml/AiragModelMapper.xml similarity index 56% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/mapper/xml/AiragModelMapper.xml rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/xml/AiragModelMapper.xml index 246e326..f89dde5 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/mapper/xml/AiragModelMapper.xml +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/mapper/xml/AiragModelMapper.xml @@ -1,8 +1,8 @@ - + - SELECT * FROM airag_model WHERE id = #{id} diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/service/IAiragKnowledgeDocService.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/service/IAiragKnowledgeDocService.java similarity index 94% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/service/IAiragKnowledgeDocService.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/service/IAiragKnowledgeDocService.java index 0ab4c61..78b6563 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/service/IAiragKnowledgeDocService.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/service/IAiragKnowledgeDocService.java @@ -1,8 +1,8 @@ -package org.cpte.modules.airag.llm.service; +package org.jeecg.modules.airag.llm.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; -import org.cpte.modules.airag.llm.entity.AiragKnowledgeDoc; +import org.jeecg.modules.airag.llm.entity.AiragKnowledgeDoc; import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/service/IAiragKnowledgeService.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/service/IAiragKnowledgeService.java similarity index 68% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/service/IAiragKnowledgeService.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/service/IAiragKnowledgeService.java index bee9183..510e18b 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/service/IAiragKnowledgeService.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/service/IAiragKnowledgeService.java @@ -1,7 +1,7 @@ -package org.cpte.modules.airag.llm.service; +package org.jeecg.modules.airag.llm.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.airag.llm.entity.AiragKnowledge; +import org.jeecg.modules.airag.llm.entity.AiragKnowledge; /** * AIRag知识库 diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/service/IAiragModelService.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/service/IAiragModelService.java similarity index 70% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/service/IAiragModelService.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/service/IAiragModelService.java index 12f606e..802f95c 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/service/IAiragModelService.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/service/IAiragModelService.java @@ -1,7 +1,7 @@ -package org.cpte.modules.airag.llm.service; +package org.jeecg.modules.airag.llm.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.airag.llm.entity.AiragModel; +import org.jeecg.modules.airag.llm.entity.AiragModel; /** * @Description: AiRag模型配置 diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/service/impl/AiragKnowledgeDocServiceImpl.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/service/impl/AiragKnowledgeDocServiceImpl.java similarity index 97% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/service/impl/AiragKnowledgeDocServiceImpl.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/service/impl/AiragKnowledgeDocServiceImpl.java index bc6cd61..087a900 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/service/impl/AiragKnowledgeDocServiceImpl.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/service/impl/AiragKnowledgeDocServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.llm.service.impl; +package org.jeecg.modules.airag.llm.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -14,13 +14,13 @@ import org.jeecg.common.config.mqtoken.UserTokenContext; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.*; import org.jeecg.common.util.filter.SsrfFileTypeFilter; -import org.cpte.modules.airag.llm.consts.LLMConsts; -import org.cpte.modules.airag.llm.entity.AiragKnowledge; -import org.cpte.modules.airag.llm.entity.AiragKnowledgeDoc; -import org.cpte.modules.airag.llm.handler.EmbeddingHandler; -import org.cpte.modules.airag.llm.mapper.AiragKnowledgeDocMapper; -import org.cpte.modules.airag.llm.mapper.AiragKnowledgeMapper; -import org.cpte.modules.airag.llm.service.IAiragKnowledgeDocService; +import org.jeecg.modules.airag.llm.consts.LLMConsts; +import org.jeecg.modules.airag.llm.entity.AiragKnowledge; +import org.jeecg.modules.airag.llm.entity.AiragKnowledgeDoc; +import org.jeecg.modules.airag.llm.handler.EmbeddingHandler; +import org.jeecg.modules.airag.llm.mapper.AiragKnowledgeDocMapper; +import org.jeecg.modules.airag.llm.mapper.AiragKnowledgeMapper; +import org.jeecg.modules.airag.llm.service.IAiragKnowledgeDocService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -43,7 +43,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.stream.Collectors; -import static org.cpte.modules.airag.llm.consts.LLMConsts.*; +import static org.jeecg.modules.airag.llm.consts.LLMConsts.*; /** * @Description: airag知识库文档 diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/service/impl/AiragKnowledgeServiceImpl.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/service/impl/AiragKnowledgeServiceImpl.java similarity index 59% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/service/impl/AiragKnowledgeServiceImpl.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/service/impl/AiragKnowledgeServiceImpl.java index a7d96b1..10f7de8 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/service/impl/AiragKnowledgeServiceImpl.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/service/impl/AiragKnowledgeServiceImpl.java @@ -1,9 +1,9 @@ -package org.cpte.modules.airag.llm.service.impl; +package org.jeecg.modules.airag.llm.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.cpte.modules.airag.llm.entity.AiragKnowledge; -import org.cpte.modules.airag.llm.mapper.AiragKnowledgeMapper; -import org.cpte.modules.airag.llm.service.IAiragKnowledgeService; +import org.jeecg.modules.airag.llm.entity.AiragKnowledge; +import org.jeecg.modules.airag.llm.mapper.AiragKnowledgeMapper; +import org.jeecg.modules.airag.llm.service.IAiragKnowledgeService; import org.springframework.stereotype.Service; /** diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/service/impl/AiragModelServiceImpl.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/service/impl/AiragModelServiceImpl.java similarity index 60% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/service/impl/AiragModelServiceImpl.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/service/impl/AiragModelServiceImpl.java index a365c8b..3245dbe 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/llm/service/impl/AiragModelServiceImpl.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/llm/service/impl/AiragModelServiceImpl.java @@ -1,9 +1,9 @@ -package org.cpte.modules.airag.llm.service.impl; +package org.jeecg.modules.airag.llm.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.cpte.modules.airag.llm.entity.AiragModel; -import org.cpte.modules.airag.llm.mapper.AiragModelMapper; -import org.cpte.modules.airag.llm.service.IAiragModelService; +import org.jeecg.modules.airag.llm.entity.AiragModel; +import org.jeecg.modules.airag.llm.mapper.AiragModelMapper; +import org.jeecg.modules.airag.llm.service.IAiragModelService; import org.springframework.stereotype.Service; /** diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/ocr/controller/AiOcrController.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/ocr/controller/AiOcrController.java similarity index 97% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/ocr/controller/AiOcrController.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/ocr/controller/AiOcrController.java index c31066e..4568885 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/ocr/controller/AiOcrController.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/ocr/controller/AiOcrController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.ocr.controller; +package org.jeecg.modules.airag.ocr.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.collections.CollectionUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.RedisUtil; -import org.cpte.modules.airag.ocr.entity.AiOcr; +import org.jeecg.modules.airag.ocr.entity.AiOcr; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/ocr/entity/AiOcr.java b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/ocr/entity/AiOcr.java similarity index 88% rename from cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/ocr/entity/AiOcr.java rename to cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/ocr/entity/AiOcr.java index c37a3b3..944747d 100644 --- a/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/cpte/modules/airag/ocr/entity/AiOcr.java +++ b/cpte-boot-module/cpte-boot-module-airag/src/main/java/org/jeecg/modules/airag/ocr/entity/AiOcr.java @@ -1,4 +1,4 @@ -package org.cpte.modules.airag.ocr.entity; +package org.jeecg.modules.airag.ocr.entity; import lombok.Data; diff --git a/cpte-boot-module/cpte-boot-module-airag/src/test/java/org/cpte/modules/airag/test/TestFileParse.java b/cpte-boot-module/cpte-boot-module-airag/src/test/java/org/jeecg/modules/airag/test/TestFileParse.java similarity index 100% rename from cpte-boot-module/cpte-boot-module-airag/src/test/java/org/cpte/modules/airag/test/TestFileParse.java rename to cpte-boot-module/cpte-boot-module-airag/src/test/java/org/jeecg/modules/airag/test/TestFileParse.java diff --git a/cpte-boot-module/cpte-boot-module-airag/src/test/java/org/cpte/modules/airag/test/TestFlows.java b/cpte-boot-module/cpte-boot-module-airag/src/test/java/org/jeecg/modules/airag/test/TestFlows.java similarity index 100% rename from cpte-boot-module/cpte-boot-module-airag/src/test/java/org/cpte/modules/airag/test/TestFlows.java rename to cpte-boot-module/cpte-boot-module-airag/src/test/java/org/jeecg/modules/airag/test/TestFlows.java diff --git a/cpte-boot-module/cpte-boot-module-airag/src/test/java/org/cpte/modules/airag/test/TestLLM.java b/cpte-boot-module/cpte-boot-module-airag/src/test/java/org/jeecg/modules/airag/test/TestLLM.java similarity index 100% rename from cpte-boot-module/cpte-boot-module-airag/src/test/java/org/cpte/modules/airag/test/TestLLM.java rename to cpte-boot-module/cpte-boot-module-airag/src/test/java/org/jeecg/modules/airag/test/TestLLM.java diff --git a/cpte-boot-module/cpte-boot-module-airag/src/test/java/org/cpte/modules/airag/test/TestVector.java b/cpte-boot-module/cpte-boot-module-airag/src/test/java/org/jeecg/modules/airag/test/TestVector.java similarity index 100% rename from cpte-boot-module/cpte-boot-module-airag/src/test/java/org/cpte/modules/airag/test/TestVector.java rename to cpte-boot-module/cpte-boot-module-airag/src/test/java/org/jeecg/modules/airag/test/TestVector.java diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/cloud/controller/JcloudDemoFeignController.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoFeignController.java similarity index 95% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/cloud/controller/JcloudDemoFeignController.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoFeignController.java index 2696854..ec25feb 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/cloud/controller/JcloudDemoFeignController.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoFeignController.java @@ -1,4 +1,4 @@ -//package org.jeecg.modules.demo.cloud.controller; +package org.jeecg.modules.demo.cloud.controller;//package org.jeecg.modules.demo.cloud.controller; // //import com.alibaba.csp.sentinel.annotation.SentinelResource; //import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/cloud/controller/JcloudDemoProviderController.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoProviderController.java similarity index 97% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/cloud/controller/JcloudDemoProviderController.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoProviderController.java index d958ea4..a7a0bb8 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/cloud/controller/JcloudDemoProviderController.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoProviderController.java @@ -13,7 +13,7 @@ import jakarta.annotation.Resource; /** * 服务端提供方——feign接口 * 【提供给system-start调用测试，看feign是否畅通】 - * @author: cpte + * @author: jeecg-boot */ @Slf4j @RestController diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/cloud/service/JcloudDemoService.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/JcloudDemoService.java similarity index 93% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/cloud/service/JcloudDemoService.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/JcloudDemoService.java index aa46b23..ba731eb 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/cloud/service/JcloudDemoService.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/JcloudDemoService.java @@ -4,7 +4,7 @@ import org.jeecg.common.api.vo.Result; /** * @Description: JcloudDemoService接口 - * @author: cpte + * @author: jeecg-boot */ public interface JcloudDemoService { diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java similarity index 95% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java index fb56efc..8d66d4f 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Service; /** * @Description: JcloudDemoServiceImpl实现类 - * @author: cpte + * @author: jeecg-boot */ @Service public class JcloudDemoServiceImpl implements JcloudDemoService { diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/cloud/xxljob/TestJobHandler.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/cloud/xxljob/TestJobHandler.java similarity index 97% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/cloud/xxljob/TestJobHandler.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/cloud/xxljob/TestJobHandler.java index a3bd805..3e40100 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/cloud/xxljob/TestJobHandler.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/cloud/xxljob/TestJobHandler.java @@ -1,4 +1,4 @@ -// +package org.jeecg.modules.demo.cloud.xxljob;// //package org.jeecg.modules.demo.cloud.xxljob; // //import com.xxl.job.core.biz.model.ReturnT; diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/MockController.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.java similarity index 97% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/MockController.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.java index db8ef4e..e748f43 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/MockController.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.java @@ -12,6 +12,7 @@ import javax.swing.filechooser.FileSystemView; import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -19,7 +20,7 @@ import java.util.Map; /** * @Description: MockController - * @author: cpte + * @author: jeecg-boot */ @RestController @RequestMapping("/mock/api") @@ -30,7 +31,7 @@ public class MockController { /** * 通用json访问接口 - * 格式： http://localhost:8000/jeecg-boot/api/json/{filename} + * 格式： http://localhost:8080/jeecg-boot/api/json/{filename} * @param filename * @return */ @@ -210,7 +211,7 @@ public class MockController { //json = FileUtils.re.readFileToString(jsonFile); //换个写法，解决springboot读取jar包中文件的问题 InputStream stream = getClass().getClassLoader().getResourceAsStream(jsonSrc.replace("classpath:", "")); - json = IOUtils.toString(stream,"UTF-8"); + json = IOUtils.toString(stream, StandardCharsets.UTF_8); } catch (IOException e) { log.error(e.getMessage(),e); } diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/area.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/area.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/area_mini.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area_mini.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/area_mini.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area_mini.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/area_options.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area_options.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/area_options.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area_options.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/asyn_tree_list_0.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_0.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/asyn_tree_list_0.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_0.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/asyn_tree_list_1.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_1.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/asyn_tree_list_1.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_1.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/asyn_tree_list_2.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_2.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/asyn_tree_list_2.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_2.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/asyn_tree_list_3.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_3.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/asyn_tree_list_3.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_3.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/asyn_tree_list_31.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_31.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/asyn_tree_list_31.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_31.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/getCntrNoCountInfo.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/getCntrNoCountInfo.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/getTubiao.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/getTubiao.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/getTubiao.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/getTubiao.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/graphreport_chart.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/graphreport_chart.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/graphreport_chart.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/graphreport_chart.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/permission.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/permission.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/permission.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/permission.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/permission_no_page.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/permission_no_page.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/permission_no_page.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/permission_no_page.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/role.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/role.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/role.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/role.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/service.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/service.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/service.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/service.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/sysdatalog.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/sysdatalog.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/sysdatalog.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/sysdatalog.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/task_process.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/task_process.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/task_process.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/task_process.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/user.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/user.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/user.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/user.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/user_info.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/user_info.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/user_info.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/user_info.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/userinfo.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/userinfo.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/userinfo.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/userinfo.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/workplace_activity.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_activity.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/workplace_activity.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_activity.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/workplace_projects.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_projects.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/workplace_projects.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_projects.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/workplace_radar.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_radar.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/workplace_radar.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_radar.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/workplace_teams.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_teams.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/json/workplace_teams.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_teams.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/vxe/controller/VxeMockController.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java similarity index 99% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/vxe/controller/VxeMockController.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java index e786245..dca65d0 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/vxe/controller/VxeMockController.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java @@ -22,11 +22,12 @@ import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.io.InputStream; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.*; /** * @Description: VxeMockController - * @author: cpte + * @author: jeecg-boot */ @RestController @RequestMapping("/mock/vxe") @@ -240,7 +241,7 @@ public class VxeMockController { } else { System.out.println("-- 高级查询模式：" + matchType.getValue()); } - superQueryParams = URLDecoder.decode(superQueryParams, "UTF-8"); + superQueryParams = URLDecoder.decode(superQueryParams, StandardCharsets.UTF_8); List conditions = JSON.parseArray(superQueryParams, QueryCondition.class); if (conditions != null) { for (QueryCondition condition : conditions) { @@ -402,7 +403,7 @@ public class VxeMockController { try { InputStream stream = getClass().getClassLoader().getResourceAsStream(path.replace("classpath:", "")); if (stream != null) { - String json = IOUtils.toString(stream, "UTF-8"); + String json = IOUtils.toString(stream, StandardCharsets.UTF_8); return JSON.parseArray(json); } } catch (IOException e) { diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/vxe/entity/MockEntity.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/entity/MockEntity.java similarity index 93% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/vxe/entity/MockEntity.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/entity/MockEntity.java index a02dbb4..dc41cdc 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/vxe/entity/MockEntity.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/entity/MockEntity.java @@ -4,7 +4,7 @@ import lombok.Data; /** * 模拟实体 - * @author: cpte + * @author: jeecg-boot */ @Data public class MockEntity { diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/vxe/json/ddjh.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/ddjh.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/vxe/json/ddjh.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/ddjh.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/vxe/json/ddjh_s8.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/ddjh_s8.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/vxe/json/ddjh_s8.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/ddjh_s8.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/vxe/json/dlglong.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/dlglong.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/vxe/json/dlglong.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/dlglong.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/vxe/websocket/VxeSocket.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/websocket/VxeSocket.java similarity index 97% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/vxe/websocket/VxeSocket.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/websocket/VxeSocket.java index 84d6964..fd1ab6f 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/mock/vxe/websocket/VxeSocket.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/websocket/VxeSocket.java @@ -18,7 +18,7 @@ import java.util.Map; /** * vxe WebSocket，用于实现实时无痕刷新的功能 - * @author: cpte + * @author: jeecg-boot */ @Slf4j @Component @@ -47,12 +47,12 @@ public class VxeSocket { * 因为一个用户可能打开多个页面，多个页面就会有多个连接； * key是userId，value是Map对象；子Map的key是pageId，value是VXESocket对象 */ - private static Map> userPool = new HashMap<>(); + private static final Map> userPool = new HashMap<>(); /** * 连接池，包含所有WebSocket连接； * key是socketId，value是VXESocket对象 */ - private static Map socketPool = new HashMap<>(); + private static final Map socketPool = new HashMap<>(); /** * 获取某个用户所有的页面 diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/online/OnlCgformDemoController.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/online/OnlCgformDemoController.java similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/online/OnlCgformDemoController.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/online/OnlCgformDemoController.java diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/controller/BigScreenTemplatController.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/BigScreenTemplatController.java similarity index 90% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/controller/BigScreenTemplatController.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/BigScreenTemplatController.java index a9ddbfe..df5f76c 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/controller/BigScreenTemplatController.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/BigScreenTemplatController.java @@ -1,9 +1,9 @@ -package org.cpte.modules.demo.test.controller; +package org.jeecg.modules.demo.test.controller; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; -import org.cpte.modules.demo.test.entity.JeecgDemo; -import org.cpte.modules.demo.test.service.IJeecgDemoService; +import org.jeecg.modules.demo.test.entity.JeecgDemo; +import org.jeecg.modules.demo.test.service.IJeecgDemoService; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/controller/JeecgDemoController.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java similarity index 98% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/controller/JeecgDemoController.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java index 06c0734..b80a3f5 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/controller/JeecgDemoController.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.demo.test.controller; +package org.jeecg.modules.demo.test.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -22,8 +22,8 @@ import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.UUIDGenerator; import org.jeecg.config.shiro.IgnoreAuth; -import org.cpte.modules.demo.test.entity.JeecgDemo; -import org.cpte.modules.demo.test.service.IJeecgDemoService; +import org.jeecg.modules.demo.test.entity.JeecgDemo; +import org.jeecg.modules.demo.test.service.IJeecgDemoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -38,7 +38,7 @@ import java.util.List; /** * @Description: 单表示例 - * @author: cpte + * @Author: jeecg-boot * @Date:2018-12-29 * @Version:V2.0 */ diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/controller/JeecgDynamicDataController.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDynamicDataController.java similarity index 85% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/controller/JeecgDynamicDataController.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDynamicDataController.java index 8bf95e8..dd3b987 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/controller/JeecgDynamicDataController.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDynamicDataController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.demo.test.controller; +package org.jeecg.modules.demo.test.controller; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; @@ -6,9 +6,9 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; -import org.cpte.modules.demo.test.entity.JeecgDemo; -import org.cpte.modules.demo.test.service.IJeecgDemoService; -import org.cpte.modules.demo.test.service.IJeecgDynamicDataService; +import org.jeecg.modules.demo.test.entity.JeecgDemo; +import org.jeecg.modules.demo.test.service.IJeecgDemoService; +import org.jeecg.modules.demo.test.service.IJeecgDynamicDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/controller/JeecgOrderErpMainController.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderErpMainController.java similarity index 98% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/controller/JeecgOrderErpMainController.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderErpMainController.java index 22393e2..f21e131 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/controller/JeecgOrderErpMainController.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderErpMainController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.demo.test.controller; +package org.jeecg.modules.demo.test.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -12,7 +12,7 @@ import org.jeecg.modules.demo.test.entity.JeecgOrderTicket; import org.jeecg.modules.demo.test.service.IJeecgOrderCustomerService; import org.jeecg.modules.demo.test.service.IJeecgOrderMainService; import org.jeecg.modules.demo.test.service.IJeecgOrderTicketService; -import org.cpte.modules.demo.test.vo.JeecgOrderMainPage; +import org.jeecg.modules.demo.test.vo.JeecgOrderMainPage; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/controller/JeecgOrderMainController.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java similarity index 97% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/controller/JeecgOrderMainController.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java index f82c0db..601d9aa 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/controller/JeecgOrderMainController.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.demo.test.controller; +package org.jeecg.modules.demo.test.controller; import java.util.ArrayList; import java.util.Arrays; @@ -14,15 +14,15 @@ import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.demo.test.entity.JeecgDemo; +import org.jeecg.modules.demo.test.entity.JeecgDemo; import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer; import org.jeecg.modules.demo.test.entity.JeecgOrderMain; import org.jeecg.modules.demo.test.entity.JeecgOrderTicket; -import org.cpte.modules.demo.test.service.IJeecgDemoService; +import org.jeecg.modules.demo.test.service.IJeecgDemoService; import org.jeecg.modules.demo.test.service.IJeecgOrderCustomerService; import org.jeecg.modules.demo.test.service.IJeecgOrderMainService; import org.jeecg.modules.demo.test.service.IJeecgOrderTicketService; -import org.cpte.modules.demo.test.vo.JeecgOrderMainPage; +import org.jeecg.modules.demo.test.vo.JeecgOrderMainPage; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -51,7 +51,7 @@ import lombok.extern.slf4j.Slf4j; /** * @Description: 一对多示例（JEditableTable行编辑） - * @author: cpte + * @Author: jeecg-boot * @Date:2019-02-15 * @Version: V2.0 */ diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/controller/JoaDemoController.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java similarity index 94% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/controller/JoaDemoController.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java index 886a517..32a8c5d 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/controller/JoaDemoController.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.test.controller; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -43,7 +44,7 @@ import lombok.extern.slf4j.Slf4j; /** * @Description: 流程测试 - * @author: cpte + * @Author: jeecg-boot * @Date: 2019-05-14 * @Version: V1.0 */ @@ -182,15 +183,11 @@ public class JoaDemoController { public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { // Step.1 组装查询条件 QueryWrapper queryWrapper = null; - try { - String paramsStr = request.getParameter("paramsStr"); - if (oConvertUtils.isNotEmpty(paramsStr)) { - String deString = URLDecoder.decode(paramsStr, "UTF-8"); - JoaDemo joaDemo = JSON.parseObject(deString, JoaDemo.class); - queryWrapper = QueryGenerator.initQueryWrapper(joaDemo, request.getParameterMap()); - } - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); + String paramsStr = request.getParameter("paramsStr"); + if (oConvertUtils.isNotEmpty(paramsStr)) { + String deString = URLDecoder.decode(paramsStr, StandardCharsets.UTF_8); + JoaDemo joaDemo = JSON.parseObject(deString, JoaDemo.class); + queryWrapper = QueryGenerator.initQueryWrapper(joaDemo, request.getParameterMap()); } //Step.2 AutoPoi 导出Excel diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/entity/JeecgDemo.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java similarity index 83% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/entity/JeecgDemo.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java index fbaec21..e2c5872 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/entity/JeecgDemo.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.demo.test.entity; +package org.jeecg.modules.demo.test.entity; import java.io.Serializable; @@ -17,8 +17,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - * @Description: cpte 测试demo - * @author: cpte + * @Description: jeecg 测试demo + * @Author: jeecg-boot * @Date: 2018-12-29 * @Version:V1.0 */ @@ -32,11 +32,11 @@ public class JeecgDemo extends JeecgEntity implements Serializable { /** 姓名 */ @Excel(name="姓名",width=25) @Schema(description = "姓名") - private java.lang.String name; + private String name; /** 关键词 */ @Schema(description = "关键词") @Excel(name="关键词",width=15) - private java.lang.String keyWord; + private String keyWord; /** 打卡时间 */ @Schema(description = "打卡时间") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @@ -50,15 +50,15 @@ public class JeecgDemo extends JeecgEntity implements Serializable { /** 奖金 */ @Schema(description = "奖金",example = "0") @Excel(name="奖金",type = 4,width=15) - private java.lang.Double bonusMoney; + private Double bonusMoney; /** 性别 {男:1,女:2} */ @Schema(description = "性别") @Excel(name = "性别", width = 15, dicCode = "sex") - private java.lang.String sex; + private String sex; /** 年龄 */ @Schema(description = "年龄",example = "0") @Excel(name="年龄",type = 4,width=15) - private java.lang.Integer age; + private Integer age; /** 生日 */ @Schema(description = "生日") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @@ -68,19 +68,19 @@ public class JeecgDemo extends JeecgEntity implements Serializable { /** 邮箱 */ @Schema(description = "邮箱") @Excel(name="邮箱",width=30) - private java.lang.String email; + private String email; /** 个人简介 */ @Schema(description = "个人简介") - private java.lang.String content; + private String content; /** 部门编码 */ @Excel(name="部门编码",width=25) @Schema(description = "部门编码") - private java.lang.String sysOrgCode; + private String sysOrgCode; @Schema(description = "租户ID") - private java.lang.Integer tenantId; + private Integer tenantId; /** 乐观锁字段 */ @Version - private java.lang.Integer updateCount; + private Integer updateCount; } diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/entity/JeecgOrderCustomer.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.java similarity index 80% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/entity/JeecgOrderCustomer.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.java index 9508bb5..830dc78 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/entity/JeecgOrderCustomer.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.java @@ -12,7 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat; /** * @Description: 订单客户 - * @author: cpte + * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 */ @@ -23,30 +23,30 @@ public class JeecgOrderCustomer implements Serializable { /**主键*/ @TableId(type = IdType.ASSIGN_ID) - private java.lang.String id; + private String id; /**客户名*/ @Excel(name="客户名字",width=15) - private java.lang.String name; + private String name; /**性别*/ - private java.lang.String sex; + private String sex; /**身份证号码*/ @Excel(name="身份证号码",width=15) - private java.lang.String idcard; + private String idcard; /**身份证扫描件*/ - private java.lang.String idcardPic; + private String idcardPic; /**电话1*/ @Excel(name="电话",width=15) - private java.lang.String telphone; + private String telphone; /**外键*/ - private java.lang.String orderId; + private String orderId; /**创建人*/ - private java.lang.String createBy; + private String createBy; /**创建时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private java.util.Date createTime; /**修改人*/ - private java.lang.String updateBy; + private String updateBy; /**修改时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/entity/JeecgOrderMain.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderMain.java similarity index 76% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/entity/JeecgOrderMain.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderMain.java index 050c1b5..4063581 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/entity/JeecgOrderMain.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderMain.java @@ -11,7 +11,7 @@ import org.springframework.format.annotation.DateTimeFormat; /** * @Description: 订单 - * @author: cpte + * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 */ @@ -22,31 +22,31 @@ public class JeecgOrderMain implements Serializable { /**主键*/ @TableId(type = IdType.ASSIGN_ID) - private java.lang.String id; + private String id; /**订单号*/ - private java.lang.String orderCode; + private String orderCode; /**订单类型*/ - private java.lang.String ctype; + private String ctype; /**订单日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private java.util.Date orderDate; + private Date orderDate; /**订单金额*/ - private java.lang.Double orderMoney; + private Double orderMoney; /**订单备注*/ - private java.lang.String content; + private String content; /**创建人*/ - private java.lang.String createBy; + private String createBy; /**创建时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private java.util.Date createTime; + private Date createTime; /**修改人*/ - private java.lang.String updateBy; + private String updateBy; /**修改时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private java.util.Date updateTime; + private Date updateTime; private String bpmStatus; } diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/entity/JeecgOrderTicket.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.java similarity index 87% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/entity/JeecgOrderTicket.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.java index b75b82c..6270d8b 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/entity/JeecgOrderTicket.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.java @@ -11,7 +11,7 @@ import org.springframework.format.annotation.DateTimeFormat; /** * @Description: 订单机票 - * @author: cpte + * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 */ @@ -22,25 +22,25 @@ public class JeecgOrderTicket implements Serializable { /**主键*/ @TableId(type = IdType.ASSIGN_ID) - private java.lang.String id; + private String id; /**航班号*/ @Excel(name="航班号",width=15) - private java.lang.String ticketCode; + private String ticketCode; /**航班时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Excel(name="航班时间",width=15,format = "yyyy-MM-dd") private java.util.Date tickectDate; /**外键*/ - private java.lang.String orderId; + private String orderId; /**创建人*/ - private java.lang.String createBy; + private String createBy; /**创建时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private java.util.Date createTime; /**修改人*/ - private java.lang.String updateBy; + private String updateBy; /**修改时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/entity/JoaDemo.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JoaDemo.java similarity index 88% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/entity/JoaDemo.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JoaDemo.java index b82cf42..69a71df 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/entity/JoaDemo.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JoaDemo.java @@ -14,7 +14,7 @@ import lombok.Data; /** * @Description: 流程测试 - * @author: cpte + * @Author: jeecg-boot * @Date: 2019-05-14 * @Version: V1.0 */ @@ -25,13 +25,13 @@ public class JoaDemo implements Serializable { /**ID*/ @TableId(type = IdType.ASSIGN_ID) - private java.lang.String id; + private String id; /**请假人*/ @Excel(name = "请假人", width = 15) - private java.lang.String name; + private String name; /**请假天数*/ @Excel(name = "请假天数", width = 15) - private java.lang.Integer days; + private Integer days; /**开始时间*/ @Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @@ -44,13 +44,13 @@ public class JoaDemo implements Serializable { private java.util.Date endDate; /**请假原因*/ @Excel(name = "请假原因", width = 15) - private java.lang.String reason; + private String reason; /**流程状态*/ @Excel(name = "流程状态", width = 15) - private java.lang.String bpmStatus; + private String bpmStatus; /**创建人id*/ @Excel(name = "创建人id", width = 15) - private java.lang.String createBy; + private String createBy; /**创建时间*/ @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @@ -63,5 +63,5 @@ public class JoaDemo implements Serializable { private java.util.Date updateTime; /**修改人id*/ @Excel(name = "修改人id", width = 15) - private java.lang.String updateBy; + private String updateBy; } diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/JeecgDemoMapper.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java similarity index 63% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/JeecgDemoMapper.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java index 7319106..8b19b64 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/JeecgDemoMapper.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java @@ -1,17 +1,17 @@ -package org.cpte.modules.demo.test.mapper; +package org.jeecg.modules.demo.test.mapper; import java.util.List; import java.util.Map; import org.apache.ibatis.annotations.Param; -import org.cpte.modules.demo.test.entity.JeecgDemo; +import org.jeecg.modules.demo.test.entity.JeecgDemo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; /** - * @Description: cpte 测试demo - * @author: cpte + * @Description: jeecg 测试demo + * @Author: jeecg-boot * @Date: 2018-12-29 * @Version: V1.0 */ @@ -22,7 +22,7 @@ public interface JeecgDemoMapper extends BaseMapper { * @param name 姓名 * @return demo集合 */ - public List getDemoByName(@Param("name") String name); + List getDemoByName(@Param("name") String name); /** * 查询列表数据 直接传数据权限的sql进行数据过滤 @@ -30,14 +30,14 @@ public interface JeecgDemoMapper extends BaseMapper { * @param permissionSql * @return */ - public IPage queryListWithPermission(Page page,@Param("permissionSql")String permissionSql); + IPage queryListWithPermission(Page page, @Param("permissionSql") String permissionSql); /** * 根据前缀获取所有有效权限 * @param permsPrefix * @return */ - public List queryAllAuth(@Param("permsPrefix")String permsPrefix); + List queryAllAuth(@Param("permsPrefix") String permsPrefix); /** * 查询用户已授权字段 @@ -45,7 +45,7 @@ public interface JeecgDemoMapper extends BaseMapper { * @param permsPrefix * @return */ - public List queryUserAuth(@Param("userId")String userId,@Param("permsPrefix")String permsPrefix); + List queryUserAuth(@Param("userId") String userId, @Param("permsPrefix") String permsPrefix); /** diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/JeecgOrderCustomerMapper.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java similarity index 84% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/JeecgOrderCustomerMapper.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java index 62e76ad..82cb1f1 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/JeecgOrderCustomerMapper.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 订单客户 - * @author: cpte + * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 */ @@ -22,7 +22,7 @@ public interface JeecgOrderCustomerMapper extends BaseMapper * @return */ @Delete("DELETE FROM JEECG_ORDER_CUSTOMER WHERE ORDER_ID = #{mainId}") - public boolean deleteCustomersByMainId(String mainId); + boolean deleteCustomersByMainId(String mainId); /** * 通过主表订单外键查询客户 @@ -30,5 +30,5 @@ public interface JeecgOrderCustomerMapper extends BaseMapper * @return 订单客户集合 */ @Select("SELECT * FROM JEECG_ORDER_CUSTOMER WHERE ORDER_ID = #{mainId}") - public List selectCustomersByMainId(String mainId); + List selectCustomersByMainId(String mainId); } diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/JeecgOrderMainMapper.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderMainMapper.java similarity index 94% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/JeecgOrderMainMapper.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderMainMapper.java index fa5f0ac..8c549d6 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/JeecgOrderMainMapper.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderMainMapper.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 订单 - * @author: cpte + * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 */ diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/JeecgOrderTicketMapper.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java similarity index 85% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/JeecgOrderTicketMapper.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java index a792811..b62f812 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/JeecgOrderTicketMapper.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 订单机票 - * @author: cpte + * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 */ @@ -21,7 +21,7 @@ public interface JeecgOrderTicketMapper extends BaseMapper { * @return */ @Delete("DELETE FROM JEECG_ORDER_TICKET WHERE ORDER_ID = #{mainId}") - public boolean deleteTicketsByMainId(String mainId); + boolean deleteTicketsByMainId(String mainId); /** * 通过主表订单外键查询订单机票 @@ -29,5 +29,5 @@ public interface JeecgOrderTicketMapper extends BaseMapper { * @return 返回订单机票集合 */ @Select("SELECT * FROM JEECG_ORDER_TICKET WHERE ORDER_ID = #{mainId}") - public List selectTicketsByMainId(String mainId); + List selectTicketsByMainId(String mainId); } diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/JoaDemoMapper.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JoaDemoMapper.java similarity index 92% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/JoaDemoMapper.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JoaDemoMapper.java index 627d8f7..6f93713 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/JoaDemoMapper.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JoaDemoMapper.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 流程测试 - * @author: cpte + * @Author: jeecg-boot * @Date: 2019-05-14 * @Version: V1.0 */ diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/xml/JeecgDemoMapper.xml b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml similarity index 86% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/xml/JeecgDemoMapper.xml rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml index c27c292..95d5da9 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/xml/JeecgDemoMapper.xml +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml @@ -1,14 +1,14 @@ - + - select * from demo where name = #{name} - select * from demo where 1=1 ${permissionSql} diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/xml/JeecgOrderCustomerMapper.xml b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderCustomerMapper.xml similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/xml/JeecgOrderCustomerMapper.xml rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderCustomerMapper.xml diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/xml/JeecgOrderMainMapper.xml b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderMainMapper.xml similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/xml/JeecgOrderMainMapper.xml rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderMainMapper.xml diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/xml/JeecgOrderTicketMapper.xml b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderTicketMapper.xml similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/xml/JeecgOrderTicketMapper.xml rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderTicketMapper.xml diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/xml/JoaDemoMapper.xml b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JoaDemoMapper.xml similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/mapper/xml/JoaDemoMapper.xml rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JoaDemoMapper.xml diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/IJeecgDemoService.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java similarity index 77% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/IJeecgDemoService.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java index aa230b3..c384d42 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/IJeecgDemoService.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java @@ -1,15 +1,15 @@ -package org.cpte.modules.demo.test.service; +package org.jeecg.modules.demo.test.service; import org.jeecg.common.system.base.service.JeecgService; -import org.cpte.modules.demo.test.entity.JeecgDemo; +import org.jeecg.modules.demo.test.entity.JeecgDemo; import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.List; /** - * @Description: cpte 测试demo - * @author: cpte + * @Description: jeecg 测试demo + * @Author: jeecg-boot * @Date: 2018-12-29 * @Version: V1.0 */ @@ -18,20 +18,20 @@ public interface IJeecgDemoService extends JeecgService { /** * 测试事务 */ - public void testTran(); + void testTran(); /** * 通过id过去demo数据，先读缓存，在读数据库 * @param id 数据库id * @return demo对象 */ - public JeecgDemo getByIdCacheable(String id); + JeecgDemo getByIdCacheable(String id); /** * 通过id过去demo数据，先读缓存，在读数据库 * @param id 数据库id * @return demo对象 */ - public JeecgDemo getByIdCacheableTTL(String id); + JeecgDemo getByIdCacheableTTL(String id); /** * 查询列表数据 在service中获取数据权限sql信息 diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/IJeecgDynamicDataService.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDynamicDataService.java similarity index 65% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/IJeecgDynamicDataService.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDynamicDataService.java index ab6aa82..9a56290 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/IJeecgDynamicDataService.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDynamicDataService.java @@ -1,7 +1,7 @@ -package org.cpte.modules.demo.test.service; +package org.jeecg.modules.demo.test.service; import org.jeecg.common.system.base.service.JeecgService; -import org.cpte.modules.demo.test.entity.JeecgDemo; +import org.jeecg.modules.demo.test.entity.JeecgDemo; import java.util.List; @@ -16,13 +16,13 @@ public interface IJeecgDynamicDataService extends JeecgService { * 测试从header获取数据源 * @return */ - public List selectSpelByHeader(); + List selectSpelByHeader(); /** * 使用spel从参数获取 * @param dsName * @return */ - public List selectSpelByKey(String dsName); + List selectSpelByKey(String dsName); } diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/IJeecgOrderCustomerService.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java similarity index 84% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/IJeecgOrderCustomerService.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java index 1e8a27c..9dde1c9 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/IJeecgOrderCustomerService.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 订单客户 - * @author: cpte + * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 */ @@ -19,5 +19,5 @@ public interface IJeecgOrderCustomerService extends IService * @param mainId 订单id * @return 订单顾客集合 */ - public List selectCustomersByMainId(String mainId); + List selectCustomersByMainId(String mainId); } diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/IJeecgOrderMainService.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java similarity index 67% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/IJeecgOrderMainService.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java index e371599..5e55ce5 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/IJeecgOrderMainService.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java @@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 订单 - * @author: cpte + * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 */ @@ -24,7 +24,7 @@ public interface IJeecgOrderMainService extends IService { * @param jeecgOrderCustomerList 订单客户集合 * @param jeecgOrderTicketList 订单机票集合 */ - public void saveMain(JeecgOrderMain jeecgOrderMain,List jeecgOrderCustomerList,List jeecgOrderTicketList) ; + void saveMain(JeecgOrderMain jeecgOrderMain, List jeecgOrderCustomerList, List jeecgOrderTicketList) ; /** * 修改一对多 @@ -32,19 +32,19 @@ public interface IJeecgOrderMainService extends IService { * @param jeecgOrderCustomerList 订单客户集合 * @param jeecgOrderTicketList 订单机票集合 */ - public void updateMain(JeecgOrderMain jeecgOrderMain,List jeecgOrderCustomerList,List jeecgOrderTicketList); + void updateMain(JeecgOrderMain jeecgOrderMain, List jeecgOrderCustomerList, List jeecgOrderTicketList); /** * 删除一对多 * @param id 订单id */ - public void delMain (String id); + void delMain(String id); /** * 批量删除一对多 * @param idList 订单id集合 */ - public void delBatchMain (Collection idList); + void delBatchMain(Collection idList); /** * 修改一对多 @@ -52,5 +52,5 @@ public interface IJeecgOrderMainService extends IService { * @param jeecgOrderCustomerList 订单客户集合 * @param jeecgOrderTicketList 订单机票集合 */ - public void updateCopyMain(JeecgOrderMain jeecgOrderMain, List jeecgOrderCustomerList, List jeecgOrderTicketList); + void updateCopyMain(JeecgOrderMain jeecgOrderMain, List jeecgOrderCustomerList, List jeecgOrderTicketList); } diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/IJeecgOrderTicketService.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java similarity index 84% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/IJeecgOrderTicketService.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java index 4b2abc3..e40c889 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/IJeecgOrderTicketService.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 订单机票 - * @author: cpte + * @Author: jeecg-boot * @Date: 2019-02-15 * @Version: V1.0 */ @@ -19,5 +19,5 @@ public interface IJeecgOrderTicketService extends IService { * @param mainId 订单id * @return 订单机票集合 */ - public List selectTicketsByMainId(String mainId); + List selectTicketsByMainId(String mainId); } diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/IJoaDemoService.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJoaDemoService.java similarity index 92% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/IJoaDemoService.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJoaDemoService.java index 8e4465b..499c049 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/IJoaDemoService.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJoaDemoService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 流程测试 - * @author: cpte + * @Author: jeecg-boot * @Date: 2019-05-14 * @Version: V1.0 */ diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/impl/JeecgDemoServiceImpl.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java similarity index 93% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/impl/JeecgDemoServiceImpl.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java index 11cfbeb..ee4e3f1 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/demo/test/service/impl/JeecgDemoServiceImpl.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.demo.test.service.impl; +package org.jeecg.modules.demo.test.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -7,9 +7,9 @@ import org.apache.shiro.SecurityUtils; import org.jeecg.common.constant.CacheConstant; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; -import org.cpte.modules.demo.test.entity.JeecgDemo; -import org.cpte.modules.demo.test.mapper.JeecgDemoMapper; -import org.cpte.modules.demo.test.service.IJeecgDemoService; +import org.jeecg.modules.demo.test.entity.JeecgDemo; +import org.jeecg.modules.demo.test.mapper.JeecgDemoMapper; +import org.jeecg.modules.demo.test.service.IJeecgDemoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -21,8 +21,8 @@ import java.util.Arrays; import java.util.List; /** - * @Description: cpte 测试demo - * @author: cpte + * @Description: jeecg 测试demo + * @Author: jeecg-boot * @Date: 2018-12-29 * @Version: V1.0 */ @@ -54,8 +54,7 @@ public class JeecgDemoServiceImpl extends ServiceImpl conditions = JSON.parseArray(superQueryParams, QueryCondition.class); if (conditions != null) { for (QueryCondition condition : conditions) { @@ -400,7 +401,7 @@ public class DlMockController { try { InputStream stream = getClass().getClassLoader().getResourceAsStream(path.replace("classpath:", "")); if (stream != null) { - String json = IOUtils.toString(stream, "UTF-8"); + String json = IOUtils.toString(stream, StandardCharsets.UTF_8); return JSON.parseArray(json); } } catch (IOException e) { diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/dlglong/entity/MockEntity.java b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/dlglong/entity/MockEntity.java similarity index 93% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/dlglong/entity/MockEntity.java rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/dlglong/entity/MockEntity.java index 07ee47f..45a7fcc 100644 --- a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/dlglong/entity/MockEntity.java +++ b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/dlglong/entity/MockEntity.java @@ -4,7 +4,7 @@ import lombok.Data; /** * 模拟实体 - * @author: cpte + * @author: jeecg-boot */ @Data public class MockEntity { diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/dlglong/json/CarLngLat.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/dlglong/json/CarLngLat.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/dlglong/json/CarLngLat.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/dlglong/json/CarLngLat.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/dlglong/json/CarTrace.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/dlglong/json/CarTrace.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/dlglong/json/CarTrace.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/dlglong/json/CarTrace.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/dlglong/json/ddjh.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/dlglong/json/ddjh.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/dlglong/json/ddjh.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/dlglong/json/ddjh.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/dlglong/json/ddjh_s8.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/dlglong/json/ddjh_s8.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/dlglong/json/ddjh_s8.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/dlglong/json/ddjh_s8.json diff --git a/cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/dlglong/json/dlglong.json b/cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/dlglong/json/dlglong.json similarity index 100% rename from cpte-boot-module/cpte-module-demo/src/main/java/org/cpte/modules/dlglong/json/dlglong.json rename to cpte-boot-module/cpte-module-demo/src/main/java/org/jeecg/modules/dlglong/json/dlglong.json diff --git a/cpte-boot-module/cpte-module-wms/pom.xml b/cpte-boot-module/cpte-module-wms/pom.xml new file mode 100644 index 0000000..ecc0e2f --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/pom.xml @@ -0,0 +1,18 @@ + + + cpte-boot-module + org.jeecgframework.boot3 + 3.8.3 + + 4.0.0 + + cpte-module-wms + + + + org.jeecgframework.boot3 + cpte-boot-base-core + + + diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/eee.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/eee.java new file mode 100644 index 0000000..9258248 --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/eee.java @@ -0,0 +1,4 @@ +package org.jeecg.modules.agvTask; + +public class eee { +} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/AreaController.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/AreaController.java new file mode 100644 index 0000000..dbdec05 --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/AreaController.java @@ -0,0 +1,186 @@ +package org.cpte.modules.base.controller; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.common.util.oConvertUtils; +import org.cpte.modules.base.entity.Area; +import org.cpte.modules.base.service.IAreaService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + /** + * @Description: 库区 + * @author: cpte + * @Date: 2025-10-27 + * @Version: V1.0 + */ +@Tag(name="库区") +@RestController +@RequestMapping("/base/area") +@Slf4j +public class AreaController extends JeecgController { + @Autowired + private IAreaService areaService; + + /** + * 分页列表查询 + * + * @param area + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "库区-分页列表查询") + @Operation(summary="库区-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(Area area, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + + // 自定义查询规则 + Map customeRuleMap = new HashMap<>(); + // 自定义多选的查询规则为：LIKE_WITH_OR + customeRuleMap.put("delFlag", QueryRuleEnum.LIKE_WITH_OR); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(area, req.getParameterMap(),customeRuleMap); + Page page = new Page(pageNo, pageSize); + IPage pageList = areaService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param area + * @return + */ + @AutoLog(value = "库区-添加") + @Operation(summary="库区-添加") + @RequiresPermissions("base:base_area:add") + @PostMapping(value = "/add") + public Result add(@RequestBody Area area) { + areaService.save(area); + + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param area + * @return + */ + @AutoLog(value = "库区-编辑") + @Operation(summary="库区-编辑") + @RequiresPermissions("base:base_area:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody Area area) { + areaService.updateById(area); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "库区-通过id删除") + @Operation(summary="库区-通过id删除") + @RequiresPermissions("base:base_area:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + areaService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "库区-批量删除") + @Operation(summary="库区-批量删除") + @RequiresPermissions("base:base_area:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.areaService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "库区-通过id查询") + @Operation(summary="库区-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + Area area = areaService.getById(id); + if(area==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(area); + } + + /** + * 导出excel + * + * @param request + * @param area + */ + @RequiresPermissions("base:base_area:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, Area area) { + return super.exportXls(request, area, Area.class, "库区"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("base:base_area:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, Area.class); + } + +} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/ItemController.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/ItemController.java new file mode 100644 index 0000000..03235a7 --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/ItemController.java @@ -0,0 +1,182 @@ +package org.cpte.modules.base.controller; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.common.util.oConvertUtils; +import org.cpte.modules.base.entity.Item; +import org.cpte.modules.base.service.IItemService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + /** + * @Description: 物料 + * @author: cpte + * @Date: 2025-10-27 + * @Version: V1.0 + */ +@Tag(name="物料") +@RestController +@RequestMapping("/base/item") +@Slf4j +public class ItemController extends JeecgController { + @Autowired + private IItemService itemService; + + /** + * 分页列表查询 + * + * @param item + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "物料-分页列表查询") + @Operation(summary="物料-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(Item item, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(item, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = itemService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param item + * @return + */ + @AutoLog(value = "物料-添加") + @Operation(summary="物料-添加") + @RequiresPermissions("base:base_item:add") + @PostMapping(value = "/add") + public Result add(@RequestBody Item item) { + itemService.save(item); + + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param item + * @return + */ + @AutoLog(value = "物料-编辑") + @Operation(summary="物料-编辑") + @RequiresPermissions("base:base_item:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody Item item) { + itemService.updateById(item); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "物料-通过id删除") + @Operation(summary="物料-通过id删除") + @RequiresPermissions("base:base_item:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + itemService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "物料-批量删除") + @Operation(summary="物料-批量删除") + @RequiresPermissions("base:base_item:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.itemService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "物料-通过id查询") + @Operation(summary="物料-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + Item item = itemService.getById(id); + if(item==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(item); + } + + /** + * 导出excel + * + * @param request + * @param item + */ + @RequiresPermissions("base:base_item:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, Item item) { + return super.exportXls(request, item, Item.class, "物料"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("base:base_item:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, Item.class); + } + +} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/PointController.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/PointController.java new file mode 100644 index 0000000..51b911d --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/PointController.java @@ -0,0 +1,182 @@ +package org.cpte.modules.base.controller; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.common.util.oConvertUtils; +import org.cpte.modules.base.entity.Point; +import org.cpte.modules.base.service.IPointService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + /** + * @Description: 库位 + * @author: cpte + * @Date: 2025-10-28 + * @Version: V1.0 + */ +@Tag(name="库位") +@RestController +@RequestMapping("/base/point") +@Slf4j +public class PointController extends JeecgController { + @Autowired + private IPointService pointService; + + /** + * 分页列表查询 + * + * @param point + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "库位-分页列表查询") + @Operation(summary="库位-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(Point point, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(point, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = pointService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param point + * @return + */ + @AutoLog(value = "库位-添加") + @Operation(summary="库位-添加") + @RequiresPermissions("base:base_point:add") + @PostMapping(value = "/add") + public Result add(@RequestBody Point point) { + pointService.save(point); + + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param point + * @return + */ + @AutoLog(value = "库位-编辑") + @Operation(summary="库位-编辑") + @RequiresPermissions("base:base_point:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody Point point) { + pointService.updateById(point); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "库位-通过id删除") + @Operation(summary="库位-通过id删除") + @RequiresPermissions("base:base_point:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + pointService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "库位-批量删除") + @Operation(summary="库位-批量删除") + @RequiresPermissions("base:base_point:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.pointService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "库位-通过id查询") + @Operation(summary="库位-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + Point point = pointService.getById(id); + if(point==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(point); + } + + /** + * 导出excel + * + * @param request + * @param point + */ + @RequiresPermissions("base:base_point:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, Point point) { + return super.exportXls(request, point, Point.class, "库位"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("base:base_point:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, Point.class); + } + +} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/StockController.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/StockController.java new file mode 100644 index 0000000..a493578 --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/StockController.java @@ -0,0 +1,182 @@ +package org.cpte.modules.base.controller; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.common.util.oConvertUtils; +import org.cpte.modules.base.entity.Stock; +import org.cpte.modules.base.service.IStockService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + /** + * @Description: 容器 + * @author: cpte + * @Date: 2025-10-28 + * @Version: V1.0 + */ +@Tag(name="容器") +@RestController +@RequestMapping("/base/stock") +@Slf4j +public class StockController extends JeecgController { + @Autowired + private IStockService stockService; + + /** + * 分页列表查询 + * + * @param stock + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "容器-分页列表查询") + @Operation(summary="容器-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(Stock stock, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(stock, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = stockService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param stock + * @return + */ + @AutoLog(value = "容器-添加") + @Operation(summary="容器-添加") + @RequiresPermissions("base:base_stock:add") + @PostMapping(value = "/add") + public Result add(@RequestBody Stock stock) { + stockService.save(stock); + + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param stock + * @return + */ + @AutoLog(value = "容器-编辑") + @Operation(summary="容器-编辑") + @RequiresPermissions("base:base_stock:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody Stock stock) { + stockService.updateById(stock); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "容器-通过id删除") + @Operation(summary="容器-通过id删除") + @RequiresPermissions("base:base_stock:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + stockService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "容器-批量删除") + @Operation(summary="容器-批量删除") + @RequiresPermissions("base:base_stock:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.stockService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "容器-通过id查询") + @Operation(summary="容器-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + Stock stock = stockService.getById(id); + if(stock==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(stock); + } + + /** + * 导出excel + * + * @param request + * @param stock + */ + @RequiresPermissions("base:base_stock:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, Stock stock) { + return super.exportXls(request, stock, Stock.class, "容器"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("base:base_stock:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, Stock.class); + } + +} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Area.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Area.java new file mode 100644 index 0000000..882ad3e --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Area.java @@ -0,0 +1,80 @@ +package org.cpte.modules.base.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 库区 + * @author: cpte + * @Date: 2025-10-27 + * @Version: V1.0 + */ +@Data +@TableName("base_area") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description="库区") +public class Area implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "主键") + private java.lang.String id; + /**库区编码*/ + @Excel(name = "库区编码", width = 15) + @Schema(description = "库区编码") + private java.lang.String areaCode; + /**库区名称*/ + @Excel(name = "库区名称", width = 15) + @Schema(description = "库区名称") + private java.lang.String areaName; + /**描述*/ + @Excel(name = "描述", width = 15) + @Schema(description = "描述") + private java.lang.String description; + /**删除状态*/ + @Excel(name = "删除状态", width = 15) + @Schema(description = "删除状态") + @TableLogic + private java.lang.String delFlag; + /**所属部门*/ + @Schema(description = "所属部门") + private java.lang.String sysOrgCode; + /**租户ID*/ + @Excel(name = "租户ID", width = 15) + @Schema(description = "租户ID") + private java.lang.Integer tenantId; + /**创建人*/ + @Schema(description = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @Schema(description = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "更新日期") + private java.util.Date updateTime; +} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Item.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Item.java new file mode 100644 index 0000000..01201fd --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Item.java @@ -0,0 +1,68 @@ +package org.cpte.modules.base.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 物料 + * @author: cpte + * @Date: 2025-10-27 + * @Version: V1.0 + */ +@Data +@TableName("base_item") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description="物料") +public class Item implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "主键") + private java.lang.String id; + /**物料编码*/ + @Excel(name = "物料编码", width = 15) + @Schema(description = "物料编码") + private java.lang.String itemCode; + /**物料名称*/ + @Excel(name = "物料名称", width = 15) + @Schema(description = "物料名称") + private java.lang.String itemName; + /**租户ID*/ + @Excel(name = "租户ID", width = 15) + @Schema(description = "租户ID") + private java.lang.Integer tenantId; + /**创建人*/ + @Schema(description = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @Schema(description = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "更新日期") + private java.util.Date updateTime; +} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Point.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Point.java new file mode 100644 index 0000000..a6c3e45 --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Point.java @@ -0,0 +1,92 @@ +package org.cpte.modules.base.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 库位 + * @author: cpte + * @Date: 2025-10-28 + * @Version: V1.0 + */ +@Data +@TableName("base_point") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description="库位") +public class Point implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "主键") + private java.lang.String id; + /**库位编码*/ + @Excel(name = "库位编码", width = 15) + @Schema(description = "库位编码") + private java.lang.String pointCode; + /**排*/ + @Excel(name = "排", width = 15) + @Schema(description = "排") + private java.lang.String row; + /**列*/ + @Excel(name = "列", width = 15) + @Schema(description = "列") + private java.lang.String col; + /**层*/ + @Excel(name = "层", width = 15) + @Schema(description = "层") + private java.lang.String layer; + /**描述*/ + @Excel(name = "描述", width = 15) + @Schema(description = "描述") + private java.lang.String description; + /**删除状态*/ + @Excel(name = "删除状态", width = 15) + @Schema(description = "删除状态") + @TableLogic + private java.lang.Integer delFlag; + /**库区ID*/ + @Excel(name = "库区ID", width = 15) + @Schema(description = "库区ID") + private java.lang.Integer areaId; + /**租户ID*/ + @Excel(name = "租户ID", width = 15) + @Schema(description = "租户ID") + private java.lang.Integer tenantId; + /**所属部门*/ + @Schema(description = "所属部门") + private java.lang.String sysOrgCode; + /**创建人*/ + @Schema(description = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @Schema(description = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "更新日期") + private java.util.Date updateTime; +} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Stock.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Stock.java new file mode 100644 index 0000000..381b50f --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Stock.java @@ -0,0 +1,76 @@ +package org.cpte.modules.base.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 容器 + * @author: cpte + * @Date: 2025-10-28 + * @Version: V1.0 + */ +@Data +@TableName("base_stock") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description="容器") +public class Stock implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "主键") + private java.lang.String id; + /**容器编码*/ + @Excel(name = "容器编码", width = 15) + @Schema(description = "容器编码") + private java.lang.String stockCode; + /**描述*/ + @Excel(name = "描述", width = 15) + @Schema(description = "描述") + private java.lang.String description; + /**删除状态*/ + @Excel(name = "删除状态", width = 15) + @Schema(description = "删除状态") + @TableLogic + private java.lang.String delFlag; + /**租户ID*/ + @Excel(name = "租户ID", width = 15) + @Schema(description = "租户ID") + private java.lang.Integer tenantId; + /**创建人*/ + @Schema(description = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @Schema(description = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Schema(description = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @Schema(description = "所属部门") + private java.lang.String sysOrgCode; +} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/AreaMapper.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/AreaMapper.java new file mode 100644 index 0000000..162e8c2 --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/AreaMapper.java @@ -0,0 +1,17 @@ +package org.cpte.modules.base.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.cpte.modules.base.entity.Area; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 库区 + * @author: cpte + * @Date: 2025-10-27 + * @Version: V1.0 + */ +public interface AreaMapper extends BaseMapper { + +} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/ItemMapper.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/ItemMapper.java new file mode 100644 index 0000000..9fc8c14 --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/ItemMapper.java @@ -0,0 +1,17 @@ +package org.cpte.modules.base.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.cpte.modules.base.entity.Item; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 物料 + * @author: cpte + * @Date: 2025-10-27 + * @Version: V1.0 + */ +public interface ItemMapper extends BaseMapper { + +} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/PointMapper.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/PointMapper.java new file mode 100644 index 0000000..deae1ce --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/PointMapper.java @@ -0,0 +1,17 @@ +package org.cpte.modules.base.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.cpte.modules.base.entity.Point; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 库位 + * @author: cpte + * @Date: 2025-10-28 + * @Version: V1.0 + */ +public interface PointMapper extends BaseMapper { + +} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/StockMapper.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/StockMapper.java new file mode 100644 index 0000000..e544e49 --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/StockMapper.java @@ -0,0 +1,17 @@ +package org.cpte.modules.base.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.cpte.modules.base.entity.Stock; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 容器 + * @author: cpte + * @Date: 2025-10-28 + * @Version: V1.0 + */ +public interface StockMapper extends BaseMapper { + +} diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysFillRuleMapper.xml b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/xml/AreaMapper.xml similarity index 69% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysFillRuleMapper.xml rename to cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/xml/AreaMapper.xml index f35510f..48db127 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysFillRuleMapper.xml +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/xml/AreaMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/mapper/xml/SysMessageMapper.xml b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/xml/ItemMapper.xml similarity index 69% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/mapper/xml/SysMessageMapper.xml rename to cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/xml/ItemMapper.xml index 89f031e..5f3e25c 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/mapper/xml/SysMessageMapper.xml +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/xml/ItemMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/xml/PointMapper.xml b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/xml/PointMapper.xml new file mode 100644 index 0000000..567cae3 --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/xml/PointMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/xml/StockMapper.xml b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/xml/StockMapper.xml new file mode 100644 index 0000000..af355fc --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/xml/StockMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IAreaService.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IAreaService.java new file mode 100644 index 0000000..5a5f314 --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IAreaService.java @@ -0,0 +1,14 @@ +package org.cpte.modules.base.service; + +import org.cpte.modules.base.entity.Area; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 库区 + * @author: cpte + * @Date: 2025-10-27 + * @Version: V1.0 + */ +public interface IAreaService extends IService { + +} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IItemService.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IItemService.java new file mode 100644 index 0000000..2a11d68 --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IItemService.java @@ -0,0 +1,14 @@ +package org.cpte.modules.base.service; + +import org.cpte.modules.base.entity.Item; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 物料 + * @author: cpte + * @Date: 2025-10-27 + * @Version: V1.0 + */ +public interface IItemService extends IService { + +} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IPointService.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IPointService.java new file mode 100644 index 0000000..7fe6bb5 --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IPointService.java @@ -0,0 +1,14 @@ +package org.cpte.modules.base.service; + +import org.cpte.modules.base.entity.Point; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 库位 + * @author: cpte + * @Date: 2025-10-28 + * @Version: V1.0 + */ +public interface IPointService extends IService { + +} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IStockService.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IStockService.java new file mode 100644 index 0000000..dcf9985 --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IStockService.java @@ -0,0 +1,14 @@ +package org.cpte.modules.base.service; + +import org.cpte.modules.base.entity.Stock; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 容器 + * @author: cpte + * @Date: 2025-10-28 + * @Version: V1.0 + */ +public interface IStockService extends IService { + +} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/AreaServiceImpl.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/AreaServiceImpl.java new file mode 100644 index 0000000..b375d07 --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/AreaServiceImpl.java @@ -0,0 +1,19 @@ +package org.cpte.modules.base.service.impl; + +import org.cpte.modules.base.entity.Area; +import org.cpte.modules.base.mapper.AreaMapper; +import org.cpte.modules.base.service.IAreaService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 库区 + * @author: cpte + * @Date: 2025-10-27 + * @Version: V1.0 + */ +@Service +public class AreaServiceImpl extends ServiceImpl implements IAreaService { + +} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/ItemServiceImpl.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/ItemServiceImpl.java new file mode 100644 index 0000000..2cbd803 --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/ItemServiceImpl.java @@ -0,0 +1,19 @@ +package org.cpte.modules.base.service.impl; + +import org.cpte.modules.base.entity.Item; +import org.cpte.modules.base.mapper.ItemMapper; +import org.cpte.modules.base.service.IItemService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 物料 + * @author: cpte + * @Date: 2025-10-27 + * @Version: V1.0 + */ +@Service +public class ItemServiceImpl extends ServiceImpl implements IItemService { + +} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/PointServiceImpl.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/PointServiceImpl.java new file mode 100644 index 0000000..80e42da --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/PointServiceImpl.java @@ -0,0 +1,19 @@ +package org.cpte.modules.base.service.impl; + +import org.cpte.modules.base.entity.Point; +import org.cpte.modules.base.mapper.PointMapper; +import org.cpte.modules.base.service.IPointService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 库位 + * @author: cpte + * @Date: 2025-10-28 + * @Version: V1.0 + */ +@Service +public class PointServiceImpl extends ServiceImpl implements IPointService { + +} diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/StockServiceImpl.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/StockServiceImpl.java new file mode 100644 index 0000000..dc14071 --- /dev/null +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/StockServiceImpl.java @@ -0,0 +1,19 @@ +package org.cpte.modules.base.service.impl; + +import org.cpte.modules.base.entity.Stock; +import org.cpte.modules.base.mapper.StockMapper; +import org.cpte.modules.base.service.IStockService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 容器 + * @author: cpte + * @Date: 2025-10-28 + * @Version: V1.0 + */ +@Service +public class StockServiceImpl extends ServiceImpl implements IStockService { + +} diff --git a/cpte-boot-module/pom.xml b/cpte-boot-module/pom.xml index ed9ea3e..fdd89ab 100644 --- a/cpte-boot-module/pom.xml +++ b/cpte-boot-module/pom.xml @@ -15,6 +15,7 @@ cpte-module-demo cpte-boot-module-airag + cpte-module-wms diff --git a/cpte-module-system/cpte-system-api/cpte-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/cpte-module-system/cpte-system-api/cpte-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java index 9283653..9679374 100644 --- a/cpte-module-system/cpte-system-api/cpte-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java +++ b/cpte-module-system/cpte-system-api/cpte-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java @@ -152,7 +152,7 @@ public interface ISysBaseAPI extends CommonAPI { */ @Override @GetMapping("/sys/api/queryEnableDictItemsByCode") - public List queryEnableDictItemsByCode(@RequestParam("code") String code); + List queryEnableDictItemsByCode(@RequestParam("code") String code); /** 11查询所有的父级字典，按照create_time排序 * @return List 字典值集合 @@ -191,7 +191,7 @@ public interface ISysBaseAPI extends CommonAPI { * @param busId 业务id */ @GetMapping("/sys/api/updateSysAnnounReadFlag") - public void updateSysAnnounReadFlag(@RequestParam("busType") String busType, @RequestParam("busId")String busId); + void updateSysAnnounReadFlag(@RequestParam("busType") String busType, @RequestParam("busId") String busId); /** * 16查询表字典 支持过滤数据 @@ -214,14 +214,14 @@ public interface ISysBaseAPI extends CommonAPI { */ @Deprecated @GetMapping("/sys/api/queryTableDictByKeys") - public List queryTableDictByKeys(@RequestParam("table") String table, @RequestParam("text") String text, @RequestParam("code") String code, @RequestParam("keyArray") String[] keyArray); + List queryTableDictByKeys(@RequestParam("table") String table, @RequestParam("text") String text, @RequestParam("code") String code, @RequestParam("keyArray") String[] keyArray); /** * 18查询所有用户 返回ComboModel * @return */ @GetMapping("/sys/api/queryAllUserBackCombo") - public List queryAllUserBackCombo(); + List queryAllUserBackCombo(); /** * 19分页查询用户 返回JSONObject @@ -231,7 +231,7 @@ public interface ISysBaseAPI extends CommonAPI { * @return */ @GetMapping("/sys/api/queryAllUser") - public JSONObject queryAllUser(@RequestParam(name="userIds",required=false)String userIds, @RequestParam(name="pageNo",required=false) Integer pageNo,@RequestParam(name="pageSize",required=false) Integer pageSize); + JSONObject queryAllUser(@RequestParam(name = "userIds", required = false) String userIds, @RequestParam(name = "pageNo", required = false) Integer pageNo, @RequestParam(name = "pageSize", required = false) Integer pageSize); /** @@ -240,7 +240,7 @@ public interface ISysBaseAPI extends CommonAPI { * @return */ @GetMapping("/sys/api/queryAllRole") - public List queryAllRole(@RequestParam(name = "roleIds",required = false)String[] roleIds); + List queryAllRole(@RequestParam(name = "roleIds", required = false) String[] roleIds); /** * 21通过用户账号查询角色Id集合 @@ -248,7 +248,7 @@ public interface ISysBaseAPI extends CommonAPI { * @return */ @GetMapping("/sys/api/getRoleIdsByUsername") - public List getRoleIdsByUsername(@RequestParam("username")String username); + List getRoleIdsByUsername(@RequestParam("username") String username); /** * 22通过部门编号查询部门id @@ -256,14 +256,14 @@ public interface ISysBaseAPI extends CommonAPI { * @return */ @GetMapping("/sys/api/getDepartIdsByOrgCode") - public String getDepartIdsByOrgCode(@RequestParam("orgCode")String orgCode); + String getDepartIdsByOrgCode(@RequestParam("orgCode") String orgCode); /** * 23查询所有部门 * @return */ @GetMapping("/sys/api/getAllSysDepart") - public List getAllSysDepart(); + List getAllSysDepart(); /** * 24查找父级部门 @@ -279,7 +279,7 @@ public interface ISysBaseAPI extends CommonAPI { * @return */ @GetMapping("/sys/api/getDeptHeadByDepId") - public List getDeptHeadByDepId(@RequestParam("deptId") String deptId); + List getDeptHeadByDepId(@RequestParam("deptId") String deptId); /** * 26给指定用户发消息 @@ -287,7 +287,7 @@ public interface ISysBaseAPI extends CommonAPI { * @param cmd */ @GetMapping("/sys/api/sendWebSocketMsg") - public void sendWebSocketMsg(@RequestParam("userIds")String[] userIds, @RequestParam("cmd") String cmd); + void sendWebSocketMsg(@RequestParam("userIds") String[] userIds, @RequestParam("cmd") String cmd); /** * 27根据id获取所有参与用户 @@ -295,7 +295,7 @@ public interface ISysBaseAPI extends CommonAPI { * @return */ @GetMapping("/sys/api/queryAllUserByIds") - public List queryAllUserByIds(@RequestParam("userIds") String[] userIds); + List queryAllUserByIds(@RequestParam("userIds") String[] userIds); /** * 28将会议签到信息推动到预览 @@ -780,7 +780,7 @@ public interface ISysBaseAPI extends CommonAPI { * @return */ @GetMapping("/sys/api/getUserAccountsByDepCode") - public List getUserAccountsByDepCode(@RequestParam("orgCode")String orgCode); + List getUserAccountsByDepCode(@RequestParam("orgCode") String orgCode); /** * 检查查询sql的表和字段是否在白名单中 diff --git a/cpte-module-system/cpte-system-api/cpte-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/cpte-module-system/cpte-system-api/cpte-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java index 758deeb..943b4cf 100644 --- a/cpte-module-system/cpte-system-api/cpte-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java +++ b/cpte-module-system/cpte-system-api/cpte-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java @@ -131,27 +131,27 @@ public interface ISysBaseAPI extends CommonAPI { /** 11查询所有的父级字典，按照create_time排序 * @return List 字典集合 */ - public List queryAllDict(); + List queryAllDict(); /** * 12查询所有分类字典 * @return */ - public List queryAllSysCategory(); + List queryAllSysCategory(); /** * 14查询所有部门 作为字典信息 id -->value,departName -->text * @return */ - public List queryAllDepartBackDictModel(); + List queryAllDepartBackDictModel(); /** * 15根据业务类型及业务id修改消息已读 * @param busType * @param busId */ - public void updateSysAnnounReadFlag(String busType, String busId); + void updateSysAnnounReadFlag(String busType, String busId); /** * 16查询表字典 支持过滤数据 @@ -161,7 +161,7 @@ public interface ISysBaseAPI extends CommonAPI { * @param filterSql * @return */ - public List queryFilterTableDictInfo(String table, String text, String code, String filterSql); + List queryFilterTableDictInfo(String table, String text, String code, String filterSql); /** * 17查询指定table的 text code 获取字典，包含text和value @@ -172,13 +172,13 @@ public interface ISysBaseAPI extends CommonAPI { * @return */ @Deprecated - public List queryTableDictByKeys(String table, String text, String code, String[] keyArray); + List queryTableDictByKeys(String table, String text, String code, String[] keyArray); /** * 18查询所有用户 返回ComboModel * @return */ - public List queryAllUserBackCombo(); + List queryAllUserBackCombo(); /** * 19分页查询用户 返回JSONObject @@ -187,40 +187,40 @@ public interface ISysBaseAPI extends CommonAPI { * @param pageSize 每页显示条数 * @return */ - public JSONObject queryAllUser(String userIds, Integer pageNo, Integer pageSize); + JSONObject queryAllUser(String userIds, Integer pageNo, Integer pageSize); /** * 20获取所有角色 * @return */ - public List queryAllRole(); + List queryAllRole(); /** * 21获取所有角色 带参 * @param roleIds 默认选中角色 * @return */ - public List queryAllRole(String[] roleIds ); + List queryAllRole(String[] roleIds); /** * 22通过用户账号查询角色Id集合 * @param username * @return */ - public List getRoleIdsByUsername(String username); + List getRoleIdsByUsername(String username); /** * 23通过部门编号查询部门id * @param orgCode * @return */ - public String getDepartIdsByOrgCode(String orgCode); + String getDepartIdsByOrgCode(String orgCode); /** * 24查询所有部门 * @return */ - public List getAllSysDepart(); + List getAllSysDepart(); /** * 25查找父级部门 @@ -234,21 +234,21 @@ public interface ISysBaseAPI extends CommonAPI { * @param deptId * @return */ - public List getDeptHeadByDepId(String deptId); + List getDeptHeadByDepId(String deptId); /** * 27给指定用户发消息 * @param userIds * @param cmd */ - public void sendWebSocketMsg(String[] userIds, String cmd); + void sendWebSocketMsg(String[] userIds, String cmd); /** * 28根据id获取所有参与用户 * @param userIds 多个用户id * @return */ - public List queryAllUserByIds(String[] userIds); + List queryAllUserByIds(String[] userIds); /** * 29将会议签到信息推动到预览 @@ -542,7 +542,7 @@ public interface ISysBaseAPI extends CommonAPI { * @param orgCode 部门编码 * @return */ - public List getUserAccountsByDepCode(String orgCode); + List getUserAccountsByDepCode(String orgCode); /** * 检查查询sql的表和字段是否在白名单中 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/config/firewall/SqlInjection/impl/DictTableWhiteListHandlerImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/config/firewall/SqlInjection/impl/DictTableWhiteListHandlerImpl.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/config/firewall/SqlInjection/impl/DictTableWhiteListHandlerImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/config/firewall/SqlInjection/impl/DictTableWhiteListHandlerImpl.java index 80e2cd7..73db6e9 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/config/firewall/SqlInjection/impl/DictTableWhiteListHandlerImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/config/firewall/SqlInjection/impl/DictTableWhiteListHandlerImpl.java @@ -1,4 +1,4 @@ -package org.cpte.config.firewall.SqlInjection.impl; +package org.jeecg.config.firewall.SqlInjection.impl; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.constant.SymbolConstant; @@ -7,15 +7,16 @@ import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.JeecgBaseConfig; import org.jeecg.config.firewall.SqlInjection.IDictTableWhiteListHandler; import org.jeecg.config.firewall.interceptor.LowCodeModeInterceptor; -import org.cpte.modules.system.entity.SysTableWhiteList; -import org.cpte.modules.system.security.DictQueryBlackListHandler; -import org.cpte.modules.system.service.ISysTableWhiteListService; +import org.jeecg.modules.system.entity.SysTableWhiteList; +import org.jeecg.modules.system.security.DictQueryBlackListHandler; +import org.jeecg.modules.system.service.ISysTableWhiteListService; import org.jeecgframework.minidao.sqlparser.impl.vo.SelectSqlInfo; import org.jeecgframework.minidao.util.MiniDaoUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.*; /** @@ -98,7 +99,7 @@ public class DictTableWhiteListHandlerImpl implements IDictTableWhiteListHandler } try { // 针对转义字符进行解码 - dictCodeString = URLDecoder.decode(dictCodeString, "UTF-8"); + dictCodeString = URLDecoder.decode(dictCodeString, StandardCharsets.UTF_8); } catch (Exception e) { log.warn(e.getMessage()); //this.throwException("字典code解码失败，可能是使用了非法字符，请检查！"); @@ -248,7 +249,7 @@ public class DictTableWhiteListHandlerImpl implements IDictTableWhiteListHandler String tableName = arr[0].trim(); //【20230814】解决使用参数tableName=sys_user t&复测，漏洞仍然存在 if (tableName.contains(".")) { - tableName = tableName.substring(tableName.indexOf(".") + 1, tableName.length()).trim(); + tableName = tableName.substring(tableName.indexOf(".") + 1).trim(); } if (tableName.contains(" ")) { tableName = tableName.substring(0, tableName.indexOf(" ")).trim(); diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/config/init/CodeGenerateDbConfig.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/config/init/CodeGenerateDbConfig.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/config/init/CodeGenerateDbConfig.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/config/init/CodeGenerateDbConfig.java index b7ae845..8a0d170 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/config/init/CodeGenerateDbConfig.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/config/init/CodeGenerateDbConfig.java @@ -1,4 +1,4 @@ -package org.cpte.config.init; +package org.jeecg.config.init; import com.alibaba.druid.filter.config.ConfigTools; import lombok.extern.slf4j.Slf4j; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/config/init/CodeTemplateInitListener.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/config/init/CodeTemplateInitListener.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/config/init/CodeTemplateInitListener.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/config/init/CodeTemplateInitListener.java index a4887b0..0c812f4 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/config/init/CodeTemplateInitListener.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/config/init/CodeTemplateInitListener.java @@ -1,4 +1,4 @@ -package org.cpte.config.init; +package org.jeecg.config.init; import cn.hutool.core.io.FileUtil; import lombok.extern.slf4j.Slf4j; @@ -49,7 +49,7 @@ public class CodeTemplateInitListener implements ApplicationListener 0) { String token = getToken(user); - try { - content = content.replace(CommonConstant.LOGIN_TOKEN, URLEncoder.encode(token, "UTF-8")); - } catch (UnsupportedEncodingException e) { - log.error("邮件消息token编码失败", e.getMessage()); - } + content = content.replace(CommonConstant.LOGIN_TOKEN, URLEncoder.encode(token, StandardCharsets.UTF_8)); } return content; } @@ -244,7 +241,7 @@ public class EmailSendMsgHandle implements ISendMsgHandle { String token = JwtUtil.sign(user.getUsername(), user.getPassword()); redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); // 设置超时时间 1个小时 - redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 1 / 1000); + redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 1000); return token; } diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/handle/impl/QywxSendMsgHandle.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/QywxSendMsgHandle.java similarity index 83% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/handle/impl/QywxSendMsgHandle.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/QywxSendMsgHandle.java index 9137b66..cfcddb0 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/handle/impl/QywxSendMsgHandle.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/QywxSendMsgHandle.java @@ -1,9 +1,9 @@ -package org.cpte.modules.message.handle.impl; +package org.jeecg.modules.message.handle.impl; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.dto.message.MessageDTO; -import org.cpte.modules.message.handle.ISendMsgHandle; -import org.cpte.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl; +import org.jeecg.modules.message.handle.ISendMsgHandle; +import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/handle/impl/SmsSendMsgHandle.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SmsSendMsgHandle.java similarity index 75% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/handle/impl/SmsSendMsgHandle.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SmsSendMsgHandle.java index e507d5e..aa2fe96 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/handle/impl/SmsSendMsgHandle.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SmsSendMsgHandle.java @@ -1,7 +1,7 @@ -package org.cpte.modules.message.handle.impl; +package org.jeecg.modules.message.handle.impl; import lombok.extern.slf4j.Slf4j; -import org.cpte.modules.message.handle.ISendMsgHandle; +import org.jeecg.modules.message.handle.ISendMsgHandle; /** * @Description: 短信发送 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/handle/impl/SystemSendMsgHandle.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SystemSendMsgHandle.java similarity index 92% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/handle/impl/SystemSendMsgHandle.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SystemSendMsgHandle.java index c5b2125..8c8b71f 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/handle/impl/SystemSendMsgHandle.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SystemSendMsgHandle.java @@ -1,4 +1,4 @@ -package org.cpte.modules.message.handle.impl; +package org.jeecg.modules.message.handle.impl; import com.alibaba.fastjson.JSONObject; import org.jeecg.common.api.dto.message.MessageDTO; @@ -10,14 +10,14 @@ import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.constant.enums.Vue3MessageHrefEnum; -import org.cpte.modules.message.handle.ISendMsgHandle; -import org.cpte.modules.message.websocket.WebSocket; -import org.cpte.modules.system.entity.SysAnnouncement; -import org.cpte.modules.system.entity.SysAnnouncementSend; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.mapper.SysAnnouncementMapper; -import org.cpte.modules.system.mapper.SysAnnouncementSendMapper; -import org.cpte.modules.system.mapper.SysUserMapper; +import org.jeecg.modules.message.handle.ISendMsgHandle; +import org.jeecg.modules.message.websocket.WebSocket; +import org.jeecg.modules.system.entity.SysAnnouncement; +import org.jeecg.modules.system.entity.SysAnnouncementSend; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.mapper.SysAnnouncementMapper; +import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper; +import org.jeecg.modules.system.mapper.SysUserMapper; import org.springframework.stereotype.Component; import jakarta.annotation.Resource; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/handle/impl/WxSendMsgHandle.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/WxSendMsgHandle.java similarity index 76% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/handle/impl/WxSendMsgHandle.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/WxSendMsgHandle.java index 7fbbece..ee81d58 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/handle/impl/WxSendMsgHandle.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/WxSendMsgHandle.java @@ -1,7 +1,7 @@ -package org.cpte.modules.message.handle.impl; +package org.jeecg.modules.message.handle.impl; import lombok.extern.slf4j.Slf4j; -import org.cpte.modules.message.handle.ISendMsgHandle; +import org.jeecg.modules.message.handle.ISendMsgHandle; /** * @Description: 发微信消息模板 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/job/SendMsgJob.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/job/SendMsgJob.java similarity index 92% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/job/SendMsgJob.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/job/SendMsgJob.java index 0af2c1b..e70fb59 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/job/SendMsgJob.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/job/SendMsgJob.java @@ -1,13 +1,13 @@ -package org.cpte.modules.message.job; +package org.jeecg.modules.message.job; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.dto.message.MessageDTO; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.util.DateUtils; -import org.cpte.modules.message.entity.SysMessage; -import org.cpte.modules.message.handle.enums.SendMsgStatusEnum; -import org.cpte.modules.message.service.ISysMessageService; +import org.jeecg.modules.message.entity.SysMessage; +import org.jeecg.modules.message.handle.enums.SendMsgStatusEnum; +import org.jeecg.modules.message.service.ISysMessageService; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/mapper/SysMessageMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/mapper/SysMessageMapper.java similarity index 69% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/mapper/SysMessageMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/mapper/SysMessageMapper.java index 6253754..5b39b7f 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/mapper/SysMessageMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/mapper/SysMessageMapper.java @@ -1,6 +1,6 @@ -package org.cpte.modules.message.mapper; +package org.jeecg.modules.message.mapper; -import org.cpte.modules.message.entity.SysMessage; +import org.jeecg.modules.message.entity.SysMessage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/mapper/SysMessageTemplateMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/mapper/SysMessageTemplateMapper.java similarity index 84% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/mapper/SysMessageTemplateMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/mapper/SysMessageTemplateMapper.java index 62b4029..2bae52f 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/mapper/SysMessageTemplateMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/mapper/SysMessageTemplateMapper.java @@ -1,8 +1,8 @@ -package org.cpte.modules.message.mapper; +package org.jeecg.modules.message.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Select; -import org.cpte.modules.message.entity.SysMessageTemplate; +import org.jeecg.modules.message.entity.SysMessageTemplate; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysCheckRuleMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageMapper.xml similarity index 71% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysCheckRuleMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageMapper.xml index 72fffb2..a07a19a 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysCheckRuleMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/mapper/xml/SysMessageTemplateMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageTemplateMapper.xml similarity index 66% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/mapper/xml/SysMessageTemplateMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageTemplateMapper.xml index 068c2ce..e3a0006 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/mapper/xml/SysMessageTemplateMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/mapper/xml/SysMessageTemplateMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/service/ISysMessageService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/service/ISysMessageService.java similarity index 70% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/service/ISysMessageService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/service/ISysMessageService.java index 809d626..95aac85 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/service/ISysMessageService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/service/ISysMessageService.java @@ -1,7 +1,7 @@ -package org.cpte.modules.message.service; +package org.jeecg.modules.message.service; import org.jeecg.common.system.base.service.JeecgService; -import org.cpte.modules.message.entity.SysMessage; +import org.jeecg.modules.message.entity.SysMessage; /** * @Description: 消息 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/service/ISysMessageTemplateService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/service/ISysMessageTemplateService.java similarity index 80% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/service/ISysMessageTemplateService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/service/ISysMessageTemplateService.java index 5949c0e..cfb13a7 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/service/ISysMessageTemplateService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/service/ISysMessageTemplateService.java @@ -1,9 +1,9 @@ -package org.cpte.modules.message.service; +package org.jeecg.modules.message.service; import java.util.List; import org.jeecg.common.system.base.service.JeecgService; -import org.cpte.modules.message.entity.SysMessageTemplate; +import org.jeecg.modules.message.entity.SysMessageTemplate; /** * @Description: 消息模板 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/service/impl/SysMessageServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/service/impl/SysMessageServiceImpl.java similarity index 60% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/service/impl/SysMessageServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/service/impl/SysMessageServiceImpl.java index 247c0e2..338643d 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/service/impl/SysMessageServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/service/impl/SysMessageServiceImpl.java @@ -1,9 +1,9 @@ -package org.cpte.modules.message.service.impl; +package org.jeecg.modules.message.service.impl; import org.jeecg.common.system.base.service.impl.JeecgServiceImpl; -import org.cpte.modules.message.entity.SysMessage; -import org.cpte.modules.message.mapper.SysMessageMapper; -import org.cpte.modules.message.service.ISysMessageService; +import org.jeecg.modules.message.entity.SysMessage; +import org.jeecg.modules.message.mapper.SysMessageMapper; +import org.jeecg.modules.message.service.ISysMessageService; import org.springframework.stereotype.Service; /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/service/impl/SysMessageTemplateServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/service/impl/SysMessageTemplateServiceImpl.java similarity index 73% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/service/impl/SysMessageTemplateServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/service/impl/SysMessageTemplateServiceImpl.java index d8b8452..87c1ddb 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/service/impl/SysMessageTemplateServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/service/impl/SysMessageTemplateServiceImpl.java @@ -1,9 +1,9 @@ -package org.cpte.modules.message.service.impl; +package org.jeecg.modules.message.service.impl; import org.jeecg.common.system.base.service.impl.JeecgServiceImpl; -import org.cpte.modules.message.entity.SysMessageTemplate; -import org.cpte.modules.message.mapper.SysMessageTemplateMapper; -import org.cpte.modules.message.service.ISysMessageTemplateService; +import org.jeecg.modules.message.entity.SysMessageTemplate; +import org.jeecg.modules.message.mapper.SysMessageTemplateMapper; +import org.jeecg.modules.message.service.ISysMessageTemplateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/util/PushMsgUtil.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/util/PushMsgUtil.java similarity index 85% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/util/PushMsgUtil.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/util/PushMsgUtil.java index 6a6816c..800cafa 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/util/PushMsgUtil.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/util/PushMsgUtil.java @@ -1,13 +1,13 @@ -package org.cpte.modules.message.util; +package org.jeecg.modules.message.util; import freemarker.template.Configuration; import freemarker.template.Template; import freemarker.template.TemplateException; -import org.cpte.modules.message.entity.SysMessage; -import org.cpte.modules.message.entity.SysMessageTemplate; -import org.cpte.modules.message.handle.enums.SendMsgStatusEnum; -import org.cpte.modules.message.service.ISysMessageService; -import org.cpte.modules.message.service.ISysMessageTemplateService; +import org.jeecg.modules.message.entity.SysMessage; +import org.jeecg.modules.message.entity.SysMessageTemplate; +import org.jeecg.modules.message.handle.enums.SendMsgStatusEnum; +import org.jeecg.modules.message.service.ISysMessageService; +import org.jeecg.modules.message.service.ISysMessageTemplateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -71,9 +71,7 @@ public class PushMsgUtil { sysMessage.setEsSendTime(new Date()); sysMessage.setEsSendStatus(SendMsgStatusEnum.WAIT.getCode()); sysMessage.setEsSendNum(0); - if(sysMessageService.save(sysMessage)) { - return true; - } + return sysMessageService.save(sysMessage); } return false; } diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/websocket/SocketHandler.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/websocket/SocketHandler.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/websocket/SocketHandler.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/websocket/SocketHandler.java index 23d9b3a..1cbe8b7 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/websocket/SocketHandler.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/websocket/SocketHandler.java @@ -1,4 +1,4 @@ -package org.cpte.modules.message.websocket; +package org.jeecg.modules.message.websocket; import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/websocket/WebSocket.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/websocket/WebSocket.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/websocket/WebSocket.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/websocket/WebSocket.java index 4374dc4..889d36f 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/message/websocket/WebSocket.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/message/websocket/WebSocket.java @@ -1,4 +1,4 @@ -package org.cpte.modules.message.websocket; +package org.jeecg.modules.message.websocket; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j; public class WebSocket { /**线程安全Map*/ - private static ConcurrentHashMap sessionPool = new ConcurrentHashMap<>(); + private static final ConcurrentHashMap sessionPool = new ConcurrentHashMap<>(); /** * Redis触发监听名字 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/actuator/CustomActuatorConfig.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/actuator/CustomActuatorConfig.java similarity index 91% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/actuator/CustomActuatorConfig.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/actuator/CustomActuatorConfig.java index a951ce2..a7c85b0 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/actuator/CustomActuatorConfig.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/actuator/CustomActuatorConfig.java @@ -1,6 +1,6 @@ -package org.cpte.modules.monitor.actuator; +package org.jeecg.modules.monitor.actuator; -import org.cpte.modules.monitor.actuator.httptrace.CustomInMemoryHttpTraceRepository; +import org.jeecg.modules.monitor.actuator.httptrace.CustomInMemoryHttpTraceRepository; import org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesProperties; import org.springframework.boot.actuate.web.exchanges.HttpExchangeRepository; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/actuator/httptrace/CustomHttpTraceEndpoint.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/actuator/httptrace/CustomHttpTraceEndpoint.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/actuator/httptrace/CustomHttpTraceEndpoint.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/actuator/httptrace/CustomHttpTraceEndpoint.java index 48b38c4..71aebfc 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/actuator/httptrace/CustomHttpTraceEndpoint.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/actuator/httptrace/CustomHttpTraceEndpoint.java @@ -1,4 +1,4 @@ -package org.cpte.modules.monitor.actuator.httptrace; +package org.jeecg.modules.monitor.actuator.httptrace; import lombok.Getter; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/actuator/httptrace/CustomInMemoryHttpTraceRepository.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/actuator/httptrace/CustomInMemoryHttpTraceRepository.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/actuator/httptrace/CustomInMemoryHttpTraceRepository.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/actuator/httptrace/CustomInMemoryHttpTraceRepository.java index f6e01cc..c9816fc 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/actuator/httptrace/CustomInMemoryHttpTraceRepository.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/actuator/httptrace/CustomInMemoryHttpTraceRepository.java @@ -1,4 +1,4 @@ -package org.cpte.modules.monitor.actuator.httptrace; +package org.jeecg.modules.monitor.actuator.httptrace; import org.springframework.boot.actuate.web.exchanges.HttpExchange; import org.springframework.boot.actuate.web.exchanges.InMemoryHttpExchangeRepository; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/actuator/undertow/CustomUndertowMetricsHandler.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/actuator/undertow/CustomUndertowMetricsHandler.java similarity index 100% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/actuator/undertow/CustomUndertowMetricsHandler.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/actuator/undertow/CustomUndertowMetricsHandler.java diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/controller/ActuatorMemoryController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/controller/ActuatorMemoryController.java similarity index 88% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/controller/ActuatorMemoryController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/controller/ActuatorMemoryController.java index 3f1fe34..2682e7e 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/controller/ActuatorMemoryController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/controller/ActuatorMemoryController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.monitor.controller; +package org.jeecg.modules.monitor.controller; import cn.hutool.core.util.NumberUtil; import lombok.extern.slf4j.Slf4j; @@ -37,9 +37,8 @@ public class ActuatorMemoryController { result.put("memory.runtime.usage", NumberUtil.div(runtime.totalMemory() - runtime.freeMemory(), runtime.totalMemory())); //update-begin---author:chenrui ---date:20240705 for：[TV360X-1695]内存信息-立即更新 功能报错 #6635------------ OperatingSystemMXBean operatingSystemMXBean = ManagementFactory.getOperatingSystemMXBean(); - if (operatingSystemMXBean instanceof com.sun.management.OperatingSystemMXBean) { - com.sun.management.OperatingSystemMXBean opBean = (com.sun.management.OperatingSystemMXBean) operatingSystemMXBean; -// JSONObject operatingSystemJson = JSONObject.parseObject(JSONObject.toJSONString(operatingSystemMXBean)); + if (operatingSystemMXBean instanceof com.sun.management.OperatingSystemMXBean opBean) { + // JSONObject operatingSystemJson = JSONObject.parseObject(JSONObject.toJSONString(operatingSystemMXBean)); long totalPhysicalMemory = opBean.getTotalPhysicalMemorySize(); long freePhysicalMemory = opBean.getFreePhysicalMemorySize(); long usedPhysicalMemory = totalPhysicalMemory - freePhysicalMemory; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/controller/ActuatorRedisController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/controller/ActuatorRedisController.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/controller/ActuatorRedisController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/controller/ActuatorRedisController.java index 32d3c7d..643269f 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/controller/ActuatorRedisController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/controller/ActuatorRedisController.java @@ -1,10 +1,10 @@ -package org.cpte.modules.monitor.controller; +package org.jeecg.modules.monitor.controller; import com.alibaba.fastjson.JSONArray; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; -import org.cpte.modules.monitor.domain.RedisInfo; -import org.cpte.modules.monitor.service.RedisService; +import org.jeecg.modules.monitor.domain.RedisInfo; +import org.jeecg.modules.monitor.service.RedisService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/domain/RedisInfo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/domain/RedisInfo.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/domain/RedisInfo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/domain/RedisInfo.java index 39cadc8..6c2da85 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/domain/RedisInfo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/domain/RedisInfo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.monitor.domain; +package org.jeecg.modules.monitor.domain; import java.util.HashMap; import java.util.Map; @@ -9,7 +9,7 @@ import java.util.Map; */ public class RedisInfo { - private static Map map = new HashMap(5); + private static final Map map = new HashMap(5); static { map.put("redis_version", "Redis 服务器版本"); diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/exception/RedisConnectException.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/exception/RedisConnectException.java similarity index 85% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/exception/RedisConnectException.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/exception/RedisConnectException.java index 411aad4..9b3a882 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/exception/RedisConnectException.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/exception/RedisConnectException.java @@ -1,4 +1,4 @@ -package org.cpte.modules.monitor.exception; +package org.jeecg.modules.monitor.exception; /** * Redis 连接异常 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/service/RedisService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/service/RedisService.java similarity index 86% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/service/RedisService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/service/RedisService.java index 0d0abb8..80a091e 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/service/RedisService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/service/RedisService.java @@ -1,11 +1,11 @@ -package org.cpte.modules.monitor.service; +package org.jeecg.modules.monitor.service; import java.util.List; import java.util.Map; import com.alibaba.fastjson.JSONArray; -import org.cpte.modules.monitor.domain.RedisInfo; -import org.cpte.modules.monitor.exception.RedisConnectException; +import org.jeecg.modules.monitor.domain.RedisInfo; +import org.jeecg.modules.monitor.exception.RedisConnectException; /** * @Description: redis信息service接口 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/service/impl/MailHealthIndicator.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/service/impl/MailHealthIndicator.java similarity index 93% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/service/impl/MailHealthIndicator.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/service/impl/MailHealthIndicator.java index 4c7228e..ea86410 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/service/impl/MailHealthIndicator.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/service/impl/MailHealthIndicator.java @@ -1,4 +1,4 @@ -package org.cpte.modules.monitor.service.impl; +package org.jeecg.modules.monitor.service.impl; import org.springframework.boot.actuate.health.Health; import org.springframework.boot.actuate.health.HealthIndicator; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/service/impl/RedisServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/service/impl/RedisServiceImpl.java similarity index 94% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/service/impl/RedisServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/service/impl/RedisServiceImpl.java index 596fb96..8b08faa 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/monitor/service/impl/RedisServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/monitor/service/impl/RedisServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.monitor.service.impl; +package org.jeecg.modules.monitor.service.impl; import java.util.*; @@ -9,9 +9,9 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Maps; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.monitor.domain.RedisInfo; -import org.cpte.modules.monitor.exception.RedisConnectException; -import org.cpte.modules.monitor.service.RedisService; +import org.jeecg.modules.monitor.domain.RedisInfo; +import org.jeecg.modules.monitor.exception.RedisConnectException; +import org.jeecg.modules.monitor.service.RedisService; import org.springframework.cglib.beans.BeanMap; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.scheduling.annotation.Scheduled; @@ -65,7 +65,7 @@ public class RedisServiceImpl implements RedisService { map.put("create_time", System.currentTimeMillis()); map.put("dbSize", dbSize); - log.debug("--getKeysSize--: " + map.toString()); + log.debug("--getKeysSize--: " + map); return map; } diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/ngalain/aop/LogRecordAspect.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java similarity index 100% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/ngalain/aop/LogRecordAspect.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/ngalain/controller/NgAlainController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java similarity index 100% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/ngalain/controller/NgAlainController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/ngalain/service/NgAlainService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/ngalain/service/NgAlainService.java similarity index 100% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/ngalain/service/NgAlainService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/ngalain/service/NgAlainService.java diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/ngalain/service/impl/NgAlainServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java similarity index 100% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/ngalain/service/impl/NgAlainServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/controller/OpenApiAuthController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiAuthController.java similarity index 93% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/controller/OpenApiAuthController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiAuthController.java index b5a7a87..fec2ec7 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/controller/OpenApiAuthController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiAuthController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.controller; +package org.jeecg.modules.openapi.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; -import org.cpte.modules.openapi.entity.OpenApiAuth; -import org.cpte.modules.openapi.generator.AKSKGenerator; -import org.cpte.modules.openapi.service.OpenApiAuthService; +import org.jeecg.modules.openapi.entity.OpenApiAuth; +import org.jeecg.modules.openapi.generator.AKSKGenerator; +import org.jeecg.modules.openapi.service.OpenApiAuthService; import org.springframework.web.bind.annotation.*; import jakarta.servlet.http.HttpServletRequest; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/controller/OpenApiController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiController.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/controller/OpenApiController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiController.java index 6b60696..e9d7ca2 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/controller/OpenApiController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.controller; +package org.jeecg.modules.openapi.controller; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; @@ -7,8 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Lists; -import org.cpte.modules.openapi.swagger.*; -import org.cpte.modules.openapi.swagger.*; +import org.jeecg.modules.openapi.swagger.*; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.base.controller.JeecgController; @@ -16,15 +15,16 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.RestUtil; -import org.cpte.modules.openapi.entity.OpenApi; -import org.cpte.modules.openapi.entity.OpenApiAuth; -import org.cpte.modules.openapi.entity.OpenApiHeader; -import org.cpte.modules.openapi.entity.OpenApiParam; -import org.cpte.modules.openapi.generator.PathGenerator; -import org.cpte.modules.openapi.service.OpenApiAuthService; -import org.cpte.modules.openapi.service.OpenApiService; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.service.ISysUserService; +import org.jeecg.modules.openapi.entity.OpenApi; +import org.jeecg.modules.openapi.entity.OpenApiAuth; +import org.jeecg.modules.openapi.entity.OpenApiHeader; +import org.jeecg.modules.openapi.entity.OpenApiParam; +import org.jeecg.modules.openapi.generator.PathGenerator; +import org.jeecg.modules.openapi.service.OpenApiAuthService; +import org.jeecg.modules.openapi.service.OpenApiService; +import org.jeecg.modules.openapi.swagger.*; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/controller/OpenApiIndexController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiIndexController.java similarity index 93% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/controller/OpenApiIndexController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiIndexController.java index 2122783..36fcba8 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/controller/OpenApiIndexController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiIndexController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.controller; +package org.jeecg.modules.openapi.controller; import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.IgnoreAuth; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/controller/OpenApiLogController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiLogController.java similarity index 94% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/controller/OpenApiLogController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiLogController.java index 8dd6437..6ca5e03 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/controller/OpenApiLogController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiLogController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.controller; +package org.jeecg.modules.openapi.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; -import org.cpte.modules.openapi.entity.OpenApiLog; -import org.cpte.modules.openapi.service.OpenApiLogService; +import org.jeecg.modules.openapi.entity.OpenApiLog; +import org.jeecg.modules.openapi.service.OpenApiLogService; import org.springframework.web.bind.annotation.*; import jakarta.servlet.http.HttpServletRequest; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/controller/OpenApiPermissionController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiPermissionController.java similarity index 78% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/controller/OpenApiPermissionController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiPermissionController.java index d39b760..9f4d3a4 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/controller/OpenApiPermissionController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiPermissionController.java @@ -1,9 +1,9 @@ -package org.cpte.modules.openapi.controller; +package org.jeecg.modules.openapi.controller; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; -import org.cpte.modules.openapi.entity.OpenApiPermission; -import org.cpte.modules.openapi.service.OpenApiPermissionService; +import org.jeecg.modules.openapi.entity.OpenApiPermission; +import org.jeecg.modules.openapi.service.OpenApiPermissionService; import org.springframework.web.bind.annotation.*; @RestController diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/entity/OpenApi.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApi.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/entity/OpenApi.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApi.java index 0a7082f..05b4fe7 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/entity/OpenApi.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApi.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.entity; +package org.jeecg.modules.openapi.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/entity/OpenApiAuth.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiAuth.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/entity/OpenApiAuth.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiAuth.java index 894bc6a..c95963a 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/entity/OpenApiAuth.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiAuth.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.entity; +package org.jeecg.modules.openapi.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/entity/OpenApiHeader.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiHeader.java similarity index 93% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/entity/OpenApiHeader.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiHeader.java index 1cb4911..48ec9a0 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/entity/OpenApiHeader.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiHeader.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.entity; +package org.jeecg.modules.openapi.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/entity/OpenApiLog.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiLog.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/entity/OpenApiLog.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiLog.java index 23b27ab..80d2c26 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/entity/OpenApiLog.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiLog.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.entity; +package org.jeecg.modules.openapi.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/entity/OpenApiParam.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiParam.java similarity index 93% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/entity/OpenApiParam.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiParam.java index b3b590c..cd042b4 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/entity/OpenApiParam.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiParam.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.entity; +package org.jeecg.modules.openapi.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/entity/OpenApiPermission.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiPermission.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/entity/OpenApiPermission.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiPermission.java index 8dc911d..661b149 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/entity/OpenApiPermission.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/entity/OpenApiPermission.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.entity; +package org.jeecg.modules.openapi.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/filter/ApiAuthFilter.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/filter/ApiAuthFilter.java similarity index 91% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/filter/ApiAuthFilter.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/filter/ApiAuthFilter.java index 1104d64..1b6cd2a 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/filter/ApiAuthFilter.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/filter/ApiAuthFilter.java @@ -1,21 +1,22 @@ -package org.cpte.modules.openapi.filter; +package org.jeecg.modules.openapi.filter; import jakarta.servlet.*; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.exception.JeecgBootException; -import org.cpte.modules.openapi.entity.OpenApi; -import org.cpte.modules.openapi.entity.OpenApiAuth; -import org.cpte.modules.openapi.entity.OpenApiLog; -import org.cpte.modules.openapi.entity.OpenApiPermission; -import org.cpte.modules.openapi.service.OpenApiAuthService; -import org.cpte.modules.openapi.service.OpenApiLogService; -import org.cpte.modules.openapi.service.OpenApiPermissionService; -import org.cpte.modules.openapi.service.OpenApiService; +import org.jeecg.modules.openapi.entity.OpenApi; +import org.jeecg.modules.openapi.entity.OpenApiAuth; +import org.jeecg.modules.openapi.entity.OpenApiLog; +import org.jeecg.modules.openapi.entity.OpenApiPermission; +import org.jeecg.modules.openapi.service.OpenApiAuthService; +import org.jeecg.modules.openapi.service.OpenApiLogService; +import org.jeecg.modules.openapi.service.OpenApiPermissionService; +import org.jeecg.modules.openapi.service.OpenApiService; import org.springframework.util.StringUtils; import org.springframework.web.context.WebApplicationContext; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.util.Arrays; import java.util.Date; @@ -169,7 +170,7 @@ public class ApiAuthFilter implements Filter { String result = ""; try { MessageDigest md = MessageDigest.getInstance("MD5"); - md.update(sourceStr.getBytes("utf-8")); + md.update(sourceStr.getBytes(StandardCharsets.UTF_8)); byte[] hash = md.digest(); int i; StringBuffer buf = new StringBuffer(32); diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/filter/ApiFilterConfig.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/filter/ApiFilterConfig.java similarity index 94% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/filter/ApiFilterConfig.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/filter/ApiFilterConfig.java index ba54f70..bac823f 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/filter/ApiFilterConfig.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/filter/ApiFilterConfig.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.filter; +package org.jeecg.modules.openapi.filter; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/generator/AKSKGenerator.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/generator/AKSKGenerator.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/generator/AKSKGenerator.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/generator/AKSKGenerator.java index 22a583e..c93069c 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/generator/AKSKGenerator.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/generator/AKSKGenerator.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.generator; +package org.jeecg.modules.openapi.generator; import java.security.SecureRandom; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/generator/PathGenerator.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/generator/PathGenerator.java similarity index 93% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/generator/PathGenerator.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/generator/PathGenerator.java index edba0c3..eaf5e53 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/generator/PathGenerator.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/generator/PathGenerator.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.generator; +package org.jeecg.modules.openapi.generator; import lombok.experimental.UtilityClass; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/mapper/OpenApiAuthMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/mapper/OpenApiAuthMapper.java similarity index 69% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/mapper/OpenApiAuthMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/mapper/OpenApiAuthMapper.java index e379b3a..4ec70f1 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/mapper/OpenApiAuthMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/mapper/OpenApiAuthMapper.java @@ -1,8 +1,8 @@ -package org.cpte.modules.openapi.mapper; +package org.jeecg.modules.openapi.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.cpte.modules.openapi.entity.OpenApiAuth; +import org.jeecg.modules.openapi.entity.OpenApiAuth; /** * @date 2024/12/10 9:49 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/mapper/OpenApiLogMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/mapper/OpenApiLogMapper.java similarity index 69% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/mapper/OpenApiLogMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/mapper/OpenApiLogMapper.java index 0361241..8035085 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/mapper/OpenApiLogMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/mapper/OpenApiLogMapper.java @@ -1,8 +1,8 @@ -package org.cpte.modules.openapi.mapper; +package org.jeecg.modules.openapi.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.cpte.modules.openapi.entity.OpenApiLog; +import org.jeecg.modules.openapi.entity.OpenApiLog; /** * @date 2024/12/10 9:50 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/mapper/OpenApiMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/mapper/OpenApiMapper.java similarity index 65% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/mapper/OpenApiMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/mapper/OpenApiMapper.java index 1fb2837..f9a4b67 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/mapper/OpenApiMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/mapper/OpenApiMapper.java @@ -1,8 +1,8 @@ -package org.cpte.modules.openapi.mapper; +package org.jeecg.modules.openapi.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.cpte.modules.openapi.entity.OpenApi; +import org.jeecg.modules.openapi.entity.OpenApi; @Mapper public interface OpenApiMapper extends BaseMapper { diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/mapper/OpenApiPermissionMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/mapper/OpenApiPermissionMapper.java similarity index 69% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/mapper/OpenApiPermissionMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/mapper/OpenApiPermissionMapper.java index 0c4c69b..18f246c 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/mapper/OpenApiPermissionMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/mapper/OpenApiPermissionMapper.java @@ -1,8 +1,8 @@ -package org.cpte.modules.openapi.mapper; +package org.jeecg.modules.openapi.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.cpte.modules.openapi.entity.OpenApiPermission; +import org.jeecg.modules.openapi.entity.OpenApiPermission; /** * @date 2024/12/19 17:43 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/OpenApiAuthService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/OpenApiAuthService.java similarity index 68% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/OpenApiAuthService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/OpenApiAuthService.java index 052100e..011513f 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/OpenApiAuthService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/OpenApiAuthService.java @@ -1,7 +1,7 @@ -package org.cpte.modules.openapi.service; +package org.jeecg.modules.openapi.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.openapi.entity.OpenApiAuth; +import org.jeecg.modules.openapi.entity.OpenApiAuth; /** * @date 2024/12/10 9:50 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/OpenApiLogService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/OpenApiLogService.java similarity index 63% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/OpenApiLogService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/OpenApiLogService.java index 8e9dead..929d509 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/OpenApiLogService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/OpenApiLogService.java @@ -1,7 +1,7 @@ -package org.cpte.modules.openapi.service; +package org.jeecg.modules.openapi.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.openapi.entity.OpenApiLog; +import org.jeecg.modules.openapi.entity.OpenApiLog; /** * @date 2024/12/10 9:51 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/OpenApiPermissionService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/OpenApiPermissionService.java similarity index 79% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/OpenApiPermissionService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/OpenApiPermissionService.java index 519f829..22babd6 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/OpenApiPermissionService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/OpenApiPermissionService.java @@ -1,8 +1,8 @@ -package org.cpte.modules.openapi.service; +package org.jeecg.modules.openapi.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; -import org.cpte.modules.openapi.entity.OpenApiPermission; +import org.jeecg.modules.openapi.entity.OpenApiPermission; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/OpenApiService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/OpenApiService.java similarity index 63% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/OpenApiService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/OpenApiService.java index 0df9b88..8b58889 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/OpenApiService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/OpenApiService.java @@ -1,7 +1,7 @@ -package org.cpte.modules.openapi.service; +package org.jeecg.modules.openapi.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.openapi.entity.OpenApi; +import org.jeecg.modules.openapi.entity.OpenApi; public interface OpenApiService extends IService { OpenApi findByPath(String path); diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/impl/OpenApiAuthServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/impl/OpenApiAuthServiceImpl.java similarity index 70% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/impl/OpenApiAuthServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/impl/OpenApiAuthServiceImpl.java index 44c3484..549994a 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/impl/OpenApiAuthServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/impl/OpenApiAuthServiceImpl.java @@ -1,10 +1,10 @@ -package org.cpte.modules.openapi.service.impl; +package org.jeecg.modules.openapi.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.cpte.modules.openapi.entity.OpenApiAuth; -import org.cpte.modules.openapi.mapper.OpenApiAuthMapper; -import org.cpte.modules.openapi.service.OpenApiAuthService; +import org.jeecg.modules.openapi.entity.OpenApiAuth; +import org.jeecg.modules.openapi.mapper.OpenApiAuthMapper; +import org.jeecg.modules.openapi.service.OpenApiAuthService; import org.springframework.stereotype.Service; /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/impl/OpenApiLogServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/impl/OpenApiLogServiceImpl.java similarity index 55% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/impl/OpenApiLogServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/impl/OpenApiLogServiceImpl.java index 907dde1..c723b7f 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/impl/OpenApiLogServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/impl/OpenApiLogServiceImpl.java @@ -1,9 +1,9 @@ -package org.cpte.modules.openapi.service.impl; +package org.jeecg.modules.openapi.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.cpte.modules.openapi.entity.OpenApiLog; -import org.cpte.modules.openapi.mapper.OpenApiLogMapper; -import org.cpte.modules.openapi.service.OpenApiLogService; +import org.jeecg.modules.openapi.entity.OpenApiLog; +import org.jeecg.modules.openapi.mapper.OpenApiLogMapper; +import org.jeecg.modules.openapi.service.OpenApiLogService; import org.springframework.stereotype.Service; /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/impl/OpenApiPermissionServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/impl/OpenApiPermissionServiceImpl.java similarity index 88% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/impl/OpenApiPermissionServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/impl/OpenApiPermissionServiceImpl.java index db6cb2b..001ed4e 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/impl/OpenApiPermissionServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/impl/OpenApiPermissionServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.service.impl; +package org.jeecg.modules.openapi.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; @@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.Resource; import org.jeecg.common.api.vo.Result; -import org.cpte.modules.openapi.entity.OpenApi; -import org.cpte.modules.openapi.entity.OpenApiPermission; -import org.cpte.modules.openapi.mapper.OpenApiPermissionMapper; -import org.cpte.modules.openapi.service.OpenApiPermissionService; -import org.cpte.modules.openapi.service.OpenApiService; +import org.jeecg.modules.openapi.entity.OpenApi; +import org.jeecg.modules.openapi.entity.OpenApiPermission; +import org.jeecg.modules.openapi.mapper.OpenApiPermissionMapper; +import org.jeecg.modules.openapi.service.OpenApiPermissionService; +import org.jeecg.modules.openapi.service.OpenApiService; import org.springframework.stereotype.Service; import java.util.Arrays; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/impl/OpenApiServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/impl/OpenApiServiceImpl.java similarity index 69% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/impl/OpenApiServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/impl/OpenApiServiceImpl.java index a098b9e..7c72d52 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/service/impl/OpenApiServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/service/impl/OpenApiServiceImpl.java @@ -1,10 +1,10 @@ -package org.cpte.modules.openapi.service.impl; +package org.jeecg.modules.openapi.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.cpte.modules.openapi.entity.OpenApi; -import org.cpte.modules.openapi.mapper.OpenApiMapper; -import org.cpte.modules.openapi.service.OpenApiService; +import org.jeecg.modules.openapi.entity.OpenApi; +import org.jeecg.modules.openapi.mapper.OpenApiMapper; +import org.jeecg.modules.openapi.service.OpenApiService; import org.springframework.stereotype.Service; @Service diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerDefinition.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerDefinition.java similarity index 82% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerDefinition.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerDefinition.java index c5fb6d2..eaf9e15 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerDefinition.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerDefinition.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.swagger; +package org.jeecg.modules.openapi.swagger; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerDefinitionProperties.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerDefinitionProperties.java similarity index 81% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerDefinitionProperties.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerDefinitionProperties.java index 66d4f80..51ac514 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerDefinitionProperties.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerDefinitionProperties.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.swagger; +package org.jeecg.modules.openapi.swagger; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerInfo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerInfo.java similarity index 87% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerInfo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerInfo.java index e8e5158..e2ca846 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerInfo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerInfo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.swagger; +package org.jeecg.modules.openapi.swagger; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerInfoContact.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerInfoContact.java similarity index 73% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerInfoContact.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerInfoContact.java index 920e8c1..c46d17c 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerInfoContact.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerInfoContact.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.swagger; +package org.jeecg.modules.openapi.swagger; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerInfoLicense.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerInfoLicense.java similarity index 77% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerInfoLicense.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerInfoLicense.java index d36b4ab..fc4b68b 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerInfoLicense.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerInfoLicense.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.swagger; +package org.jeecg.modules.openapi.swagger; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerModel.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerModel.java similarity index 91% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerModel.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerModel.java index 8a16c0a..dd0b732 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerModel.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerModel.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.swagger; +package org.jeecg.modules.openapi.swagger; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerOperation.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerOperation.java similarity index 90% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerOperation.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerOperation.java index cb3a239..3fe6f89 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerOperation.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerOperation.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.swagger; +package org.jeecg.modules.openapi.swagger; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerOperationParameter.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerOperationParameter.java similarity index 86% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerOperationParameter.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerOperationParameter.java index 4e0b5ed..dac52a9 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerOperationParameter.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerOperationParameter.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.swagger; +package org.jeecg.modules.openapi.swagger; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerOperationResponse.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerOperationResponse.java similarity index 82% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerOperationResponse.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerOperationResponse.java index d81232f..cb749d3 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerOperationResponse.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerOperationResponse.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.swagger; +package org.jeecg.modules.openapi.swagger; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerSchema.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerSchema.java similarity index 83% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerSchema.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerSchema.java index 1659742..ef9a0d0 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerSchema.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerSchema.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.swagger; +package org.jeecg.modules.openapi.swagger; /** * @date 2025/1/26 11:51 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerTag.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerTag.java similarity index 72% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerTag.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerTag.java index d343513..f0281e5 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/openapi/swagger/SwaggerTag.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/openapi/swagger/SwaggerTag.java @@ -1,4 +1,4 @@ -package org.cpte.modules.openapi.swagger; +package org.jeecg.modules.openapi.swagger; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/oss/controller/OssFileController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/oss/controller/OssFileController.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/oss/controller/OssFileController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/oss/controller/OssFileController.java index 43fced3..f8740e6 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/oss/controller/OssFileController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/oss/controller/OssFileController.java @@ -1,12 +1,12 @@ -package org.cpte.modules.oss.controller; +package org.jeecg.modules.oss.controller; import jakarta.servlet.http.HttpServletRequest; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.cpte.modules.oss.entity.OssFile; -import org.cpte.modules.oss.service.IOssFileService; +import org.jeecg.modules.oss.entity.OssFile; +import org.jeecg.modules.oss.service.IOssFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/oss/entity/OssFile.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/oss/entity/OssFile.java similarity index 94% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/oss/entity/OssFile.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/oss/entity/OssFile.java index 1de0d89..8632346 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/oss/entity/OssFile.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/oss/entity/OssFile.java @@ -1,4 +1,4 @@ -package org.cpte.modules.oss.entity; +package org.jeecg.modules.oss.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/oss/mapper/OssFileMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/oss/mapper/OssFileMapper.java similarity index 68% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/oss/mapper/OssFileMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/oss/mapper/OssFileMapper.java index 6707a05..a3f1352 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/oss/mapper/OssFileMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/oss/mapper/OssFileMapper.java @@ -1,7 +1,7 @@ -package org.cpte.modules.oss.mapper; +package org.jeecg.modules.oss.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.cpte.modules.oss.entity.OssFile; +import org.jeecg.modules.oss.entity.OssFile; /** * @Description: oss云存储Mapper diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/oss/service/IOssFileService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/oss/service/IOssFileService.java similarity index 86% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/oss/service/IOssFileService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/oss/service/IOssFileService.java index aec437c..e74e3ea 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/oss/service/IOssFileService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/oss/service/IOssFileService.java @@ -1,9 +1,9 @@ -package org.cpte.modules.oss.service; +package org.jeecg.modules.oss.service; import java.io.IOException; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.oss.entity.OssFile; +import org.jeecg.modules.oss.entity.OssFile; import org.springframework.web.multipart.MultipartFile; /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/oss/service/impl/OssFileServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/oss/service/impl/OssFileServiceImpl.java similarity index 89% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/oss/service/impl/OssFileServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/oss/service/impl/OssFileServiceImpl.java index fc9b251..f302400 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/oss/service/impl/OssFileServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/oss/service/impl/OssFileServiceImpl.java @@ -1,13 +1,13 @@ -package org.cpte.modules.oss.service.impl; +package org.jeecg.modules.oss.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.CommonUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oss.OssBootUtil; -import org.cpte.modules.oss.entity.OssFile; -import org.cpte.modules.oss.mapper.OssFileMapper; -import org.cpte.modules.oss.service.IOssFileService; +import org.jeecg.modules.oss.entity.OssFile; +import org.jeecg.modules.oss.mapper.OssFileMapper; +import org.jeecg.modules.oss.service.IOssFileService; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/controller/QuartzJobController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/controller/QuartzJobController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java index 2c2413b..11de057 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/controller/QuartzJobController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.quartz.controller; +package org.jeecg.modules.quartz.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,8 +15,8 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.ImportExcelUtil; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.quartz.entity.QuartzJob; -import org.cpte.modules.quartz.service.IQuartzJobService; +import org.jeecg.modules.quartz.entity.QuartzJob; +import org.jeecg.modules.quartz.service.IQuartzJobService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -138,7 +138,7 @@ public class QuartzJobController { if (ids == null || "".equals(ids.trim())) { return Result.error("参数不识别！"); } - for (String id : Arrays.asList(ids.split(SymbolConstant.COMMA))) { + for (String id : ids.split(SymbolConstant.COMMA)) { QuartzJob job = quartzJobService.getById(id); quartzJobService.deleteAndStopJob(job); } diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/entity/QuartzJob.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/entity/QuartzJob.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java index 8d57707..382b559 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/entity/QuartzJob.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java @@ -1,4 +1,4 @@ -package org.cpte.modules.quartz.entity; +package org.jeecg.modules.quartz.entity; import java.io.Serializable; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/job/AsyncJob.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/job/AsyncJob.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/job/AsyncJob.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/job/AsyncJob.java index 52d3c6a..61b9dcf 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/job/AsyncJob.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/job/AsyncJob.java @@ -1,4 +1,4 @@ -package org.cpte.modules.quartz.job; +package org.jeecg.modules.quartz.job; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.util.DateUtils; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/job/SampleJob.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleJob.java similarity index 93% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/job/SampleJob.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleJob.java index 6300362..db37777 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/job/SampleJob.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleJob.java @@ -1,4 +1,4 @@ -package org.cpte.modules.quartz.job; +package org.jeecg.modules.quartz.job; import org.jeecg.common.util.DateUtils; import org.quartz.Job; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/job/SampleParamJob.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/job/SampleParamJob.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java index a0f96ea..db2a71c 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/job/SampleParamJob.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java @@ -1,4 +1,4 @@ -package org.cpte.modules.quartz.job; +package org.jeecg.modules.quartz.job; import org.jeecg.common.util.DateUtils; import org.quartz.Job; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/mapper/QuartzJobMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/QuartzJobMapper.java similarity index 69% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/mapper/QuartzJobMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/QuartzJobMapper.java index 47c5edc..9df1171 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/mapper/QuartzJobMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/QuartzJobMapper.java @@ -1,9 +1,9 @@ -package org.cpte.modules.quartz.mapper; +package org.jeecg.modules.quartz.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.cpte.modules.quartz.entity.QuartzJob; +import org.jeecg.modules.quartz.entity.QuartzJob; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -20,6 +20,6 @@ public interface QuartzJobMapper extends BaseMapper { * @param jobClassName 任务类名 * @return */ - public List findByJobClassName(@Param("jobClassName") String jobClassName); + List findByJobClassName(@Param("jobClassName") String jobClassName); } diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/mapper/xml/QuartzJobMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/QuartzJobMapper.xml similarity index 63% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/mapper/xml/QuartzJobMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/QuartzJobMapper.xml index b00d3dd..2f6f0a0 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/mapper/xml/QuartzJobMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/QuartzJobMapper.xml @@ -1,9 +1,9 @@ - + - select * from sys_quartz_job where job_class_name = #{jobClassName} \ No newline at end of file diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/service/IQuartzJobService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/service/IQuartzJobService.java similarity index 93% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/service/IQuartzJobService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/service/IQuartzJobService.java index 5f8dcc0..be44a8c 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/service/IQuartzJobService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/service/IQuartzJobService.java @@ -1,8 +1,8 @@ -package org.cpte.modules.quartz.service; +package org.jeecg.modules.quartz.service; import java.util.List; -import org.cpte.modules.quartz.entity.QuartzJob; +import org.jeecg.modules.quartz.entity.QuartzJob; import org.quartz.SchedulerException; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/service/impl/QuartzJobServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/service/impl/QuartzJobServiceImpl.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/service/impl/QuartzJobServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/service/impl/QuartzJobServiceImpl.java index 379cbc9..6a4628b 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/quartz/service/impl/QuartzJobServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/quartz/service/impl/QuartzJobServiceImpl.java @@ -1,13 +1,13 @@ -package org.cpte.modules.quartz.service.impl; +package org.jeecg.modules.quartz.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.DateUtils; -import org.cpte.modules.quartz.entity.QuartzJob; -import org.cpte.modules.quartz.mapper.QuartzJobMapper; -import org.cpte.modules.quartz.service.IQuartzJobService; +import org.jeecg.modules.quartz.entity.QuartzJob; +import org.jeecg.modules.quartz.mapper.QuartzJobMapper; +import org.jeecg.modules.quartz.service.IQuartzJobService; import org.quartz.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/cache/AuthStateRedisCache.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/cache/AuthStateRedisCache.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/cache/AuthStateRedisCache.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/cache/AuthStateRedisCache.java index bd54437..caab1c6 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/cache/AuthStateRedisCache.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/cache/AuthStateRedisCache.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.cache; +package org.jeecg.modules.system.cache; import jakarta.annotation.PostConstruct; import me.zhyd.oauth.cache.AuthCacheConfig; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/config/AuthStateConfiguration.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/config/AuthStateConfiguration.java similarity index 76% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/config/AuthStateConfiguration.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/config/AuthStateConfiguration.java index 2175e87..b7c4916 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/config/AuthStateConfiguration.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/config/AuthStateConfiguration.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.config; +package org.jeecg.modules.system.config; import me.zhyd.oauth.cache.AuthStateCache; -import org.cpte.modules.system.cache.AuthStateRedisCache; +import org.jeecg.modules.system.cache.AuthStateRedisCache; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/constant/DefIndexConst.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/constant/DefIndexConst.java similarity index 94% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/constant/DefIndexConst.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/constant/DefIndexConst.java index 80361c9..191f889 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/constant/DefIndexConst.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/constant/DefIndexConst.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.constant; +package org.jeecg.modules.system.constant; /** * 默认首页常量 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/CommonController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/CommonController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java index 219dd29..cd2d485 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/CommonController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -22,6 +22,7 @@ import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.ModelAndView; import java.io.*; +import java.nio.charset.StandardCharsets; /** *

@@ -202,7 +203,7 @@ public class CommonController { } // 设置强制下载不打开 response.setContentType("application/force-download"); - response.addHeader("Content-Disposition", "attachment;fileName=" + new String(file.getName().getBytes("UTF-8"),"iso-8859-1")); + response.addHeader("Content-Disposition", "attachment;fileName=" + new String(file.getName().getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1)); // 结合 StreamingResponseBody 的流式写法 try (InputStream inputStream = new BufferedInputStream(new FileInputStream(file)); diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/DuplicateCheckController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java similarity index 91% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/DuplicateCheckController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java index c1cf7cd..8b9a880 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/DuplicateCheckController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java @@ -1,12 +1,12 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; -import org.cpte.modules.system.model.DuplicateCheckVo; -import org.cpte.modules.system.service.ISysDictService; +import org.jeecg.modules.system.model.DuplicateCheckVo; +import org.jeecg.modules.system.service.ISysDictService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/LoginController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/LoginController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java index 81035ef..81f797d 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/LoginController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java @@ -1,12 +1,11 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import cn.hutool.core.util.RandomUtil; import com.alibaba.fastjson.JSONObject; import com.aliyuncs.exceptions.ClientException; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import org.cpte.modules.system.service.*; -import org.cpte.modules.system.service.*; +import org.jeecg.modules.system.service.*; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import lombok.extern.slf4j.Slf4j; @@ -23,12 +22,13 @@ import org.jeecg.common.util.*; import org.jeecg.common.util.encryption.EncryptedString; import org.jeecg.config.JeecgBaseConfig; import org.jeecg.modules.base.service.BaseCommonService; -import org.cpte.modules.system.entity.SysDepart; -import org.cpte.modules.system.entity.SysRoleIndex; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.model.SysLoginModel; -import org.cpte.modules.system.service.impl.SysBaseApiImpl; -import org.cpte.modules.system.util.RandImageUtil; +import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.system.entity.SysRoleIndex; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.model.SysLoginModel; +import org.jeecg.modules.system.service.*; +import org.jeecg.modules.system.service.impl.SysBaseApiImpl; +import org.jeecg.modules.system.util.RandImageUtil; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -397,7 +397,7 @@ public class LoginController { } } - if (b == false) { + if (!b) { result.setMessage("短信验证码发送失败,请稍后重试"); result.setSuccess(false); return result; @@ -753,9 +753,7 @@ public class LoginController { Object failTime = redisUtil.get(key); if(failTime!=null){ Integer val = Integer.parseInt(failTime.toString()); - if(val>5){ - return true; - } + return val > 5; } return false; } diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysAnnouncementController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysAnnouncementController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java index be85206..404d19a 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysAnnouncementController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -20,16 +20,16 @@ import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.*; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.cpte.modules.message.enums.RangeDateEnum; -import org.cpte.modules.message.websocket.WebSocket; -import org.cpte.modules.system.entity.SysAnnouncement; -import org.cpte.modules.system.entity.SysAnnouncementSend; -import org.cpte.modules.system.service.ISysAnnouncementSendService; -import org.cpte.modules.system.service.ISysAnnouncementService; -import org.cpte.modules.system.service.impl.SysBaseApiImpl; -import org.cpte.modules.system.service.impl.ThirdAppDingtalkServiceImpl; -import org.cpte.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl; -import org.cpte.modules.system.util.XssUtils; +import org.jeecg.modules.message.enums.RangeDateEnum; +import org.jeecg.modules.message.websocket.WebSocket; +import org.jeecg.modules.system.entity.SysAnnouncement; +import org.jeecg.modules.system.entity.SysAnnouncementSend; +import org.jeecg.modules.system.service.ISysAnnouncementSendService; +import org.jeecg.modules.system.service.ISysAnnouncementService; +import org.jeecg.modules.system.service.impl.SysBaseApiImpl; +import org.jeecg.modules.system.service.impl.ThirdAppDingtalkServiceImpl; +import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl; +import org.jeecg.modules.system.util.XssUtils; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysAnnouncementSendController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysAnnouncementSendController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java index c9a72b9..5ad4506 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysAnnouncementSendController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import java.util.Arrays; import java.util.Date; @@ -14,10 +14,10 @@ import org.jeecg.common.constant.WebsocketConst; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.SqlInjectionUtil; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.message.websocket.WebSocket; -import org.cpte.modules.system.entity.SysAnnouncementSend; -import org.cpte.modules.system.model.AnnouncementSendModel; -import org.cpte.modules.system.service.ISysAnnouncementSendService; +import org.jeecg.modules.message.websocket.WebSocket; +import org.jeecg.modules.system.entity.SysAnnouncementSend; +import org.jeecg.modules.system.model.AnnouncementSendModel; +import org.jeecg.modules.system.service.ISysAnnouncementSendService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysAppVersionController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAppVersionController.java similarity index 92% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysAppVersionController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAppVersionController.java index 3f0f18a..affed35 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysAppVersionController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAppVersionController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -7,7 +7,7 @@ import org.apache.shiro.authz.annotation.RequiresRoles; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.system.entity.SysAppVersion; +import org.jeecg.modules.system.entity.SysAppVersion; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,7 +29,7 @@ public class SysAppVersionController{ /** * APP缓存前缀 */ - private String APP3_VERSION = "app3:version"; + private final String APP3_VERSION = "app3:version"; /** * app3版本信息 * @return diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysCategoryController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysCategoryController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java index bc7b0dd..b156cc4 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysCategoryController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -18,9 +18,9 @@ import org.jeecg.common.util.ImportExcelUtil; import org.jeecg.common.util.ReflectHelper; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.cpte.modules.system.entity.SysCategory; -import org.cpte.modules.system.model.TreeSelectModel; -import org.cpte.modules.system.service.ISysCategoryService; +import org.jeecg.modules.system.entity.SysCategory; +import org.jeecg.modules.system.model.TreeSelectModel; +import org.jeecg.modules.system.service.ISysCategoryService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysCheckRuleController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCheckRuleController.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysCheckRuleController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCheckRuleController.java index 201dba4..03bf1ad 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysCheckRuleController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCheckRuleController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -11,8 +11,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; -import org.cpte.modules.system.entity.SysCheckRule; -import org.cpte.modules.system.service.ISysCheckRuleService; +import org.jeecg.modules.system.entity.SysCheckRule; +import org.jeecg.modules.system.service.ISysCheckRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -21,6 +21,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.Arrays; /** @@ -80,7 +81,7 @@ public class SysCheckRuleController extends JeecgController list = (List) service.listByIds(idList); + List list = service.listByIds(idList); result.setResult(list); result.setSuccess(true); } catch (Exception e) { diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysDataSourceController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysDataSourceController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.java index 526f4ad..351f98a 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysDataSourceController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import com.alibaba.fastjson.JSONArray; @@ -21,9 +21,9 @@ import org.jeecg.common.util.dynamic.db.DataSourceCachePool; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.security.JdbcSecurityUtil; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.cpte.modules.system.entity.SysDataSource; -import org.cpte.modules.system.service.ISysDataSourceService; -import org.cpte.modules.system.util.SecurityUtil; +import org.jeecg.modules.system.entity.SysDataSource; +import org.jeecg.modules.system.service.ISysDataSourceService; +import org.jeecg.modules.system.util.SecurityUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysDepartController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysDepartController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java index 72c0efa..6a7a998 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysDepartController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,17 +16,17 @@ import org.jeecg.common.util.ImportExcelUtil; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.cpte.modules.system.entity.SysDepart; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.excelstyle.ExcelExportSysUserStyle; -import org.cpte.modules.system.model.DepartIdModel; -import org.cpte.modules.system.model.SysDepartTreeModel; -import org.cpte.modules.system.service.ISysDepartService; -import org.cpte.modules.system.service.ISysUserDepartService; -import org.cpte.modules.system.service.ISysUserService; -import org.cpte.modules.system.vo.SysDepartExportVo; -import org.cpte.modules.system.vo.SysPositionSelectTreeVo; -import org.cpte.modules.system.vo.lowapp.ExportDepartVo; +import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.excelstyle.ExcelExportSysUserStyle; +import org.jeecg.modules.system.model.DepartIdModel; +import org.jeecg.modules.system.model.SysDepartTreeModel; +import org.jeecg.modules.system.service.ISysDepartService; +import org.jeecg.modules.system.service.ISysUserDepartService; +import org.jeecg.modules.system.service.ISysUserService; +import org.jeecg.modules.system.vo.SysDepartExportVo; +import org.jeecg.modules.system.vo.SysPositionSelectTreeVo; +import org.jeecg.modules.system.vo.lowapp.ExportDepartVo; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysDepartPermissionController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java similarity index 94% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysDepartPermissionController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java index 72fda80..5b95971 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysDepartPermissionController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import java.util.*; import java.util.stream.Collectors; @@ -14,20 +14,20 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.base.service.BaseCommonService; -import org.cpte.modules.system.entity.SysDepartPermission; -import org.cpte.modules.system.entity.SysDepartRolePermission; -import org.cpte.modules.system.entity.SysPermission; -import org.cpte.modules.system.entity.SysPermissionDataRule; -import org.cpte.modules.system.model.TreeModel; -import org.cpte.modules.system.service.ISysDepartPermissionService; +import org.jeecg.modules.system.entity.SysDepartPermission; +import org.jeecg.modules.system.entity.SysDepartRolePermission; +import org.jeecg.modules.system.entity.SysPermission; +import org.jeecg.modules.system.entity.SysPermissionDataRule; +import org.jeecg.modules.system.model.TreeModel; +import org.jeecg.modules.system.service.ISysDepartPermissionService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; -import org.cpte.modules.system.service.ISysDepartRolePermissionService; -import org.cpte.modules.system.service.ISysPermissionDataRuleService; -import org.cpte.modules.system.service.ISysPermissionService; +import org.jeecg.modules.system.service.ISysDepartRolePermissionService; +import org.jeecg.modules.system.service.ISysPermissionDataRuleService; +import org.jeecg.modules.system.service.ISysPermissionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysDepartRoleController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysDepartRoleController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java index f543159..6b205e7 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysDepartRoleController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java @@ -1,9 +1,8 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import java.util.*; import java.util.stream.Collectors; -import org.cpte.modules.system.service.*; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -11,10 +10,10 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.cpte.modules.system.entity.SysDepartRole; -import org.cpte.modules.system.entity.SysDepartRolePermission; -import org.cpte.modules.system.entity.SysDepartRoleUser; -import org.cpte.modules.system.entity.SysPermissionDataRule; +import org.jeecg.modules.system.entity.SysDepartRole; +import org.jeecg.modules.system.entity.SysDepartRolePermission; +import org.jeecg.modules.system.entity.SysDepartRoleUser; +import org.jeecg.modules.system.entity.SysPermissionDataRule; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; @@ -22,13 +21,14 @@ import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.base.service.BaseCommonService; -import org.cpte.modules.system.service.*; +import org.jeecg.modules.system.service.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.modules.system.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysDictController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysDictController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java index b7106ef..5d78b61 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysDictController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import com.alibaba.fastjson.JSON; @@ -24,14 +24,14 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.*; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; import org.jeecg.config.shiro.ShiroRealm; -import org.cpte.modules.system.entity.SysDict; -import org.cpte.modules.system.entity.SysDictItem; -import org.cpte.modules.system.model.SysDictTree; -import org.cpte.modules.system.model.TreeSelectModel; -import org.cpte.modules.system.service.ISysDictItemService; -import org.cpte.modules.system.service.ISysDictService; -import org.cpte.modules.system.vo.SysDictPage; -import org.cpte.modules.system.vo.lowapp.SysDictVo; +import org.jeecg.modules.system.entity.SysDict; +import org.jeecg.modules.system.entity.SysDictItem; +import org.jeecg.modules.system.model.SysDictTree; +import org.jeecg.modules.system.model.TreeSelectModel; +import org.jeecg.modules.system.service.ISysDictItemService; +import org.jeecg.modules.system.service.ISysDictService; +import org.jeecg.modules.system.vo.SysDictPage; +import org.jeecg.modules.system.vo.lowapp.SysDictVo; import org.jeecgframework.poi.excel.ExcelImportCheckUtil; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; @@ -50,6 +50,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.*; /** @@ -217,12 +218,8 @@ public class SysDictController { //update-begin-author:taoyan date:2023-5-22 for: /issues/4905 因为中括号(%5)的问题导致的 表单生成器字段配置时，选择关联字段，在进行高级配置时，无法加载数据库列表，提示 Sgin签名校验错误！ #4905 RouteToRequestUrlFilter if(keyword!=null && keyword.indexOf("%5")>=0){ - try { - keyword = URLDecoder.decode(keyword, "UTF-8"); - } catch (UnsupportedEncodingException e) { - log.error("下拉搜索关键字解码失败", e); - } - } + keyword = URLDecoder.decode(keyword, StandardCharsets.UTF_8); + } //update-end-author:taoyan date:2023-5-22 for: /issues/4905 因为中括号(%5)的问题导致的 表单生成器字段配置时，选择关联字段，在进行高级配置时，无法加载数据库列表，提示 Sgin签名校验错误！ #4905 log.info(" 加载字典表数据,加载关键字: "+ keyword); diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysDictItemController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysDictItemController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java index 4612d9b..0d15c5b 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysDictItemController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import java.util.Arrays; @@ -14,8 +14,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CacheConstant; import org.jeecg.common.system.query.QueryGenerator; -import org.cpte.modules.system.entity.SysDictItem; -import org.cpte.modules.system.service.ISysDictItemService; +import org.jeecg.modules.system.entity.SysDictItem; +import org.jeecg.modules.system.service.ISysDictItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.RequestBody; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysFillRuleController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFillRuleController.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysFillRuleController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFillRuleController.java index d126248..47530f8 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysFillRuleController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFillRuleController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -13,8 +13,8 @@ import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.FillRuleUtil; -import org.cpte.modules.system.entity.SysFillRule; -import org.cpte.modules.system.service.ISysFillRuleService; +import org.jeecg.modules.system.entity.SysFillRule; +import org.jeecg.modules.system.service.ISysFillRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysFormFileController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFormFileController.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysFormFileController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFormFileController.java index fd513bc..0582335 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysFormFileController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFormFileController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -10,8 +10,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; -import org.cpte.modules.system.entity.SysFormFile; -import org.cpte.modules.system.service.ISysFormFileService; +import org.jeecg.modules.system.entity.SysFormFile; +import org.jeecg.modules.system.service.ISysFormFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysGatewayRouteController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysGatewayRouteController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java index ee2ffe4..c0a8a0b 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysGatewayRouteController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -10,8 +10,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.system.entity.SysGatewayRoute; -import org.cpte.modules.system.service.ISysGatewayRouteService; +import org.jeecg.modules.system.entity.SysGatewayRoute; +import org.jeecg.modules.system.service.ISysGatewayRouteService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysLogController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysLogController.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysLogController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysLogController.java index 67171ab..9aaea3e 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysLogController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysLogController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import java.util.Arrays; @@ -9,9 +9,9 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.system.entity.SysLog; -import org.cpte.modules.system.entity.SysRole; -import org.cpte.modules.system.service.ISysLogService; +import org.jeecg.modules.system.entity.SysLog; +import org.jeecg.modules.system.entity.SysRole; +import org.jeecg.modules.system.service.ISysLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysPermissionController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysPermissionController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java index 91b36f3..afe6496 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysPermissionController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java @@ -1,13 +1,11 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.cpte.modules.system.entity.*; -import org.cpte.modules.system.service.*; -import org.cpte.modules.system.entity.*; -import org.cpte.modules.system.service.*; +import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.system.service.*; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -22,10 +20,12 @@ import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.JeecgBaseConfig; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.base.service.BaseCommonService; -import org.cpte.modules.system.constant.DefIndexConst; -import org.cpte.modules.system.model.SysPermissionTree; -import org.cpte.modules.system.model.TreeModel; -import org.cpte.modules.system.util.PermissionDataUtil; +import org.jeecg.modules.system.constant.DefIndexConst; +import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.system.model.SysPermissionTree; +import org.jeecg.modules.system.model.TreeModel; +import org.jeecg.modules.system.service.*; +import org.jeecg.modules.system.util.PermissionDataUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -878,11 +878,8 @@ public class SysPermissionController { */ private boolean isWwwHttpUrl(String url) { boolean flag = url != null && (url.startsWith(CommonConstant.HTTP_PROTOCOL) || url.startsWith(CommonConstant.HTTPS_PROTOCOL) || url.startsWith(SymbolConstant.DOUBLE_LEFT_CURLY_BRACKET)); - if (flag) { - return true; - } - return false; - } + return flag; + } /** * 通过URL生成路由name（去掉URL前缀斜杠，替换内容中的斜杠‘/’为-） 举例： URL = /isystem/role RouteName = diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysPositionController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java similarity index 91% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysPositionController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java index d5a452f..9fe1554 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysPositionController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import cn.hutool.core.util.RandomUtil; import com.alibaba.fastjson.JSON; @@ -18,11 +18,11 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.ImportExcelUtil; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.cpte.modules.system.entity.SysPosition; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.service.ISysPositionService; -import org.cpte.modules.system.service.ISysUserPositionService; -import org.cpte.modules.system.service.ISysUserService; +import org.jeecg.modules.system.entity.SysPosition; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.service.ISysPositionService; +import org.jeecg.modules.system.service.ISysUserPositionService; +import org.jeecg.modules.system.service.ISysUserService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -39,6 +39,7 @@ import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -224,22 +225,18 @@ public class SysPositionController { public ModelAndView exportXls(SysPosition sysPosition,HttpServletRequest request, HttpServletResponse response) { // Step.1 组装查询条件 QueryWrapper queryWrapper = null; - try { - String paramsStr = request.getParameter("paramsStr"); - if (oConvertUtils.isNotEmpty(paramsStr)) { - String deString = URLDecoder.decode(paramsStr, "UTF-8"); - sysPosition = JSON.parseObject(deString, SysPosition.class); - //------------------------------------------------------------------------------------------------ - //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】 - if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){ - sysPosition.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0)); - } - //------------------------------------------------------------------------------------------------ + String paramsStr = request.getParameter("paramsStr"); + if (oConvertUtils.isNotEmpty(paramsStr)) { + String deString = URLDecoder.decode(paramsStr, StandardCharsets.UTF_8); + sysPosition = JSON.parseObject(deString, SysPosition.class); + //------------------------------------------------------------------------------------------------ + //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】 + if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){ + sysPosition.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0)); } - queryWrapper = QueryGenerator.initQueryWrapper(sysPosition, request.getParameterMap()); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); + //------------------------------------------------------------------------------------------------ } + queryWrapper = QueryGenerator.initQueryWrapper(sysPosition, request.getParameterMap()); //update-begin--Author:liusq Date:20240715 for：[03]职务导出，如果选择数据则只导出相关数据-------------------- String selections = request.getParameter("selections"); if(!oConvertUtils.isEmpty(selections)){ diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysRoleController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysRoleController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java index c090cfe..75159d3 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysRoleController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import java.io.IOException; @@ -8,16 +8,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.cpte.modules.system.entity.*; -import org.cpte.modules.system.service.*; +import org.jeecg.modules.system.service.*; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import cn.hutool.core.util.RandomUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.cpte.modules.system.entity.*; -import org.cpte.modules.system.service.*; +import org.jeecg.modules.system.entity.*; import org.jeecg.common.api.vo.Result; import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.CommonConstant; @@ -27,8 +25,10 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; import org.jeecg.modules.base.service.BaseCommonService; -import org.cpte.modules.system.model.TreeModel; -import org.cpte.modules.system.vo.SysUserRoleCountVo; +import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.system.model.TreeModel; +import org.jeecg.modules.system.service.*; +import org.jeecg.modules.system.vo.SysUserRoleCountVo; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; @@ -98,10 +98,10 @@ public class SysRoleController { @RequiresPermissions("system:role:list") @RequestMapping(value = "/list", method = RequestMethod.GET) public Result> queryPageList(SysRole role, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - @RequestParam(name="isMultiTranslate", required = false) Boolean isMultiTranslate, - HttpServletRequest req) { + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="isMultiTranslate", required = false) Boolean isMultiTranslate, + HttpServletRequest req) { //update-begin---author:wangshuai---date:2025-03-26---for:【issues/7948】角色解决根据id查询回显不对--- if(null != isMultiTranslate && isMultiTranslate){ pageSize = 100; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysRoleIndexController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysRoleIndexController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java index 3a963d7..5012cde 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysRoleIndexController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,10 +20,10 @@ import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.base.service.BaseCommonService; -import org.cpte.modules.system.constant.DefIndexConst; -import org.cpte.modules.system.entity.SysRoleIndex; -import org.cpte.modules.system.service.ISysRoleIndexService; -import org.cpte.modules.system.service.ISysUserService; +import org.jeecg.modules.system.constant.DefIndexConst; +import org.jeecg.modules.system.entity.SysRoleIndex; +import org.jeecg.modules.system.service.ISysRoleIndexService; +import org.jeecg.modules.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysTableWhiteListController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTableWhiteListController.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysTableWhiteListController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTableWhiteListController.java index 9b12815..6ba079e 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysTableWhiteListController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTableWhiteListController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -11,8 +11,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; -import org.cpte.modules.system.entity.SysTableWhiteList; -import org.cpte.modules.system.service.ISysTableWhiteListService; +import org.jeecg.modules.system.entity.SysTableWhiteList; +import org.jeecg.modules.system.service.ISysTableWhiteListService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysTenantController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysTenantController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java index 9399e4d..ce48e64 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysTenantController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import cn.hutool.core.collection.CollectionUtil; @@ -7,8 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.cpte.modules.system.entity.*; -import org.cpte.modules.system.entity.*; +import org.jeecg.modules.system.entity.*; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -24,16 +23,17 @@ import org.jeecg.common.util.TokenUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; import org.jeecg.modules.base.service.BaseCommonService; -import org.cpte.modules.system.service.ISysTenantPackService; -import org.cpte.modules.system.service.ISysTenantService; -import org.cpte.modules.system.service.ISysUserService; -import org.cpte.modules.system.service.ISysUserTenantService; -import org.cpte.modules.system.service.ISysDepartService; -import org.cpte.modules.system.vo.SysUserTenantVo; -import org.cpte.modules.system.vo.tenant.TenantDepartAuthInfo; -import org.cpte.modules.system.vo.tenant.TenantPackModel; -import org.cpte.modules.system.vo.tenant.TenantPackUser; -import org.cpte.modules.system.vo.tenant.TenantPackUserCount; +import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.system.service.ISysTenantPackService; +import org.jeecg.modules.system.service.ISysTenantService; +import org.jeecg.modules.system.service.ISysUserService; +import org.jeecg.modules.system.service.ISysUserTenantService; +import org.jeecg.modules.system.service.ISysDepartService; +import org.jeecg.modules.system.vo.SysUserTenantVo; +import org.jeecg.modules.system.vo.tenant.TenantDepartAuthInfo; +import org.jeecg.modules.system.vo.tenant.TenantPackModel; +import org.jeecg.modules.system.vo.tenant.TenantPackUser; +import org.jeecg.modules.system.vo.tenant.TenantPackUserCount; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysUploadController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java similarity index 93% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysUploadController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java index 8c71ebf..fec9c89 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysUploadController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; @@ -6,8 +6,8 @@ import org.jeecg.common.util.CommonUtils; import org.jeecg.common.util.MinioUtil; import org.jeecg.common.util.filter.SsrfFileTypeFilter; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.oss.entity.OssFile; -import org.cpte.modules.oss.service.IOssFileService; +import org.jeecg.modules.oss.entity.OssFile; +import org.jeecg.modules.oss.service.IOssFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysUserController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysUserController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index a41de26..78715d5 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysUserController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import cn.hutool.core.util.RandomUtil; @@ -8,9 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.cpte.modules.system.entity.*; -import org.cpte.modules.system.service.*; -import org.cpte.modules.system.entity.*; +import org.jeecg.modules.system.service.*; +import org.jeecg.modules.system.entity.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; @@ -27,17 +26,18 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.*; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; import org.jeecg.modules.base.service.BaseCommonService; -import org.cpte.modules.system.excelstyle.ExcelExportSysUserStyle; -import org.cpte.modules.system.model.DepartIdModel; -import org.cpte.modules.system.model.SysUserSysDepPostModel; -import org.cpte.modules.system.model.SysUserSysDepartModel; -import org.cpte.modules.system.service.*; -import org.cpte.modules.system.util.ImportSysUserCache; -import org.cpte.modules.system.vo.SysDepartUsersVO; -import org.cpte.modules.system.vo.SysUserExportVo; -import org.cpte.modules.system.vo.SysUserRoleVO; -import org.cpte.modules.system.vo.lowapp.DepartAndUserInfo; -import org.cpte.modules.system.vo.lowapp.UpdateDepartInfo; +import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.system.excelstyle.ExcelExportSysUserStyle; +import org.jeecg.modules.system.model.DepartIdModel; +import org.jeecg.modules.system.model.SysUserSysDepPostModel; +import org.jeecg.modules.system.model.SysUserSysDepartModel; +import org.jeecg.modules.system.service.*; +import org.jeecg.modules.system.util.ImportSysUserCache; +import org.jeecg.modules.system.vo.SysDepartUsersVO; +import org.jeecg.modules.system.vo.SysUserExportVo; +import org.jeecg.modules.system.vo.SysUserRoleVO; +import org.jeecg.modules.system.vo.lowapp.DepartAndUserInfo; +import org.jeecg.modules.system.vo.lowapp.UpdateDepartInfo; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; @@ -219,7 +219,7 @@ public class SysUserController { @RequestMapping(value = "/delete", method = RequestMethod.DELETE) public Result delete(@RequestParam(name="id",required=true) String id) { baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 3); - List userNameList = sysUserService.userIdToUsername(Arrays.asList(id)); + List userNameList = sysUserService.userIdToUsername(Collections.singletonList(id)); this.sysUserService.deleteUser(id); if (!userNameList.isEmpty()) { diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysUserOnlineController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserOnlineController.java similarity index 92% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysUserOnlineController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserOnlineController.java index a1c7e6b..847cd98 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/SysUserOnlineController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserOnlineController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; @@ -12,9 +12,9 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.base.service.BaseCommonService; -import org.cpte.modules.system.service.ISysUserService; -import org.cpte.modules.system.service.impl.SysBaseApiImpl; -import org.cpte.modules.system.vo.SysUserOnlineVO; +import org.jeecg.modules.system.service.ISysUserService; +import org.jeecg.modules.system.service.impl.SysBaseApiImpl; +import org.jeecg.modules.system.vo.SysUserOnlineVO; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -63,11 +63,8 @@ public class SysUserOnlineController { if (loginUser != null && !"_reserve_user_external".equals(loginUser.getUsername())) { //update-begin---author:wangshuai ---date:20220104 for：[JTC-382]在线用户查询无效------------ //验证用户名是否与传过来的用户名相同 - boolean isMatchUsername=true; + boolean isMatchUsername= !oConvertUtils.isNotEmpty(username) || loginUser.getUsername().contains(username); //判断用户名是否为空，并且当前循环的用户不包含传过来的用户名，那么就设成false - if(oConvertUtils.isNotEmpty(username) && !loginUser.getUsername().contains(username)){ - isMatchUsername = false; - } if(isMatchUsername){ BeanUtils.copyProperties(loginUser, online); onlineList.add(online); diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/ThirdAppController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdAppController.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/ThirdAppController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdAppController.java index 82bf4b9..5a20de9 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/ThirdAppController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdAppController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSONObject; @@ -18,15 +18,15 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.TokenUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.cpte.modules.system.entity.SysThirdAccount; -import org.cpte.modules.system.entity.SysThirdAppConfig; -import org.cpte.modules.system.service.ISysThirdAccountService; -import org.cpte.modules.system.service.ISysThirdAppConfigService; -import org.cpte.modules.system.service.impl.ThirdAppDingtalkServiceImpl; -import org.cpte.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl; -import org.cpte.modules.system.vo.thirdapp.JwSysUserDepartVo; -import org.cpte.modules.system.vo.thirdapp.JwUserDepartVo; -import org.cpte.modules.system.vo.thirdapp.SyncInfoVo; +import org.jeecg.modules.system.entity.SysThirdAccount; +import org.jeecg.modules.system.entity.SysThirdAppConfig; +import org.jeecg.modules.system.service.ISysThirdAccountService; +import org.jeecg.modules.system.service.ISysThirdAppConfigService; +import org.jeecg.modules.system.service.impl.ThirdAppDingtalkServiceImpl; +import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl; +import org.jeecg.modules.system.vo.thirdapp.JwSysUserDepartVo; +import org.jeecg.modules.system.vo.thirdapp.JwUserDepartVo; +import org.jeecg.modules.system.vo.thirdapp.SyncInfoVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/ThirdLoginController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java similarity index 87% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/ThirdLoginController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java index 9389c1d..7b48f65 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/ThirdLoginController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.RandomUtil; @@ -19,18 +19,18 @@ import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.*; import org.jeecg.modules.base.service.BaseCommonService; -import org.cpte.modules.system.entity.SysDepart; -import org.cpte.modules.system.entity.SysThirdAccount; -import org.cpte.modules.system.entity.SysThirdAppConfig; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.model.ThirdLoginModel; -import org.cpte.modules.system.service.ISysDictService; -import org.cpte.modules.system.service.ISysThirdAccountService; -import org.cpte.modules.system.service.ISysThirdAppConfigService; -import org.cpte.modules.system.service.ISysUserService; -import org.cpte.modules.system.service.ISysDepartService; -import org.cpte.modules.system.service.impl.ThirdAppDingtalkServiceImpl; -import org.cpte.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl; +import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.system.entity.SysThirdAccount; +import org.jeecg.modules.system.entity.SysThirdAppConfig; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.model.ThirdLoginModel; +import org.jeecg.modules.system.service.ISysDictService; +import org.jeecg.modules.system.service.ISysThirdAccountService; +import org.jeecg.modules.system.service.ISysThirdAppConfigService; +import org.jeecg.modules.system.service.ISysUserService; +import org.jeecg.modules.system.service.ISysDepartService; +import org.jeecg.modules.system.service.impl.ThirdAppDingtalkServiceImpl; +import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -41,6 +41,7 @@ import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.util.Date; import java.util.List; @@ -127,7 +128,7 @@ public class ThirdLoginController { String token = saveToken(sysUser); modelMap.addAttribute("token", token); }else{ - modelMap.addAttribute("token", "绑定手机号,"+""+uuid); + modelMap.addAttribute("token", "绑定手机号,"+uuid); } //update-end-author:wangshuai date:20201118 for:从第三方登录查询是否存在用户id，不存在绑定手机号 //update-begin--Author:wangshuai Date:20200729 for：接口在签名校验失败时返回失败的标识码 issues#1441-------------------- @@ -344,8 +345,8 @@ public class ThirdLoginController { // 企业的CorpID builder.append("?appid=").append(config.getClientId()); // 授权后重定向的回调链接地址，请使用urlencode对链接进行处理 - String redirectUri = CommonUtils.getBaseUrl(request) + "/sys/thirdLogin/oauth2/wechat_enterprise/callback?tenantId="+tenantId;; - builder.append("&redirect_uri=").append(URLEncoder.encode(redirectUri, "UTF-8")); + String redirectUri = CommonUtils.getBaseUrl(request) + "/sys/thirdLogin/oauth2/wechat_enterprise/callback?tenantId="+tenantId; + builder.append("&redirect_uri=").append(URLEncoder.encode(redirectUri, StandardCharsets.UTF_8)); // 返回类型，此时固定为：code builder.append("&response_type=code"); // 应用授权作用域。 @@ -370,7 +371,7 @@ public class ThirdLoginController { // 授权通过/拒绝后回调地址。 // 注意 需要与注册应用时登记的域名保持一致。 String redirectUri = CommonUtils.getBaseUrl(request) + "/sys/thirdLogin/oauth2/dingtalk/callback?tenantId="+tenantId; - builder.append("?redirect_uri=").append(URLEncoder.encode(redirectUri, "UTF-8")); + builder.append("?redirect_uri=").append(URLEncoder.encode(redirectUri, StandardCharsets.UTF_8)); // 固定值为code。 // 授权通过后返回authCode。 builder.append("&response_type=code"); @@ -429,40 +430,35 @@ public class ThirdLoginController { } else { return "不支持的source"; } - try { - //update-begin-author:taoyan date:2022-6-30 for: 工作流发送消息 点击消息链接跳转办理页面 - String redirect = ""; - if (state.indexOf("?") > 0) { - String[] arr = state.split("\\?"); - state = arr[0]; - if(arr.length>1){ - redirect = arr[1]; - } - } - - String token = saveToken(loginUser); - state += "/oauth2-app/login?oauth2LoginToken=" + URLEncoder.encode(token, "UTF-8") + "&tenantId=" + URLEncoder.encode(tenantId, "UTF-8"); - //update-begin---author:wangshuai ---date:20220613 for：[issues/I5BOUF]oauth2 钉钉无法登录------------ - state += "&thirdType=" + source; - //state += "&thirdType=" + "wechat_enterprise"; - if (redirect != null && redirect.length() > 0) { - state += "&" + redirect; - } - //update-end-author:taoyan date:2022-6-30 for: 工作流发送消息 点击消息链接跳转办理页面 - - //update-end---author:wangshuai ---date:20220613 for：[issues/I5BOUF]oauth2 钉钉无法登录------------ - log.info("OAuth2登录重定向地址: " + state); - try { - response.sendRedirect(state); - return "ok"; - } catch (IOException e) { - e.printStackTrace(); - return "重定向失败"; + //update-begin-author:taoyan date:2022-6-30 for: 工作流发送消息 点击消息链接跳转办理页面 + String redirect = ""; + if (state.indexOf("?") > 0) { + String[] arr = state.split("\\?"); + state = arr[0]; + if(arr.length>1){ + redirect = arr[1]; } - } catch (UnsupportedEncodingException e) { + } + + String token = saveToken(loginUser); + state += "/oauth2-app/login?oauth2LoginToken=" + URLEncoder.encode(token, StandardCharsets.UTF_8) + "&tenantId=" + URLEncoder.encode(tenantId, StandardCharsets.UTF_8); + //update-begin---author:wangshuai ---date:20220613 for：[issues/I5BOUF]oauth2 钉钉无法登录------------ + state += "&thirdType=" + source; + //state += "&thirdType=" + "wechat_enterprise"; + if (redirect != null && redirect.length() > 0) { + state += "&" + redirect; + } + //update-end-author:taoyan date:2022-6-30 for: 工作流发送消息 点击消息链接跳转办理页面 + + //update-end---author:wangshuai ---date:20220613 for：[issues/I5BOUF]oauth2 钉钉无法登录------------ + log.info("OAuth2登录重定向地址: " + state); + try { + response.sendRedirect(state); + return "ok"; + } catch (IOException e) { e.printStackTrace(); - return "解码失败"; + return "重定向失败"; } } @@ -582,34 +578,29 @@ public class ThirdLoginController { @RequestParam(name = "tenantId",defaultValue = "0") String tenantId, HttpServletResponse response) { SysUser loginUser = thirdAppDingtalkService.oauthDingDingLogin(authCode,Integer.valueOf(tenantId)); - try { - String redirect = ""; - if (state.indexOf("?") > 0) { - String[] arr = state.split("\\?"); - state = arr[0]; - if(arr.length>1){ - redirect = arr[1]; - } - } - String token = saveToken(loginUser); - state += "/oauth2-app/login?oauth2LoginToken=" + URLEncoder.encode(token, "UTF-8") + "&tenantId=" + URLEncoder.encode(tenantId, "UTF-8"); - state += "&thirdType=DINGTALK"; - if (redirect != null && redirect.length() > 0) { - state += "&" + redirect; - } - log.info("OAuth2登录重定向地址: " + state); - try { - response.sendRedirect(state); - return "ok"; - } catch (IOException e) { - log.error(e.getMessage(),e); - return "重定向失败"; - } - } catch (UnsupportedEncodingException e) { - log.error(e.getMessage(),e); - return "解码失败"; - } - } + String redirect = ""; + if (state.indexOf("?") > 0) { + String[] arr = state.split("\\?"); + state = arr[0]; + if(arr.length>1){ + redirect = arr[1]; + } + } + String token = saveToken(loginUser); + state += "/oauth2-app/login?oauth2LoginToken=" + URLEncoder.encode(token, StandardCharsets.UTF_8) + "&tenantId=" + URLEncoder.encode(tenantId, StandardCharsets.UTF_8); + state += "&thirdType=DINGTALK"; + if (redirect != null && redirect.length() > 0) { + state += "&" + redirect; + } + log.info("OAuth2登录重定向地址: " + state); + try { + response.sendRedirect(state); + return "ok"; + } catch (IOException e) { + log.error(e.getMessage(),e); + return "重定向失败"; + } + } /** * 获取企业id和应用id diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/WechatVerifyController.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/WechatVerifyController.java similarity index 92% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/WechatVerifyController.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/WechatVerifyController.java index a4da7eb..9cc4259 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/controller/WechatVerifyController.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/controller/WechatVerifyController.java @@ -1,8 +1,8 @@ -package org.cpte.modules.system.controller; +package org.jeecg.modules.system.controller; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.cpte.modules.system.util.XssUtils; +import org.jeecg.modules.system.util.XssUtils; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysAnnouncement.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java similarity index 99% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysAnnouncement.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java index 33bcfb1..1c5fdac 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysAnnouncement.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysAnnouncementSend.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysAnnouncementSend.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java index 89ea0ea..eab1424 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysAnnouncementSend.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import java.io.Serializable; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysAppVersion.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAppVersion.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysAppVersion.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAppVersion.java index 04216d3..c99d6e7 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysAppVersion.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAppVersion.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysCategory.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCategory.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysCategory.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCategory.java index 4b3f917..a2851be 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysCategory.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCategory.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysCheckRule.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysCheckRule.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java index 82a8233..d3a093a 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysCheckRule.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysComment.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysComment.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java index f8ba86f..a19af8d 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysComment.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDataLog.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDataLog.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java index 2c11f0b..ecf63bf 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDataLog.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDataSource.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDataSource.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java index 21be903..4aa72d9 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDataSource.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDepart.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java similarity index 99% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDepart.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java index e7de135..075533e 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDepart.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDepartPermission.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDepartPermission.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java index b3f7dbb..f4d2d48 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDepartPermission.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDepartRole.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDepartRole.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java index ca1cbab..3122c8b 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDepartRole.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDepartRolePermission.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDepartRolePermission.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java index f82d35f..99ffc71 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDepartRolePermission.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDepartRoleUser.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDepartRoleUser.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java index 298b022..454e208 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDepartRoleUser.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDict.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDict.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDict.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDict.java index 5fe2c6b..8e7569c 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDict.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDict.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import java.io.Serializable; import java.util.Date; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDictItem.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDictItem.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java index f9954be..d5602ff 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysDictItem.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import java.io.Serializable; import java.util.Date; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysFillRule.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysFillRule.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java index fc6ace3..21abc81 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysFillRule.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysFormFile.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFormFile.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysFormFile.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFormFile.java index 2ba3d37..f9434c8 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysFormFile.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFormFile.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysGatewayRoute.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysGatewayRoute.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysGatewayRoute.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysGatewayRoute.java index 0ae5efa..7768d93 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysGatewayRoute.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysGatewayRoute.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysLog.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysLog.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysLog.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysLog.java index b6d9638..3b89d0a 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysLog.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysLog.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import java.util.Date; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysPackPermission.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPackPermission.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysPackPermission.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPackPermission.java index 22cbcd7..479a505 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysPackPermission.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPackPermission.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import java.io.Serializable; import java.util.Date; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysPermission.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermission.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysPermission.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermission.java index 9800b30..f88774f 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysPermission.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermission.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import java.io.Serializable; import java.util.Date; @@ -9,7 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecg.common.aspect.annotation.Dict; -import org.cpte.modules.system.constant.DefIndexConst; +import org.jeecg.modules.system.constant.DefIndexConst; /** *

diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysPermissionDataRule.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysPermissionDataRule.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java index 9d06067..4a0af83 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysPermissionDataRule.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import java.io.Serializable; import java.util.Date; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysPosition.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysPosition.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.java index 1d838bd..d877a43 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysPosition.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysRole.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRole.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysRole.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRole.java index ad838e3..0b2c16f 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysRole.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRole.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import java.io.Serializable; import java.util.Date; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysRoleIndex.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRoleIndex.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysRoleIndex.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRoleIndex.java index c107eef..c8ebed1 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysRoleIndex.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRoleIndex.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysRolePermission.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysRolePermission.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java index 3e362cf..f0a301d 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysRolePermission.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import java.io.Serializable; import java.util.Date; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysTableWhiteList.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTableWhiteList.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysTableWhiteList.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTableWhiteList.java index 53c1d87..0e322c5 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysTableWhiteList.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTableWhiteList.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysTenant.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenant.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysTenant.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenant.java index efaf8de..b6eb3d2 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysTenant.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenant.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysTenantPack.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPack.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysTenantPack.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPack.java index 3ef626a..d7835e8 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysTenantPack.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPack.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import java.io.Serializable; import java.util.Date; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysTenantPackUser.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPackUser.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysTenantPackUser.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPackUser.java index 3e6bac1..ddc2e2a 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysTenantPackUser.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPackUser.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysThirdAccount.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysThirdAccount.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java index 740a918..caa6f80 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysThirdAccount.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysThirdAppConfig.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAppConfig.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysThirdAppConfig.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAppConfig.java index 86f66f2..c639f1f 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysThirdAppConfig.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAppConfig.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysUser.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java similarity index 99% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysUser.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java index a5527ea..a7816d6 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysUser.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import java.util.Date; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysUserDepPost.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserDepPost.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysUserDepPost.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserDepPost.java index 0d17083..796464c 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysUserDepPost.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserDepPost.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysUserDepart.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysUserDepart.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java index 52cdd9e..923249d 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysUserDepart.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import java.io.Serializable; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysUserPosition.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserPosition.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysUserPosition.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserPosition.java index 2dc9720..ef50a4a 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysUserPosition.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserPosition.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysUserRole.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysUserRole.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java index 4dd5d39..1998e3d 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysUserRole.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import java.io.Serializable; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysUserTenant.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserTenant.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysUserTenant.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserTenant.java index 4c6a4de..7243a45 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/entity/SysUserTenant.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserTenant.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.entity; +package org.jeecg.modules.system.entity; import java.io.Serializable; import java.util.Date; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/excelstyle/ExcelExportSysUserStyle.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/excelstyle/ExcelExportSysUserStyle.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/excelstyle/ExcelExportSysUserStyle.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/excelstyle/ExcelExportSysUserStyle.java index 2ebbb8d..9799e13 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/excelstyle/ExcelExportSysUserStyle.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/excelstyle/ExcelExportSysUserStyle.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.excelstyle; +package org.jeecg.modules.system.excelstyle; import org.apache.poi.ss.usermodel.*; import org.jeecgframework.poi.excel.export.styler.ExcelExportStylerDefaultImpl; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysAnnouncementMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysAnnouncementMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java index 323bdf7..9b3d0d9 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysAnnouncementMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java @@ -1,10 +1,10 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.cpte.modules.system.entity.SysAnnouncement; +import org.jeecg.modules.system.entity.SysAnnouncement; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysAnnouncementSendMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java similarity index 72% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysAnnouncementSendMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java index 3b66e42..d5f4ed8 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysAnnouncementSendMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java @@ -1,10 +1,10 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.cpte.modules.system.entity.SysAnnouncementSend; -import org.cpte.modules.system.model.AnnouncementSendModel; +import org.jeecg.modules.system.entity.SysAnnouncementSend; +import org.jeecg.modules.system.model.AnnouncementSendModel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -23,7 +23,7 @@ public interface SysAnnouncementSendMapper extends BaseMapper getMyAnnouncementSendList(Page page,@Param("announcementSendModel") AnnouncementSendModel announcementSendModel); + List getMyAnnouncementSendList(Page page, @Param("announcementSendModel") AnnouncementSendModel announcementSendModel); /** * 获取一条记录 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysCategoryMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.java similarity index 79% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysCategoryMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.java index 713843a..7cb27c1 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysCategoryMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import java.util.List; import java.util.Map; @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.cpte.modules.system.entity.SysCategory; -import org.cpte.modules.system.model.TreeSelectModel; +import org.jeecg.modules.system.entity.SysCategory; +import org.jeecg.modules.system.model.TreeSelectModel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -26,7 +26,7 @@ public interface SysCategoryMapper extends BaseMapper { * @param query * @return */ - public List queryListByPid(@Param("pid") String pid,@Param("query") Map query); + List queryListByPid(@Param("pid") String pid, @Param("query") Map query); /** * 通过code查询分类字典表 @@ -34,7 +34,7 @@ public interface SysCategoryMapper extends BaseMapper { * @return */ @Select("SELECT ID FROM sys_category WHERE CODE = #{code,jdbcType=VARCHAR}") - public String queryIdByCode(@Param("code") String code); + String queryIdByCode(@Param("code") String code); /** * 获取分类字典最大的code diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysCheckRuleMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCheckRuleMapper.java similarity index 71% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysCheckRuleMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCheckRuleMapper.java index 3bf1f96..b0e4906 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysCheckRuleMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCheckRuleMapper.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.cpte.modules.system.entity.SysCheckRule; +import org.jeecg.modules.system.entity.SysCheckRule; /** * @Description: 编码校验规则 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysCommentMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCommentMapper.java similarity index 78% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysCommentMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCommentMapper.java index 37d8c25..1b756aa 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysCommentMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCommentMapper.java @@ -1,12 +1,12 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; -import org.cpte.modules.system.entity.SysComment; -import org.cpte.modules.system.vo.SysCommentFileVo; -import org.cpte.modules.system.vo.SysCommentVO; -import org.cpte.modules.system.vo.UserAvatar; +import org.jeecg.modules.system.entity.SysComment; +import org.jeecg.modules.system.vo.SysCommentFileVo; +import org.jeecg.modules.system.vo.SysCommentVO; +import org.jeecg.modules.system.vo.UserAvatar; import java.util.List; import java.util.Set; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDataLogMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java similarity index 64% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDataLogMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java index 945e35a..b0ef227 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDataLogMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import org.apache.ibatis.annotations.Param; -import org.cpte.modules.system.entity.SysDataLog; +import org.jeecg.modules.system.entity.SysDataLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -16,6 +16,6 @@ public interface SysDataLogMapper extends BaseMapper{ * @param dataId * @return */ - public String queryMaxDataVer(@Param("tableName") String tableName,@Param("dataId") String dataId); + String queryMaxDataVer(@Param("tableName") String tableName, @Param("dataId") String dataId); } diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDataSourceMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataSourceMapper.java similarity index 71% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDataSourceMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataSourceMapper.java index 4709c5d..504d267 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDataSourceMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataSourceMapper.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.cpte.modules.system.entity.SysDataSource; +import org.jeecg.modules.system.entity.SysDataSource; /** * @Description: 多数据源管理 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDepartMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java similarity index 89% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDepartMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java index fab8263..cff2e70 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDepartMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java @@ -1,16 +1,16 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; -import org.cpte.modules.system.entity.SysDepart; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.vo.SysDepartExportVo; -import org.cpte.modules.system.vo.SysDepartPositionVo; -import org.cpte.modules.system.vo.SysUserDepVo; -import org.cpte.modules.system.vo.lowapp.ExportDepartVo; +import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.vo.SysDepartExportVo; +import org.jeecg.modules.system.vo.SysDepartPositionVo; +import org.jeecg.modules.system.vo.SysUserDepVo; +import org.jeecg.modules.system.vo.lowapp.ExportDepartVo; import org.springframework.data.repository.query.Param; import java.util.List; @@ -30,7 +30,7 @@ public interface SysDepartMapper extends BaseMapper { * @param userId 用户id * @return List */ - public List queryUserDeparts(@Param("userId") String userId); + List queryUserDeparts(@Param("userId") String userId); /** * 根据用户名查询部门 @@ -38,7 +38,7 @@ public interface SysDepartMapper extends BaseMapper { * @param username * @return */ - public List queryDepartsByUsername(@Param("username") String username); + List queryDepartsByUsername(@Param("username") String username); /** * 根据用户名查询部门 @@ -46,7 +46,7 @@ public interface SysDepartMapper extends BaseMapper { * @param userId * @return */ - public List queryDepartsByUserId(@Param("userId") String userId); + List queryDepartsByUserId(@Param("userId") String userId); /** * 通过部门编码获取部门id @@ -54,14 +54,14 @@ public interface SysDepartMapper extends BaseMapper { * @return String */ @Select("select id from sys_depart where org_code=#{orgCode}") - public String queryDepartIdByOrgCode(@Param("orgCode") String orgCode); + String queryDepartIdByOrgCode(@Param("orgCode") String orgCode); /** * 通过部门id，查询部门下的用户的账号 * @param departIds 部门ID集合 * @return String */ - public List queryUserAccountByDepartIds(@Param("departIds") List departIds); + List queryUserAccountByDepartIds(@Param("departIds") List departIds); /** * 通过部门id 查询部门id,父id @@ -69,7 +69,7 @@ public interface SysDepartMapper extends BaseMapper { * @return */ @Select("select id,parent_id from sys_depart where id=#{departId}") - public SysDepart getParentDepartId(@Param("departId") String departId); + SysDepart getParentDepartId(@Param("departId") String departId); /** * 根据部门Id查询,当前和下级所有部门IDS diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDepartPermissionMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartPermissionMapper.java similarity index 70% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDepartPermissionMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartPermissionMapper.java index 657c5d9..682ec9c 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDepartPermissionMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartPermissionMapper.java @@ -1,6 +1,6 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; -import org.cpte.modules.system.entity.SysDepartPermission; +import org.jeecg.modules.system.entity.SysDepartPermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDepartRoleMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java similarity index 66% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDepartRoleMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java index 4cfd4fc..343fae4 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDepartRoleMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.cpte.modules.system.entity.SysDepartRole; +import org.jeecg.modules.system.entity.SysDepartRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -19,5 +19,5 @@ public interface SysDepartRoleMapper extends BaseMapper { * @param userId * @return */ - public List queryDeptRoleByDeptAndUser(@Param("orgCode") String orgCode, @Param("userId") String userId); + List queryDeptRoleByDeptAndUser(@Param("orgCode") String orgCode, @Param("userId") String userId); } diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDepartRolePermissionMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRolePermissionMapper.java similarity index 78% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDepartRolePermissionMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRolePermissionMapper.java index 14f3715..2d52875 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDepartRolePermissionMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRolePermissionMapper.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.cpte.modules.system.entity.SysDepartRolePermission; +import org.jeecg.modules.system.entity.SysDepartRolePermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDepartRoleUserMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.java similarity index 79% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDepartRoleUserMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.java index 88c8d98..f8e6d86 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDepartRoleUserMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleUserMapper.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.cpte.modules.system.entity.SysDepartRoleUser; +import org.jeecg.modules.system.entity.SysDepartRoleUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDictItemMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java similarity index 76% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDictItemMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java index 07e186b..6374053 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDictItemMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import org.apache.ibatis.annotations.Select; -import org.cpte.modules.system.entity.SysDictItem; +import org.jeecg.modules.system.entity.SysDictItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; @@ -22,5 +22,5 @@ public interface SysDictItemMapper extends BaseMapper { * @return */ @Select("SELECT * FROM sys_dict_item WHERE DICT_ID = #{mainId} order by sort_order asc, item_value asc") - public List selectItemsByMainId(String mainId); + List selectItemsByMainId(String mainId); } diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDictMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java similarity index 82% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDictMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java index b93ec3b..770c261 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysDictMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -10,9 +10,9 @@ import org.apache.ibatis.annotations.Update; import org.jeecg.common.system.vo.DictModel; import org.jeecg.common.system.vo.DictModelMany; import org.jeecg.common.system.vo.DictQuery; -import org.cpte.modules.system.entity.SysDict; -import org.cpte.modules.system.model.DuplicateCheckVo; -import org.cpte.modules.system.model.TreeSelectModel; +import org.jeecg.modules.system.entity.SysDict; +import org.jeecg.modules.system.model.DuplicateCheckVo; +import org.jeecg.modules.system.model.TreeSelectModel; import java.util.List; import java.util.Map; @@ -33,7 +33,7 @@ public interface SysDictMapper extends BaseMapper { * @return */ @Deprecated - public Long duplicateCheckCountSql(DuplicateCheckVo duplicateCheckVo); + Long duplicateCheckCountSql(DuplicateCheckVo duplicateCheckVo); /** * 重复校验 sql语句 @@ -41,14 +41,14 @@ public interface SysDictMapper extends BaseMapper { * @return */ @Deprecated - public Long duplicateCheckCountSqlNoDataId(DuplicateCheckVo duplicateCheckVo); + Long duplicateCheckCountSqlNoDataId(DuplicateCheckVo duplicateCheckVo); /** * 通过字典code获取字典数据 * @param code 字典code * @return List */ - public List queryDictItemsByCode(@Param("code") String code); + List queryDictItemsByCode(@Param("code") String code); /** * 查询有效的数据字典项 @@ -64,7 +64,7 @@ public interface SysDictMapper extends BaseMapper { * @param dictCodeList * @return */ - public List queryDictItemsByCodeList(@Param("dictCodeList") List dictCodeList); + List queryDictItemsByCodeList(@Param("dictCodeList") List dictCodeList); /** * 通过字典code获取字典数据 @@ -72,7 +72,7 @@ public interface SysDictMapper extends BaseMapper { * @param key * @return */ - public String queryDictTextByKey(@Param("code") String code,@Param("key") String key); + String queryDictTextByKey(@Param("code") String code, @Param("key") String key); /** * 可通过多个字典code查询翻译文本 @@ -86,19 +86,19 @@ public interface SysDictMapper extends BaseMapper { * 查询系统所有字典项 * @return */ - public List queryAllDictItems(List tenantIdList); + List queryAllDictItems(List tenantIdList); /** * 查询所有部门 作为字典信息 id -->value,departName -->text * @return */ - public List queryAllDepartBackDictModel(); + List queryAllDepartBackDictModel(); /** * 查询所有用户 作为字典信息 username -->value,realname -->text * @return */ - public List queryAllUserBackDictModel(); + List queryAllUserBackDictModel(); /** * 根据表名、显示字段名、存储字段名 查询树 @@ -121,14 +121,14 @@ public interface SysDictMapper extends BaseMapper { * @param id */ @Select("delete from sys_dict where id = #{id}") - public void deleteOneById(@Param("id") String id); + void deleteOneById(@Param("id") String id); /** * 查询被逻辑删除的数据 * @return */ @Select("select * from sys_dict where del_flag = 1") - public List queryDeleteList(); + List queryDeleteList(); /** * 修改状态值 @@ -136,7 +136,7 @@ public interface SysDictMapper extends BaseMapper { * @param id */ @Update("update sys_dict set del_flag = #{flag,jdbcType=INTEGER} where id = #{id,jdbcType=VARCHAR}") - public void updateDictDelFlag(@Param("flag") int delFlag, @Param("id") String id); + void updateDictDelFlag(@Param("flag") int delFlag, @Param("id") String id); /** @@ -146,7 +146,7 @@ public interface SysDictMapper extends BaseMapper { * @return */ @Deprecated - public Page queryDictTablePageList(Page page, @Param("query") DictQuery query); + Page queryDictTablePageList(Page page, @Param("query") DictQuery query); /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysFillRuleMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFillRuleMapper.java similarity index 70% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysFillRuleMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFillRuleMapper.java index 2108a34..73c70ae 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysFillRuleMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFillRuleMapper.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.cpte.modules.system.entity.SysFillRule; +import org.jeecg.modules.system.entity.SysFillRule; /** * @Description: 填值规则 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysFormFileMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFormFileMapper.java similarity index 71% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysFormFileMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFormFileMapper.java index bbdfdb3..28d08a6 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysFormFileMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysFormFileMapper.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.cpte.modules.system.entity.SysFormFile; +import org.jeecg.modules.system.entity.SysFormFile; /** * @Description: 表单评论文件 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysGatewayRouteMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysGatewayRouteMapper.java similarity index 88% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysGatewayRouteMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysGatewayRouteMapper.java index 03e823f..1e3b30b 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysGatewayRouteMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysGatewayRouteMapper.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.cpte.modules.system.entity.SysGatewayRoute; +import org.jeecg.modules.system.entity.SysGatewayRoute; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysLogMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java similarity index 92% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysLogMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java index 86e834d..47b8c5a 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysLogMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java @@ -1,11 +1,11 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import java.util.Date; import java.util.List; import java.util.Map; import org.apache.ibatis.annotations.Param; -import org.cpte.modules.system.entity.SysLog; +import org.jeecg.modules.system.entity.SysLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -22,7 +22,7 @@ public interface SysLogMapper extends BaseMapper { /** * 清空所有日志记录 */ - public void removeAll(); + void removeAll(); /** * 获取系统总访问次数 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysPackPermissionMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPackPermissionMapper.java similarity index 87% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysPackPermissionMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPackPermissionMapper.java index 3992981..7761cad 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysPackPermissionMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPackPermissionMapper.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.cpte.modules.system.entity.SysPackPermission; +import org.jeecg.modules.system.entity.SysPackPermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysPermissionDataRuleMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java similarity index 65% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysPermissionDataRuleMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java index 679b76a..cf77e5c 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysPermissionDataRuleMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.cpte.modules.system.entity.SysPermissionDataRule; +import org.jeecg.modules.system.entity.SysPermissionDataRule; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -23,6 +23,6 @@ public interface SysPermissionDataRuleMapper extends BaseMapper queryDataRuleIds(@Param("username") String username,@Param("permissionId") String permissionId); + List queryDataRuleIds(@Param("username") String username, @Param("permissionId") String permissionId); } diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysPermissionMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java similarity index 73% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysPermissionMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java index e215099..f42a765 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysPermissionMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import java.util.List; @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; -import org.cpte.modules.system.entity.SysPermission; -import org.cpte.modules.system.model.TreeModel; +import org.jeecg.modules.system.entity.SysPermission; +import org.jeecg.modules.system.model.TreeModel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -25,14 +25,14 @@ public interface SysPermissionMapper extends BaseMapper { * @param parentId * @return */ - public List queryListByParentId(@Param("parentId") String parentId); + List queryListByParentId(@Param("parentId") String parentId); /** * 根据用户查询用户权限 * @param userId 用户ID * @return List */ - public List queryByUser(@Param("userId") String userId); + List queryByUser(@Param("userId") String userId); /** * 修改菜单状态字段： 是否子节点 @@ -41,22 +41,22 @@ public interface SysPermissionMapper extends BaseMapper { * @return int */ @Update("update sys_permission set is_leaf=#{leaf} where id = #{id}") - public int setMenuLeaf(@Param("id") String id,@Param("leaf") int leaf); + int setMenuLeaf(@Param("id") String id, @Param("leaf") int leaf); /** * 切换vue3菜单 */ @Update("alter table sys_permission rename to sys_permission_v2") - public void backupVue2Menu(); + void backupVue2Menu(); @Update("alter table sys_permission_v3 rename to sys_permission") - public void changeVue3Menu(); + void changeVue3Menu(); /** * 获取模糊匹配规则的数据权限URL * @return List */ @Select("SELECT url FROM sys_permission WHERE del_flag = 0 and menu_type = 2 and url like '%*%'") - public List queryPermissionUrlWithStar(); + List queryPermissionUrlWithStar(); /** @@ -65,7 +65,7 @@ public interface SysPermissionMapper extends BaseMapper { * @param username * @return */ - public int queryCountByUsername(@Param("username") String username, @Param("permission") SysPermission sysPermission); + int queryCountByUsername(@Param("username") String username, @Param("permission") SysPermission sysPermission); /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysPositionMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPositionMapper.java similarity index 92% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysPositionMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPositionMapper.java index 81ec997..5fecb45 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysPositionMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPositionMapper.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Select; -import org.cpte.modules.system.entity.SysPosition; +import org.jeecg.modules.system.entity.SysPosition; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysRoleIndexMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleIndexMapper.java similarity index 71% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysRoleIndexMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleIndexMapper.java index b710506..8660f07 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysRoleIndexMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleIndexMapper.java @@ -1,6 +1,6 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; -import org.cpte.modules.system.entity.SysRoleIndex; +import org.jeecg.modules.system.entity.SysRoleIndex; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysRoleMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java similarity index 92% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysRoleMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java index b6b7af3..417ac4d 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysRoleMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRoleMapper.java @@ -1,15 +1,15 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.cpte.modules.system.entity.SysRole; +import org.jeecg.modules.system.entity.SysRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.vo.SysUserPositionVo; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.vo.SysUserPositionVo; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysRolePermissionMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.java similarity index 70% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysRolePermissionMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.java index df1dff9..25c08d2 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysRolePermissionMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysRolePermissionMapper.java @@ -1,6 +1,6 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; -import org.cpte.modules.system.entity.SysRolePermission; +import org.jeecg.modules.system.entity.SysRolePermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysTableWhiteListMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTableWhiteListMapper.java similarity index 70% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysTableWhiteListMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTableWhiteListMapper.java index 53a0b6c..b13ff3a 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysTableWhiteListMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTableWhiteListMapper.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.cpte.modules.system.entity.SysTableWhiteList; +import org.jeecg.modules.system.entity.SysTableWhiteList; /** * @Description: 系统表白名单 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysTenantMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantMapper.java similarity index 91% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysTenantMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantMapper.java index 3c8e8cc..c2b6b9b 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysTenantMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantMapper.java @@ -1,14 +1,14 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.cpte.modules.system.entity.SysTenant; -import org.cpte.modules.system.vo.tenant.TenantPackUser; -import org.cpte.modules.system.vo.tenant.TenantPackUserCount; -import org.cpte.modules.system.vo.tenant.UserDepart; -import org.cpte.modules.system.vo.tenant.UserPosition; +import org.jeecg.modules.system.entity.SysTenant; +import org.jeecg.modules.system.vo.tenant.TenantPackUser; +import org.jeecg.modules.system.vo.tenant.TenantPackUserCount; +import org.jeecg.modules.system.vo.tenant.UserDepart; +import org.jeecg.modules.system.vo.tenant.UserPosition; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysTenantPackMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantPackMapper.java similarity index 90% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysTenantPackMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantPackMapper.java index 217c64d..3384a03 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysTenantPackMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantPackMapper.java @@ -1,10 +1,10 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.cpte.modules.system.entity.SysTenantPack; +import org.jeecg.modules.system.entity.SysTenantPack; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysTenantPackUserMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantPackUserMapper.java similarity index 93% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysTenantPackUserMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantPackUserMapper.java index 577b2ba..324b0f5 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysTenantPackUserMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTenantPackUserMapper.java @@ -1,11 +1,11 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.cpte.modules.system.entity.SysTenantPack; -import org.cpte.modules.system.entity.SysTenantPackUser; +import org.jeecg.modules.system.entity.SysTenantPack; +import org.jeecg.modules.system.entity.SysTenantPackUser; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysThirdAccountMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysThirdAccountMapper.java similarity index 85% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysThirdAccountMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysThirdAccountMapper.java index 8fc7d74..e81f0d0 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysThirdAccountMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysThirdAccountMapper.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; -import org.cpte.modules.system.entity.SysThirdAccount; -import org.cpte.modules.system.vo.thirdapp.JwUserDepartVo; +import org.jeecg.modules.system.entity.SysThirdAccount; +import org.jeecg.modules.system.vo.thirdapp.JwUserDepartVo; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysThirdAppConfigMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysThirdAppConfigMapper.java similarity index 88% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysThirdAppConfigMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysThirdAppConfigMapper.java index ccb5ddf..e7e441c 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysThirdAppConfigMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysThirdAppConfigMapper.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.cpte.modules.system.entity.SysThirdAppConfig; +import org.jeecg.modules.system.entity.SysThirdAppConfig; import org.springframework.data.repository.query.Param; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysUserDepPostMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserDepPostMapper.java similarity index 86% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysUserDepPostMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserDepPostMapper.java index 6bc61bf..43b0282 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysUserDepPostMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserDepPostMapper.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.cpte.modules.system.entity.SysUserDepPost; +import org.jeecg.modules.system.entity.SysUserDepPost; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysUserDepartMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysUserDepartMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java index 37c253b..5c4eb46 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysUserDepartMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java @@ -1,12 +1,12 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.entity.SysUserDepart; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.entity.SysUserDepart; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysUserMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java similarity index 93% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysUserMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java index 339ac20..879e5be 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysUserMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.cpte.modules.system.entity.SysUser; +import org.jeecg.modules.system.entity.SysUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.cpte.modules.system.model.SysUserSysDepPostModel; -import org.cpte.modules.system.model.SysUserSysDepartModel; -import org.cpte.modules.system.vo.SysUserDepVo; +import org.jeecg.modules.system.model.SysUserSysDepPostModel; +import org.jeecg.modules.system.model.SysUserSysDepartModel; +import org.jeecg.modules.system.vo.SysUserDepVo; import java.util.List; @@ -28,14 +28,14 @@ public interface SysUserMapper extends BaseMapper { * @param username * @return */ - public SysUser getUserByName(@Param("username") String username); + SysUser getUserByName(@Param("username") String username); /** * 通过用户账号查询用户Id * @param username * @return */ - public String getUserIdByName(@Param("username") String username); + String getUserIdByName(@Param("username") String username); /** * 根据部门Id查询用户信息 @@ -92,7 +92,7 @@ public interface SysUserMapper extends BaseMapper { * @param phone * @return */ - public SysUser getUserByPhone(@Param("phone") String phone); + SysUser getUserByPhone(@Param("phone") String phone); /** @@ -100,7 +100,7 @@ public interface SysUserMapper extends BaseMapper { * @param email * @return */ - public SysUser getUserByEmail(@Param("email")String email); + SysUser getUserByEmail(@Param("email") String email); /** * 根据 orgCode 查询用户，包括子部门下的用户 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysUserPositionMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserPositionMapper.java similarity index 92% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysUserPositionMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserPositionMapper.java index 9e8f744..f2338e7 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysUserPositionMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserPositionMapper.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import java.util.List; @@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Select; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.entity.SysUserPosition; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.entity.SysUserPosition; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; -import org.cpte.modules.system.vo.SysUserPositionVo; +import org.jeecg.modules.system.vo.SysUserPositionVo; /** * @Description: 用户职位关系表 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysUserRoleMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java similarity index 93% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysUserRoleMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java index 78e46f5..81048cf 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysUserRoleMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserRoleMapper.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.cpte.modules.system.entity.SysUserRole; +import org.jeecg.modules.system.entity.SysUserRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysUserTenantMapper.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserTenantMapper.java similarity index 94% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysUserTenantMapper.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserTenantMapper.java index ad1f774..bedbada 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/SysUserTenantMapper.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserTenantMapper.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.mapper; +package org.jeecg.modules.system.mapper; import java.util.List; @@ -7,12 +7,12 @@ import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; -import org.cpte.modules.system.entity.SysTenant; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.entity.SysUserTenant; +import org.jeecg.modules.system.entity.SysTenant; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.entity.SysUserTenant; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.cpte.modules.system.vo.SysUserTenantVo; -import org.cpte.modules.system.vo.thirdapp.JwUserDepartVo; +import org.jeecg.modules.system.vo.SysUserTenantVo; +import org.jeecg.modules.system.vo.thirdapp.JwUserDepartVo; /** * @Description: sys_user_tenant_relation diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysAnnouncementMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysAnnouncementMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml index dc528c3..1ab7af4 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysAnnouncementMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml @@ -1,8 +1,8 @@ - + - + diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysAnnouncementSendMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml index 05d31db..5e3ced9 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysAnnouncementSendMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml @@ -1,8 +1,8 @@ - + - + diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysCategoryMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysCategoryMapper.xml similarity index 89% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysCategoryMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysCategoryMapper.xml index b9f003f..741670c 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysCategoryMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysCategoryMapper.xml @@ -1,8 +1,8 @@ - + - select code, name as "title", id as "key", diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDataSourceMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysCheckRuleMapper.xml similarity index 72% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDataSourceMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysCheckRuleMapper.xml index 2557a67..47a12fd 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDataSourceMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysCheckRuleMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysCommentMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysCommentMapper.xml similarity index 87% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysCommentMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysCommentMapper.xml index dba5faa..eec4a63 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysCommentMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysCommentMapper.xml @@ -1,8 +1,8 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -50,7 +50,7 @@ - select b.id as sys_form_file_id, c.id as file_id, @@ -69,7 +69,7 @@ - select id, avatar, realname from sys_user WHERE id IN diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDataLogMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDataLogMapper.xml similarity index 85% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDataLogMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDataLogMapper.xml index 3d23d5f..29b9c3a 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDataLogMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDataLogMapper.xml @@ -1,6 +1,6 @@ - + + - SELECT * FROM sys_depart WHERE id IN ( @@ -45,7 +45,7 @@ - SELECT * FROM sys_depart where del_flag = '0' @@ -59,12 +59,12 @@ - select * from sys_depart where del_flag = '0' and org_category='1' and org_code= #{orgCode,jdbcType=VARCHAR} - SELECT * FROM sys_depart WHERE del_flag = '0' @@ -89,7 +89,7 @@ - SELECT * FROM sys_depart WHERE @@ -104,7 +104,7 @@ - SELECT id,depart_name,parent_id FROM sys_depart WHERE tenant_id = #{tenantId} @@ -121,7 +121,7 @@ - SELECT id,depart_name,org_code,parent_id FROM sys_depart where depart_name = #{departName} @@ -135,7 +135,7 @@ - SELECT sd.depart_name, sud.user_id, sd.id as deptId, sd.parent_id FROM sys_depart sd RIGHT JOIN sys_user_depart sud on sd.id = sud.dep_id and sd.del_flag = 0 @@ -148,7 +148,7 @@ - SELECT id,depart_name,org_code,parent_id FROM sys_depart where depart_name = #{departName} @@ -169,7 +169,7 @@ - SELECT id,depart_name,parent_id,depart_name_en,depart_order,description,org_category,org_code,mobile,fax,address,memo, position_id FROM sys_depart WHERE 1=1 @@ -195,7 +195,7 @@ - SELECT id,depart_name,org_code,parent_id FROM sys_depart where 1=1 @@ -208,7 +208,7 @@ - SELECT sd.depart_name, sud.user_id, sd.id as deptId, sd.parent_id, sd.org_category FROM sys_depart sd RIGHT JOIN sys_user_depart sud on sd.id = sud.dep_id and sd.del_flag = 0 @@ -220,7 +220,7 @@ - select sd.depart_name, sd.id, sd.iz_leaf, sd.org_category, sd.parent_id, sd.org_code from sys_depart sd left join sys_position sp on sd.position_id = sp.id where sd.parent_id = #{parentId} and sd.org_category = '3' @@ -234,13 +234,13 @@ - select depart_name as positionName,id,iz_leaf,parent_id,org_category,org_code, dep_post_parent_id from sys_depart where id = #{departId} - select depart_name as positionName,id,iz_leaf,parent_id,org_category,org_code, dep_post_parent_id from sys_depart where org_code like #{orgCode} and org_category = '3' diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDepartPermissionMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartPermissionMapper.xml similarity index 66% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDepartPermissionMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartPermissionMapper.xml index 8d115c2..a234533 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDepartPermissionMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartPermissionMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDepartRoleMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleMapper.xml similarity index 72% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDepartRoleMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleMapper.xml index 71f79f8..a9e3f05 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDepartRoleMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleMapper.xml @@ -1,9 +1,9 @@ - + - SELECT * FROM sys_depart_role WHERE depart_id IN ( SELECT id FROM sys_depart WHERE id IN (SELECT dep_id FROM sys_user_depart WHERE user_id=#{userId}) AND org_code LIKE CONCAT(#{orgCode},'%') diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDepartRolePermissionMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRolePermissionMapper.xml similarity index 82% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDepartRolePermissionMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRolePermissionMapper.xml index f49b29d..729322e 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDepartRolePermissionMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRolePermissionMapper.xml @@ -1,6 +1,6 @@ - + DELETE FROM sys_depart_role_permission diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDepartRoleUserMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleUserMapper.xml similarity index 83% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDepartRoleUserMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleUserMapper.xml index c604131..27a0353 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDepartRoleUserMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleUserMapper.xml @@ -1,6 +1,6 @@ - + DELETE FROM sys_depart_role_user diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDictItemMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictItemMapper.xml similarity index 68% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDictItemMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictItemMapper.xml index 2cf39e6..a1eee4c 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDictItemMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictItemMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDictMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDictMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml index 566afff..157ca53 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysDictMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml @@ -1,6 +1,6 @@ - + + - - select ${text} as "title", ${code} as "key", @@ -209,7 +209,7 @@ - select id,dict_name,dict_code from sys_dict where del_flag = 0 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysRoleIndexMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysFillRuleMapper.xml similarity index 71% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysRoleIndexMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysFillRuleMapper.xml index 0c2826a..b0d5e1e 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysRoleIndexMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysFillRuleMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysGatewayRouteMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysGatewayRouteMapper.xml similarity index 91% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysGatewayRouteMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysGatewayRouteMapper.xml index bfccfc3..4e29a00 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysGatewayRouteMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysGatewayRouteMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysLogMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysLogMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml index fe90f08..e853dcc 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysLogMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysPackPermissionMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPackPermissionMapper.xml similarity index 90% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysPackPermissionMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPackPermissionMapper.xml index 445b4a8..ef58b88 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysPackPermissionMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPackPermissionMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysPermissionMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysPermissionMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml index ec22759..a724503 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysPermissionMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -181,7 +181,7 @@ - SELECT id, parent_id, diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysPositionMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPositionMapper.xml similarity index 72% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysPositionMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPositionMapper.xml index 691c8c7..778c3f1 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysPositionMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPositionMapper.xml @@ -1,9 +1,9 @@ - + - SELECT sp.name,sp.id FROM sys_position sp INNER JOIN sys_user_position sup on sp.id = sup.position_id WHERE @@ -11,7 +11,7 @@ - SELECT name FROM sys_position WHERE id IN diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleIndexMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleIndexMapper.xml new file mode 100644 index 0000000..4b7cc60 --- /dev/null +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleIndexMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysRoleMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml similarity index 85% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysRoleMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml index f08da9a..e046cff 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysRoleMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml @@ -1,8 +1,8 @@ - + - SELECT * from sys_role WHERE 1=1 @@ -41,13 +41,13 @@ - SELECT * from sys_role WHERE role_code = #{roleCode} - SELECT id, role_code from sys_role WHERE id in (SELECT role_id from sys_user_role WHERE user_id = #{userId}) @@ -56,7 +56,7 @@ - SELECT sr.role_name as name,sur.user_id FROM sys_role sr RIGHT JOIN sys_user_role sur on sur.role_id = sr.id WHERE sur.user_id IN diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysTableWhiteListMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTableWhiteListMapper.xml similarity index 67% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysTableWhiteListMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTableWhiteListMapper.xml index e9ee4ca..be0f212 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysTableWhiteListMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTableWhiteListMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysTenantMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantMapper.xml similarity index 86% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysTenantMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantMapper.xml index 25d410e..0b4240a 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysTenantMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantMapper.xml @@ -1,9 +1,9 @@ - + - SELECT id,name,company_logo,house_number,status FROM sys_tenant WHERE del_flag = 1 @@ -40,7 +40,7 @@ - SELECT pack_code, count(*) as user_count FROM sys_tenant_pack a join sys_tenant_pack_user b on a.id = b.pack_id where a.tenant_id = #{tenantId} and b.tenant_id = #{tenantId} @@ -70,7 +70,7 @@ - SELECT c.id, c.username, c.realname, c.phone, c.avatar, a.pack_name, a.id as pack_id FROM sys_user c join sys_tenant_pack_user b on c.id = b.user_id join sys_tenant_pack a on a.id = b.pack_id @@ -86,7 +86,7 @@ - SELECT c.id as user_id,a.depart_name FROM sys_user c join sys_user_depart b on c.id = b.user_id join sys_depart a on a.id = b.dep_id @@ -98,7 +98,7 @@ - SELECT c.id as user_id, name as position_name FROM sys_user c join sys_user_position b on c.id = b.user_id join sys_position a on a.id = b.position_id @@ -110,7 +110,7 @@ - SELECT c.id, c.username, c.realname, c.phone, c.avatar, a.pack_name, a.id as pack_id FROM sys_user c join sys_tenant_pack_user b on c.id = b.user_id join sys_tenant_pack a on a.id = b.pack_id @@ -133,7 +133,7 @@ - SELECT st.id,st.name FROM sys_tenant st LEFT JOIN sys_user_tenant sut on st.id= sut.tenant_id and st.status = 1 and sut.status='1' WHERE sut.user_id = #{userId} diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysTenantPackMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantPackMapper.xml similarity index 86% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysTenantPackMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantPackMapper.xml index 8814d15..b59f61d 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysTenantPackMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantPackMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysTenantPackUserMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantPackUserMapper.xml similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysTenantPackUserMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantPackUserMapper.xml index 4164fa3..e9c7f13 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysTenantPackUserMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysTenantPackUserMapper.xml @@ -1,6 +1,6 @@ - + + - SELECT su.id userId, su.realname, su.avatar, sta.realname as wechatRealName, sta.third_user_id as wechatUserId, sta.id as thirdId FROM sys_third_account sta LEFT JOIN sys_user su on sta.sys_user_id = su.id diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysThirdAppConfigMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysThirdAppConfigMapper.xml similarity index 65% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysThirdAppConfigMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysThirdAppConfigMapper.xml index 81a503d..c166ad2 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysThirdAppConfigMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysThirdAppConfigMapper.xml @@ -1,16 +1,16 @@ - + - select * from sys_third_app_config where tenant_id = #{tenantId} and status = 1 - select * from sys_third_app_config where tenant_id = #{tenantId} and third_type = #{thirdType} diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysUserDepartMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml similarity index 87% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysUserDepartMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml index 5c24544..dd97aac 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysUserDepartMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml @@ -1,14 +1,14 @@ - - SELECT * FROM sys_user_depart WHERE user_id = #{userId, jdbcType=VARCHAR} - select a.* from sys_user a join sys_user_depart b on b.user_id = a.id join sys_depart c on b.dep_id = c.id @@ -22,7 +22,7 @@ - select DISTINCT a.* from sys_user a left join sys_user_depart b on b.user_id = a.id @@ -40,7 +40,7 @@ - select DISTINCT a.* from sys_user a left join sys_user_depart b on b.user_id = a.id left join sys_depart c on b.dep_id = c.id @@ -57,7 +57,7 @@ - select DISTINCT a.* from sys_user a left join sys_user_depart b on b.user_id = a.id left join sys_depart c on b.dep_id = c.id @@ -96,7 +96,7 @@ - select * from sys_user_depart where user_id = #{userId} @@ -106,7 +106,7 @@ - select su.id,su.realname from sys_user_depart sud INNER JOIN sys_user su ON sud.user_id = su.id INNER JOIN sys_user_tenant sut ON su.id = sut.user_id diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysUserMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml similarity index 91% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysUserMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml index b2109d8..0f331da 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysUserMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml @@ -1,9 +1,9 @@ - + - select * from sys_user where username = #{username} and del_flag = 0 @@ -13,7 +13,7 @@ - select * from sys_user where del_flag = 0 and id in (select user_id from sys_user_depart where dep_id=#{departId}) and username = #{username} @@ -29,7 +29,7 @@ - select d.depart_name,ud.user_id from sys_user_depart ud,sys_depart d where d.id = ud.dep_id and ud.user_id in #{id} @@ -37,7 +37,7 @@ - select * from sys_user where del_flag = 0 and id in (select user_id from sys_user_depart where dep_id in @@ -52,7 +52,7 @@ - select * from sys_user where del_flag = 0 and id in (select user_id from sys_user_role where role_id=#{roleId}) and username = #{username} @@ -79,12 +79,12 @@ - select * from sys_user where phone = #{phone} and del_flag = 0 - select * from sys_user where email = #{email} and del_flag = 0 @@ -114,7 +114,7 @@ - SELECT sys_user.id AS id, sys_user.realname AS realname, @@ -155,7 +155,7 @@ - SELECT * FROM sys_user ${ew.customSqlSegment} @@ -195,7 +195,7 @@ - select * from sys_user where del_flag = 0 and id in (select user_id from sys_user_depart where dep_id in @@ -210,7 +210,7 @@ - select DISTINCT a.* from sys_user a left join sys_user_role sur on sur.user_id = a.id where @@ -238,7 +238,7 @@ - select su.id,su.username,su.realname,su.sex,su.avatar,su.create_time,sut.create_by from sys_user su join sys_user_tenant sut on sut.user_id = su.id and sut.status = '2' where @@ -286,7 +286,7 @@ - select su.* from sys_user su join sys_user_tenant sut on su.id = sut.user_id where su.del_flag = 0 @@ -329,7 +329,7 @@ - SELECT su.* from ( SELECT su.create_time,su.realname,su.username,su.phone FROM sys_user su @@ -363,7 +363,7 @@ - SELECT su.* from ( SELECT su.create_time,su.realname,su.username,su.phone FROM sys_user su @@ -400,7 +400,7 @@ - SELECT su.* from ( SELECT su.id, su.create_time, su.realname, su.username, su.phone, su.avatar, su.birthday, su.sex, su.email, diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysUserPositionMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserPositionMapper.xml similarity index 89% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysUserPositionMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserPositionMapper.xml index 1d9bfe8..77b3f68 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysUserPositionMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserPositionMapper.xml @@ -1,9 +1,9 @@ - + - SELECT su.realname,su.id,su.username,su.email,su.phone,su.work_no FROM sys_user_position sup INNER JOIN sys_user su on sup.user_id = su.id and su.del_flag = 0 @@ -44,7 +44,7 @@ - SELECT sp.name,sup.user_id FROM sys_position sp RIGHT JOIN sys_user_position sup on sup.position_id = sp.id WHERE sup.user_id IN diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysUserTenantMapper.xml b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserTenantMapper.xml similarity index 91% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysUserTenantMapper.xml rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserTenantMapper.xml index be2e66a..6e71adb 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/mapper/xml/SysUserTenantMapper.xml +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserTenantMapper.xml @@ -1,9 +1,9 @@ - + - SELECT su.id,su.username,su.realname,su.sex,su.phone FROM sys_user su JOIN sys_user_tenant str ON str.user_id = su.id and str.status = '1' WHERE su.del_flag = 0 @@ -38,7 +38,7 @@ - SELECT st.id as tenantUserId,st.name,st.trade,st.house_number,st.create_by,sut.status as userTenantStatus,sut.user_id as id FROM sys_user_tenant sut LEFT JOIN sys_tenant st ON sut.tenant_id = st.id @@ -69,7 +69,7 @@ - SELECT su.id,su.realname,su.username,su.email,su.phone,su.avatar,su.work_no,su.org_code,sut.status,su.create_time,st.create_by FROM sys_user_tenant sut RIGHT JOIN sys_user su on sut.user_id = su.id and su.del_flag = 0 @@ -117,7 +117,7 @@ - SELECT st.id,st.name FROM sys_user_tenant sut JOIN sys_tenant st ON sut.tenant_id = st.id AND st.del_flag = 0 AND st.status = 1 WHERE @@ -137,7 +137,7 @@ - SELECT st.id,st.name,st.status,st.trade,st.company_size,st.company_address,st.company_logo,st.house_number,st.work_place,st.position,st.department,st.create_by FROM sys_user_tenant sut JOIN sys_tenant st ON sut.tenant_id = st.id AND st.del_flag = 0 AND st.status = 1 WHERE sut.user_id = #{userId} @@ -173,7 +173,7 @@ - SELECT su.id userId,su.realname,su.avatar FROM sys_user_tenant sut JOIN sys_tenant st ON sut.tenant_id = st.id and st.status = 1 and st.del_flag = 0 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/AnnouncementSendModel.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/AnnouncementSendModel.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java index 7ad705c..c399b00 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/AnnouncementSendModel.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.model; +package org.jeecg.modules.system.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/DepartIdModel.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/DepartIdModel.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java index e33b45f..5a5c703 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/DepartIdModel.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java @@ -1,10 +1,10 @@ -package org.cpte.modules.system.model; +package org.jeecg.modules.system.model; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.cpte.modules.system.entity.SysDepart; +import org.jeecg.modules.system.entity.SysDepart; /** *

diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/DuplicateCheckVo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/DuplicateCheckVo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java index cf47dd6..9bdd36b 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/DuplicateCheckVo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.model; +package org.jeecg.modules.system.model; import java.io.Serializable; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/SysDepartTreeModel.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/SysDepartTreeModel.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java index e518f3b..6ecf410 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/SysDepartTreeModel.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java @@ -1,6 +1,6 @@ -package org.cpte.modules.system.model; +package org.jeecg.modules.system.model; -import org.cpte.modules.system.entity.SysDepart; +import org.jeecg.modules.system.entity.SysDepart; import java.io.Serializable; import java.util.ArrayList; @@ -121,11 +121,7 @@ public class SysDepartTreeModel implements Serializable{ this.directorUserIds = sysDepart.getDirectorUserIds(); this.positionId = sysDepart.getPositionId(); this.depPostParentId = sysDepart.getDepPostParentId(); - if(0 == sysDepart.getIzLeaf()){ - this.isLeaf = false; - }else{ - this.isLeaf = true; - } + this.isLeaf = 0 != sysDepart.getIzLeaf(); } public boolean getIsLeaf() { diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/SysDictTree.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/SysDictTree.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/SysDictTree.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/SysDictTree.java index cbd0c0a..fb7983a 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/SysDictTree.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/SysDictTree.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.model; +package org.jeecg.modules.system.model; import java.io.Serializable; import java.util.Date; -import org.cpte.modules.system.entity.SysDict; +import org.jeecg.modules.system.entity.SysDict; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/SysLoginModel.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/SysLoginModel.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/SysLoginModel.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/SysLoginModel.java index fde1064..71e6787 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/SysLoginModel.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/SysLoginModel.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.model; +package org.jeecg.modules.system.model; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/SysPermissionTree.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/SysPermissionTree.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java index 1147970..dd4f732 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/SysPermissionTree.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java @@ -1,10 +1,10 @@ -package org.cpte.modules.system.model; +package org.jeecg.modules.system.model; import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.cpte.modules.system.entity.SysPermission; +import org.jeecg.modules.system.entity.SysPermission; /** * @Description: 菜单树，封装树结构 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/SysUserSysDepPostModel.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/SysUserSysDepPostModel.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/SysUserSysDepPostModel.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/SysUserSysDepPostModel.java index 751a24e..f4e3f21 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/SysUserSysDepPostModel.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/SysUserSysDepPostModel.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.model; +package org.jeecg.modules.system.model; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableLogic; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/SysUserSysDepartModel.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/SysUserSysDepartModel.java similarity index 92% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/SysUserSysDepartModel.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/SysUserSysDepartModel.java index 928224b..50b29b3 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/SysUserSysDepartModel.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/SysUserSysDepartModel.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.model; +package org.jeecg.modules.system.model; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/ThirdLoginModel.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/ThirdLoginModel.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/ThirdLoginModel.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/ThirdLoginModel.java index 8efd56c..481e27b 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/ThirdLoginModel.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/ThirdLoginModel.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.model; +package org.jeecg.modules.system.model; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/TreeModel.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/TreeModel.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/TreeModel.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/TreeModel.java index c4b898c..cedabb1 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/TreeModel.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/TreeModel.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.model; +package org.jeecg.modules.system.model; import java.io.Serializable; import java.util.ArrayList; @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.cpte.modules.system.entity.SysPermission; +import org.jeecg.modules.system.entity.SysPermission; /** * 树形列表用到 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/TreeSelectModel.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/TreeSelectModel.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/TreeSelectModel.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/TreeSelectModel.java index 18a7378..ad61ccf 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/model/TreeSelectModel.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/model/TreeSelectModel.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.model; +package org.jeecg.modules.system.model; import java.io.Serializable; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/rule/CategoryCodeRule.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java similarity index 92% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/rule/CategoryCodeRule.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java index b1faef8..fcf2921 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/rule/CategoryCodeRule.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.rule; +package org.jeecg.modules.system.rule; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -7,8 +7,8 @@ import org.jeecg.common.handler.IFillRuleHandler; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.YouBianCodeUtil; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.system.entity.SysCategory; -import org.cpte.modules.system.mapper.SysCategoryMapper; +import org.jeecg.modules.system.entity.SysCategory; +import org.jeecg.modules.system.mapper.SysCategoryMapper; import java.util.List; @@ -62,7 +62,7 @@ public class CategoryCodeRule implements IFillRuleHandler { } else { //情况2 //update-begin---author:wangshuai ---date:20230424 for：【issues/4846】开启saas多租户功能后，租户管理员在添加分类字典时，报错------------ - SysCategory parent = (SysCategory) baseMapper.selectSysCategoryById(categoryPid); + SysCategory parent = baseMapper.selectSysCategoryById(categoryPid); //update-end---author:wangshuai ---date:20230424 for：【issues/4846】开启saas多租户功能后，租户管理员在添加分类字典时，报错------------ categoryCode = YouBianCodeUtil.getSubYouBianCode(parent.getCode(), null); } diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/rule/OrderNumberRule.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/rule/OrderNumberRule.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/rule/OrderNumberRule.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/rule/OrderNumberRule.java index 588ec30..24b2f1b 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/rule/OrderNumberRule.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/rule/OrderNumberRule.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.rule; +package org.jeecg.modules.system.rule; import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang.StringUtils; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/rule/OrgCodeRule.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/rule/OrgCodeRule.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.java index 709e137..56c028f 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/rule/OrgCodeRule.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.rule; +package org.jeecg.modules.system.rule; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -8,8 +8,8 @@ import io.netty.util.internal.StringUtil; import org.jeecg.common.handler.IFillRuleHandler; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.YouBianCodeUtil; -import org.cpte.modules.system.entity.SysDepart; -import org.cpte.modules.system.service.ISysDepartService; +import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.system.service.ISysDepartService; import java.util.ArrayList; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/security/DictQueryBlackListHandler.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/security/DictQueryBlackListHandler.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/security/DictQueryBlackListHandler.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/security/DictQueryBlackListHandler.java index c87a44b..676ae46 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/security/DictQueryBlackListHandler.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/security/DictQueryBlackListHandler.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.security; +package org.jeecg.modules.system.security; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.util.oConvertUtils; @@ -6,6 +6,7 @@ import org.jeecg.common.util.security.AbstractQueryBlackListHandler; import org.springframework.stereotype.Component; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; @@ -27,7 +28,7 @@ public class DictQueryBlackListHandler extends AbstractQueryBlackListHandler { //针对转义字符进行解码 try { if (dictCodeString.contains("%")) { - dictCodeString = URLDecoder.decode(dictCodeString, "UTF-8"); + dictCodeString = URLDecoder.decode(dictCodeString, StandardCharsets.UTF_8); } } catch (Exception e) { //e.printStackTrace(); @@ -70,7 +71,7 @@ public class DictQueryBlackListHandler extends AbstractQueryBlackListHandler { String tableName = arr[0].trim(); //【20230814】解决使用参数tableName=sys_user t&复测，漏洞仍然存在 if (tableName.contains(".")) { - tableName = tableName.substring(tableName.indexOf(".")+1, tableName.length()).trim(); + tableName = tableName.substring(tableName.indexOf(".")+1).trim(); } if (tableName.contains(" ")) { tableName = tableName.substring(0, tableName.indexOf(" ")).trim(); diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysAnnouncementSendService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java similarity index 65% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysAnnouncementSendService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java index 8600304..6123ea7 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysAnnouncementSendService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; -import org.cpte.modules.system.entity.SysAnnouncementSend; -import org.cpte.modules.system.model.AnnouncementSendModel; +import org.jeecg.modules.system.entity.SysAnnouncementSend; +import org.jeecg.modules.system.model.AnnouncementSendModel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -20,7 +20,7 @@ public interface ISysAnnouncementSendService extends IService getMyAnnouncementSendPage(Page page,AnnouncementSendModel announcementSendModel); + Page getMyAnnouncementSendPage(Page page, AnnouncementSendModel announcementSendModel); /** * 根据消息发送记录ID获取消息内容 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysAnnouncementService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java similarity index 78% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysAnnouncementService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java index 1912d6c..1d7fb00 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysAnnouncementService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java @@ -1,10 +1,10 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.cpte.modules.system.entity.SysAnnouncement; +import org.jeecg.modules.system.entity.SysAnnouncement; import java.util.Date; import java.util.List; @@ -21,21 +21,21 @@ public interface ISysAnnouncementService extends IService { * 保存系统通告 * @param sysAnnouncement */ - public void saveAnnouncement(SysAnnouncement sysAnnouncement); + void saveAnnouncement(SysAnnouncement sysAnnouncement); /** * 修改系统通告 * @param sysAnnouncement * @return */ - public boolean upDateAnnouncement(SysAnnouncement sysAnnouncement); + boolean upDateAnnouncement(SysAnnouncement sysAnnouncement); /** * 保存系统通告 * @param title 标题 * @param msgContent 信息内容 */ - public void saveSysAnnouncement(String title, String msgContent); + void saveSysAnnouncement(String title, String msgContent); /** * 分页查询系统通告 @@ -44,7 +44,7 @@ public interface ISysAnnouncementService extends IService { * @param msgCategory 消息类型 * @return Page */ - public Page querySysCementPageByUserId(Page page, String userId, String msgCategory, Integer tenantId, Date beginDate); + Page querySysCementPageByUserId(Page page, String userId, String msgCategory, Integer tenantId, Date beginDate); /** * 获取用户未读消息数量 @@ -53,7 +53,7 @@ public interface ISysAnnouncementService extends IService { * @param noticeType 通知类型 * @return */ - public Integer getUnreadMessageCountByUserId(String userId, Date beginDate, String noticeType); + Integer getUnreadMessageCountByUserId(String userId, Date beginDate, String noticeType); /** @@ -92,7 +92,7 @@ public interface ISysAnnouncementService extends IService { * @param userId * @return */ - public List getNotSendedAnnouncementlist(String userId); + List getNotSendedAnnouncementlist(String userId); /** * 添加访问次数 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysCategoryService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCategoryService.java similarity index 78% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysCategoryService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCategoryService.java index f87650d..579b3d7 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysCategoryService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCategoryService.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.exception.JeecgBootException; -import org.cpte.modules.system.entity.SysCategory; -import org.cpte.modules.system.model.TreeSelectModel; +import org.jeecg.modules.system.entity.SysCategory; +import org.jeecg.modules.system.model.TreeSelectModel; import java.util.List; import java.util.Map; @@ -17,12 +17,12 @@ import java.util.Map; public interface ISysCategoryService extends IService { /**根节点父ID的值*/ - public static final String ROOT_PID_VALUE = "0"; + String ROOT_PID_VALUE = "0"; /** * 存在子节点 */ - public static final String HAS_CHILD = "1"; + String HAS_CHILD = "1"; /** * 添加分类字典 @@ -42,14 +42,14 @@ public interface ISysCategoryService extends IService { * @return * @throws JeecgBootException */ - public List queryListByCode(String pcode) throws JeecgBootException; + List queryListByCode(String pcode) throws JeecgBootException; /** * 根据pid查询子节点集合 * @param pid * @return */ - public List queryListByPid(String pid); + List queryListByPid(String pid); /** * 根据pid查询子节点集合,支持查询条件 @@ -57,14 +57,14 @@ public interface ISysCategoryService extends IService { * @param condition * @return */ - public List queryListByPid(String pid, Map condition); + List queryListByPid(String pid, Map condition); /** * 根据code查询id * @param code * @return */ - public String queryIdByCode(String code); + String queryIdByCode(String code); /** * 删除节点时同时删除子节点及修改父级节点 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysCheckRuleService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCheckRuleService.java similarity index 88% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysCheckRuleService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCheckRuleService.java index 6a55fde..dfaec24 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysCheckRuleService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCheckRuleService.java @@ -1,8 +1,8 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.system.entity.SysCheckRule; +import org.jeecg.modules.system.entity.SysCheckRule; /** * @Description: 编码校验规则 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysCommentService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCommentService.java similarity index 85% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysCommentService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCommentService.java index a5394e5..e0be2d5 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysCommentService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCommentService.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.system.entity.SysComment; -import org.cpte.modules.system.vo.SysCommentFileVo; -import org.cpte.modules.system.vo.SysCommentVO; +import org.jeecg.modules.system.entity.SysComment; +import org.jeecg.modules.system.vo.SysCommentFileVo; +import org.jeecg.modules.system.vo.SysCommentVO; import jakarta.servlet.http.HttpServletRequest; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysDataLogService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java similarity index 63% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysDataLogService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java index 91a5a70..a6b04e0 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysDataLogService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java @@ -1,6 +1,6 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; -import org.cpte.modules.system.entity.SysDataLog; +import org.jeecg.modules.system.entity.SysDataLog; import com.baomidou.mybatisplus.extension.service.IService; @@ -16,6 +16,6 @@ public interface ISysDataLogService extends IService { * @param dataId * @param dataContent */ - public void addDataLog(String tableName, String dataId, String dataContent); + void addDataLog(String tableName, String dataId, String dataContent); } diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysDataSourceService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataSourceService.java similarity index 87% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysDataSourceService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataSourceService.java index d75c17a..3e2824b 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysDataSourceService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataSourceService.java @@ -1,8 +1,8 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; -import org.cpte.modules.system.entity.SysDataSource; +import org.jeecg.modules.system.entity.SysDataSource; /** * @Description: 多数据源管理 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysDepartPermissionService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartPermissionService.java similarity index 72% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysDepartPermissionService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartPermissionService.java index d8f5454..cdfed2d 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysDepartPermissionService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartPermissionService.java @@ -1,8 +1,8 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; -import org.cpte.modules.system.entity.SysDepartPermission; +import org.jeecg.modules.system.entity.SysDepartPermission; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.system.entity.SysPermissionDataRule; +import org.jeecg.modules.system.entity.SysPermissionDataRule; import java.util.List; @@ -19,7 +19,7 @@ public interface ISysDepartPermissionService extends IService{ * 查询所有部门DepartId信息,并分节点进行显示 * @return */ - public List queryDepartIdTreeList(); + List queryDepartIdTreeList(); /** * 保存部门数据 @@ -96,7 +96,7 @@ public interface ISysDepartService extends IService{ * @param userId * @return */ - public List queryUserDeparts(String userId); + List queryUserDeparts(String userId); /** * 根据用户名查询部门 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysDictItemService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java similarity index 68% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysDictItemService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java index ecfe1ad..188c0fe 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysDictItemService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java @@ -1,6 +1,6 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; -import org.cpte.modules.system.entity.SysDictItem; +import org.jeecg.modules.system.entity.SysDictItem; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -20,5 +20,5 @@ public interface ISysDictItemService extends IService { * @param mainId 字典id * @return */ - public List selectItemsByMainId(String mainId); + List selectItemsByMainId(String mainId); } diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysDictService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java similarity index 81% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysDictService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java index 6b0e8f4..90888ee 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysDictService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java @@ -1,13 +1,13 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.system.vo.DictModel; import org.jeecg.common.system.vo.DictQuery; -import org.cpte.modules.system.entity.SysDict; -import org.cpte.modules.system.entity.SysDictItem; -import org.cpte.modules.system.model.DuplicateCheckVo; -import org.cpte.modules.system.model.TreeSelectModel; -import org.cpte.modules.system.vo.lowapp.SysDictVo; +import org.jeecg.modules.system.entity.SysDict; +import org.jeecg.modules.system.entity.SysDictItem; +import org.jeecg.modules.system.model.DuplicateCheckVo; +import org.jeecg.modules.system.model.TreeSelectModel; +import org.jeecg.modules.system.vo.lowapp.SysDictVo; import java.util.List; import java.util.Map; @@ -29,14 +29,14 @@ public interface ISysDictService extends IService { * @return */ @Deprecated - public boolean duplicateCheckData(DuplicateCheckVo duplicateCheckVo); + boolean duplicateCheckData(DuplicateCheckVo duplicateCheckVo); /** * 通过字典code获取字典数据 * @param code * @return */ - public List queryDictItemsByCode(String code); + List queryDictItemsByCode(String code); /** * 查询有效的数据字典项 @@ -57,7 +57,7 @@ public interface ISysDictService extends IService { * 登录加载系统字典 * @return */ - public Map> queryAllDictItems(); + Map> queryAllDictItems(); /** * 查通过查询指定table的 text code 获取字典 @@ -78,7 +78,7 @@ public interface ISysDictService extends IService { * @return */ @Deprecated - public List queryTableDictItemsByCodeAndFilter(String table, String text, String code, String filterSql); + List queryTableDictItemsByCodeAndFilter(String table, String text, String code, String filterSql); /** * 通过字典code及字典项的value获取字典文本 @@ -86,7 +86,7 @@ public interface ISysDictService extends IService { * @param key * @return */ - public String queryDictTextByKey(String code, String key); + String queryDictTextByKey(String code, String key); /** * 可通过多个字典code查询翻译文本 @@ -158,19 +158,19 @@ public interface ISysDictService extends IService { * @param sysDictItemList * @return Integer */ - public Integer saveMain(SysDict sysDict, List sysDictItemList); + Integer saveMain(SysDict sysDict, List sysDictItemList); /** * 查询所有部门 作为字典信息 id -->value,departName -->text * @return */ - public List queryAllDepartBackDictModel(); + List queryAllDepartBackDictModel(); /** * 查询所有用户 作为字典信息 username -->value,realname -->text * @return */ - public List queryAllUserBackDictModel(); + List queryAllUserBackDictModel(); // /** // * 通过关键字查询字典表 @@ -194,7 +194,7 @@ public interface ISysDictService extends IService { * @return */ @Deprecated - public List queryLittleTableDictItems(String table, String text, String code, String condition, String keyword, int pageNo, int pageSize); + List queryLittleTableDictItems(String table, String text, String code, String condition, String keyword, int pageNo, int pageSize); /** * 查询字典表所有数据 @@ -206,7 +206,7 @@ public interface ISysDictService extends IService { * @return */ @Deprecated - public List queryAllTableDictItems(String table, String text, String code, String condition, String keyword); + List queryAllTableDictItems(String table, String text, String code, String condition, String keyword); /** * 根据表名、显示字段名、存储字段名 查询树 * @param table @@ -225,20 +225,20 @@ public interface ISysDictService extends IService { * 真实删除 * @param id */ - public void deleteOneDictPhysically(String id); + void deleteOneDictPhysically(String id); /** * 修改delFlag * @param delFlag * @param id */ - public void updateDictDelFlag(int delFlag,String id); + void updateDictDelFlag(int delFlag, String id); /** * 查询被逻辑删除的数据 * @return */ - public List queryDeleteList(String tenantId); + List queryDeleteList(String tenantId); /** * 分页查询 @@ -248,7 +248,7 @@ public interface ISysDictService extends IService { * @return */ @Deprecated - public List queryDictTablePageList(DictQuery query,int pageSize, int pageNo); + List queryDictTablePageList(DictQuery query, int pageSize, int pageNo); /** * 获取字典数据 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysFillRuleService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFillRuleService.java similarity index 70% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysFillRuleService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFillRuleService.java index 08898ae..9ccc643 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysFillRuleService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFillRuleService.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.system.entity.SysFillRule; +import org.jeecg.modules.system.entity.SysFillRule; /** * @Description: 填值规则 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysFormFileService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFormFileService.java similarity index 71% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysFormFileService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFormFileService.java index 365707c..af3938e 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysFormFileService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysFormFileService.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.system.entity.SysFormFile; +import org.jeecg.modules.system.entity.SysFormFile; /** * @Description: 表单评论文件 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysGatewayRouteService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysGatewayRouteService.java similarity index 91% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysGatewayRouteService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysGatewayRouteService.java index 1213e28..6970525 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysGatewayRouteService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysGatewayRouteService.java @@ -1,8 +1,8 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.system.entity.SysGatewayRoute; +import org.jeecg.modules.system.entity.SysGatewayRoute; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysLogService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysLogService.java similarity index 91% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysLogService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysLogService.java index 55fcf0b..56de6e0 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysLogService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysLogService.java @@ -1,10 +1,10 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import java.util.Date; import java.util.List; import java.util.Map; -import org.cpte.modules.system.entity.SysLog; +import org.jeecg.modules.system.entity.SysLog; import com.baomidou.mybatisplus.extension.service.IService; @@ -21,7 +21,7 @@ public interface ISysLogService extends IService { /** * 清空所有日志记录 */ - public void removeAll(); + void removeAll(); /** * 获取系统总访问次数 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysPackPermissionService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPackPermissionService.java similarity index 71% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysPackPermissionService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPackPermissionService.java index 1d123b6..45e2177 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysPackPermissionService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPackPermissionService.java @@ -1,6 +1,6 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; -import org.cpte.modules.system.entity.SysPackPermission; +import org.jeecg.modules.system.entity.SysPackPermission; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysPermissionDataRuleService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java similarity index 81% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysPermissionDataRuleService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java index 55a25b8..d5e9b0f 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysPermissionDataRuleService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java @@ -1,8 +1,8 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import java.util.List; -import org.cpte.modules.system.entity.SysPermissionDataRule; +import org.jeecg.modules.system.entity.SysPermissionDataRule; import com.baomidou.mybatisplus.extension.service.IService; @@ -44,13 +44,13 @@ public interface ISysPermissionDataRuleService extends IService { /** * 切换vue3菜单 */ - public void switchVue3Menu(); + void switchVue3Menu(); /** * 通过父id查询菜单 * @param parentId 父id * @return */ - public List queryListByParentId(String parentId); + List queryListByParentId(String parentId); /** * 真实删除 * @param id 菜单id * @throws JeecgBootException */ - public void deletePermission(String id) throws JeecgBootException; + void deletePermission(String id) throws JeecgBootException; /** * 逻辑删除 * @param id 菜单id * @throws JeecgBootException */ - public void deletePermissionLogical(String id) throws JeecgBootException; + void deletePermissionLogical(String id) throws JeecgBootException; /** * 添加菜单 * @param sysPermission SysPermission对象 * @throws JeecgBootException */ - public void addPermission(SysPermission sysPermission) throws JeecgBootException; + void addPermission(SysPermission sysPermission) throws JeecgBootException; /** * 编辑菜单 * @param sysPermission SysPermission对象 * @throws JeecgBootException */ - public void editPermission(SysPermission sysPermission) throws JeecgBootException; + void editPermission(SysPermission sysPermission) throws JeecgBootException; /** * 获取登录用户拥有的权限 * @param username 用户名 * @return */ - public List queryByUser(String username); + List queryByUser(String username); /** * 根据permissionId删除其关联的SysPermissionDataRule表中的数据 @@ -69,13 +69,13 @@ public interface ISysPermissionService extends IService { * @param id * @return */ - public void deletePermRuleByPermId(String id); + void deletePermRuleByPermId(String id); /** * 查询出带有特殊符号的菜单地址的集合 * @return */ - public List queryPermissionUrlWithStar(); + List queryPermissionUrlWithStar(); /** * 判断用户否拥有权限 @@ -83,7 +83,7 @@ public interface ISysPermissionService extends IService { * @param sysPermission * @return */ - public boolean hasPermission(String username, SysPermission sysPermission); + boolean hasPermission(String username, SysPermission sysPermission); /** * 根据用户和请求地址判断是否有此权限 @@ -91,7 +91,7 @@ public interface ISysPermissionService extends IService { * @param url * @return */ - public boolean hasPermission(String username, String url); + boolean hasPermission(String username, String url); /** * 查询部门权限数据 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysPositionService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPositionService.java similarity index 87% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysPositionService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPositionService.java index 606aab1..29448a0 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysPositionService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPositionService.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.system.entity.SysPosition; +import org.jeecg.modules.system.entity.SysPosition; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysRoleIndexService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleIndexService.java similarity index 90% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysRoleIndexService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleIndexService.java index 5139b41..610dcb4 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysRoleIndexService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleIndexService.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.system.entity.SysRoleIndex; +import org.jeecg.modules.system.entity.SysRoleIndex; /** * @Description: 角色首页配置 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysRolePermissionService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java similarity index 65% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysRolePermissionService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java index 2b63746..7a7e620 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysRolePermissionService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java @@ -1,6 +1,6 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; -import org.cpte.modules.system.entity.SysRolePermission; +import org.jeecg.modules.system.entity.SysRolePermission; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -18,7 +18,7 @@ public interface ISysRolePermissionService extends IService { * @param roleId * @param permissionIds */ - public void saveRolePermission(String roleId,String permissionIds); + void saveRolePermission(String roleId, String permissionIds); /** * 保存授权 将上次的权限和这次作比较 差异处理提高效率 @@ -26,6 +26,6 @@ public interface ISysRolePermissionService extends IService { * @param permissionIds * @param lastPermissionIds */ - public void saveRolePermission(String roleId,String permissionIds,String lastPermissionIds); + void saveRolePermission(String roleId, String permissionIds, String lastPermissionIds); } diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysRoleService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java similarity index 89% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysRoleService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java index db97d44..bd26481 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysRoleService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java @@ -1,10 +1,10 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.apache.ibatis.annotations.Param; import org.jeecg.common.api.vo.Result; -import org.cpte.modules.system.entity.SysRole; +import org.jeecg.modules.system.entity.SysRole; import org.jeecgframework.poi.excel.entity.ImportParams; import org.springframework.web.multipart.MultipartFile; @@ -48,14 +48,14 @@ public interface ISysRoleService extends IService { * @param roleid * @return */ - public boolean deleteRole(String roleid); + boolean deleteRole(String roleid); /** * 批量删除角色 * @param roleids * @return */ - public boolean deleteBatchRole(String[] roleids); + boolean deleteBatchRole(String[] roleids); /** * 根据角色id和当前租户判断当前角色是否存在这个租户中 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysTableWhiteListService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTableWhiteListService.java similarity index 91% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysTableWhiteListService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTableWhiteListService.java index aaccf93..e366805 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysTableWhiteListService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTableWhiteListService.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.system.entity.SysTableWhiteList; +import org.jeecg.modules.system.entity.SysTableWhiteList; import java.util.Map; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysTenantPackService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantPackService.java similarity index 93% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysTenantPackService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantPackService.java index 1cffabb..91a553a 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysTenantPackService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantPackService.java @@ -1,8 +1,8 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; -import org.cpte.modules.system.entity.SysTenantPack; +import org.jeecg.modules.system.entity.SysTenantPack; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.system.entity.SysTenantPackUser; +import org.jeecg.modules.system.entity.SysTenantPackUser; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysTenantService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantService.java similarity index 92% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysTenantService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantService.java index c46ce56..3cf084b 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysTenantService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantService.java @@ -1,16 +1,16 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; -import org.cpte.modules.system.entity.SysTenant; -import org.cpte.modules.system.entity.SysTenantPackUser; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.vo.tenant.TenantDepartAuthInfo; -import org.cpte.modules.system.vo.tenant.TenantPackModel; -import org.cpte.modules.system.vo.tenant.TenantPackUser; -import org.cpte.modules.system.vo.tenant.TenantPackUserCount; +import org.jeecg.modules.system.entity.SysTenant; +import org.jeecg.modules.system.entity.SysTenantPackUser; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.vo.tenant.TenantDepartAuthInfo; +import org.jeecg.modules.system.vo.tenant.TenantPackModel; +import org.jeecg.modules.system.vo.tenant.TenantPackUser; +import org.jeecg.modules.system.vo.tenant.TenantPackUserCount; import java.util.Collection; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysThirdAccountService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysThirdAccountService.java similarity index 91% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysThirdAccountService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysThirdAccountService.java index 8c85018..aabc6e2 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysThirdAccountService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysThirdAccountService.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.system.entity.SysThirdAccount; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.model.ThirdLoginModel; +import org.jeecg.modules.system.entity.SysThirdAccount; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.model.ThirdLoginModel; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysThirdAppConfigService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysThirdAppConfigService.java similarity index 89% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysThirdAppConfigService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysThirdAppConfigService.java index 6c6d3e0..8b642d6 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysThirdAppConfigService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysThirdAppConfigService.java @@ -1,8 +1,8 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.system.entity.SysThirdAppConfig; +import org.jeecg.modules.system.entity.SysThirdAppConfig; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysUserDepPostService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserDepPostService.java similarity index 70% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysUserDepPostService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserDepPostService.java index 8471cee..96184fd 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysUserDepPostService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserDepPostService.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.system.entity.SysUserDepPost; +import org.jeecg.modules.system.entity.SysUserDepPost; /** * @Description: 部门岗位用户表 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysUserDepartService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java similarity index 92% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysUserDepartService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java index 8b6e7e0..7358b16 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysUserDepartService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java @@ -1,12 +1,12 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.entity.SysUserDepart; -import org.cpte.modules.system.model.DepartIdModel; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.entity.SysUserDepart; +import org.jeecg.modules.system.model.DepartIdModel; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysUserPositionService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserPositionService.java similarity index 87% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysUserPositionService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserPositionService.java index 6f266e8..ce97bfd 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysUserPositionService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserPositionService.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.entity.SysUserPosition; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.entity.SysUserPosition; import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 用户职位关系表 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysUserRoleService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.java similarity index 70% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysUserRoleService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.java index d0e852d..4813754 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysUserRoleService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserRoleService.java @@ -1,6 +1,6 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; -import org.cpte.modules.system.entity.SysUserRole; +import org.jeecg.modules.system.entity.SysUserRole; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysUserService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java similarity index 87% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysUserService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java index 31ff9e1..1dfd63d 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysUserService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -9,13 +9,13 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.system.vo.SysUserCacheInfo; -import org.cpte.modules.system.entity.SysRoleIndex; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.model.SysUserSysDepPostModel; -import org.cpte.modules.system.model.SysUserSysDepartModel; -import org.cpte.modules.system.vo.SysUserExportVo; -import org.cpte.modules.system.vo.lowapp.DepartAndUserInfo; -import org.cpte.modules.system.vo.lowapp.UpdateDepartInfo; +import org.jeecg.modules.system.entity.SysRoleIndex; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.model.SysUserSysDepPostModel; +import org.jeecg.modules.system.model.SysUserSysDepartModel; +import org.jeecg.modules.system.vo.SysUserExportVo; +import org.jeecg.modules.system.vo.lowapp.DepartAndUserInfo; +import org.jeecg.modules.system.vo.lowapp.UpdateDepartInfo; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.servlet.ModelAndView; @@ -55,7 +55,7 @@ public interface ISysUserService extends IService { * @param confirmpassword * @return */ - public Result resetPassword(String username, String oldpassword, String newpassword, String confirmpassword); + Result resetPassword(String username, String oldpassword, String newpassword, String confirmpassword); /** * 修改密码 @@ -63,35 +63,35 @@ public interface ISysUserService extends IService { * @param sysUser * @return */ - public Result changePassword(SysUser sysUser); + Result changePassword(SysUser sysUser); /** * 删除用户 * @param userId * @return */ - public boolean deleteUser(String userId); + boolean deleteUser(String userId); /** * 批量删除用户 * @param userIds * @return */ - public boolean deleteBatchUsers(String userIds); + boolean deleteBatchUsers(String userIds); /** * 根据用户名查询 * @param username 用户名 * @return SysUser */ - public SysUser getUserByName(String username); + SysUser getUserByName(String username); /** * 添加用户和用户角色关系 * @param user * @param roles */ - public void addUserWithRole(SysUser user,String roles); + void addUserWithRole(SysUser user, String roles); /** @@ -99,14 +99,14 @@ public interface ISysUserService extends IService { * @param user * @param roles */ - public void editUserWithRole(SysUser user,String roles); + void editUserWithRole(SysUser user, String roles); /** * 获取用户的授权角色 * @param username * @return */ - public List getRole(String username); + List getRole(String username); /** * 获取根据登录用户的角色获取动态首页 @@ -115,7 +115,7 @@ public interface ISysUserService extends IService { * @param version 前端UI版本 * @return */ - public SysRoleIndex getDynamicIndexByUserRole(String username,String version); + SysRoleIndex getDynamicIndexByUserRole(String username, String version); /** * 查询用户信息包括 部门信息 @@ -123,7 +123,7 @@ public interface ISysUserService extends IService { * @return */ @Deprecated - public SysUserCacheInfo getCacheUser(String username); + SysUserCacheInfo getCacheUser(String username); /** * 根据部门Id查询 @@ -132,7 +132,7 @@ public interface ISysUserService extends IService { * @param username 用户账户名称 * @return */ - public IPage getUserByDepId(Page page, String departId, String username); + IPage getUserByDepId(Page page, String departId, String username); /** * 根据部门Ids查询 @@ -141,14 +141,14 @@ public interface ISysUserService extends IService { * @param username 用户账户名称 * @return */ - public IPage getUserByDepIds(Page page, List departIds, String username); + IPage getUserByDepIds(Page page, List departIds, String username); /** * 根据 userIds查询，查询用户所属部门的名称（多个部门名逗号隔开） * @param userIds * @return */ - public Map getDepNamesByUserIds(List userIds); + Map getDepNamesByUserIds(List userIds); /** * 根据部门 Id 和 QueryWrapper 查询 @@ -180,7 +180,7 @@ public interface ISysUserService extends IService { * @param realname 用户姓名 * @return */ - public IPage getUserByRoleId(Page page,String roleId, String username, String realname); + IPage getUserByRoleId(Page page, String roleId, String username, String realname); /** * 通过用户名获取用户角色集合 @@ -218,7 +218,7 @@ public interface ISysUserService extends IService { * @param phone 手机号 * @return SysUser */ - public SysUser getUserByPhone(String phone); + SysUser getUserByPhone(String phone); /** @@ -226,7 +226,7 @@ public interface ISysUserService extends IService { * @param email 邮箱 * @return SysUser */ - public SysUser getUserByEmail(String email); + SysUser getUserByEmail(String email); /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysUserTenantService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserTenantService.java similarity index 92% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysUserTenantService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserTenantService.java index deba9da..03b9e8c 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/ISysUserTenantService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserTenantService.java @@ -1,12 +1,12 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.cpte.modules.system.entity.SysTenant; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.entity.SysUserTenant; +import org.jeecg.modules.system.entity.SysTenant; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.entity.SysUserTenant; import com.baomidou.mybatisplus.extension.service.IService; -import org.cpte.modules.system.vo.SysUserTenantVo; +import org.jeecg.modules.system.vo.SysUserTenantVo; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/IThirdAppService.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/IThirdAppService.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/IThirdAppService.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/IThirdAppService.java index 90c8a80..ba60d03 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/IThirdAppService.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/IThirdAppService.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.service; +package org.jeecg.modules.system.service; import org.jeecg.common.api.dto.message.MessageDTO; -import org.cpte.modules.system.vo.thirdapp.SyncInfoVo; +import org.jeecg.modules.system.vo.thirdapp.SyncInfoVo; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/ImportFileServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ImportFileServiceImpl.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/ImportFileServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ImportFileServiceImpl.java index 3727422..f77a6df 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/ImportFileServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ImportFileServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.util.CommonUtils; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysAnnouncementSendServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java similarity index 76% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysAnnouncementSendServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java index 19bd602..a0d8f5b 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysAnnouncementSendServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java @@ -1,11 +1,11 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import jakarta.annotation.Resource; -import org.cpte.modules.system.entity.SysAnnouncementSend; -import org.cpte.modules.system.mapper.SysAnnouncementSendMapper; -import org.cpte.modules.system.model.AnnouncementSendModel; -import org.cpte.modules.system.service.ISysAnnouncementSendService; +import org.jeecg.modules.system.entity.SysAnnouncementSend; +import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper; +import org.jeecg.modules.system.model.AnnouncementSendModel; +import org.jeecg.modules.system.service.ISysAnnouncementSendService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysAnnouncementServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysAnnouncementServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java index 09d781c..a946c70 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysAnnouncementServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import cn.hutool.core.io.IoUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -17,13 +17,13 @@ import org.jeecg.common.util.FileDownloadUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.JeecgBaseConfig; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.cpte.modules.system.entity.SysAnnouncement; -import org.cpte.modules.system.entity.SysAnnouncementSend; -import org.cpte.modules.system.mapper.SysAnnouncementMapper; -import org.cpte.modules.system.mapper.SysAnnouncementSendMapper; -import org.cpte.modules.system.mapper.SysUserMapper; -import org.cpte.modules.system.service.ISysAnnouncementSendService; -import org.cpte.modules.system.service.ISysAnnouncementService; +import org.jeecg.modules.system.entity.SysAnnouncement; +import org.jeecg.modules.system.entity.SysAnnouncementSend; +import org.jeecg.modules.system.mapper.SysAnnouncementMapper; +import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper; +import org.jeecg.modules.system.mapper.SysUserMapper; +import org.jeecg.modules.system.service.ISysAnnouncementSendService; +import org.jeecg.modules.system.service.ISysAnnouncementService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,6 +32,8 @@ import org.springframework.util.CollectionUtils; import java.io.*; import java.net.URLEncoder; import jakarta.annotation.Resource; + +import java.nio.charset.StandardCharsets; import java.util.*; import java.util.concurrent.ExecutorService; import java.util.concurrent.SynchronousQueue; @@ -290,7 +292,7 @@ public class SysAnnouncementServiceImpl extends ServiceImpl allPossiblePaths = this.getOnlinePossiblePaths(requestPath); - log.info("获取的菜单地址= {}", allPossiblePaths.toString()); + log.info("获取的菜单地址= {}", allPossiblePaths); if(allPossiblePaths.size()==1){ query.eq(SysPermission::getUrl, requestPath); }else{ @@ -944,20 +953,16 @@ public class SysBaseApiImpl implements ISysBaseAPI { //update-begin-author:taoyan date:2023-5-19 for: QQYUN-5326【简流】获取组织人员 单/多 筛选条件 没有部门筛选 String departKey = "depart"; QueryCondition departCondition = null; - try { - String temp = URLDecoder.decode(superQuery, "UTF-8"); - List conditions = JSON.parseArray(temp, QueryCondition.class); - for(QueryCondition condition: conditions){ - if(departKey.equals(condition.getField())){ - departCondition = condition; - break; - } - } - } catch (UnsupportedEncodingException e) { - log.error("查询用户信息，查询条件json转化失败", e); - } - - for (SysUser user : list) { + String temp = URLDecoder.decode(superQuery, StandardCharsets.UTF_8); + List conditions = JSON.parseArray(temp, QueryCondition.class); + for(QueryCondition condition: conditions){ + if(departKey.equals(condition.getField())){ + departCondition = condition; + break; + } + } + + for (SysUser user : list) { JSONObject userJson = JSONObject.parseObject(JSONObject.toJSONString(user)); List departList = sysDepartService.queryDepartsByUsername(user.getUsername()); List departIds = null; @@ -992,13 +997,9 @@ public class SysBaseApiImpl implements ISysBaseAPI { QueryRuleEnum rule = QueryRuleEnum.getByValue(departCondition.getRule()); String conditionVal = departCondition.getVal(); if(rule == QueryRuleEnum.EMPTY){ - if(departIds==null || departIds.size()==0){ - return true; - } + return departIds == null || departIds.size() == 0; }else if (rule == QueryRuleEnum.NOT_EMPTY){ - if(departIds!=null && departIds.size()>0){ - return true; - } + return departIds != null && departIds.size() > 0; }else{ if(oConvertUtils.isEmpty(conditionVal)){ return false; @@ -1013,21 +1014,13 @@ public class SysBaseApiImpl implements ISysBaseAPI { conditionList = new ArrayList(Arrays.asList(conditionVal.split(","))); } if(rule == QueryRuleEnum.EQ){ - if(oConvertUtils.isEqList(conditionList, departIds)){ - return true; - } + return oConvertUtils.isEqList(conditionList, departIds); }else if(rule == QueryRuleEnum.NE){ - if(!oConvertUtils.isEqList(conditionList, departIds)){ - return true; - } + return !oConvertUtils.isEqList(conditionList, departIds); }else if(rule == QueryRuleEnum.IN){ - if(oConvertUtils.isInList(departIds, conditionList)){ - return true; - } + return oConvertUtils.isInList(departIds, conditionList); }else if(rule == QueryRuleEnum.NOT_IN){ - if(!oConvertUtils.isInList(departIds, conditionList)){ - return true; - } + return !oConvertUtils.isInList(departIds, conditionList); } } return false; @@ -1212,9 +1205,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { //update-begin---author:chenrui ---date:20240123 for：[QQYUN-7992]【online】工单申请下的online表单，未配置online表单开发菜单，操作报错无权限------------ sysPermission.setUrl(onlineAuthDTO.getOnlineWorkOrderUrl()); count = sysPermissionMapper.queryCountByUsername(username, sysPermission); - if(count<=0) { - return false; - } + return count > 0; //update-end---author:chenrui ---date:20240123 for：[QQYUN-7992]【online】工单申请下的online表单，未配置online表单开发菜单，操作报错无权限------------ } } else { @@ -1445,7 +1436,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { * @param dySmsEnum 短信模版 */ @Override - public void sendSmsMsg(String phone, JSONObject param,DySmsEnum dySmsEnum) { + public void sendSmsMsg(String phone, JSONObject param, DySmsEnum dySmsEnum) { try { log.info(" 发送短信消息 phone = {}", phone); log.info(" 发送短信消息 param = {}", param); @@ -1463,7 +1454,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { * @param params */ @Override - public void sendHtmlTemplateEmail(String email, String title, EmailTemplateEnum emailTemplateEnum,JSONObject params) { + public void sendHtmlTemplateEmail(String email, String title, EmailTemplateEnum emailTemplateEnum, JSONObject params) { EmailSendMsgHandle emailHandle=new EmailSendMsgHandle(); String htmlText=""; try{ diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysCategoryServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysCategoryServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java index bed6fdb..b8b3927 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -10,10 +10,10 @@ import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.FillRuleUtil; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.system.entity.SysCategory; -import org.cpte.modules.system.mapper.SysCategoryMapper; -import org.cpte.modules.system.model.TreeSelectModel; -import org.cpte.modules.system.service.ISysCategoryService; +import org.jeecg.modules.system.entity.SysCategory; +import org.jeecg.modules.system.mapper.SysCategoryMapper; +import org.jeecg.modules.system.model.TreeSelectModel; +import org.jeecg.modules.system.service.ISysCategoryService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysCheckRuleServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCheckRuleServiceImpl.java similarity index 94% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysCheckRuleServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCheckRuleServiceImpl.java index fc2002e..0fe26f9 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysCheckRuleServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCheckRuleServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -6,9 +6,9 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang.StringUtils; -import org.cpte.modules.system.entity.SysCheckRule; -import org.cpte.modules.system.mapper.SysCheckRuleMapper; -import org.cpte.modules.system.service.ISysCheckRuleService; +import org.jeecg.modules.system.entity.SysCheckRule; +import org.jeecg.modules.system.mapper.SysCheckRuleMapper; +import org.jeecg.modules.system.service.ISysCheckRuleService; import org.springframework.stereotype.Service; import java.util.regex.Pattern; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysCommentServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCommentServiceImpl.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysCommentServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCommentServiceImpl.java index d19bca6..fce1211 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysCommentServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCommentServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,14 +16,14 @@ import org.jeecg.common.util.CommonUtils; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.filter.SsrfFileTypeFilter; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.system.entity.SysComment; -import org.cpte.modules.system.entity.SysFormFile; -import org.cpte.modules.system.mapper.SysCommentMapper; -import org.cpte.modules.system.mapper.SysFormFileMapper; -import org.cpte.modules.system.service.ISysCommentService; -import org.cpte.modules.system.vo.SysCommentFileVo; -import org.cpte.modules.system.vo.SysCommentVO; -import org.cpte.modules.system.vo.UserAvatar; +import org.jeecg.modules.system.entity.SysComment; +import org.jeecg.modules.system.entity.SysFormFile; +import org.jeecg.modules.system.mapper.SysCommentMapper; +import org.jeecg.modules.system.mapper.SysFormFileMapper; +import org.jeecg.modules.system.service.ISysCommentService; +import org.jeecg.modules.system.vo.SysCommentFileVo; +import org.jeecg.modules.system.vo.SysCommentVO; +import org.jeecg.modules.system.vo.UserAvatar; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -149,7 +149,7 @@ public class SysCommentServiceImpl extends ServiceImpl impl text = SqlInjectionUtil.getSqlInjectField(text); code = SqlInjectionUtil.getSqlInjectField(code); - List dictModeList = sysDictMapper.queryTableDictByKeysAndFilterSql(table, text, code, null, Arrays.asList(key)); + List dictModeList = sysDictMapper.queryTableDictByKeysAndFilterSql(table, text, code, null, Collections.singletonList(key)); if(CollectionUtils.isEmpty(dictModeList)){ return null; }else{ diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysFillRuleServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFillRuleServiceImpl.java similarity index 62% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysFillRuleServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFillRuleServiceImpl.java index 9cfc2d2..3f8a103 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysFillRuleServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFillRuleServiceImpl.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.cpte.modules.system.entity.SysFillRule; -import org.cpte.modules.system.mapper.SysFillRuleMapper; -import org.cpte.modules.system.service.ISysFillRuleService; +import org.jeecg.modules.system.entity.SysFillRule; +import org.jeecg.modules.system.mapper.SysFillRuleMapper; +import org.jeecg.modules.system.service.ISysFillRuleService; import org.springframework.stereotype.Service; /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysFormFileServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFormFileServiceImpl.java similarity index 61% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysFormFileServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFormFileServiceImpl.java index 80f891e..bf9d00d 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysFormFileServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysFormFileServiceImpl.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.cpte.modules.system.entity.SysFormFile; -import org.cpte.modules.system.mapper.SysFormFileMapper; -import org.cpte.modules.system.service.ISysFormFileService; +import org.jeecg.modules.system.entity.SysFormFile; +import org.jeecg.modules.system.mapper.SysFormFileMapper; +import org.jeecg.modules.system.service.ISysFormFileService; import org.springframework.stereotype.Service; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysGatewayRouteServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysGatewayRouteServiceImpl.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysGatewayRouteServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysGatewayRouteServiceImpl.java index d81fb9f..1524251 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysGatewayRouteServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysGatewayRouteServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; @@ -12,9 +12,9 @@ import org.jeecg.common.constant.CacheConstant; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.GlobalConstants; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.system.entity.SysGatewayRoute; -import org.cpte.modules.system.mapper.SysGatewayRouteMapper; -import org.cpte.modules.system.service.ISysGatewayRouteService; +import org.jeecg.modules.system.entity.SysGatewayRoute; +import org.jeecg.modules.system.mapper.SysGatewayRouteMapper; +import org.jeecg.modules.system.service.ISysGatewayRouteService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysLogServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java similarity index 87% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysLogServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java index 7b53516..bfab316 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysLogServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import java.util.Date; import java.util.List; @@ -8,9 +8,9 @@ import jakarta.annotation.Resource; import com.baomidou.mybatisplus.annotation.DbType; import org.jeecg.common.util.CommonUtils; -import org.cpte.modules.system.entity.SysLog; -import org.cpte.modules.system.mapper.SysLogMapper; -import org.cpte.modules.system.service.ISysLogService; +import org.jeecg.modules.system.entity.SysLog; +import org.jeecg.modules.system.mapper.SysLogMapper; +import org.jeecg.modules.system.service.ISysLogService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysPackPermissionServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPackPermissionServiceImpl.java similarity index 61% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysPackPermissionServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPackPermissionServiceImpl.java index fadaef6..fd49a01 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysPackPermissionServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPackPermissionServiceImpl.java @@ -1,8 +1,8 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; -import org.cpte.modules.system.entity.SysPackPermission; -import org.cpte.modules.system.mapper.SysPackPermissionMapper; -import org.cpte.modules.system.service.ISysPackPermissionService; +import org.jeecg.modules.system.entity.SysPackPermission; +import org.jeecg.modules.system.mapper.SysPackPermissionMapper; +import org.jeecg.modules.system.service.ISysPackPermissionService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysPermissionDataRuleImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java similarity index 90% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysPermissionDataRuleImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java index b490ba4..7e84217 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysPermissionDataRuleImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import java.util.HashSet; import java.util.List; @@ -9,11 +9,11 @@ import jakarta.annotation.Resource; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.system.entity.SysPermission; -import org.cpte.modules.system.entity.SysPermissionDataRule; -import org.cpte.modules.system.mapper.SysPermissionDataRuleMapper; -import org.cpte.modules.system.mapper.SysPermissionMapper; -import org.cpte.modules.system.service.ISysPermissionDataRuleService; +import org.jeecg.modules.system.entity.SysPermission; +import org.jeecg.modules.system.entity.SysPermissionDataRule; +import org.jeecg.modules.system.mapper.SysPermissionDataRuleMapper; +import org.jeecg.modules.system.mapper.SysPermissionMapper; +import org.jeecg.modules.system.service.ISysPermissionDataRuleService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -72,7 +72,7 @@ public class SysPermissionDataRuleImpl extends ServiceImpl0){ - return true; - }else{ - return false; - } + return count > 0; } @Override @@ -292,11 +288,7 @@ public class SysPermissionServiceImpl extends ServiceImpl0){ - return true; - }else{ - return false; - } + return count > 0; } @Override diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysPositionServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPositionServiceImpl.java similarity index 85% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysPositionServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPositionServiceImpl.java index 79589fa..3fc87c6 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysPositionServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPositionServiceImpl.java @@ -1,11 +1,11 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.constant.SymbolConstant; -import org.cpte.modules.system.entity.SysPosition; -import org.cpte.modules.system.mapper.SysPositionMapper; -import org.cpte.modules.system.service.ISysPositionService; +import org.jeecg.modules.system.entity.SysPosition; +import org.jeecg.modules.system.mapper.SysPositionMapper; +import org.jeecg.modules.system.service.ISysPositionService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysRoleIndexServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleIndexServiceImpl.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysRoleIndexServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleIndexServiceImpl.java index 48e25cb..a0a413c 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysRoleIndexServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleIndexServiceImpl.java @@ -1,14 +1,14 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.system.constant.DefIndexConst; -import org.cpte.modules.system.entity.SysRoleIndex; -import org.cpte.modules.system.mapper.SysRoleIndexMapper; -import org.cpte.modules.system.service.ISysRoleIndexService; +import org.jeecg.modules.system.constant.DefIndexConst; +import org.jeecg.modules.system.entity.SysRoleIndex; +import org.jeecg.modules.system.mapper.SysRoleIndexMapper; +import org.jeecg.modules.system.service.ISysRoleIndexService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysRolePermissionServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java similarity index 93% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysRolePermissionServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java index f6e0a33..35f4c64 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysRolePermissionServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java @@ -1,13 +1,13 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import java.util.*; import org.jeecg.common.util.IpUtils; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.system.entity.SysRolePermission; -import org.cpte.modules.system.mapper.SysRolePermissionMapper; -import org.cpte.modules.system.service.ISysRolePermissionService; +import org.jeecg.modules.system.entity.SysRolePermission; +import org.jeecg.modules.system.mapper.SysRolePermissionMapper; +import org.jeecg.modules.system.service.ISysRolePermissionService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysRoleServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java similarity index 94% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysRoleServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java index 3fc40df..f7b4e46 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysRoleServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -8,10 +8,10 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.ImportExcelUtil; -import org.cpte.modules.system.entity.SysRole; -import org.cpte.modules.system.mapper.SysRoleMapper; -import org.cpte.modules.system.mapper.SysUserMapper; -import org.cpte.modules.system.service.ISysRoleService; +import org.jeecg.modules.system.entity.SysRole; +import org.jeecg.modules.system.mapper.SysRoleMapper; +import org.jeecg.modules.system.mapper.SysUserMapper; +import org.jeecg.modules.system.service.ISysRoleService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.entity.ImportParams; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysTableWhiteListServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTableWhiteListServiceImpl.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysTableWhiteListServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTableWhiteListServiceImpl.java index 9204f51..27db5b7 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysTableWhiteListServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTableWhiteListServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -7,9 +7,9 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.firewall.SqlInjection.IDictTableWhiteListHandler; -import org.cpte.modules.system.entity.SysTableWhiteList; -import org.cpte.modules.system.mapper.SysTableWhiteListMapper; -import org.cpte.modules.system.service.ISysTableWhiteListService; +import org.jeecg.modules.system.entity.SysTableWhiteList; +import org.jeecg.modules.system.mapper.SysTableWhiteListMapper; +import org.jeecg.modules.system.service.ISysTableWhiteListService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -127,7 +127,7 @@ public class SysTableWhiteListServiceImpl extends ServiceImpl {}", tableName, saveEntity.toString()); + log.info("新增表单白名单项: 表名：{}，配置 > {}", tableName, saveEntity); return saveEntity; } } diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysTenantPackServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysTenantPackServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java index 49b8195..de37dc2 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysTenantPackServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java @@ -1,9 +1,8 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.RandomUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.cpte.modules.system.mapper.*; -import org.cpte.modules.system.mapper.*; +import org.jeecg.modules.system.mapper.*; import org.apache.shiro.SecurityUtils; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; @@ -11,11 +10,12 @@ import org.jeecg.common.constant.TenantConstant; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.aop.TenantLog; -import org.cpte.modules.system.entity.SysPackPermission; -import org.cpte.modules.system.entity.SysTenantPack; -import org.cpte.modules.system.entity.SysTenantPackUser; -import org.cpte.modules.system.service.ISysTenantPackService; +import org.jeecg.modules.aop.TenantLog; +import org.jeecg.modules.system.entity.SysPackPermission; +import org.jeecg.modules.system.entity.SysTenantPack; +import org.jeecg.modules.system.entity.SysTenantPackUser; +import org.jeecg.modules.system.mapper.*; +import org.jeecg.modules.system.service.ISysTenantPackService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysTenantServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysTenantServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java index d2a1ba3..33c6f68 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysTenantServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.RandomUtil; @@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.cpte.modules.system.entity.*; -import org.cpte.modules.system.mapper.*; -import org.cpte.modules.system.vo.tenant.*; +import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.system.mapper.*; +import org.jeecg.modules.system.vo.tenant.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.shiro.SecurityUtils; @@ -28,10 +28,13 @@ import org.jeecg.common.util.PasswordUtil; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.constant.enums.SysAnnmentTypeEnum; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.aop.TenantLog; -import org.cpte.modules.system.service.ISysTenantPackService; -import org.cpte.modules.system.service.ISysTenantService; -import org.cpte.modules.system.service.ISysUserService; +import org.jeecg.modules.aop.TenantLog; +import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.system.mapper.*; +import org.jeecg.modules.system.service.ISysTenantPackService; +import org.jeecg.modules.system.service.ISysTenantService; +import org.jeecg.modules.system.service.ISysUserService; +import org.jeecg.modules.system.vo.tenant.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; @@ -503,7 +506,7 @@ public class SysTenantServiceImpl extends ServiceImpl packCountList = baseMapper.queryTenantPackUserCount(tenantId); info.setPackCountList(packCountList); } diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysThirdAccountServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java similarity index 94% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysThirdAccountServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java index a35a65c..ce20c67 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysThirdAccountServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -15,16 +15,16 @@ import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.PasswordUtil; import org.jeecg.common.util.UUIDGenerator; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.system.entity.SysRole; -import org.cpte.modules.system.entity.SysThirdAccount; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.entity.SysUserRole; -import org.cpte.modules.system.mapper.SysRoleMapper; -import org.cpte.modules.system.mapper.SysThirdAccountMapper; -import org.cpte.modules.system.mapper.SysUserMapper; -import org.cpte.modules.system.mapper.SysUserRoleMapper; -import org.cpte.modules.system.model.ThirdLoginModel; -import org.cpte.modules.system.service.ISysThirdAccountService; +import org.jeecg.modules.system.entity.SysRole; +import org.jeecg.modules.system.entity.SysThirdAccount; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.entity.SysUserRole; +import org.jeecg.modules.system.mapper.SysRoleMapper; +import org.jeecg.modules.system.mapper.SysThirdAccountMapper; +import org.jeecg.modules.system.mapper.SysUserMapper; +import org.jeecg.modules.system.mapper.SysUserRoleMapper; +import org.jeecg.modules.system.model.ThirdLoginModel; +import org.jeecg.modules.system.service.ISysThirdAccountService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysThirdAppConfigServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAppConfigServiceImpl.java similarity index 85% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysThirdAppConfigServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAppConfigServiceImpl.java index 4193765..cf19e04 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysThirdAppConfigServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAppConfigServiceImpl.java @@ -1,11 +1,11 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; -import org.cpte.modules.system.entity.SysThirdAppConfig; -import org.cpte.modules.system.mapper.SysThirdAppConfigMapper; -import org.cpte.modules.system.service.ISysThirdAppConfigService; +import org.jeecg.modules.system.entity.SysThirdAppConfig; +import org.jeecg.modules.system.mapper.SysThirdAppConfigMapper; +import org.jeecg.modules.system.service.ISysThirdAppConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysUserDepPostServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepPostServiceImpl.java similarity index 61% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysUserDepPostServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepPostServiceImpl.java index d624ed8..c502ced 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysUserDepPostServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepPostServiceImpl.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.cpte.modules.system.entity.SysUserDepPost; -import org.cpte.modules.system.mapper.SysUserDepPostMapper; -import org.cpte.modules.system.service.ISysUserDepPostService; +import org.jeecg.modules.system.entity.SysUserDepPost; +import org.jeecg.modules.system.mapper.SysUserDepPostMapper; +import org.jeecg.modules.system.service.ISysUserDepPostService; import org.springframework.stereotype.Service; /** diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysUserDepartServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysUserDepartServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java index c7bb0f2..d0385c1 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysUserDepartServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -12,17 +12,17 @@ import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.cpte.modules.system.entity.SysDepart; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.entity.SysUserDepart; -import org.cpte.modules.system.mapper.SysUserDepartMapper; -import org.cpte.modules.system.mapper.SysUserMapper; -import org.cpte.modules.system.mapper.SysUserTenantMapper; -import org.cpte.modules.system.model.DepartIdModel; -import org.cpte.modules.system.service.ISysDepartService; -import org.cpte.modules.system.service.ISysUserDepartService; -import org.cpte.modules.system.service.ISysUserService; -import org.cpte.modules.system.vo.SysUserDepVo; +import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.entity.SysUserDepart; +import org.jeecg.modules.system.mapper.SysUserDepartMapper; +import org.jeecg.modules.system.mapper.SysUserMapper; +import org.jeecg.modules.system.mapper.SysUserTenantMapper; +import org.jeecg.modules.system.model.DepartIdModel; +import org.jeecg.modules.system.service.ISysDepartService; +import org.jeecg.modules.system.service.ISysUserDepartService; +import org.jeecg.modules.system.service.ISysUserService; +import org.jeecg.modules.system.vo.SysUserDepVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -106,7 +106,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl userList = (List) sysUserMapper.selectBatchIds(userIdList); + List userList = sysUserMapper.selectBatchIds(userIdList); //update-begin-author:taoyan date:201905047 for:接口调用查询返回结果不能返回密码相关信息 for (SysUser sysUser : userList) { sysUser.setSalt(""); diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysUserPositionServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserPositionServiceImpl.java similarity index 89% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysUserPositionServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserPositionServiceImpl.java index a1062c0..5741abb 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysUserPositionServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserPositionServiceImpl.java @@ -1,15 +1,15 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.entity.SysUserPosition; -import org.cpte.modules.system.mapper.SysUserMapper; -import org.cpte.modules.system.mapper.SysUserPositionMapper; -import org.cpte.modules.system.service.ISysUserPositionService; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.entity.SysUserPosition; +import org.jeecg.modules.system.mapper.SysUserMapper; +import org.jeecg.modules.system.mapper.SysUserPositionMapper; +import org.jeecg.modules.system.service.ISysUserPositionService; import org.springframework.stereotype.Service; import java.util.*; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysUserRoleServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java similarity index 61% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysUserRoleServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java index 745b825..4d00c7c 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysUserRoleServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java @@ -1,8 +1,8 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; -import org.cpte.modules.system.entity.SysUserRole; -import org.cpte.modules.system.mapper.SysUserRoleMapper; -import org.cpte.modules.system.service.ISysUserRoleService; +import org.jeecg.modules.system.entity.SysUserRole; +import org.jeecg.modules.system.mapper.SysUserRoleMapper; +import org.jeecg.modules.system.service.ISysUserRoleService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysUserServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java similarity index 99% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysUserServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index a7f8152..6e0bcd1 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysUserServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.RandomUtil; @@ -12,20 +12,19 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.cpte.modules.system.entity.*; -import org.cpte.modules.system.mapper.*; -import org.cpte.modules.system.vo.*; -import org.cpte.modules.system.mapper.*; +import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.system.mapper.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.shiro.SecurityUtils; -import org.cpte.modules.system.entity.*; -import org.cpte.modules.system.service.ISysRoleIndexService; -import org.cpte.modules.system.service.ISysTenantService; -import org.cpte.modules.system.service.ISysThirdAccountService; -import org.cpte.modules.system.service.ISysUserService; -import org.cpte.modules.system.vo.*; +import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.system.mapper.*; +import org.jeecg.modules.system.service.ISysRoleIndexService; +import org.jeecg.modules.system.service.ISysTenantService; +import org.jeecg.modules.system.service.ISysThirdAccountService; +import org.jeecg.modules.system.service.ISysUserService; +import org.jeecg.modules.system.vo.*; import org.jeecg.common.api.dto.message.MessageDTO; import org.jeecg.common.api.vo.Result; import org.jeecg.common.config.TenantContext; @@ -44,14 +43,15 @@ import org.jeecg.common.util.*; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.jmreport.common.util.OkConvertUtils; -import org.cpte.modules.message.handle.impl.SystemSendMsgHandle; -import org.cpte.modules.system.model.SysUserSysDepPostModel; -import org.cpte.modules.system.model.SysUserSysDepartModel; -import org.cpte.modules.system.util.ImportSysUserCache; -import org.cpte.modules.system.vo.lowapp.AppExportUserVo; -import org.cpte.modules.system.vo.lowapp.DepartAndUserInfo; -import org.cpte.modules.system.vo.lowapp.DepartInfo; -import org.cpte.modules.system.vo.lowapp.UpdateDepartInfo; +import org.jeecg.modules.message.handle.impl.SystemSendMsgHandle; +import org.jeecg.modules.system.model.SysUserSysDepPostModel; +import org.jeecg.modules.system.model.SysUserSysDepartModel; +import org.jeecg.modules.system.util.ImportSysUserCache; +import org.jeecg.modules.system.vo.*; +import org.jeecg.modules.system.vo.lowapp.AppExportUserVo; +import org.jeecg.modules.system.vo.lowapp.DepartAndUserInfo; +import org.jeecg.modules.system.vo.lowapp.DepartInfo; +import org.jeecg.modules.system.vo.lowapp.UpdateDepartInfo; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -206,8 +206,8 @@ public class SysUserServiceImpl extends ServiceImpl impl } Integer posTenantId = null; if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) { - posTenantId = oConvertUtils.getInt(TenantContext.getTenant(), 0);; - } + posTenantId = oConvertUtils.getInt(TenantContext.getTenant(), 0); + } //查询用户职位关系表(获取租户下面的) //update-begin---author:wangshuai---date:2023-11-15---for:【QQYUN-7028】用户职务保存后未回显--- List positionList = sysUserPositionMapper.getPositionIdByUserTenantId(item.getId(),posTenantId); @@ -1313,7 +1313,7 @@ public class SysUserServiceImpl extends ServiceImpl impl user.setDepartIds(departId); }else{ List list = new ArrayList(Arrays.asList(departIds.split(","))); - if(list.indexOf(departId)>=0){ + if(list.contains(departId)){ continue; }else{ list.add(departId); @@ -1380,7 +1380,7 @@ public class SysUserServiceImpl extends ServiceImpl impl SysUser user = this.getById(userId); if(user!=null){ String ids = user.getDepartIds(); - if(status==true){ + if(status){ //设置部门负责人 if(oConvertUtils.isEmpty(ids)){ //设置为上级 @@ -1388,7 +1388,7 @@ public class SysUserServiceImpl extends ServiceImpl impl user.setDepartIds(departId); }else{ List list = new ArrayList(Arrays.asList(ids.split(","))); - if(list.indexOf(departId)>=0){ + if(list.contains(departId)){ //啥也不干 }else{ list.add(departId); @@ -1654,7 +1654,7 @@ public class SysUserServiceImpl extends ServiceImpl impl //update-begin---author:wangshuai---date:2025-01-17---for:【QQYUN-10926】组织管理——用户导出时，部门没有导出上下级关系--- Map departMap = this.getDepartNamesAndCategory(userDepVos, sysUser); String departNames = departMap.get("departNames"); - exportUserVo.setDepart(departNames.toString()); + exportUserVo.setDepart(departNames); //update-end---author:wangshuai---date:2025-01-17---for:【QQYUN-10926】组织管理——用户导出时，部门没有导出上下级关系--- String posNames = positionVos.stream().filter(item -> item.getUserId().equals(sysUser.getId())).map(SysUserPositionVo::getName).collect(Collectors.joining(SymbolConstant.SEMICOLON)); exportUserVo.setPosition(posNames); @@ -2752,7 +2752,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } Integer posTenantId = null; if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) { - posTenantId = oConvertUtils.getInt(TenantContext.getTenant(), 0);; + posTenantId = oConvertUtils.getInt(TenantContext.getTenant(), 0); } }); } diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysUserTenantServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserTenantServiceImpl.java similarity index 91% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysUserTenantServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserTenantServiceImpl.java index 9e3ca4c..0da2e07 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/SysUserTenantServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserTenantServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -9,16 +9,16 @@ import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.CommonUtils; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.system.entity.SysTenant; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.entity.SysUserTenant; -import org.cpte.modules.system.mapper.SysTenantPackUserMapper; -import org.cpte.modules.system.mapper.SysUserMapper; -import org.cpte.modules.system.mapper.SysUserPositionMapper; -import org.cpte.modules.system.mapper.SysUserTenantMapper; -import org.cpte.modules.system.service.ISysUserTenantService; -import org.cpte.modules.system.vo.SysUserDepVo; -import org.cpte.modules.system.vo.SysUserTenantVo; +import org.jeecg.modules.system.entity.SysTenant; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.entity.SysUserTenant; +import org.jeecg.modules.system.mapper.SysTenantPackUserMapper; +import org.jeecg.modules.system.mapper.SysUserMapper; +import org.jeecg.modules.system.mapper.SysUserPositionMapper; +import org.jeecg.modules.system.mapper.SysUserTenantMapper; +import org.jeecg.modules.system.service.ISysUserTenantService; +import org.jeecg.modules.system.vo.SysUserDepVo; +import org.jeecg.modules.system.vo.SysUserTenantVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java index 0c857ab..67afc16 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; @@ -22,13 +22,15 @@ import com.jeecg.dingtalk.api.oauth2.vo.ContactUser; import com.jeecg.dingtalk.api.user.JdtUserAPI; import com.jeecg.dingtalk.api.user.body.GetUserListBody; import com.jeecg.dingtalk.api.user.vo.User; -import org.cpte.modules.system.entity.*; -import org.cpte.modules.system.mapper.*; -import org.cpte.modules.system.service.*; -import org.cpte.modules.system.entity.*; +import org.jeecg.common.util.PasswordUtil; +import org.jeecg.common.util.RestUtil; +import org.jeecg.common.util.SpringContextUtils; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.system.mapper.*; +import org.jeecg.modules.system.service.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.cpte.modules.system.service.*; import org.jeecg.common.api.dto.message.MessageDTO; import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.CommonConstant; @@ -37,14 +39,15 @@ import org.jeecg.common.constant.enums.MessageTypeEnum; import org.jeecg.common.exception.JeecgBootBizTipException; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.util.JwtUtil; -import org.jeecg.common.util.*; import org.jeecg.config.JeecgBaseConfig; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.cpte.modules.system.mapper.*; -import org.cpte.modules.system.model.SysDepartTreeModel; -import org.cpte.modules.system.model.ThirdLoginModel; -import org.cpte.modules.system.vo.thirdapp.JdtDepartmentTreeVo; -import org.cpte.modules.system.vo.thirdapp.SyncInfoVo; +import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.system.mapper.*; +import org.jeecg.modules.system.model.SysDepartTreeModel; +import org.jeecg.modules.system.model.ThirdLoginModel; +import org.jeecg.modules.system.service.*; +import org.jeecg.modules.system.vo.thirdapp.JdtDepartmentTreeVo; +import org.jeecg.modules.system.vo.thirdapp.SyncInfoVo; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; @@ -119,7 +122,8 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { if (!departmentRes.isSuccess()) { syncInfo.addFailInfo(departmentRes.getErrmsg()); // 88 是 ip 不在白名单的错误码，如果遇到此错误码，后面的操作都可以不用进行了，因为肯定都是失败的 - if (new Integer(88).equals(departmentRes.getErrcode())) { + Integer DEPARTMENT_NOT_FOUND_ERROR = 88; + if (DEPARTMENT_NOT_FOUND_ERROR.equals(departmentRes.getErrcode())) { return syncInfo; } continue; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java index 654baca..1dbe7cf 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java @@ -1,15 +1,13 @@ -package org.cpte.modules.system.service.impl; +package org.jeecg.modules.system.service.impl; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import org.cpte.modules.system.entity.*; -import org.cpte.modules.system.mapper.*; -import org.cpte.modules.system.service.*; -import org.cpte.modules.system.service.*; -import org.cpte.modules.system.mapper.*; +import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.system.service.*; +import org.jeecg.modules.system.mapper.*; import com.jeecg.qywx.api.base.JwAccessTokenAPI; import com.jeecg.qywx.api.core.common.AccessToken; import com.jeecg.qywx.api.department.JwDepartmentAPI; @@ -19,7 +17,6 @@ import com.jeecg.qywx.api.message.JwMessageAPI; import com.jeecg.qywx.api.message.vo.*; import com.jeecg.qywx.api.user.JwUserAPI; import com.jeecg.qywx.api.user.vo.User; -import org.cpte.modules.system.entity.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.apache.http.HttpEntity; @@ -44,11 +41,14 @@ import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.JeecgBaseConfig; import org.jeecg.config.mybatis.MybatisPlusSaasConfig; -import org.cpte.modules.system.model.SysDepartTreeModel; -import org.cpte.modules.system.vo.thirdapp.JwDepartmentTreeVo; -import org.cpte.modules.system.vo.thirdapp.JwSysUserDepartVo; -import org.cpte.modules.system.vo.thirdapp.JwUserDepartVo; -import org.cpte.modules.system.vo.thirdapp.SyncInfoVo; +import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.system.mapper.*; +import org.jeecg.modules.system.model.SysDepartTreeModel; +import org.jeecg.modules.system.service.*; +import org.jeecg.modules.system.vo.thirdapp.JwDepartmentTreeVo; +import org.jeecg.modules.system.vo.thirdapp.JwSysUserDepartVo; +import org.jeecg.modules.system.vo.thirdapp.JwUserDepartVo; +import org.jeecg.modules.system.vo.thirdapp.SyncInfoVo; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; @@ -849,7 +849,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { * @param verifyConfig 是否验证配置（未启用的APP会拒绝发送） * @return */ - public JSONObject sendTextCardMessage(SysAnnouncement announcement,String mobileOpenUrl, boolean verifyConfig) { + public JSONObject sendTextCardMessage(SysAnnouncement announcement, String mobileOpenUrl, boolean verifyConfig) { SysThirdAppConfig config = this.getWeChatThirdAppConfig(); if (verifyConfig && null == config) { return null; @@ -1103,7 +1103,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { SysThirdAccount oneBySysUserId = sysThirdAccountService.getOneByUuidAndThirdType(userId, THIRD_TYPE,tenantId, userId); if(null != oneBySysUserId){ userIds.add(qwUsers.get(i).getUserid()); - userList = userList.stream().filter(item -> !item.getUserId().equals(oneBySysUserId.getSysUserId())).collect(Collectors.toList());; + userList = userList.stream().filter(item -> !item.getUserId().equals(oneBySysUserId.getSysUserId())).collect(Collectors.toList()); continue; } AtomicBoolean excludeUser = new AtomicBoolean(false); diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/FindsDepartsChildrenUtil.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/FindsDepartsChildrenUtil.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java index 9506bb1..53bf849 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/FindsDepartsChildrenUtil.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.util; +package org.jeecg.modules.system.util; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.system.entity.SysDepart; -import org.cpte.modules.system.model.DepartIdModel; -import org.cpte.modules.system.model.SysDepartTreeModel; +import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.system.model.DepartIdModel; +import org.jeecg.modules.system.model.SysDepartTreeModel; import java.util.ArrayList; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/ImportOldUserUtil.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/ImportOldUserUtil.java similarity index 93% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/ImportOldUserUtil.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/ImportOldUserUtil.java index d4bfa25..412c903 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/ImportOldUserUtil.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/ImportOldUserUtil.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.util; +package org.jeecg.modules.system.util; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; @@ -9,12 +9,12 @@ import org.jeecg.common.util.ImportExcelUtil; import org.jeecg.common.util.PasswordUtil; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.system.entity.SysUser; -import org.cpte.modules.system.entity.SysUserDepart; -import org.cpte.modules.system.service.ISysUserDepartService; -import org.cpte.modules.system.service.ISysUserService; -import org.cpte.modules.system.service.impl.SysUserDepartServiceImpl; -import org.cpte.modules.system.service.impl.SysUserServiceImpl; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.entity.SysUserDepart; +import org.jeecg.modules.system.service.ISysUserDepartService; +import org.jeecg.modules.system.service.ISysUserService; +import org.jeecg.modules.system.service.impl.SysUserDepartServiceImpl; +import org.jeecg.modules.system.service.impl.SysUserServiceImpl; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.entity.ImportParams; import org.springframework.web.multipart.MultipartFile; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/ImportSysUserCache.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/ImportSysUserCache.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/ImportSysUserCache.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/ImportSysUserCache.java index 882ac87..c07da36 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/ImportSysUserCache.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/ImportSysUserCache.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.util; +package org.jeecg.modules.system.util; import java.util.HashMap; import java.util.Map; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/PermissionDataUtil.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java similarity index 94% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/PermissionDataUtil.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java index 0feeddf..8346037 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/PermissionDataUtil.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java @@ -1,12 +1,12 @@ -package org.cpte.modules.system.util; +package org.jeecg.modules.system.util; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.system.entity.SysPermission; -import org.cpte.modules.system.entity.SysRoleIndex; -import org.cpte.modules.system.service.ISysRoleIndexService; +import org.jeecg.modules.system.entity.SysPermission; +import org.jeecg.modules.system.entity.SysRoleIndex; +import org.jeecg.modules.system.service.ISysRoleIndexService; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/RandImageUtil.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/RandImageUtil.java similarity index 99% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/RandImageUtil.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/RandImageUtil.java index 625d5c9..31d961e 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/RandImageUtil.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/RandImageUtil.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.util; +package org.jeecg.modules.system.util; import javax.imageio.ImageIO; import jakarta.servlet.http.HttpServletResponse; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/SecurityUtil.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/SecurityUtil.java similarity index 93% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/SecurityUtil.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/SecurityUtil.java index a94aea0..904b7b9 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/SecurityUtil.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/SecurityUtil.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.util; +package org.jeecg.modules.system.util; import cn.hutool.core.util.CharsetUtil; @@ -12,7 +12,7 @@ import cn.hutool.crypto.symmetric.SymmetricCrypto; */ public class SecurityUtil { /**加密key*/ - private static String key = "JEECGBOOT1423670"; + private static final String key = "JEECGBOOT1423670"; //---AES加密---------begin--------- /**加密 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/XssUtils.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/XssUtils.java similarity index 89% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/XssUtils.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/XssUtils.java index d600921..0e6e924 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/util/XssUtils.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/util/XssUtils.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.util; +package org.jeecg.modules.system.util; import org.springframework.web.util.HtmlUtils; @@ -11,11 +11,11 @@ import java.util.regex.Pattern; */ public class XssUtils { - private static Pattern[] patterns = new Pattern[]{ + private static final Pattern[] patterns = new Pattern[]{ //Script fragments Pattern.compile("", Pattern.CASE_INSENSITIVE), //src='...' - Pattern.compile("src[\r\n]*=[\r\n]*\\\'(.*?)\\\'", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL), + Pattern.compile("src[\r\n]*=[\r\n]*\\'(.*?)\\'", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL), Pattern.compile("src[\r\n]*=[\r\n]*\\\"(.*?)\\\"", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL), //script tags Pattern.compile("", Pattern.CASE_INSENSITIVE), diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysCommentFileVo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysCommentFileVo.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysCommentFileVo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysCommentFileVo.java index 49e5e86..7b4ef7d 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysCommentFileVo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysCommentFileVo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo; +package org.jeecg.modules.system.vo; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysCommentVO.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysCommentVO.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysCommentVO.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysCommentVO.java index 791035f..7d811c7 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysCommentVO.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysCommentVO.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo; +package org.jeecg.modules.system.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysDepartExportVo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDepartExportVo.java similarity index 97% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysDepartExportVo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDepartExportVo.java index d4b2f4b..c8c97e5 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysDepartExportVo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDepartExportVo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo; +package org.jeecg.modules.system.vo; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysDepartPositionVo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDepartPositionVo.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysDepartPositionVo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDepartPositionVo.java index 4f265fd..97014df 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysDepartPositionVo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDepartPositionVo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo; +package org.jeecg.modules.system.vo; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysDepartUsersVO.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDepartUsersVO.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysDepartUsersVO.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDepartUsersVO.java index 24e6d80..3e0f8bb 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysDepartUsersVO.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDepartUsersVO.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo; +package org.jeecg.modules.system.vo; import java.io.Serializable; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysDictPage.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java similarity index 89% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysDictPage.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java index 5e21f30..8c00c37 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysDictPage.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.vo; +package org.jeecg.modules.system.vo; import lombok.Data; -import org.cpte.modules.system.entity.SysDictItem; +import org.jeecg.modules.system.entity.SysDictItem; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.ExcelCollection; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysPositionSelectTreeVo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysPositionSelectTreeVo.java similarity index 86% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysPositionSelectTreeVo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysPositionSelectTreeVo.java index c44780e..b4955a3 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysPositionSelectTreeVo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysPositionSelectTreeVo.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.vo; +package org.jeecg.modules.system.vo; import lombok.Data; import org.jeecg.common.constant.enums.DepartCategoryEnum; import org.jeecg.common.util.oConvertUtils; -import org.cpte.modules.system.entity.SysDepart; +import org.jeecg.modules.system.entity.SysDepart; import java.util.ArrayList; import java.util.List; @@ -48,11 +48,7 @@ public class SysPositionSelectTreeVo { this.parentId = sysDepart.getParentId(); this.orgCategory = sysDepart.getOrgCategory(); this.orgCode = sysDepart.getOrgCode(); - if(0 == sysDepart.getIzLeaf()){ - this.isLeaf = false; - }else{ - this.isLeaf = true; - } + this.isLeaf = 0 != sysDepart.getIzLeaf(); if(DepartCategoryEnum.DEPART_CATEGORY_POST.getValue().equals(sysDepart.getOrgCategory())){ this.checkable = true; this.disabled = false; @@ -72,11 +68,7 @@ public class SysPositionSelectTreeVo { this.id = position.getId(); this.parentId = position.getDepPostParentId(); this.orgCategory = "3"; - if(0 == position.getIzLeaf()){ - this.isLeaf = false; - }else{ - this.isLeaf = true; - } + this.isLeaf = 0 != position.getIzLeaf(); this.checkable = true; this.disabled = false; } diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserDepVo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserDepVo.java similarity index 92% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserDepVo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserDepVo.java index b0480d0..2e09a91 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserDepVo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserDepVo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo; +package org.jeecg.modules.system.vo; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserExportVo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserExportVo.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserExportVo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserExportVo.java index e21a886..3ce72c1 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserExportVo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserExportVo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo; +package org.jeecg.modules.system.vo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserImportVo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserImportVo.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserImportVo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserImportVo.java index a422e20..fc12343 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserImportVo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserImportVo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo; +package org.jeecg.modules.system.vo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserOnlineVO.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserOnlineVO.java similarity index 96% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserOnlineVO.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserOnlineVO.java index 21e21dd..cb5654b 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserOnlineVO.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserOnlineVO.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo; +package org.jeecg.modules.system.vo; import java.util.Date; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserPositionVo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserPositionVo.java similarity index 89% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserPositionVo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserPositionVo.java index 69dbca1..90894ca 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserPositionVo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserPositionVo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo; +package org.jeecg.modules.system.vo; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserRoleCountVo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserRoleCountVo.java similarity index 92% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserRoleCountVo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserRoleCountVo.java index e015aa9..0a62c68 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserRoleCountVo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserRoleCountVo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo; +package org.jeecg.modules.system.vo; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserRoleVO.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserRoleVO.java similarity index 93% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserRoleVO.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserRoleVO.java index 3375dc2..c0278c4 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserRoleVO.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserRoleVO.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo; +package org.jeecg.modules.system.vo; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserTenantVo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserTenantVo.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserTenantVo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserTenantVo.java index b807e1a..2d34fbc 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/SysUserTenantVo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/SysUserTenantVo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo; +package org.jeecg.modules.system.vo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/UserAvatar.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/UserAvatar.java similarity index 83% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/UserAvatar.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/UserAvatar.java index 9de9b49..d8c55f8 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/UserAvatar.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/UserAvatar.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.vo; +package org.jeecg.modules.system.vo; import lombok.Data; -import org.cpte.modules.system.entity.SysUser; +import org.jeecg.modules.system.entity.SysUser; /** * 用户名和头像信息 diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/lowapp/AppExportUserVo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/AppExportUserVo.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/lowapp/AppExportUserVo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/AppExportUserVo.java index ee27bc4..0544334 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/lowapp/AppExportUserVo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/AppExportUserVo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo.lowapp; +package org.jeecg.modules.system.vo.lowapp; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/lowapp/DepartAndUserInfo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/DepartAndUserInfo.java similarity index 81% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/lowapp/DepartAndUserInfo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/DepartAndUserInfo.java index 662d001..7d45f4a 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/lowapp/DepartAndUserInfo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/DepartAndUserInfo.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.vo.lowapp; +package org.jeecg.modules.system.vo.lowapp; import lombok.Data; -import org.cpte.modules.system.vo.UserAvatar; +import org.jeecg.modules.system.vo.UserAvatar; import java.io.Serializable; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/lowapp/DepartInfo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/DepartInfo.java similarity index 87% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/lowapp/DepartInfo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/DepartInfo.java index d9d1448..51e7951 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/lowapp/DepartInfo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/DepartInfo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo.lowapp; +package org.jeecg.modules.system.vo.lowapp; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/lowapp/ExportDepartVo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/ExportDepartVo.java similarity index 89% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/lowapp/ExportDepartVo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/ExportDepartVo.java index f59a1fe..4164be6 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/lowapp/ExportDepartVo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/ExportDepartVo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo.lowapp; +package org.jeecg.modules.system.vo.lowapp; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/lowapp/SysDictVo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/SysDictVo.java similarity index 86% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/lowapp/SysDictVo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/SysDictVo.java index 20bbc9f..188f94b 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/lowapp/SysDictVo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/SysDictVo.java @@ -1,9 +1,9 @@ -package org.cpte.modules.system.vo.lowapp; +package org.jeecg.modules.system.vo.lowapp; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; -import org.cpte.modules.system.entity.SysDictItem; +import org.jeecg.modules.system.entity.SysDictItem; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/lowapp/UpdateDepartInfo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/UpdateDepartInfo.java similarity index 87% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/lowapp/UpdateDepartInfo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/UpdateDepartInfo.java index 882712a..7f48342 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/lowapp/UpdateDepartInfo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/lowapp/UpdateDepartInfo.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.vo.lowapp; +package org.jeecg.modules.system.vo.lowapp; import lombok.Data; -import org.cpte.modules.system.entity.SysDepart; +import org.jeecg.modules.system.entity.SysDepart; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/TenantDepartAuthInfo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantDepartAuthInfo.java similarity index 86% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/TenantDepartAuthInfo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantDepartAuthInfo.java index 8a5c173..70349ab 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/TenantDepartAuthInfo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantDepartAuthInfo.java @@ -1,7 +1,7 @@ -package org.cpte.modules.system.vo.tenant; +package org.jeecg.modules.system.vo.tenant; import lombok.Data; -import org.cpte.modules.system.entity.SysTenant; +import org.jeecg.modules.system.entity.SysTenant; import java.util.List; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/TenantPackAuth.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantPackAuth.java similarity index 89% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/TenantPackAuth.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantPackAuth.java index 26d7b1b..234ef94 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/TenantPackAuth.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantPackAuth.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo.tenant; +package org.jeecg.modules.system.vo.tenant; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/TenantPackModel.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantPackModel.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/TenantPackModel.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantPackModel.java index 472e6dd..9198bcc 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/TenantPackModel.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantPackModel.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo.tenant; +package org.jeecg.modules.system.vo.tenant; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/TenantPackUser.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantPackUser.java similarity index 95% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/TenantPackUser.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantPackUser.java index 2344971..684cb84 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/TenantPackUser.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantPackUser.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo.tenant; +package org.jeecg.modules.system.vo.tenant; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/TenantPackUserCount.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantPackUserCount.java similarity index 87% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/TenantPackUserCount.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantPackUserCount.java index 7510286..6b8b2d7 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/TenantPackUserCount.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/TenantPackUserCount.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo.tenant; +package org.jeecg.modules.system.vo.tenant; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/UserDepart.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/UserDepart.java similarity index 85% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/UserDepart.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/UserDepart.java index c6c7a97..4ba9e37 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/UserDepart.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/UserDepart.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo.tenant; +package org.jeecg.modules.system.vo.tenant; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/UserPosition.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/UserPosition.java similarity index 85% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/UserPosition.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/UserPosition.java index 90d6fe2..d4a1d8b 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/tenant/UserPosition.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/tenant/UserPosition.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo.tenant; +package org.jeecg.modules.system.vo.tenant; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/thirdapp/JdtDepartmentTreeVo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/thirdapp/JdtDepartmentTreeVo.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/thirdapp/JdtDepartmentTreeVo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/thirdapp/JdtDepartmentTreeVo.java index 3af6689..9726ca8 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/thirdapp/JdtDepartmentTreeVo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/thirdapp/JdtDepartmentTreeVo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo.thirdapp; +package org.jeecg.modules.system.vo.thirdapp; import com.jeecg.dingtalk.api.department.vo.Department; import org.springframework.beans.BeanUtils; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/thirdapp/JwDepartmentTreeVo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/thirdapp/JwDepartmentTreeVo.java similarity index 98% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/thirdapp/JwDepartmentTreeVo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/thirdapp/JwDepartmentTreeVo.java index 4d356db..d7d3de1 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/thirdapp/JwDepartmentTreeVo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/thirdapp/JwDepartmentTreeVo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo.thirdapp; +package org.jeecg.modules.system.vo.thirdapp; import com.jeecg.qywx.api.department.vo.Department; import org.springframework.beans.BeanUtils; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/thirdapp/JwSysUserDepartVo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/thirdapp/JwSysUserDepartVo.java similarity index 87% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/thirdapp/JwSysUserDepartVo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/thirdapp/JwSysUserDepartVo.java index d7685e9..e8609f9 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/thirdapp/JwSysUserDepartVo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/thirdapp/JwSysUserDepartVo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo.thirdapp; +package org.jeecg.modules.system.vo.thirdapp; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/thirdapp/JwUserDepartVo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/thirdapp/JwUserDepartVo.java similarity index 93% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/thirdapp/JwUserDepartVo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/thirdapp/JwUserDepartVo.java index e5c0043..defb472 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/thirdapp/JwUserDepartVo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/thirdapp/JwUserDepartVo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo.thirdapp; +package org.jeecg.modules.system.vo.thirdapp; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/thirdapp/SyncInfoVo.java b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/thirdapp/SyncInfoVo.java similarity index 94% rename from cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/thirdapp/SyncInfoVo.java rename to cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/thirdapp/SyncInfoVo.java index dbb064d..9169202 100644 --- a/cpte-module-system/cpte-system-biz/src/main/java/org/cpte/modules/system/vo/thirdapp/SyncInfoVo.java +++ b/cpte-module-system/cpte-system-biz/src/main/java/org/jeecg/modules/system/vo/thirdapp/SyncInfoVo.java @@ -1,4 +1,4 @@ -package org.cpte.modules.system.vo.thirdapp; +package org.jeecg.modules.system.vo.thirdapp; import lombok.Data; diff --git a/cpte-module-system/cpte-system-biz/src/main/resources/static/generic/web/locale/locale.properties b/cpte-module-system/cpte-system-biz/src/main/resources/static/generic/web/locale/locale.properties index 9aded1b..e306904 100644 --- a/cpte-module-system/cpte-system-biz/src/main/resources/static/generic/web/locale/locale.properties +++ b/cpte-module-system/cpte-system-biz/src/main/resources/static/generic/web/locale/locale.properties @@ -1,312 +1,312 @@ -[ach] -@import url(ach/viewer.properties) +[ach]= +@import=url(ach/viewer.properties) -[af] -@import url(af/viewer.properties) +[af]= +@import=url(af/viewer.properties) -[ak] -@import url(ak/viewer.properties) +[ak]= +@import=url(ak/viewer.properties) -[an] -@import url(an/viewer.properties) +[an]= +@import=url(an/viewer.properties) -[ar] -@import url(ar/viewer.properties) +[ar]= +@import=url(ar/viewer.properties) -[as] -@import url(as/viewer.properties) +[as]= +@import=url(as/viewer.properties) -[ast] -@import url(ast/viewer.properties) +[ast]= +@import=url(ast/viewer.properties) -[az] -@import url(az/viewer.properties) +[az]= +@import=url(az/viewer.properties) -[be] -@import url(be/viewer.properties) +[be]= +@import=url(be/viewer.properties) -[bg] -@import url(bg/viewer.properties) +[bg]= +@import=url(bg/viewer.properties) -[bn-BD] -@import url(bn-BD/viewer.properties) +[bn-BD]= +@import=url(bn-BD/viewer.properties) -[bn-IN] -@import url(bn-IN/viewer.properties) +[bn-IN]= +@import=url(bn-IN/viewer.properties) -[br] -@import url(br/viewer.properties) +[br]= +@import=url(br/viewer.properties) -[bs] -@import url(bs/viewer.properties) +[bs]= +@import=url(bs/viewer.properties) -[ca] -@import url(ca/viewer.properties) +[ca]= +@import=url(ca/viewer.properties) -[cs] -@import url(cs/viewer.properties) +[cs]= +@import=url(cs/viewer.properties) -[csb] -@import url(csb/viewer.properties) +[csb]= +@import=url(csb/viewer.properties) -[cy] -@import url(cy/viewer.properties) +[cy]= +@import=url(cy/viewer.properties) -[da] -@import url(da/viewer.properties) +[da]= +@import=url(da/viewer.properties) -[de] -@import url(de/viewer.properties) +[de]= +@import=url(de/viewer.properties) -[el] -@import url(el/viewer.properties) +[el]= +@import=url(el/viewer.properties) -[en-GB] -@import url(en-GB/viewer.properties) +[en-GB]= +@import=url(en-GB/viewer.properties) -[en-US] -@import url(en-US/viewer.properties) +[en-US]= +@import=url(en-US/viewer.properties) -[en-ZA] -@import url(en-ZA/viewer.properties) +[en-ZA]= +@import=url(en-ZA/viewer.properties) -[eo] -@import url(eo/viewer.properties) +[eo]= +@import=url(eo/viewer.properties) -[es-AR] -@import url(es-AR/viewer.properties) +[es-AR]= +@import=url(es-AR/viewer.properties) -[es-CL] -@import url(es-CL/viewer.properties) +[es-CL]= +@import=url(es-CL/viewer.properties) -[es-ES] -@import url(es-ES/viewer.properties) +[es-ES]= +@import=url(es-ES/viewer.properties) -[es-MX] -@import url(es-MX/viewer.properties) +[es-MX]= +@import=url(es-MX/viewer.properties) -[et] -@import url(et/viewer.properties) +[et]= +@import=url(et/viewer.properties) -[eu] -@import url(eu/viewer.properties) +[eu]= +@import=url(eu/viewer.properties) -[fa] -@import url(fa/viewer.properties) +[fa]= +@import=url(fa/viewer.properties) -[ff] -@import url(ff/viewer.properties) +[ff]= +@import=url(ff/viewer.properties) -[fi] -@import url(fi/viewer.properties) +[fi]= +@import=url(fi/viewer.properties) -[fr] -@import url(fr/viewer.properties) +[fr]= +@import=url(fr/viewer.properties) -[fy-NL] -@import url(fy-NL/viewer.properties) +[fy-NL]= +@import=url(fy-NL/viewer.properties) -[ga-IE] -@import url(ga-IE/viewer.properties) +[ga-IE]= +@import=url(ga-IE/viewer.properties) -[gd] -@import url(gd/viewer.properties) +[gd]= +@import=url(gd/viewer.properties) -[gl] -@import url(gl/viewer.properties) +[gl]= +@import=url(gl/viewer.properties) -[gu-IN] -@import url(gu-IN/viewer.properties) +[gu-IN]= +@import=url(gu-IN/viewer.properties) -[he] -@import url(he/viewer.properties) +[he]= +@import=url(he/viewer.properties) -[hi-IN] -@import url(hi-IN/viewer.properties) +[hi-IN]= +@import=url(hi-IN/viewer.properties) -[hr] -@import url(hr/viewer.properties) +[hr]= +@import=url(hr/viewer.properties) -[hu] -@import url(hu/viewer.properties) +[hu]= +@import=url(hu/viewer.properties) -[hy-AM] -@import url(hy-AM/viewer.properties) +[hy-AM]= +@import=url(hy-AM/viewer.properties) -[id] -@import url(id/viewer.properties) +[id]= +@import=url(id/viewer.properties) -[is] -@import url(is/viewer.properties) +[is]= +@import=url(is/viewer.properties) -[it] -@import url(it/viewer.properties) +[it]= +@import=url(it/viewer.properties) -[ja] -@import url(ja/viewer.properties) +[ja]= +@import=url(ja/viewer.properties) -[ka] -@import url(ka/viewer.properties) +[ka]= +@import=url(ka/viewer.properties) -[kk] -@import url(kk/viewer.properties) +[kk]= +@import=url(kk/viewer.properties) -[km] -@import url(km/viewer.properties) +[km]= +@import=url(km/viewer.properties) -[kn] -@import url(kn/viewer.properties) +[kn]= +@import=url(kn/viewer.properties) -[ko] -@import url(ko/viewer.properties) +[ko]= +@import=url(ko/viewer.properties) -[ku] -@import url(ku/viewer.properties) +[ku]= +@import=url(ku/viewer.properties) -[lg] -@import url(lg/viewer.properties) +[lg]= +@import=url(lg/viewer.properties) -[lij] -@import url(lij/viewer.properties) +[lij]= +@import=url(lij/viewer.properties) -[lt] -@import url(lt/viewer.properties) +[lt]= +@import=url(lt/viewer.properties) -[lv] -@import url(lv/viewer.properties) +[lv]= +@import=url(lv/viewer.properties) -[mai] -@import url(mai/viewer.properties) +[mai]= +@import=url(mai/viewer.properties) -[mk] -@import url(mk/viewer.properties) +[mk]= +@import=url(mk/viewer.properties) -[ml] -@import url(ml/viewer.properties) +[ml]= +@import=url(ml/viewer.properties) -[mn] -@import url(mn/viewer.properties) +[mn]= +@import=url(mn/viewer.properties) -[mr] -@import url(mr/viewer.properties) +[mr]= +@import=url(mr/viewer.properties) -[ms] -@import url(ms/viewer.properties) +[ms]= +@import=url(ms/viewer.properties) -[my] -@import url(my/viewer.properties) +[my]= +@import=url(my/viewer.properties) -[nb-NO] -@import url(nb-NO/viewer.properties) +[nb-NO]= +@import=url(nb-NO/viewer.properties) -[nl] -@import url(nl/viewer.properties) +[nl]= +@import=url(nl/viewer.properties) -[nn-NO] -@import url(nn-NO/viewer.properties) +[nn-NO]= +@import=url(nn-NO/viewer.properties) -[nso] -@import url(nso/viewer.properties) +[nso]= +@import=url(nso/viewer.properties) -[oc] -@import url(oc/viewer.properties) +[oc]= +@import=url(oc/viewer.properties) -[or] -@import url(or/viewer.properties) +[or]= +@import=url(or/viewer.properties) -[pa-IN] -@import url(pa-IN/viewer.properties) +[pa-IN]= +@import=url(pa-IN/viewer.properties) -[pl] -@import url(pl/viewer.properties) +[pl]= +@import=url(pl/viewer.properties) -[pt-BR] -@import url(pt-BR/viewer.properties) +[pt-BR]= +@import=url(pt-BR/viewer.properties) -[pt-PT] -@import url(pt-PT/viewer.properties) +[pt-PT]= +@import=url(pt-PT/viewer.properties) -[rm] -@import url(rm/viewer.properties) +[rm]= +@import=url(rm/viewer.properties) -[ro] -@import url(ro/viewer.properties) +[ro]= +@import=url(ro/viewer.properties) -[ru] -@import url(ru/viewer.properties) +[ru]= +@import=url(ru/viewer.properties) -[rw] -@import url(rw/viewer.properties) +[rw]= +@import=url(rw/viewer.properties) -[sah] -@import url(sah/viewer.properties) +[sah]= +@import=url(sah/viewer.properties) -[si] -@import url(si/viewer.properties) +[si]= +@import=url(si/viewer.properties) -[sk] -@import url(sk/viewer.properties) +[sk]= +@import=url(sk/viewer.properties) -[sl] -@import url(sl/viewer.properties) +[sl]= +@import=url(sl/viewer.properties) -[son] -@import url(son/viewer.properties) +[son]= +@import=url(son/viewer.properties) -[sq] -@import url(sq/viewer.properties) +[sq]= +@import=url(sq/viewer.properties) -[sr] -@import url(sr/viewer.properties) +[sr]= +@import=url(sr/viewer.properties) -[sv-SE] -@import url(sv-SE/viewer.properties) +[sv-SE]= +@import=url(sv-SE/viewer.properties) -[sw] -@import url(sw/viewer.properties) +[sw]= +@import=url(sw/viewer.properties) -[ta] -@import url(ta/viewer.properties) +[ta]= +@import=url(ta/viewer.properties) -[ta-LK] -@import url(ta-LK/viewer.properties) +[ta-LK]= +@import=url(ta-LK/viewer.properties) -[te] -@import url(te/viewer.properties) +[te]= +@import=url(te/viewer.properties) -[th] -@import url(th/viewer.properties) +[th]= +@import=url(th/viewer.properties) -[tl] -@import url(tl/viewer.properties) +[tl]= +@import=url(tl/viewer.properties) -[tn] -@import url(tn/viewer.properties) +[tn]= +@import=url(tn/viewer.properties) -[tr] -@import url(tr/viewer.properties) +[tr]= +@import=url(tr/viewer.properties) -[uk] -@import url(uk/viewer.properties) +[uk]= +@import=url(uk/viewer.properties) -[ur] -@import url(ur/viewer.properties) +[ur]= +@import=url(ur/viewer.properties) -[vi] -@import url(vi/viewer.properties) +[vi]= +@import=url(vi/viewer.properties) -[wo] -@import url(wo/viewer.properties) +[wo]= +@import=url(wo/viewer.properties) -[xh] -@import url(xh/viewer.properties) +[xh]= +@import=url(xh/viewer.properties) -[zh-CN] -@import url(zh-CN/viewer.properties) +[zh-CN]= +@import=url(zh-CN/viewer.properties) -[zh-TW] -@import url(zh-TW/viewer.properties) +[zh-TW]= +@import=url(zh-TW/viewer.properties) -[zu] -@import url(zu/viewer.properties) +[zu]= +@import=url(zu/viewer.properties) diff --git a/cpte-module-system/cpte-system-start/pom.xml b/cpte-module-system/cpte-system-start/pom.xml index dd2e296..1cb241a 100644 --- a/cpte-module-system/cpte-system-start/pom.xml +++ b/cpte-module-system/cpte-system-start/pom.xml @@ -24,6 +24,13 @@ cpte-module-demo ${cpte.version} + + + + org.jeecgframework.boot3 + cpte-module-wms + ${cpte.version} +