diff --git a/.gitignore b/.gitignore index 8534072..eeec857 100644 --- a/.gitignore +++ b/.gitignore @@ -4,11 +4,8 @@ target/ !**/src/test/**/target/ ### IntelliJ IDEA ### -.idea/modules.xml -.idea/jarRepositories.xml -.idea/compiler.xml -.idea/libraries/ -.idea +*/target/ +.idea/ *.iws *.iml *.ipr diff --git a/Dockerfile b/Dockerfile index 69c0b9f..006e539 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM harbor.axzo.cn/images_base/jdk1.8-fc:v1 -COPY server/target/demo-server.jar ./demo-server.jar +FROM registry.cn-hangzhou.aliyuncs.com/axzo-k8s/jdk1.8-fc:v1 +COPY orgmanax-server/target/maokai.jar ./orgmanax.jar ENTRYPOINT [{ENTRYPOINT}] diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/config/OrgmanaxApiConfig.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/config/OrgmanaxApiConfig.java similarity index 69% rename from orgmanax-api/src/main/java/cn/axzo/orgmanax/config/OrgmanaxApiConfig.java rename to orgmanax-api/src/main/java/cn/axzo/orgmanax/api/config/OrgmanaxApiConfig.java index 5945d59..6580f64 100644 --- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/config/OrgmanaxApiConfig.java +++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/config/OrgmanaxApiConfig.java @@ -1,4 +1,4 @@ -package cn.axzo.orgmanax.config; +package cn.axzo.orgmanax.api.config; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Configuration; @@ -8,6 +8,6 @@ import org.springframework.context.annotation.Configuration; * @date 2022/4/25 10:48 */ @Configuration -@EnableFeignClients(basePackages = "cn.axzo.orgmanax.feign") +@EnableFeignClients(basePackages = "cn.axzo.orgmanax.api.feign") public class OrgmanaxApiConfig { } diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/feign/OrganizationalNodeApi.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/feign/OrganizationalNodeApi.java new file mode 100644 index 0000000..0d9c0ee --- /dev/null +++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/feign/OrganizationalNodeApi.java @@ -0,0 +1,15 @@ +package cn.axzo.orgmanax.api.feign; + +import org.springframework.cloud.openfeign.FeignClient; + +/** + * @author tanjie@axzo.cn + * @date 2024/12/2 15:40 + */ +@FeignClient( + value = "orgmanax", + url = "${axzo.service.orgmanax:http://orgmanax:8080}") +public interface OrganizationalNodeApi { + + +} diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/feign/OrganizationalUnitApi.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/feign/OrganizationalUnitApi.java similarity index 87% rename from orgmanax-api/src/main/java/cn/axzo/orgmanax/feign/OrganizationalUnitApi.java rename to orgmanax-api/src/main/java/cn/axzo/orgmanax/api/feign/OrganizationalUnitApi.java index ea54391..d2e9fd9 100644 --- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/feign/OrganizationalUnitApi.java +++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/feign/OrganizationalUnitApi.java @@ -1,4 +1,4 @@ -package cn.axzo.orgmanax.feign; +package cn.axzo.orgmanax.api.feign; diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/package-info.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/package-info.java similarity index 89% rename from orgmanax-api/src/main/java/cn/axzo/orgmanax/package-info.java rename to orgmanax-api/src/main/java/cn/axzo/orgmanax/api/package-info.java index 151b46f..c22d243 100644 --- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/package-info.java +++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/package-info.java @@ -1,4 +1,4 @@ -package cn.axzo.orgmanax; +package cn.axzo.orgmanax.api; /** diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/req/package-info.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/req/package-info.java new file mode 100644 index 0000000..b47014b --- /dev/null +++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/req/package-info.java @@ -0,0 +1 @@ +package cn.axzo.orgmanax.api.req; \ No newline at end of file diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/resp/package-info.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/resp/package-info.java new file mode 100644 index 0000000..88341a1 --- /dev/null +++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/resp/package-info.java @@ -0,0 +1 @@ +package cn.axzo.orgmanax.api.resp; \ No newline at end of file diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/req/package-info.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/req/package-info.java deleted file mode 100644 index 0cb6048..0000000 --- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/req/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.axzo.orgmanax.req; \ No newline at end of file diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/resp/package-info.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/resp/package-info.java deleted file mode 100644 index ba75a89..0000000 --- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/resp/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.axzo.orgmanax.resp; \ No newline at end of file diff --git a/orgmanax-api/src/resources/META-INF/spring.factories b/orgmanax-api/src/resources/META-INF/spring.factories index 90a378b..daf44a8 100644 --- a/orgmanax-api/src/resources/META-INF/spring.factories +++ b/orgmanax-api/src/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -cn.axzo.orgmanax.config.OrgmanaxApiConfig \ No newline at end of file +cn.axzo.orgmanax.api.config.OrgmanaxApiConfig \ No newline at end of file diff --git a/orgmanax-common/.gitignore b/orgmanax-common/.gitignore deleted file mode 100644 index 5ff6309..0000000 --- a/orgmanax-common/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### IntelliJ IDEA ### -.idea/modules.xml -.idea/jarRepositories.xml -.idea/compiler.xml -.idea/libraries/ -*.iws -*.iml -*.ipr - -### Eclipse ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ - -### Mac OS ### -.DS_Store \ No newline at end of file diff --git a/orgmanax-common/src/main/java/cn/axzo/orgmanax/config/package-info.java b/orgmanax-common/src/main/java/cn/axzo/orgmanax/common/config/package-info.java similarity index 51% rename from orgmanax-common/src/main/java/cn/axzo/orgmanax/config/package-info.java rename to orgmanax-common/src/main/java/cn/axzo/orgmanax/common/config/package-info.java index 43a496b..0807ad5 100644 --- a/orgmanax-common/src/main/java/cn/axzo/orgmanax/config/package-info.java +++ b/orgmanax-common/src/main/java/cn/axzo/orgmanax/common/config/package-info.java @@ -1,4 +1,4 @@ -package cn.axzo.orgmanax.config; +package cn.axzo.orgmanax.common.config; /** * 公共组件、枚举等 * diff --git a/orgmanax-domain/.gitignore b/orgmanax-domain/.gitignore deleted file mode 100644 index 5ff6309..0000000 --- a/orgmanax-domain/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### IntelliJ IDEA ### -.idea/modules.xml -.idea/jarRepositories.xml -.idea/compiler.xml -.idea/libraries/ -*.iws -*.iml -*.ipr - -### Eclipse ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ - -### Mac OS ### -.DS_Store \ No newline at end of file diff --git a/orgmanax-domain/src/main/java/cn/axzo/orgmanax/Main.java b/orgmanax-domain/src/main/java/cn/axzo/orgmanax/Main.java deleted file mode 100644 index 8d79101..0000000 --- a/orgmanax-domain/src/main/java/cn/axzo/orgmanax/Main.java +++ /dev/null @@ -1,11 +0,0 @@ -package cn.axzo.orgmanax; - -/** - * @author tanjie@axzo.cn - * @date 2024/11/28 15:52 - */ -public class Main { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} \ No newline at end of file diff --git a/orgmanax-domain/src/main/java/cn/axzo/orgmanax/domain/pakcage-info.java b/orgmanax-domain/src/main/java/cn/axzo/orgmanax/domain/pakcage-info.java new file mode 100644 index 0000000..174404d --- /dev/null +++ b/orgmanax-domain/src/main/java/cn/axzo/orgmanax/domain/pakcage-info.java @@ -0,0 +1,4 @@ +/** + * @#{(#)package-info.java } + * 领域层 + */ \ No newline at end of file diff --git a/orgmanax-infra/.gitignore b/orgmanax-infra/.gitignore deleted file mode 100644 index 5ff6309..0000000 --- a/orgmanax-infra/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### IntelliJ IDEA ### -.idea/modules.xml -.idea/jarRepositories.xml -.idea/compiler.xml -.idea/libraries/ -*.iws -*.iml -*.ipr - -### Eclipse ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ - -### Mac OS ### -.DS_Store \ No newline at end of file diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/client/RpcClientHolder.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/RpcClientHolder.java similarity index 97% rename from orgmanax-infra/src/main/java/cn/axzo/orgmanax/client/RpcClientHolder.java rename to orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/RpcClientHolder.java index ee524ea..11e33c5 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/client/RpcClientHolder.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/RpcClientHolder.java @@ -1,4 +1,4 @@ -package cn.axzo.orgmanax.client; +package cn.axzo.orgmanax.infra.client; import cn.axzo.foundation.web.support.apps.AppCenter; import cn.axzo.foundation.web.support.rpc.RpcClient; diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/config/Config.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/config/Config.java similarity index 99% rename from orgmanax-infra/src/main/java/cn/axzo/orgmanax/config/Config.java rename to orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/config/Config.java index 277fea7..61da658 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/config/Config.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/config/Config.java @@ -1,4 +1,4 @@ -package cn.axzo.orgmanax.config; +package cn.axzo.orgmanax.infra.config; import cn.axzo.foundation.web.support.AppRuntime; import cn.axzo.foundation.web.support.apps.AppCenter; diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/config/MybatisPlusConfig.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/config/MybatisPlusConfig.java similarity index 97% rename from orgmanax-infra/src/main/java/cn/axzo/orgmanax/config/MybatisPlusConfig.java rename to orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/config/MybatisPlusConfig.java index 9ff8d07..4ba6c81 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/config/MybatisPlusConfig.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package cn.axzo.orgmanax.config; +package cn.axzo.orgmanax.infra.config; import cn.axzo.foundation.dao.support.mysql.plugins.LimitInterceptor; import cn.axzo.foundation.web.support.conditional.LocalCondition; diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/config/RocketMQEventConfig.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/config/RocketMQEventConfig.java similarity index 99% rename from orgmanax-infra/src/main/java/cn/axzo/orgmanax/config/RocketMQEventConfig.java rename to orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/config/RocketMQEventConfig.java index ccb7da8..25e9dd4 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/config/RocketMQEventConfig.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/config/RocketMQEventConfig.java @@ -1,4 +1,4 @@ -package cn.axzo.orgmanax.config; +package cn.axzo.orgmanax.infra.config; import cn.axzo.foundation.event.support.consumer.*; import cn.axzo.foundation.event.support.producer.EventProducer; diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/package-info.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/package-info.java similarity index 76% rename from orgmanax-infra/src/main/java/cn/axzo/orgmanax/package-info.java rename to orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/package-info.java index 8e9e44b..8ea01fe 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/package-info.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/package-info.java @@ -1,4 +1,4 @@ -package cn.axzo.orgmanax; +package cn.axzo.orgmanax.infra; /** * @(#)package-info.java * 基础设施层 diff --git a/orgmanax-server/.gitignore b/orgmanax-server/.gitignore deleted file mode 100644 index 5ff6309..0000000 --- a/orgmanax-server/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### IntelliJ IDEA ### -.idea/modules.xml -.idea/jarRepositories.xml -.idea/compiler.xml -.idea/libraries/ -*.iws -*.iml -*.ipr - -### Eclipse ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ - -### Mac OS ### -.DS_Store \ No newline at end of file diff --git a/orgmanax-server/pom.xml b/orgmanax-server/pom.xml index 72febef..1c6172c 100644 --- a/orgmanax-server/pom.xml +++ b/orgmanax-server/pom.xml @@ -23,15 +23,18 @@ orgmanax-domain ${project.version} + cn.axzo.orgmanax orgmanax-infra ${project.version} + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config + org.springframework.cloud spring-cloud-starter-bootstrap diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/OrgmanaxApplication.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/OrgmanaxApplication.java similarity index 98% rename from orgmanax-server/src/main/java/cn/axzo/orgmanax/OrgmanaxApplication.java rename to orgmanax-server/src/main/java/cn/axzo/orgmanax/server/OrgmanaxApplication.java index 66571a4..8947a64 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/OrgmanaxApplication.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/OrgmanaxApplication.java @@ -1,4 +1,4 @@ -package cn.axzo.orgmanax; +package cn.axzo.orgmanax.server; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/controller/pakcage-info.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/controller/pakcage-info.java similarity index 100% rename from orgmanax-server/src/main/java/cn/axzo/orgmanax/controller/pakcage-info.java rename to orgmanax-server/src/main/java/cn/axzo/orgmanax/server/controller/pakcage-info.java diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/controller/unit/OrganizationalUnit.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/controller/unit/OrganizationalUnit.java similarity index 85% rename from orgmanax-server/src/main/java/cn/axzo/orgmanax/controller/unit/OrganizationalUnit.java rename to orgmanax-server/src/main/java/cn/axzo/orgmanax/server/controller/unit/OrganizationalUnit.java index 2b8baad..db80f47 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/controller/unit/OrganizationalUnit.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/controller/unit/OrganizationalUnit.java @@ -1,4 +1,4 @@ -package cn.axzo.orgmanax.controller.unit; +package cn.axzo.orgmanax.server.controller.unit; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/service/package-info.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/service/package-info.java similarity index 82% rename from orgmanax-server/src/main/java/cn/axzo/orgmanax/service/package-info.java rename to orgmanax-server/src/main/java/cn/axzo/orgmanax/server/service/package-info.java index 815cd08..ed02ace 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/service/package-info.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/service/package-info.java @@ -1,5 +1,5 @@ -package cn.axzo.orgmanax.service; +package cn.axzo.orgmanax.server.service; /** * @(#)service层 * 该层为业务实现，但是只关注业务的流程，针对domain或者infra完成整个业务的编排。不包含具体业务逻辑实现。