diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/req/CreateOrgUnitReq.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/req/CreateOrgUnitReq.java index f50d4d5..fac68c1 100644 --- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/req/CreateOrgUnitReq.java +++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/req/CreateOrgUnitReq.java @@ -7,10 +7,6 @@ import lombok.NoArgsConstructor; import java.io.Serializable; -@NoArgsConstructor -@AllArgsConstructor @Data -@Builder public class CreateOrgUnitReq implements Serializable { - } diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/req/ListOrgUnitReq.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/req/ListOrgUnitReq.java index 5b32edc..82c5e31 100644 --- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/req/ListOrgUnitReq.java +++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/req/ListOrgUnitReq.java @@ -13,4 +13,6 @@ import java.io.Serializable; @Builder public class ListOrgUnitReq implements Serializable { + private String test; + } diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/req/UpdateOrgUnitReq.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/req/UpdateOrgUnitReq.java index 19c8e8b..dfab220 100644 --- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/req/UpdateOrgUnitReq.java +++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/req/UpdateOrgUnitReq.java @@ -7,10 +7,6 @@ import lombok.NoArgsConstructor; import java.io.Serializable; -@NoArgsConstructor -@AllArgsConstructor @Data -@Builder public class UpdateOrgUnitReq implements Serializable { - } diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/CreateOrgUnitResp.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/CreateOrgUnitResp.java index ea368f3..e6ce36d 100644 --- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/CreateOrgUnitResp.java +++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/CreateOrgUnitResp.java @@ -6,11 +6,9 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; - -@NoArgsConstructor -@AllArgsConstructor @Data -@Builder public class CreateOrgUnitResp implements Serializable { + + private String test; } diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/ListOrgUnitResp.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/ListOrgUnitResp.java index ff0f2dd..028d923 100644 --- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/ListOrgUnitResp.java +++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/ListOrgUnitResp.java @@ -6,11 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; - -@NoArgsConstructor -@AllArgsConstructor @Data -@Builder public class ListOrgUnitResp implements Serializable { } diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/UpdateOrgUnitResp.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/UpdateOrgUnitResp.java index 7201e1a..04a62a5 100644 --- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/UpdateOrgUnitResp.java +++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/UpdateOrgUnitResp.java @@ -1,16 +1,9 @@ package cn.axzo.orgmanax.api.unit.resp; -import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; import java.io.Serializable; - -@NoArgsConstructor -@AllArgsConstructor @Data -@Builder public class UpdateOrgUnitResp implements Serializable { } diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/config/Config.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/config/Config.java index a1ca86b..9343216 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/config/Config.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/config/Config.java @@ -1,26 +1,21 @@ package cn.axzo.orgmanax.infra.config; import cn.axzo.foundation.web.support.AppRuntime; -import cn.axzo.foundation.web.support.apps.AppCenter; -import cn.axzo.foundation.web.support.apps.AppCenterImpl; import cn.axzo.foundation.web.support.config.DefaultWebMvcConfig; import cn.axzo.foundation.web.support.exception.AbstractExceptionHandler; import cn.axzo.foundation.web.support.log.RequestLogAspect; -import cn.axzo.foundation.web.support.rpc.RpcClient; -import cn.axzo.foundation.web.support.rpc.RpcClientImpl; import cn.axzo.orgmanax.infra.event.config.RocketMQEventConfig; -import com.google.common.collect.ImmutableMap; -import com.google.common.util.concurrent.ThreadFactoryBuilder; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration; import org.springframework.boot.task.TaskExecutorBuilder; import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.*; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.context.annotation.Profile; import org.springframework.scheduling.annotation.AsyncAnnotationBeanPostProcessor; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.function.Consumer; import static org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration.APPLICATION_TASK_EXECUTOR_BEAN_NAME; @@ -70,4 +65,9 @@ public class Config { }; } + @Bean + AppRuntime appRuntime(ApplicationContext applicationContext) { + return AppRuntime.builder().applicationContext(applicationContext).build(); + } + } diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/event/config/MQEventProducer.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/event/config/MQEventProducer.java index 1ab7e21..d41077b 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/event/config/MQEventProducer.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/event/config/MQEventProducer.java @@ -12,12 +12,4 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class MQEventProducer { - /** - * rocket - */ - private final EventProducer eventProducer; - - - - } diff --git a/orgmanax-integration/pom.xml b/orgmanax-integration/pom.xml new file mode 100644 index 0000000..32b4d4b --- /dev/null +++ b/orgmanax-integration/pom.xml @@ -0,0 +1,23 @@ + + + 4.0.0 + + cn.axzo.orgmanax + orgmanax + ${revision} + + + orgmanax-integration + + + + + cn.axzo.apollo + apollo-api + ${project.version} + + + + \ No newline at end of file diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/processor/impl/CreateNodeProcessor.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/processor/impl/CreateNodeProcessor.java index 4773577..514e525 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/processor/impl/CreateNodeProcessor.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/processor/impl/CreateNodeProcessor.java @@ -23,7 +23,6 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class CreateNodeProcessor implements NodeProcessor { private final NodeFoundationService nodeFoundationService; - private final EventProducer eventProducer; @Override public ProcessResult process(ProcessContext context) { @@ -32,7 +31,7 @@ public class CreateNodeProcessor implements NodeProcessor { // basic check param.check(); // 创建普通部门数据 - ProcessOrgNodeResp processOrgNodeResp = nodeFoundationService.create(null); + ProcessOrgNodeResp processOrgNodeResp = null; // nodeFoundationService.create(null); // 发送部门创建MQ消息 - 业务事件 // eventProducer.send(null); diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/processor/impl/CreateTeamProcessor.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/processor/impl/CreateTeamProcessor.java index 9f9253d..fde1ee3 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/processor/impl/CreateTeamProcessor.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/processor/impl/CreateTeamProcessor.java @@ -32,7 +32,7 @@ public class CreateTeamProcessor implements NodeProcessor { // 班组长 check ，如 不能是其他班组的班组长 等 // 1. 创建普通部门 - ProcessOrgNodeResp processOrgNodeResp = nodeFoundationService.create(null); +// ProcessOrgNodeResp processOrgNodeResp = nodeFoundationService.create(null); // 2. 创建班组长nodeUser // nodeUserFoundationService.create(null); @@ -45,7 +45,8 @@ public class CreateTeamProcessor implements NodeProcessor { // eventProducer.send(null); // 返回数据 - return ProcessResult.success((JSONObject) JSONObject.toJSON(processOrgNodeResp)); +// return ProcessResult.success((JSONObject) JSONObject.toJSON(processOrgNodeResp)); + return null; } @NoArgsConstructor diff --git a/orgmanax-server/src/main/resources/logback-spring.xml b/orgmanax-server/src/main/resources/logback-spring.xml deleted file mode 100644 index 7a01894..0000000 --- a/orgmanax-server/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/orgmanax-starter/pom.xml b/orgmanax-starter/pom.xml new file mode 100644 index 0000000..82bebc2 --- /dev/null +++ b/orgmanax-starter/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + cn.axzo.orgmanax + orgmanax + ${revision} + + cn.axzo.orgmanax + orgmanax-starter + + + + cn.axzo.orgmanax + orgmanax-server + ${project.version} + + + cn.axzo.orgmanax + orgmanax-infra + ${project.version} + + + cn.axzo.orgmanax + orgmanax-integration + ${project.version} + + + + \ No newline at end of file diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/OrgmanaxApplication.java b/orgmanax-starter/src/main/java/cn/axzo/orgmanax/Application.java similarity index 88% rename from orgmanax-server/src/main/java/cn/axzo/orgmanax/server/OrgmanaxApplication.java rename to orgmanax-starter/src/main/java/cn/axzo/orgmanax/Application.java index b70b2e4..0bffb88 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/OrgmanaxApplication.java +++ b/orgmanax-starter/src/main/java/cn/axzo/orgmanax/Application.java @@ -1,4 +1,4 @@ -package cn.axzo.orgmanax.server; +package cn.axzo.orgmanax; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; @@ -6,20 +6,18 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.env.Environment; -import static cn.axzo.orgmanax.server.OrgmanaxApplication.DEFAULT_DIR; - /** * @author tanjie@axzo.cn * @date 2024/11/28 15:54 */ -@SpringBootApplication(scanBasePackages = DEFAULT_DIR) +@SpringBootApplication(scanBasePackages = Application.DEFAULT_DIR) @Slf4j -public class OrgmanaxApplication { +public class Application { public static final String DEFAULT_DIR = "cn.axzo.orgmanax"; public static void main(String[] args) { - ConfigurableApplicationContext run = SpringApplication.run(OrgmanaxApplication.class, args); + ConfigurableApplicationContext run = SpringApplication.run(Application.class, args); Environment env = run.getEnvironment(); log.info( "--------------------------------------------------------------------------------------------------------------------\n" + diff --git a/orgmanax-starter/src/main/java/cn/axzo/orgmanax/DevApplication.java b/orgmanax-starter/src/main/java/cn/axzo/orgmanax/DevApplication.java new file mode 100644 index 0000000..5250303 --- /dev/null +++ b/orgmanax-starter/src/main/java/cn/axzo/orgmanax/DevApplication.java @@ -0,0 +1,55 @@ +package cn.axzo.orgmanax; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.core.env.Environment; + +/** + * @author tanjie@axzo.cn + * @date 2024/11/28 15:54 + */ +@SpringBootApplication(scanBasePackages = DevApplication.DEFAULT_DIR) +@Slf4j +public class DevApplication { + + public static final String DEFAULT_DIR = "cn.axzo.orgmanax"; + + public static void main(String[] args) { +// System.setProperty("rocket.consumer.listeners.disable", "true"); + System.setProperty("spring.profiles.active","dev"); + System.setProperty("NACOS_HOST","https://dev-nacos.axzo.cn"); + System.setProperty("NACOS_PORT","443"); + System.setProperty("NACOS_NAMESPACE_ID","35eada10-9574-4db8-9fea-bc6a4960b6c7"); + System.setProperty("CUSTOM_ENV","dev"); + System.setProperty("spring.datasource.url","jdbc:mysql://172.16.2.171:3306/pudge?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=true&verifyServerCertificate=false&rewriteBatchedStatements=true"); + System.setProperty("spring.redis.port","6379"); + System.setProperty("spring.redis.host","172.16.2.219"); + System.setProperty("spring.redis.database","5"); + System.setProperty("spring.redis.password","!rHV2!fctYtV4vF"); + System.setProperty("xxl.job.admin.addresses","http://dev-xxl-job.axzo.cn/xxl-job-admin"); + System.setProperty("rocketmq.name-server", "172.16.2.82:9876"); + SpringApplication application = new SpringApplication(DevApplication.class); + ConfigurableApplicationContext run = application.run(args); + Environment env = run.getEnvironment(); + log.info( + "--------------------------------------------------------------------------------------------------------------------\n" + + "Application 【{}】 is running on 【{}】 environment!\n" + + "Api Local: \thttp://127.0.0.1:{}\n" + + "Mysql: \t{}\t username:{}\n" + + "Redis: \t{}:{}\t database:{}\n" + + "RabbitMQ: \t{}\t username:{}", + env.getProperty("spring.application.name"), + env.getProperty("spring.profiles.active"), + env.getProperty("server.port"), + env.getProperty("spring.datasource.url"), + env.getProperty("spring.datasource.username"), + env.getProperty("spring.redis.host"), + env.getProperty("spring.redis.port"), + env.getProperty("spring.redis.database"), + env.getProperty("spring.rabbitmq.addresses"), + env.getProperty("spring.rabbitmq.username") + + "\n----------------------------------------------------------"); + } +} \ No newline at end of file diff --git a/orgmanax-server/src/main/resources/bootstrap.yml b/orgmanax-starter/src/main/resources/bootstrap.yml similarity index 99% rename from orgmanax-server/src/main/resources/bootstrap.yml rename to orgmanax-starter/src/main/resources/bootstrap.yml index 1c1d23f..899e026 100644 --- a/orgmanax-server/src/main/resources/bootstrap.yml +++ b/orgmanax-starter/src/main/resources/bootstrap.yml @@ -27,4 +27,3 @@ spring: # 优雅关闭 server: shutdown: graceful - diff --git a/orgmanax-starter/src/main/resources/logback-spring.xml b/orgmanax-starter/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..c0138a3 --- /dev/null +++ b/orgmanax-starter/src/main/resources/logback-spring.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + ${appName} + + + + + ${PATTERN_CONSOLE} + UTF-8 + + + + + + + ${PATTERN_FILE} + + + + ${LOG_PATH}/${LOG_FILE} + + + ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_PATH}/${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz} + + ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} + + ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} + + ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-1GB} + + ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30} + + + + + + + 0 + + 256 + + + + + + + + + @timestamp + yyyy-MM-dd'T'HH:mm:ss.SSSx + GMT+8 + + + + { + "app":"${appName}", + "level":"%level", + "traceId":"%X{ctxLogId}", + "thread":"%thread", + "class":"%logger{40}", + "message":"%replace(%message){'^(.{3000}).*$', '$1'}", + "error_level":"%X{errorLevel}", + "error_type":"%X{errorType}", + "stack_trace":"%exception{20}" + } + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 18a4f81..40da429 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 2.0.0-SNAPSHOT 2021.1 3.0.6 - 3.5.6 + 2.2.3 2.0.0-SNAPSHOT 2.0.0-SNAPSHOT @@ -71,11 +71,6 @@ unittest-support-lib ${foundation-support-lib} - - com.baomidou - mybatis-plus-boot-starter - ${mybatis-plus.version} - org.apache.rocketmq rocketmq-spring-boot-starter @@ -119,5 +114,7 @@ orgmanax-common orgmanax-server orgmanax-infra + orgmanax-starter + orgmanax-integration