diff --git a/Dockerfile b/Dockerfile index edcbcf2..4fb9b8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ FROM harbor.axzo.cn/images_base/jdk1.8-fc:v1 -COPY xlog-server/target/xlog-server.jar ./xlog.jar +COPY axzo-log-server/target/axzo-log-server.jar ./xlog.jar ENTRYPOINT [{ENTRYPOINT}] diff --git a/xlog-client/pom.xml b/axzo-log-api/pom.xml similarity index 85% rename from xlog-client/pom.xml rename to axzo-log-api/pom.xml index e747966..da3e474 100644 --- a/xlog-client/pom.xml +++ b/axzo-log-api/pom.xml @@ -1,19 +1,16 @@ - - xlog - cn.axzo.xlog - 1.0.0-SNAPSHOT - ../pom.xml + axzo-log-plat + cn.axzo.platform + 1.0-SNAPSHOT - 4.0.0 - xlog-client + axzo-log-api jar - xlog-client + axzo-log-api http://maven.apache.org @@ -21,7 +18,6 @@ - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/xlog-client/src/main/java/cn/axzo/xlog/client/XLogClient.java b/axzo-log-api/src/main/java/cn/axzo/log/platform/client/XLogClient.java similarity index 78% rename from xlog-client/src/main/java/cn/axzo/xlog/client/XLogClient.java rename to axzo-log-api/src/main/java/cn/axzo/log/platform/client/XLogClient.java index 665a9ba..466b5f7 100644 --- a/xlog-client/src/main/java/cn/axzo/xlog/client/XLogClient.java +++ b/axzo-log-api/src/main/java/cn/axzo/log/platform/client/XLogClient.java @@ -1,9 +1,9 @@ -package cn.axzo.xlog.client; +package cn.axzo.log.platform.client; -import cn.axzo.xlog.client.feign.XLogApi; -import cn.axzo.xlog.client.model.OperateLogQueryReq; -import cn.axzo.xlog.client.model.OperateLogQueryResp; -import cn.axzo.xlog.client.model.OperateLogReq; +import cn.axzo.log.platform.client.feign.XLogApi; +import cn.axzo.log.platform.client.model.OperateLogQueryReq; +import cn.axzo.log.platform.client.model.OperateLogQueryResp; +import cn.axzo.log.platform.client.model.OperateLogReq; import cn.azxo.framework.common.model.CommonPageResponse; import cn.azxo.framework.common.model.CommonResponse; import lombok.RequiredArgsConstructor; diff --git a/xlog-client/src/main/java/cn/axzo/xlog/client/config/XLogClientAutoConfiguration.java b/axzo-log-api/src/main/java/cn/axzo/log/platform/client/config/XLogClientAutoConfiguration.java similarity index 71% rename from xlog-client/src/main/java/cn/axzo/xlog/client/config/XLogClientAutoConfiguration.java rename to axzo-log-api/src/main/java/cn/axzo/log/platform/client/config/XLogClientAutoConfiguration.java index f65e442..e19594b 100644 --- a/xlog-client/src/main/java/cn/axzo/xlog/client/config/XLogClientAutoConfiguration.java +++ b/axzo-log-api/src/main/java/cn/axzo/log/platform/client/config/XLogClientAutoConfiguration.java @@ -1,7 +1,8 @@ -package cn.axzo.xlog.client.config; +package cn.axzo.log.platform.client.config; -import cn.axzo.xlog.client.XLogClient; -import cn.axzo.xlog.client.feign.XLogApi; + +import cn.axzo.log.platform.client.XLogClient; +import cn.axzo.log.platform.client.feign.XLogApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/xlog-client/src/main/java/cn/axzo/xlog/client/feign/XLogApi.java b/axzo-log-api/src/main/java/cn/axzo/log/platform/client/feign/XLogApi.java similarity index 73% rename from xlog-client/src/main/java/cn/axzo/xlog/client/feign/XLogApi.java rename to axzo-log-api/src/main/java/cn/axzo/log/platform/client/feign/XLogApi.java index 8006394..026b6e8 100644 --- a/xlog-client/src/main/java/cn/axzo/xlog/client/feign/XLogApi.java +++ b/axzo-log-api/src/main/java/cn/axzo/log/platform/client/feign/XLogApi.java @@ -1,8 +1,8 @@ -package cn.axzo.xlog.client.feign; +package cn.axzo.log.platform.client.feign; -import cn.axzo.xlog.client.model.OperateLogQueryReq; -import cn.axzo.xlog.client.model.OperateLogQueryResp; -import cn.axzo.xlog.client.model.OperateLogReq; +import cn.axzo.log.platform.client.model.OperateLogQueryReq; +import cn.axzo.log.platform.client.model.OperateLogQueryResp; +import cn.axzo.log.platform.client.model.OperateLogReq; import cn.azxo.framework.common.model.CommonPageResponse; import cn.azxo.framework.common.model.CommonResponse; import org.springframework.cloud.openfeign.FeignClient; @@ -18,7 +18,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; * @description: TODO * @date: 2022/9/16 */ -@FeignClient(name = "xlog", url = "http://xlog:10999", fallbackFactory = XLogApiFallback.class) +@FeignClient(name = "xlog", url = "http://xlog:8080", fallbackFactory = XLogApiFallback.class) public interface XLogApi { @PostMapping(value = "/api/operateLog/create", consumes = APPLICATION_JSON_VALUE) diff --git a/xlog-client/src/main/java/cn/axzo/xlog/client/feign/XLogApiFallback.java b/axzo-log-api/src/main/java/cn/axzo/log/platform/client/feign/XLogApiFallback.java similarity index 76% rename from xlog-client/src/main/java/cn/axzo/xlog/client/feign/XLogApiFallback.java rename to axzo-log-api/src/main/java/cn/axzo/log/platform/client/feign/XLogApiFallback.java index c0d7246..7f699ed 100644 --- a/xlog-client/src/main/java/cn/axzo/xlog/client/feign/XLogApiFallback.java +++ b/axzo-log-api/src/main/java/cn/axzo/log/platform/client/feign/XLogApiFallback.java @@ -1,8 +1,8 @@ -package cn.axzo.xlog.client.feign; +package cn.axzo.log.platform.client.feign; -import cn.axzo.xlog.client.model.OperateLogQueryReq; -import cn.axzo.xlog.client.model.OperateLogQueryResp; -import cn.axzo.xlog.client.model.OperateLogReq; +import cn.axzo.log.platform.client.model.OperateLogQueryReq; +import cn.axzo.log.platform.client.model.OperateLogQueryResp; +import cn.axzo.log.platform.client.model.OperateLogReq; import cn.azxo.framework.common.model.CommonPageResponse; import cn.azxo.framework.common.model.CommonResponse; import com.alibaba.fastjson.JSON; @@ -16,7 +16,7 @@ import lombok.extern.slf4j.Slf4j; */ @Slf4j @RequiredArgsConstructor -public class XLogApiFallback implements XLogApi{ +public class XLogApiFallback implements XLogApi { @Override public CommonResponse operateLogCreate(OperateLogReq req) { diff --git a/xlog-client/src/main/java/cn/axzo/xlog/client/model/OperateLogQueryReq.java b/axzo-log-api/src/main/java/cn/axzo/log/platform/client/model/OperateLogQueryReq.java similarity index 96% rename from xlog-client/src/main/java/cn/axzo/xlog/client/model/OperateLogQueryReq.java rename to axzo-log-api/src/main/java/cn/axzo/log/platform/client/model/OperateLogQueryReq.java index 44bb71c..b9ff878 100644 --- a/xlog-client/src/main/java/cn/axzo/xlog/client/model/OperateLogQueryReq.java +++ b/axzo-log-api/src/main/java/cn/axzo/log/platform/client/model/OperateLogQueryReq.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.client.model; +package cn.axzo.log.platform.client.model; import cn.axzo.core.domain.PageRequest; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/xlog-client/src/main/java/cn/axzo/xlog/client/model/OperateLogQueryResp.java b/axzo-log-api/src/main/java/cn/axzo/log/platform/client/model/OperateLogQueryResp.java similarity index 94% rename from xlog-client/src/main/java/cn/axzo/xlog/client/model/OperateLogQueryResp.java rename to axzo-log-api/src/main/java/cn/axzo/log/platform/client/model/OperateLogQueryResp.java index a39e7d3..6765046 100644 --- a/xlog-client/src/main/java/cn/axzo/xlog/client/model/OperateLogQueryResp.java +++ b/axzo-log-api/src/main/java/cn/axzo/log/platform/client/model/OperateLogQueryResp.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.client.model; +package cn.axzo.log.platform.client.model; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/xlog-client/src/main/java/cn/axzo/xlog/client/model/OperateLogReq.java b/axzo-log-api/src/main/java/cn/axzo/log/platform/client/model/OperateLogReq.java similarity index 98% rename from xlog-client/src/main/java/cn/axzo/xlog/client/model/OperateLogReq.java rename to axzo-log-api/src/main/java/cn/axzo/log/platform/client/model/OperateLogReq.java index 3c9510b..c27466e 100644 --- a/xlog-client/src/main/java/cn/axzo/xlog/client/model/OperateLogReq.java +++ b/axzo-log-api/src/main/java/cn/axzo/log/platform/client/model/OperateLogReq.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.client.model; +package cn.axzo.log.platform.client.model; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; diff --git a/xlog-client/src/main/resources/META-INF/spring.factories b/axzo-log-api/src/main/resources/META-INF/spring.factories similarity index 50% rename from xlog-client/src/main/resources/META-INF/spring.factories rename to axzo-log-api/src/main/resources/META-INF/spring.factories index 324af78..2ba58bb 100644 --- a/xlog-client/src/main/resources/META-INF/spring.factories +++ b/axzo-log-api/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -cn.axzo.xlog.client.config.XLogClientAutoConfiguration \ No newline at end of file +cn.axzo.log.platform.client.config.XLogClientAutoConfiguration \ No newline at end of file diff --git a/axzo-log-api/src/test/java/cn/axzo/log/platform/client/AppTest.java b/axzo-log-api/src/test/java/cn/axzo/log/platform/client/AppTest.java new file mode 100644 index 0000000..4735dae --- /dev/null +++ b/axzo-log-api/src/test/java/cn/axzo/log/platform/client/AppTest.java @@ -0,0 +1,8 @@ +package cn.axzo.log.platform.client; + +/** + * Unit test for simple App. + */ +public class AppTest { + +} diff --git a/xlog-server/pom.xml b/axzo-log-server/pom.xml similarity index 95% rename from xlog-server/pom.xml rename to axzo-log-server/pom.xml index cde2310..f7fc208 100644 --- a/xlog-server/pom.xml +++ b/axzo-log-server/pom.xml @@ -1,18 +1,16 @@ - xlog - cn.axzo.xlog - 1.0.0-SNAPSHOT - ../pom.xml + axzo-log-plat + cn.axzo.platform + 1.0-SNAPSHOT - 4.0.0 - xlog-server + axzo-log-server jar - xlog-server + axzo-log-server http://maven.apache.org @@ -127,7 +125,6 @@ cn.axzo.basics basics-profiles-api - diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/XlogApplication.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/XlogApplication.java similarity index 94% rename from xlog-server/src/main/java/cn/axzo/xlog/server/XlogApplication.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/XlogApplication.java index d66909c..9aa42f8 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/XlogApplication.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/XlogApplication.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.server; +package cn.axzo.log.platform.server; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,7 +22,7 @@ import org.springframework.core.env.Environment; "cn.axzo.basics" }) @EnableDiscoveryClient -@SpringBootApplication(scanBasePackages = "cn.axzo.xlog.server") +@SpringBootApplication(scanBasePackages = "cn.axzo.log.platform.server") public class XlogApplication { private static final Logger logger = LoggerFactory.getLogger(XlogApplication.class); diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/config/EsClientConfig.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/config/EsClientConfig.java similarity index 98% rename from xlog-server/src/main/java/cn/axzo/xlog/server/config/EsClientConfig.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/config/EsClientConfig.java index 9eccf39..75c320c 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/config/EsClientConfig.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/config/EsClientConfig.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.server.config; +package cn.axzo.log.platform.server.config; import org.apache.http.HttpHost; import org.apache.http.auth.AuthScope; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/config/FeignConfig.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/config/FeignConfig.java similarity index 99% rename from xlog-server/src/main/java/cn/axzo/xlog/server/config/FeignConfig.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/config/FeignConfig.java index 98195d8..f13cfc9 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/config/FeignConfig.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/config/FeignConfig.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.server.config; +package cn.axzo.log.platform.server.config; import cn.axzo.pudge.core.service.ServiceException; import cn.azxo.framework.common.constatns.Constants; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/config/MybatisPlusConfig.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/config/MybatisPlusConfig.java similarity index 95% rename from xlog-server/src/main/java/cn/axzo/xlog/server/config/MybatisPlusConfig.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/config/MybatisPlusConfig.java index 7c5a58f..6c99bf4 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/config/MybatisPlusConfig.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/config/MybatisPlusConfig.java @@ -1,6 +1,6 @@ -package cn.axzo.xlog.server.config; +package cn.axzo.log.platform.server.config; -import cn.axzo.xlog.server.entity.BaseEntity; +import cn.axzo.log.platform.server.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/config/RabbitMqConfig.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/config/RabbitMqConfig.java similarity index 97% rename from xlog-server/src/main/java/cn/axzo/xlog/server/config/RabbitMqConfig.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/config/RabbitMqConfig.java index 3594bb0..8658b92 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/config/RabbitMqConfig.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/config/RabbitMqConfig.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.server.config; +package cn.axzo.log.platform.server.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/config/SpringContextAware.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/config/SpringContextAware.java similarity index 94% rename from xlog-server/src/main/java/cn/axzo/xlog/server/config/SpringContextAware.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/config/SpringContextAware.java index 44273da..0ab5639 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/config/SpringContextAware.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/config/SpringContextAware.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.server.config; +package cn.axzo.log.platform.server.config; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/consumer/OperateLogMqConsumer.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/consumer/OperateLogMqConsumer.java similarity index 85% rename from xlog-server/src/main/java/cn/axzo/xlog/server/consumer/OperateLogMqConsumer.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/consumer/OperateLogMqConsumer.java index bebf809..1a5db85 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/consumer/OperateLogMqConsumer.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/consumer/OperateLogMqConsumer.java @@ -1,8 +1,8 @@ -package cn.axzo.xlog.server.consumer; +package cn.axzo.log.platform.server.consumer; -import cn.axzo.xlog.server.config.RabbitMqConfig; -import cn.axzo.xlog.server.dto.OperateLogReqDTO; -import cn.axzo.xlog.server.service.OperateLogService; +import cn.axzo.log.platform.server.config.RabbitMqConfig; +import cn.axzo.log.platform.server.dto.OperateLogReqDTO; +import cn.axzo.log.platform.server.service.OperateLogService; import com.alibaba.fastjson.JSONObject; import com.rabbitmq.client.Channel; import org.slf4j.Logger; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/controller/HealthCheckController.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/controller/HealthCheckController.java similarity index 89% rename from xlog-server/src/main/java/cn/axzo/xlog/server/controller/HealthCheckController.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/controller/HealthCheckController.java index 1887421..c511472 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/controller/HealthCheckController.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/controller/HealthCheckController.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.server.controller; +package cn.axzo.log.platform.server.controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/controller/api/OperateLogController.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/controller/api/OperateLogController.java similarity index 90% rename from xlog-server/src/main/java/cn/axzo/xlog/server/controller/api/OperateLogController.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/controller/api/OperateLogController.java index fb5a465..c6f864f 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/controller/api/OperateLogController.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/controller/api/OperateLogController.java @@ -1,9 +1,9 @@ -package cn.axzo.xlog.server.controller.api; +package cn.axzo.log.platform.server.controller.api; -import cn.axzo.xlog.server.dto.OperateLogQueryReqDTO; -import cn.axzo.xlog.server.dto.OperateLogQueryRespDTO; -import cn.axzo.xlog.server.dto.OperateLogReqDTO; -import cn.axzo.xlog.server.service.OperateLogService; +import cn.axzo.log.platform.server.dto.OperateLogQueryReqDTO; +import cn.axzo.log.platform.server.dto.OperateLogQueryRespDTO; +import cn.axzo.log.platform.server.dto.OperateLogReqDTO; +import cn.axzo.log.platform.server.service.OperateLogService; import cn.azxo.framework.common.model.CommonPageResponse; import cn.azxo.framework.common.model.CommonResponse; import cn.hutool.core.date.DateUtil; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/dto/OperateLogQueryReqDTO.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogQueryReqDTO.java similarity index 98% rename from xlog-server/src/main/java/cn/axzo/xlog/server/dto/OperateLogQueryReqDTO.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogQueryReqDTO.java index ccc9a87..5e1cfac 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/dto/OperateLogQueryReqDTO.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogQueryReqDTO.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.server.dto; +package cn.axzo.log.platform.server.dto; import cn.axzo.basics.common.page.PageRequest; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/dto/OperateLogQueryRespDTO.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogQueryRespDTO.java similarity index 95% rename from xlog-server/src/main/java/cn/axzo/xlog/server/dto/OperateLogQueryRespDTO.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogQueryRespDTO.java index e205369..2f7fee0 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/dto/OperateLogQueryRespDTO.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogQueryRespDTO.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.server.dto; +package cn.axzo.log.platform.server.dto; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/dto/OperateLogReqDTO.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogReqDTO.java similarity index 98% rename from xlog-server/src/main/java/cn/axzo/xlog/server/dto/OperateLogReqDTO.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogReqDTO.java index 0eb3d71..25a5bc3 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/dto/OperateLogReqDTO.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/OperateLogReqDTO.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.server.dto; +package cn.axzo.log.platform.server.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/entity/BaseEntity.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/entity/BaseEntity.java similarity index 95% rename from xlog-server/src/main/java/cn/axzo/xlog/server/entity/BaseEntity.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/entity/BaseEntity.java index 973cb7e..4039066 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/entity/BaseEntity.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.server.entity; +package cn.axzo.log.platform.server.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/entity/OperateLogRecordEntity.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/entity/OperateLogRecordEntity.java similarity index 98% rename from xlog-server/src/main/java/cn/axzo/xlog/server/entity/OperateLogRecordEntity.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/entity/OperateLogRecordEntity.java index cb7ce8e..7c78196 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/entity/OperateLogRecordEntity.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/entity/OperateLogRecordEntity.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.server.entity; +package cn.axzo.log.platform.server.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.EqualsAndHashCode; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/enums/IEnum.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/enums/IEnum.java similarity index 93% rename from xlog-server/src/main/java/cn/axzo/xlog/server/enums/IEnum.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/enums/IEnum.java index 9a51e6b..2db5346 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/enums/IEnum.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/enums/IEnum.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.server.enums; +package cn.axzo.log.platform.server.enums; /** * 项目名称:pudge diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/enums/IdentityType.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/enums/IdentityType.java similarity index 93% rename from xlog-server/src/main/java/cn/axzo/xlog/server/enums/IdentityType.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/enums/IdentityType.java index 8145669..f77c72d 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/enums/IdentityType.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/enums/IdentityType.java @@ -1,6 +1,6 @@ -package cn.axzo.xlog.server.enums; +package cn.axzo.log.platform.server.enums; -import cn.axzo.xlog.server.exception.ServiceException; +import cn.axzo.log.platform.server.exception.ServiceException; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonValue; import lombok.AllArgsConstructor; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/enums/LogGradeEnum.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/enums/LogGradeEnum.java similarity index 90% rename from xlog-server/src/main/java/cn/axzo/xlog/server/enums/LogGradeEnum.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/enums/LogGradeEnum.java index 92bda8e..776f46b 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/enums/LogGradeEnum.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/enums/LogGradeEnum.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.server.enums; +package cn.axzo.log.platform.server.enums; import lombok.Getter; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/exception/ServiceException.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/exception/ServiceException.java similarity index 87% rename from xlog-server/src/main/java/cn/axzo/xlog/server/exception/ServiceException.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/exception/ServiceException.java index 3d8a3d6..08a8dea 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/exception/ServiceException.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/exception/ServiceException.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.server.exception; +package cn.axzo.log.platform.server.exception; /** * @author Smile diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/mapper/OperateLogMapper.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/mapper/OperateLogMapper.java similarity index 70% rename from xlog-server/src/main/java/cn/axzo/xlog/server/mapper/OperateLogMapper.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/mapper/OperateLogMapper.java index 8624c97..8d7beeb 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/mapper/OperateLogMapper.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/mapper/OperateLogMapper.java @@ -1,6 +1,6 @@ -package cn.axzo.xlog.server.mapper; +package cn.axzo.log.platform.server.mapper; -import cn.axzo.xlog.server.entity.OperateLogRecordEntity; +import cn.axzo.log.platform.server.entity.OperateLogRecordEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/repository/OperateLogRepository.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/repository/OperateLogRepository.java similarity index 66% rename from xlog-server/src/main/java/cn/axzo/xlog/server/repository/OperateLogRepository.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/repository/OperateLogRepository.java index 4255ff7..ad61322 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/repository/OperateLogRepository.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/repository/OperateLogRepository.java @@ -1,7 +1,7 @@ -package cn.axzo.xlog.server.repository; +package cn.axzo.log.platform.server.repository; -import cn.axzo.xlog.server.dto.OperateLogQueryReqDTO; -import cn.axzo.xlog.server.entity.OperateLogRecordEntity; +import cn.axzo.log.platform.server.dto.OperateLogQueryReqDTO; +import cn.axzo.log.platform.server.entity.OperateLogRecordEntity; import com.baomidou.mybatisplus.core.metadata.IPage; /*** diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/repository/impl/OperateLogRepositoryImpl.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/repository/impl/OperateLogRepositoryImpl.java similarity index 87% rename from xlog-server/src/main/java/cn/axzo/xlog/server/repository/impl/OperateLogRepositoryImpl.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/repository/impl/OperateLogRepositoryImpl.java index 788fac6..234ca7e 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/repository/impl/OperateLogRepositoryImpl.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/repository/impl/OperateLogRepositoryImpl.java @@ -1,9 +1,9 @@ -package cn.axzo.xlog.server.repository.impl; +package cn.axzo.log.platform.server.repository.impl; -import cn.axzo.xlog.server.dto.OperateLogQueryReqDTO; -import cn.axzo.xlog.server.entity.OperateLogRecordEntity; -import cn.axzo.xlog.server.mapper.OperateLogMapper; -import cn.axzo.xlog.server.repository.OperateLogRepository; +import cn.axzo.log.platform.server.dto.OperateLogQueryReqDTO; +import cn.axzo.log.platform.server.entity.OperateLogRecordEntity; +import cn.axzo.log.platform.server.mapper.OperateLogMapper; +import cn.axzo.log.platform.server.repository.OperateLogRepository; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/service/BaseEsService.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/BaseEsService.java similarity index 98% rename from xlog-server/src/main/java/cn/axzo/xlog/server/service/BaseEsService.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/BaseEsService.java index 09bc7dd..8fa226d 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/service/BaseEsService.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/BaseEsService.java @@ -1,6 +1,6 @@ -package cn.axzo.xlog.server.service; +package cn.axzo.log.platform.server.service; -import cn.axzo.xlog.server.config.SpringContextAware; +import cn.axzo.log.platform.server.config.SpringContextAware; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/service/OperateLogService.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/OperateLogService.java similarity index 72% rename from xlog-server/src/main/java/cn/axzo/xlog/server/service/OperateLogService.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/OperateLogService.java index d82bf1a..b0306be 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/service/OperateLogService.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/OperateLogService.java @@ -1,9 +1,8 @@ -package cn.axzo.xlog.server.service; +package cn.axzo.log.platform.server.service; -import cn.axzo.xlog.server.dto.OperateLogQueryReqDTO; -import cn.axzo.xlog.server.dto.OperateLogQueryRespDTO; -import cn.axzo.xlog.server.dto.OperateLogReqDTO; -import cn.axzo.xlog.server.entity.OperateLogRecordEntity; +import cn.axzo.log.platform.server.dto.OperateLogQueryReqDTO; +import cn.axzo.log.platform.server.dto.OperateLogQueryRespDTO; +import cn.axzo.log.platform.server.dto.OperateLogReqDTO; import cn.azxo.framework.common.model.CommonPageResponse; /*** diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/service/converter/EntityConverter.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/converter/EntityConverter.java similarity index 77% rename from xlog-server/src/main/java/cn/axzo/xlog/server/service/converter/EntityConverter.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/converter/EntityConverter.java index 85fc411..60a325d 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/service/converter/EntityConverter.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/converter/EntityConverter.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.server.service.converter; +package cn.axzo.log.platform.server.service.converter; import java.util.List; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/service/converter/OperateLogConverter.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/converter/OperateLogConverter.java similarity index 66% rename from xlog-server/src/main/java/cn/axzo/xlog/server/service/converter/OperateLogConverter.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/converter/OperateLogConverter.java index 73d5086..4693b1c 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/service/converter/OperateLogConverter.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/converter/OperateLogConverter.java @@ -1,7 +1,7 @@ -package cn.axzo.xlog.server.service.converter; +package cn.axzo.log.platform.server.service.converter; -import cn.axzo.xlog.server.dto.OperateLogReqDTO; -import cn.axzo.xlog.server.entity.OperateLogRecordEntity; +import cn.axzo.log.platform.server.dto.OperateLogReqDTO; +import cn.axzo.log.platform.server.entity.OperateLogRecordEntity; import org.mapstruct.Mapper; import static org.mapstruct.NullValueCheckStrategy.ALWAYS; diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/service/impl/OperateLogServiceImpl.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/impl/OperateLogServiceImpl.java similarity index 95% rename from xlog-server/src/main/java/cn/axzo/xlog/server/service/impl/OperateLogServiceImpl.java rename to axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/impl/OperateLogServiceImpl.java index cdee3d8..1103ea0 100644 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/service/impl/OperateLogServiceImpl.java +++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/impl/OperateLogServiceImpl.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.server.service.impl; +package cn.axzo.log.platform.server.service.impl; import cn.axzo.apollo.core.web.Result; import cn.axzo.apollo.workspace.api.workspace.WorkspaceApi; @@ -8,15 +8,15 @@ import cn.axzo.basics.organizational.api.OrganizationalUnitApi; import cn.axzo.basics.organizational.api.vo.response.OrganizationalUnitVO; import cn.axzo.basics.profiles.api.UserProfileServiceApi; import cn.axzo.basics.profiles.dto.basic.IdentityProfileDto; +import cn.axzo.log.platform.server.dto.OperateLogQueryReqDTO; +import cn.axzo.log.platform.server.dto.OperateLogQueryRespDTO; +import cn.axzo.log.platform.server.dto.OperateLogReqDTO; +import cn.axzo.log.platform.server.entity.OperateLogRecordEntity; +import cn.axzo.log.platform.server.repository.OperateLogRepository; +import cn.axzo.log.platform.server.service.BaseEsService; +import cn.axzo.log.platform.server.service.OperateLogService; +import cn.axzo.log.platform.server.service.converter.OperateLogConverter; import cn.axzo.pudge.core.service.ServiceException; -import cn.axzo.xlog.server.dto.OperateLogQueryReqDTO; -import cn.axzo.xlog.server.dto.OperateLogQueryRespDTO; -import cn.axzo.xlog.server.dto.OperateLogReqDTO; -import cn.axzo.xlog.server.entity.OperateLogRecordEntity; -import cn.axzo.xlog.server.repository.OperateLogRepository; -import cn.axzo.xlog.server.service.BaseEsService; -import cn.axzo.xlog.server.service.OperateLogService; -import cn.axzo.xlog.server.service.converter.OperateLogConverter; import cn.azxo.framework.common.model.CommonPageResponse; import cn.azxo.framework.common.model.CommonResponse; import cn.hutool.core.date.CalendarUtil; diff --git a/xlog-server/src/main/resources/bootstrap.yml b/axzo-log-server/src/main/resources/bootstrap.yml similarity index 100% rename from xlog-server/src/main/resources/bootstrap.yml rename to axzo-log-server/src/main/resources/bootstrap.yml diff --git a/xlog-server/src/main/resources/logback-spring.xml b/axzo-log-server/src/main/resources/logback-spring.xml similarity index 100% rename from xlog-server/src/main/resources/logback-spring.xml rename to axzo-log-server/src/main/resources/logback-spring.xml diff --git a/xlog-server/src/main/resources/mapper/OperateLogMapper.xml b/axzo-log-server/src/main/resources/mapper/OperateLogMapper.xml similarity index 100% rename from xlog-server/src/main/resources/mapper/OperateLogMapper.xml rename to axzo-log-server/src/main/resources/mapper/OperateLogMapper.xml diff --git a/xlog-server/src/test/java/cn/axzo/xlog/server/XlogApplicationTestBase.java b/axzo-log-server/src/test/java/cn/axzo/log/platform/server/XlogApplicationTestBase.java similarity index 89% rename from xlog-server/src/test/java/cn/axzo/xlog/server/XlogApplicationTestBase.java rename to axzo-log-server/src/test/java/cn/axzo/log/platform/server/XlogApplicationTestBase.java index 6bca3f7..b07e4c0 100644 --- a/xlog-server/src/test/java/cn/axzo/xlog/server/XlogApplicationTestBase.java +++ b/axzo-log-server/src/test/java/cn/axzo/log/platform/server/XlogApplicationTestBase.java @@ -1,4 +1,4 @@ -package cn.axzo.xlog.server; +package cn.axzo.log.platform.server; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; @@ -12,5 +12,5 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest public class XlogApplicationTestBase { - + } diff --git a/xlog-server/src/test/java/cn/axzo/xlog/server/config/ElasticClientConfigTest.java b/axzo-log-server/src/test/java/cn/axzo/log/platform/server/config/ElasticClientConfigTest.java similarity index 95% rename from xlog-server/src/test/java/cn/axzo/xlog/server/config/ElasticClientConfigTest.java rename to axzo-log-server/src/test/java/cn/axzo/log/platform/server/config/ElasticClientConfigTest.java index b38aa36..e327e82 100644 --- a/xlog-server/src/test/java/cn/axzo/xlog/server/config/ElasticClientConfigTest.java +++ b/axzo-log-server/src/test/java/cn/axzo/log/platform/server/config/ElasticClientConfigTest.java @@ -1,7 +1,7 @@ -package cn.axzo.xlog.server.config; +package cn.axzo.log.platform.server.config; -import cn.axzo.xlog.server.entity.OperateLogRecordEntity; -import cn.axzo.xlog.server.service.BaseEsService; +import cn.axzo.log.platform.server.entity.OperateLogRecordEntity; +import cn.axzo.log.platform.server.service.BaseEsService; import cn.hutool.core.date.CalendarUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; diff --git a/xlog-server/src/test/java/cn/axzo/xlog/server/config/IndexOprTest.java b/axzo-log-server/src/test/java/cn/axzo/log/platform/server/config/IndexOprTest.java similarity index 90% rename from xlog-server/src/test/java/cn/axzo/xlog/server/config/IndexOprTest.java rename to axzo-log-server/src/test/java/cn/axzo/log/platform/server/config/IndexOprTest.java index 4edf9d1..f831edb 100644 --- a/xlog-server/src/test/java/cn/axzo/xlog/server/config/IndexOprTest.java +++ b/axzo-log-server/src/test/java/cn/axzo/log/platform/server/config/IndexOprTest.java @@ -1,6 +1,6 @@ -package cn.axzo.xlog.server.config; +package cn.axzo.log.platform.server.config; -import cn.axzo.xlog.server.XlogApplicationTestBase; +import cn.axzo.log.platform.server.XlogApplicationTestBase; import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.client.RequestOptions; diff --git a/xlog-server/src/test/java/cn/axzo/xlog/server/config/RabbitMqConsumerTest.java b/axzo-log-server/src/test/java/cn/axzo/log/platform/server/config/RabbitMqConsumerTest.java similarity index 90% rename from xlog-server/src/test/java/cn/axzo/xlog/server/config/RabbitMqConsumerTest.java rename to axzo-log-server/src/test/java/cn/axzo/log/platform/server/config/RabbitMqConsumerTest.java index 3e604bd..5c0d442 100644 --- a/xlog-server/src/test/java/cn/axzo/xlog/server/config/RabbitMqConsumerTest.java +++ b/axzo-log-server/src/test/java/cn/axzo/log/platform/server/config/RabbitMqConsumerTest.java @@ -1,7 +1,7 @@ -package cn.axzo.xlog.server.config; +package cn.axzo.log.platform.server.config; -import cn.axzo.xlog.server.XlogApplicationTestBase; -import cn.axzo.xlog.server.dto.OperateLogReqDTO; +import cn.axzo.log.platform.server.XlogApplicationTestBase; +import cn.axzo.log.platform.server.dto.OperateLogReqDTO; import com.alibaba.fastjson.JSONObject; import org.junit.Test; import org.springframework.amqp.rabbit.core.RabbitTemplate; diff --git a/xlog-server/src/test/java/cn/axzo/xlog/server/service/OperateLogServiceTest.java b/axzo-log-server/src/test/java/cn/axzo/log/platform/server/service/OperateLogServiceTest.java similarity index 88% rename from xlog-server/src/test/java/cn/axzo/xlog/server/service/OperateLogServiceTest.java rename to axzo-log-server/src/test/java/cn/axzo/log/platform/server/service/OperateLogServiceTest.java index eefcc22..f48acd0 100644 --- a/xlog-server/src/test/java/cn/axzo/xlog/server/service/OperateLogServiceTest.java +++ b/axzo-log-server/src/test/java/cn/axzo/log/platform/server/service/OperateLogServiceTest.java @@ -1,11 +1,11 @@ -package cn.axzo.xlog.server.service; +package cn.axzo.log.platform.server.service; -import cn.axzo.xlog.server.XlogApplicationTestBase; -import cn.axzo.xlog.server.dto.OperateLogQueryReqDTO; -import cn.axzo.xlog.server.dto.OperateLogQueryRespDTO; -import cn.axzo.xlog.server.dto.OperateLogReqDTO; -import cn.axzo.xlog.server.entity.OperateLogRecordEntity; -import cn.axzo.xlog.server.service.converter.OperateLogConverter; +import cn.axzo.log.platform.server.XlogApplicationTestBase; +import cn.axzo.log.platform.server.dto.OperateLogQueryReqDTO; +import cn.axzo.log.platform.server.dto.OperateLogQueryRespDTO; +import cn.axzo.log.platform.server.dto.OperateLogReqDTO; +import cn.axzo.log.platform.server.entity.OperateLogRecordEntity; +import cn.axzo.log.platform.server.service.converter.OperateLogConverter; import cn.azxo.framework.common.model.CommonPageResponse; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; diff --git a/pom.xml b/pom.xml index a166771..57c9986 100644 --- a/pom.xml +++ b/pom.xml @@ -8,19 +8,20 @@ 2.4.13 - cn.axzo.xlog - xlog - 1.0.0-SNAPSHOT - pom - - xlog - http://maven.apache.org + cn.axzo.platform + axzo-log-plat + 1.0-SNAPSHOT - xlog-client - xlog-server + axzo-log-server + axzo-log-api + pom + + axzo-log-plat + http://maven.apache.org + UTF-8 1.4.2.Final diff --git a/xlog-server/src/main/java/cn/axzo/xlog/server/controller/BaseController.java b/xlog-server/src/main/java/cn/axzo/xlog/server/controller/BaseController.java deleted file mode 100644 index 119d723..0000000 --- a/xlog-server/src/main/java/cn/axzo/xlog/server/controller/BaseController.java +++ /dev/null @@ -1,10 +0,0 @@ -package cn.axzo.xlog.server.controller; - -/*** - * @author: pepsi - * @description: TODO - * @date: 2022/9/16 - */ -public abstract class BaseController { - -}