From 93482337f42cc3341ee0310405f6476b44610887 Mon Sep 17 00:00:00 2001 From: guoyuanlu Date: Wed, 27 Sep 2023 16:27:02 +0800 Subject: [PATCH] fixed --- .../cat/build/ComponentsConfigurator.java | 37 ++++++++++++++++++- .../cat/build/ComponentsConfigurator.java | 18 +++------ 2 files changed, 41 insertions(+), 14 deletions(-) diff --git a/cat-core/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java b/cat-core/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java index 553a6df1a2..9094519cb9 100644 --- a/cat-core/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java +++ b/cat-core/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java @@ -22,6 +22,15 @@ import java.util.Collection; import java.util.List; +import com.dianping.cat.config.app.*; +import com.dianping.cat.config.app.command.CommandFormatConfigManager; +import com.dianping.cat.config.app.command.DefaultCommandFormatlHandler; +import com.dianping.cat.config.web.AjaxDataTableProvider; +import com.dianping.cat.config.web.WebConfigManager; +import com.dianping.cat.config.web.WebSpeedConfigManager; +import com.dianping.cat.config.web.js.DefaultAggregationHandler; +import com.dianping.cat.config.web.url.DefaultUrlPatternHandler; +import com.dianping.cat.config.web.url.UrlPatternConfigManager; import org.unidal.dal.jdbc.configuration.AbstractJdbcResourceConfigurator; import org.unidal.lookup.configuration.Component; import com.dianping.cat.CatConstants; @@ -80,10 +89,24 @@ public List defineComponents() { all.add(A(DefaultMessageHandler.class)); + all.add(A(DefaultAggregationHandler.class)); + all.add(A(DefaultCommandFormatlHandler.class)); + all.add(A(CommandFormatConfigManager.class)); all.add(A(SampleConfigManager.class)); + all.add(A(AppCommandConfigManager.class)); + all.add(A(AppCommandGroupConfigManager.class)); + all.add(A(WebConfigManager.class)); + all.add(A(WebSpeedConfigManager.class)); + all.add(A(AppSpeedConfigManager.class)); all.add(A(BusinessConfigManager.class)); + all.add(A(MobileConfigManager.class)); + all.add(A(CrashLogConfigManager.class)); + all.add(A(SdkConfigManager.class)); all.add(A(ReportReloadConfigManager.class)); + all.add(A(DefaultUrlPatternHandler.class)); + all.add(A(UrlPatternConfigManager.class)); + all.add(A(CatCoreModule.class)); all.addAll(defineStorageComponents()); @@ -91,15 +114,25 @@ public List defineComponents() { all.add(A(RemoteServersManager.class)); all.add(A(ServersUpdaterManager.class)); + all.add(A(AppCommandTableProvider.class)); + all.add(A(AppConnectionTableProvider.class)); + all.add(A(AppSpeedTableProvider.class)); + all.add(A(AjaxDataTableProvider.class)); + all.add(A(CrashLogTableProvider.class)); + all.add(A(CrashLogContentTableProvider.class)); + all.add(A(TpValueStatisticConfigManager.class)); all.add(A(AtomicMessageConfigManager.class)); all.add(defineJdbcDataSourceConfigurationManagerComponent("datasources.xml") - .config(E("baseDirRef").value("CAT_HOME")) - .config(E("defaultBaseDir").value(CatConstants.CAT_HOME_DEFAULT_DIR))); + .config(E("baseDirRef").value("CAT_HOME")) + .config(E("defaultBaseDir").value(CatConstants.CAT_HOME_DEFAULT_DIR))); all.addAll(new CatCoreDatabaseConfigurator().defineComponents()); all.addAll(new CatDatabaseConfigurator().defineComponents()); + all.addAll(new AppDatabaseConfigurator().defineComponents()); + all.addAll(new AppCrashDatabaseConfigurator().defineComponents()); + all.addAll(new WebDatabaseConfigurator().defineComponents()); return all; } diff --git a/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java b/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java index 3ade58e126..1f16ea7019 100755 --- a/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java +++ b/cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; +import com.dianping.cat.build.report.*; import org.unidal.dal.jdbc.configuration.AbstractJdbcResourceConfigurator; import org.unidal.initialization.DefaultModuleManager; import org.unidal.initialization.ModuleManager; @@ -28,15 +29,6 @@ import com.dianping.cat.CatConstants; import com.dianping.cat.CatHomeModule; -import com.dianping.cat.build.report.DependencyComponentConfigurator; -import com.dianping.cat.build.report.EventComponentConfigurator; -import com.dianping.cat.build.report.HeartbeatComponentConfigurator; -import com.dianping.cat.build.report.MetricComponentConfigurator; -import com.dianping.cat.build.report.OfflineComponentConfigurator; -import com.dianping.cat.build.report.ProblemComponentConfigurator; -import com.dianping.cat.build.report.ReportComponentConfigurator; -import com.dianping.cat.build.report.StorageComponentConfigurator; -import com.dianping.cat.build.report.TransactionComponentConfigurator; import com.dianping.cat.helper.JsonBuilder; import com.dianping.cat.mvc.PayloadNormalizer; import com.dianping.cat.report.HourlyReportContentTableProvider; @@ -111,7 +103,9 @@ public List defineComponents() { all.add(A(ResourceConfigManager.class)); all.add(C(ModuleManager.class, DefaultModuleManager.class) // - .config(E("topLevelModules").value(CatHomeModule.ID))); + .config(E("topLevelModules").value(CatHomeModule.ID))); + + all.addAll(new AppComponentConfigurator().defineComponents()); all.addAll(new TransactionComponentConfigurator().defineComponents()); @@ -132,8 +126,8 @@ public List defineComponents() { all.addAll(new OfflineComponentConfigurator().defineComponents()); all.add(defineJdbcDataSourceConfigurationManagerComponent("datasources.xml") - .config(E("baseDirRef").value("CAT_HOME")) - .config(E("defaultBaseDir").value(CatConstants.CAT_HOME_DEFAULT_DIR))); + .config(E("baseDirRef").value("CAT_HOME")) + .config(E("defaultBaseDir").value(CatConstants.CAT_HOME_DEFAULT_DIR))); all.addAll(new CatDatabaseConfigurator().defineComponents());