This is an automated email from the ASF dual-hosted git repository.
gaoxihui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozhera.git
The following commit(s) were added to refs/heads/master by this push:
new 821c1205 refactor: upgrade package name and code update (#489)
821c1205 is described below
commit 821c1205d8046da77637aa14bc3a058a8226cd77
Author: wtt <[email protected]>
AuthorDate: Fri Oct 11 14:59:58 2024 +0800
refactor: upgrade package name and code update (#489)
* refactor: upgrade package name and code update
* refactor: update distributionManagement
---
.../log/agent/channel/ChannelServiceImpl.java | 14 +++--
.../channel/memory/AgentMemoryServiceImpl.java | 8 +--
.../src/main/resources/log_impl_type.json | 22 +++----
.../org/apache/ozhera/log/parse/JsonLogParser.java | 7 ++-
.../service/bind/LogTypeProcessorFactory.java | 2 +-
.../log/stream/config/MilogConfigListener.java | 60 ++++++++++---------
.../apache/ozhera/log/stream/job/JobManager.java | 57 +++++++++++-------
ozhera-monitor/ozhera-monitor-server/pom.xml | 2 +-
.../monitor/aop/HeraRequestMappingAspect.java | 2 +-
.../ozhera/monitor/config/DataSourceConfig.java | 4 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
.../src/main/resources/generatorConfig.xml | 6 +-
pom.xml | 69 +++++++++++-----------
13 files changed, 140 insertions(+), 115 deletions(-)
diff --git
a/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/channel/ChannelServiceImpl.java
b/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/channel/ChannelServiceImpl.java
index dfa27cf5..b2cf4d6c 100644
---
a/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/channel/ChannelServiceImpl.java
+++
b/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/channel/ChannelServiceImpl.java
@@ -21,6 +21,11 @@ import com.google.common.collect.Lists;
import com.google.gson.Gson;
import com.xiaomi.data.push.common.SafeRun;
import com.xiaomi.mone.file.*;
+import com.xiaomi.youpin.docean.Ioc;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.ozhera.log.agent.channel.file.InodeFileComparator;
import org.apache.ozhera.log.agent.channel.file.MonitorFile;
import org.apache.ozhera.log.agent.channel.memory.AgentMemoryService;
@@ -37,11 +42,6 @@ import org.apache.ozhera.log.api.model.msg.LineMessage;
import org.apache.ozhera.log.common.Constant;
import org.apache.ozhera.log.common.PathUtils;
import org.apache.ozhera.log.utils.NetUtil;
-import com.xiaomi.youpin.docean.Ioc;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
import java.time.Instant;
import java.util.*;
@@ -185,6 +185,7 @@ public class ChannelServiceImpl extends
AbstractChannelService {
channelMemory = memoryService.getMemory(channelId);
if (null == channelMemory) {
+ log.info("get channelMemory empty,filePath:{}", logPattern);
channelMemory = initChannelMemory(channelId, input, patterns,
channelDefine);
}
memoryService.cleanChannelMemoryContent(channelId, patterns);
@@ -396,7 +397,7 @@ public class ChannelServiceImpl extends
AbstractChannelService {
logFileMap.put(filePath, logFile);
Future<?> future = ExecutorUtil.submit(() -> {
try {
- log.info("thread {} {}",
Thread.currentThread().isVirtual(), Thread.currentThread());
+ log.info("filePath:{},is VirtualThread {},
thread:{},id:{}", filePath, Thread.currentThread().isVirtual(),
Thread.currentThread(), Thread.currentThread().threadId());
logFile.readLine();
} catch (Exception e) {
logFile.setExceptionFinish();
@@ -469,6 +470,7 @@ public class ChannelServiceImpl extends
AbstractChannelService {
}
ChannelEngine channelEngine = Ioc.ins().getBean(ChannelEngine.class);
ILogFile logFile = channelEngine.logFile();
+ log.info("initLogFile filePath:{},pointer:{},lineNumber:{}", filePath,
pointer, lineNumber);
logFile.initLogFile(filePath, listener, pointer, lineNumber);
return logFile;
}
diff --git
a/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/channel/memory/AgentMemoryServiceImpl.java
b/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/channel/memory/AgentMemoryServiceImpl.java
index c0e8bba9..c38f2ce3 100644
---
a/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/channel/memory/AgentMemoryServiceImpl.java
+++
b/ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/channel/memory/AgentMemoryServiceImpl.java
@@ -21,13 +21,13 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.xiaomi.mone.file.FileUtils;
import com.xiaomi.mone.file.ReadResult;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.ozhera.log.agent.common.AbstractElementAdapter;
import org.apache.ozhera.log.agent.common.ExecutorUtil;
import org.apache.ozhera.log.agent.exception.AgentException;
import org.apache.ozhera.log.agent.input.Input;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
import java.io.File;
import java.io.FileWriter;
@@ -87,7 +87,7 @@ public class AgentMemoryServiceImpl implements
AgentMemoryService {
if (CollectionUtils.isEmpty(channelMemoryList)) {
return;
}
-
+ log.info("memory data:{}", gson.toJson(channelMemoryList));
channelMemoryList.forEach(c -> {
if (c != null &&
ChannelMemory.DEFAULT_VERSION.equals(c.getVersion())) {
channelMemoryMap.put(c.getChannelId(), c);
diff --git a/ozhera-log/log-agent/src/main/resources/log_impl_type.json
b/ozhera-log/log-agent/src/main/resources/log_impl_type.json
index fb90796f..14041d65 100644
--- a/ozhera-log/log-agent/src/main/resources/log_impl_type.json
+++ b/ozhera-log/log-agent/src/main/resources/log_impl_type.json
@@ -1,14 +1,14 @@
{
- "APP_LOG": "com.xiaomi.mone.log.agent.input.AppLogInput",
- "APP_LOG_MULTI": "com.xiaomi.mone.log.agent.input.AppLogInput",
- "APP_LOG_SIGNAL": "com.xiaomi.mone.log.agent.input.AppLogInput",
- "MIS_APP_LOG": "com.xiaomi.mone.log.agent.input.MisAppLogInput",
- "NGINX": "com.xiaomi.mone.log.agent.input.NginxInput",
- "OPENTELEMETRY": "com.xiaomi.mone.log.agent.input.OpentelemetryInput",
- "DOCKER": "com.xiaomi.mone.log.agent.input.AppLogInput",
- "FREE": "com.xiaomi.mone.log.agent.input.FreeLogInput",
- "ORIGIN_LOG": "com.xiaomi.mone.log.agent.input.OriginLogInput",
- "rocketmq": "com.xiaomi.mone.log.agent.extension.RmqOutput",
+ "APP_LOG": "org.apache.ozhera.log.agent.input.AppLogInput",
+ "APP_LOG_MULTI": "org.apache.ozhera.log.agent.input.AppLogInput",
+ "APP_LOG_SIGNAL": "org.apache.ozhera.log.agent.input.AppLogInput",
+ "MIS_APP_LOG": "org.apache.ozhera.log.agent.input.MisAppLogInput",
+ "NGINX": "org.apache.ozhera.log.agent.input.NginxInput",
+ "OPENTELEMETRY": "org.apache.ozhera.log.agent.input.OpentelemetryInput",
+ "DOCKER": "org.apache.ozhera.log.agent.input.AppLogInput",
+ "FREE": "org.apache.ozhera.log.agent.input.FreeLogInput",
+ "ORIGIN_LOG": "org.apache.ozhera.log.agent.input.OriginLogInput",
+ "rocketmq": "org.apache.ozhera.log.agent.extension.RmqOutput",
"talos": "com.xiaomi.mone.log.agent.output.TalosOutput",
- "kafka": "com.xiaomi.mone.log.agent.extension.KafkaOutput"
+ "kafka": "org.apache.ozhera.log.agent.extension.KafkaOutput"
}
diff --git
a/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/JsonLogParser.java
b/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/JsonLogParser.java
index eb594899..b77164d5 100644
---
a/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/JsonLogParser.java
+++
b/ozhera-log/log-common/src/main/java/org/apache/ozhera/log/parse/JsonLogParser.java
@@ -20,9 +20,9 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.ToNumberPolicy;
import com.google.gson.reflect.TypeToken;
-import org.apache.ozhera.log.utils.IndexUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.apache.ozhera.log.utils.IndexUtils;
import java.util.*;
@@ -90,7 +90,7 @@ public class JsonLogParser extends AbstractLogParser {
return parsedLogs;
}
- public Map<String, Object> flattenJson(String logData) {
+ public static Map<String, Object> flattenJson(String logData) {
Map<String, Object> ret = new HashMap<>();
if (logData == null || logData.isEmpty()) {
return ret;
@@ -99,6 +99,7 @@ public class JsonLogParser extends AbstractLogParser {
TypeToken<Map<String, Object>> token = new TypeToken<>() {
};
Map<String, Object> rawLogMap = GSON.fromJson(logData, token);
+ ret.putAll(rawLogMap);
flattenMap("", rawLogMap, ret);
} catch (Exception e) {
ret.put(ES_KEY_MAP_LOG_SOURCE, logData);
@@ -106,7 +107,7 @@ public class JsonLogParser extends AbstractLogParser {
return ret;
}
- private void flattenMap(String prefix, Map<String, Object> source,
Map<String, Object> target) {
+ private static void flattenMap(String prefix, Map<String, Object> source,
Map<String, Object> target) {
for (Map.Entry<String, Object> entry : source.entrySet()) {
String key = prefix.isEmpty() ? entry.getKey() : prefix + "." +
entry.getKey();
Object value = entry.getValue();
diff --git
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/bind/LogTypeProcessorFactory.java
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/bind/LogTypeProcessorFactory.java
index 4becd632..e46cc81d 100644
---
a/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/bind/LogTypeProcessorFactory.java
+++
b/ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/bind/LogTypeProcessorFactory.java
@@ -84,7 +84,7 @@ public class LogTypeProcessorFactory {
@NotNull
private static List<Class<?>> getClasses(Class<LogTypeProcessor>
LogTypeProcessorClass) {
- Set<Class<?>> classSet =
ClassUtil.scanPackage("com.xiaomi.mone.log.manager");
+ Set<Class<?>> classSet =
ClassUtil.scanPackage("org.apache.ozhera.log.manager");
List<Class<?>> classes = classSet.parallelStream()
.filter(LogTypeProcessorClass::isAssignableFrom)
.filter(clazz -> !Objects.equals(clazz, LogTypeProcessorClass))
diff --git
a/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/config/MilogConfigListener.java
b/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/config/MilogConfigListener.java
index 4559b833..7190b74b 100644
---
a/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/config/MilogConfigListener.java
+++
b/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/config/MilogConfigListener.java
@@ -18,13 +18,6 @@ package org.apache.ozhera.log.stream.config;
import com.alibaba.nacos.api.config.listener.Listener;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
-import org.apache.ozhera.log.common.Config;
-import org.apache.ozhera.log.common.Constant;
-import org.apache.ozhera.log.model.LogtailConfig;
-import org.apache.ozhera.log.model.MilogSpaceData;
-import org.apache.ozhera.log.model.SinkConfig;
-import org.apache.ozhera.log.stream.job.JobManager;
-import org.apache.ozhera.log.stream.job.extension.StreamCommonExtension;
import com.xiaomi.youpin.docean.Ioc;
import com.xiaomi.youpin.docean.anno.Component;
import com.xiaomi.youpin.docean.common.StringUtils;
@@ -32,15 +25,19 @@ import com.xiaomi.youpin.docean.plugin.nacos.NacosConfig;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.ozhera.log.common.Config;
+import org.apache.ozhera.log.common.Constant;
+import org.apache.ozhera.log.model.LogtailConfig;
+import org.apache.ozhera.log.model.MilogSpaceData;
+import org.apache.ozhera.log.model.SinkConfig;
+import org.apache.ozhera.log.stream.job.JobManager;
+import org.apache.ozhera.log.stream.job.extension.StreamCommonExtension;
import org.jetbrains.annotations.NotNull;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.*;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
@@ -89,31 +86,38 @@ public class MilogConfigListener {
return Ioc.ins().getBean(factualServiceName);
}
- private void handleNacosConfigDataJob(MilogSpaceData newMilogSpaceData) {
+ private void handleNacosConfigDataJob(MilogSpaceData newMilogSpaceData)
throws Exception {
+ boolean locked = false;
try {
- buildDataLock.lock();
- if (!oldLogTailConfigMap.isEmpty() && !oldSinkConfigMap.isEmpty())
{
- List<SinkConfig> sinkConfigs =
newMilogSpaceData.getSpaceConfig();
- stopUnusedOldStoreJobs(sinkConfigs);
- for (SinkConfig sinkConfig : sinkConfigs) {
- stopOldJobsForRemovedTailIds(sinkConfig);
- if
(oldSinkConfigMap.containsKey(sinkConfig.getLogstoreId())) {
- //Whether the submission store information changes,
the change stops
- if (!isStoreSame(sinkConfig,
oldSinkConfigMap.get(sinkConfig.getLogstoreId()))) {
- restartPerTail(sinkConfig, milogSpaceData);
+ locked = buildDataLock.tryLock(1, TimeUnit.MINUTES);
+ if (locked) {
+ if (!oldLogTailConfigMap.isEmpty() &&
!oldSinkConfigMap.isEmpty()) {
+ List<SinkConfig> sinkConfigs =
newMilogSpaceData.getSpaceConfig();
+ stopUnusedOldStoreJobs(sinkConfigs);
+ for (SinkConfig sinkConfig : sinkConfigs) {
+ stopOldJobsForRemovedTailIds(sinkConfig);
+ if
(oldSinkConfigMap.containsKey(sinkConfig.getLogstoreId())) {
+ //Whether the submission store information
changes, the change stops
+ if (!isStoreSame(sinkConfig,
oldSinkConfigMap.get(sinkConfig.getLogstoreId()))) {
+ restartPerTail(sinkConfig, milogSpaceData);
+ } else {
+ handlePerTailComparison(sinkConfig,
milogSpaceData);
+ }
} else {
- handlePerTailComparison(sinkConfig,
milogSpaceData);
+ newStoreStart(sinkConfig, milogSpaceData);
}
- } else {
- newStoreStart(sinkConfig, milogSpaceData);
}
+ } else {
+ // Restart all
+ initNewJob(newMilogSpaceData);
}
} else {
- // Restart all
- initNewJob(newMilogSpaceData);
+ log.warn("handleNacosConfigDataJob lock failed,data:{}",
gson.toJson(newMilogSpaceData));
}
} finally {
- buildDataLock.unlock();
+ if (locked) {
+ buildDataLock.unlock();
+ }
}
}
diff --git
a/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/job/JobManager.java
b/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/job/JobManager.java
index 7fe4d49c..869dc4e0 100644
---
a/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/job/JobManager.java
+++
b/ozhera-log/log-stream/src/main/java/org/apache/ozhera/log/stream/job/JobManager.java
@@ -16,6 +16,11 @@
package org.apache.ozhera.log.stream.job;
import com.google.gson.Gson;
+import com.xiaomi.youpin.docean.Ioc;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.ozhera.log.common.Config;
import org.apache.ozhera.log.model.LogtailConfig;
import org.apache.ozhera.log.model.MilogSpaceData;
@@ -25,16 +30,12 @@ import org.apache.ozhera.log.stream.common.SinkJobEnum;
import org.apache.ozhera.log.stream.job.extension.SinkJob;
import org.apache.ozhera.log.stream.job.extension.SinkJobProvider;
import org.apache.ozhera.log.stream.sink.SinkChain;
-import com.xiaomi.youpin.docean.Ioc;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
@@ -97,15 +98,22 @@ public class JobManager {
}
public void stopJob(LogtailConfig logtailConfig) {
- stopLock.lock();
+ boolean locked = false;
try {
- List<Long> jobKeys =
jobs.entrySet().stream().map(Map.Entry::getKey).collect(Collectors.toList());
- log.info("【stop job】,all jobs:{}", jobKeys);
- sinkJobsShutDown(logtailConfig);
+ locked = stopLock.tryLock(10, TimeUnit.SECONDS);
+ if (locked) {
+ List<Long> jobKeys =
jobs.entrySet().stream().map(Map.Entry::getKey).collect(Collectors.toList());
+ log.info("【stop job】,all jobs:{}", jobKeys);
+ sinkJobsShutDown(logtailConfig);
+ } else {
+ log.warn("【stop job】,other job is running,wait
10s,tailConfig:{}", gson.toJson(logtailConfig));
+ }
} catch (Exception e) {
log.error(String.format("[JobManager.stopJob] stopJob
err,logtailId:%s", logtailConfig.getLogtailId()), e);
} finally {
- stopLock.unlock();
+ if (locked) {
+ stopLock.unlock();
+ }
}
}
@@ -183,21 +191,28 @@ public class JobManager {
}
public void startJob(LogtailConfig logtailConfig, SinkConfig sinkConfig,
Long logSpaceId) {
- startLock.lock();
+ boolean locked = false;
try {
- String ak = logtailConfig.getAk();
- String sk = logtailConfig.getSk();
- String clusterInfo = logtailConfig.getClusterInfo();
- String type = logtailConfig.getType();
- if (StringUtils.isEmpty(clusterInfo) ||
StringUtils.isEmpty(logtailConfig.getTopic())) {
- log.info("start job error,ak or sk or logtailConfig
null,ak:{},sk:{},logtailConfig:{}", ak, sk, new Gson().toJson(logtailConfig));
- return;
+ locked = startLock.tryLock(10, TimeUnit.SECONDS);
+ if (locked) {
+ String ak = logtailConfig.getAk();
+ String sk = logtailConfig.getSk();
+ String clusterInfo = logtailConfig.getClusterInfo();
+ String type = logtailConfig.getType();
+ if (StringUtils.isEmpty(clusterInfo) ||
StringUtils.isEmpty(logtailConfig.getTopic())) {
+ log.info("start job error,ak or sk or logtailConfig
null,ak:{},sk:{},logtailConfig:{}", ak, sk, new Gson().toJson(logtailConfig));
+ return;
+ }
+ startConsumerJob(type, ak, sk, clusterInfo, logtailConfig,
sinkConfig, logSpaceId);
+ } else {
+ log.warn("start job error,lock
timeout,tailConfig:{},sinkConfig:{}", gson.toJson(logtailConfig),
gson.toJson(sinkConfig));
}
- startConsumerJob(type, ak, sk, clusterInfo, logtailConfig,
sinkConfig, logSpaceId);
} catch (Exception e) {
- log.error(String.format("[JobManager.startJob] start job
err,logtailConfig:%s,esIndex:%s", logtailConfig, sinkConfig.getEsIndex()), e);
+ log.error(String.format("[JobManager.startJob] start job
err,logTailConfig:%s,esIndex:%s", logtailConfig, sinkConfig.getEsIndex()), e);
} finally {
- startLock.unlock();
+ if (locked) {
+ startLock.unlock();
+ }
}
}
diff --git a/ozhera-monitor/ozhera-monitor-server/pom.xml
b/ozhera-monitor/ozhera-monitor-server/pom.xml
index 662a5c6f..1b0d6e2e 100644
--- a/ozhera-monitor/ozhera-monitor-server/pom.xml
+++ b/ozhera-monitor/ozhera-monitor-server/pom.xml
@@ -13,7 +13,7 @@
<dependencies>
<dependency>
- <groupId>run.mone</groupId>
+ <groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-monitor-service</artifactId>
<exclusions>
<exclusion>
diff --git
a/ozhera-monitor/ozhera-monitor-server/src/main/java/org/apache/ozhera/monitor/aop/HeraRequestMappingAspect.java
b/ozhera-monitor/ozhera-monitor-server/src/main/java/org/apache/ozhera/monitor/aop/HeraRequestMappingAspect.java
index 4611d30f..16d3c447 100644
---
a/ozhera-monitor/ozhera-monitor-server/src/main/java/org/apache/ozhera/monitor/aop/HeraRequestMappingAspect.java
+++
b/ozhera-monitor/ozhera-monitor-server/src/main/java/org/apache/ozhera/monitor/aop/HeraRequestMappingAspect.java
@@ -46,7 +46,7 @@ import java.util.concurrent.ThreadPoolExecutor;
@Configuration
public class HeraRequestMappingAspect {
- @Pointcut("@annotation(com.xiaomi.mone.monitor.aop.HeraRequestMapping)")
+ @Pointcut("@annotation(org.apache.ozhera.monitor.aop.HeraRequestMapping)")
public void operationLog(){}
@Autowired
diff --git
a/ozhera-monitor/ozhera-monitor-server/src/main/java/org/apache/ozhera/monitor/config/DataSourceConfig.java
b/ozhera-monitor/ozhera-monitor-server/src/main/java/org/apache/ozhera/monitor/config/DataSourceConfig.java
index 25c90438..36bb4870 100644
---
a/ozhera-monitor/ozhera-monitor-server/src/main/java/org/apache/ozhera/monitor/config/DataSourceConfig.java
+++
b/ozhera-monitor/ozhera-monitor-server/src/main/java/org/apache/ozhera/monitor/config/DataSourceConfig.java
@@ -46,8 +46,8 @@ import java.util.Properties;
@MapperScan(basePackages = DataSourceConfig.PACKAGE, sqlSessionFactoryRef =
"masterSqlSessionFactory")
public class DataSourceConfig {
- static final String PACKAGE = "com.xiaomi.mone.monitor.dao.mapper";
- static final String MAPPER_LOCATION =
"classpath*:com/xiaomi/mone/monitor/dao/**/*.xml";
+ static final String PACKAGE = "org.apache.ozhera.monitor.dao.mapper";
+ static final String MAPPER_LOCATION =
"classpath*:org/apache/ozhera/monitor/dao/**/*.xml";
@NacosValue(value = "${spring.datasource.driverClassName}", autoRefreshed
= true)
private String driverClass;
diff --git
a/ozhera-monitor/ozhera-monitor-server/src/main/resources/META-INF/spring.factories
b/ozhera-monitor/ozhera-monitor-server/src/main/resources/META-INF/spring.factories
index 1c75de02..4026c179 100644
---
a/ozhera-monitor/ozhera-monitor-server/src/main/resources/META-INF/spring.factories
+++
b/ozhera-monitor/ozhera-monitor-server/src/main/resources/META-INF/spring.factories
@@ -1 +1 @@
-org.springframework.context.ApplicationListener=listener.org.apache.ozhera.monitor.ApplicationStartedListener
\ No newline at end of file
+org.springframework.context.ApplicationListener=org.apache.ozhera.monitor.listener.ApplicationStartedListener
\ No newline at end of file
diff --git
a/ozhera-monitor/ozhera-monitor-service/src/main/resources/generatorConfig.xml
b/ozhera-monitor/ozhera-monitor-service/src/main/resources/generatorConfig.xml
index 5d3df6f0..9dfe7162 100644
---
a/ozhera-monitor/ozhera-monitor-service/src/main/resources/generatorConfig.xml
+++
b/ozhera-monitor/ozhera-monitor-service/src/main/resources/generatorConfig.xml
@@ -39,7 +39,7 @@
</javaTypeResolver>
<!-- 生成实体类地址 -->
- <javaModelGenerator targetPackage="com.xiaomi.mone.monitor.dao.model"
targetProject="src/main/java">
+ <javaModelGenerator
targetPackage="org.apache.ozhera.monitor.dao.model"
targetProject="src/main/java">
<!--<javaModelGenerator
targetPackage="com.xiaomi.mone.monitor.dao.model.cat"
targetProject="src/main/java">-->
<!--<javaModelGenerator targetPackage="com.xiaomi.data.push.dao.model"
targetProject="/data/workspace/java/web-service/user-profile-push/src/main/java">-->
<!-- 从数据库返回的值被清理前后的空格 -->
@@ -49,14 +49,14 @@
</javaModelGenerator>
<!-- 生成mapper xml文件 -->
- <sqlMapGenerator targetPackage="com.xiaomi.mone.monitor.dao.mapper"
targetProject="src/main/resources/">
+ <sqlMapGenerator targetPackage="org.apache.ozhera.monitor.mapper"
targetProject="src/main/resources/">
<!-- <sqlMapGenerator targetPackage="com.xiaomi.cat.dao.mapper"
targetProject="src/main/resources/">-->
<!-- enableSubPackages:是否让schema作为包的后缀 -->
<property name="enableSubPackages" value="false"/>
</sqlMapGenerator>
<!-- 生成mapper xml对应Client-->
- <javaClientGenerator
targetPackage="com.xiaomi.mone.monitor.dao.mapper"
targetProject="src/main/java" type="XMLMAPPER">
+ <javaClientGenerator targetPackage="org.apache.ozhera.monitor.mapper"
targetProject="src/main/java" type="XMLMAPPER">
<!--<javaClientGenerator
targetPackage="com.xiaomi.mone.monitor.dao.cat" targetProject="src/main/java"
type="XMLMAPPER">-->
<!--<javaClientGenerator
targetPackage="com.xiaomi.data.push.dao.mapper"
targetProject="/data/workspace/java/web-service/user-profile-push/src/main/java"
type="XMLMAPPER">-->
<!-- enableSubPackages:是否让schema作为包的后缀 -->
diff --git a/pom.xml b/pom.xml
index 60e84027..bdc72de9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>31</version>
- <relativePath />
+ <relativePath/>
</parent>
<groupId>org.apache.ozhera</groupId>
@@ -96,7 +96,7 @@
</dependency>
<dependency>
- <groupId>run.mone</groupId>
+ <groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-monitor-service</artifactId>
<version>1.3-jdk21</version>
</dependency>
@@ -1001,7 +1001,9 @@
<failOnMissing>false</failOnMissing>
<licenseMerges>
<licenseMerge>Apache License, Version 2.0|The
Apache Software License, Version
- 2.0|ASF 2.0|Apache 2|Apache-2.0|Apache 2.0
License|Apache 2.0|Apache License v2.0|Apache License 2.0|The Apache License,
Version 2.0|The Apache Software License, Version 2.0
+ 2.0|ASF 2.0|Apache 2|Apache-2.0|Apache 2.0
License|Apache 2.0|Apache License
+ v2.0|Apache License 2.0|The Apache
License, Version 2.0|The Apache Software License,
+ Version 2.0
</licenseMerge>
<licenseMerge>The MIT License|MIT
License</licenseMerge>
<licenseMerge>The 3-Clause BSD License|New BSD
License|3-Clause BSD
@@ -1012,36 +1014,36 @@
</execution>
</executions>
</plugin>
-<!-- <plugin>-->
-<!-- <groupId>com.mycila</groupId>-->
-<!-- <artifactId>license-maven-plugin</artifactId>-->
-<!-- <version>3.0</version>-->
-<!-- <executions>-->
-<!-- <execution>-->
-<!-- <phase>generate-sources</phase>-->
-<!-- <goals>-->
-<!-- <goal>check</goal>-->
-<!-- <goal>remove</goal>-->
-<!-- <goal>format</goal>-->
-<!-- </goals>-->
-<!-- </execution>-->
-<!-- </executions>-->
-<!-- <configuration>-->
-<!-- <quiet>true</quiet>-->
-<!-- <header>${ozhera.project.path}/HEADER</header>-->
-<!-- <excludes>-->
-<!-- <exclude>src/main/java/com/mycila</exclude>-->
-<!-- </excludes>-->
-<!-- <includes>-->
-<!-- <include>src/main/java/run/mone/**</include>-->
-<!-- <include>**/src/test/java/**</include>-->
-<!-- </includes>-->
-<!-- <strictCheck>true</strictCheck>-->
-<!-- <mapping>-->
-<!-- <java>SLASHSTAR_STYLE</java>-->
-<!-- </mapping>-->
-<!-- </configuration>-->
-<!-- </plugin>-->
+ <!-- <plugin>-->
+ <!-- <groupId>com.mycila</groupId>-->
+ <!--
<artifactId>license-maven-plugin</artifactId>-->
+ <!-- <version>3.0</version>-->
+ <!-- <executions>-->
+ <!-- <execution>-->
+ <!-- <phase>generate-sources</phase>-->
+ <!-- <goals>-->
+ <!-- <goal>check</goal>-->
+ <!-- <goal>remove</goal>-->
+ <!-- <goal>format</goal>-->
+ <!-- </goals>-->
+ <!-- </execution>-->
+ <!-- </executions>-->
+ <!-- <configuration>-->
+ <!-- <quiet>true</quiet>-->
+ <!--
<header>${ozhera.project.path}/HEADER</header>-->
+ <!-- <excludes>-->
+ <!--
<exclude>src/main/java/com/mycila</exclude>-->
+ <!-- </excludes>-->
+ <!-- <includes>-->
+ <!--
<include>src/main/java/run/mone/**</include>-->
+ <!--
<include>**/src/test/java/**</include>-->
+ <!-- </includes>-->
+ <!-- <strictCheck>true</strictCheck>-->
+ <!-- <mapping>-->
+ <!-- <java>SLASHSTAR_STYLE</java>-->
+ <!-- </mapping>-->
+ <!-- </configuration>-->
+ <!-- </plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1068,4 +1070,5 @@
</repository>
</distributionManagement>
+
</project>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
