From f5acbaff87119061ea04a4a26049e86e5130c1c6 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Tue, 19 Jul 2016 07:33:28 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8DWeb=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E4=BA=8B=E5=8A=A1,2.=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AnalysisResultService.java | 2 ++ .../service/impl/CallChainTreeService.java | 2 ++ .../web/service/impl/TraceTreeService.java | 2 ++ .../skywalking/web/util/DBConnectUtil.java | 24 +++---------------- .../resources/spring/application-jdbc.xml | 10 +++----- 5 files changed, 12 insertions(+), 28 deletions(-) diff --git a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/AnalysisResultService.java b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/AnalysisResultService.java index f3c48b754..e8b8a728b 100644 --- a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/AnalysisResultService.java +++ b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/AnalysisResultService.java @@ -11,6 +11,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.io.IOException; import java.text.ParseException; @@ -21,6 +22,7 @@ import java.util.*; * Created by xin on 16-4-25. */ @Service +@Transactional public class AnalysisResultService implements IAnalysisResultService { private Logger logger = LogManager.getLogger(AnalysisResultService.class); diff --git a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/CallChainTreeService.java b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/CallChainTreeService.java index aca4fbcc9..612fe4cfe 100644 --- a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/CallChainTreeService.java +++ b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/CallChainTreeService.java @@ -11,6 +11,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.io.IOException; import java.sql.SQLException; @@ -18,6 +19,7 @@ import java.util.ArrayList; import java.util.List; @Service +@Transactional public class CallChainTreeService implements ICallChainTreeService { private Logger logger = LogManager.getLogger(CallChainTreeService.class); diff --git a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/TraceTreeService.java b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/TraceTreeService.java index 0336be570..3c6fd9ac1 100644 --- a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/TraceTreeService.java +++ b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/TraceTreeService.java @@ -10,6 +10,7 @@ import com.ai.cloud.skywalking.web.util.Constants; import com.ai.cloud.skywalking.web.util.ReplaceAddressUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -22,6 +23,7 @@ import java.util.List; * Created by xin on 16-3-30. */ @Service +@Transactional public class TraceTreeService implements ITraceTreeService { @Autowired diff --git a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/util/DBConnectUtil.java b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/util/DBConnectUtil.java index 170180734..8f19d2a20 100644 --- a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/util/DBConnectUtil.java +++ b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/util/DBConnectUtil.java @@ -1,10 +1,9 @@ package com.ai.cloud.skywalking.web.util; -import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Value; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import java.sql.Connection; @@ -13,31 +12,14 @@ import java.sql.SQLException; @Repository public class DBConnectUtil { - @Value("#{configProperties['jdbc.url']}") - private String dbURL; - @Value("#{configProperties['jdbc.username']}") - private String dbUser; - @Value("#{configProperties['jdbc.password']}") - private String password; - @Value("#{configProperties['jdbc.driverClassName']}") - private String dbDriverClass; private static Logger logger = LogManager.getLogger(DBConnectUtil.class); + @Autowired private static HikariDataSource hikariDataSource; public Connection getConnection() { - if (hikariDataSource == null) { - HikariConfig config = new HikariConfig(); - config.setJdbcUrl(dbURL); - config.setUsername(dbUser); - config.setPassword(password); - config.setDriverClassName(dbDriverClass); - config.addDataSourceProperty("cachePrepStmts", "true"); - config.addDataSourceProperty("prepStmtCacheSize", "250"); - config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048"); - hikariDataSource = new HikariDataSource(config); - } + try { return hikariDataSource.getConnection(); } catch (SQLException e) { diff --git a/skywalking-webui/src/main/resources/spring/application-jdbc.xml b/skywalking-webui/src/main/resources/spring/application-jdbc.xml index 175b4f427..3a806bfee 100644 --- a/skywalking-webui/src/main/resources/spring/application-jdbc.xml +++ b/skywalking-webui/src/main/resources/spring/application-jdbc.xml @@ -13,15 +13,11 @@ http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"> - + - + - - - - - +