Skip to content

C
cat

梦中观雨 / cat
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
C
cat

体验新版 GitCode，发现更多精彩内容 >>

提交 e036e5fc 编写于 作者: Y yong.you
浏览文件
操作

rename error package name

上级 eb87c38b
隐藏空白更改
内联 并排
Showing with 218 addition and 209 deletion
cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/DomainManager.java
浏览文件 @ e036e5fc
......@@ -21,11 +21,11 @@ import org.unidal.webres.helper.Files;
import org.unidal.webres.json.JsonArray;
import org.unidal.webres.json.JsonObject;
import com.dainping.cat.consumer.core.dal.Hostinfo;
import com.dainping.cat.consumer.core.dal.HostinfoDao;
import com.dainping.cat.consumer.core.dal.HostinfoEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.ServerConfigManager;
import com.dianping.cat.consumer.core.dal.Hostinfo;
import com.dianping.cat.consumer.core.dal.HostinfoDao;
import com.dianping.cat.consumer.core.dal.HostinfoEntity;
public class DomainManager implements Initializable, LogEnabled {
......
cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/advanced/CrossAnalyzer.java
浏览文件 @ e036e5fc
......@@ -10,11 +10,11 @@ import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.AbstractMessageAnalyzer;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.cross.model.entity.CrossReport;
import com.dianping.cat.consumer.cross.model.entity.Local;
import com.dianping.cat.consumer.cross.model.entity.Name;
......
cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/advanced/DatabaseAnalyzer.java
浏览文件 @ e036e5fc
......@@ -10,11 +10,11 @@ import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.AbstractMessageAnalyzer;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.database.model.entity.DatabaseReport;
import com.dianping.cat.consumer.database.model.entity.Domain;
import com.dianping.cat.consumer.database.model.entity.Method;
......
cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/advanced/DependencyAnalyzer.java
浏览文件 @ e036e5fc
......@@ -12,12 +12,12 @@ import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.AbstractMessageAnalyzer;
import com.dianping.cat.consumer.DomainManager;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.dependency.model.entity.Dependency;
import com.dianping.cat.consumer.dependency.model.entity.DependencyReport;
import com.dianping.cat.consumer.dependency.model.entity.Index;
......
cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/advanced/MatrixAnalyzer.java
浏览文件 @ e036e5fc
......@@ -11,11 +11,11 @@ import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.AbstractMessageAnalyzer;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.matrix.model.entity.Matrix;
import com.dianping.cat.consumer.matrix.model.entity.MatrixReport;
import com.dianping.cat.consumer.matrix.model.entity.Ratio;
......
cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/advanced/MetricAnalyzer.java
浏览文件 @ e036e5fc
......@@ -10,13 +10,13 @@ import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.advanced.dal.BusinessReport;
import com.dainping.cat.consumer.advanced.dal.BusinessReportDao;
import com.dianping.cat.Cat;
import com.dianping.cat.CatConstants;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.AbstractMessageAnalyzer;
import com.dianping.cat.consumer.advanced.BussinessConfigManager.BusinessConfig;
import com.dianping.cat.consumer.advanced.dal.BusinessReport;
import com.dianping.cat.consumer.advanced.dal.BusinessReportDao;
import com.dianping.cat.consumer.metric.model.entity.MetricReport;
import com.dianping.cat.consumer.metric.model.entity.Point;
import com.dianping.cat.consumer.metric.model.transform.DefaultNativeBuilder;
......
cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/advanced/SqlAnalyzer.java
浏览文件 @ e036e5fc
......@@ -11,11 +11,11 @@ import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.AbstractMessageAnalyzer;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.sql.SqlParseManager;
import com.dianping.cat.consumer.sql.model.entity.Database;
import com.dianping.cat.consumer.sql.model.entity.Method;
......
cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/build/CatAdvancedDatabaseConfigurator.java
浏览文件 @ e036e5fc
......@@ -14,8 +14,8 @@ final class CatAdvancedDatabaseConfigurator extends AbstractJdbcResourceConfigur
all.add(defineJdbcDataSourceConfigurationManagerComponent("datasources.xml"));
all.add(defineJdbcDataSourceComponent("cat", "com.mysql.jdbc.Driver", "jdbc:mysql://192.168.7.43:3306/cat", "dpcom_cat", "password", "<![CDATA[useUnicode=true&autoReconnect=true]]>"));
defineSimpleTableProviderComponents(all, "cat", com.dainping.cat.consumer.advanced.dal._INDEX.getEntityClasses());
defineDaoComponents(all, com.dainping.cat.consumer.advanced.dal._INDEX.getDaoClasses());
defineSimpleTableProviderComponents(all, "cat", com.dianping.cat.consumer.advanced.dal._INDEX.getEntityClasses());
defineDaoComponents(all, com.dianping.cat.consumer.advanced.dal._INDEX.getDaoClasses());
return all;
}
......
cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/build/ComponentsConfigurator.java
浏览文件 @ e036e5fc
......@@ -8,10 +8,6 @@ import org.unidal.initialization.Module;
import org.unidal.lookup.configuration.AbstractResourceConfigurator;
import org.unidal.lookup.configuration.Component;
import com.dainping.cat.consumer.advanced.dal.BusinessReportDao;
import com.dainping.cat.consumer.advanced.dal.SqltableDao;
import com.dainping.cat.consumer.core.dal.HostinfoDao;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.configuration.ServerConfigManager;
import com.dianping.cat.consumer.CatConsumerAdvancedModule;
import com.dianping.cat.consumer.DomainManager;
......@@ -24,6 +20,10 @@ import com.dianping.cat.consumer.advanced.DependencyAnalyzer;
import com.dianping.cat.consumer.advanced.MatrixAnalyzer;
import com.dianping.cat.consumer.advanced.MetricAnalyzer;
import com.dianping.cat.consumer.advanced.SqlAnalyzer;
import com.dianping.cat.consumer.advanced.dal.BusinessReportDao;
import com.dianping.cat.consumer.advanced.dal.SqltableDao;
import com.dianping.cat.consumer.core.dal.HostinfoDao;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.sql.SqlParseManager;
import com.dianping.cat.storage.BucketManager;
......
cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/sql/SqlParseManager.java
浏览文件 @ e036e5fc
......@@ -9,10 +9,10 @@ import java.util.Set;
import org.unidal.dal.jdbc.DalException;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.advanced.dal.Sqltable;
import com.dainping.cat.consumer.advanced.dal.SqltableDao;
import com.dainping.cat.consumer.advanced.dal.SqltableEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.consumer.advanced.dal.Sqltable;
import com.dianping.cat.consumer.advanced.dal.SqltableDao;
import com.dianping.cat.consumer.advanced.dal.SqltableEntity;
public class SqlParseManager {
@Inject
......
cat-consumer-advanced/src/main/resources/META-INF/dal/jdbc/report-dal.xml
浏览文件 @ e036e5fc
<?xml version="1.0" encoding="UTF-8"?>
<entities do-package="com.dainping.cat.consumer.advanced.dal" gen="true">
<entities do-package="com.dianping.cat.consumer.advanced.dal" gen="true">
<entity name="sqltable">
<member name="creation-date" insert-expr="NOW()" />
<member name="modify-date" insert-expr="NOW()" update-expr="NOW()" />
......
cat-consumer-advanced/src/main/resources/META-INF/plexus/components.xml
浏览文件 @ e036e5fc
......@@ -12,7 +12,7 @@
<role>com.dianping.cat.configuration.ServerConfigManager</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.HostinfoDao</role>
<role>com.dianping.cat.consumer.core.dal.HostinfoDao</role>
</requirement>
</requirements>
</component>
......@@ -21,7 +21,7 @@
<implementation>com.dianping.cat.consumer.sql.SqlParseManager</implementation>
<requirements>
<requirement>
<role>com.dainping.cat.consumer.advanced.dal.SqltableDao</role>
<role>com.dianping.cat.consumer.advanced.dal.SqltableDao</role>
</requirement>
</requirements>
</component>
......@@ -39,7 +39,7 @@
<role>com.dianping.cat.storage.BucketManager</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
</requirements>
</component>
......@@ -53,7 +53,7 @@
<role>com.dianping.cat.storage.BucketManager</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.consumer.sql.SqlParseManager</role>
......@@ -73,7 +73,7 @@
<role>com.dianping.cat.storage.BucketManager</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.consumer.sql.SqlParseManager</role>
......@@ -93,7 +93,7 @@
<role>com.dianping.cat.storage.BucketManager</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
</requirements>
</component>
......@@ -107,7 +107,7 @@
<role>com.dianping.cat.storage.BucketManager</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.consumer.DomainManager</role>
......@@ -127,7 +127,7 @@
<role>com.dianping.cat.storage.BucketManager</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.advanced.dal.BusinessReportDao</role>
<role>com.dianping.cat.consumer.advanced.dal.BusinessReportDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.consumer.advanced.BussinessConfigManager</role>
......@@ -198,8 +198,8 @@
</configuration>
</component>
<component>
<role>com.dainping.cat.consumer.advanced.dal.BusinessReportDao</role>
<implementation>com.dainping.cat.consumer.advanced.dal.BusinessReportDao</implementation>
<role>com.dianping.cat.consumer.advanced.dal.BusinessReportDao</role>
<implementation>com.dianping.cat.consumer.advanced.dal.BusinessReportDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
......@@ -207,8 +207,8 @@
</requirements>
</component>
<component>
<role>com.dainping.cat.consumer.advanced.dal.SqltableDao</role>
<implementation>com.dainping.cat.consumer.advanced.dal.SqltableDao</implementation>
<role>com.dianping.cat.consumer.advanced.dal.SqltableDao</role>
<implementation>com.dianping.cat.consumer.advanced.dal.SqltableDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
......
cat-consumer-advanced/src/test/java/com/dianping/cat/consumer/advanced/MetricDaoTest.java
浏览文件 @ e036e5fc
......@@ -8,11 +8,11 @@ import org.junit.Test;
import org.unidal.lookup.ComponentTestCase;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.advanced.dal.BusinessReport;
import com.dainping.cat.consumer.advanced.dal.BusinessReportDao;
import com.dainping.cat.consumer.advanced.dal.BusinessReportEntity;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.advanced.dal.BusinessReport;
import com.dianping.cat.consumer.advanced.dal.BusinessReportDao;
import com.dianping.cat.consumer.advanced.dal.BusinessReportEntity;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.metric.model.entity.MetricReport;
import com.dianping.cat.consumer.metric.model.transform.DefaultNativeBuilder;
import com.dianping.cat.consumer.metric.model.transform.DefaultNativeParser;
......
cat-consumer/src/main/java/com/dianping/cat/consumer/build/CatCoreDatabaseConfigurator.java
浏览文件 @ e036e5fc
......@@ -13,8 +13,8 @@ final class CatCoreDatabaseConfigurator extends AbstractJdbcResourceConfigurator
all.add(defineJdbcDataSourceComponent("cat", "com.mysql.jdbc.Driver", "jdbc:mysql://192.168.7.43:3306/cat", "dpcom_cat", "password", "<![CDATA[useUnicode=true&autoReconnect=true]]>"));
defineSimpleTableProviderComponents(all, "cat", com.dainping.cat.consumer.core.dal._INDEX.getEntityClasses());
defineDaoComponents(all, com.dainping.cat.consumer.core.dal._INDEX.getDaoClasses());
defineSimpleTableProviderComponents(all, "cat", com.dianping.cat.consumer.core.dal._INDEX.getEntityClasses());
defineDaoComponents(all, com.dianping.cat.consumer.core.dal._INDEX.getDaoClasses());
return all;
}
......
cat-consumer/src/main/java/com/dianping/cat/consumer/build/ComponentsConfigurator.java
浏览文件 @ e036e5fc
......@@ -8,10 +8,6 @@ import org.unidal.initialization.Module;
import org.unidal.lookup.configuration.AbstractResourceConfigurator;
import org.unidal.lookup.configuration.Component;
import com.dainping.cat.consumer.core.dal.HostinfoDao;
import com.dainping.cat.consumer.core.dal.ProjectDao;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dainping.cat.consumer.core.dal.TaskDao;
import com.dianping.cat.configuration.ServerConfigManager;
import com.dianping.cat.consumer.CatConsumerModule;
import com.dianping.cat.consumer.DefaultMessageAnalyzerManager;
......@@ -25,6 +21,10 @@ import com.dianping.cat.consumer.core.ProblemAnalyzer;
import com.dianping.cat.consumer.core.StateAnalyzer;
import com.dianping.cat.consumer.core.TopAnalyzer;
import com.dianping.cat.consumer.core.TransactionAnalyzer;
import com.dianping.cat.consumer.core.dal.HostinfoDao;
import com.dianping.cat.consumer.core.dal.ProjectDao;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.core.dal.TaskDao;
import com.dianping.cat.consumer.core.problem.DefaultProblemHandler;
import com.dianping.cat.consumer.core.problem.LongExecutionProblemHandler;
import com.dianping.cat.consumer.core.problem.ProblemHandler;
......
cat-consumer/src/main/java/com/dianping/cat/consumer/core/EventAnalyzer.java
浏览文件 @ e036e5fc
......@@ -10,13 +10,13 @@ import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dainping.cat.consumer.core.dal.Task;
import com.dainping.cat.consumer.core.dal.TaskDao;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.AbstractMessageAnalyzer;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.core.dal.Task;
import com.dianping.cat.consumer.core.dal.TaskDao;
import com.dianping.cat.consumer.event.model.entity.EventName;
import com.dianping.cat.consumer.event.model.entity.EventReport;
import com.dianping.cat.consumer.event.model.entity.EventType;
......
cat-consumer/src/main/java/com/dianping/cat/consumer/core/HeartbeatAnalyzer.java
浏览文件 @ e036e5fc
......@@ -11,13 +11,13 @@ import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dainping.cat.consumer.core.dal.Task;
import com.dainping.cat.consumer.core.dal.TaskDao;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.AbstractMessageAnalyzer;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.core.dal.Task;
import com.dianping.cat.consumer.core.dal.TaskDao;
import com.dianping.cat.consumer.heartbeat.model.entity.Disk;
import com.dianping.cat.consumer.heartbeat.model.entity.HeartbeatReport;
import com.dianping.cat.consumer.heartbeat.model.entity.Period;
......
cat-consumer/src/main/java/com/dianping/cat/consumer/core/ProblemAnalyzer.java
浏览文件 @ e036e5fc
......@@ -13,13 +13,13 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dainping.cat.consumer.core.dal.Task;
import com.dainping.cat.consumer.core.dal.TaskDao;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.AbstractMessageAnalyzer;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.core.dal.Task;
import com.dianping.cat.consumer.core.dal.TaskDao;
import com.dianping.cat.consumer.core.problem.ProblemHandler;
import com.dianping.cat.consumer.problem.model.entity.Duration;
import com.dianping.cat.consumer.problem.model.entity.Entry;
......
cat-consumer/src/main/java/com/dianping/cat/consumer/core/StateAnalyzer.java
浏览文件 @ e036e5fc
......@@ -12,18 +12,18 @@ import org.unidal.dal.jdbc.DalException;
import org.unidal.dal.jdbc.DalNotFoundException;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Hostinfo;
import com.dainping.cat.consumer.core.dal.HostinfoDao;
import com.dainping.cat.consumer.core.dal.Project;
import com.dainping.cat.consumer.core.dal.ProjectDao;
import com.dainping.cat.consumer.core.dal.ProjectEntity;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dainping.cat.consumer.core.dal.Task;
import com.dainping.cat.consumer.core.dal.TaskDao;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.AbstractMessageAnalyzer;
import com.dianping.cat.consumer.core.dal.Hostinfo;
import com.dianping.cat.consumer.core.dal.HostinfoDao;
import com.dianping.cat.consumer.core.dal.Project;
import com.dianping.cat.consumer.core.dal.ProjectDao;
import com.dianping.cat.consumer.core.dal.ProjectEntity;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.core.dal.Task;
import com.dianping.cat.consumer.core.dal.TaskDao;
import com.dianping.cat.consumer.state.model.entity.Machine;
import com.dianping.cat.consumer.state.model.entity.ProcessDomain;
import com.dianping.cat.consumer.state.model.entity.StateReport;
......
cat-consumer/src/main/java/com/dianping/cat/consumer/core/TopAnalyzer.java
浏览文件 @ e036e5fc
......@@ -10,11 +10,11 @@ import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.AbstractMessageAnalyzer;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.problem.model.entity.Entry;
import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
import com.dianping.cat.consumer.problem.model.entity.Segment;
......
cat-consumer/src/main/java/com/dianping/cat/consumer/core/TransactionAnalyzer.java
浏览文件 @ e036e5fc
......@@ -17,13 +17,13 @@ import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dainping.cat.consumer.core.dal.Task;
import com.dainping.cat.consumer.core.dal.TaskDao;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.AbstractMessageAnalyzer;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.core.dal.Task;
import com.dianping.cat.consumer.core.dal.TaskDao;
import com.dianping.cat.consumer.transaction.model.entity.AllDuration;
import com.dianping.cat.consumer.transaction.model.entity.Duration;
import com.dianping.cat.consumer.transaction.model.entity.Machine;
......
cat-consumer/src/main/resources/META-INF/dal/jdbc/report-dal.xml
浏览文件 @ e036e5fc
<?xml version="1.0" encoding="UTF-8"?>
<entities do-package="com.dainping.cat.consumer.core.dal" gen="true">
<entities do-package="com.dianping.cat.consumer.core.dal" gen="true">
<entity name="report" table="report" alias="r">
<member name="creation-date" insert-expr="NOW()" />
<var name="start-date" value-type="Date" />
......
cat-consumer/src/main/resources/META-INF/plexus/components.xml
浏览文件 @ e036e5fc
......@@ -46,10 +46,10 @@
<role>com.dianping.cat.storage.BucketManager</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.TaskDao</role>
<role>com.dianping.cat.consumer.core.dal.TaskDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.consumer.core.problem.ProblemHandler</role>
......@@ -71,10 +71,10 @@
<role>com.dianping.cat.storage.BucketManager</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.TaskDao</role>
<role>com.dianping.cat.consumer.core.dal.TaskDao</role>
</requirement>
</requirements>
</component>
......@@ -88,10 +88,10 @@
<role>com.dianping.cat.storage.BucketManager</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.TaskDao</role>
<role>com.dianping.cat.consumer.core.dal.TaskDao</role>
</requirement>
</requirements>
</component>
......@@ -102,16 +102,16 @@
<instantiation-strategy>per-lookup</instantiation-strategy>
<requirements>
<requirement>
<role>com.dainping.cat.consumer.core.dal.HostinfoDao</role>
<role>com.dianping.cat.consumer.core.dal.HostinfoDao</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.TaskDao</role>
<role>com.dianping.cat.consumer.core.dal.TaskDao</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ProjectDao</role>
<role>com.dianping.cat.consumer.core.dal.ProjectDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.storage.BucketManager</role>
......@@ -131,10 +131,10 @@
<role>com.dianping.cat.storage.BucketManager</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.TaskDao</role>
<role>com.dianping.cat.consumer.core.dal.TaskDao</role>
</requirement>
</requirements>
</component>
......@@ -163,7 +163,7 @@
<role>com.dianping.cat.storage.BucketManager</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
</requirements>
</component>
......@@ -244,8 +244,8 @@
</configuration>
</component>
<component>
<role>com.dainping.cat.consumer.core.dal.HostinfoDao</role>
<implementation>com.dainping.cat.consumer.core.dal.HostinfoDao</implementation>
<role>com.dianping.cat.consumer.core.dal.HostinfoDao</role>
<implementation>com.dianping.cat.consumer.core.dal.HostinfoDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
......@@ -253,8 +253,8 @@
</requirements>
</component>
<component>
<role>com.dainping.cat.consumer.core.dal.ProjectDao</role>
<implementation>com.dainping.cat.consumer.core.dal.ProjectDao</implementation>
<role>com.dianping.cat.consumer.core.dal.ProjectDao</role>
<implementation>com.dianping.cat.consumer.core.dal.ProjectDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
......@@ -262,8 +262,8 @@
</requirements>
</component>
<component>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<implementation>com.dainping.cat.consumer.core.dal.ReportDao</implementation>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
<implementation>com.dianping.cat.consumer.core.dal.ReportDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
......@@ -271,8 +271,8 @@
</requirements>
</component>
<component>
<role>com.dainping.cat.consumer.core.dal.TaskDao</role>
<implementation>com.dainping.cat.consumer.core.dal.TaskDao</implementation>
<role>com.dianping.cat.consumer.core.dal.TaskDao</role>
<implementation>com.dianping.cat.consumer.core.dal.TaskDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
......
cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java
浏览文件 @ e036e5fc
......@@ -10,14 +10,14 @@ import org.unidal.initialization.ModuleManager;
import org.unidal.lookup.configuration.AbstractResourceConfigurator;
import org.unidal.lookup.configuration.Component;
import com.dainping.cat.consumer.advanced.dal.BusinessReportDao;
import com.dainping.cat.consumer.core.dal.ProjectDao;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dainping.cat.consumer.core.dal.TaskDao;
import com.dianping.cat.CatHomeModule;
import com.dianping.cat.configuration.ServerConfigManager;
import com.dianping.cat.consumer.DomainManager;
import com.dianping.cat.consumer.RealtimeConsumer;
import com.dianping.cat.consumer.advanced.dal.BusinessReportDao;
import com.dianping.cat.consumer.core.dal.ProjectDao;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.core.dal.TaskDao;
import com.dianping.cat.home.dal.report.DailygraphDao;
import com.dianping.cat.home.dal.report.DailyreportDao;
import com.dianping.cat.home.dal.report.EventDao;
......
cat-home/src/main/java/com/dianping/cat/build/WebComponentConfigurator.java
浏览文件 @ e036e5fc
......@@ -3,12 +3,12 @@ package com.dianping.cat.build;
import java.util.ArrayList;
import java.util.List;
import com.dianping.cat.report.ReportModule;
import com.dianping.cat.system.SystemModule;
import org.unidal.lookup.configuration.Component;
import org.unidal.web.configuration.AbstractWebComponentsConfigurator;
import com.dianping.cat.report.ReportModule;
import com.dianping.cat.system.SystemModule;
class WebComponentConfigurator extends AbstractWebComponentsConfigurator {
@SuppressWarnings("unchecked")
@Override
......
cat-home/src/main/java/com/dianping/cat/report/page/AbstractReportModel.java
浏览文件 @ e036e5fc
......@@ -10,7 +10,7 @@ import org.unidal.web.mvc.Action;
import org.unidal.web.mvc.ActionContext;
import org.unidal.web.mvc.ViewModel;
import com.dainping.cat.consumer.core.dal.Project;
import com.dianping.cat.consumer.core.dal.Project;
import com.dianping.cat.report.ReportPage;
import com.dianping.cat.report.view.DomainNavManager;
import com.dianping.cat.report.view.DomainNavManager.Department;
......
cat-home/src/main/java/com/dianping/cat/report/page/BaseHistoryGraphs.java
浏览文件 @ e036e5fc
......@@ -25,12 +25,13 @@ public class BaseHistoryGraphs {
return result;
}
protected String buildSingalTitle(Date date, int size, long step) {
SimpleDateFormat m_sdf = new SimpleDateFormat("yyyy-MM-dd");
private String buildSingalTitle(Date date, int size, long step) {
SimpleDateFormat from = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat to = new SimpleDateFormat("MM-dd");
StringBuilder sb = new StringBuilder();
sb.append("From ").append(m_sdf.format(date)).append(" To ")
.append(m_sdf.format(new Date(date.getTime() + step * size)));
sb.append(from.format(date)).append("~")
.append(to.format(new Date(date.getTime() + step * size)));
return sb.toString();
}
}
cat-home/src/main/java/com/dianping/cat/report/page/dependency/DependencyGraphBuilder.java
浏览文件 @ e036e5fc
......@@ -28,7 +28,7 @@ public class DependencyGraphBuilder extends BaseVisitor {
if (old.getStatus() > old.getStatus()) {
old.setStatus(old.getStatus());
}
old.setWeight(old.getWeight() + node.getWeight());
old.setWeight(old.getWeight());
old.setDes(old.getDes() + node.getDes());
if (!StringUtil.isEmpty(node.getLink())) {
old.setLink(node.getLink());
......
cat-home/src/main/java/com/dianping/cat/report/page/dependency/Handler.java
浏览文件 @ e036e5fc
......@@ -62,6 +62,10 @@ public class Handler implements PageHandler<Context> {
ModelResponse<DependencyReport> response = m_service.invoke(request);
DependencyReport report = response.getModel();
Date start = report.getStartTime();
if (start == null) {
report.setStartTime(new Date(payload.getDate()));
}
return report;
} else {
throw new RuntimeException("Internal error: no eligable dependency service registered for " + request + "!");
......@@ -125,8 +129,6 @@ public class Handler implements PageHandler<Context> {
for (LineChart temp : charts) {
result.add(temp.getJsonString());
System.out.println(temp.getJsonString());
}
return result;
}
......
cat-home/src/main/java/com/dianping/cat/report/page/dependency/JspViewer.java
浏览文件 @ e036e5fc
package com.dianping.cat.report.page.dependency;
import com.dianping.cat.report.ReportPage;
import org.unidal.web.mvc.view.BaseJspViewer;
import com.dianping.cat.report.ReportPage;
public class JspViewer extends BaseJspViewer<ReportPage, Action, Context, Model> {
@Override
protected String getJspFilePath(Context ctx, Model model) {
......
cat-home/src/main/java/com/dianping/cat/report/page/dependency/LineGraphBuilder.java
浏览文件 @ e036e5fc
......@@ -135,7 +135,7 @@ public class LineGraphBuilder extends BaseVisitor {
long count = segment.getExceptionCount();
m_currentMinute = segment.getId();
Item item = findOrCreateItem("count", "exception");
Item item = findOrCreateItem(ERROR_COUNT, "exception");
item.setValue(m_currentMinute, count);
super.visitSegment(segment);
......
cat-home/src/main/java/com/dianping/cat/report/page/externalError/JspViewer.java
浏览文件 @ e036e5fc
package com.dianping.cat.report.page.externalError;
import com.dianping.cat.report.ReportPage;
import org.unidal.web.mvc.view.BaseJspViewer;
import com.dianping.cat.report.ReportPage;
public class JspViewer extends BaseJspViewer<ReportPage, Action, Context, Model> {
@Override
protected String getJspFilePath(Context ctx, Model model) {
......
cat-home/src/main/java/com/dianping/cat/report/page/externalError/Model.java
浏览文件 @ e036e5fc
package com.dianping.cat.report.page.externalError;
import com.dianping.cat.report.ReportPage;
import org.unidal.web.mvc.ViewModel;
import com.dianping.cat.report.ReportPage;
public class Model extends ViewModel<ReportPage, Action, Context> {
public Model(Context ctx) {
super(ctx);
......
cat-home/src/main/java/com/dianping/cat/report/service/impl/HourlyReportServiceImpl.java
浏览文件 @ e036e5fc
......@@ -8,13 +8,13 @@ import java.util.Set;
import org.unidal.dal.jdbc.DalException;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.advanced.dal.BusinessReport;
import com.dainping.cat.consumer.advanced.dal.BusinessReportDao;
import com.dainping.cat.consumer.advanced.dal.BusinessReportEntity;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dainping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.consumer.advanced.dal.BusinessReport;
import com.dianping.cat.consumer.advanced.dal.BusinessReportDao;
import com.dianping.cat.consumer.advanced.dal.BusinessReportEntity;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.consumer.cross.model.entity.CrossReport;
import com.dianping.cat.consumer.database.model.entity.DatabaseReport;
import com.dianping.cat.consumer.dependency.model.entity.DependencyReport;
......
cat-home/src/main/java/com/dianping/cat/report/task/cross/CrossMerger.java
浏览文件 @ e036e5fc
......@@ -4,8 +4,8 @@ import java.util.Date;
import java.util.List;
import java.util.Set;
import com.dainping.cat.consumer.core.dal.Report;
import com.dianping.cat.Cat;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.cross.model.entity.CrossReport;
import com.dianping.cat.consumer.cross.model.transform.DefaultSaxParser;
import com.dianping.cat.report.page.model.cross.CrossReportMerger;
......
cat-home/src/main/java/com/dianping/cat/report/task/cross/CrossReportBuilder.java
浏览文件 @ e036e5fc
......@@ -8,10 +8,10 @@ import java.util.Set;
import org.unidal.dal.jdbc.DalException;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.consumer.cross.model.entity.CrossReport;
import com.dianping.cat.consumer.cross.model.transform.DefaultSaxParser;
import com.dianping.cat.helper.TimeUtil;
......
cat-home/src/main/java/com/dianping/cat/report/task/database/DatabaseMerger.java
浏览文件 @ e036e5fc
......@@ -4,8 +4,8 @@ import java.util.Date;
import java.util.List;
import java.util.Set;
import com.dainping.cat.consumer.core.dal.Report;
import com.dianping.cat.Cat;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.database.model.entity.DatabaseReport;
import com.dianping.cat.consumer.database.model.transform.DefaultSaxParser;
import com.dianping.cat.helper.CatString;
......
cat-home/src/main/java/com/dianping/cat/report/task/database/DatabaseReportBuilder.java
浏览文件 @ e036e5fc
......@@ -8,10 +8,10 @@ import java.util.Set;
import org.unidal.dal.jdbc.DalException;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.consumer.database.model.entity.DatabaseReport;
import com.dianping.cat.consumer.database.model.transform.DefaultSaxParser;
import com.dianping.cat.helper.TimeUtil;
......
cat-home/src/main/java/com/dianping/cat/report/task/event/EventMerger.java
浏览文件 @ e036e5fc
......@@ -7,8 +7,8 @@ import java.util.Date;
import java.util.List;
import java.util.Set;
import com.dainping.cat.consumer.core.dal.Report;
import com.dianping.cat.Cat;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.event.model.entity.EventReport;
import com.dianping.cat.consumer.event.model.entity.Machine;
import com.dianping.cat.consumer.event.model.transform.DefaultSaxParser;
......
cat-home/src/main/java/com/dianping/cat/report/task/event/EventReportBuilder.java
浏览文件 @ e036e5fc
......@@ -9,10 +9,10 @@ import java.util.Set;
import org.unidal.dal.jdbc.DalException;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.consumer.event.model.entity.EventReport;
import com.dianping.cat.consumer.event.model.transform.DefaultSaxParser;
import com.dianping.cat.helper.TimeUtil;
......
cat-home/src/main/java/com/dianping/cat/report/task/health/HealthReportBuilder.java
浏览文件 @ e036e5fc
......@@ -11,10 +11,10 @@ import org.codehaus.plexus.logging.Logger;
import org.unidal.dal.jdbc.DalException;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.consumer.event.model.entity.EventReport;
import com.dianping.cat.consumer.health.model.entity.HealthReport;
import com.dianping.cat.consumer.health.model.transform.DefaultXmlBuilder;
......
cat-home/src/main/java/com/dianping/cat/report/task/health/HealthServiceCollector.java
浏览文件 @ e036e5fc
......@@ -11,11 +11,11 @@ import java.util.Set;
import org.unidal.dal.jdbc.DalException;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dainping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.consumer.DomainManager;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.consumer.cross.model.entity.CrossReport;
import com.dianping.cat.consumer.cross.model.transform.DefaultSaxParser;
import com.dianping.cat.helper.CatString;
......
cat-home/src/main/java/com/dianping/cat/report/task/heartbeat/HeartbeatMerger.java
浏览文件 @ e036e5fc
......@@ -6,8 +6,8 @@ package com.dianping.cat.report.task.heartbeat;
import java.util.List;
import java.util.Set;
import com.dainping.cat.consumer.core.dal.Report;
import com.dianping.cat.Cat;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.heartbeat.model.entity.HeartbeatReport;
import com.dianping.cat.consumer.heartbeat.model.transform.DefaultSaxParser;
import com.dianping.cat.report.page.model.heartbeat.HeartbeatReportMerger;
......
cat-home/src/main/java/com/dianping/cat/report/task/heartbeat/HeartbeatReportBuilder.java
浏览文件 @ e036e5fc
......@@ -8,10 +8,10 @@ import java.util.List;
import org.unidal.dal.jdbc.DalException;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.consumer.heartbeat.model.entity.HeartbeatReport;
import com.dianping.cat.consumer.heartbeat.model.transform.DefaultSaxParser;
import com.dianping.cat.helper.TimeUtil;
......
cat-home/src/main/java/com/dianping/cat/report/task/matrix/MatrixMerger.java
浏览文件 @ e036e5fc
......@@ -4,9 +4,9 @@ import java.util.Date;
import java.util.List;
import java.util.Set;
import com.dainping.cat.consumer.core.dal.Report;
import com.dianping.cat.Cat;
import com.dianping.cat.consumer.advanced.MatrixReportFilter;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.matrix.model.entity.MatrixReport;
import com.dianping.cat.consumer.matrix.model.transform.DefaultSaxParser;
import com.dianping.cat.report.page.model.matrix.MatrixReportMerger;
......
cat-home/src/main/java/com/dianping/cat/report/task/matrix/MatrixReportBuilder.java
浏览文件 @ e036e5fc
......@@ -8,10 +8,10 @@ import java.util.Set;
import org.unidal.dal.jdbc.DalException;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.consumer.matrix.model.entity.MatrixReport;
import com.dianping.cat.consumer.matrix.model.transform.DefaultSaxParser;
import com.dianping.cat.helper.TimeUtil;
......
cat-home/src/main/java/com/dianping/cat/report/task/problem/ProblemMerger.java
浏览文件 @ e036e5fc
......@@ -7,8 +7,8 @@ import java.util.Date;
import java.util.List;
import java.util.Set;
import com.dainping.cat.consumer.core.dal.Report;
import com.dianping.cat.Cat;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
import com.dianping.cat.consumer.problem.model.transform.DefaultSaxParser;
import com.dianping.cat.report.page.model.problem.ProblemReportMerger;
......
cat-home/src/main/java/com/dianping/cat/report/task/problem/ProblemReportBuilder.java
浏览文件 @ e036e5fc
......@@ -9,10 +9,10 @@ import java.util.Set;
import org.unidal.dal.jdbc.DalException;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
import com.dianping.cat.consumer.problem.model.transform.DefaultSaxParser;
import com.dianping.cat.helper.TimeUtil;
......
cat-home/src/main/java/com/dianping/cat/report/task/spi/AbstractReportBuilder.java
浏览文件 @ e036e5fc
......@@ -9,10 +9,10 @@ import java.util.Set;
import org.unidal.dal.jdbc.DalException;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dainping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.home.dal.report.DailygraphDao;
import com.dianping.cat.home.dal.report.DailyreportDao;
import com.dianping.cat.home.dal.report.GraphDao;
......
cat-home/src/main/java/com/dianping/cat/report/task/spi/ReportFacade.java
浏览文件 @ e036e5fc
......@@ -10,8 +10,8 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Task;
import com.dianping.cat.Cat;
import com.dianping.cat.consumer.core.dal.Task;
import com.dianping.cat.report.task.cross.CrossReportBuilder;
import com.dianping.cat.report.task.database.DatabaseReportBuilder;
import com.dianping.cat.report.task.event.EventReportBuilder;
......
cat-home/src/main/java/com/dianping/cat/report/task/spi/ReportMerger.java
浏览文件 @ e036e5fc
......@@ -6,7 +6,7 @@ package com.dianping.cat.report.task.spi;
import java.util.List;
import java.util.Set;
import com.dainping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.Report;
public interface ReportMerger<E> {
......
cat-home/src/main/java/com/dianping/cat/report/task/sql/SqlMerger.java
浏览文件 @ e036e5fc
......@@ -4,8 +4,8 @@ import java.util.Date;
import java.util.List;
import java.util.Set;
import com.dainping.cat.consumer.core.dal.Report;
import com.dianping.cat.Cat;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.sql.model.entity.SqlReport;
import com.dianping.cat.consumer.sql.model.transform.DefaultSaxParser;
import com.dianping.cat.helper.CatString;
......
cat-home/src/main/java/com/dianping/cat/report/task/sql/SqlReportBuilder.java
浏览文件 @ e036e5fc
......@@ -8,10 +8,10 @@ import java.util.Set;
import org.unidal.dal.jdbc.DalException;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.consumer.sql.model.entity.SqlReport;
import com.dianping.cat.consumer.sql.model.transform.DefaultSaxParser;
import com.dianping.cat.helper.TimeUtil;
......
cat-home/src/main/java/com/dianping/cat/report/task/state/StateMerger.java
浏览文件 @ e036e5fc
......@@ -4,8 +4,8 @@ import java.util.Date;
import java.util.List;
import java.util.Set;
import com.dainping.cat.consumer.core.dal.Report;
import com.dianping.cat.Cat;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.state.model.entity.Machine;
import com.dianping.cat.consumer.state.model.entity.StateReport;
import com.dianping.cat.consumer.state.model.transform.DefaultSaxParser;
......
cat-home/src/main/java/com/dianping/cat/report/task/state/StateReportBuilder.java
浏览文件 @ e036e5fc
......@@ -8,10 +8,10 @@ import java.util.Set;
import org.unidal.dal.jdbc.DalException;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.consumer.state.model.entity.StateReport;
import com.dianping.cat.consumer.state.model.transform.DefaultSaxParser;
import com.dianping.cat.helper.TimeUtil;
......
cat-home/src/main/java/com/dianping/cat/report/task/thread/DefaultTaskConsumer.java
浏览文件 @ e036e5fc
......@@ -9,11 +9,11 @@ import java.util.concurrent.locks.LockSupport;
import org.unidal.dal.jdbc.DalException;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Task;
import com.dainping.cat.consumer.core.dal.TaskDao;
import com.dainping.cat.consumer.core.dal.TaskEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.core.dal.Task;
import com.dianping.cat.consumer.core.dal.TaskDao;
import com.dianping.cat.consumer.core.dal.TaskEntity;
import com.dianping.cat.report.task.spi.ReportFacade;
public class DefaultTaskConsumer extends TaskConsumer {
......
cat-home/src/main/java/com/dianping/cat/report/task/thread/TaskConsumer.java
浏览文件 @ e036e5fc
package com.dianping.cat.report.task.thread;
import com.dainping.cat.consumer.core.dal.Task;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.core.dal.Task;
public abstract class TaskConsumer implements org.unidal.helper.Threads.Task {
......
cat-home/src/main/java/com/dianping/cat/report/task/thread/TaskProducer.java
浏览文件 @ e036e5fc
......@@ -13,14 +13,14 @@ import org.unidal.dal.jdbc.DalException;
import org.unidal.dal.jdbc.DalNotFoundException;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dainping.cat.consumer.core.dal.ReportEntity;
import com.dainping.cat.consumer.core.dal.Task;
import com.dainping.cat.consumer.core.dal.TaskDao;
import com.dainping.cat.consumer.core.dal.TaskEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.consumer.core.dal.Task;
import com.dianping.cat.consumer.core.dal.TaskDao;
import com.dianping.cat.consumer.core.dal.TaskEntity;
import com.dianping.cat.helper.CatString;
import com.dianping.cat.helper.TimeUtil;
import com.dianping.cat.message.Transaction;
......
cat-home/src/main/java/com/dianping/cat/report/task/transaction/TransactionMerger.java
浏览文件 @ e036e5fc
......@@ -10,9 +10,9 @@ import java.util.Set;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import com.dainping.cat.consumer.core.dal.Report;
import com.dianping.cat.Cat;
import com.dianping.cat.consumer.core.TransactionReportUrlFilter;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
import com.dianping.cat.consumer.transaction.model.transform.DefaultSaxParser;
import com.dianping.cat.report.page.model.transaction.TransactionReportMerger;
......
cat-home/src/main/java/com/dianping/cat/report/task/transaction/TransactionReportBuilder.java
浏览文件 @ e036e5fc
......@@ -11,11 +11,11 @@ import org.codehaus.plexus.logging.Logger;
import org.unidal.dal.jdbc.DalException;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.NetworkInterfaceManager;
import com.dianping.cat.consumer.core.TransactionReportUrlFilter;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
import com.dianping.cat.consumer.transaction.model.transform.DefaultSaxParser;
import com.dianping.cat.helper.TimeUtil;
......
cat-home/src/main/java/com/dianping/cat/report/view/DomainNavManager.java
浏览文件 @ e036e5fc
......@@ -15,11 +15,11 @@ import org.unidal.helper.Threads;
import org.unidal.helper.Threads.Task;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Project;
import com.dainping.cat.consumer.core.dal.ProjectDao;
import com.dainping.cat.consumer.core.dal.ProjectEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.configuration.ServerConfigManager;
import com.dianping.cat.consumer.core.dal.Project;
import com.dianping.cat.consumer.core.dal.ProjectDao;
import com.dianping.cat.consumer.core.dal.ProjectEntity;
import com.dianping.cat.helper.TimeUtil;
public class DomainNavManager implements Initializable {
......
cat-home/src/main/java/com/dianping/cat/system/page/config/Handler.java
浏览文件 @ e036e5fc
......@@ -15,10 +15,10 @@ import org.unidal.web.mvc.annotation.InboundActionMeta;
import org.unidal.web.mvc.annotation.OutboundActionMeta;
import org.unidal.web.mvc.annotation.PayloadMeta;
import com.dainping.cat.consumer.core.dal.Project;
import com.dainping.cat.consumer.core.dal.ProjectDao;
import com.dainping.cat.consumer.core.dal.ProjectEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.consumer.core.dal.Project;
import com.dianping.cat.consumer.core.dal.ProjectDao;
import com.dianping.cat.consumer.core.dal.ProjectEntity;
import com.dianping.cat.home.dal.report.AggregationRule;
import com.dianping.cat.home.dal.report.AggregationRuleDao;
import com.dianping.cat.home.dal.report.AggregationRuleEntity;
......
cat-home/src/main/java/com/dianping/cat/system/page/config/Model.java
浏览文件 @ e036e5fc
......@@ -5,7 +5,7 @@ import java.util.List;
import org.unidal.web.mvc.ViewModel;
import com.dainping.cat.consumer.core.dal.Project;
import com.dianping.cat.consumer.core.dal.Project;
import com.dianping.cat.home.dal.report.AggregationRule;
import com.dianping.cat.system.SystemPage;
......
cat-home/src/main/resources/META-INF/plexus/components.xml
浏览文件 @ e036e5fc
......@@ -31,7 +31,7 @@
<implementation>com.dianping.cat.report.task.thread.DefaultTaskConsumer</implementation>
<requirements>
<requirement>
<role>com.dainping.cat.consumer.core.dal.TaskDao</role>
<role>com.dianping.cat.consumer.core.dal.TaskDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.report.task.spi.ReportFacade</role>
......@@ -101,7 +101,7 @@
<role>com.dianping.cat.home.dal.report.DailygraphDao</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.home.dal.report.DailyreportDao</role>
......@@ -131,7 +131,7 @@
<role>com.dianping.cat.home.dal.report.DailygraphDao</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.home.dal.report.DailyreportDao</role>
......@@ -161,7 +161,7 @@
<role>com.dianping.cat.home.dal.report.DailygraphDao</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.home.dal.report.DailyreportDao</role>
......@@ -191,7 +191,7 @@
<role>com.dianping.cat.home.dal.report.DailygraphDao</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.home.dal.report.DailyreportDao</role>
......@@ -221,7 +221,7 @@
<role>com.dianping.cat.home.dal.report.DailygraphDao</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.home.dal.report.DailyreportDao</role>
......@@ -248,7 +248,7 @@
<role>com.dianping.cat.home.dal.report.DailygraphDao</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.home.dal.report.DailyreportDao</role>
......@@ -275,7 +275,7 @@
<role>com.dianping.cat.home.dal.report.DailygraphDao</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.home.dal.report.DailyreportDao</role>
......@@ -302,7 +302,7 @@
<role>com.dianping.cat.home.dal.report.DailygraphDao</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.home.dal.report.DailyreportDao</role>
......@@ -329,7 +329,7 @@
<role>com.dianping.cat.home.dal.report.DailygraphDao</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.home.dal.report.DailyreportDao</role>
......@@ -350,10 +350,10 @@
<implementation>com.dianping.cat.report.task.thread.TaskProducer</implementation>
<requirements>
<requirement>
<role>com.dainping.cat.consumer.core.dal.TaskDao</role>
<role>com.dianping.cat.consumer.core.dal.TaskDao</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
</requirements>
</component>
......@@ -365,7 +365,7 @@
<role>com.dianping.cat.home.dal.report.GraphDao</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.home.dal.report.DailyreportDao</role>
......@@ -434,7 +434,7 @@
<role>com.dianping.cat.consumer.DomainManager</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
</requirements>
</component>
......@@ -473,7 +473,10 @@
<implementation>com.dianping.cat.report.view.DomainNavManager</implementation>
<requirements>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ProjectDao</role>
<role>com.dianping.cat.consumer.core.dal.ProjectDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.configuration.ServerConfigManager</role>
</requirement>
</requirements>
</component>
......@@ -482,10 +485,10 @@
<implementation>com.dianping.cat.report.service.impl.HourlyReportServiceImpl</implementation>
<requirements>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ReportDao</role>
<role>com.dianping.cat.consumer.core.dal.ReportDao</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.advanced.dal.BusinessReportDao</role>
<role>com.dianping.cat.consumer.advanced.dal.BusinessReportDao</role>
</requirement>
</requirements>
</component>
......@@ -2296,7 +2299,7 @@
<implementation>com.dianping.cat.consumer.DomainManager</implementation>
<requirements>
<requirement>
<role>com.dainping.cat.consumer.core.dal.HostinfoDao</role>
<role>com.dianping.cat.consumer.core.dal.HostinfoDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.configuration.ServerConfigManager</role>
......@@ -2304,8 +2307,8 @@
</requirements>
</component>
<component>
<role>com.dainping.cat.consumer.core.dal.HostinfoDao</role>
<implementation>com.dainping.cat.consumer.core.dal.HostinfoDao</implementation>
<role>com.dianping.cat.consumer.core.dal.HostinfoDao</role>
<implementation>com.dianping.cat.consumer.core.dal.HostinfoDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
......@@ -2842,7 +2845,7 @@
<role>com.dianping.cat.system.page.config.JspViewer</role>
</requirement>
<requirement>
<role>com.dainping.cat.consumer.core.dal.ProjectDao</role>
<role>com.dianping.cat.consumer.core.dal.ProjectDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.home.dal.report.AggregationRuleDao</role>
......@@ -2859,8 +2862,8 @@
</requirements>
</component>
<component>
<role>com.dainping.cat.consumer.core.dal.ProjectDao</role>
<implementation>com.dainping.cat.consumer.core.dal.ProjectDao</implementation>
<role>com.dianping.cat.consumer.core.dal.ProjectDao</role>
<implementation>com.dianping.cat.consumer.core.dal.ProjectDao</implementation>
<requirements>
<requirement>
<role>org.unidal.dal.jdbc.QueryEngine</role>
......
cat-home/src/test/java/com/dianping/cat/report/analyzer/UrlTransactionBugTest.java
浏览文件 @ e036e5fc
......@@ -11,10 +11,10 @@ import org.unidal.helper.Files;
import org.unidal.lookup.ComponentTestCase;
import org.unidal.lookup.annotation.Inject;
import com.dainping.cat.consumer.core.dal.Report;
import com.dainping.cat.consumer.core.dal.ReportDao;
import com.dainping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.Cat;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.ReportDao;
import com.dianping.cat.consumer.core.dal.ReportEntity;
import com.dianping.cat.consumer.transaction.model.entity.TransactionName;
import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
import com.dianping.cat.consumer.transaction.model.entity.TransactionType;
......
cat-home/src/test/java/com/dianping/cat/report/page/metric/MetricDaoTest.java
浏览文件 @ e036e5fc
......@@ -9,9 +9,9 @@ import org.unidal.lookup.ComponentTestCase;
import org.unidal.lookup.annotation.Inject;
import org.unidal.webres.helper.Files;
import com.dainping.cat.consumer.advanced.dal.BusinessReport;
import com.dainping.cat.consumer.advanced.dal.BusinessReportDao;
import com.dainping.cat.consumer.advanced.dal.BusinessReportEntity;
import com.dianping.cat.consumer.advanced.dal.BusinessReport;
import com.dianping.cat.consumer.advanced.dal.BusinessReportDao;
import com.dianping.cat.consumer.advanced.dal.BusinessReportEntity;
import com.dianping.cat.consumer.metric.model.entity.MetricReport;
import com.dianping.cat.consumer.metric.model.transform.DefaultNativeBuilder;
import com.dianping.cat.consumer.metric.model.transform.DefaultNativeParser;
......
cat-home/src/test/java/com/dianping/cat/report/task/TaskConsumerTest.java
浏览文件 @ e036e5fc
......@@ -8,7 +8,7 @@ import junit.framework.Assert;
import org.junit.Test;
import com.dainping.cat.consumer.core.dal.Task;
import com.dianping.cat.consumer.core.dal.Task;
import com.dianping.cat.report.task.thread.TaskConsumer;
public class TaskConsumerTest {
......
cat-home/src/test/java/com/dianping/cat/report/task/event/EventDailyGraphMergerTest.java
浏览文件 @ e036e5fc
......@@ -11,7 +11,7 @@ import org.junit.Before;
import org.junit.Test;
import org.unidal.webres.helper.Files;
import com.dainping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.event.model.entity.EventReport;
public class EventDailyGraphMergerTest {
......
cat-home/src/test/java/com/dianping/cat/report/task/problem/ProblemDailyGraphMergerTest.java
浏览文件 @ e036e5fc
......@@ -11,7 +11,7 @@ import org.junit.Before;
import org.junit.Test;
import org.unidal.webres.helper.Files;
import com.dainping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.problem.model.entity.ProblemReport;
public class ProblemDailyGraphMergerTest {
......
cat-home/src/test/java/com/dianping/cat/report/task/transaction/TransactionDailyGraphMergerTest.java
浏览文件 @ e036e5fc
......@@ -11,7 +11,7 @@ import org.junit.Before;
import org.junit.Test;
import org.unidal.webres.helper.Files;
import com.dainping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.core.dal.Report;
import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
public class TransactionDailyGraphMergerTest {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或