Merge branch 'apache:master' into master

sadadw1 · Sep 13, 2024 · c3e8b90 · c3e8b90
2 parents 8f61d3f + e264094
commit c3e8b90
Show file tree

Hide file tree

Showing 289 changed files with 742 additions and 741 deletions.
diff --git 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">
 
     <parent>
-        <groupId>run.mone</groupId>
+        <groupId>org.apache.ozhera</groupId>
         <artifactId>ozhera-app</artifactId>
-        <version>1.4-jdk21-4</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>app-api</artifactId>
     <version>${hera-app.release.version}</version>
 
     <dependencies>
         <dependency>
-            <groupId>run.mone</groupId>
+            <groupId>org.apache.ozhera</groupId>
             <artifactId>app-common</artifactId>
         </dependency>
 

diff --git a/...api/message/HeraAppInfoModifyMessage.java → ...api/message/HeraAppInfoModifyMessage.java b/...api/message/HeraAppInfoModifyMessage.java → ...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/...ne/app/api/message/HeraAppModifyType.java → ...ra/app/api/message/HeraAppModifyType.java b/...ne/app/api/message/HeraAppModifyType.java → ...ra/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/...e/app/api/model/HeraAppBaseInfoModel.java → ...a/app/api/model/HeraAppBaseInfoModel.java b/...e/app/api/model/HeraAppBaseInfoModel.java → ...a/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/...api/model/HeraAppBaseInfoParticipant.java → ...api/model/HeraAppBaseInfoParticipant.java b/...api/model/HeraAppBaseInfoParticipant.java → ...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/.../mone/app/api/model/HeraAppBaseQuery.java → ...zhera/app/api/model/HeraAppBaseQuery.java b/.../mone/app/api/model/HeraAppBaseQuery.java → ...zhera/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/...mi/mone/app/api/model/HeraAppEnvData.java → .../ozhera/app/api/model/HeraAppEnvData.java b/...mi/mone/app/api/model/HeraAppEnvData.java → .../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/...omi/mone/app/api/model/HeraAppMqInfo.java → ...e/ozhera/app/api/model/HeraAppMqInfo.java b/...omi/mone/app/api/model/HeraAppMqInfo.java → ...e/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/.../mone/app/api/model/HeraAppRoleModel.java → ...zhera/app/api/model/HeraAppRoleModel.java b/.../mone/app/api/model/HeraAppRoleModel.java → ...zhera/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/...omi/mone/app/api/model/HeraSimpleEnv.java → ...e/ozhera/app/api/model/HeraSimpleEnv.java b/...omi/mone/app/api/model/HeraSimpleEnv.java → ...e/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/...ect/group/HeraProjectGroupAppRequest.java → ...ect/group/HeraProjectGroupAppRequest.java b/...ect/group/HeraProjectGroupAppRequest.java → ...ect/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/...ct/group/HeraProjectGroupDataRequest.java → ...ct/group/HeraProjectGroupDataRequest.java b/...ct/group/HeraProjectGroupDataRequest.java → ...ct/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/.../project/group/HeraProjectGroupModel.java → .../project/group/HeraProjectGroupModel.java b/.../project/group/HeraProjectGroupModel.java → .../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/...ject/group/HeraProjectGroupUserModel.java → ...ject/group/HeraProjectGroupUserModel.java b/...ject/group/HeraProjectGroupUserModel.java → ...ject/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/...l/project/group/ProjectGroupTreeNode.java → ...l/project/group/ProjectGroupTreeNode.java b/...l/project/group/ProjectGroupTreeNode.java → ...l/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/...mi/mone/app/api/response/AppBaseInfo.java → .../ozhera/app/api/response/AppBaseInfo.java b/...mi/mone/app/api/response/AppBaseInfo.java → .../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/...i/mone/app/api/response/PairResponse.java → ...ozhera/app/api/response/PairResponse.java b/...i/mone/app/api/response/PairResponse.java → ...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/...api/service/HeraAppEnvOutwardService.java → ...api/service/HeraAppEnvOutwardService.java b/...api/service/HeraAppEnvOutwardService.java → ...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/.../mone/app/api/service/HeraAppService.java → ...zhera/app/api/service/HeraAppService.java b/.../mone/app/api/service/HeraAppService.java → ...zhera/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/...app/api/service/HeraAuthorizationApi.java → ...app/api/service/HeraAuthorizationApi.java b/...app/api/service/HeraAuthorizationApi.java → ...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/...i/service/HeraProjectGroupServiceApi.java → ...i/service/HeraProjectGroupServiceApi.java b/...i/service/HeraProjectGroupServiceApi.java → ...i/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
@@ -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">
     <parent>
