From 37a7ddd43ce494f6dc465b17865ee832bb6218e2 Mon Sep 17 00:00:00 2001 From: shanwb Date: Fri, 13 Sep 2024 14:20:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20update=20tspandata=E3=80=81webh?= =?UTF-8?q?ook=20module=20change=20run.mone=20to=20org.apache=20(#457)=20(?= =?UTF-8?q?#463)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit refactor: update app module change run.mone to org.apache (#457) Co-authored-by: EricDing <128116675+sadadw1@users.noreply.github.com> --- ozhera-app/app-api/pom.xml | 7 ++-- .../api/message/HeraAppInfoModifyMessage.java | 4 +-- .../app/api/message/HeraAppModifyType.java | 2 +- .../app/api/model/HeraAppBaseInfoModel.java | 2 +- .../api/model/HeraAppBaseInfoParticipant.java | 2 +- .../app/api/model/HeraAppBaseQuery.java | 2 +- .../ozhera}/app/api/model/HeraAppEnvData.java | 2 +- .../ozhera}/app/api/model/HeraAppMqInfo.java | 4 +-- .../app/api/model/HeraAppRoleModel.java | 2 +- .../ozhera}/app/api/model/HeraSimpleEnv.java | 2 +- .../group/HeraProjectGroupAppRequest.java | 2 +- .../group/HeraProjectGroupDataRequest.java | 2 +- .../project/group/HeraProjectGroupModel.java | 2 +- .../group/HeraProjectGroupUserModel.java | 2 +- .../project/group/ProjectGroupTreeNode.java | 2 +- .../ozhera}/app/api/response/AppBaseInfo.java | 2 +- .../app/api/response/PairResponse.java | 2 +- .../api/service/HeraAppEnvOutwardService.java | 6 ++-- .../app/api/service/HeraAppService.java | 12 +++---- .../app/api/service/HeraAuthorizationApi.java | 4 +-- .../service/HeraProjectGroupServiceApi.java | 12 +++---- ozhera-app/app-common/pom.xml | 5 +-- .../apache/ozhera}/app/common/Constant.java | 2 +- .../apache/ozhera}/app/common/Result.java | 6 ++-- .../apache/ozhera}/app/enums/AppTypeEnum.java | 2 +- .../apache/ozhera}/app/enums/BizCodeEnum.java | 2 +- .../apache/ozhera}/app/enums/CommonError.java | 2 +- .../apache/ozhera}/app/enums/OperateEnum.java | 2 +- .../apache/ozhera}/app/enums/PlatForm.java | 2 +- .../ozhera}/app/enums/PlatFormTypeEnum.java | 2 +- .../ozhera}/app/enums/ProjectTypeEnum.java | 2 +- .../apache/ozhera}/app/enums/StatusEnum.java | 2 +- .../ozhera}/app/exception/AppException.java | 4 +-- .../apache/ozhera}/app/model/BaseCommon.java | 2 +- .../ozhera}/app/model/vo/HeraAppEnvVo.java | 4 +-- .../app/model/vo/HeraAppOperateVo.java | 6 ++-- .../ozhera}/app/model/vo/HeraEnvIpVo.java | 4 +-- .../apache/ozhera}/app/model/vo/PodInfo.java | 2 +- .../ozhera}/app/model/vo/TpcLabelRes.java | 2 +- .../ozhera}/app/model/vo/TpcPageRes.java | 2 +- .../apache/ozhera}/app/valid/AddGroup.java | 2 +- .../apache/ozhera}/app/valid/UpdateGroup.java | 2 +- ozhera-app/app-server/pom.xml | 8 ++--- .../apache/ozhera}/app/AppBootstrap.java | 2 +- .../app/aop/OperateAppBaseInfoAspect.java | 12 +++---- .../apache/ozhera}/app/config/BeanConfig.java | 2 +- .../ozhera}/app/config/DataSourceConfig.java | 2 +- .../app/config/DubboConfiguration.java | 2 +- .../apache/ozhera}/app/config/MqConfig.java | 2 +- .../ozhera}/app/config/RocketMqConfig.java | 4 +-- .../ozhera}/app/controller/AppController.java | 18 +++++----- .../app/controller/HeraAppEnvController.java | 12 +++---- .../app/controller/TestController.java | 10 +++--- .../AppExceptionControllerAdvice.java | 6 ++-- .../ozhera}/app/job/HeraAppEnvIpJob.java | 4 +-- .../app/response/AppResponseAdvice.java | 6 ++-- .../app/response/anno/OriginalResponse.java | 2 +- .../apache/ozhera/app}/test/AppBaseTest.java | 0 .../app}/test/EnvIpFetchServiceTest.java | 0 .../app}/test/HeraAppEnvControllerTest.java | 0 .../test/HeraAppEnvOutwardServiceTest.java | 2 +- .../app}/test/HeraProjectGroupTest.java | 0 .../apache/ozhera/app}/test/RocketMqTest.java | 0 .../ozhera/app}/test/SpringBootFeatTest.java | 2 +- .../apache/ozhera/app}/test/UserBean.java | 2 +- ozhera-app/app-service/pom.xml | 7 ++-- .../app/auth/AuthorizationService.java | 8 ++--- .../app/config/NacosConfiguration.java | 2 +- .../ozhera}/app/dao/HeraAppRoleDao.java | 8 ++--- .../ozhera}/app/dao/HeraBaseInfoDao.java | 16 ++++----- .../app/dao/HeraProjectGroupAppDao.java | 8 ++--- .../ozhera}/app/dao/HeraProjectGroupDao.java | 10 +++--- .../app/dao/HeraProjectGroupUserDao.java | 10 +++--- .../app/dao/mapper/HeraAppBaseInfoMapper.java | 12 +++---- .../app/dao/mapper/HeraAppEnvMapper.java | 4 +-- .../dao/mapper/HeraAppExcessInfoMapper.java | 4 +-- .../app/dao/mapper/HeraAppRoleMapper.java | 6 ++-- .../dao/mapper/HeraProjectGroupAppMapper.java | 6 ++-- .../dao/mapper/HeraProjectGroupMapper.java | 8 ++--- .../mapper/HeraProjectGroupUserMapper.java | 6 ++-- .../ozhera}/app/model/HeraAppBaseInfo.java | 4 +-- .../app/model/HeraAppBaseInfoExample.java | 2 +- .../apache/ozhera}/app/model/HeraAppEnv.java | 12 +++---- .../ozhera}/app/model/HeraAppExcessInfo.java | 2 +- .../apache/ozhera}/app/model/HeraAppRole.java | 2 +- .../ozhera}/app/model/HeraAppRoleExample.java | 2 +- .../ozhera}/app/model/HeraMetaDataPort.java | 2 +- .../ozhera}/app/model/HeraProjectGroup.java | 2 +- .../app/model/HeraProjectGroupApp.java | 2 +- .../app/model/HeraProjectGroupAppExample.java | 2 +- .../app/model/HeraProjectGroupExample.java | 2 +- .../app/model/HeraProjectGroupUser.java | 2 +- .../model/HeraProjectGroupUserExample.java | 2 +- .../ozhera}/app/redis/RedisService.java | 2 +- .../app/service/HeraAppEnvService.java | 6 ++-- .../app/service/HeraAppRoleService.java | 8 ++--- .../app/service/env/DefaultEnvIpFetch.java | 12 +++---- .../service/env/DefaultHttpEnvIpFetch.java | 10 +++--- .../service/env/DefaultNacosEnvIpFetch.java | 4 +-- .../ozhera}/app/service/env/EnvIpFetch.java | 4 +-- .../extension/AppTypeServiceExtension.java | 2 +- .../impl/DefaultAppTypeServiceExtension.java | 10 +++--- .../impl/AuthorizationServiceImpl.java | 8 ++--- .../service/impl/HeraAppBaseInfoService.java | 12 +++---- .../impl/HeraAppEnvOutwardServiceImpl.java | 12 +++---- .../service/impl/HeraAppEnvServiceImpl.java | 32 ++++++++--------- .../app/service/impl/HeraAppServiceImpl.java | 36 +++++++++---------- .../impl/HeraPojectGroupServiceImpl.java | 16 ++++----- .../service/mq/RocketMqHeraAppConsumer.java | 20 +++++------ .../service/mq/RocketMqHeraAppProducer.java | 4 +-- .../app/service/mq/model/HeraAppMessage.java | 4 +-- .../group/HeraProjectGroupService.java | 32 ++++++++--------- .../project/group/TreeQueryBuilder.java | 12 +++---- .../ozhera}/app/util/AppTypeTransferUtil.java | 6 ++-- .../mapper/HeraAppBaseInfoMapper.xml | 34 +++++++++--------- .../resources/mapper/HeraAppRoleMapper.xml | 18 +++++----- .../mapper/HeraProjectGroupAppMapper.xml | 18 +++++----- .../mapper/HeraProjectGroupMapper.xml | 18 +++++----- .../mapper/HeraProjectGroupUserMapper.xml | 18 +++++----- ozhera-app/pom.xml | 17 +++++---- .../log/agent/common/trace/TraceUtil.java | 26 +++++++------- .../log/agent/extension/KafkaExporter.java | 2 +- .../mone/log/agent/extension/RmqExporter.java | 2 +- .../log/manager/dao/MilogAppTopicRelDao.java | 4 +-- .../manager/service/HeraAppEnvService.java | 4 +-- .../log/manager/service/HeraAppService.java | 8 ++--- .../log/manager/service/LogTailService.java | 4 +-- .../consumer/MioneRocketMqConsumer.java | 2 +- .../agent/MilogAgentServiceImpl.java | 2 +- .../tail/DefaultTailExtensionService.java | 4 +-- .../extension/tail/TailExtensionService.java | 2 +- .../service/impl/EsDataServiceImpl.java | 2 +- .../service/impl/HeraAppEnvServiceImpl.java | 6 ++-- .../service/impl/HeraAppServiceImpl.java | 12 +++---- .../impl/HeralogHomePageServiceImpl.java | 2 +- .../service/impl/LogTailServiceImpl.java | 4 +-- .../MilogAppMiddlewareRelServiceImpl.java | 2 +- .../service/impl/MilogOpenServiceImpl.java | 2 +- .../listener/AutoLogAccessListener.java | 2 +- .../service/path/LogPathMappingFactory.java | 2 +- .../controller/AppMonitorController.java | 4 +-- .../controller/AuthorizationController.java | 4 +-- .../controller/GrafanaMappingController.java | 2 +- .../HeraProjectGroupController.java | 12 +++---- .../service/AppGrafanaMappingService.java | 2 +- .../monitor/service/AppMonitorService.java | 4 +-- .../monitor/service/HeraBaseInfoService.java | 4 +-- .../api/AppMonitorServiceExtension.java | 2 +- .../impl/AppMonitorServiceExtensionImpl.java | 2 +- .../impl/MerticDetailServiceImpl.java | 2 +- .../impl/AppGrafanaMappingServiceImpl.java | 2 +- .../service/impl/AppMonitorServiceImpl.java | 8 ++--- .../service/impl/HeraBaseInfoServiceImpl.java | 10 +++--- .../service/model/AppMonitorModel.java | 2 +- .../service/model/HeraAppRoleQuery.java | 2 +- .../project/group/ProjectGroupService.java | 16 ++++----- .../rocketmq/RocketMqHeraMonitorConsumer.java | 2 +- .../rocketmq/model/HeraAppMessage.java | 2 +- .../ozhera-operator-common/pom.xml | 4 +-- .../ozhera}/operator/common/ESIndexConst.java | 2 +- .../ozhera}/operator/common/ErrorCode.java | 2 +- .../ozhera}/operator/common/FileUtils.java | 2 +- .../ozhera}/operator/common/HoConstant.java | 2 +- .../operator/common/HttpClientUtil.java | 2 +- .../operator/common/ResourceTypeEnum.java | 2 +- .../ozhera-operator-server/pom.xml | 8 ++--- .../ozhera}/operator/HeraBootstrap.java | 2 +- .../controller/OzHeraOperatorController.java | 22 ++++++------ .../ozhera}/operator/test/SidecarTest.java | 2 +- .../ozhera-operator-service/pom.xml | 6 ++-- .../ozhera}/operator/bo/HeraBootstrap.java | 2 +- .../operator/bo/HeraBootstrapList.java | 2 +- .../ozhera}/operator/bo/HeraObjectMeta.java | 2 +- .../ozhera}/operator/bo/HeraResource.java | 9 ++--- .../apache/ozhera}/operator/bo/HeraSpec.java | 2 +- .../ozhera}/operator/bo/HeraStatus.java | 2 +- .../apache/ozhera}/operator/bo/PropConf.java | 2 +- .../bo/dashboard/GrafanaApiKeyReq.java | 2 +- .../bo/dashboard/GrafanaApiKeyRes.java | 2 +- .../ozhera}/operator/common/K8sUtilBean.java | 8 ++--- .../ozhera}/operator/dto/DashboardDTO.java | 2 +- .../ozhera}/operator/dto/DeployStateDTO.java | 2 +- .../operator/dto/HeraOperatorDefineDTO.java | 6 ++-- .../operator/dto/OperatorStateDTO.java | 2 +- .../ozhera}/operator/dto/PodStateDTO.java | 2 +- .../operator/dto/ServiceCheckResource.java | 4 +-- .../handler/HeraResourceEventHandler.java | 14 ++++---- .../ozhera}/operator/service/ESService.java | 6 ++-- .../service/HeraBootstrapInitService.java | 28 +++++++-------- .../ozhera}/operator/service/IResource.java | 2 +- .../operator/service/NacosService.java | 4 +-- .../operator/service/RocketMQSerivce.java | 2 +- .../operator/test/PlaceholderTest.java | 2 +- ozhera-operator/pom.xml | 10 +++--- ozhera-tspandata/pom.xml | 9 +++-- .../ozhera}/tspandata/TAttributeKey.java | 2 +- .../ozhera}/tspandata/TAttributeType.java | 2 +- .../apache/ozhera}/tspandata/TAttributes.java | 2 +- .../apache/ozhera}/tspandata/TEvent.java | 2 +- .../apache/ozhera}/tspandata/TExtra.java | 2 +- .../TInstrumentationLibraryInfo.java | 2 +- .../apache/ozhera}/tspandata/TKind.java | 2 +- .../apache/ozhera}/tspandata/TLink.java | 2 +- .../apache/ozhera}/tspandata/TResource.java | 2 +- .../ozhera}/tspandata/TSpanContext.java | 2 +- .../apache/ozhera}/tspandata/TSpanData.java | 2 +- .../apache/ozhera}/tspandata/TStatus.java | 2 +- .../apache/ozhera}/tspandata/TTraceState.java | 2 +- .../apache/ozhera}/tspandata/TValue.java | 2 +- ozhera-webhook/ozhera-webhook-server/pom.xml | 2 +- .../apache/ozhera}/webhook/Bootstrap.java | 6 ++-- .../ozhera}/webhook/common/FileUtils.java | 2 +- .../webhook/common/HttpClientUtil.java | 2 +- .../ozhera}/webhook/common/K8sUtilBean.java | 2 +- .../webhook/config/NacosConfiguration.java | 2 +- .../webhook/controller/HealthController.java | 2 +- .../controller/HeraWebhookController.java | 6 ++-- .../ozhera}/webhook/domain/JsonPatch.java | 2 +- .../ozhera}/webhook/domain/k8s/Container.java | 2 +- .../ozhera}/webhook/domain/k8s/Limits.java | 2 +- .../ozhera}/webhook/domain/k8s/Requests.java | 2 +- .../ozhera}/webhook/domain/k8s/Resource.java | 2 +- .../webhook/domain/k8s/VolumeMount.java | 2 +- .../webhook/domain/tpc/TpcAppInfo.java | 2 +- .../webhook/domain/tpc/TpcAppRequest.java | 2 +- .../webhook/domain/tpc/TpcEnvRequest.java | 2 +- .../webhook/service/HeraWebhookService.java | 4 +-- .../service/impl/HeraWebhookServiceImpl.java | 24 ++++++------- ozhera-webhook/pom.xml | 9 +++-- .../etl/api/service/DataSourceService.java | 2 +- .../etl/api/service/IMetricsParseService.java | 2 +- .../etl/es/consumer/ConsumerService.java | 8 ++--- .../trace/etl/es/consumer/FilterService.java | 2 +- .../es/consumer/KafkaTraceSpanConsumer.java | 2 +- .../consumer/RocketMQTraceSpanConsumer.java | 2 +- .../trace/etl/es/domain/FutureRequest.java | 2 +- .../doris/DorisDataSourceService.java | 2 +- .../extension/doris/WriteDorisService.java | 16 ++++----- .../etl/extension/es/EsDataSourceService.java | 2 +- .../etl/extension/es/WriteEsService.java | 16 ++++----- .../etl/nginx/parser/NginxLogToTraceBase.java | 18 +++++----- .../etl/consumer/KafkaConsumerService.java | 2 +- .../etl/consumer/MetricsParseService.java | 2 +- .../etl/consumer/RocketMQConsumerService.java | 2 +- .../hera/trace/etl/util/ThriftUtil.java | 4 +-- .../xiaomi/hera/trace/etl/util/TraceUtil.java | 26 +++++++------- 246 files changed, 670 insertions(+), 669 deletions(-) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/message/HeraAppInfoModifyMessage.java (95%) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/message/HeraAppModifyType.java (94%) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/model/HeraAppBaseInfoModel.java (96%) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/model/HeraAppBaseInfoParticipant.java (96%) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/model/HeraAppBaseQuery.java (97%) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/model/HeraAppEnvData.java (96%) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/model/HeraAppMqInfo.java (94%) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/model/HeraAppRoleModel.java (96%) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/model/HeraSimpleEnv.java (96%) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/model/project/group/HeraProjectGroupAppRequest.java (94%) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/model/project/group/HeraProjectGroupDataRequest.java (95%) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/model/project/group/HeraProjectGroupModel.java (95%) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/model/project/group/HeraProjectGroupUserModel.java (94%) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/model/project/group/ProjectGroupTreeNode.java (97%) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/response/AppBaseInfo.java (96%) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/response/PairResponse.java (95%) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/service/HeraAppEnvOutwardService.java (87%) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/service/HeraAppService.java (85%) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/service/HeraAuthorizationApi.java (90%) rename ozhera-app/app-api/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/api/service/HeraProjectGroupServiceApi.java (78%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/common/Constant.java (97%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/common/Result.java (95%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/enums/AppTypeEnum.java (97%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/enums/BizCodeEnum.java (96%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/enums/CommonError.java (97%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/enums/OperateEnum.java (97%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/enums/PlatForm.java (95%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/enums/PlatFormTypeEnum.java (99%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/enums/ProjectTypeEnum.java (97%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/enums/StatusEnum.java (96%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/exception/AppException.java (94%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/BaseCommon.java (95%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/vo/HeraAppEnvVo.java (93%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/vo/HeraAppOperateVo.java (91%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/vo/HeraEnvIpVo.java (92%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/vo/PodInfo.java (95%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/vo/TpcLabelRes.java (97%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/vo/TpcPageRes.java (96%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/valid/AddGroup.java (95%) rename ozhera-app/app-common/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/valid/UpdateGroup.java (95%) rename ozhera-app/app-server/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/AppBootstrap.java (98%) rename ozhera-app/app-server/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/aop/OperateAppBaseInfoAspect.java (93%) rename ozhera-app/app-server/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/config/BeanConfig.java (97%) rename ozhera-app/app-server/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/config/DataSourceConfig.java (99%) rename ozhera-app/app-server/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/config/DubboConfiguration.java (98%) rename ozhera-app/app-server/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/config/MqConfig.java (98%) rename ozhera-app/app-server/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/config/RocketMqConfig.java (95%) rename ozhera-app/app-server/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/controller/AppController.java (89%) rename ozhera-app/app-server/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/controller/HeraAppEnvController.java (87%) rename ozhera-app/app-server/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/controller/TestController.java (86%) rename ozhera-app/app-server/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/exception/AppExceptionControllerAdvice.java (95%) rename ozhera-app/app-server/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/job/HeraAppEnvIpJob.java (94%) rename ozhera-app/app-server/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/response/AppResponseAdvice.java (94%) rename ozhera-app/app-server/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/response/anno/OriginalResponse.java (95%) rename ozhera-app/app-server/src/test/java/{com/xiaomi/mone => org/apache/ozhera/app}/test/AppBaseTest.java (100%) rename ozhera-app/app-server/src/test/java/{com/xiaomi/mone => org/apache/ozhera/app}/test/EnvIpFetchServiceTest.java (100%) rename ozhera-app/app-server/src/test/java/{com/xiaomi/mone => org/apache/ozhera/app}/test/HeraAppEnvControllerTest.java (100%) rename ozhera-app/app-server/src/test/java/{com/xiaomi/mone => org/apache/ozhera/app}/test/HeraAppEnvOutwardServiceTest.java (97%) rename ozhera-app/app-server/src/test/java/{com/xiaomi/mone => org/apache/ozhera/app}/test/HeraProjectGroupTest.java (100%) rename ozhera-app/app-server/src/test/java/{com/xiaomi/mone => org/apache/ozhera/app}/test/RocketMqTest.java (100%) rename ozhera-app/app-server/src/test/java/{com/xiaomi/mone => org/apache/ozhera/app}/test/SpringBootFeatTest.java (98%) rename ozhera-app/app-server/src/test/java/{com/xiaomi/mone => org/apache/ozhera/app}/test/UserBean.java (96%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/auth/AuthorizationService.java (96%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/config/NacosConfiguration.java (98%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/dao/HeraAppRoleDao.java (97%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/dao/HeraBaseInfoDao.java (96%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/dao/HeraProjectGroupAppDao.java (93%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/dao/HeraProjectGroupDao.java (95%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/dao/HeraProjectGroupUserDao.java (93%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/dao/mapper/HeraAppBaseInfoMapper.java (88%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/dao/mapper/HeraAppEnvMapper.java (90%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/dao/mapper/HeraAppExcessInfoMapper.java (90%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/dao/mapper/HeraAppRoleMapper.java (92%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/dao/mapper/HeraProjectGroupAppMapper.java (91%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/dao/mapper/HeraProjectGroupMapper.java (88%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/dao/mapper/HeraProjectGroupUserMapper.java (91%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/HeraAppBaseInfo.java (98%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/HeraAppBaseInfoExample.java (99%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/HeraAppEnv.java (90%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/HeraAppExcessInfo.java (97%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/HeraAppRole.java (99%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/HeraAppRoleExample.java (99%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/HeraMetaDataPort.java (96%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/HeraProjectGroup.java (99%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/HeraProjectGroupApp.java (99%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/HeraProjectGroupAppExample.java (99%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/HeraProjectGroupExample.java (99%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/HeraProjectGroupUser.java (99%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/model/HeraProjectGroupUserExample.java (99%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/redis/RedisService.java (99%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/service/HeraAppEnvService.java (88%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/service/HeraAppRoleService.java (93%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/service/env/DefaultEnvIpFetch.java (92%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/service/env/DefaultHttpEnvIpFetch.java (92%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/service/env/DefaultNacosEnvIpFetch.java (98%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/service/env/EnvIpFetch.java (93%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/service/extension/AppTypeServiceExtension.java (95%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/service/extension/impl/DefaultAppTypeServiceExtension.java (85%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/service/impl/AuthorizationServiceImpl.java (86%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/service/impl/HeraAppBaseInfoService.java (92%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/service/impl/HeraAppEnvOutwardServiceImpl.java (90%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/service/impl/HeraAppEnvServiceImpl.java (92%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/service/impl/HeraAppServiceImpl.java (92%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/service/impl/HeraPojectGroupServiceImpl.java (82%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/service/mq/RocketMqHeraAppConsumer.java (95%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/service/mq/RocketMqHeraAppProducer.java (94%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/service/mq/model/HeraAppMessage.java (95%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/service/project/group/HeraProjectGroupService.java (95%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/service/project/group/TreeQueryBuilder.java (89%) rename ozhera-app/app-service/src/main/java/{com/xiaomi/mone => org/apache/ozhera}/app/util/AppTypeTransferUtil.java (93%) rename ozhera-operator/ozhera-operator-common/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/common/ESIndexConst.java (99%) rename ozhera-operator/ozhera-operator-common/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/common/ErrorCode.java (97%) rename ozhera-operator/ozhera-operator-common/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/common/FileUtils.java (97%) rename ozhera-operator/ozhera-operator-common/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/common/HoConstant.java (98%) rename ozhera-operator/ozhera-operator-common/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/common/HttpClientUtil.java (99%) rename ozhera-operator/ozhera-operator-common/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/common/ResourceTypeEnum.java (98%) rename ozhera-operator/ozhera-operator-server/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/HeraBootstrap.java (97%) rename ozhera-operator/ozhera-operator-server/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/controller/OzHeraOperatorController.java (93%) rename ozhera-operator/ozhera-operator-server/src/test/java/{run/mone/hera => org/apache/ozhera}/operator/test/SidecarTest.java (97%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/bo/HeraBootstrap.java (96%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/bo/HeraBootstrapList.java (95%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/bo/HeraObjectMeta.java (95%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/bo/HeraResource.java (91%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/bo/HeraSpec.java (95%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/bo/HeraStatus.java (96%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/bo/PropConf.java (95%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/bo/dashboard/GrafanaApiKeyReq.java (94%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/bo/dashboard/GrafanaApiKeyRes.java (94%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/common/K8sUtilBean.java (97%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/dto/DashboardDTO.java (95%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/dto/DeployStateDTO.java (95%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/dto/HeraOperatorDefineDTO.java (86%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/dto/OperatorStateDTO.java (95%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/dto/PodStateDTO.java (96%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/dto/ServiceCheckResource.java (91%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/handler/HeraResourceEventHandler.java (98%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/service/ESService.java (92%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/service/HeraBootstrapInitService.java (98%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/service/IResource.java (94%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/service/NacosService.java (94%) rename ozhera-operator/ozhera-operator-service/src/main/java/{run/mone/hera => org/apache/ozhera}/operator/service/RocketMQSerivce.java (98%) rename ozhera-operator/ozhera-operator-service/src/test/java/{run/mone/hera => org/apache/ozhera}/operator/test/PlaceholderTest.java (97%) rename ozhera-tspandata/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/tspandata/TAttributeKey.java (99%) rename ozhera-tspandata/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/tspandata/TAttributeType.java (97%) rename ozhera-tspandata/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/tspandata/TAttributes.java (99%) rename ozhera-tspandata/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/tspandata/TEvent.java (99%) rename ozhera-tspandata/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/tspandata/TExtra.java (99%) rename ozhera-tspandata/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/tspandata/TInstrumentationLibraryInfo.java (99%) rename ozhera-tspandata/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/tspandata/TKind.java (97%) rename ozhera-tspandata/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/tspandata/TLink.java (99%) rename ozhera-tspandata/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/tspandata/TResource.java (99%) rename ozhera-tspandata/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/tspandata/TSpanContext.java (99%) rename ozhera-tspandata/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/tspandata/TSpanData.java (99%) rename ozhera-tspandata/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/tspandata/TStatus.java (97%) rename ozhera-tspandata/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/tspandata/TTraceState.java (99%) rename ozhera-tspandata/src/main/java/{com/xiaomi/hera => org/apache/ozhera}/tspandata/TValue.java (99%) rename ozhera-webhook/ozhera-webhook-server/src/main/java/{run/mone/hera => org/apache/ozhera}/webhook/Bootstrap.java (98%) rename ozhera-webhook/ozhera-webhook-server/src/main/java/{run/mone/hera => org/apache/ozhera}/webhook/common/FileUtils.java (97%) rename ozhera-webhook/ozhera-webhook-server/src/main/java/{run/mone/hera => org/apache/ozhera}/webhook/common/HttpClientUtil.java (99%) rename ozhera-webhook/ozhera-webhook-server/src/main/java/{run/mone/hera => org/apache/ozhera}/webhook/common/K8sUtilBean.java (99%) rename ozhera-webhook/ozhera-webhook-server/src/main/java/{run/mone/hera => org/apache/ozhera}/webhook/config/NacosConfiguration.java (97%) rename ozhera-webhook/ozhera-webhook-server/src/main/java/{run/mone/hera => org/apache/ozhera}/webhook/controller/HealthController.java (95%) rename ozhera-webhook/ozhera-webhook-server/src/main/java/{run/mone/hera => org/apache/ozhera}/webhook/controller/HeraWebhookController.java (95%) rename ozhera-webhook/ozhera-webhook-server/src/main/java/{run/mone/hera => org/apache/ozhera}/webhook/domain/JsonPatch.java (96%) rename ozhera-webhook/ozhera-webhook-server/src/main/java/{run/mone/hera => org/apache/ozhera}/webhook/domain/k8s/Container.java (95%) rename ozhera-webhook/ozhera-webhook-server/src/main/java/{run/mone/hera => org/apache/ozhera}/webhook/domain/k8s/Limits.java (94%) rename ozhera-webhook/ozhera-webhook-server/src/main/java/{run/mone/hera => org/apache/ozhera}/webhook/domain/k8s/Requests.java (94%) rename ozhera-webhook/ozhera-webhook-server/src/main/java/{run/mone/hera => org/apache/ozhera}/webhook/domain/k8s/Resource.java (94%) rename ozhera-webhook/ozhera-webhook-server/src/main/java/{run/mone/hera => org/apache/ozhera}/webhook/domain/k8s/VolumeMount.java (95%) rename ozhera-webhook/ozhera-webhook-server/src/main/java/{run/mone/hera => org/apache/ozhera}/webhook/domain/tpc/TpcAppInfo.java (95%) rename ozhera-webhook/ozhera-webhook-server/src/main/java/{run/mone/hera => org/apache/ozhera}/webhook/domain/tpc/TpcAppRequest.java (95%) rename ozhera-webhook/ozhera-webhook-server/src/main/java/{run/mone/hera => org/apache/ozhera}/webhook/domain/tpc/TpcEnvRequest.java (94%) rename ozhera-webhook/ozhera-webhook-server/src/main/java/{run/mone/hera => org/apache/ozhera}/webhook/service/HeraWebhookService.java (91%) rename ozhera-webhook/ozhera-webhook-server/src/main/java/{run/mone/hera => org/apache/ozhera}/webhook/service/impl/HeraWebhookServiceImpl.java (97%) diff --git a/ozhera-app/app-api/pom.xml b/ozhera-app/app-api/pom.xml index 4a9a1521f..27f7cdc66 100644 --- a/ozhera-app/app-api/pom.xml +++ b/ozhera-app/app-api/pom.xml @@ -4,17 +4,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - run.mone + org.apache.ozhera ozhera-app - 1.4-jdk21-4 + 2.0.0-SNAPSHOT + 4.0.0 app-api ${hera-app.release.version} - run.mone + org.apache.ozhera app-common diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/message/HeraAppInfoModifyMessage.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/message/HeraAppInfoModifyMessage.java similarity index 95% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/message/HeraAppInfoModifyMessage.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/message/HeraAppInfoModifyMessage.java index 722dd0d6b..ec14d7bce 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/message/HeraAppInfoModifyMessage.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/message/HeraAppInfoModifyMessage.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.message; +package org.apache.ozhera.app.api.message; import com.google.gson.JsonObject; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; import lombok.Data; import lombok.ToString; diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/message/HeraAppModifyType.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/message/HeraAppModifyType.java similarity index 94% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/message/HeraAppModifyType.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/message/HeraAppModifyType.java index 976e06c32..bf6e51ab8 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/message/HeraAppModifyType.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/message/HeraAppModifyType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.message; +package org.apache.ozhera.app.api.message; import java.io.Serializable; diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraAppBaseInfoModel.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraAppBaseInfoModel.java similarity index 96% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraAppBaseInfoModel.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraAppBaseInfoModel.java index f10aa8edb..175fefc41 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraAppBaseInfoModel.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraAppBaseInfoModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.model; +package org.apache.ozhera.app.api.model; import lombok.Data; diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraAppBaseInfoParticipant.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraAppBaseInfoParticipant.java similarity index 96% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraAppBaseInfoParticipant.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraAppBaseInfoParticipant.java index 0acc63248..ff07ce01d 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraAppBaseInfoParticipant.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraAppBaseInfoParticipant.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.model; +package org.apache.ozhera.app.api.model; import lombok.Data; diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraAppBaseQuery.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraAppBaseQuery.java similarity index 97% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraAppBaseQuery.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraAppBaseQuery.java index df4ad6c11..c2f34e530 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraAppBaseQuery.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraAppBaseQuery.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.model; +package org.apache.ozhera.app.api.model; import lombok.Data; import lombok.ToString; diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraAppEnvData.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraAppEnvData.java similarity index 96% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraAppEnvData.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraAppEnvData.java index b2b611a42..a458d75c4 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraAppEnvData.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraAppEnvData.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.model; +package org.apache.ozhera.app.api.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraAppMqInfo.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraAppMqInfo.java similarity index 94% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraAppMqInfo.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraAppMqInfo.java index f9b27f8d4..29062e571 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraAppMqInfo.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraAppMqInfo.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.model; +package org.apache.ozhera.app.api.model; -import com.xiaomi.mone.app.enums.OperateEnum; +import org.apache.ozhera.app.enums.OperateEnum; import lombok.Data; import java.io.Serializable; diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraAppRoleModel.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraAppRoleModel.java similarity index 96% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraAppRoleModel.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraAppRoleModel.java index 8a1018f56..8633567bf 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraAppRoleModel.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraAppRoleModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.model; +package org.apache.ozhera.app.api.model; import lombok.Data; import lombok.ToString; diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraSimpleEnv.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraSimpleEnv.java similarity index 96% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraSimpleEnv.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraSimpleEnv.java index e6acc47ed..948eafff6 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/HeraSimpleEnv.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/HeraSimpleEnv.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.model; +package org.apache.ozhera.app.api.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/project/group/HeraProjectGroupAppRequest.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/project/group/HeraProjectGroupAppRequest.java similarity index 94% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/project/group/HeraProjectGroupAppRequest.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/project/group/HeraProjectGroupAppRequest.java index 6df3287dc..9f94274fe 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/project/group/HeraProjectGroupAppRequest.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/project/group/HeraProjectGroupAppRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.model.project.group; +package org.apache.ozhera.app.api.model.project.group; import lombok.Data; diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/project/group/HeraProjectGroupDataRequest.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/project/group/HeraProjectGroupDataRequest.java similarity index 95% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/project/group/HeraProjectGroupDataRequest.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/project/group/HeraProjectGroupDataRequest.java index ce8a1336f..b3aae318a 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/project/group/HeraProjectGroupDataRequest.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/project/group/HeraProjectGroupDataRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.model.project.group; +package org.apache.ozhera.app.api.model.project.group; import lombok.Data; diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/project/group/HeraProjectGroupModel.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/project/group/HeraProjectGroupModel.java similarity index 95% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/project/group/HeraProjectGroupModel.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/project/group/HeraProjectGroupModel.java index 94ee12f61..716a900a3 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/project/group/HeraProjectGroupModel.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/project/group/HeraProjectGroupModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.model.project.group; +package org.apache.ozhera.app.api.model.project.group; import lombok.Data; diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/project/group/HeraProjectGroupUserModel.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/project/group/HeraProjectGroupUserModel.java similarity index 94% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/project/group/HeraProjectGroupUserModel.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/project/group/HeraProjectGroupUserModel.java index 84b3e54d0..93ab4852c 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/project/group/HeraProjectGroupUserModel.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/project/group/HeraProjectGroupUserModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.model.project.group; +package org.apache.ozhera.app.api.model.project.group; import lombok.Data; diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/project/group/ProjectGroupTreeNode.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/project/group/ProjectGroupTreeNode.java similarity index 97% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/project/group/ProjectGroupTreeNode.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/project/group/ProjectGroupTreeNode.java index 76d7f06a5..e2e99863a 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/model/project/group/ProjectGroupTreeNode.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/model/project/group/ProjectGroupTreeNode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.model.project.group; +package org.apache.ozhera.app.api.model.project.group; import lombok.Data; diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/response/AppBaseInfo.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/response/AppBaseInfo.java similarity index 96% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/response/AppBaseInfo.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/response/AppBaseInfo.java index f0ea07503..4a9b5a473 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/response/AppBaseInfo.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/response/AppBaseInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.response; +package org.apache.ozhera.app.api.response; import lombok.Data; diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/response/PairResponse.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/response/PairResponse.java similarity index 95% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/response/PairResponse.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/response/PairResponse.java index 8f150ab40..336468139 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/response/PairResponse.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/response/PairResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.response; +package org.apache.ozhera.app.api.response; import lombok.Data; diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/service/HeraAppEnvOutwardService.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/service/HeraAppEnvOutwardService.java similarity index 87% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/service/HeraAppEnvOutwardService.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/service/HeraAppEnvOutwardService.java index f08484719..64dfdd55e 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/service/HeraAppEnvOutwardService.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/service/HeraAppEnvOutwardService.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.service; +package org.apache.ozhera.app.api.service; -import com.xiaomi.mone.app.api.model.HeraAppEnvData; -import com.xiaomi.mone.app.api.model.HeraSimpleEnv; +import org.apache.ozhera.app.api.model.HeraAppEnvData; +import org.apache.ozhera.app.api.model.HeraSimpleEnv; import java.util.List; diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/service/HeraAppService.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/service/HeraAppService.java similarity index 85% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/service/HeraAppService.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/service/HeraAppService.java index fa8c49465..02a8b54d2 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/service/HeraAppService.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/service/HeraAppService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.service; +package org.apache.ozhera.app.api.service; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoParticipant; -import com.xiaomi.mone.app.api.model.HeraAppBaseQuery; -import com.xiaomi.mone.app.api.model.HeraAppRoleModel; -import com.xiaomi.mone.app.api.response.AppBaseInfo; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoParticipant; +import org.apache.ozhera.app.api.model.HeraAppBaseQuery; +import org.apache.ozhera.app.api.model.HeraAppRoleModel; +import org.apache.ozhera.app.api.response.AppBaseInfo; import java.util.List; diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/service/HeraAuthorizationApi.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/service/HeraAuthorizationApi.java similarity index 90% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/service/HeraAuthorizationApi.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/service/HeraAuthorizationApi.java index d15db02b5..d4cb35425 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/service/HeraAuthorizationApi.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/service/HeraAuthorizationApi.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.service; +package org.apache.ozhera.app.api.service; -import com.xiaomi.mone.app.common.Result; +import org.apache.ozhera.app.common.Result; /** * @author gaoxihui diff --git a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/service/HeraProjectGroupServiceApi.java b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/service/HeraProjectGroupServiceApi.java similarity index 78% rename from ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/service/HeraProjectGroupServiceApi.java rename to ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/service/HeraProjectGroupServiceApi.java index 4d3a21c99..f97bba1cd 100644 --- a/ozhera-app/app-api/src/main/java/com/xiaomi/mone/app/api/service/HeraProjectGroupServiceApi.java +++ b/ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/service/HeraProjectGroupServiceApi.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.api.service; +package org.apache.ozhera.app.api.service; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; -import com.xiaomi.mone.app.api.model.project.group.HeraProjectGroupDataRequest; -import com.xiaomi.mone.app.api.model.project.group.HeraProjectGroupModel; -import com.xiaomi.mone.app.api.model.project.group.ProjectGroupTreeNode; -import com.xiaomi.mone.app.common.Result; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.project.group.HeraProjectGroupDataRequest; +import org.apache.ozhera.app.api.model.project.group.HeraProjectGroupModel; +import org.apache.ozhera.app.api.model.project.group.ProjectGroupTreeNode; +import org.apache.ozhera.app.common.Result; import java.util.List; diff --git a/ozhera-app/app-common/pom.xml b/ozhera-app/app-common/pom.xml index e084de09c..3ed682cbd 100644 --- a/ozhera-app/app-common/pom.xml +++ b/ozhera-app/app-common/pom.xml @@ -3,10 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - run.mone + org.apache.ozhera ozhera-app - 1.4-jdk21-4 + 2.0.0-SNAPSHOT + 4.0.0 app-common ${hera-app.release.version} diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/common/Constant.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/common/Constant.java similarity index 97% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/common/Constant.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/common/Constant.java index f5858def0..252a4339a 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/common/Constant.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/common/Constant.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.common; +package org.apache.ozhera.app.common; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/common/Result.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/common/Result.java similarity index 95% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/common/Result.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/common/Result.java index 4bb577234..eb0805b36 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/common/Result.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/common/Result.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.common; +package org.apache.ozhera.app.common; -import com.xiaomi.mone.app.enums.CommonError; -import com.xiaomi.mone.app.exception.AppException; +import org.apache.ozhera.app.enums.CommonError; +import org.apache.ozhera.app.exception.AppException; import lombok.Data; import java.io.Serializable; diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/AppTypeEnum.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/AppTypeEnum.java similarity index 97% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/AppTypeEnum.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/AppTypeEnum.java index ccfbe29f8..bb4865a63 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/AppTypeEnum.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/AppTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.enums; +package org.apache.ozhera.app.enums; import lombok.Getter; diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/BizCodeEnum.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/BizCodeEnum.java similarity index 96% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/BizCodeEnum.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/BizCodeEnum.java index 9e96b0942..6c9417bf2 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/BizCodeEnum.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/BizCodeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.enums; +package org.apache.ozhera.app.enums; /** * @author wtt diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/CommonError.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/CommonError.java similarity index 97% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/CommonError.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/CommonError.java index 1f207760f..e19b901a2 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/CommonError.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/CommonError.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.enums; +package org.apache.ozhera.app.enums; /** * @author wtt diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/OperateEnum.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/OperateEnum.java similarity index 97% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/OperateEnum.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/OperateEnum.java index ec5db644d..c47f65847 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/OperateEnum.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/OperateEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.enums; +package org.apache.ozhera.app.enums; import lombok.Getter; diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/PlatForm.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/PlatForm.java similarity index 95% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/PlatForm.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/PlatForm.java index fa4e82919..29ddacaf8 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/PlatForm.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/PlatForm.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.enums; +package org.apache.ozhera.app.enums; /** * @author wtt diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/PlatFormTypeEnum.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/PlatFormTypeEnum.java similarity index 99% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/PlatFormTypeEnum.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/PlatFormTypeEnum.java index d80e6fa30..b43d6d394 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/PlatFormTypeEnum.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/PlatFormTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.enums; +package org.apache.ozhera.app.enums; /** * @author wtt diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/ProjectTypeEnum.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/ProjectTypeEnum.java similarity index 97% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/ProjectTypeEnum.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/ProjectTypeEnum.java index 9be9eec79..c5b07790c 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/ProjectTypeEnum.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/ProjectTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.enums; +package org.apache.ozhera.app.enums; import lombok.Getter; diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/StatusEnum.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/StatusEnum.java similarity index 96% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/StatusEnum.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/StatusEnum.java index 72621d449..bb3567a3d 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/enums/StatusEnum.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/enums/StatusEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.enums; +package org.apache.ozhera.app.enums; import lombok.Getter; diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/exception/AppException.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/exception/AppException.java similarity index 94% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/exception/AppException.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/exception/AppException.java index acd458c80..63cc15ff7 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/exception/AppException.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/exception/AppException.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.exception; +package org.apache.ozhera.app.exception; -import com.xiaomi.mone.app.enums.CommonError; +import org.apache.ozhera.app.enums.CommonError; /** * @author wtt diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/BaseCommon.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/BaseCommon.java similarity index 95% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/BaseCommon.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/BaseCommon.java index a5961a2b6..2673b9aae 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/BaseCommon.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/BaseCommon.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model; +package org.apache.ozhera.app.model; import lombok.Data; diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/vo/HeraAppEnvVo.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/vo/HeraAppEnvVo.java similarity index 93% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/vo/HeraAppEnvVo.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/vo/HeraAppEnvVo.java index ee7187ee6..4f3625dfb 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/vo/HeraAppEnvVo.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/vo/HeraAppEnvVo.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model.vo; +package org.apache.ozhera.app.model.vo; -import com.xiaomi.mone.app.model.BaseCommon; +import org.apache.ozhera.app.model.BaseCommon; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/vo/HeraAppOperateVo.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/vo/HeraAppOperateVo.java similarity index 91% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/vo/HeraAppOperateVo.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/vo/HeraAppOperateVo.java index 32ef2b8f5..dd81ec4ec 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/vo/HeraAppOperateVo.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/vo/HeraAppOperateVo.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model.vo; +package org.apache.ozhera.app.model.vo; -import com.xiaomi.mone.app.valid.AddGroup; -import com.xiaomi.mone.app.valid.UpdateGroup; +import org.apache.ozhera.app.valid.AddGroup; +import org.apache.ozhera.app.valid.UpdateGroup; import lombok.Data; import javax.validation.constraints.NotEmpty; diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/vo/HeraEnvIpVo.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/vo/HeraEnvIpVo.java similarity index 92% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/vo/HeraEnvIpVo.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/vo/HeraEnvIpVo.java index c73a05692..ea009b978 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/vo/HeraEnvIpVo.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/vo/HeraEnvIpVo.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model.vo; +package org.apache.ozhera.app.model.vo; -import com.xiaomi.mone.app.model.BaseCommon; +import org.apache.ozhera.app.model.BaseCommon; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/vo/PodInfo.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/vo/PodInfo.java similarity index 95% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/vo/PodInfo.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/vo/PodInfo.java index 804c028a0..d60e1a151 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/vo/PodInfo.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/vo/PodInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model.vo; +package org.apache.ozhera.app.model.vo; import lombok.Builder; import lombok.Data; diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/vo/TpcLabelRes.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/vo/TpcLabelRes.java similarity index 97% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/vo/TpcLabelRes.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/vo/TpcLabelRes.java index 9f874836e..5a82af054 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/vo/TpcLabelRes.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/vo/TpcLabelRes.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model.vo; +package org.apache.ozhera.app.model.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/vo/TpcPageRes.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/vo/TpcPageRes.java similarity index 96% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/vo/TpcPageRes.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/vo/TpcPageRes.java index 751e7675d..2978ebd15 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/model/vo/TpcPageRes.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/model/vo/TpcPageRes.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model.vo; +package org.apache.ozhera.app.model.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/valid/AddGroup.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/valid/AddGroup.java similarity index 95% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/valid/AddGroup.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/valid/AddGroup.java index 2bec4f871..c5607ad0c 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/valid/AddGroup.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/valid/AddGroup.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.valid; +package org.apache.ozhera.app.valid; /** * @author wtt diff --git a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/valid/UpdateGroup.java b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/valid/UpdateGroup.java similarity index 95% rename from ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/valid/UpdateGroup.java rename to ozhera-app/app-common/src/main/java/org/apache/ozhera/app/valid/UpdateGroup.java index 39a7fcd46..ca7887b36 100644 --- a/ozhera-app/app-common/src/main/java/com/xiaomi/mone/app/valid/UpdateGroup.java +++ b/ozhera-app/app-common/src/main/java/org/apache/ozhera/app/valid/UpdateGroup.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.valid; +package org.apache.ozhera.app.valid; /** * @author wtt diff --git a/ozhera-app/app-server/pom.xml b/ozhera-app/app-server/pom.xml index 6d93fc20f..d09344c55 100644 --- a/ozhera-app/app-server/pom.xml +++ b/ozhera-app/app-server/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - run.mone + org.apache.ozhera ozhera-app - 1.4-jdk21-4 + 2.0.0-SNAPSHOT 4.0.0 @@ -30,7 +30,7 @@ - run.mone + org.apache.ozhera app-service @@ -105,7 +105,7 @@ spring-boot-maven-plugin 2.7.15 - com.xiaomi.mone.app.AppBootstrap + org.apache.ozhera.app.AppBootstrap diff --git a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/AppBootstrap.java b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/AppBootstrap.java similarity index 98% rename from ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/AppBootstrap.java rename to ozhera-app/app-server/src/main/java/org/apache/ozhera/app/AppBootstrap.java index b35f6d055..9283775cd 100644 --- a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/AppBootstrap.java +++ b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/AppBootstrap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app; +package org.apache.ozhera.app; import com.google.common.base.Stopwatch; import lombok.extern.slf4j.Slf4j; diff --git a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/aop/OperateAppBaseInfoAspect.java b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/aop/OperateAppBaseInfoAspect.java similarity index 93% rename from ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/aop/OperateAppBaseInfoAspect.java rename to ozhera-app/app-server/src/main/java/org/apache/ozhera/app/aop/OperateAppBaseInfoAspect.java index 8d91c21ea..14a8d6d62 100644 --- a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/aop/OperateAppBaseInfoAspect.java +++ b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/aop/OperateAppBaseInfoAspect.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.aop; +package org.apache.ozhera.app.aop; -import com.xiaomi.mone.app.api.model.HeraAppMqInfo; -import com.xiaomi.mone.app.common.Result; -import com.xiaomi.mone.app.enums.OperateEnum; -import com.xiaomi.mone.app.model.HeraAppBaseInfo; +import org.apache.ozhera.app.api.model.HeraAppMqInfo; +import org.apache.ozhera.app.common.Result; +import org.apache.ozhera.app.enums.OperateEnum; +import org.apache.ozhera.app.model.HeraAppBaseInfo; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.producer.DefaultMQProducer; import org.apache.rocketmq.common.message.Message; @@ -34,7 +34,7 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; -import static com.xiaomi.mone.app.common.Constant.GSON; +import static org.apache.ozhera.app.common.Constant.GSON; /** * @author wtt diff --git a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/config/BeanConfig.java b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/config/BeanConfig.java similarity index 97% rename from ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/config/BeanConfig.java rename to ozhera-app/app-server/src/main/java/org/apache/ozhera/app/config/BeanConfig.java index 88da288ae..de4561643 100644 --- a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/config/BeanConfig.java +++ b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/config/BeanConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.config; +package org.apache.ozhera.app.config; import com.google.gson.Gson; import lombok.extern.slf4j.Slf4j; diff --git a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/config/DataSourceConfig.java b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/config/DataSourceConfig.java similarity index 99% rename from ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/config/DataSourceConfig.java rename to ozhera-app/app-server/src/main/java/org/apache/ozhera/app/config/DataSourceConfig.java index a592ad48b..381d02ffa 100644 --- a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/config/DataSourceConfig.java +++ b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/config/DataSourceConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.config; +package org.apache.ozhera.app.config; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.mchange.v2.c3p0.ComboPooledDataSource; diff --git a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/config/DubboConfiguration.java b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/config/DubboConfiguration.java similarity index 98% rename from ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/config/DubboConfiguration.java rename to ozhera-app/app-server/src/main/java/org/apache/ozhera/app/config/DubboConfiguration.java index 8450cdb2d..2a8001a16 100644 --- a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/config/DubboConfiguration.java +++ b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/config/DubboConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.config; +package org.apache.ozhera.app.config; import com.alibaba.nacos.api.config.annotation.NacosValue; import org.apache.dubbo.config.ApplicationConfig; diff --git a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/config/MqConfig.java b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/config/MqConfig.java similarity index 98% rename from ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/config/MqConfig.java rename to ozhera-app/app-server/src/main/java/org/apache/ozhera/app/config/MqConfig.java index 69200304b..82718db42 100644 --- a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/config/MqConfig.java +++ b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/config/MqConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.config; +package org.apache.ozhera.app.config; import com.alibaba.nacos.api.config.annotation.NacosValue; import org.apache.dubbo.common.utils.StringUtils; diff --git a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/config/RocketMqConfig.java b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/config/RocketMqConfig.java similarity index 95% rename from ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/config/RocketMqConfig.java rename to ozhera-app/app-server/src/main/java/org/apache/ozhera/app/config/RocketMqConfig.java index 8291b816a..4173de66b 100644 --- a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/config/RocketMqConfig.java +++ b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/config/RocketMqConfig.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.config; +package org.apache.ozhera.app.config; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.mone.app.exception.AppException; +import org.apache.ozhera.app.exception.AppException; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.client.producer.DefaultMQProducer; diff --git a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/controller/AppController.java b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/controller/AppController.java similarity index 89% rename from ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/controller/AppController.java rename to ozhera-app/app-server/src/main/java/org/apache/ozhera/app/controller/AppController.java index edbe75130..177faad2b 100644 --- a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/controller/AppController.java +++ b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/controller/AppController.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.controller; +package org.apache.ozhera.app.controller; import com.google.common.collect.Lists; -import com.xiaomi.mone.app.api.response.AppBaseInfo; -import com.xiaomi.mone.app.api.service.HeraAppService; -import com.xiaomi.mone.app.common.Result; -import com.xiaomi.mone.app.enums.CommonError; -import com.xiaomi.mone.app.model.HeraAppBaseInfo; -import com.xiaomi.mone.app.response.anno.OriginalResponse; -import com.xiaomi.mone.app.service.HeraAppRoleService; -import com.xiaomi.mone.app.service.impl.HeraAppBaseInfoService; +import org.apache.ozhera.app.api.response.AppBaseInfo; +import org.apache.ozhera.app.api.service.HeraAppService; +import org.apache.ozhera.app.common.Result; +import org.apache.ozhera.app.enums.CommonError; +import org.apache.ozhera.app.model.HeraAppBaseInfo; +import org.apache.ozhera.app.response.anno.OriginalResponse; +import org.apache.ozhera.app.service.HeraAppRoleService; +import org.apache.ozhera.app.service.impl.HeraAppBaseInfoService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/controller/HeraAppEnvController.java b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/controller/HeraAppEnvController.java similarity index 87% rename from ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/controller/HeraAppEnvController.java rename to ozhera-app/app-server/src/main/java/org/apache/ozhera/app/controller/HeraAppEnvController.java index 8a31c8f14..329d18154 100644 --- a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/controller/HeraAppEnvController.java +++ b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/controller/HeraAppEnvController.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.controller; +package org.apache.ozhera.app.controller; -import com.xiaomi.mone.app.model.vo.HeraAppEnvVo; -import com.xiaomi.mone.app.model.vo.HeraAppOperateVo; -import com.xiaomi.mone.app.service.HeraAppEnvService; -import com.xiaomi.mone.app.valid.AddGroup; -import com.xiaomi.mone.app.valid.UpdateGroup; +import org.apache.ozhera.app.model.vo.HeraAppEnvVo; +import org.apache.ozhera.app.model.vo.HeraAppOperateVo; +import org.apache.ozhera.app.service.HeraAppEnvService; +import org.apache.ozhera.app.valid.AddGroup; +import org.apache.ozhera.app.valid.UpdateGroup; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.validation.annotation.Validated; diff --git a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/controller/TestController.java b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/controller/TestController.java similarity index 86% rename from ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/controller/TestController.java rename to ozhera-app/app-server/src/main/java/org/apache/ozhera/app/controller/TestController.java index 402328471..7212e8880 100644 --- a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/controller/TestController.java +++ b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/controller/TestController.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.controller; +package org.apache.ozhera.app.controller; -import com.xiaomi.mone.app.model.vo.HeraAppEnvVo; -import com.xiaomi.mone.app.service.env.DefaultEnvIpFetch; -import com.xiaomi.mone.app.service.env.DefaultHttpEnvIpFetch; -import com.xiaomi.mone.app.service.env.EnvIpFetch; +import org.apache.ozhera.app.model.vo.HeraAppEnvVo; +import org.apache.ozhera.app.service.env.DefaultEnvIpFetch; +import org.apache.ozhera.app.service.env.DefaultHttpEnvIpFetch; +import org.apache.ozhera.app.service.env.EnvIpFetch; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/exception/AppExceptionControllerAdvice.java b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/exception/AppExceptionControllerAdvice.java similarity index 95% rename from ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/exception/AppExceptionControllerAdvice.java rename to ozhera-app/app-server/src/main/java/org/apache/ozhera/app/exception/AppExceptionControllerAdvice.java index 9ebf75407..c310ec116 100644 --- a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/exception/AppExceptionControllerAdvice.java +++ b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/exception/AppExceptionControllerAdvice.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.exception; +package org.apache.ozhera.app.exception; -import com.xiaomi.mone.app.common.Result; -import com.xiaomi.mone.app.enums.BizCodeEnum; +import org.apache.ozhera.app.common.Result; +import org.apache.ozhera.app.enums.BizCodeEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.MissingServletRequestParameterException; diff --git a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/job/HeraAppEnvIpJob.java b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/job/HeraAppEnvIpJob.java similarity index 94% rename from ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/job/HeraAppEnvIpJob.java rename to ozhera-app/app-server/src/main/java/org/apache/ozhera/app/job/HeraAppEnvIpJob.java index c912f6401..8990ad9d7 100644 --- a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/job/HeraAppEnvIpJob.java +++ b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/job/HeraAppEnvIpJob.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.job; +package org.apache.ozhera.app.job; -import com.xiaomi.mone.app.service.HeraAppEnvService; +import org.apache.ozhera.app.service.HeraAppEnvService; import lombok.extern.slf4j.Slf4j; import org.apache.logging.log4j.util.Strings; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/response/AppResponseAdvice.java b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/response/AppResponseAdvice.java similarity index 94% rename from ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/response/AppResponseAdvice.java rename to ozhera-app/app-server/src/main/java/org/apache/ozhera/app/response/AppResponseAdvice.java index f74efbfd5..32cb51e22 100644 --- a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/response/AppResponseAdvice.java +++ b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/response/AppResponseAdvice.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.response; +package org.apache.ozhera.app.response; import com.google.gson.Gson; -import com.xiaomi.mone.app.common.Result; -import com.xiaomi.mone.app.response.anno.OriginalResponse; +import org.apache.ozhera.app.common.Result; +import org.apache.ozhera.app.response.anno.OriginalResponse; import org.springframework.boot.web.servlet.error.ErrorController; import org.springframework.core.MethodParameter; import org.springframework.http.MediaType; diff --git a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/response/anno/OriginalResponse.java b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/response/anno/OriginalResponse.java similarity index 95% rename from ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/response/anno/OriginalResponse.java rename to ozhera-app/app-server/src/main/java/org/apache/ozhera/app/response/anno/OriginalResponse.java index 8d8c79b83..c1ad215b4 100644 --- a/ozhera-app/app-server/src/main/java/com/xiaomi/mone/app/response/anno/OriginalResponse.java +++ b/ozhera-app/app-server/src/main/java/org/apache/ozhera/app/response/anno/OriginalResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.response.anno; +package org.apache.ozhera.app.response.anno; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ozhera-app/app-server/src/test/java/com/xiaomi/mone/test/AppBaseTest.java b/ozhera-app/app-server/src/test/java/org/apache/ozhera/app/test/AppBaseTest.java similarity index 100% rename from ozhera-app/app-server/src/test/java/com/xiaomi/mone/test/AppBaseTest.java rename to ozhera-app/app-server/src/test/java/org/apache/ozhera/app/test/AppBaseTest.java diff --git a/ozhera-app/app-server/src/test/java/com/xiaomi/mone/test/EnvIpFetchServiceTest.java b/ozhera-app/app-server/src/test/java/org/apache/ozhera/app/test/EnvIpFetchServiceTest.java similarity index 100% rename from ozhera-app/app-server/src/test/java/com/xiaomi/mone/test/EnvIpFetchServiceTest.java rename to ozhera-app/app-server/src/test/java/org/apache/ozhera/app/test/EnvIpFetchServiceTest.java diff --git a/ozhera-app/app-server/src/test/java/com/xiaomi/mone/test/HeraAppEnvControllerTest.java b/ozhera-app/app-server/src/test/java/org/apache/ozhera/app/test/HeraAppEnvControllerTest.java similarity index 100% rename from ozhera-app/app-server/src/test/java/com/xiaomi/mone/test/HeraAppEnvControllerTest.java rename to ozhera-app/app-server/src/test/java/org/apache/ozhera/app/test/HeraAppEnvControllerTest.java diff --git a/ozhera-app/app-server/src/test/java/com/xiaomi/mone/test/HeraAppEnvOutwardServiceTest.java b/ozhera-app/app-server/src/test/java/org/apache/ozhera/app/test/HeraAppEnvOutwardServiceTest.java similarity index 97% rename from ozhera-app/app-server/src/test/java/com/xiaomi/mone/test/HeraAppEnvOutwardServiceTest.java rename to ozhera-app/app-server/src/test/java/org/apache/ozhera/app/test/HeraAppEnvOutwardServiceTest.java index fa0bd391e..93440d5eb 100644 --- a/ozhera-app/app-server/src/test/java/com/xiaomi/mone/test/HeraAppEnvOutwardServiceTest.java +++ b/ozhera-app/app-server/src/test/java/org/apache/ozhera/app/test/HeraAppEnvOutwardServiceTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.test; +package org.apache.ozhera.app.test; import lombok.extern.slf4j.Slf4j; diff --git a/ozhera-app/app-server/src/test/java/com/xiaomi/mone/test/HeraProjectGroupTest.java b/ozhera-app/app-server/src/test/java/org/apache/ozhera/app/test/HeraProjectGroupTest.java similarity index 100% rename from ozhera-app/app-server/src/test/java/com/xiaomi/mone/test/HeraProjectGroupTest.java rename to ozhera-app/app-server/src/test/java/org/apache/ozhera/app/test/HeraProjectGroupTest.java diff --git a/ozhera-app/app-server/src/test/java/com/xiaomi/mone/test/RocketMqTest.java b/ozhera-app/app-server/src/test/java/org/apache/ozhera/app/test/RocketMqTest.java similarity index 100% rename from ozhera-app/app-server/src/test/java/com/xiaomi/mone/test/RocketMqTest.java rename to ozhera-app/app-server/src/test/java/org/apache/ozhera/app/test/RocketMqTest.java diff --git a/ozhera-app/app-server/src/test/java/com/xiaomi/mone/test/SpringBootFeatTest.java b/ozhera-app/app-server/src/test/java/org/apache/ozhera/app/test/SpringBootFeatTest.java similarity index 98% rename from ozhera-app/app-server/src/test/java/com/xiaomi/mone/test/SpringBootFeatTest.java rename to ozhera-app/app-server/src/test/java/org/apache/ozhera/app/test/SpringBootFeatTest.java index 2dd21a038..85d22564a 100644 --- a/ozhera-app/app-server/src/test/java/com/xiaomi/mone/test/SpringBootFeatTest.java +++ b/ozhera-app/app-server/src/test/java/org/apache/ozhera/app/test/SpringBootFeatTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.test; +package org.apache.ozhera.app.test; import org.junit.jupiter.api.Test; diff --git a/ozhera-app/app-server/src/test/java/com/xiaomi/mone/test/UserBean.java b/ozhera-app/app-server/src/test/java/org/apache/ozhera/app/test/UserBean.java similarity index 96% rename from ozhera-app/app-server/src/test/java/com/xiaomi/mone/test/UserBean.java rename to ozhera-app/app-server/src/test/java/org/apache/ozhera/app/test/UserBean.java index ae81fc2f6..2cfb3c4b7 100644 --- a/ozhera-app/app-server/src/test/java/com/xiaomi/mone/test/UserBean.java +++ b/ozhera-app/app-server/src/test/java/org/apache/ozhera/app/test/UserBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.test; +package org.apache.ozhera.app.test; import lombok.Data; diff --git a/ozhera-app/app-service/pom.xml b/ozhera-app/app-service/pom.xml index 3c0bf66cf..8bee6ad16 100644 --- a/ozhera-app/app-service/pom.xml +++ b/ozhera-app/app-service/pom.xml @@ -3,10 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + org.apache.ozhera ozhera-app - run.mone - 1.4-jdk21-4 + 2.0.0-SNAPSHOT + 4.0.0 app-service ${hera-app.release.version} @@ -18,7 +19,7 @@ - run.mone + org.apache.ozhera app-api ${hera-app.release.version} diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/auth/AuthorizationService.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/auth/AuthorizationService.java similarity index 96% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/auth/AuthorizationService.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/auth/AuthorizationService.java index 664fe878e..064de2fc5 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/auth/AuthorizationService.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/auth/AuthorizationService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.auth; +package org.apache.ozhera.app.auth; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.alibaba.nacos.client.config.utils.MD5; -import com.xiaomi.mone.app.common.Result; -import com.xiaomi.mone.app.enums.CommonError; -import com.xiaomi.mone.app.redis.RedisService; +import org.apache.ozhera.app.common.Result; +import org.apache.ozhera.app.enums.CommonError; +import org.apache.ozhera.app.redis.RedisService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/config/NacosConfiguration.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/config/NacosConfiguration.java similarity index 98% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/config/NacosConfiguration.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/config/NacosConfiguration.java index 58d253403..3190a30c0 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/config/NacosConfiguration.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/config/NacosConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.config; +package org.apache.ozhera.app.config; import com.alibaba.nacos.api.annotation.NacosProperties; import com.alibaba.nacos.spring.context.annotation.config.EnableNacosConfig; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/HeraAppRoleDao.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/HeraAppRoleDao.java similarity index 97% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/HeraAppRoleDao.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/HeraAppRoleDao.java index e7aedbd82..d988b4fdc 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/HeraAppRoleDao.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/HeraAppRoleDao.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.dao; +package org.apache.ozhera.app.dao; -import com.xiaomi.mone.app.dao.mapper.HeraAppRoleMapper; -import com.xiaomi.mone.app.model.HeraAppRole; -import com.xiaomi.mone.app.model.HeraAppRoleExample; +import org.apache.ozhera.app.dao.mapper.HeraAppRoleMapper; +import org.apache.ozhera.app.model.HeraAppRole; +import org.apache.ozhera.app.model.HeraAppRoleExample; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/HeraBaseInfoDao.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/HeraBaseInfoDao.java similarity index 96% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/HeraBaseInfoDao.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/HeraBaseInfoDao.java index a7abef85d..deb3dab10 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/HeraBaseInfoDao.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/HeraBaseInfoDao.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.dao; - -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoParticipant; -import com.xiaomi.mone.app.api.model.HeraAppBaseQuery; -import com.xiaomi.mone.app.dao.mapper.HeraAppBaseInfoMapper; -import com.xiaomi.mone.app.model.HeraAppBaseInfo; -import com.xiaomi.mone.app.model.HeraAppBaseInfoExample; +package org.apache.ozhera.app.dao; + +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoParticipant; +import org.apache.ozhera.app.api.model.HeraAppBaseQuery; +import org.apache.ozhera.app.dao.mapper.HeraAppBaseInfoMapper; +import org.apache.ozhera.app.model.HeraAppBaseInfo; +import org.apache.ozhera.app.model.HeraAppBaseInfoExample; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/HeraProjectGroupAppDao.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/HeraProjectGroupAppDao.java similarity index 93% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/HeraProjectGroupAppDao.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/HeraProjectGroupAppDao.java index a07ba1420..c54b67e34 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/HeraProjectGroupAppDao.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/HeraProjectGroupAppDao.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.dao; +package org.apache.ozhera.app.dao; import com.google.gson.Gson; -import com.xiaomi.mone.app.dao.mapper.HeraProjectGroupAppMapper; -import com.xiaomi.mone.app.model.HeraProjectGroupApp; -import com.xiaomi.mone.app.model.HeraProjectGroupAppExample; +import org.apache.ozhera.app.dao.mapper.HeraProjectGroupAppMapper; +import org.apache.ozhera.app.model.HeraProjectGroupApp; +import org.apache.ozhera.app.model.HeraProjectGroupAppExample; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; import org.springframework.util.CollectionUtils; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/HeraProjectGroupDao.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/HeraProjectGroupDao.java similarity index 95% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/HeraProjectGroupDao.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/HeraProjectGroupDao.java index a2178d19a..6b3884d87 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/HeraProjectGroupDao.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/HeraProjectGroupDao.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.dao; +package org.apache.ozhera.app.dao; -import com.xiaomi.mone.app.api.model.project.group.HeraProjectGroupModel; -import com.xiaomi.mone.app.dao.mapper.HeraProjectGroupMapper; -import com.xiaomi.mone.app.model.HeraProjectGroup; -import com.xiaomi.mone.app.model.HeraProjectGroupExample; +import org.apache.ozhera.app.api.model.project.group.HeraProjectGroupModel; +import org.apache.ozhera.app.dao.mapper.HeraProjectGroupMapper; +import org.apache.ozhera.app.model.HeraProjectGroup; +import org.apache.ozhera.app.model.HeraProjectGroupExample; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/HeraProjectGroupUserDao.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/HeraProjectGroupUserDao.java similarity index 93% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/HeraProjectGroupUserDao.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/HeraProjectGroupUserDao.java index 4a99703a1..6efdebb06 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/HeraProjectGroupUserDao.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/HeraProjectGroupUserDao.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.dao; +package org.apache.ozhera.app.dao; -import com.xiaomi.mone.app.dao.mapper.HeraProjectGroupUserMapper; -import com.xiaomi.mone.app.model.HeraProjectGroupUser; -import com.xiaomi.mone.app.model.HeraProjectGroupUserExample; +import org.apache.ozhera.app.dao.mapper.HeraProjectGroupUserMapper; +import org.apache.ozhera.app.model.HeraProjectGroupUser; +import org.apache.ozhera.app.model.HeraProjectGroupUserExample; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; @@ -27,7 +27,7 @@ import java.util.List; import java.util.stream.Collectors; -import static com.xiaomi.mone.app.common.Constant.GSON; +import static org.apache.ozhera.app.common.Constant.GSON; @Slf4j @Repository diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraAppBaseInfoMapper.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraAppBaseInfoMapper.java similarity index 88% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraAppBaseInfoMapper.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraAppBaseInfoMapper.java index f0d849870..298b78d9a 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraAppBaseInfoMapper.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraAppBaseInfoMapper.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.dao.mapper; +package org.apache.ozhera.app.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoParticipant; -import com.xiaomi.mone.app.api.model.HeraAppBaseQuery; -import com.xiaomi.mone.app.api.response.AppBaseInfo; -import com.xiaomi.mone.app.model.HeraAppBaseInfo; -import com.xiaomi.mone.app.model.HeraAppBaseInfoExample; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoParticipant; +import org.apache.ozhera.app.api.model.HeraAppBaseQuery; +import org.apache.ozhera.app.api.response.AppBaseInfo; +import org.apache.ozhera.app.model.HeraAppBaseInfo; +import org.apache.ozhera.app.model.HeraAppBaseInfoExample; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraAppEnvMapper.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraAppEnvMapper.java similarity index 90% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraAppEnvMapper.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraAppEnvMapper.java index 73cc95f88..bb5c7726d 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraAppEnvMapper.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraAppEnvMapper.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.dao.mapper; +package org.apache.ozhera.app.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.xiaomi.mone.app.model.HeraAppEnv; +import org.apache.ozhera.app.model.HeraAppEnv; import org.apache.ibatis.annotations.Mapper; /** diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraAppExcessInfoMapper.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraAppExcessInfoMapper.java similarity index 90% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraAppExcessInfoMapper.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraAppExcessInfoMapper.java index a7307be96..91d821062 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraAppExcessInfoMapper.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraAppExcessInfoMapper.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.dao.mapper; +package org.apache.ozhera.app.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.xiaomi.mone.app.model.HeraAppExcessInfo; +import org.apache.ozhera.app.model.HeraAppExcessInfo; import org.apache.ibatis.annotations.Mapper; /** diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraAppRoleMapper.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraAppRoleMapper.java similarity index 92% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraAppRoleMapper.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraAppRoleMapper.java index d650b2ec5..70b044b3f 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraAppRoleMapper.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraAppRoleMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.dao.mapper; +package org.apache.ozhera.app.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.xiaomi.mone.app.model.HeraAppRole; -import com.xiaomi.mone.app.model.HeraAppRoleExample; +import org.apache.ozhera.app.model.HeraAppRole; +import org.apache.ozhera.app.model.HeraAppRoleExample; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraProjectGroupAppMapper.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraProjectGroupAppMapper.java similarity index 91% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraProjectGroupAppMapper.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraProjectGroupAppMapper.java index d52c5ebd5..63aa8463d 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraProjectGroupAppMapper.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraProjectGroupAppMapper.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.dao.mapper; +package org.apache.ozhera.app.dao.mapper; -import com.xiaomi.mone.app.model.HeraProjectGroupApp; -import com.xiaomi.mone.app.model.HeraProjectGroupAppExample; +import org.apache.ozhera.app.model.HeraProjectGroupApp; +import org.apache.ozhera.app.model.HeraProjectGroupAppExample; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraProjectGroupMapper.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraProjectGroupMapper.java similarity index 88% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraProjectGroupMapper.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraProjectGroupMapper.java index 02de688b3..ce2298acf 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraProjectGroupMapper.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraProjectGroupMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.dao.mapper; +package org.apache.ozhera.app.dao.mapper; -import com.xiaomi.mone.app.api.model.project.group.HeraProjectGroupModel; -import com.xiaomi.mone.app.model.HeraProjectGroup; -import com.xiaomi.mone.app.model.HeraProjectGroupExample; +import org.apache.ozhera.app.api.model.project.group.HeraProjectGroupModel; +import org.apache.ozhera.app.model.HeraProjectGroup; +import org.apache.ozhera.app.model.HeraProjectGroupExample; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraProjectGroupUserMapper.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraProjectGroupUserMapper.java similarity index 91% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraProjectGroupUserMapper.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraProjectGroupUserMapper.java index f10548134..fc00476ae 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/dao/mapper/HeraProjectGroupUserMapper.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraProjectGroupUserMapper.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.dao.mapper; +package org.apache.ozhera.app.dao.mapper; -import com.xiaomi.mone.app.model.HeraProjectGroupUser; -import com.xiaomi.mone.app.model.HeraProjectGroupUserExample; +import org.apache.ozhera.app.model.HeraProjectGroupUser; +import org.apache.ozhera.app.model.HeraProjectGroupUserExample; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraAppBaseInfo.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppBaseInfo.java similarity index 98% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraAppBaseInfo.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppBaseInfo.java index 74a95909c..fda0a8b5e 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraAppBaseInfo.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppBaseInfo.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model; +package org.apache.ozhera.app.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.xiaomi.mone.app.api.response.AppBaseInfo; +import org.apache.ozhera.app.api.response.AppBaseInfo; import lombok.Data; import java.util.ArrayList; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraAppBaseInfoExample.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppBaseInfoExample.java similarity index 99% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraAppBaseInfoExample.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppBaseInfoExample.java index f4fb6838e..d9ec9a079 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraAppBaseInfoExample.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppBaseInfoExample.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model; +package org.apache.ozhera.app.model; import java.util.ArrayList; import java.util.Date; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraAppEnv.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppEnv.java similarity index 90% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraAppEnv.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppEnv.java index 5cae5f083..29830f9af 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraAppEnv.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppEnv.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model; +package org.apache.ozhera.app.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; -import com.xiaomi.mone.app.api.model.HeraSimpleEnv; -import com.xiaomi.mone.app.enums.OperateEnum; -import com.xiaomi.mone.app.exception.AppException; -import com.xiaomi.mone.app.model.vo.HeraAppEnvVo; -import com.xiaomi.mone.app.model.vo.HeraAppOperateVo; +import org.apache.ozhera.app.api.model.HeraSimpleEnv; +import org.apache.ozhera.app.enums.OperateEnum; +import org.apache.ozhera.app.exception.AppException; +import org.apache.ozhera.app.model.vo.HeraAppEnvVo; +import org.apache.ozhera.app.model.vo.HeraAppOperateVo; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraAppExcessInfo.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppExcessInfo.java similarity index 97% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraAppExcessInfo.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppExcessInfo.java index bc657ec3d..2aef5c99c 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraAppExcessInfo.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppExcessInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model; +package org.apache.ozhera.app.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraAppRole.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppRole.java similarity index 99% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraAppRole.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppRole.java index aa93201a2..07e36f89e 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraAppRole.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppRole.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model; +package org.apache.ozhera.app.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraAppRoleExample.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppRoleExample.java similarity index 99% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraAppRoleExample.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppRoleExample.java index 85bde5d79..583d853a6 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraAppRoleExample.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppRoleExample.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model; +package org.apache.ozhera.app.model; import java.util.ArrayList; import java.util.Date; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraMetaDataPort.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraMetaDataPort.java similarity index 96% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraMetaDataPort.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraMetaDataPort.java index 4bc62c40f..b16ec4fa8 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraMetaDataPort.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraMetaDataPort.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model; +package org.apache.ozhera.app.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraProjectGroup.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraProjectGroup.java similarity index 99% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraProjectGroup.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraProjectGroup.java index 21a514afe..91beb0413 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraProjectGroup.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraProjectGroup.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model; +package org.apache.ozhera.app.model; import java.util.ArrayList; import java.util.Arrays; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraProjectGroupApp.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraProjectGroupApp.java similarity index 99% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraProjectGroupApp.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraProjectGroupApp.java index 7d52db88a..479271a1b 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraProjectGroupApp.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraProjectGroupApp.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model; +package org.apache.ozhera.app.model; import java.util.ArrayList; import java.util.Arrays; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraProjectGroupAppExample.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraProjectGroupAppExample.java similarity index 99% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraProjectGroupAppExample.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraProjectGroupAppExample.java index 54a00f15d..ad53ea245 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraProjectGroupAppExample.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraProjectGroupAppExample.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model; +package org.apache.ozhera.app.model; import java.util.ArrayList; import java.util.Date; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraProjectGroupExample.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraProjectGroupExample.java similarity index 99% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraProjectGroupExample.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraProjectGroupExample.java index 14eea6d82..f8b21c20c 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraProjectGroupExample.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraProjectGroupExample.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model; +package org.apache.ozhera.app.model; import java.util.ArrayList; import java.util.Date; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraProjectGroupUser.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraProjectGroupUser.java similarity index 99% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraProjectGroupUser.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraProjectGroupUser.java index 622d61470..50d21b310 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraProjectGroupUser.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraProjectGroupUser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model; +package org.apache.ozhera.app.model; import java.util.ArrayList; import java.util.Arrays; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraProjectGroupUserExample.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraProjectGroupUserExample.java similarity index 99% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraProjectGroupUserExample.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraProjectGroupUserExample.java index 462abf514..852850cac 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/model/HeraProjectGroupUserExample.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraProjectGroupUserExample.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.model; +package org.apache.ozhera.app.model; import java.util.ArrayList; import java.util.Date; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/redis/RedisService.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/redis/RedisService.java similarity index 99% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/redis/RedisService.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/redis/RedisService.java index 1d8d4f77a..a9a408fda 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/redis/RedisService.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/redis/RedisService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.redis; +package org.apache.ozhera.app.redis; import com.alibaba.nacos.api.config.annotation.NacosValue; import lombok.extern.slf4j.Slf4j; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/HeraAppEnvService.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/HeraAppEnvService.java similarity index 88% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/HeraAppEnvService.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/HeraAppEnvService.java index 6050095d2..fe1c7a3df 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/HeraAppEnvService.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/HeraAppEnvService.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.service; +package org.apache.ozhera.app.service; -import com.xiaomi.mone.app.model.vo.HeraAppEnvVo; -import com.xiaomi.mone.app.model.vo.HeraAppOperateVo; +import org.apache.ozhera.app.model.vo.HeraAppEnvVo; +import org.apache.ozhera.app.model.vo.HeraAppOperateVo; import java.util.List; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/HeraAppRoleService.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/HeraAppRoleService.java similarity index 93% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/HeraAppRoleService.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/HeraAppRoleService.java index 416ebaf75..30365a133 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/HeraAppRoleService.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/HeraAppRoleService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.service; +package org.apache.ozhera.app.service; -import com.xiaomi.mone.app.api.model.HeraAppRoleModel; -import com.xiaomi.mone.app.dao.HeraAppRoleDao; -import com.xiaomi.mone.app.model.HeraAppRole; +import org.apache.ozhera.app.api.model.HeraAppRoleModel; +import org.apache.ozhera.app.dao.HeraAppRoleDao; +import org.apache.ozhera.app.model.HeraAppRole; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/env/DefaultEnvIpFetch.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/env/DefaultEnvIpFetch.java similarity index 92% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/env/DefaultEnvIpFetch.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/env/DefaultEnvIpFetch.java index 58bc76b9f..cafd5c19e 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/env/DefaultEnvIpFetch.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/env/DefaultEnvIpFetch.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.service.env; +package org.apache.ozhera.app.service.env; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; -import com.xiaomi.mone.app.common.Result; -import com.xiaomi.mone.app.model.vo.TpcLabelRes; -import com.xiaomi.mone.app.model.vo.TpcPageRes; +import org.apache.ozhera.app.common.Result; +import org.apache.ozhera.app.model.vo.TpcLabelRes; +import org.apache.ozhera.app.model.vo.TpcPageRes; import lombok.extern.slf4j.Slf4j; import okhttp3.*; import org.apache.commons.collections.CollectionUtils; @@ -33,8 +33,8 @@ import javax.annotation.Resource; import java.util.Objects; -import static com.xiaomi.mone.app.common.Constant.DEFAULT_REGISTER_REMOTE_TYPE; -import static com.xiaomi.mone.app.common.Constant.URL.HERA_TPC_APP_DETAIL_URL; +import static org.apache.ozhera.app.common.Constant.DEFAULT_REGISTER_REMOTE_TYPE; +import static org.apache.ozhera.app.common.Constant.URL.HERA_TPC_APP_DETAIL_URL; /** * @author wtt diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/env/DefaultHttpEnvIpFetch.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/env/DefaultHttpEnvIpFetch.java similarity index 92% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/env/DefaultHttpEnvIpFetch.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/env/DefaultHttpEnvIpFetch.java index d7da8a02a..f42511f52 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/env/DefaultHttpEnvIpFetch.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/env/DefaultHttpEnvIpFetch.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.service.env; +package org.apache.ozhera.app.service.env; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; -import com.xiaomi.mone.app.common.Result; -import com.xiaomi.mone.app.model.vo.HeraAppEnvVo; -import com.xiaomi.mone.app.model.vo.PodInfo; +import org.apache.ozhera.app.common.Result; +import org.apache.ozhera.app.model.vo.HeraAppEnvVo; +import org.apache.ozhera.app.model.vo.PodInfo; import lombok.extern.slf4j.Slf4j; import okhttp3.*; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -32,7 +32,7 @@ import java.util.Map; import java.util.stream.Collectors; -import static com.xiaomi.mone.app.common.Constant.URL.HERA_OPERATOR_ENV_URL; +import static org.apache.ozhera.app.common.Constant.URL.HERA_OPERATOR_ENV_URL; /** * @author wtt diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/env/DefaultNacosEnvIpFetch.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/env/DefaultNacosEnvIpFetch.java similarity index 98% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/env/DefaultNacosEnvIpFetch.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/env/DefaultNacosEnvIpFetch.java index 5062bcd0c..35e1ce260 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/env/DefaultNacosEnvIpFetch.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/env/DefaultNacosEnvIpFetch.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.service.env; +package org.apache.ozhera.app.service.env; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.alibaba.nacos.api.exception.NacosException; import com.alibaba.nacos.api.naming.pojo.Instance; import com.google.common.collect.Lists; import com.xiaomi.data.push.nacos.NacosNaming; -import com.xiaomi.mone.app.model.vo.HeraAppEnvVo; +import org.apache.ozhera.app.model.vo.HeraAppEnvVo; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/env/EnvIpFetch.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/env/EnvIpFetch.java similarity index 93% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/env/EnvIpFetch.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/env/EnvIpFetch.java index d346945d5..ec3aec48c 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/env/EnvIpFetch.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/env/EnvIpFetch.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.service.env; +package org.apache.ozhera.app.service.env; -import com.xiaomi.mone.app.model.vo.HeraAppEnvVo; +import org.apache.ozhera.app.model.vo.HeraAppEnvVo; import java.util.List; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/extension/AppTypeServiceExtension.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/extension/AppTypeServiceExtension.java similarity index 95% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/extension/AppTypeServiceExtension.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/extension/AppTypeServiceExtension.java index b824df391..4d247c1f8 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/extension/AppTypeServiceExtension.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/extension/AppTypeServiceExtension.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.service.extension; +package org.apache.ozhera.app.service.extension; /** * @author wtt diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/extension/impl/DefaultAppTypeServiceExtension.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/extension/impl/DefaultAppTypeServiceExtension.java similarity index 85% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/extension/impl/DefaultAppTypeServiceExtension.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/extension/impl/DefaultAppTypeServiceExtension.java index 4d0c24b46..edf5a1da2 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/extension/impl/DefaultAppTypeServiceExtension.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/extension/impl/DefaultAppTypeServiceExtension.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.service.extension.impl; +package org.apache.ozhera.app.service.extension.impl; -import com.xiaomi.mone.app.enums.PlatFormTypeEnum; -import com.xiaomi.mone.app.enums.ProjectTypeEnum; -import com.xiaomi.mone.app.service.extension.AppTypeServiceExtension; -import com.xiaomi.mone.app.util.AppTypeTransferUtil; +import org.apache.ozhera.app.enums.PlatFormTypeEnum; +import org.apache.ozhera.app.enums.ProjectTypeEnum; +import org.apache.ozhera.app.service.extension.AppTypeServiceExtension; +import org.apache.ozhera.app.util.AppTypeTransferUtil; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Service; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/AuthorizationServiceImpl.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/AuthorizationServiceImpl.java similarity index 86% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/AuthorizationServiceImpl.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/AuthorizationServiceImpl.java index d7ee2cd70..23397381f 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/AuthorizationServiceImpl.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/AuthorizationServiceImpl.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.service.impl; +package org.apache.ozhera.app.service.impl; -import com.xiaomi.mone.app.api.service.HeraAuthorizationApi; -import com.xiaomi.mone.app.auth.AuthorizationService; -import com.xiaomi.mone.app.common.Result; +import org.apache.ozhera.app.api.service.HeraAuthorizationApi; +import org.apache.ozhera.app.auth.AuthorizationService; +import org.apache.ozhera.app.common.Result; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.Service; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/HeraAppBaseInfoService.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraAppBaseInfoService.java similarity index 92% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/HeraAppBaseInfoService.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraAppBaseInfoService.java index 6e7b416fe..dc6dcd426 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/HeraAppBaseInfoService.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraAppBaseInfoService.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.service.impl; +package org.apache.ozhera.app.service.impl; import com.google.gson.Gson; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoParticipant; -import com.xiaomi.mone.app.api.model.HeraAppBaseQuery; -import com.xiaomi.mone.app.dao.HeraBaseInfoDao; -import com.xiaomi.mone.app.model.HeraAppBaseInfo; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoParticipant; +import org.apache.ozhera.app.api.model.HeraAppBaseQuery; +import org.apache.ozhera.app.dao.HeraBaseInfoDao; +import org.apache.ozhera.app.model.HeraAppBaseInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/HeraAppEnvOutwardServiceImpl.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraAppEnvOutwardServiceImpl.java similarity index 90% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/HeraAppEnvOutwardServiceImpl.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraAppEnvOutwardServiceImpl.java index 224f99b5c..807ea94f3 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/HeraAppEnvOutwardServiceImpl.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraAppEnvOutwardServiceImpl.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.service.impl; +package org.apache.ozhera.app.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.collect.Lists; -import com.xiaomi.mone.app.api.model.HeraAppEnvData; -import com.xiaomi.mone.app.api.model.HeraSimpleEnv; -import com.xiaomi.mone.app.api.service.HeraAppEnvOutwardService; -import com.xiaomi.mone.app.dao.mapper.HeraAppEnvMapper; -import com.xiaomi.mone.app.model.HeraAppEnv; +import org.apache.ozhera.app.api.model.HeraAppEnvData; +import org.apache.ozhera.app.api.model.HeraSimpleEnv; +import org.apache.ozhera.app.api.service.HeraAppEnvOutwardService; +import org.apache.ozhera.app.dao.mapper.HeraAppEnvMapper; +import org.apache.ozhera.app.model.HeraAppEnv; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.dubbo.config.annotation.Service; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/HeraAppEnvServiceImpl.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraAppEnvServiceImpl.java similarity index 92% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/HeraAppEnvServiceImpl.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraAppEnvServiceImpl.java index 732bf464f..5a05ee01a 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/HeraAppEnvServiceImpl.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraAppEnvServiceImpl.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.service.impl; +package org.apache.ozhera.app.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.xiaomi.mone.app.dao.mapper.HeraAppBaseInfoMapper; -import com.xiaomi.mone.app.dao.mapper.HeraAppEnvMapper; -import com.xiaomi.mone.app.enums.OperateEnum; -import com.xiaomi.mone.app.enums.StatusEnum; -import com.xiaomi.mone.app.exception.AppException; -import com.xiaomi.mone.app.model.HeraAppBaseInfo; -import com.xiaomi.mone.app.model.HeraAppEnv; -import com.xiaomi.mone.app.model.vo.HeraAppEnvVo; -import com.xiaomi.mone.app.model.vo.HeraAppOperateVo; -import com.xiaomi.mone.app.model.vo.HeraEnvIpVo; -import com.xiaomi.mone.app.service.HeraAppEnvService; -import com.xiaomi.mone.app.service.env.DefaultEnvIpFetch; -import com.xiaomi.mone.app.service.env.EnvIpFetch; +import org.apache.ozhera.app.dao.mapper.HeraAppBaseInfoMapper; +import org.apache.ozhera.app.dao.mapper.HeraAppEnvMapper; +import org.apache.ozhera.app.enums.OperateEnum; +import org.apache.ozhera.app.enums.StatusEnum; +import org.apache.ozhera.app.exception.AppException; +import org.apache.ozhera.app.model.HeraAppBaseInfo; +import org.apache.ozhera.app.model.HeraAppEnv; +import org.apache.ozhera.app.model.vo.HeraAppEnvVo; +import org.apache.ozhera.app.model.vo.HeraAppOperateVo; +import org.apache.ozhera.app.model.vo.HeraEnvIpVo; +import org.apache.ozhera.app.service.HeraAppEnvService; +import org.apache.ozhera.app.service.env.DefaultEnvIpFetch; +import org.apache.ozhera.app.service.env.EnvIpFetch; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.rocketmq.client.producer.DefaultMQProducer; @@ -51,8 +51,8 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.stream.Collectors; -import static com.xiaomi.mone.app.common.Constant.DEFAULT_OPERATOR; -import static com.xiaomi.mone.app.common.Constant.GSON; +import static org.apache.ozhera.app.common.Constant.DEFAULT_OPERATOR; +import static org.apache.ozhera.app.common.Constant.GSON; /** * @author wtt diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/HeraAppServiceImpl.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraAppServiceImpl.java similarity index 92% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/HeraAppServiceImpl.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraAppServiceImpl.java index 1d7cf533b..cde766eb0 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/HeraAppServiceImpl.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraAppServiceImpl.java @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.service.impl; +package org.apache.ozhera.app.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.common.collect.Lists; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoParticipant; -import com.xiaomi.mone.app.api.model.HeraAppBaseQuery; -import com.xiaomi.mone.app.api.model.HeraAppRoleModel; -import com.xiaomi.mone.app.api.response.AppBaseInfo; -import com.xiaomi.mone.app.api.service.HeraAppService; -import com.xiaomi.mone.app.dao.mapper.HeraAppBaseInfoMapper; -import com.xiaomi.mone.app.dao.mapper.HeraAppExcessInfoMapper; -import com.xiaomi.mone.app.dao.mapper.HeraAppRoleMapper; -import com.xiaomi.mone.app.enums.StatusEnum; -import com.xiaomi.mone.app.model.HeraAppBaseInfo; -import com.xiaomi.mone.app.model.HeraAppExcessInfo; -import com.xiaomi.mone.app.model.HeraAppRole; -import com.xiaomi.mone.app.service.HeraAppRoleService; -import com.xiaomi.mone.app.service.extension.AppTypeServiceExtension; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoParticipant; +import org.apache.ozhera.app.api.model.HeraAppBaseQuery; +import org.apache.ozhera.app.api.model.HeraAppRoleModel; +import org.apache.ozhera.app.api.response.AppBaseInfo; +import org.apache.ozhera.app.api.service.HeraAppService; +import org.apache.ozhera.app.dao.mapper.HeraAppBaseInfoMapper; +import org.apache.ozhera.app.dao.mapper.HeraAppExcessInfoMapper; +import org.apache.ozhera.app.dao.mapper.HeraAppRoleMapper; +import org.apache.ozhera.app.enums.StatusEnum; +import org.apache.ozhera.app.model.HeraAppBaseInfo; +import org.apache.ozhera.app.model.HeraAppExcessInfo; +import org.apache.ozhera.app.model.HeraAppRole; +import org.apache.ozhera.app.service.HeraAppRoleService; +import org.apache.ozhera.app.service.extension.AppTypeServiceExtension; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -47,8 +47,8 @@ import java.util.Objects; import java.util.stream.Collectors; -import static com.xiaomi.mone.app.common.Constant.GSON; -import static com.xiaomi.mone.app.enums.StatusEnum.NOT_DELETED; +import static org.apache.ozhera.app.common.Constant.GSON; +import static org.apache.ozhera.app.enums.StatusEnum.NOT_DELETED; /** * @author wtt diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/HeraPojectGroupServiceImpl.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraPojectGroupServiceImpl.java similarity index 82% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/HeraPojectGroupServiceImpl.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraPojectGroupServiceImpl.java index f6136a03f..c61fbf10e 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/impl/HeraPojectGroupServiceImpl.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraPojectGroupServiceImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.service.impl; +package org.apache.ozhera.app.service.impl; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; -import com.xiaomi.mone.app.api.model.project.group.HeraProjectGroupDataRequest; -import com.xiaomi.mone.app.api.model.project.group.HeraProjectGroupModel; -import com.xiaomi.mone.app.api.model.project.group.ProjectGroupTreeNode; -import com.xiaomi.mone.app.api.service.HeraProjectGroupServiceApi; -import com.xiaomi.mone.app.common.Result; -import com.xiaomi.mone.app.service.project.group.HeraProjectGroupService; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.project.group.HeraProjectGroupDataRequest; +import org.apache.ozhera.app.api.model.project.group.HeraProjectGroupModel; +import org.apache.ozhera.app.api.model.project.group.ProjectGroupTreeNode; +import org.apache.ozhera.app.api.service.HeraProjectGroupServiceApi; +import org.apache.ozhera.app.common.Result; +import org.apache.ozhera.app.service.project.group.HeraProjectGroupService; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.Service; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/mq/RocketMqHeraAppConsumer.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/mq/RocketMqHeraAppConsumer.java similarity index 95% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/mq/RocketMqHeraAppConsumer.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/mq/RocketMqHeraAppConsumer.java index f62fe443d..5fa41653d 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/mq/RocketMqHeraAppConsumer.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/mq/RocketMqHeraAppConsumer.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.service.mq; +package org.apache.ozhera.app.service.mq; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.gson.Gson; -import com.xiaomi.mone.app.api.message.HeraAppInfoModifyMessage; -import com.xiaomi.mone.app.api.message.HeraAppModifyType; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; -import com.xiaomi.mone.app.dao.HeraAppRoleDao; -import com.xiaomi.mone.app.dao.HeraBaseInfoDao; -import com.xiaomi.mone.app.model.HeraAppBaseInfo; -import com.xiaomi.mone.app.model.HeraAppRole; -import com.xiaomi.mone.app.service.impl.HeraAppBaseInfoService; -import com.xiaomi.mone.app.service.mq.model.HeraAppMessage; +import org.apache.ozhera.app.api.message.HeraAppInfoModifyMessage; +import org.apache.ozhera.app.api.message.HeraAppModifyType; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.dao.HeraAppRoleDao; +import org.apache.ozhera.app.dao.HeraBaseInfoDao; +import org.apache.ozhera.app.model.HeraAppBaseInfo; +import org.apache.ozhera.app.model.HeraAppRole; +import org.apache.ozhera.app.service.impl.HeraAppBaseInfoService; +import org.apache.ozhera.app.service.mq.model.HeraAppMessage; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.common.utils.CollectionUtils; import org.apache.dubbo.common.utils.StringUtils; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/mq/RocketMqHeraAppProducer.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/mq/RocketMqHeraAppProducer.java similarity index 94% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/mq/RocketMqHeraAppProducer.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/mq/RocketMqHeraAppProducer.java index dd55aa3d0..4d0941362 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/mq/RocketMqHeraAppProducer.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/mq/RocketMqHeraAppProducer.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.service.mq; +package org.apache.ozhera.app.service.mq; import com.alibaba.fastjson.JSON; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.mone.app.api.message.HeraAppInfoModifyMessage; +import org.apache.ozhera.app.api.message.HeraAppInfoModifyMessage; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.producer.DefaultMQProducer; import org.apache.rocketmq.common.message.Message; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/mq/model/HeraAppMessage.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/mq/model/HeraAppMessage.java similarity index 95% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/mq/model/HeraAppMessage.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/mq/model/HeraAppMessage.java index a80b51af1..bec20bbd1 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/mq/model/HeraAppMessage.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/mq/model/HeraAppMessage.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.service.mq.model; +package org.apache.ozhera.app.service.mq.model; import com.google.gson.JsonObject; -import com.xiaomi.mone.app.model.HeraAppBaseInfo; +import org.apache.ozhera.app.model.HeraAppBaseInfo; import lombok.Data; import lombok.ToString; import org.apache.commons.lang3.StringUtils; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/project/group/HeraProjectGroupService.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/project/group/HeraProjectGroupService.java similarity index 95% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/project/group/HeraProjectGroupService.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/project/group/HeraProjectGroupService.java index 3e2d7eafa..98bf65336 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/project/group/HeraProjectGroupService.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/project/group/HeraProjectGroupService.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.service.project.group; +package org.apache.ozhera.app.service.project.group; import com.google.common.collect.Lists; import com.google.gson.Gson; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; -import com.xiaomi.mone.app.api.model.project.group.HeraProjectGroupAppRequest; -import com.xiaomi.mone.app.api.model.project.group.HeraProjectGroupDataRequest; -import com.xiaomi.mone.app.api.model.project.group.HeraProjectGroupModel; -import com.xiaomi.mone.app.api.model.project.group.ProjectGroupTreeNode; -import com.xiaomi.mone.app.common.Result; -import com.xiaomi.mone.app.dao.HeraBaseInfoDao; -import com.xiaomi.mone.app.dao.HeraProjectGroupAppDao; -import com.xiaomi.mone.app.dao.HeraProjectGroupDao; -import com.xiaomi.mone.app.dao.HeraProjectGroupUserDao; -import com.xiaomi.mone.app.enums.CommonError; -import com.xiaomi.mone.app.model.HeraAppBaseInfo; -import com.xiaomi.mone.app.model.HeraProjectGroup; -import com.xiaomi.mone.app.model.HeraProjectGroupApp; -import com.xiaomi.mone.app.model.HeraProjectGroupUser; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.project.group.HeraProjectGroupAppRequest; +import org.apache.ozhera.app.api.model.project.group.HeraProjectGroupDataRequest; +import org.apache.ozhera.app.api.model.project.group.HeraProjectGroupModel; +import org.apache.ozhera.app.api.model.project.group.ProjectGroupTreeNode; +import org.apache.ozhera.app.common.Result; +import org.apache.ozhera.app.dao.HeraBaseInfoDao; +import org.apache.ozhera.app.dao.HeraProjectGroupAppDao; +import org.apache.ozhera.app.dao.HeraProjectGroupDao; +import org.apache.ozhera.app.dao.HeraProjectGroupUserDao; +import org.apache.ozhera.app.enums.CommonError; +import org.apache.ozhera.app.model.HeraAppBaseInfo; +import org.apache.ozhera.app.model.HeraProjectGroup; +import org.apache.ozhera.app.model.HeraProjectGroupApp; +import org.apache.ozhera.app.model.HeraProjectGroupUser; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/project/group/TreeQueryBuilder.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/project/group/TreeQueryBuilder.java similarity index 89% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/project/group/TreeQueryBuilder.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/project/group/TreeQueryBuilder.java index 7145c9981..5fff9ff87 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/service/project/group/TreeQueryBuilder.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/project/group/TreeQueryBuilder.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.service.project.group; +package org.apache.ozhera.app.service.project.group; -import com.xiaomi.mone.app.api.model.project.group.HeraProjectGroupModel; -import com.xiaomi.mone.app.api.model.project.group.ProjectGroupTreeNode; -import com.xiaomi.mone.app.common.Result; -import com.xiaomi.mone.app.dao.HeraProjectGroupDao; -import com.xiaomi.mone.app.enums.CommonError; +import org.apache.ozhera.app.api.model.project.group.HeraProjectGroupModel; +import org.apache.ozhera.app.api.model.project.group.ProjectGroupTreeNode; +import org.apache.ozhera.app.common.Result; +import org.apache.ozhera.app.dao.HeraProjectGroupDao; +import org.apache.ozhera.app.enums.CommonError; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/util/AppTypeTransferUtil.java b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/util/AppTypeTransferUtil.java similarity index 93% rename from ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/util/AppTypeTransferUtil.java rename to ozhera-app/app-service/src/main/java/org/apache/ozhera/app/util/AppTypeTransferUtil.java index 88ed4a622..525284651 100644 --- a/ozhera-app/app-service/src/main/java/com/xiaomi/mone/app/util/AppTypeTransferUtil.java +++ b/ozhera-app/app-service/src/main/java/org/apache/ozhera/app/util/AppTypeTransferUtil.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mone.app.util; +package org.apache.ozhera.app.util; -import com.xiaomi.mone.app.enums.PlatFormTypeEnum; -import com.xiaomi.mone.app.enums.ProjectTypeEnum; +import org.apache.ozhera.app.enums.PlatFormTypeEnum; +import org.apache.ozhera.app.enums.ProjectTypeEnum; import java.util.Arrays; import java.util.Objects; diff --git a/ozhera-app/app-service/src/main/resources/mapper/HeraAppBaseInfoMapper.xml b/ozhera-app/app-service/src/main/resources/mapper/HeraAppBaseInfoMapper.xml index 69e399987..adc3f7127 100644 --- a/ozhera-app/app-service/src/main/resources/mapper/HeraAppBaseInfoMapper.xml +++ b/ozhera-app/app-service/src/main/resources/mapper/HeraAppBaseInfoMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -17,7 +17,7 @@ - + @@ -85,7 +85,7 @@ envs_map - select distinct @@ -105,7 +105,7 @@ - + @@ -121,12 +121,12 @@ - - select count(1) from hera_app_base_info app INNER JOIN @@ -157,7 +157,7 @@ - select app.id, app.bind_id, @@ -203,7 +203,7 @@ limit #{offset} , #{limit} - select distinct @@ -232,13 +232,13 @@ delete from hera_app_base_info where id = #{id,jdbcType=INTEGER} - + delete from hera_app_base_info - + SELECT LAST_INSERT_ID() @@ -253,7 +253,7 @@ #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{envsMap,jdbcType=LONGVARCHAR}) - + SELECT LAST_INSERT_ID() @@ -347,7 +347,7 @@ - select count(*) from hera_app_base_info @@ -447,7 +447,7 @@ - + update hera_app_base_info @@ -495,7 +495,7 @@ where id = #{id,jdbcType=INTEGER} - + update hera_app_base_info set bind_id = #{bindId,jdbcType=VARCHAR}, bind_type = #{bindType,jdbcType=INTEGER}, @@ -513,7 +513,7 @@ envs_map = #{envsMap,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=INTEGER} - + update hera_app_base_info set bind_id = #{bindId,jdbcType=VARCHAR}, bind_type = #{bindType,jdbcType=INTEGER}, @@ -600,7 +600,7 @@ - + diff --git a/ozhera-app/app-service/src/main/resources/mapper/HeraAppRoleMapper.xml b/ozhera-app/app-service/src/main/resources/mapper/HeraAppRoleMapper.xml index 1468875f2..99ffa3141 100644 --- a/ozhera-app/app-service/src/main/resources/mapper/HeraAppRoleMapper.xml +++ b/ozhera-app/app-service/src/main/resources/mapper/HeraAppRoleMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -72,7 +72,7 @@ id, app_id, app_platform, user, role, status, create_time, update_time - select distinct @@ -99,13 +99,13 @@ delete from hera_app_role where id = #{id,jdbcType=INTEGER} - + delete from hera_app_role - + SELECT LAST_INSERT_ID() @@ -116,7 +116,7 @@ #{role,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) - + SELECT LAST_INSERT_ID() @@ -168,7 +168,7 @@ - select count(*) from hera_app_role @@ -220,7 +220,7 @@ - + update hera_app_role @@ -247,7 +247,7 @@ where id = #{id,jdbcType=INTEGER} - + update hera_app_role set app_id = #{appId,jdbcType=VARCHAR}, app_platform = #{appPlatform,jdbcType=INTEGER}, diff --git a/ozhera-app/app-service/src/main/resources/mapper/HeraProjectGroupAppMapper.xml b/ozhera-app/app-service/src/main/resources/mapper/HeraProjectGroupAppMapper.xml index 17d3928ec..6a73c66cd 100644 --- a/ozhera-app/app-service/src/main/resources/mapper/HeraProjectGroupAppMapper.xml +++ b/ozhera-app/app-service/src/main/resources/mapper/HeraProjectGroupAppMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -70,7 +70,7 @@ id, project_group_id, app_base_info_id, status, create_time, update_time - select distinct @@ -97,13 +97,13 @@ delete from hera_project_group_app where id = #{id,jdbcType=INTEGER} - + delete from hera_project_group_app - + SELECT LAST_INSERT_ID() @@ -112,7 +112,7 @@ values (#{projectGroupId,jdbcType=INTEGER}, #{appBaseInfoId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) - + SELECT LAST_INSERT_ID() @@ -152,7 +152,7 @@ - select count(*) from hera_project_group_app @@ -196,7 +196,7 @@ - + update hera_project_group_app @@ -217,7 +217,7 @@ where id = #{id,jdbcType=INTEGER} - + update hera_project_group_app set project_group_id = #{projectGroupId,jdbcType=INTEGER}, app_base_info_id = #{appBaseInfoId,jdbcType=INTEGER}, diff --git a/ozhera-app/app-service/src/main/resources/mapper/HeraProjectGroupMapper.xml b/ozhera-app/app-service/src/main/resources/mapper/HeraProjectGroupMapper.xml index 5e9b7f083..8e82be69c 100644 --- a/ozhera-app/app-service/src/main/resources/mapper/HeraProjectGroupMapper.xml +++ b/ozhera-app/app-service/src/main/resources/mapper/HeraProjectGroupMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -76,7 +76,7 @@ id, type, relation_object_id, name, cn_name, parent_group_id, status, level, create_time, update_time - select distinct @@ -103,13 +103,13 @@ delete from hera_project_group where id = #{id,jdbcType=INTEGER} - + delete from hera_project_group - + SELECT LAST_INSERT_ID() @@ -122,7 +122,7 @@ #{level,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} ) - + SELECT LAST_INSERT_ID() @@ -186,7 +186,7 @@ - select count(*) from hera_project_group @@ -246,7 +246,7 @@ - + update hera_project_group @@ -279,7 +279,7 @@ where id = #{id,jdbcType=INTEGER} - + update hera_project_group set type = #{type,jdbcType=INTEGER}, relation_object_id = #{relationObjectId,jdbcType=INTEGER}, diff --git a/ozhera-app/app-service/src/main/resources/mapper/HeraProjectGroupUserMapper.xml b/ozhera-app/app-service/src/main/resources/mapper/HeraProjectGroupUserMapper.xml index ff2b66481..81b885243 100644 --- a/ozhera-app/app-service/src/main/resources/mapper/HeraProjectGroupUserMapper.xml +++ b/ozhera-app/app-service/src/main/resources/mapper/HeraProjectGroupUserMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -70,7 +70,7 @@ id, project_group_id, user, status, create_time, update_time - select distinct @@ -97,13 +97,13 @@ delete from hera_project_group_user where id = #{id,jdbcType=INTEGER} - + delete from hera_project_group_user - + SELECT LAST_INSERT_ID() @@ -112,7 +112,7 @@ values (#{projectGroupId,jdbcType=INTEGER}, #{user,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) - + SELECT LAST_INSERT_ID() @@ -152,7 +152,7 @@ - select count(*) from hera_project_group_user @@ -196,7 +196,7 @@ - + update hera_project_group_user @@ -217,7 +217,7 @@ where id = #{id,jdbcType=INTEGER} - + update hera_project_group_user set project_group_id = #{projectGroupId,jdbcType=INTEGER}, user = #{user,jdbcType=VARCHAR}, diff --git a/ozhera-app/pom.xml b/ozhera-app/pom.xml index f06c3b7bc..396b93667 100644 --- a/ozhera-app/pom.xml +++ b/ozhera-app/pom.xml @@ -5,14 +5,13 @@ 4.0.0 - run.mone - ozhera - 1.4.0-jdk21-SNAPSHOT + org.apache.ozhera + ozhera-parent + 2.0.0-SNAPSHOT - run.mone ozhera-app - 1.4-jdk21-4 + 2.0.0-SNAPSHOT pom @@ -23,23 +22,23 @@ - 1.4-jdk21-4 + 2.0.0-SNAPSHOT - run.mone + org.apache.ozhera app-api ${hera-app.release.version} - run.mone + org.apache.ozhera app-service ${hera-app.release.version} - run.mone + org.apache.ozhera app-server ${hera-app.release.version} diff --git a/ozhera-log/log-agent/src/main/java/com/xiaomi/mone/log/agent/common/trace/TraceUtil.java b/ozhera-log/log-agent/src/main/java/com/xiaomi/mone/log/agent/common/trace/TraceUtil.java index 9d5f5d842..dc7aaf42c 100644 --- a/ozhera-log/log-agent/src/main/java/com/xiaomi/mone/log/agent/common/trace/TraceUtil.java +++ b/ozhera-log/log-agent/src/main/java/com/xiaomi/mone/log/agent/common/trace/TraceUtil.java @@ -18,19 +18,19 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Sets; -import com.xiaomi.hera.tspandata.TAttributeKey; -import com.xiaomi.hera.tspandata.TAttributeType; -import com.xiaomi.hera.tspandata.TAttributes; -import com.xiaomi.hera.tspandata.TEvent; -import com.xiaomi.hera.tspandata.TExtra; -import com.xiaomi.hera.tspandata.TInstrumentationLibraryInfo; -import com.xiaomi.hera.tspandata.TKind; -import com.xiaomi.hera.tspandata.TLink; -import com.xiaomi.hera.tspandata.TResource; -import com.xiaomi.hera.tspandata.TSpanContext; -import com.xiaomi.hera.tspandata.TSpanData; -import com.xiaomi.hera.tspandata.TStatus; -import com.xiaomi.hera.tspandata.TValue; +import org.apache.ozhera.tspandata.TAttributeKey; +import org.apache.ozhera.tspandata.TAttributeType; +import org.apache.ozhera.tspandata.TAttributes; +import org.apache.ozhera.tspandata.TEvent; +import org.apache.ozhera.tspandata.TExtra; +import org.apache.ozhera.tspandata.TInstrumentationLibraryInfo; +import org.apache.ozhera.tspandata.TKind; +import org.apache.ozhera.tspandata.TLink; +import org.apache.ozhera.tspandata.TResource; +import org.apache.ozhera.tspandata.TSpanContext; +import org.apache.ozhera.tspandata.TSpanData; +import org.apache.ozhera.tspandata.TStatus; +import org.apache.ozhera.tspandata.TValue; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.thrift.TException; diff --git a/ozhera-log/log-agent/src/main/java/com/xiaomi/mone/log/agent/extension/KafkaExporter.java b/ozhera-log/log-agent/src/main/java/com/xiaomi/mone/log/agent/extension/KafkaExporter.java index d5a819e1a..38c202b6b 100644 --- a/ozhera-log/log-agent/src/main/java/com/xiaomi/mone/log/agent/extension/KafkaExporter.java +++ b/ozhera-log/log-agent/src/main/java/com/xiaomi/mone/log/agent/extension/KafkaExporter.java @@ -16,7 +16,7 @@ package com.xiaomi.mone.log.agent.extension; import com.google.common.collect.Lists; -import com.xiaomi.hera.tspandata.TSpanData; +import org.apache.ozhera.tspandata.TSpanData; import com.xiaomi.mone.log.agent.common.HashUtil; import com.xiaomi.mone.log.agent.common.trace.TraceUtil; import com.xiaomi.mone.log.agent.export.MsgExporter; diff --git a/ozhera-log/log-agent/src/main/java/com/xiaomi/mone/log/agent/extension/RmqExporter.java b/ozhera-log/log-agent/src/main/java/com/xiaomi/mone/log/agent/extension/RmqExporter.java index 5a4cd3c40..48e31fe0f 100644 --- a/ozhera-log/log-agent/src/main/java/com/xiaomi/mone/log/agent/extension/RmqExporter.java +++ b/ozhera-log/log-agent/src/main/java/com/xiaomi/mone/log/agent/extension/RmqExporter.java @@ -17,7 +17,7 @@ import com.google.common.collect.Lists; import com.google.gson.Gson; -import com.xiaomi.hera.tspandata.TSpanData; +import org.apache.ozhera.tspandata.TSpanData; import com.xiaomi.mone.log.agent.common.HashUtil; import com.xiaomi.mone.log.agent.common.trace.TraceUtil; import com.xiaomi.mone.log.agent.export.MsgExporter; diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/dao/MilogAppTopicRelDao.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/dao/MilogAppTopicRelDao.java index 258e4e0bf..33782ea44 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/dao/MilogAppTopicRelDao.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/dao/MilogAppTopicRelDao.java @@ -15,8 +15,8 @@ */ package com.xiaomi.mone.log.manager.dao; -import com.xiaomi.mone.app.api.response.AppBaseInfo; -import com.xiaomi.mone.app.api.service.HeraAppService; +import org.apache.ozhera.app.api.response.AppBaseInfo; +import org.apache.ozhera.app.api.service.HeraAppService; import com.xiaomi.mone.log.api.enums.ProjectTypeEnum; import com.xiaomi.mone.log.manager.model.pojo.MilogAppTopicRelDO; import com.xiaomi.youpin.docean.anno.Service; diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/HeraAppEnvService.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/HeraAppEnvService.java index 528079b86..ca6c4292c 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/HeraAppEnvService.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/HeraAppEnvService.java @@ -15,8 +15,8 @@ */ package com.xiaomi.mone.log.manager.service; -import com.xiaomi.mone.app.api.model.HeraAppEnvData; -import com.xiaomi.mone.app.api.model.HeraSimpleEnv; +import org.apache.ozhera.app.api.model.HeraAppEnvData; +import org.apache.ozhera.app.api.model.HeraSimpleEnv; import java.util.List; diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/HeraAppService.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/HeraAppService.java index 6b2fdc51d..860461a17 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/HeraAppService.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/HeraAppService.java @@ -15,10 +15,10 @@ */ package com.xiaomi.mone.log.manager.service; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoParticipant; -import com.xiaomi.mone.app.api.model.HeraAppBaseQuery; -import com.xiaomi.mone.app.api.response.AppBaseInfo; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoParticipant; +import org.apache.ozhera.app.api.model.HeraAppBaseQuery; +import org.apache.ozhera.app.api.response.AppBaseInfo; import java.util.List; diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/LogTailService.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/LogTailService.java index 5c5c2b4f3..146be468a 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/LogTailService.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/LogTailService.java @@ -15,8 +15,8 @@ */ package com.xiaomi.mone.log.manager.service; -import com.xiaomi.mone.app.api.response.AppBaseInfo; -import com.xiaomi.mone.app.model.vo.HeraEnvIpVo; +import org.apache.ozhera.app.api.response.AppBaseInfo; +import org.apache.ozhera.app.model.vo.HeraEnvIpVo; import com.xiaomi.mone.log.api.enums.LogStructureEnum; import com.xiaomi.mone.log.common.Result; import com.xiaomi.mone.log.manager.model.bo.LogTailParam; diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/consumer/MioneRocketMqConsumer.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/consumer/MioneRocketMqConsumer.java index 4ccb82567..43b4db68d 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/consumer/MioneRocketMqConsumer.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/consumer/MioneRocketMqConsumer.java @@ -16,7 +16,7 @@ package com.xiaomi.mone.log.manager.service.consumer; import com.google.gson.Gson; -import com.xiaomi.mone.app.model.vo.HeraEnvIpVo; +import org.apache.ozhera.app.model.vo.HeraEnvIpVo; import com.xiaomi.mone.log.manager.service.impl.LogTailServiceImpl; import com.xiaomi.youpin.docean.anno.Service; import com.xiaomi.youpin.docean.plugin.config.anno.Value; diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/extension/agent/MilogAgentServiceImpl.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/extension/agent/MilogAgentServiceImpl.java index fa38d97ab..7ba37c0da 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/extension/agent/MilogAgentServiceImpl.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/extension/agent/MilogAgentServiceImpl.java @@ -19,7 +19,7 @@ import com.google.gson.Gson; import com.xiaomi.data.push.context.AgentContext; import com.xiaomi.data.push.rpc.netty.AgentChannel; -import com.xiaomi.mone.app.api.response.AppBaseInfo; +import org.apache.ozhera.app.api.response.AppBaseInfo; import com.xiaomi.mone.log.api.enums.LogTypeEnum; import com.xiaomi.mone.log.api.enums.MQSourceEnum; import com.xiaomi.mone.log.api.enums.OperateEnum; diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/extension/tail/DefaultTailExtensionService.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/extension/tail/DefaultTailExtensionService.java index 53be29475..b0ad61a56 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/extension/tail/DefaultTailExtensionService.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/extension/tail/DefaultTailExtensionService.java @@ -16,8 +16,8 @@ package com.xiaomi.mone.log.manager.service.extension.tail; import com.google.common.collect.Lists; -import com.xiaomi.mone.app.api.model.HeraSimpleEnv; -import com.xiaomi.mone.app.api.response.AppBaseInfo; +import org.apache.ozhera.app.api.model.HeraSimpleEnv; +import org.apache.ozhera.app.api.response.AppBaseInfo; import com.xiaomi.mone.log.api.enums.OperateEnum; import com.xiaomi.mone.log.api.enums.ProjectTypeEnum; import com.xiaomi.mone.log.manager.dao.MilogLogTailDao; diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/extension/tail/TailExtensionService.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/extension/tail/TailExtensionService.java index 09573491e..a6d83994d 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/extension/tail/TailExtensionService.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/extension/tail/TailExtensionService.java @@ -15,7 +15,7 @@ */ package com.xiaomi.mone.log.manager.service.extension.tail; -import com.xiaomi.mone.app.api.response.AppBaseInfo; +import org.apache.ozhera.app.api.response.AppBaseInfo; import com.xiaomi.mone.log.manager.model.bo.LogTailParam; import com.xiaomi.mone.log.manager.model.dto.MilogAppEnvDTO; import com.xiaomi.mone.log.manager.model.pojo.MilogLogStoreDO; diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/EsDataServiceImpl.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/EsDataServiceImpl.java index 99928b743..a3c211a56 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/EsDataServiceImpl.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/EsDataServiceImpl.java @@ -19,7 +19,7 @@ import cn.hutool.core.lang.Pair; import com.alibaba.fastjson.JSON; import com.google.common.collect.Lists; -import com.xiaomi.mone.app.api.model.HeraAppEnvData; +import org.apache.ozhera.app.api.model.HeraAppEnvData; import com.xiaomi.mone.es.EsClient; import com.xiaomi.mone.log.api.enums.LogStorageTypeEnum; import com.xiaomi.mone.log.api.model.dto.TraceLogDTO; diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/HeraAppEnvServiceImpl.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/HeraAppEnvServiceImpl.java index dd534dff2..3c578ab13 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/HeraAppEnvServiceImpl.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/HeraAppEnvServiceImpl.java @@ -15,9 +15,9 @@ */ package com.xiaomi.mone.log.manager.service.impl; -import com.xiaomi.mone.app.api.model.HeraAppEnvData; -import com.xiaomi.mone.app.api.model.HeraSimpleEnv; -import com.xiaomi.mone.app.api.service.HeraAppEnvOutwardService; +import org.apache.ozhera.app.api.model.HeraAppEnvData; +import org.apache.ozhera.app.api.model.HeraSimpleEnv; +import org.apache.ozhera.app.api.service.HeraAppEnvOutwardService; import com.xiaomi.mone.log.manager.service.HeraAppEnvService; import com.xiaomi.youpin.docean.anno.Service; import com.xiaomi.youpin.docean.plugin.dubbo.anno.Reference; diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/HeraAppServiceImpl.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/HeraAppServiceImpl.java index ecd1f7926..ade0725ed 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/HeraAppServiceImpl.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/HeraAppServiceImpl.java @@ -17,10 +17,10 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoParticipant; -import com.xiaomi.mone.app.api.model.HeraAppBaseQuery; -import com.xiaomi.mone.app.api.response.AppBaseInfo; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoParticipant; +import org.apache.ozhera.app.api.model.HeraAppBaseQuery; +import org.apache.ozhera.app.api.response.AppBaseInfo; import com.xiaomi.mone.log.manager.service.HeraAppService; import com.xiaomi.youpin.docean.anno.Service; import com.xiaomi.youpin.docean.plugin.dubbo.anno.Reference; @@ -41,8 +41,8 @@ @Service public class HeraAppServiceImpl implements HeraAppService { - @Reference(interfaceClass = com.xiaomi.mone.app.api.service.HeraAppService.class, group = "$dubbo.env.group", check = false, timeout = 5000) - private com.xiaomi.mone.app.api.service.HeraAppService heraAppService; + @Reference(interfaceClass = org.apache.ozhera.app.api.service.HeraAppService.class, group = "$dubbo.env.group", check = false, timeout = 5000) + private org.apache.ozhera.app.api.service.HeraAppService heraAppService; private static final Cache CACHE_LOCAL = CacheBuilder.newBuilder() .maximumSize(100) diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/HeralogHomePageServiceImpl.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/HeralogHomePageServiceImpl.java index f1139b7ca..288a72aa8 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/HeralogHomePageServiceImpl.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/HeralogHomePageServiceImpl.java @@ -17,7 +17,7 @@ package com.xiaomi.mone.log.manager.service.impl; import com.google.common.collect.Lists; -import com.xiaomi.mone.app.api.response.AppBaseInfo; +import org.apache.ozhera.app.api.response.AppBaseInfo; import com.xiaomi.mone.log.common.Config; import com.xiaomi.mone.log.common.Result; import com.xiaomi.mone.log.exception.CommonError; diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/LogTailServiceImpl.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/LogTailServiceImpl.java index 644f6f560..a7b6cd048 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/LogTailServiceImpl.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/LogTailServiceImpl.java @@ -17,8 +17,8 @@ import cn.hutool.core.lang.Assert; import com.google.common.collect.Lists; -import com.xiaomi.mone.app.api.response.AppBaseInfo; -import com.xiaomi.mone.app.model.vo.HeraEnvIpVo; +import org.apache.ozhera.app.api.response.AppBaseInfo; +import org.apache.ozhera.app.model.vo.HeraEnvIpVo; import com.xiaomi.mone.log.api.enums.*; import com.xiaomi.mone.log.api.model.meta.FilterDefine; import com.xiaomi.mone.log.common.Result; diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/MilogAppMiddlewareRelServiceImpl.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/MilogAppMiddlewareRelServiceImpl.java index 2178f730c..e8f4ef7e1 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/MilogAppMiddlewareRelServiceImpl.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/MilogAppMiddlewareRelServiceImpl.java @@ -15,7 +15,7 @@ */ package com.xiaomi.mone.log.manager.service.impl; -import com.xiaomi.mone.app.api.response.AppBaseInfo; +import org.apache.ozhera.app.api.response.AppBaseInfo; import com.xiaomi.mone.log.api.enums.MiddlewareEnum; import com.xiaomi.mone.log.manager.common.Utils; import com.xiaomi.mone.log.manager.common.context.MoneUserContext; diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/MilogOpenServiceImpl.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/MilogOpenServiceImpl.java index 1b2801f5c..a712b24d7 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/MilogOpenServiceImpl.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/MilogOpenServiceImpl.java @@ -16,7 +16,7 @@ package com.xiaomi.mone.log.manager.service.impl; import com.google.gson.Gson; -import com.xiaomi.mone.app.api.response.AppBaseInfo; +import org.apache.ozhera.app.api.response.AppBaseInfo; import com.xiaomi.mone.log.api.enums.DeployWayEnum; import com.xiaomi.mone.log.api.enums.ProjectTypeEnum; import com.xiaomi.mone.log.api.model.bo.MiLogMoneTransfer; diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/listener/AutoLogAccessListener.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/listener/AutoLogAccessListener.java index 5e348219c..9fd5ff004 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/listener/AutoLogAccessListener.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/listener/AutoLogAccessListener.java @@ -20,7 +20,7 @@ import com.alibaba.nacos.api.config.listener.Listener; import com.alibaba.nacos.api.exception.NacosException; import com.google.gson.reflect.TypeToken; -import com.xiaomi.mone.app.api.response.AppBaseInfo; +import org.apache.ozhera.app.api.response.AppBaseInfo; import com.xiaomi.mone.log.api.enums.OperateEnum; import com.xiaomi.mone.log.api.enums.ProjectTypeEnum; import com.xiaomi.mone.log.manager.dao.MilogLogTailDao; diff --git a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/path/LogPathMappingFactory.java b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/path/LogPathMappingFactory.java index 2147e99ca..cecaffdb3 100644 --- a/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/path/LogPathMappingFactory.java +++ b/ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/service/path/LogPathMappingFactory.java @@ -15,7 +15,7 @@ */ package com.xiaomi.mone.log.manager.service.path; -import com.xiaomi.mone.app.enums.ProjectTypeEnum; +import org.apache.ozhera.app.enums.ProjectTypeEnum; import com.xiaomi.youpin.docean.anno.Service; import javax.annotation.Resource; diff --git a/ozhera-monitor/ozhera-monitor-server/src/main/java/com/xiaomi/mone/monitor/controller/AppMonitorController.java b/ozhera-monitor/ozhera-monitor-server/src/main/java/com/xiaomi/mone/monitor/controller/AppMonitorController.java index df719d180..670982929 100644 --- a/ozhera-monitor/ozhera-monitor-server/src/main/java/com/xiaomi/mone/monitor/controller/AppMonitorController.java +++ b/ozhera-monitor/ozhera-monitor-server/src/main/java/com/xiaomi/mone/monitor/controller/AppMonitorController.java @@ -16,8 +16,8 @@ package com.xiaomi.mone.monitor.controller; import com.google.common.collect.Lists; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; -import com.xiaomi.mone.app.api.model.HeraAppRoleModel; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.HeraAppRoleModel; import com.xiaomi.mone.monitor.bo.AppType; import com.xiaomi.mone.monitor.bo.Pair; import com.xiaomi.mone.monitor.dao.HeraAppRoleDao; diff --git a/ozhera-monitor/ozhera-monitor-server/src/main/java/com/xiaomi/mone/monitor/controller/AuthorizationController.java b/ozhera-monitor/ozhera-monitor-server/src/main/java/com/xiaomi/mone/monitor/controller/AuthorizationController.java index a1c4b91db..65e79aa30 100644 --- a/ozhera-monitor/ozhera-monitor-server/src/main/java/com/xiaomi/mone/monitor/controller/AuthorizationController.java +++ b/ozhera-monitor/ozhera-monitor-server/src/main/java/com/xiaomi/mone/monitor/controller/AuthorizationController.java @@ -15,8 +15,8 @@ */ package com.xiaomi.mone.monitor.controller; -import com.xiaomi.mone.app.api.service.HeraAuthorizationApi; -import com.xiaomi.mone.app.common.Result; +import org.apache.ozhera.app.api.service.HeraAuthorizationApi; +import org.apache.ozhera.app.common.Result; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.Reference; import org.springframework.web.bind.annotation.*; diff --git a/ozhera-monitor/ozhera-monitor-server/src/main/java/com/xiaomi/mone/monitor/controller/GrafanaMappingController.java b/ozhera-monitor/ozhera-monitor-server/src/main/java/com/xiaomi/mone/monitor/controller/GrafanaMappingController.java index 35ce88928..b32324813 100644 --- a/ozhera-monitor/ozhera-monitor-server/src/main/java/com/xiaomi/mone/monitor/controller/GrafanaMappingController.java +++ b/ozhera-monitor/ozhera-monitor-server/src/main/java/com/xiaomi/mone/monitor/controller/GrafanaMappingController.java @@ -15,7 +15,7 @@ */ package com.xiaomi.mone.monitor.controller; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; import com.xiaomi.mone.monitor.result.ErrorCode; import com.xiaomi.mone.monitor.result.Result; import com.xiaomi.mone.monitor.service.AppGrafanaMappingService; diff --git a/ozhera-monitor/ozhera-monitor-server/src/main/java/com/xiaomi/mone/monitor/controller/HeraProjectGroupController.java b/ozhera-monitor/ozhera-monitor-server/src/main/java/com/xiaomi/mone/monitor/controller/HeraProjectGroupController.java index a329f82b1..32c6a54ef 100644 --- a/ozhera-monitor/ozhera-monitor-server/src/main/java/com/xiaomi/mone/monitor/controller/HeraProjectGroupController.java +++ b/ozhera-monitor/ozhera-monitor-server/src/main/java/com/xiaomi/mone/monitor/controller/HeraProjectGroupController.java @@ -16,12 +16,12 @@ package com.xiaomi.mone.monitor.controller; import com.google.gson.Gson; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; -import com.xiaomi.mone.app.api.model.project.group.HeraProjectGroupDataRequest; -import com.xiaomi.mone.app.api.model.project.group.HeraProjectGroupModel; -import com.xiaomi.mone.app.api.model.project.group.ProjectGroupTreeNode; -import com.xiaomi.mone.app.common.Result; -import com.xiaomi.mone.app.enums.CommonError; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.project.group.HeraProjectGroupDataRequest; +import org.apache.ozhera.app.api.model.project.group.HeraProjectGroupModel; +import org.apache.ozhera.app.api.model.project.group.ProjectGroupTreeNode; +import org.apache.ozhera.app.common.Result; +import org.apache.ozhera.app.enums.CommonError; import com.xiaomi.mone.monitor.dao.model.AppMonitor; import com.xiaomi.mone.monitor.service.model.project.group.ProjectGroupRequest; import com.xiaomi.mone.monitor.service.project.group.ProjectGroupService; diff --git a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/AppGrafanaMappingService.java b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/AppGrafanaMappingService.java index 4b4ba9206..25ea8f81d 100644 --- a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/AppGrafanaMappingService.java +++ b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/AppGrafanaMappingService.java @@ -16,7 +16,7 @@ package com.xiaomi.mone.monitor.service; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; import com.xiaomi.mone.monitor.dao.model.AppGrafanaMapping; import com.xiaomi.mone.monitor.result.Result; diff --git a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/AppMonitorService.java b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/AppMonitorService.java index bc4a61174..01fcd251b 100644 --- a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/AppMonitorService.java +++ b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/AppMonitorService.java @@ -16,8 +16,8 @@ package com.xiaomi.mone.monitor.service; -import com.xiaomi.mone.app.api.message.HeraAppInfoModifyMessage; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.message.HeraAppInfoModifyMessage; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; import com.xiaomi.mone.monitor.dao.model.AlarmHealthQuery; import com.xiaomi.mone.monitor.dao.model.AppMonitor; import com.xiaomi.mone.monitor.result.Result; diff --git a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/HeraBaseInfoService.java b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/HeraBaseInfoService.java index e6c4601aa..674c71c01 100644 --- a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/HeraBaseInfoService.java +++ b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/HeraBaseInfoService.java @@ -16,8 +16,8 @@ package com.xiaomi.mone.monitor.service; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; -import com.xiaomi.mone.app.api.model.HeraAppRoleModel; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.HeraAppRoleModel; import com.xiaomi.mone.monitor.result.Result; import com.xiaomi.mone.monitor.service.model.HeraAppBaseQuery; diff --git a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/api/AppMonitorServiceExtension.java b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/api/AppMonitorServiceExtension.java index cf0771d7f..401f9ecaa 100644 --- a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/api/AppMonitorServiceExtension.java +++ b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/api/AppMonitorServiceExtension.java @@ -15,7 +15,7 @@ */ package com.xiaomi.mone.monitor.service.api; -import com.xiaomi.mone.app.api.message.HeraAppInfoModifyMessage; +import org.apache.ozhera.app.api.message.HeraAppInfoModifyMessage; import com.xiaomi.mone.monitor.dao.model.AppMonitor; import com.xiaomi.mone.monitor.result.Result; import com.xiaomi.mone.monitor.service.model.ProjectInfo; diff --git a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/api/impl/AppMonitorServiceExtensionImpl.java b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/api/impl/AppMonitorServiceExtensionImpl.java index f93570373..f986291e6 100644 --- a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/api/impl/AppMonitorServiceExtensionImpl.java +++ b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/api/impl/AppMonitorServiceExtensionImpl.java @@ -18,7 +18,7 @@ import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.gson.Gson; import com.google.gson.JsonArray; -import com.xiaomi.mone.app.api.message.HeraAppInfoModifyMessage; +import org.apache.ozhera.app.api.message.HeraAppInfoModifyMessage; import com.xiaomi.mone.monitor.bo.GrafanaInterfaceRes; import com.xiaomi.mone.monitor.dao.model.AppMonitor; import com.xiaomi.mone.monitor.result.ErrorCode; diff --git a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/extension/impl/MerticDetailServiceImpl.java b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/extension/impl/MerticDetailServiceImpl.java index 35494670f..9b3beacee 100644 --- a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/extension/impl/MerticDetailServiceImpl.java +++ b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/extension/impl/MerticDetailServiceImpl.java @@ -15,7 +15,7 @@ */ package com.xiaomi.mone.monitor.service.extension.impl; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; import com.xiaomi.mone.monitor.result.ErrorCode; import com.xiaomi.mone.monitor.result.Result; import com.xiaomi.mone.monitor.service.HeraBaseInfoService; diff --git a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/impl/AppGrafanaMappingServiceImpl.java b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/impl/AppGrafanaMappingServiceImpl.java index c5a47b986..20e7835e9 100644 --- a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/impl/AppGrafanaMappingServiceImpl.java +++ b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/impl/AppGrafanaMappingServiceImpl.java @@ -18,7 +18,7 @@ import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; import com.xiaomi.mone.monitor.bo.AppLanguage; import com.xiaomi.mone.monitor.bo.AppType; import com.xiaomi.mone.monitor.bo.PlatFormType; diff --git a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/impl/AppMonitorServiceImpl.java b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/impl/AppMonitorServiceImpl.java index b75c67f46..ae139a0cd 100644 --- a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/impl/AppMonitorServiceImpl.java +++ b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/impl/AppMonitorServiceImpl.java @@ -18,10 +18,10 @@ import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.xiaomi.mone.app.api.message.HeraAppInfoModifyMessage; -import com.xiaomi.mone.app.api.message.HeraAppModifyType; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; -import com.xiaomi.mone.app.api.service.HeraAppService; +import org.apache.ozhera.app.api.message.HeraAppInfoModifyMessage; +import org.apache.ozhera.app.api.message.HeraAppModifyType; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.service.HeraAppService; import com.xiaomi.mone.monitor.bo.AlarmStrategyInfo; import com.xiaomi.mone.monitor.bo.AppViewType; import com.xiaomi.mone.monitor.bo.RuleStatusType; diff --git a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/impl/HeraBaseInfoServiceImpl.java b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/impl/HeraBaseInfoServiceImpl.java index 8b6d512cb..8a3c0c218 100644 --- a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/impl/HeraBaseInfoServiceImpl.java +++ b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/impl/HeraBaseInfoServiceImpl.java @@ -18,10 +18,10 @@ import com.google.common.collect.Lists; import com.google.gson.Gson; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoParticipant; -import com.xiaomi.mone.app.api.model.HeraAppRoleModel; -import com.xiaomi.mone.app.api.service.HeraAppService; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoParticipant; +import org.apache.ozhera.app.api.model.HeraAppRoleModel; +import org.apache.ozhera.app.api.service.HeraAppService; import com.xiaomi.mone.monitor.bo.AlertGroupParam; import com.xiaomi.mone.monitor.bo.PlatForm; import com.xiaomi.mone.monitor.bo.UserInfo; @@ -397,7 +397,7 @@ public int deleteByIdRemote(Integer id) { @Override public Result queryByParticipantRemote(HeraAppBaseQuery query) { - com.xiaomi.mone.app.api.model.HeraAppBaseQuery queryRemote = new com.xiaomi.mone.app.api.model.HeraAppBaseQuery(); + org.apache.ozhera.app.api.model.HeraAppBaseQuery queryRemote = new org.apache.ozhera.app.api.model.HeraAppBaseQuery(); BeanUtils.copyProperties(query, queryRemote); //MyParticipant只有值为yes才查询我参与的应用，传其他值均查询所有 diff --git a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/model/AppMonitorModel.java b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/model/AppMonitorModel.java index becdf2638..ebcf797c6 100644 --- a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/model/AppMonitorModel.java +++ b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/model/AppMonitorModel.java @@ -15,7 +15,7 @@ */ package com.xiaomi.mone.monitor.service.model; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; import com.xiaomi.mone.monitor.dao.model.AppMonitor; import lombok.Data; import lombok.ToString; diff --git a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/model/HeraAppRoleQuery.java b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/model/HeraAppRoleQuery.java index 9feec221d..a407aabc8 100644 --- a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/model/HeraAppRoleQuery.java +++ b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/model/HeraAppRoleQuery.java @@ -15,7 +15,7 @@ */ package com.xiaomi.mone.monitor.service.model; -import com.xiaomi.mone.app.api.model.HeraAppRoleModel; +import org.apache.ozhera.app.api.model.HeraAppRoleModel; import lombok.Data; import lombok.ToString; import org.springframework.beans.BeanUtils; diff --git a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/project/group/ProjectGroupService.java b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/project/group/ProjectGroupService.java index 5f7faa9bc..36bb4d8ef 100644 --- a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/project/group/ProjectGroupService.java +++ b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/project/group/ProjectGroupService.java @@ -16,14 +16,14 @@ package com.xiaomi.mone.monitor.service.project.group; import com.google.gson.Gson; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; -import com.xiaomi.mone.app.api.model.project.group.HeraProjectGroupAppRequest; -import com.xiaomi.mone.app.api.model.project.group.HeraProjectGroupDataRequest; -import com.xiaomi.mone.app.api.model.project.group.HeraProjectGroupModel; -import com.xiaomi.mone.app.api.model.project.group.ProjectGroupTreeNode; -import com.xiaomi.mone.app.api.service.HeraAuthorizationApi; -import com.xiaomi.mone.app.api.service.HeraProjectGroupServiceApi; -import com.xiaomi.mone.app.common.Result; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.project.group.HeraProjectGroupAppRequest; +import org.apache.ozhera.app.api.model.project.group.HeraProjectGroupDataRequest; +import org.apache.ozhera.app.api.model.project.group.HeraProjectGroupModel; +import org.apache.ozhera.app.api.model.project.group.ProjectGroupTreeNode; +import org.apache.ozhera.app.api.service.HeraAuthorizationApi; +import org.apache.ozhera.app.api.service.HeraProjectGroupServiceApi; +import org.apache.ozhera.app.common.Result; import com.xiaomi.mone.monitor.dao.model.AppMonitor; import com.xiaomi.mone.monitor.service.AppMonitorService; import com.xiaomi.mone.monitor.service.HeraBaseInfoService; diff --git a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/rocketmq/RocketMqHeraMonitorConsumer.java b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/rocketmq/RocketMqHeraMonitorConsumer.java index 694c45bc5..48ac3a955 100644 --- a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/rocketmq/RocketMqHeraMonitorConsumer.java +++ b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/rocketmq/RocketMqHeraMonitorConsumer.java @@ -17,7 +17,7 @@ import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.gson.Gson; -import com.xiaomi.mone.app.api.message.HeraAppInfoModifyMessage; +import org.apache.ozhera.app.api.message.HeraAppInfoModifyMessage; import com.xiaomi.mone.monitor.dao.HeraAppRoleDao; import com.xiaomi.mone.monitor.service.AppGrafanaMappingService; import com.xiaomi.mone.monitor.service.AppMonitorService; diff --git a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/rocketmq/model/HeraAppMessage.java b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/rocketmq/model/HeraAppMessage.java index 239a3850a..65079995c 100644 --- a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/rocketmq/model/HeraAppMessage.java +++ b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/rocketmq/model/HeraAppMessage.java @@ -16,7 +16,7 @@ package com.xiaomi.mone.monitor.service.rocketmq.model; import com.google.gson.JsonObject; -import com.xiaomi.mone.app.api.model.HeraAppBaseInfoModel; +import org.apache.ozhera.app.api.model.HeraAppBaseInfoModel; import com.xiaomi.mone.monitor.dao.model.AppMonitor; import lombok.Data; import lombok.ToString; diff --git a/ozhera-operator/ozhera-operator-common/pom.xml b/ozhera-operator/ozhera-operator-common/pom.xml index 69bb1776c..a1e769304 100644 --- a/ozhera-operator/ozhera-operator-common/pom.xml +++ b/ozhera-operator/ozhera-operator-common/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + org.apache.ozhera ozhera-operator - run.mone - 1.0-jdk21 + 2.0.0-SNAPSHOT 4.0.0 diff --git a/ozhera-operator/ozhera-operator-common/src/main/java/run/mone/hera/operator/common/ESIndexConst.java b/ozhera-operator/ozhera-operator-common/src/main/java/org/apache/ozhera/operator/common/ESIndexConst.java similarity index 99% rename from ozhera-operator/ozhera-operator-common/src/main/java/run/mone/hera/operator/common/ESIndexConst.java rename to ozhera-operator/ozhera-operator-common/src/main/java/org/apache/ozhera/operator/common/ESIndexConst.java index 0df58a887..93f1e4ee4 100644 --- a/ozhera-operator/ozhera-operator-common/src/main/java/run/mone/hera/operator/common/ESIndexConst.java +++ b/ozhera-operator/ozhera-operator-common/src/main/java/org/apache/ozhera/operator/common/ESIndexConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.common; +package org.apache.ozhera.operator.common; import org.apache.commons.lang3.StringUtils; diff --git a/ozhera-operator/ozhera-operator-common/src/main/java/run/mone/hera/operator/common/ErrorCode.java b/ozhera-operator/ozhera-operator-common/src/main/java/org/apache/ozhera/operator/common/ErrorCode.java similarity index 97% rename from ozhera-operator/ozhera-operator-common/src/main/java/run/mone/hera/operator/common/ErrorCode.java rename to ozhera-operator/ozhera-operator-common/src/main/java/org/apache/ozhera/operator/common/ErrorCode.java index 3b63696b6..08d247cf4 100644 --- a/ozhera-operator/ozhera-operator-common/src/main/java/run/mone/hera/operator/common/ErrorCode.java +++ b/ozhera-operator/ozhera-operator-common/src/main/java/org/apache/ozhera/operator/common/ErrorCode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.common; +package org.apache.ozhera.operator.common; public enum ErrorCode { success(0, "success"), diff --git a/ozhera-operator/ozhera-operator-common/src/main/java/run/mone/hera/operator/common/FileUtils.java b/ozhera-operator/ozhera-operator-common/src/main/java/org/apache/ozhera/operator/common/FileUtils.java similarity index 97% rename from ozhera-operator/ozhera-operator-common/src/main/java/run/mone/hera/operator/common/FileUtils.java rename to ozhera-operator/ozhera-operator-common/src/main/java/org/apache/ozhera/operator/common/FileUtils.java index 0abcb046e..efdc6747e 100644 --- a/ozhera-operator/ozhera-operator-common/src/main/java/run/mone/hera/operator/common/FileUtils.java +++ b/ozhera-operator/ozhera-operator-common/src/main/java/org/apache/ozhera/operator/common/FileUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.common; +package org.apache.ozhera.operator.common; import java.io.BufferedReader; import java.io.File; diff --git a/ozhera-operator/ozhera-operator-common/src/main/java/run/mone/hera/operator/common/HoConstant.java b/ozhera-operator/ozhera-operator-common/src/main/java/org/apache/ozhera/operator/common/HoConstant.java similarity index 98% rename from ozhera-operator/ozhera-operator-common/src/main/java/run/mone/hera/operator/common/HoConstant.java rename to ozhera-operator/ozhera-operator-common/src/main/java/org/apache/ozhera/operator/common/HoConstant.java index 1517d6591..98b64551e 100644 --- a/ozhera-operator/ozhera-operator-common/src/main/java/run/mone/hera/operator/common/HoConstant.java +++ b/ozhera-operator/ozhera-operator-common/src/main/java/org/apache/ozhera/operator/common/HoConstant.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.common; +package org.apache.ozhera.operator.common; /** * @author shanwb diff --git a/ozhera-operator/ozhera-operator-common/src/main/java/run/mone/hera/operator/common/HttpClientUtil.java b/ozhera-operator/ozhera-operator-common/src/main/java/org/apache/ozhera/operator/common/HttpClientUtil.java similarity index 99% rename from ozhera-operator/ozhera-operator-common/src/main/java/run/mone/hera/operator/common/HttpClientUtil.java rename to ozhera-operator/ozhera-operator-common/src/main/java/org/apache/ozhera/operator/common/HttpClientUtil.java index 65dba435f..05c8bac90 100755 --- a/ozhera-operator/ozhera-operator-common/src/main/java/run/mone/hera/operator/common/HttpClientUtil.java +++ b/ozhera-operator/ozhera-operator-common/src/main/java/org/apache/ozhera/operator/common/HttpClientUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.common; +package org.apache.ozhera.operator.common; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/ozhera-operator/ozhera-operator-common/src/main/java/run/mone/hera/operator/common/ResourceTypeEnum.java b/ozhera-operator/ozhera-operator-common/src/main/java/org/apache/ozhera/operator/common/ResourceTypeEnum.java similarity index 98% rename from ozhera-operator/ozhera-operator-common/src/main/java/run/mone/hera/operator/common/ResourceTypeEnum.java rename to ozhera-operator/ozhera-operator-common/src/main/java/org/apache/ozhera/operator/common/ResourceTypeEnum.java index 4bc0798a8..0da050c16 100644 --- a/ozhera-operator/ozhera-operator-common/src/main/java/run/mone/hera/operator/common/ResourceTypeEnum.java +++ b/ozhera-operator/ozhera-operator-common/src/main/java/org/apache/ozhera/operator/common/ResourceTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.common; +package org.apache.ozhera.operator.common; /** * @author shanwb diff --git a/ozhera-operator/ozhera-operator-server/pom.xml b/ozhera-operator/ozhera-operator-server/pom.xml index 8634bc488..888d9ad92 100644 --- a/ozhera-operator/ozhera-operator-server/pom.xml +++ b/ozhera-operator/ozhera-operator-server/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + org.apache.ozhera ozhera-operator - run.mone - 1.0-jdk21 + 2.0.0-SNAPSHOT 4.0.0 @@ -23,7 +23,7 @@ - run.mone + org.apache.ozhera ozhera-operator-service ${project.parent.version} @@ -58,7 +58,7 @@ false - run.mone.hera.operator.HeraBootstrap + org.apache.ozhera.operator.HeraBootstrap diff --git a/ozhera-operator/ozhera-operator-server/src/main/java/run/mone/hera/operator/HeraBootstrap.java b/ozhera-operator/ozhera-operator-server/src/main/java/org/apache/ozhera/operator/HeraBootstrap.java similarity index 97% rename from ozhera-operator/ozhera-operator-server/src/main/java/run/mone/hera/operator/HeraBootstrap.java rename to ozhera-operator/ozhera-operator-server/src/main/java/org/apache/ozhera/operator/HeraBootstrap.java index 7b4febbbe..6b70406c1 100644 --- a/ozhera-operator/ozhera-operator-server/src/main/java/run/mone/hera/operator/HeraBootstrap.java +++ b/ozhera-operator/ozhera-operator-server/src/main/java/org/apache/ozhera/operator/HeraBootstrap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator; +package org.apache.ozhera.operator; import com.xiaomi.youpin.docean.Ioc; import com.xiaomi.youpin.docean.Mvc; diff --git a/ozhera-operator/ozhera-operator-server/src/main/java/run/mone/hera/operator/controller/OzHeraOperatorController.java b/ozhera-operator/ozhera-operator-server/src/main/java/org/apache/ozhera/operator/controller/OzHeraOperatorController.java similarity index 93% rename from ozhera-operator/ozhera-operator-server/src/main/java/run/mone/hera/operator/controller/OzHeraOperatorController.java rename to ozhera-operator/ozhera-operator-server/src/main/java/org/apache/ozhera/operator/controller/OzHeraOperatorController.java index d597aa87a..2a22162a9 100644 --- a/ozhera-operator/ozhera-operator-server/src/main/java/run/mone/hera/operator/controller/OzHeraOperatorController.java +++ b/ozhera-operator/ozhera-operator-server/src/main/java/org/apache/ozhera/operator/controller/OzHeraOperatorController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.controller; +package org.apache.ozhera.operator.controller; import com.google.common.base.Preconditions; import com.google.gson.Gson; @@ -26,16 +26,16 @@ import io.fabric8.kubernetes.api.model.ObjectMeta; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; -import run.mone.hera.operator.bo.HeraBootstrap; -import run.mone.hera.operator.bo.HeraResource; -import run.mone.hera.operator.bo.HeraStatus; -import run.mone.hera.operator.common.HoConstant; -import run.mone.hera.operator.common.ResourceTypeEnum; -import run.mone.hera.operator.dto.DeployStateDTO; -import run.mone.hera.operator.dto.HeraOperatorDefineDTO; -import run.mone.hera.operator.dto.OperatorStateDTO; -import run.mone.hera.operator.dto.ServiceCheckResource; -import run.mone.hera.operator.service.HeraBootstrapInitService; +import org.apache.ozhera.operator.bo.HeraBootstrap; +import org.apache.ozhera.operator.bo.HeraResource; +import org.apache.ozhera.operator.bo.HeraStatus; +import org.apache.ozhera.operator.common.HoConstant; +import org.apache.ozhera.operator.common.ResourceTypeEnum; +import org.apache.ozhera.operator.dto.DeployStateDTO; +import org.apache.ozhera.operator.dto.HeraOperatorDefineDTO; +import org.apache.ozhera.operator.dto.OperatorStateDTO; +import org.apache.ozhera.operator.dto.ServiceCheckResource; +import org.apache.ozhera.operator.service.HeraBootstrapInitService; import java.util.ArrayList; import java.util.HashMap; diff --git a/ozhera-operator/ozhera-operator-server/src/test/java/run/mone/hera/operator/test/SidecarTest.java b/ozhera-operator/ozhera-operator-server/src/test/java/org/apache/ozhera/operator/test/SidecarTest.java similarity index 97% rename from ozhera-operator/ozhera-operator-server/src/test/java/run/mone/hera/operator/test/SidecarTest.java rename to ozhera-operator/ozhera-operator-server/src/test/java/org/apache/ozhera/operator/test/SidecarTest.java index 42ade1532..bf41ec3da 100644 --- a/ozhera-operator/ozhera-operator-server/src/test/java/run/mone/hera/operator/test/SidecarTest.java +++ b/ozhera-operator/ozhera-operator-server/src/test/java/org/apache/ozhera/operator/test/SidecarTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.test; +package org.apache.ozhera.operator.test; import io.fabric8.kubernetes.api.model.Container; import org.junit.Test; diff --git a/ozhera-operator/ozhera-operator-service/pom.xml b/ozhera-operator/ozhera-operator-service/pom.xml index db2d1bcfd..6e33c24fd 100644 --- a/ozhera-operator/ozhera-operator-service/pom.xml +++ b/ozhera-operator/ozhera-operator-service/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + org.apache.ozhera ozhera-operator - run.mone - 1.0-jdk21 + 2.0.0-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ - run.mone + org.apache.ozhera ozhera-operator-common ${project.parent.version} diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/HeraBootstrap.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/HeraBootstrap.java similarity index 96% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/HeraBootstrap.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/HeraBootstrap.java index 7ce397bb0..fc18d9a5d 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/HeraBootstrap.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/HeraBootstrap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.bo; +package org.apache.ozhera.operator.bo; import io.fabric8.kubernetes.api.model.Namespaced; import io.fabric8.kubernetes.client.CustomResource; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/HeraBootstrapList.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/HeraBootstrapList.java similarity index 95% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/HeraBootstrapList.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/HeraBootstrapList.java index e97340a1f..b76165bf4 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/HeraBootstrapList.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/HeraBootstrapList.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.bo; +package org.apache.ozhera.operator.bo; import io.fabric8.kubernetes.client.CustomResourceList; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/HeraObjectMeta.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/HeraObjectMeta.java similarity index 95% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/HeraObjectMeta.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/HeraObjectMeta.java index e570337ba..ff958dfc4 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/HeraObjectMeta.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/HeraObjectMeta.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.bo; +package org.apache.ozhera.operator.bo; import lombok.Data; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/HeraResource.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/HeraResource.java similarity index 91% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/HeraResource.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/HeraResource.java index 66b3441a0..4ef948b84 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/HeraResource.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/HeraResource.java @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.bo; +package org.apache.ozhera.operator.bo; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import run.mone.hera.operator.service.IResource; -import run.mone.hera.operator.common.FileUtils; +import org.apache.ozhera.operator.common.ResourceTypeEnum; +import org.apache.ozhera.operator.service.IResource; +import org.apache.ozhera.operator.common.FileUtils; import java.util.*; @@ -46,7 +47,7 @@ public class HeraResource implements IResource { private Boolean required = true; /** - * @see run.mone.hera.operator.common.ResourceTypeEnum#getTypeName() + * @see ResourceTypeEnum#getTypeName() */ private String resourceType; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/HeraSpec.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/HeraSpec.java similarity index 95% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/HeraSpec.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/HeraSpec.java index 1ea801e79..640ce687b 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/HeraSpec.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/HeraSpec.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.bo; +package org.apache.ozhera.operator.bo; import lombok.Data; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/HeraStatus.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/HeraStatus.java similarity index 96% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/HeraStatus.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/HeraStatus.java index 4d36a28ed..f5571db10 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/HeraStatus.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/HeraStatus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.bo; +package org.apache.ozhera.operator.bo; import lombok.Data; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/PropConf.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/PropConf.java similarity index 95% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/PropConf.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/PropConf.java index b49eb49c3..d31d2027e 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/PropConf.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/PropConf.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.bo; +package org.apache.ozhera.operator.bo; import lombok.Data; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/dashboard/GrafanaApiKeyReq.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/dashboard/GrafanaApiKeyReq.java similarity index 94% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/dashboard/GrafanaApiKeyReq.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/dashboard/GrafanaApiKeyReq.java index 379e643ba..12fd90a6e 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/dashboard/GrafanaApiKeyReq.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/dashboard/GrafanaApiKeyReq.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.bo.dashboard; +package org.apache.ozhera.operator.bo.dashboard; import lombok.Data; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/dashboard/GrafanaApiKeyRes.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/dashboard/GrafanaApiKeyRes.java similarity index 94% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/dashboard/GrafanaApiKeyRes.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/dashboard/GrafanaApiKeyRes.java index 896640b94..685a85e87 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/bo/dashboard/GrafanaApiKeyRes.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/bo/dashboard/GrafanaApiKeyRes.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.bo.dashboard; +package org.apache.ozhera.operator.bo.dashboard; import lombok.Data; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/common/K8sUtilBean.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/common/K8sUtilBean.java similarity index 97% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/common/K8sUtilBean.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/common/K8sUtilBean.java index 4c26a9c1a..83c6d8c96 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/common/K8sUtilBean.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/common/K8sUtilBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.common; +package org.apache.ozhera.operator.common; import com.google.gson.Gson; import com.xiaomi.youpin.docean.anno.Component; @@ -26,9 +26,9 @@ import io.fabric8.kubernetes.client.dsl.ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable; import io.fabric8.kubernetes.client.dsl.Resource; import lombok.extern.slf4j.Slf4j; -import run.mone.hera.operator.bo.HeraBootstrap; -import run.mone.hera.operator.bo.HeraBootstrapList; -import run.mone.hera.operator.bo.HeraResource; +import org.apache.ozhera.operator.bo.HeraBootstrap; +import org.apache.ozhera.operator.bo.HeraBootstrapList; +import org.apache.ozhera.operator.bo.HeraResource; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/dto/DashboardDTO.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/dto/DashboardDTO.java similarity index 95% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/dto/DashboardDTO.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/dto/DashboardDTO.java index fd73e3052..d575a29bb 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/dto/DashboardDTO.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/dto/DashboardDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.dto; +package org.apache.ozhera.operator.dto; import lombok.Data; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/dto/DeployStateDTO.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/dto/DeployStateDTO.java similarity index 95% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/dto/DeployStateDTO.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/dto/DeployStateDTO.java index 43b2f1940..5a7c324c4 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/dto/DeployStateDTO.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/dto/DeployStateDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.dto; +package org.apache.ozhera.operator.dto; import lombok.Data; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/dto/HeraOperatorDefineDTO.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/dto/HeraOperatorDefineDTO.java similarity index 86% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/dto/HeraOperatorDefineDTO.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/dto/HeraOperatorDefineDTO.java index d11580007..5b8840d5c 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/dto/HeraOperatorDefineDTO.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/dto/HeraOperatorDefineDTO.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.dto; +package org.apache.ozhera.operator.dto; import lombok.Data; -import run.mone.hera.operator.bo.HeraObjectMeta; -import run.mone.hera.operator.bo.HeraSpec; +import org.apache.ozhera.operator.bo.HeraObjectMeta; +import org.apache.ozhera.operator.bo.HeraSpec; import java.io.Serializable; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/dto/OperatorStateDTO.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/dto/OperatorStateDTO.java similarity index 95% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/dto/OperatorStateDTO.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/dto/OperatorStateDTO.java index e7179a7fa..5862bda5f 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/dto/OperatorStateDTO.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/dto/OperatorStateDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.dto; +package org.apache.ozhera.operator.dto; import lombok.Data; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/dto/PodStateDTO.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/dto/PodStateDTO.java similarity index 96% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/dto/PodStateDTO.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/dto/PodStateDTO.java index 9148cd21d..b8629ed40 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/dto/PodStateDTO.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/dto/PodStateDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.dto; +package org.apache.ozhera.operator.dto; import io.fabric8.kubernetes.api.model.ContainerState; import lombok.Data; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/dto/ServiceCheckResource.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/dto/ServiceCheckResource.java similarity index 91% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/dto/ServiceCheckResource.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/dto/ServiceCheckResource.java index bbbc7510b..97dcc1459 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/dto/ServiceCheckResource.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/dto/ServiceCheckResource.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.dto; +package org.apache.ozhera.operator.dto; import lombok.Data; -import run.mone.hera.operator.bo.HeraResource; +import org.apache.ozhera.operator.bo.HeraResource; import java.io.Serializable; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/handler/HeraResourceEventHandler.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/handler/HeraResourceEventHandler.java similarity index 98% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/handler/HeraResourceEventHandler.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/handler/HeraResourceEventHandler.java index f5b44ced1..17017ea39 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/handler/HeraResourceEventHandler.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/handler/HeraResourceEventHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.handler; +package org.apache.ozhera.operator.handler; import com.google.common.base.Preconditions; import com.google.gson.Gson; @@ -33,12 +33,12 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.ibatis.jdbc.ScriptRunner; -import run.mone.hera.operator.bo.*; -import run.mone.hera.operator.common.HoConstant; -import run.mone.hera.operator.common.K8sUtilBean; -import run.mone.hera.operator.common.ResourceTypeEnum; -import run.mone.hera.operator.service.ESService; -import run.mone.hera.operator.service.RocketMQSerivce; +import org.apache.ozhera.operator.bo.*; +import org.apache.ozhera.operator.common.HoConstant; +import org.apache.ozhera.operator.common.K8sUtilBean; +import org.apache.ozhera.operator.common.ResourceTypeEnum; +import org.apache.ozhera.operator.service.ESService; +import org.apache.ozhera.operator.service.RocketMQSerivce; import org.mariadb.jdbc.Driver; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/service/ESService.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/service/ESService.java similarity index 92% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/service/ESService.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/service/ESService.java index 60bda2155..62a23ad59 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/service/ESService.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/service/ESService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.service; +package org.apache.ozhera.operator.service; import com.xiaomi.youpin.docean.anno.Service; import org.apache.commons.lang3.StringUtils; -import run.mone.hera.operator.common.ESIndexConst; -import run.mone.hera.operator.common.HttpClientUtil; +import org.apache.ozhera.operator.common.ESIndexConst; +import org.apache.ozhera.operator.common.HttpClientUtil; import java.nio.charset.StandardCharsets; import java.util.Base64; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/service/HeraBootstrapInitService.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/service/HeraBootstrapInitService.java similarity index 98% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/service/HeraBootstrapInitService.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/service/HeraBootstrapInitService.java index 3088a939f..2f864b6cd 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/service/HeraBootstrapInitService.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/service/HeraBootstrapInitService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.service; +package org.apache.ozhera.operator.service; import com.google.common.base.Preconditions; import com.google.gson.Gson; @@ -39,19 +39,19 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StringSubstitutor; import org.apache.ibatis.jdbc.ScriptRunner; -import run.mone.hera.operator.bo.HeraBootstrap; -import run.mone.hera.operator.bo.HeraObjectMeta; -import run.mone.hera.operator.bo.HeraResource; -import run.mone.hera.operator.bo.HeraSpec; -import run.mone.hera.operator.bo.HeraStatus; -import run.mone.hera.operator.bo.PropConf; -import run.mone.hera.operator.common.FileUtils; -import run.mone.hera.operator.common.HoConstant; -import run.mone.hera.operator.common.K8sUtilBean; -import run.mone.hera.operator.common.ResourceTypeEnum; -import run.mone.hera.operator.dto.DeployStateDTO; -import run.mone.hera.operator.dto.HeraOperatorDefineDTO; -import run.mone.hera.operator.dto.PodStateDTO; +import org.apache.ozhera.operator.bo.HeraBootstrap; +import org.apache.ozhera.operator.bo.HeraObjectMeta; +import org.apache.ozhera.operator.bo.HeraResource; +import org.apache.ozhera.operator.bo.HeraSpec; +import org.apache.ozhera.operator.bo.HeraStatus; +import org.apache.ozhera.operator.bo.PropConf; +import org.apache.ozhera.operator.common.FileUtils; +import org.apache.ozhera.operator.common.HoConstant; +import org.apache.ozhera.operator.common.K8sUtilBean; +import org.apache.ozhera.operator.common.ResourceTypeEnum; +import org.apache.ozhera.operator.dto.DeployStateDTO; +import org.apache.ozhera.operator.dto.HeraOperatorDefineDTO; +import org.apache.ozhera.operator.dto.PodStateDTO; import java.io.BufferedReader; import java.io.File; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/service/IResource.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/service/IResource.java similarity index 94% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/service/IResource.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/service/IResource.java index 338040e41..174bb1179 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/service/IResource.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/service/IResource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.service; +package org.apache.ozhera.operator.service; /** * @author shanwb diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/service/NacosService.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/service/NacosService.java similarity index 94% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/service/NacosService.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/service/NacosService.java index 81018e00a..04e995d13 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/service/NacosService.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/service/NacosService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.service; +package org.apache.ozhera.operator.service; import com.alibaba.nacos.api.config.ConfigFactory; import com.alibaba.nacos.api.config.ConfigService; import com.xiaomi.youpin.docean.anno.Service; import lombok.extern.slf4j.Slf4j; -import run.mone.hera.operator.common.FileUtils; +import org.apache.ozhera.operator.common.FileUtils; import java.io.File; diff --git a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/service/RocketMQSerivce.java b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/service/RocketMQSerivce.java similarity index 98% rename from ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/service/RocketMQSerivce.java rename to ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/service/RocketMQSerivce.java index bdb9123df..1fae38153 100644 --- a/ozhera-operator/ozhera-operator-service/src/main/java/run/mone/hera/operator/service/RocketMQSerivce.java +++ b/ozhera-operator/ozhera-operator-service/src/main/java/org/apache/ozhera/operator/service/RocketMQSerivce.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.service; +package org.apache.ozhera.operator.service; import com.xiaomi.youpin.docean.anno.Service; import lombok.extern.slf4j.Slf4j; diff --git a/ozhera-operator/ozhera-operator-service/src/test/java/run/mone/hera/operator/test/PlaceholderTest.java b/ozhera-operator/ozhera-operator-service/src/test/java/org/apache/ozhera/operator/test/PlaceholderTest.java similarity index 97% rename from ozhera-operator/ozhera-operator-service/src/test/java/run/mone/hera/operator/test/PlaceholderTest.java rename to ozhera-operator/ozhera-operator-service/src/test/java/org/apache/ozhera/operator/test/PlaceholderTest.java index 5096725dd..26eabd99b 100644 --- a/ozhera-operator/ozhera-operator-service/src/test/java/run/mone/hera/operator/test/PlaceholderTest.java +++ b/ozhera-operator/ozhera-operator-service/src/test/java/org/apache/ozhera/operator/test/PlaceholderTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.operator.test; +package org.apache.ozhera.operator.test; import org.apache.commons.text.StringSubstitutor; import org.junit.Test; diff --git a/ozhera-operator/pom.xml b/ozhera-operator/pom.xml index 2380a630c..1c724a322 100644 --- a/ozhera-operator/pom.xml +++ b/ozhera-operator/pom.xml @@ -5,15 +5,15 @@ 4.0.0 - run.mone - ozhera - 1.4.0-jdk21-SNAPSHOT + org.apache.ozhera + ozhera-parent + 2.0.0-SNAPSHOT - run.mone + org.apache.ozhera ozhera-operator pom - 1.0-jdk21 + 2.0.0-SNAPSHOT ozhera-operator-common ozhera-operator-service diff --git a/ozhera-tspandata/pom.xml b/ozhera-tspandata/pom.xml index 50a1d6486..59b8072cb 100644 --- a/ozhera-tspandata/pom.xml +++ b/ozhera-tspandata/pom.xml @@ -4,16 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - run.mone - ozhera - 1.4.0-jdk21-SNAPSHOT + org.apache.ozhera + ozhera-parent + 2.0.0-SNAPSHOT 4.0.0 - run.mone ozhera-tspandata - 2.0 + 2.0.0-SNAPSHOT diff --git a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TAttributeKey.java b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TAttributeKey.java similarity index 99% rename from ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TAttributeKey.java rename to ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TAttributeKey.java index 6d7dfff8d..664e02150 100644 --- a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TAttributeKey.java +++ b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TAttributeKey.java @@ -18,7 +18,7 @@ // (powered by FernFlower decompiler) // -package com.xiaomi.hera.tspandata; +package org.apache.ozhera.tspandata; import java.io.Serializable; import java.util.Collections; diff --git a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TAttributeType.java b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TAttributeType.java similarity index 97% rename from ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TAttributeType.java rename to ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TAttributeType.java index 6189df242..24d3b8cb6 100644 --- a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TAttributeType.java +++ b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TAttributeType.java @@ -18,7 +18,7 @@ // (powered by FernFlower decompiler) // -package com.xiaomi.hera.tspandata; +package org.apache.ozhera.tspandata; import org.apache.thrift.TEnum; diff --git a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TAttributes.java b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TAttributes.java similarity index 99% rename from ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TAttributes.java rename to ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TAttributes.java index 59a6e12a2..e07589aca 100644 --- a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TAttributes.java +++ b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TAttributes.java @@ -18,7 +18,7 @@ // (powered by FernFlower decompiler) // -package com.xiaomi.hera.tspandata; +package org.apache.ozhera.tspandata; import java.io.Serializable; import java.util.ArrayList; diff --git a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TEvent.java b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TEvent.java similarity index 99% rename from ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TEvent.java rename to ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TEvent.java index 833476e80..b6e5cff1a 100644 --- a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TEvent.java +++ b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TEvent.java @@ -18,7 +18,7 @@ // (powered by FernFlower decompiler) // -package com.xiaomi.hera.tspandata; +package org.apache.ozhera.tspandata; import org.apache.thrift.TBase; import org.apache.thrift.TBaseHelper; diff --git a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TExtra.java b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TExtra.java similarity index 99% rename from ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TExtra.java rename to ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TExtra.java index 2fcb1856f..656cedfc1 100644 --- a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TExtra.java +++ b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TExtra.java @@ -18,7 +18,7 @@ // (powered by FernFlower decompiler) // -package com.xiaomi.hera.tspandata; +package org.apache.ozhera.tspandata; import java.io.Serializable; import java.util.Collections; diff --git a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TInstrumentationLibraryInfo.java b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TInstrumentationLibraryInfo.java similarity index 99% rename from ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TInstrumentationLibraryInfo.java rename to ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TInstrumentationLibraryInfo.java index 4c4811d56..21d2d9df9 100644 --- a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TInstrumentationLibraryInfo.java +++ b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TInstrumentationLibraryInfo.java @@ -18,7 +18,7 @@ // (powered by FernFlower decompiler) // -package com.xiaomi.hera.tspandata; +package org.apache.ozhera.tspandata; import java.io.Serializable; import java.util.Collections; diff --git a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TKind.java b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TKind.java similarity index 97% rename from ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TKind.java rename to ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TKind.java index a61542e5f..e76a9d95d 100644 --- a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TKind.java +++ b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TKind.java @@ -18,7 +18,7 @@ // (powered by FernFlower decompiler) // -package com.xiaomi.hera.tspandata; +package org.apache.ozhera.tspandata; import org.apache.thrift.TEnum; diff --git a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TLink.java b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TLink.java similarity index 99% rename from ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TLink.java rename to ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TLink.java index 7118642b3..b967c7ddb 100644 --- a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TLink.java +++ b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TLink.java @@ -18,7 +18,7 @@ // (powered by FernFlower decompiler) // -package com.xiaomi.hera.tspandata; +package org.apache.ozhera.tspandata; import java.io.Serializable; import java.util.BitSet; diff --git a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TResource.java b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TResource.java similarity index 99% rename from ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TResource.java rename to ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TResource.java index 12f9b8390..94bc20ed4 100644 --- a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TResource.java +++ b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TResource.java @@ -18,7 +18,7 @@ // (powered by FernFlower decompiler) // -package com.xiaomi.hera.tspandata; +package org.apache.ozhera.tspandata; import java.io.Serializable; import java.util.Collections; diff --git a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TSpanContext.java b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TSpanContext.java similarity index 99% rename from ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TSpanContext.java rename to ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TSpanContext.java index 548f9ca3e..3cc7abe28 100644 --- a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TSpanContext.java +++ b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TSpanContext.java @@ -18,7 +18,7 @@ // (powered by FernFlower decompiler) // -package com.xiaomi.hera.tspandata; +package org.apache.ozhera.tspandata; import java.io.Serializable; import java.util.BitSet; diff --git a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TSpanData.java b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TSpanData.java similarity index 99% rename from ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TSpanData.java rename to ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TSpanData.java index 4d74e9692..5bf6a1782 100644 --- a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TSpanData.java +++ b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TSpanData.java @@ -18,7 +18,7 @@ // (powered by FernFlower decompiler) // -package com.xiaomi.hera.tspandata; +package org.apache.ozhera.tspandata; import java.io.Serializable; import java.util.ArrayList; diff --git a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TStatus.java b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TStatus.java similarity index 97% rename from ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TStatus.java rename to ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TStatus.java index f3c6f6c07..6a39757de 100644 --- a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TStatus.java +++ b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TStatus.java @@ -18,7 +18,7 @@ // (powered by FernFlower decompiler) // -package com.xiaomi.hera.tspandata; +package org.apache.ozhera.tspandata; import org.apache.thrift.TEnum; diff --git a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TTraceState.java b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TTraceState.java similarity index 99% rename from ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TTraceState.java rename to ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TTraceState.java index a83a70ec5..f2c85094d 100644 --- a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TTraceState.java +++ b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TTraceState.java @@ -18,7 +18,7 @@ // (powered by FernFlower decompiler) // -package com.xiaomi.hera.tspandata; +package org.apache.ozhera.tspandata; import java.io.Serializable; import java.util.Collections; diff --git a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TValue.java b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TValue.java similarity index 99% rename from ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TValue.java rename to ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TValue.java index bc8957f56..f923761ec 100644 --- a/ozhera-tspandata/src/main/java/com/xiaomi/hera/tspandata/TValue.java +++ b/ozhera-tspandata/src/main/java/org/apache/ozhera/tspandata/TValue.java @@ -18,7 +18,7 @@ // (powered by FernFlower decompiler) // -package com.xiaomi.hera.tspandata; +package org.apache.ozhera.tspandata; import java.io.Serializable; import java.util.ArrayList; diff --git a/ozhera-webhook/ozhera-webhook-server/pom.xml b/ozhera-webhook/ozhera-webhook-server/pom.xml index 66489e97c..1fe3222c1 100644 --- a/ozhera-webhook/ozhera-webhook-server/pom.xml +++ b/ozhera-webhook/ozhera-webhook-server/pom.xml @@ -100,7 +100,7 @@ spring-boot-maven-plugin 2.7.15 - run.mone.hera.webhook.Bootstrap + org.apache.ozhera.webhook.Bootstrap diff --git a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/Bootstrap.java b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/Bootstrap.java similarity index 98% rename from ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/Bootstrap.java rename to ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/Bootstrap.java index 0dfbde12b..6d91f1120 100644 --- a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/Bootstrap.java +++ b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/Bootstrap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.webhook; +package org.apache.ozhera.webhook; import com.xiaomi.youpin.docean.Ioc; import io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest; @@ -24,8 +24,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.context.annotation.ComponentScan; -import run.mone.hera.webhook.common.FileUtils; -import run.mone.hera.webhook.common.K8sUtilBean; +import org.apache.ozhera.webhook.common.FileUtils; +import org.apache.ozhera.webhook.common.K8sUtilBean; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/common/FileUtils.java b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/common/FileUtils.java similarity index 97% rename from ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/common/FileUtils.java rename to ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/common/FileUtils.java index 83f777098..e20adc34c 100644 --- a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/common/FileUtils.java +++ b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/common/FileUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.webhook.common; +package org.apache.ozhera.webhook.common; import java.io.BufferedReader; import java.io.IOException; diff --git a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/common/HttpClientUtil.java b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/common/HttpClientUtil.java similarity index 99% rename from ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/common/HttpClientUtil.java rename to ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/common/HttpClientUtil.java index d0a21756f..c7b7275b0 100644 --- a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/common/HttpClientUtil.java +++ b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/common/HttpClientUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.webhook.common; +package org.apache.ozhera.webhook.common; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/common/K8sUtilBean.java b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/common/K8sUtilBean.java similarity index 99% rename from ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/common/K8sUtilBean.java rename to ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/common/K8sUtilBean.java index 6b122b3dc..23a0ba8d7 100644 --- a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/common/K8sUtilBean.java +++ b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/common/K8sUtilBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.webhook.common; +package org.apache.ozhera.webhook.common; import com.google.gson.Gson; import com.xiaomi.youpin.docean.anno.Component; diff --git a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/config/NacosConfiguration.java b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/config/NacosConfiguration.java similarity index 97% rename from ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/config/NacosConfiguration.java rename to ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/config/NacosConfiguration.java index 169501f74..d6dfbf8a5 100644 --- a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/config/NacosConfiguration.java +++ b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/config/NacosConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.webhook.config; +package org.apache.ozhera.webhook.config; import com.alibaba.nacos.api.annotation.NacosProperties; import com.alibaba.nacos.api.config.annotation.NacosValue; diff --git a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/controller/HealthController.java b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/controller/HealthController.java similarity index 95% rename from ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/controller/HealthController.java rename to ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/controller/HealthController.java index 3eb12bcac..c3cd2e221 100644 --- a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/controller/HealthController.java +++ b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/controller/HealthController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.webhook.controller; +package org.apache.ozhera.webhook.controller; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/controller/HeraWebhookController.java b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/controller/HeraWebhookController.java similarity index 95% rename from ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/controller/HeraWebhookController.java rename to ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/controller/HeraWebhookController.java index 63430cfe5..6a8e481f5 100644 --- a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/controller/HeraWebhookController.java +++ b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/controller/HeraWebhookController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.webhook.controller; +package org.apache.ozhera.webhook.controller; import com.alibaba.fastjson2.JSONObject; import com.alibaba.nacos.api.config.annotation.NacosValue; @@ -26,8 +26,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import run.mone.hera.webhook.domain.JsonPatch; -import run.mone.hera.webhook.service.HeraWebhookService; +import org.apache.ozhera.webhook.domain.JsonPatch; +import org.apache.ozhera.webhook.service.HeraWebhookService; import java.nio.charset.StandardCharsets; import java.util.Base64; diff --git a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/JsonPatch.java b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/JsonPatch.java similarity index 96% rename from ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/JsonPatch.java rename to ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/JsonPatch.java index 22c0b7d12..b988ae238 100644 --- a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/JsonPatch.java +++ b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/JsonPatch.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.webhook.domain; +package org.apache.ozhera.webhook.domain; /** * @Description diff --git a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/k8s/Container.java b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/k8s/Container.java similarity index 95% rename from ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/k8s/Container.java rename to ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/k8s/Container.java index a8c45c4fb..f459cddda 100644 --- a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/k8s/Container.java +++ b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/k8s/Container.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.webhook.domain.k8s; +package org.apache.ozhera.webhook.domain.k8s; import io.fabric8.kubernetes.api.model.EnvVar; import lombok.Data; diff --git a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/k8s/Limits.java b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/k8s/Limits.java similarity index 94% rename from ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/k8s/Limits.java rename to ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/k8s/Limits.java index 7790fa333..cbc1687ff 100644 --- a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/k8s/Limits.java +++ b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/k8s/Limits.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.webhook.domain.k8s; +package org.apache.ozhera.webhook.domain.k8s; import lombok.Data; import lombok.ToString; diff --git a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/k8s/Requests.java b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/k8s/Requests.java similarity index 94% rename from ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/k8s/Requests.java rename to ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/k8s/Requests.java index 05f24c740..531df7c47 100644 --- a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/k8s/Requests.java +++ b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/k8s/Requests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.webhook.domain.k8s; +package org.apache.ozhera.webhook.domain.k8s; import lombok.Data; import lombok.ToString; diff --git a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/k8s/Resource.java b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/k8s/Resource.java similarity index 94% rename from ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/k8s/Resource.java rename to ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/k8s/Resource.java index c4dd62d08..d4c005ec1 100644 --- a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/k8s/Resource.java +++ b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/k8s/Resource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.webhook.domain.k8s; +package org.apache.ozhera.webhook.domain.k8s; import lombok.Data; import lombok.ToString; diff --git a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/k8s/VolumeMount.java b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/k8s/VolumeMount.java similarity index 95% rename from ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/k8s/VolumeMount.java rename to ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/k8s/VolumeMount.java index e198ccf6f..2fa1511c1 100644 --- a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/k8s/VolumeMount.java +++ b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/k8s/VolumeMount.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.webhook.domain.k8s; +package org.apache.ozhera.webhook.domain.k8s; import lombok.Data; import lombok.ToString; diff --git a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/tpc/TpcAppInfo.java b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/tpc/TpcAppInfo.java similarity index 95% rename from ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/tpc/TpcAppInfo.java rename to ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/tpc/TpcAppInfo.java index c22df30ed..95cf12240 100644 --- a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/tpc/TpcAppInfo.java +++ b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/tpc/TpcAppInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.webhook.domain.tpc; +package org.apache.ozhera.webhook.domain.tpc; import lombok.Data; import lombok.ToString; diff --git a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/tpc/TpcAppRequest.java b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/tpc/TpcAppRequest.java similarity index 95% rename from ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/tpc/TpcAppRequest.java rename to ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/tpc/TpcAppRequest.java index 2eb8cd15a..c6e128708 100644 --- a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/tpc/TpcAppRequest.java +++ b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/tpc/TpcAppRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.webhook.domain.tpc; +package org.apache.ozhera.webhook.domain.tpc; import lombok.Data; import lombok.ToString; diff --git a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/tpc/TpcEnvRequest.java b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/tpc/TpcEnvRequest.java similarity index 94% rename from ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/tpc/TpcEnvRequest.java rename to ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/tpc/TpcEnvRequest.java index 2af7daeda..bf9205c43 100644 --- a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/domain/tpc/TpcEnvRequest.java +++ b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/domain/tpc/TpcEnvRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.webhook.domain.tpc; +package org.apache.ozhera.webhook.domain.tpc; import lombok.Data; import lombok.ToString; diff --git a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/service/HeraWebhookService.java b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/service/HeraWebhookService.java similarity index 91% rename from ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/service/HeraWebhookService.java rename to ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/service/HeraWebhookService.java index d24713a59..6a4d4156b 100644 --- a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/service/HeraWebhookService.java +++ b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/service/HeraWebhookService.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package run.mone.hera.webhook.service; +package org.apache.ozhera.webhook.service; import com.alibaba.fastjson2.JSONObject; -import run.mone.hera.webhook.domain.JsonPatch; +import org.apache.ozhera.webhook.domain.JsonPatch; import javax.annotation.PostConstruct; import java.util.List; diff --git a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/service/impl/HeraWebhookServiceImpl.java b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/service/impl/HeraWebhookServiceImpl.java similarity index 97% rename from ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/service/impl/HeraWebhookServiceImpl.java rename to ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/service/impl/HeraWebhookServiceImpl.java index 1fcde303e..a363f3fe7 100644 --- a/ozhera-webhook/ozhera-webhook-server/src/main/java/run/mone/hera/webhook/service/impl/HeraWebhookServiceImpl.java +++ b/ozhera-webhook/ozhera-webhook-server/src/main/java/org/apache/ozhera/webhook/service/impl/HeraWebhookServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package run.mone.hera.webhook.service.impl; +package org.apache.ozhera.webhook.service.impl; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; @@ -28,17 +28,17 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import run.mone.hera.webhook.common.HttpClientUtil; -import run.mone.hera.webhook.domain.JsonPatch; -import run.mone.hera.webhook.domain.k8s.Container; -import run.mone.hera.webhook.domain.k8s.Limits; -import run.mone.hera.webhook.domain.k8s.Requests; -import run.mone.hera.webhook.domain.k8s.Resource; -import run.mone.hera.webhook.domain.k8s.VolumeMount; -import run.mone.hera.webhook.domain.tpc.TpcAppInfo; -import run.mone.hera.webhook.domain.tpc.TpcAppRequest; -import run.mone.hera.webhook.domain.tpc.TpcEnvRequest; -import run.mone.hera.webhook.service.HeraWebhookService; +import org.apache.ozhera.webhook.common.HttpClientUtil; +import org.apache.ozhera.webhook.domain.JsonPatch; +import org.apache.ozhera.webhook.domain.k8s.Container; +import org.apache.ozhera.webhook.domain.k8s.Limits; +import org.apache.ozhera.webhook.domain.k8s.Requests; +import org.apache.ozhera.webhook.domain.k8s.Resource; +import org.apache.ozhera.webhook.domain.k8s.VolumeMount; +import org.apache.ozhera.webhook.domain.tpc.TpcAppInfo; +import org.apache.ozhera.webhook.domain.tpc.TpcAppRequest; +import org.apache.ozhera.webhook.domain.tpc.TpcEnvRequest; +import org.apache.ozhera.webhook.service.HeraWebhookService; import javax.annotation.PostConstruct; import java.time.Duration; diff --git a/ozhera-webhook/pom.xml b/ozhera-webhook/pom.xml index db485c69d..4f19f7a48 100644 --- a/ozhera-webhook/pom.xml +++ b/ozhera-webhook/pom.xml @@ -4,16 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - run.mone - ozhera - 1.4.0-jdk21-SNAPSHOT + org.apache.ozhera + ozhera-parent + 2.0.0-SNAPSHOT 4.0.0 - run.mone ozhera-webhook pom - 1.0-jdk21 + 2.0.0-SNAPSHOT ozhera-webhook-server diff --git a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/DataSourceService.java b/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/DataSourceService.java index 859759e3d..0a68763e9 100644 --- a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/DataSourceService.java +++ b/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/DataSourceService.java @@ -22,7 +22,7 @@ import com.xiaomi.hera.trace.etl.domain.tracequery.TraceListQueryVo; import com.xiaomi.hera.trace.etl.domain.tracequery.TraceOperationsVo; import com.xiaomi.hera.trace.etl.domain.tracequery.TraceQueryResult; -import com.xiaomi.hera.tspandata.TSpanData; +import org.apache.ozhera.tspandata.TSpanData; import java.util.List; diff --git a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/IMetricsParseService.java b/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/IMetricsParseService.java index bd34437e3..5d3d834a7 100644 --- a/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/IMetricsParseService.java +++ b/trace-etl/trace-etl-api/src/main/java/com/xiaomi/hera/trace/etl/api/service/IMetricsParseService.java @@ -15,7 +15,7 @@ */ package com.xiaomi.hera.trace.etl.api.service; -import com.xiaomi.hera.tspandata.TSpanData; +import org.apache.ozhera.tspandata.TSpanData; /** * @author goodjava@qq.com diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/ConsumerService.java b/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/ConsumerService.java index d220b443d..2394e2e2a 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/ConsumerService.java +++ b/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/ConsumerService.java @@ -26,10 +26,10 @@ import com.xiaomi.hera.trace.etl.util.ExecutorUtil; import com.xiaomi.hera.trace.etl.util.MessageUtil; import com.xiaomi.hera.trace.etl.util.ThriftUtil; -import com.xiaomi.hera.tspandata.TAttributeKey; -import com.xiaomi.hera.tspandata.TAttributes; -import com.xiaomi.hera.tspandata.TSpanData; -import com.xiaomi.hera.tspandata.TValue; +import org.apache.ozhera.tspandata.TAttributeKey; +import org.apache.ozhera.tspandata.TAttributes; +import org.apache.ozhera.tspandata.TSpanData; +import org.apache.ozhera.tspandata.TValue; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.mutable.MutableObject; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/FilterService.java b/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/FilterService.java index 93e910ca1..b395da09b 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/FilterService.java +++ b/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/FilterService.java @@ -23,7 +23,7 @@ import com.xiaomi.hera.trace.etl.es.domain.FilterResult; import com.xiaomi.hera.trace.etl.es.util.bloomfilter.TraceIdRedisBloomUtil; import com.xiaomi.hera.trace.etl.util.MessageUtil; -import com.xiaomi.hera.tspandata.TSpanData; +import org.apache.ozhera.tspandata.TSpanData; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/KafkaTraceSpanConsumer.java b/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/KafkaTraceSpanConsumer.java index d727ba64d..9df146347 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/KafkaTraceSpanConsumer.java +++ b/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/KafkaTraceSpanConsumer.java @@ -20,7 +20,7 @@ import com.xiaomi.hera.trace.etl.bo.MqConfig; import com.xiaomi.hera.trace.etl.es.util.pool.ConsumerPool; import com.xiaomi.hera.trace.etl.util.ThriftUtil; -import com.xiaomi.hera.tspandata.TSpanData; +import org.apache.ozhera.tspandata.TSpanData; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/RocketMQTraceSpanConsumer.java b/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/RocketMQTraceSpanConsumer.java index 7521c0c3a..161274f26 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/RocketMQTraceSpanConsumer.java +++ b/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/consumer/RocketMQTraceSpanConsumer.java @@ -20,7 +20,7 @@ import com.xiaomi.hera.trace.etl.bo.MqConfig; import com.xiaomi.hera.trace.etl.es.util.pool.ConsumerPool; import com.xiaomi.hera.trace.etl.util.ThriftUtil; -import com.xiaomi.hera.tspandata.TSpanData; +import org.apache.ozhera.tspandata.TSpanData; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.common.message.MessageExt; diff --git a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/domain/FutureRequest.java b/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/domain/FutureRequest.java index fa587bcdc..1a92e2ea0 100644 --- a/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/domain/FutureRequest.java +++ b/trace-etl/trace-etl-es/src/main/java/com/xiaomi/hera/trace/etl/es/domain/FutureRequest.java @@ -16,7 +16,7 @@ package com.xiaomi.hera.trace.etl.es.domain; -import com.xiaomi.hera.tspandata.TSpanData; +import org.apache.ozhera.tspandata.TSpanData; /** * @Description diff --git a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/DorisDataSourceService.java b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/DorisDataSourceService.java index 73377af3a..795d81d73 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/DorisDataSourceService.java +++ b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/DorisDataSourceService.java @@ -23,7 +23,7 @@ import com.xiaomi.hera.trace.etl.domain.tracequery.TraceListQueryVo; import com.xiaomi.hera.trace.etl.domain.tracequery.TraceOperationsVo; import com.xiaomi.hera.trace.etl.domain.tracequery.TraceQueryResult; -import com.xiaomi.hera.tspandata.TSpanData; +import org.apache.ozhera.tspandata.TSpanData; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; diff --git a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/WriteDorisService.java b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/WriteDorisService.java index e81c91c8f..696a0f517 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/WriteDorisService.java +++ b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/src/main/java/run/mone/trace/etl/extension/doris/WriteDorisService.java @@ -27,14 +27,14 @@ import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerRefType; import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerReferences; import com.xiaomi.hera.trace.etl.util.MessageUtil; -import com.xiaomi.hera.tspandata.TAttributeKey; -import com.xiaomi.hera.tspandata.TAttributes; -import com.xiaomi.hera.tspandata.TEvent; -import com.xiaomi.hera.tspandata.TLink; -import com.xiaomi.hera.tspandata.TResource; -import com.xiaomi.hera.tspandata.TSpanContext; -import com.xiaomi.hera.tspandata.TSpanData; -import com.xiaomi.hera.tspandata.TValue; +import org.apache.ozhera.tspandata.TAttributeKey; +import org.apache.ozhera.tspandata.TAttributes; +import org.apache.ozhera.tspandata.TEvent; +import org.apache.ozhera.tspandata.TLink; +import org.apache.ozhera.tspandata.TResource; +import org.apache.ozhera.tspandata.TSpanContext; +import org.apache.ozhera.tspandata.TSpanData; +import org.apache.ozhera.tspandata.TValue; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/EsDataSourceService.java b/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/EsDataSourceService.java index 3f0157555..6c9876e79 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/EsDataSourceService.java +++ b/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/EsDataSourceService.java @@ -23,7 +23,7 @@ import com.xiaomi.hera.trace.etl.domain.tracequery.TraceListQueryVo; import com.xiaomi.hera.trace.etl.domain.tracequery.TraceOperationsVo; import com.xiaomi.hera.trace.etl.domain.tracequery.TraceQueryResult; -import com.xiaomi.hera.tspandata.TSpanData; +import org.apache.ozhera.tspandata.TSpanData; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; diff --git a/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/WriteEsService.java b/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/WriteEsService.java index 49c90071d..aff9084eb 100644 --- a/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/WriteEsService.java +++ b/trace-etl/trace-etl-extensions/trace-etl-es-extension/src/main/java/run/mone/trace/etl/extension/es/WriteEsService.java @@ -30,14 +30,14 @@ import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerReferences; import com.xiaomi.hera.trace.etl.util.ExecutorUtil; import com.xiaomi.hera.trace.etl.util.MessageUtil; -import com.xiaomi.hera.tspandata.TAttributeKey; -import com.xiaomi.hera.tspandata.TAttributes; -import com.xiaomi.hera.tspandata.TEvent; -import com.xiaomi.hera.tspandata.TLink; -import com.xiaomi.hera.tspandata.TResource; -import com.xiaomi.hera.tspandata.TSpanContext; -import com.xiaomi.hera.tspandata.TSpanData; -import com.xiaomi.hera.tspandata.TValue; +import org.apache.ozhera.tspandata.TAttributeKey; +import org.apache.ozhera.tspandata.TAttributes; +import org.apache.ozhera.tspandata.TEvent; +import org.apache.ozhera.tspandata.TLink; +import org.apache.ozhera.tspandata.TResource; +import org.apache.ozhera.tspandata.TSpanContext; +import org.apache.ozhera.tspandata.TSpanData; +import org.apache.ozhera.tspandata.TValue; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/trace-etl/trace-etl-nginx/src/main/java/com/xiaomi/hera/trace/etl/nginx/parser/NginxLogToTraceBase.java b/trace-etl/trace-etl-nginx/src/main/java/com/xiaomi/hera/trace/etl/nginx/parser/NginxLogToTraceBase.java index 11d7c63a1..083ed318a 100644 --- a/trace-etl/trace-etl-nginx/src/main/java/com/xiaomi/hera/trace/etl/nginx/parser/NginxLogToTraceBase.java +++ b/trace-etl/trace-etl-nginx/src/main/java/com/xiaomi/hera/trace/etl/nginx/parser/NginxLogToTraceBase.java @@ -19,15 +19,15 @@ import com.xiaomi.hera.trace.etl.domain.NginxJaegerDomain; import com.xiaomi.hera.trace.etl.domain.jaegeres.JaegerAttrType; import com.xiaomi.hera.trace.etl.util.ThriftUtil; -import com.xiaomi.hera.tspandata.TAttributeKey; -import com.xiaomi.hera.tspandata.TAttributeType; -import com.xiaomi.hera.tspandata.TAttributes; -import com.xiaomi.hera.tspandata.TExtra; -import com.xiaomi.hera.tspandata.TKind; -import com.xiaomi.hera.tspandata.TResource; -import com.xiaomi.hera.tspandata.TSpanData; -import com.xiaomi.hera.tspandata.TStatus; -import com.xiaomi.hera.tspandata.TValue; +import org.apache.ozhera.tspandata.TAttributeKey; +import org.apache.ozhera.tspandata.TAttributeType; +import org.apache.ozhera.tspandata.TAttributes; +import org.apache.ozhera.tspandata.TExtra; +import org.apache.ozhera.tspandata.TKind; +import org.apache.ozhera.tspandata.TResource; +import org.apache.ozhera.tspandata.TSpanData; +import org.apache.ozhera.tspandata.TStatus; +import org.apache.ozhera.tspandata.TValue; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.thrift.TSerializer; diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/KafkaConsumerService.java b/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/KafkaConsumerService.java index a4328307d..0ebfba2ba 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/KafkaConsumerService.java +++ b/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/KafkaConsumerService.java @@ -21,7 +21,7 @@ import com.xiaomi.hera.trace.etl.api.service.MQExtension; import com.xiaomi.hera.trace.etl.bo.MqConfig; import com.xiaomi.hera.trace.etl.util.ThriftUtil; -import com.xiaomi.hera.tspandata.TSpanData; +import org.apache.ozhera.tspandata.TSpanData; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/MetricsParseService.java b/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/MetricsParseService.java index ec3c76077..24a52a170 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/MetricsParseService.java +++ b/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/MetricsParseService.java @@ -28,9 +28,9 @@ import com.xiaomi.hera.trace.etl.domain.MetricsParseResult; import com.xiaomi.hera.trace.etl.service.HeraContextService; import com.xiaomi.hera.trace.etl.util.ThriftUtil; -import com.xiaomi.hera.tspandata.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.ozhera.tspandata.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/RocketMQConsumerService.java b/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/RocketMQConsumerService.java index 483ccdb34..2bf4fa038 100644 --- a/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/RocketMQConsumerService.java +++ b/trace-etl/trace-etl-server/src/main/java/com/xiaomi/hera/trace/etl/consumer/RocketMQConsumerService.java @@ -21,7 +21,7 @@ import com.xiaomi.hera.trace.etl.api.service.MQExtension; import com.xiaomi.hera.trace.etl.bo.MqConfig; import com.xiaomi.hera.trace.etl.util.ThriftUtil; -import com.xiaomi.hera.tspandata.TSpanData; +import org.apache.ozhera.tspandata.TSpanData; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.common.message.MessageExt; diff --git a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/ThriftUtil.java b/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/ThriftUtil.java index 28c4d11a2..54c7101b7 100644 --- a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/ThriftUtil.java +++ b/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/ThriftUtil.java @@ -15,8 +15,8 @@ */ package com.xiaomi.hera.trace.etl.util; -import com.xiaomi.hera.tspandata.TAttributeType; -import com.xiaomi.hera.tspandata.TValue; +import org.apache.ozhera.tspandata.TAttributeType; +import org.apache.ozhera.tspandata.TValue; import org.apache.thrift.protocol.TCompactProtocol; import org.apache.thrift.protocol.TProtocolFactory; diff --git a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/TraceUtil.java b/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/TraceUtil.java index 7fab921b8..4ebadc2b8 100644 --- a/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/TraceUtil.java +++ b/trace-etl/trace-etl-service/src/main/java/com/xiaomi/hera/trace/etl/util/TraceUtil.java @@ -18,19 +18,19 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Sets; -import com.xiaomi.hera.tspandata.TAttributeKey; -import com.xiaomi.hera.tspandata.TAttributeType; -import com.xiaomi.hera.tspandata.TAttributes; -import com.xiaomi.hera.tspandata.TEvent; -import com.xiaomi.hera.tspandata.TExtra; -import com.xiaomi.hera.tspandata.TInstrumentationLibraryInfo; -import com.xiaomi.hera.tspandata.TKind; -import com.xiaomi.hera.tspandata.TLink; -import com.xiaomi.hera.tspandata.TResource; -import com.xiaomi.hera.tspandata.TSpanContext; -import com.xiaomi.hera.tspandata.TSpanData; -import com.xiaomi.hera.tspandata.TStatus; -import com.xiaomi.hera.tspandata.TValue; +import org.apache.ozhera.tspandata.TAttributeKey; +import org.apache.ozhera.tspandata.TAttributeType; +import org.apache.ozhera.tspandata.TAttributes; +import org.apache.ozhera.tspandata.TEvent; +import org.apache.ozhera.tspandata.TExtra; +import org.apache.ozhera.tspandata.TInstrumentationLibraryInfo; +import org.apache.ozhera.tspandata.TKind; +import org.apache.ozhera.tspandata.TLink; +import org.apache.ozhera.tspandata.TResource; +import org.apache.ozhera.tspandata.TSpanContext; +import org.apache.ozhera.tspandata.TSpanData; +import org.apache.ozhera.tspandata.TStatus; +import org.apache.ozhera.tspandata.TValue; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.thrift.TSerializer; From ea5385a3d85c32a3ab5548e13faf8b243f2ad11c Mon Sep 17 00:00:00 2001 From: psxjoy Date: Fri, 13 Sep 2024 14:40:06 +0800 Subject: [PATCH 2/3] refactor: update intelligence module change run.mone to org.apache (#466) Co-authored-by: EricDing <128116675+sadadw1@users.noreply.github.com> --- ozhera-intelligence/ozhera-intelligence-domain/pom.xml | 2 +- .../intelligence/domain/rootanalysis/LogParam.java | 2 +- .../intelligence/domain/rootanalysis/LogPromptResult.java | 2 +- .../intelligence/domain/rootanalysis/MarkDownParam.java | 2 +- .../domain/rootanalysis/MetricsPromptResult.java | 2 +- .../domain/rootanalysis/MetricsQueryParam.java | 2 +- .../domain/rootanalysis/TracePromptResult.java | 2 +- .../intelligence/domain/rootanalysis/TraceQueryParam.java | 2 +- ozhera-intelligence/ozhera-intelligence-server/pom.xml | 6 +++--- .../intelligence/bootstrap/IntelligenceBootStrap.java | 2 +- .../intelligence/controller/RootAnalysisController.java | 6 +++--- ozhera-intelligence/ozhera-intelligence-service/pom.xml | 6 +++--- .../apache/ozhera}/intelligence/service/LogService.java | 4 ++-- .../ozhera}/intelligence/service/MetricsService.java | 4 ++-- .../ozhera}/intelligence/service/PromptService.java | 8 ++++---- .../ozhera}/intelligence/service/RootAnalysisConst.java | 2 +- .../ozhera}/intelligence/service/RootAnalysisService.java | 6 +++--- .../apache/ozhera}/intelligence/service/TraceService.java | 4 ++-- ozhera-intelligence/pom.xml | 6 +++--- 19 files changed, 35 insertions(+), 35 deletions(-) rename ozhera-intelligence/ozhera-intelligence-domain/src/main/java/{run/mone/hera => org/apache/ozhera}/intelligence/domain/rootanalysis/LogParam.java (93%) rename ozhera-intelligence/ozhera-intelligence-domain/src/main/java/{run/mone/hera => org/apache/ozhera}/intelligence/domain/rootanalysis/LogPromptResult.java (92%) rename ozhera-intelligence/ozhera-intelligence-domain/src/main/java/{run/mone/hera => org/apache/ozhera}/intelligence/domain/rootanalysis/MarkDownParam.java (94%) rename ozhera-intelligence/ozhera-intelligence-domain/src/main/java/{run/mone/hera => org/apache/ozhera}/intelligence/domain/rootanalysis/MetricsPromptResult.java (92%) rename ozhera-intelligence/ozhera-intelligence-domain/src/main/java/{run/mone/hera => org/apache/ozhera}/intelligence/domain/rootanalysis/MetricsQueryParam.java (94%) rename ozhera-intelligence/ozhera-intelligence-domain/src/main/java/{run/mone/hera => org/apache/ozhera}/intelligence/domain/rootanalysis/TracePromptResult.java (96%) rename ozhera-intelligence/ozhera-intelligence-domain/src/main/java/{run/mone/hera => org/apache/ozhera}/intelligence/domain/rootanalysis/TraceQueryParam.java (93%) rename ozhera-intelligence/ozhera-intelligence-server/src/main/java/{run/mone/hera => org/apache/ozhera}/intelligence/bootstrap/IntelligenceBootStrap.java (96%) rename ozhera-intelligence/ozhera-intelligence-server/src/main/java/{run/mone/hera => org/apache/ozhera}/intelligence/controller/RootAnalysisController.java (86%) rename ozhera-intelligence/ozhera-intelligence-service/src/main/java/{run/mone/hera => org/apache/ozhera}/intelligence/service/LogService.java (88%) rename ozhera-intelligence/ozhera-intelligence-service/src/main/java/{run/mone/hera => org/apache/ozhera}/intelligence/service/MetricsService.java (88%) rename ozhera-intelligence/ozhera-intelligence-service/src/main/java/{run/mone/hera => org/apache/ozhera}/intelligence/service/PromptService.java (88%) rename ozhera-intelligence/ozhera-intelligence-service/src/main/java/{run/mone/hera => org/apache/ozhera}/intelligence/service/RootAnalysisConst.java (94%) rename ozhera-intelligence/ozhera-intelligence-service/src/main/java/{run/mone/hera => org/apache/ozhera}/intelligence/service/RootAnalysisService.java (90%) rename ozhera-intelligence/ozhera-intelligence-service/src/main/java/{run/mone/hera => org/apache/ozhera}/intelligence/service/TraceService.java (88%) diff --git a/ozhera-intelligence/ozhera-intelligence-domain/pom.xml b/ozhera-intelligence/ozhera-intelligence-domain/pom.xml index 3b9bb6a74..47ea01371 100644 --- a/ozhera-intelligence/ozhera-intelligence-domain/pom.xml +++ b/ozhera-intelligence/ozhera-intelligence-domain/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - run.mone + org.apache.ozhera ozhera-intelligence 1.0.0 diff --git a/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/LogParam.java b/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/LogParam.java similarity index 93% rename from ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/LogParam.java rename to ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/LogParam.java index 16b9317a5..8c1ab97d9 100644 --- a/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/LogParam.java +++ b/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/LogParam.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.intelligence.domain.rootanalysis; +package org.apache.ozhera.intelligence.domain.rootanalysis; import lombok.Builder; import lombok.Data; diff --git a/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/LogPromptResult.java b/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/LogPromptResult.java similarity index 92% rename from ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/LogPromptResult.java rename to ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/LogPromptResult.java index cc60e637b..d754e08c7 100644 --- a/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/LogPromptResult.java +++ b/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/LogPromptResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.intelligence.domain.rootanalysis; +package org.apache.ozhera.intelligence.domain.rootanalysis; import lombok.Data; diff --git a/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/MarkDownParam.java b/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/MarkDownParam.java similarity index 94% rename from ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/MarkDownParam.java rename to ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/MarkDownParam.java index e5ee07e9c..1082623d6 100644 --- a/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/MarkDownParam.java +++ b/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/MarkDownParam.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.intelligence.domain.rootanalysis; +package org.apache.ozhera.intelligence.domain.rootanalysis; import lombok.Builder; import lombok.Data; diff --git a/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/MetricsPromptResult.java b/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/MetricsPromptResult.java similarity index 92% rename from ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/MetricsPromptResult.java rename to ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/MetricsPromptResult.java index 6e5816418..3120fd00b 100644 --- a/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/MetricsPromptResult.java +++ b/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/MetricsPromptResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.intelligence.domain.rootanalysis; +package org.apache.ozhera.intelligence.domain.rootanalysis; import lombok.Data; diff --git a/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/MetricsQueryParam.java b/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/MetricsQueryParam.java similarity index 94% rename from ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/MetricsQueryParam.java rename to ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/MetricsQueryParam.java index 7dbb6bd83..74e2400c5 100644 --- a/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/MetricsQueryParam.java +++ b/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/MetricsQueryParam.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.intelligence.domain.rootanalysis; +package org.apache.ozhera.intelligence.domain.rootanalysis; import lombok.Builder; import lombok.Data; diff --git a/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/TracePromptResult.java b/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/TracePromptResult.java similarity index 96% rename from ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/TracePromptResult.java rename to ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/TracePromptResult.java index 3ce3ed681..e37f145ea 100644 --- a/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/TracePromptResult.java +++ b/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/TracePromptResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.intelligence.domain.rootanalysis; +package org.apache.ozhera.intelligence.domain.rootanalysis; import lombok.Data; diff --git a/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/TraceQueryParam.java b/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/TraceQueryParam.java similarity index 93% rename from ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/TraceQueryParam.java rename to ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/TraceQueryParam.java index bb13596b9..a1e400178 100644 --- a/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/run/mone/hera/intelligence/domain/rootanalysis/TraceQueryParam.java +++ b/ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/TraceQueryParam.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.intelligence.domain.rootanalysis; +package org.apache.ozhera.intelligence.domain.rootanalysis; import lombok.Builder; import lombok.Data; diff --git a/ozhera-intelligence/ozhera-intelligence-server/pom.xml b/ozhera-intelligence/ozhera-intelligence-server/pom.xml index 6cceaacb4..2b2f1ffa7 100644 --- a/ozhera-intelligence/ozhera-intelligence-server/pom.xml +++ b/ozhera-intelligence/ozhera-intelligence-server/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - run.mone + org.apache.ozhera ozhera-intelligence 1.0.0 @@ -19,7 +19,7 @@ - run.mone + org.apache.ozhera ozhera-intelligence-service ${ozhera.intelligence.version} @@ -60,7 +60,7 @@ spring-boot-maven-plugin 2.7.15 - com.xiaomi.hera.trace.etl.bootstrap.TraceEtlBootstrap + org.apache.ozhera.trace.etl.bootstrap.TraceEtlBootstrap diff --git a/ozhera-intelligence/ozhera-intelligence-server/src/main/java/run/mone/hera/intelligence/bootstrap/IntelligenceBootStrap.java b/ozhera-intelligence/ozhera-intelligence-server/src/main/java/org/apache/ozhera/intelligence/bootstrap/IntelligenceBootStrap.java similarity index 96% rename from ozhera-intelligence/ozhera-intelligence-server/src/main/java/run/mone/hera/intelligence/bootstrap/IntelligenceBootStrap.java rename to ozhera-intelligence/ozhera-intelligence-server/src/main/java/org/apache/ozhera/intelligence/bootstrap/IntelligenceBootStrap.java index addba10ad..c14f7b0f5 100644 --- a/ozhera-intelligence/ozhera-intelligence-server/src/main/java/run/mone/hera/intelligence/bootstrap/IntelligenceBootStrap.java +++ b/ozhera-intelligence/ozhera-intelligence-server/src/main/java/org/apache/ozhera/intelligence/bootstrap/IntelligenceBootStrap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.intelligence.bootstrap; +package org.apache.ozhera.intelligence.bootstrap; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; diff --git a/ozhera-intelligence/ozhera-intelligence-server/src/main/java/run/mone/hera/intelligence/controller/RootAnalysisController.java b/ozhera-intelligence/ozhera-intelligence-server/src/main/java/org/apache/ozhera/intelligence/controller/RootAnalysisController.java similarity index 86% rename from ozhera-intelligence/ozhera-intelligence-server/src/main/java/run/mone/hera/intelligence/controller/RootAnalysisController.java rename to ozhera-intelligence/ozhera-intelligence-server/src/main/java/org/apache/ozhera/intelligence/controller/RootAnalysisController.java index 3819f52be..0997595bd 100644 --- a/ozhera-intelligence/ozhera-intelligence-server/src/main/java/run/mone/hera/intelligence/controller/RootAnalysisController.java +++ b/ozhera-intelligence/ozhera-intelligence-server/src/main/java/org/apache/ozhera/intelligence/controller/RootAnalysisController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.intelligence.controller; +package org.apache.ozhera.intelligence.controller; import com.xiaomi.youpin.infra.rpc.Result; import lombok.extern.slf4j.Slf4j; @@ -21,8 +21,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import run.mone.hera.intelligence.domain.rootanalysis.TraceQueryParam; -import run.mone.hera.intelligence.service.RootAnalysisService; +import org.apache.ozhera.intelligence.domain.rootanalysis.TraceQueryParam; +import org.apache.ozhera.intelligence.service.RootAnalysisService; @RestController @RequestMapping("/analysis") diff --git a/ozhera-intelligence/ozhera-intelligence-service/pom.xml b/ozhera-intelligence/ozhera-intelligence-service/pom.xml index e5ea71572..2ed57496f 100644 --- a/ozhera-intelligence/ozhera-intelligence-service/pom.xml +++ b/ozhera-intelligence/ozhera-intelligence-service/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - run.mone + org.apache.ozhera ozhera-intelligence 1.0.0 @@ -19,7 +19,7 @@ - run.mone + org.apache.ozhera ozhera-intelligence-domain ${ozhera.intelligence.version} @@ -56,7 +56,7 @@ - run.mone + org.apache.ozhera trace-etl-domain diff --git a/ozhera-intelligence/ozhera-intelligence-service/src/main/java/run/mone/hera/intelligence/service/LogService.java b/ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/LogService.java similarity index 88% rename from ozhera-intelligence/ozhera-intelligence-service/src/main/java/run/mone/hera/intelligence/service/LogService.java rename to ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/LogService.java index dd698fd0c..f20c29a17 100644 --- a/ozhera-intelligence/ozhera-intelligence-service/src/main/java/run/mone/hera/intelligence/service/LogService.java +++ b/ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/LogService.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.intelligence.service; +package org.apache.ozhera.intelligence.service; import org.springframework.stereotype.Service; -import run.mone.hera.intelligence.domain.rootanalysis.LogParam; +import org.apache.ozhera.intelligence.domain.rootanalysis.LogParam; @Service public class LogService { diff --git a/ozhera-intelligence/ozhera-intelligence-service/src/main/java/run/mone/hera/intelligence/service/MetricsService.java b/ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/MetricsService.java similarity index 88% rename from ozhera-intelligence/ozhera-intelligence-service/src/main/java/run/mone/hera/intelligence/service/MetricsService.java rename to ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/MetricsService.java index b70a753b9..4954a91ed 100644 --- a/ozhera-intelligence/ozhera-intelligence-service/src/main/java/run/mone/hera/intelligence/service/MetricsService.java +++ b/ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/MetricsService.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.intelligence.service; +package org.apache.ozhera.intelligence.service; import org.springframework.stereotype.Service; -import run.mone.hera.intelligence.domain.rootanalysis.MetricsQueryParam; +import org.apache.ozhera.intelligence.domain.rootanalysis.MetricsQueryParam; /** * diff --git a/ozhera-intelligence/ozhera-intelligence-service/src/main/java/run/mone/hera/intelligence/service/PromptService.java b/ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/PromptService.java similarity index 88% rename from ozhera-intelligence/ozhera-intelligence-service/src/main/java/run/mone/hera/intelligence/service/PromptService.java rename to ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/PromptService.java index 834e9f8e7..6ab45b974 100644 --- a/ozhera-intelligence/ozhera-intelligence-service/src/main/java/run/mone/hera/intelligence/service/PromptService.java +++ b/ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/PromptService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.intelligence.service; +package org.apache.ozhera.intelligence.service; import org.springframework.stereotype.Service; -import run.mone.hera.intelligence.domain.rootanalysis.LogPromptResult; -import run.mone.hera.intelligence.domain.rootanalysis.MetricsPromptResult; -import run.mone.hera.intelligence.domain.rootanalysis.TracePromptResult; +import org.apache.ozhera.intelligence.domain.rootanalysis.LogPromptResult; +import org.apache.ozhera.intelligence.domain.rootanalysis.MetricsPromptResult; +import org.apache.ozhera.intelligence.domain.rootanalysis.TracePromptResult; @Service public class PromptService { diff --git a/ozhera-intelligence/ozhera-intelligence-service/src/main/java/run/mone/hera/intelligence/service/RootAnalysisConst.java b/ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/RootAnalysisConst.java similarity index 94% rename from ozhera-intelligence/ozhera-intelligence-service/src/main/java/run/mone/hera/intelligence/service/RootAnalysisConst.java rename to ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/RootAnalysisConst.java index c50ae6fbc..052bda920 100644 --- a/ozhera-intelligence/ozhera-intelligence-service/src/main/java/run/mone/hera/intelligence/service/RootAnalysisConst.java +++ b/ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/RootAnalysisConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.intelligence.service; +package org.apache.ozhera.intelligence.service; public class RootAnalysisConst { diff --git a/ozhera-intelligence/ozhera-intelligence-service/src/main/java/run/mone/hera/intelligence/service/RootAnalysisService.java b/ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/RootAnalysisService.java similarity index 90% rename from ozhera-intelligence/ozhera-intelligence-service/src/main/java/run/mone/hera/intelligence/service/RootAnalysisService.java rename to ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/RootAnalysisService.java index dfe6a4eeb..85bffbf37 100644 --- a/ozhera-intelligence/ozhera-intelligence-service/src/main/java/run/mone/hera/intelligence/service/RootAnalysisService.java +++ b/ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/RootAnalysisService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.intelligence.service; +package org.apache.ozhera.intelligence.service; import com.xiaomi.youpin.infra.rpc.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import run.mone.hera.intelligence.domain.rootanalysis.MarkDownParam; -import run.mone.hera.intelligence.domain.rootanalysis.TraceQueryParam; +import org.apache.ozhera.intelligence.domain.rootanalysis.MarkDownParam; +import org.apache.ozhera.intelligence.domain.rootanalysis.TraceQueryParam; @Service public class RootAnalysisService { diff --git a/ozhera-intelligence/ozhera-intelligence-service/src/main/java/run/mone/hera/intelligence/service/TraceService.java b/ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/TraceService.java similarity index 88% rename from ozhera-intelligence/ozhera-intelligence-service/src/main/java/run/mone/hera/intelligence/service/TraceService.java rename to ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/TraceService.java index ad44a6ee2..8df9df939 100644 --- a/ozhera-intelligence/ozhera-intelligence-service/src/main/java/run/mone/hera/intelligence/service/TraceService.java +++ b/ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/TraceService.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package run.mone.hera.intelligence.service; +package org.apache.ozhera.intelligence.service; import org.springframework.stereotype.Service; -import run.mone.hera.intelligence.domain.rootanalysis.TraceQueryParam; +import org.apache.ozhera.intelligence.domain.rootanalysis.TraceQueryParam; @Service public class TraceService { diff --git a/ozhera-intelligence/pom.xml b/ozhera-intelligence/pom.xml index 6af7be482..3294c4a29 100644 --- a/ozhera-intelligence/pom.xml +++ b/ozhera-intelligence/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - run.mone + org.apache.ozhera ozhera - 1.4.0-jdk21-SNAPSHOT + 2.0.0-SNAPSHOT ozhera-intelligence @@ -48,7 +48,7 @@ ${spring.version} - run.mone + org.apache.ozhera trace-etl-domain ${trace.etl.domain.version} From e2640944c90dcccd03be8df55cd3a1daa20c2fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=BF=97=E5=8B=87?= Date: Fri, 13 Sep 2024 14:42:00 +0800 Subject: [PATCH 3/3] refactor: switch the orginal package path from com.xiaomi.mone to org.apache.ozhera #457 (#467) Co-authored-by: wodiwudi <40229449+wodiwudi@users.noreply.github.com> --- .../demo/client/config/PrometheusConfiguration.java | 2 +- .../hera/demo/client/controller/TestController.java | 2 +- .../apache/ozhera}/prometheus/all/client/Metrics.java | 10 +++++----- .../ozhera}/prometheus/all/client/MetricsManager.java | 2 +- .../ozhera}/prometheus/all/client/Prometheus.java | 2 +- .../prometheus/all/client/PrometheusCounter.java | 2 +- .../ozhera}/prometheus/all/client/PrometheusGauge.java | 2 +- .../prometheus/all/client/PrometheusHistogram.java | 2 +- .../ozhera}/prometheus/all/client/XmCounter.java | 2 +- .../apache/ozhera}/prometheus/all/client/XmGauge.java | 2 +- .../ozhera}/prometheus/all/client/XmHistogram.java | 2 +- .../all/client/binder/ClassLoaderMetricsReduced.java | 2 +- .../all/client/binder/JvmGcMetricsReduced.java | 2 +- .../all/client/binder/JvmMemoryMetricsReduced.java | 2 +- .../all/client/binder/JvmThreadMetricsReduced.java | 2 +- .../ozhera}/prometheus/all/client/PrometheusTest.java | 2 +- .../starter/all/config/PrometheusConfigure.java | 10 +++++----- .../ozhera}/prometheus/starter/all/domain/Const.java | 2 +- .../prometheus/starter/all/exporter/HTTPServer.java | 2 +- .../prometheus/starter/all/factory/ServiceFactory.java | 8 ++++---- .../starter/all/service/MilinePrometheusService.java | 2 +- .../starter/all/service/PrometheusService.java | 2 +- readme/custom-tracking/custom-tracking.md | 4 ++-- readme/custom-tracking/custom-tracking_cn.md | 4 ++-- 24 files changed, 37 insertions(+), 37 deletions(-) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/Metrics.java (93%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/MetricsManager.java (96%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/Prometheus.java (99%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/PrometheusCounter.java (97%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/PrometheusGauge.java (98%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/PrometheusHistogram.java (97%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/XmCounter.java (95%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/XmGauge.java (95%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/XmHistogram.java (95%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/binder/ClassLoaderMetricsReduced.java (97%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/binder/JvmGcMetricsReduced.java (99%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/binder/JvmMemoryMetricsReduced.java (98%) rename prometheus-starter-all/prometheus-diy-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/binder/JvmThreadMetricsReduced.java (97%) rename prometheus-starter-all/prometheus-diy-client/src/test/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/all/client/PrometheusTest.java (98%) rename prometheus-starter-all/prometheus-diy-starter/src/main/java/{com/xiaomi/mione => org/apache/ozhera}/prometheus/starter/all/config/PrometheusConfigure.java (92%) rename prometheus-starter-all/prometheus-diy-starter/src/main/java/{com/xiaomi/mione => org/apache/ozhera}/prometheus/starter/all/domain/Const.java (93%) rename prometheus-starter-all/prometheus-diy-starter/src/main/java/{com/xiaomi/mione => org/apache/ozhera}/prometheus/starter/all/exporter/HTTPServer.java (99%) rename prometheus-starter-all/prometheus-diy-starter/src/main/java/{com/xiaomi/mione => org/apache/ozhera}/prometheus/starter/all/factory/ServiceFactory.java (81%) rename prometheus-starter-all/prometheus-diy-starter/src/main/java/{com/xiaomi/mione => org/apache/ozhera}/prometheus/starter/all/service/MilinePrometheusService.java (96%) rename prometheus-starter-all/prometheus-diy-starter/src/main/java/{com/xiaomi/mione => org/apache/ozhera}/prometheus/starter/all/service/PrometheusService.java (94%) diff --git a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/config/PrometheusConfiguration.java b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/config/PrometheusConfiguration.java index 95aabdc24..59e7f6a43 100644 --- a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/config/PrometheusConfiguration.java +++ b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/config/PrometheusConfiguration.java @@ -15,7 +15,7 @@ */ package com.xiaomi.mone.hera.demo.client.config; -import com.xiaomi.mione.prometheus.starter.all.config.PrometheusConfigure; +import org.apache.ozhera.prometheus.starter.all.config.PrometheusConfigure; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/controller/TestController.java b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/controller/TestController.java index d31e88ad1..a8cbbb206 100644 --- a/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/controller/TestController.java +++ b/ozhera-demo-client/ozhera-demo-client-server/src/main/java/com/xiaomi/mone/hera/demo/client/controller/TestController.java @@ -19,7 +19,7 @@ import com.xiaomi.mone.hera.demo.client.api.service.DubboHealthService; import com.xiaomi.mone.hera.demo.client.grpc.GrpcClientService; import com.xiaomi.mone.hera.demo.client.util.HttpClientUtil; -import com.xiaomi.youpin.prometheus.all.client.Metrics; +import org.apache.ozhera.prometheus.all.client.Metrics; import lombok.extern.slf4j.Slf4j; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpUriRequest; diff --git a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/Metrics.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/Metrics.java similarity index 93% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/Metrics.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/Metrics.java index 6e35cdd24..0de54200a 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/Metrics.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/Metrics.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.all.client; +package org.apache.ozhera.prometheus.all.client; -import com.xiaomi.youpin.prometheus.all.client.binder.ClassLoaderMetricsReduced; -import com.xiaomi.youpin.prometheus.all.client.binder.JvmGcMetricsReduced; -import com.xiaomi.youpin.prometheus.all.client.binder.JvmMemoryMetricsReduced; -import com.xiaomi.youpin.prometheus.all.client.binder.JvmThreadMetricsReduced; +import org.apache.ozhera.prometheus.all.client.binder.ClassLoaderMetricsReduced; +import org.apache.ozhera.prometheus.all.client.binder.JvmGcMetricsReduced; +import org.apache.ozhera.prometheus.all.client.binder.JvmMemoryMetricsReduced; +import org.apache.ozhera.prometheus.all.client.binder.JvmThreadMetricsReduced; import io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics; import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics; import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics; diff --git a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/MetricsManager.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/MetricsManager.java similarity index 96% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/MetricsManager.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/MetricsManager.java index 28392f711..e3faee259 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/MetricsManager.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/MetricsManager.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.all.client; +package org.apache.ozhera.prometheus.all.client; /** * @author zhangxiaowei6 */ diff --git a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/Prometheus.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/Prometheus.java similarity index 99% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/Prometheus.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/Prometheus.java index 21968406e..5de0a7a4b 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/Prometheus.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/Prometheus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.all.client; +package org.apache.ozhera.prometheus.all.client; import io.micrometer.prometheus.PrometheusConfig; import io.micrometer.prometheus.PrometheusMeterRegistry; diff --git a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/PrometheusCounter.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/PrometheusCounter.java similarity index 97% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/PrometheusCounter.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/PrometheusCounter.java index 768a865c5..5ec3243a1 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/PrometheusCounter.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/PrometheusCounter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.all.client; +package org.apache.ozhera.prometheus.all.client; import io.prometheus.client.Counter; import lombok.extern.slf4j.Slf4j; diff --git a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/PrometheusGauge.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/PrometheusGauge.java similarity index 98% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/PrometheusGauge.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/PrometheusGauge.java index 3edf2c071..64a80ff02 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/PrometheusGauge.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/PrometheusGauge.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.all.client; +package org.apache.ozhera.prometheus.all.client; import io.prometheus.client.Gauge; import lombok.extern.slf4j.Slf4j; diff --git a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/PrometheusHistogram.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/PrometheusHistogram.java similarity index 97% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/PrometheusHistogram.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/PrometheusHistogram.java index 5cd466570..12f71c749 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/PrometheusHistogram.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/PrometheusHistogram.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.all.client; +package org.apache.ozhera.prometheus.all.client; import io.prometheus.client.Histogram; import lombok.extern.slf4j.Slf4j; diff --git a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/XmCounter.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/XmCounter.java similarity index 95% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/XmCounter.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/XmCounter.java index 14a18c8b4..036114415 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/XmCounter.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/XmCounter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.all.client; +package org.apache.ozhera.prometheus.all.client; /** * @author zhangxiaowei6 */ diff --git a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/XmGauge.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/XmGauge.java similarity index 95% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/XmGauge.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/XmGauge.java index cac9ac226..6ef097eba 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/XmGauge.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/XmGauge.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.all.client; +package org.apache.ozhera.prometheus.all.client; /** * @author zhangxiaowei6 */ diff --git a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/XmHistogram.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/XmHistogram.java similarity index 95% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/XmHistogram.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/XmHistogram.java index 3554945a0..29e65fbf4 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/XmHistogram.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/XmHistogram.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.all.client; +package org.apache.ozhera.prometheus.all.client; /** * @author zhangxiaowei6 */ diff --git a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/ClassLoaderMetricsReduced.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/ClassLoaderMetricsReduced.java similarity index 97% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/ClassLoaderMetricsReduced.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/ClassLoaderMetricsReduced.java index a3c02c21b..b9bc25de7 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/ClassLoaderMetricsReduced.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/ClassLoaderMetricsReduced.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.all.client.binder; +package org.apache.ozhera.prometheus.all.client.binder; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.MeterRegistry; diff --git a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/JvmGcMetricsReduced.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/JvmGcMetricsReduced.java similarity index 99% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/JvmGcMetricsReduced.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/JvmGcMetricsReduced.java index 8478d8c75..224cfe166 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/JvmGcMetricsReduced.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/JvmGcMetricsReduced.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.all.client.binder; +package org.apache.ozhera.prometheus.all.client.binder; import com.sun.management.GarbageCollectionNotificationInfo; import com.sun.management.GcInfo; diff --git a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/JvmMemoryMetricsReduced.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/JvmMemoryMetricsReduced.java similarity index 98% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/JvmMemoryMetricsReduced.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/JvmMemoryMetricsReduced.java index f21b21d91..082d6dd6c 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/JvmMemoryMetricsReduced.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/JvmMemoryMetricsReduced.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.all.client.binder; +package org.apache.ozhera.prometheus.all.client.binder; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.MeterRegistry; diff --git a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/JvmThreadMetricsReduced.java b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/JvmThreadMetricsReduced.java similarity index 97% rename from prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/JvmThreadMetricsReduced.java rename to prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/JvmThreadMetricsReduced.java index 9438f7bde..ade431a65 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/main/java/com/xiaomi/youpin/prometheus/all/client/binder/JvmThreadMetricsReduced.java +++ b/prometheus-starter-all/prometheus-diy-client/src/main/java/org/apache/ozhera/prometheus/all/client/binder/JvmThreadMetricsReduced.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.all.client.binder; +package org.apache.ozhera.prometheus.all.client.binder; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.MeterRegistry; diff --git a/prometheus-starter-all/prometheus-diy-client/src/test/java/com/xiaomi/youpin/prometheus/all/client/PrometheusTest.java b/prometheus-starter-all/prometheus-diy-client/src/test/java/org/apache/ozhera/prometheus/all/client/PrometheusTest.java similarity index 98% rename from prometheus-starter-all/prometheus-diy-client/src/test/java/com/xiaomi/youpin/prometheus/all/client/PrometheusTest.java rename to prometheus-starter-all/prometheus-diy-client/src/test/java/org/apache/ozhera/prometheus/all/client/PrometheusTest.java index a5b3a7e94..601f3e316 100644 --- a/prometheus-starter-all/prometheus-diy-client/src/test/java/com/xiaomi/youpin/prometheus/all/client/PrometheusTest.java +++ b/prometheus-starter-all/prometheus-diy-client/src/test/java/org/apache/ozhera/prometheus/all/client/PrometheusTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.all.client; +package org.apache.ozhera.prometheus.all.client; import org.junit.Before; import org.junit.Test; diff --git a/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/config/PrometheusConfigure.java b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/config/PrometheusConfigure.java similarity index 92% rename from prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/config/PrometheusConfigure.java rename to prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/config/PrometheusConfigure.java index 9d9c9b336..5d60f9944 100644 --- a/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/config/PrometheusConfigure.java +++ b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/config/PrometheusConfigure.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mione.prometheus.starter.all.config; +package org.apache.ozhera.prometheus.starter.all.config; import com.alibaba.nacos.api.exception.NacosException; import com.alibaba.nacos.api.naming.pojo.Instance; import com.alibaba.nacos.client.naming.NacosNamingService; import com.sun.net.httpserver.HttpServer; -import com.xiaomi.mione.prometheus.starter.all.exporter.HTTPServer; -import com.xiaomi.mione.prometheus.starter.all.service.MilinePrometheusService; -import com.xiaomi.youpin.prometheus.all.client.Metrics; -import com.xiaomi.youpin.prometheus.all.client.Prometheus; +import org.apache.ozhera.prometheus.starter.all.exporter.HTTPServer; +import org.apache.ozhera.prometheus.starter.all.service.MilinePrometheusService; +import org.apache.ozhera.prometheus.all.client.Metrics; +import org.apache.ozhera.prometheus.all.client.Prometheus; import io.prometheus.client.CollectorRegistry; import lombok.extern.slf4j.Slf4j; diff --git a/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/domain/Const.java b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/domain/Const.java similarity index 93% rename from prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/domain/Const.java rename to prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/domain/Const.java index 5de8da292..6760673b0 100644 --- a/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/domain/Const.java +++ b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/domain/Const.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mione.prometheus.starter.all.domain; +package org.apache.ozhera.prometheus.starter.all.domain; /** * @Description diff --git a/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/exporter/HTTPServer.java b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/exporter/HTTPServer.java similarity index 99% rename from prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/exporter/HTTPServer.java rename to prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/exporter/HTTPServer.java index 7f35a29d1..368fccc38 100644 --- a/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/exporter/HTTPServer.java +++ b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/exporter/HTTPServer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mione.prometheus.starter.all.exporter; +package org.apache.ozhera.prometheus.starter.all.exporter; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; diff --git a/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/factory/ServiceFactory.java b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/factory/ServiceFactory.java similarity index 81% rename from prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/factory/ServiceFactory.java rename to prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/factory/ServiceFactory.java index 3c982b49c..b4929f39a 100644 --- a/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/factory/ServiceFactory.java +++ b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/factory/ServiceFactory.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mione.prometheus.starter.all.factory; +package org.apache.ozhera.prometheus.starter.all.factory; -import com.xiaomi.mione.prometheus.starter.all.service.MilinePrometheusService; -import com.xiaomi.mione.prometheus.starter.all.service.PrometheusService; +import org.apache.ozhera.prometheus.starter.all.service.MilinePrometheusService; +import org.apache.ozhera.prometheus.starter.all.service.PrometheusService; import org.apache.commons.lang3.StringUtils; -import com.xiaomi.mione.prometheus.starter.all.domain.Const ; +import org.apache.ozhera.prometheus.starter.all.domain.Const; /** diff --git a/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/service/MilinePrometheusService.java b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/service/MilinePrometheusService.java similarity index 96% rename from prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/service/MilinePrometheusService.java rename to prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/service/MilinePrometheusService.java index 343be62d1..6fa0ccc23 100644 --- a/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/service/MilinePrometheusService.java +++ b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/service/MilinePrometheusService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mione.prometheus.starter.all.service; +package org.apache.ozhera.prometheus.starter.all.service; import org.apache.commons.lang3.StringUtils; diff --git a/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/service/PrometheusService.java b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/service/PrometheusService.java similarity index 94% rename from prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/service/PrometheusService.java rename to prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/service/PrometheusService.java index 4a7083563..4868a8597 100644 --- a/prometheus-starter-all/prometheus-diy-starter/src/main/java/com/xiaomi/mione/prometheus/starter/all/service/PrometheusService.java +++ b/prometheus-starter-all/prometheus-diy-starter/src/main/java/org/apache/ozhera/prometheus/starter/all/service/PrometheusService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.mione.prometheus.starter.all.service; +package org.apache.ozhera.prometheus.starter.all.service; public abstract class PrometheusService { diff --git a/readme/custom-tracking/custom-tracking.md b/readme/custom-tracking/custom-tracking.md index d29839f92..41d466984 100644 --- a/readme/custom-tracking/custom-tracking.md +++ b/readme/custom-tracking/custom-tracking.md @@ -41,7 +41,7 @@ After a successful compilation, push the pom to the company's Maven repository, Just ensure that the initialization of the `PrometheusConfigure.init()` method is called before any monitoring points. ```java - import com.xiaomi.mione.prometheus.starter.all.config.PrometheusConfigure; + import config.org.apache.ozhera.prometheus.starter.all.PrometheusConfigure; PrometheusConfigure.init(nacosAddr, serverType); ``` @@ -70,7 +70,7 @@ Counter: An always-increasing counter. We can use it to record the frequency of #### 2) Code Example ```java -import com.xiaomi.youpin.prometheus.all.client.Metrics; +import org.apache.ozhera.prometheus.all.client.Metrics; Metrics.getInstance().newCounter("testCounter","methodName","url").with("ok","/test/ok").add(1, "ok","/test/ok"); ``` diff --git a/readme/custom-tracking/custom-tracking_cn.md b/readme/custom-tracking/custom-tracking_cn.md index 3344f4c46..d9749b0f0 100644 --- a/readme/custom-tracking/custom-tracking_cn.md +++ b/readme/custom-tracking/custom-tracking_cn.md @@ -41,7 +41,7 @@ https://github.com/XiaoMi/ozhera/tree/master/prometheus-starter-all 只要是在进行打点前完成初始化PrometheusConfigure.init()方法的调用即可。 ```java - import com.xiaomi.mione.prometheus.starter.all.config.PrometheusConfigure; + import config.org.apache.ozhera.prometheus.starter.all.PrometheusConfigure; PrometheusConfigure.init(nacosAddr, serverType); ``` @@ -71,7 +71,7 @@ Counter：只增不减的计数器，我们可以在应用程序中记录某些 #### 2）代码示例 ```java -import com.xiaomi.youpin.prometheus.all.client.Metrics; +import org.apache.ozhera.prometheus.all.client.Metrics; Metrics.getInstance().newCounter("testCounter","methodName","url").with("ok","/test/ok").add(1, "ok","/test/ok"); ```