This is an automated email from the ASF dual-hosted git repository. dingtao pushed a commit to branch business-metrics in repository https://gitbox.apache.org/repos/asf/ozhera.git
commit 715c40f63531f3685a918daceac9d828c3281bc1 Merge: 9f3d2d46 2f2ce9ff Author: EricDing <[email protected]> AuthorDate: Wed Jul 2 16:46:09 2025 +0800 Merge branch 'apache:master' into master .../apache/ozhera/app/api/message/HeraAppInfoModifyMessage.java | 3 +-- .../java/org/apache/ozhera/app/api/message/HeraAppModifyType.java | 3 +-- .../apache/ozhera/app/api/model/HeraAppBaseInfoParticipant.java | 3 +-- .../java/org/apache/ozhera/app/api/model/HeraAppBaseQuery.java | 3 +-- .../main/java/org/apache/ozhera/app/api/model/HeraAppEnvData.java | 1 - .../main/java/org/apache/ozhera/app/api/model/HeraAppMqInfo.java | 1 - .../java/org/apache/ozhera/app/api/model/HeraAppRoleModel.java | 3 +-- .../main/java/org/apache/ozhera/app/api/model/HeraSimpleEnv.java | 1 - .../app/api/model/project/group/HeraProjectGroupAppRequest.java | 3 +-- .../app/api/model/project/group/HeraProjectGroupDataRequest.java | 3 +-- .../ozhera/app/api/model/project/group/HeraProjectGroupModel.java | 3 +-- .../app/api/model/project/group/HeraProjectGroupUserModel.java | 3 +-- .../ozhera/app/api/model/project/group/ProjectGroupTreeNode.java | 3 +-- .../main/java/org/apache/ozhera/app/api/response/AppBaseInfo.java | 1 - .../java/org/apache/ozhera/app/api/response/PairResponse.java | 1 - .../apache/ozhera/app/api/service/HeraAppEnvOutwardService.java | 1 - .../java/org/apache/ozhera/app/api/service/HeraAppService.java | 1 - .../org/apache/ozhera/app/api/service/HeraAuthorizationApi.java | 3 +-- .../apache/ozhera/app/api/service/HeraProjectGroupServiceApi.java | 3 +-- .../src/main/java/org/apache/ozhera/app/common/Constant.java | 1 - .../src/main/java/org/apache/ozhera/app/common/Result.java | 1 - .../src/main/java/org/apache/ozhera/app/enums/AppTypeEnum.java | 1 - .../src/main/java/org/apache/ozhera/app/enums/BizCodeEnum.java | 1 - .../src/main/java/org/apache/ozhera/app/enums/CommonError.java | 1 - .../src/main/java/org/apache/ozhera/app/enums/OperateEnum.java | 1 - .../src/main/java/org/apache/ozhera/app/enums/PlatForm.java | 1 - .../main/java/org/apache/ozhera/app/enums/PlatFormTypeEnum.java | 1 - .../main/java/org/apache/ozhera/app/enums/ProjectTypeEnum.java | 1 - .../src/main/java/org/apache/ozhera/app/enums/StatusEnum.java | 1 - .../main/java/org/apache/ozhera/app/exception/AppException.java | 1 - .../src/main/java/org/apache/ozhera/app/model/BaseCommon.java | 1 - .../main/java/org/apache/ozhera/app/model/vo/HeraAppEnvVo.java | 1 - .../java/org/apache/ozhera/app/model/vo/HeraAppOperateVo.java | 1 - .../src/main/java/org/apache/ozhera/app/model/vo/HeraEnvIpVo.java | 1 - .../src/main/java/org/apache/ozhera/app/model/vo/TpcLabelRes.java | 1 - .../src/main/java/org/apache/ozhera/app/model/vo/TpcPageRes.java | 1 - .../src/main/java/org/apache/ozhera/app/valid/AddGroup.java | 1 - .../src/main/java/org/apache/ozhera/app/valid/UpdateGroup.java | 1 - .../src/main/java/org/apache/ozhera/app/AppBootstrap.java | 1 - .../java/org/apache/ozhera/app/aop/OperateAppBaseInfoAspect.java | 1 - .../src/main/java/org/apache/ozhera/app/config/BeanConfig.java | 1 - .../main/java/org/apache/ozhera/app/config/DataSourceConfig.java | 1 - .../java/org/apache/ozhera/app/config/DubboConfiguration.java | 1 - .../main/java/org/apache/ozhera/app/config/RocketMqConfig.java | 1 - .../main/java/org/apache/ozhera/app/controller/AppController.java | 1 - .../org/apache/ozhera/app/controller/HeraAppEnvController.java | 1 - .../java/org/apache/ozhera/app/controller/TestController.java | 1 - .../apache/ozhera/app/exception/AppExceptionControllerAdvice.java | 1 - .../src/main/java/org/apache/ozhera/app/job/HeraAppEnvIpJob.java | 1 - .../java/org/apache/ozhera/app/response/AppResponseAdvice.java | 1 - .../src/test/java/org/apache/ozhera/app/test/AppBaseTest.java | 3 +-- .../java/org/apache/ozhera/app/test/EnvIpFetchServiceTest.java | 1 - .../java/org/apache/ozhera/app/test/HeraAppEnvControllerTest.java | 1 - .../org/apache/ozhera/app/test/HeraAppEnvOutwardServiceTest.java | 1 - .../java/org/apache/ozhera/app/test/HeraProjectGroupTest.java | 3 +-- .../src/test/java/org/apache/ozhera/app/test/RocketMqTest.java | 1 - .../test/java/org/apache/ozhera/app/test/SpringBootFeatTest.java | 1 - .../src/test/java/org/apache/ozhera/app/test/UserBean.java | 1 - .../java/org/apache/ozhera/app/auth/AuthorizationService.java | 3 +-- .../java/org/apache/ozhera/app/config/NacosConfiguration.java | 1 - .../org/apache/ozhera/app/dao/mapper/HeraAppBaseInfoMapper.java | 1 - .../java/org/apache/ozhera/app/dao/mapper/HeraAppEnvMapper.java | 1 - .../org/apache/ozhera/app/dao/mapper/HeraAppExcessInfoMapper.java | 1 - .../main/java/org/apache/ozhera/app/model/HeraAppBaseInfo.java | 1 - .../src/main/java/org/apache/ozhera/app/model/HeraAppEnv.java | 1 - .../main/java/org/apache/ozhera/app/model/HeraAppExcessInfo.java | 1 - .../java/org/apache/ozhera/app/service/HeraAppEnvService.java | 1 - .../java/org/apache/ozhera/app/service/HeraAppRoleService.java | 3 +-- .../java/org/apache/ozhera/app/service/env/DefaultEnvIpFetch.java | 1 - .../org/apache/ozhera/app/service/env/DefaultHttpEnvIpFetch.java | 1 - .../org/apache/ozhera/app/service/env/DefaultNacosEnvIpFetch.java | 1 - .../main/java/org/apache/ozhera/app/service/env/EnvIpFetch.java | 1 - .../ozhera/app/service/extension/AppTypeServiceExtension.java | 1 - .../service/extension/impl/DefaultAppTypeServiceExtension.java | 1 - .../apache/ozhera/app/service/impl/AuthorizationServiceImpl.java | 3 +-- .../apache/ozhera/app/service/impl/HeraAppBaseInfoService.java | 3 +-- .../ozhera/app/service/impl/HeraAppEnvOutwardServiceImpl.java | 1 - .../org/apache/ozhera/app/service/impl/HeraAppEnvServiceImpl.java | 1 - .../org/apache/ozhera/app/service/impl/HeraAppServiceImpl.java | 1 - .../ozhera/app/service/impl/HeraProjectGroupServiceImpl.java | 3 +-- .../org/apache/ozhera/app/service/mq/RocketMqHeraAppConsumer.java | 3 +-- .../org/apache/ozhera/app/service/mq/RocketMqHeraAppProducer.java | 3 +-- .../org/apache/ozhera/app/service/mq/model/HeraAppMessage.java | 3 +-- .../ozhera/app/service/project/group/HeraProjectGroupService.java | 3 +-- .../apache/ozhera/app/service/project/group/TreeQueryBuilder.java | 3 +-- .../main/java/org/apache/ozhera/app/util/AppTypeTransferUtil.java | 1 - .../main/java/org/apache/ozhera/operator/common/FileUtils.java | 1 - .../main/java/org/apache/ozhera/operator/common/HoConstant.java | 1 - .../java/org/apache/ozhera/operator/common/ResourceTypeEnum.java | 1 - .../src/main/java/org/apache/ozhera/operator/HeraBootstrap.java | 1 - .../ozhera/operator/controller/OzHeraOperatorController.java | 1 - .../test/java/org/apache/ozhera/operator/test/SidecarTest.java | 1 - .../java/org/apache/ozhera/operator/bo/HeraBootstrapList.java | 3 --- .../main/java/org/apache/ozhera/operator/bo/HeraObjectMeta.java | 1 - .../src/main/java/org/apache/ozhera/operator/bo/HeraResource.java | 1 - .../src/main/java/org/apache/ozhera/operator/bo/HeraSpec.java | 3 --- .../src/main/java/org/apache/ozhera/operator/bo/HeraStatus.java | 3 --- .../src/main/java/org/apache/ozhera/operator/bo/PropConf.java | 1 - .../org/apache/ozhera/operator/bo/dashboard/GrafanaApiKeyReq.java | 1 - .../org/apache/ozhera/operator/bo/dashboard/GrafanaApiKeyRes.java | 1 - .../main/java/org/apache/ozhera/operator/common/K8sUtilBean.java | 1 - .../main/java/org/apache/ozhera/operator/dto/DashboardDTO.java | 1 - .../main/java/org/apache/ozhera/operator/dto/DeployStateDTO.java | 1 - .../org/apache/ozhera/operator/dto/HeraOperatorDefineDTO.java | 1 - .../java/org/apache/ozhera/operator/dto/OperatorStateDTO.java | 1 - .../src/main/java/org/apache/ozhera/operator/dto/PodStateDTO.java | 1 - .../java/org/apache/ozhera/operator/dto/ServiceCheckResource.java | 1 - .../apache/ozhera/operator/handler/HeraResourceEventHandler.java | 8 +++++--- .../apache/ozhera/operator/service/HeraBootstrapInitService.java | 1 - .../main/java/org/apache/ozhera/operator/service/IResource.java | 1 - .../java/org/apache/ozhera/operator/test/PlaceholderTest.java | 1 - 111 files changed, 29 insertions(+), 143 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