-        <groupId>run.mone</groupId>
+        <groupId>org.apache.ozhera</groupId>
         <artifactId>ozhera-app</artifactId>
-        <version>1.4-jdk21-4</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>app-common</artifactId>
     <version>${hera-app.release.version}</version>

diff --git a/.../com/xiaomi/mone/app/common/Constant.java → ...rg/apache/ozhera/app/common/Constant.java b/.../com/xiaomi/mone/app/common/Constant.java → ...rg/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/...va/com/xiaomi/mone/app/common/Result.java → .../org/apache/ozhera/app/common/Result.java b/...va/com/xiaomi/mone/app/common/Result.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/...om/xiaomi/mone/app/enums/AppTypeEnum.java → .../apache/ozhera/app/enums/AppTypeEnum.java b/...om/xiaomi/mone/app/enums/AppTypeEnum.java → .../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/...om/xiaomi/mone/app/enums/BizCodeEnum.java → .../apache/ozhera/app/enums/BizCodeEnum.java b/...om/xiaomi/mone/app/enums/BizCodeEnum.java → .../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/...om/xiaomi/mone/app/enums/CommonError.java → .../apache/ozhera/app/enums/CommonError.java b/...om/xiaomi/mone/app/enums/CommonError.java → .../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/...om/xiaomi/mone/app/enums/OperateEnum.java → .../apache/ozhera/app/enums/OperateEnum.java b/...om/xiaomi/mone/app/enums/OperateEnum.java → .../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/...a/com/xiaomi/mone/app/enums/PlatForm.java → ...org/apache/ozhera/app/enums/PlatForm.java b/...a/com/xiaomi/mone/app/enums/PlatForm.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/...aomi/mone/app/enums/PlatFormTypeEnum.java → ...he/ozhera/app/enums/PlatFormTypeEnum.java b/...aomi/mone/app/enums/PlatFormTypeEnum.java → ...he/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/...iaomi/mone/app/enums/ProjectTypeEnum.java → ...che/ozhera/app/enums/ProjectTypeEnum.java b/...iaomi/mone/app/enums/ProjectTypeEnum.java → ...che/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/...com/xiaomi/mone/app/enums/StatusEnum.java → ...g/apache/ozhera/app/enums/StatusEnum.java b/...com/xiaomi/mone/app/enums/StatusEnum.java → ...g/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/...aomi/mone/app/exception/AppException.java → ...he/ozhera/app/exception/AppException.java b/...aomi/mone/app/exception/AppException.java → ...he/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/...com/xiaomi/mone/app/model/BaseCommon.java → ...g/apache/ozhera/app/model/BaseCommon.java b/...com/xiaomi/mone/app/model/BaseCommon.java → ...g/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/...iaomi/mone/app/model/vo/HeraAppEnvVo.java → ...che/ozhera/app/model/vo/HeraAppEnvVo.java b/...iaomi/mone/app/model/vo/HeraAppEnvVo.java → ...che/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/...i/mone/app/model/vo/HeraAppOperateVo.java → ...ozhera/app/model/vo/HeraAppOperateVo.java b/...i/mone/app/model/vo/HeraAppOperateVo.java → ...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;