project rename

This commit is contained in:
pepsi 2022-09-29 11:26:40 +08:00
parent a3b0141f75
commit 5b9f216f55
48 changed files with 126 additions and 134 deletions

View File

@ -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}]

View File

@ -1,19 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
<artifactId>xlog</artifactId>
<groupId>cn.axzo.xlog</groupId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<artifactId>axzo-log-plat</artifactId>
<groupId>cn.axzo.platform</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xlog-client</artifactId>
<artifactId>axzo-log-api</artifactId>
<packaging>jar</packaging>
<name>xlog-client</name>
<name>axzo-log-api</name>
<url>http://maven.apache.org</url>
<properties>
@ -21,7 +18,6 @@
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>

View File

@ -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;

View File

@ -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;

View File

@ -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)

View File

@ -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<Boolean> operateLogCreate(OperateLogReq req) {

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
cn.axzo.xlog.client.config.XLogClientAutoConfiguration
cn.axzo.log.platform.client.config.XLogClientAutoConfiguration

View File

@ -0,0 +1,8 @@
package cn.axzo.log.platform.client;
/**
* Unit test for simple App.
*/
public class AppTest {
}

View File

@ -1,18 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
<artifactId>xlog</artifactId>
<groupId>cn.axzo.xlog</groupId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<artifactId>axzo-log-plat</artifactId>
<groupId>cn.axzo.platform</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xlog-server</artifactId>
<artifactId>axzo-log-server</artifactId>
<packaging>jar</packaging>
<name>xlog-server</name>
<name>axzo-log-server</name>
<url>http://maven.apache.org</url>
<properties>
@ -127,7 +125,6 @@
<groupId>cn.axzo.basics</groupId>
<artifactId>basics-profiles-api</artifactId>
</dependency>
</dependencies>
<build>

View File

@ -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);

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -1,4 +1,4 @@
package cn.axzo.xlog.server.dto;
package cn.axzo.log.platform.server.dto;
import cn.axzo.basics.common.page.PageRequest;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -1,4 +1,4 @@
package cn.axzo.xlog.server.enums;
package cn.axzo.log.platform.server.enums;
/**
* 项目名称pudge

View File

@ -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;

View File

@ -1,4 +1,4 @@
package cn.axzo.xlog.server.enums;
package cn.axzo.log.platform.server.enums;
import lombok.Getter;

View File

@ -1,4 +1,4 @@
package cn.axzo.xlog.server.exception;
package cn.axzo.log.platform.server.exception;
/**
* @author Smile

View File

@ -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;

View File

@ -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;
/***

View File

@ -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;

View File

@ -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;

View File

@ -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;
/***

View File

@ -1,4 +1,4 @@
package cn.axzo.xlog.server.service.converter;
package cn.axzo.log.platform.server.service.converter;
import java.util.List;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

19
pom.xml
View File

@ -8,19 +8,20 @@
<version>2.4.13</version>
</parent>
<groupId>cn.axzo.xlog</groupId>
<artifactId>xlog</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>xlog</name>
<url>http://maven.apache.org</url>
<groupId>cn.axzo.platform</groupId>
<artifactId>axzo-log-plat</artifactId>
<version>1.0-SNAPSHOT</version>
<modules>
<module>xlog-client</module>
<module>xlog-server</module>
<module>axzo-log-server</module>
<module>axzo-log-api</module>
</modules>
<packaging>pom</packaging>
<name>axzo-log-plat</name>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<mapstruct.version>1.4.2.Final</mapstruct.version>

View File

@ -1,10 +0,0 @@
package cn.axzo.xlog.server.controller;
/***
* @author: pepsi
* @description: TODO
* @date: 2022/9/16
*/
public abstract class BaseController {
}