Skip to content

Commit 18e4903

Browse files
committed
20171015
1 parent b77422a commit 18e4903

11 files changed

+302
-593
lines changed

.idea/artifacts/blogdemo1_war_exploded.xml

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__com_mchange_c3p0_0_9_5_pre10.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_8.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/workspace.xml

+234-580
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

blogdemo1.iml

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
<orderEntry type="inheritedJdk" />
2727
<orderEntry type="sourceFolder" forTests="false" />
2828
<orderEntry type="library" name="Spring-4.3.10.RELEASE" level="project" />
29+
<orderEntry type="library" name="Maven: com.mchange:c3p0:0.9.5-pre10" level="project" />
30+
<orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.8" level="project" />
2931
<orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
3032
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
3133
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.0.2.RELEASE" level="project" />

pom.xml

+12-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<!-- <log4j.version>1.2.12</log4j.version>-->
8787
<httpclient.version>4.1.2</httpclient.version>
8888
<jackson.version>1.9.13</jackson.version>
89-
<c3p0.version>0.9.1.2</c3p0.version>
89+
<c3p0.version>0.9.5-pre10</c3p0.version>
9090
<druid.version>1.0.5</druid.version>
9191
<tomcat.jdbc.version>7.0.53</tomcat.jdbc.version>
9292
<jstl.version>1.2</jstl.version>
@@ -101,7 +101,18 @@
101101
<hibernate.validator.version>5.1.1.Final</hibernate.validator.version>
102102
</properties>
103103

104+
105+
104106
<dependencies>
107+
108+
<!--c3p0连接池-->
109+
<dependency>
110+
<groupId>com.mchange</groupId>
111+
<artifactId>c3p0</artifactId>
112+
<version>0.9.5-pre10</version>
113+
</dependency>
114+
115+
105116
<!-- junit -->
106117
<dependency>
107118
<groupId>junit</groupId>

src/main/java/Service/ArticlesServiceImpl.java

+2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
import Dao.ArticlesDao;
55
import org.springframework.beans.factory.annotation.Autowired;
66
import org.springframework.stereotype.Service;
7+
import org.springframework.transaction.annotation.Transactional;
78

89
import java.util.List;
910

11+
@Transactional
1012
@Service
1113
public class ArticlesServiceImpl implements ArticlesService{
1214

src/main/java/Service/CataLogServiceImpl.java

+2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
import Dao.CataLogDao;
66
import org.springframework.beans.factory.annotation.Autowired;
77
import org.springframework.stereotype.Service;
8+
import org.springframework.transaction.annotation.Transactional;
89

910
import java.util.List;
1011

12+
@Transactional
1113
@Service
1214
public class CataLogServiceImpl implements CataLogService{
1315

src/main/java/Service/UserServiceImpl.java

+4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
import Dao.UserDao;
66
import org.springframework.beans.factory.annotation.Autowired;
77
import org.springframework.stereotype.Service;
8+
import org.springframework.transaction.annotation.Isolation;
9+
import org.springframework.transaction.annotation.Propagation;
10+
import org.springframework.transaction.annotation.Transactional;
811

12+
@Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.SERIALIZABLE)
913
@Service
1014
public class UserServiceImpl implements UserService{
1115

src/main/resources/log4j.properties

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@ log4j.appender.druid.layout.ConversionPattern= [%d{HH\:mm\:ss}] %c{1} - %m%n
3131
log4j.appender.druid.datePattern='.'yyyy-MM-dd
3232
log4j.appender.druid.Threshold = WARN
3333
log4j.appender.druid.append=true
34-
log4j.appender.druid.File=${catalina.home}/logs/perfect-ssm/druid-slow-sql.log
34+
log4j.appender.druid.File=${catalina.home}/logs/blog-demo/druid-slow-sql.log
3535

3636
log4j.appender.admin=org.apache.log4j.DailyRollingFileAppender
3737
log4j.appender.admin.layout=org.apache.log4j.PatternLayout
3838
log4j.appender.admin.layout.ConversionPattern= [%d{HH\:mm\:ss}] %c{1} - %m%n
3939
log4j.appender.admin.datePattern='.'yyyy-MM-dd
4040
log4j.appender.admin.Threshold = INFO
4141
log4j.appender.admin.append=true
42-
log4j.appender.admin.File=${catalina.home}/logs/perfect-ssm/admin.log
42+
log4j.appender.admin.File=${catalina.home}/logs/blog-demo/admin.log
4343

4444
log4j.appender.service=org.apache.log4j.DailyRollingFileAppender
4545
log4j.appender.service.layout=org.apache.log4j.PatternLayout
4646
log4j.appender.service.layout.ConversionPattern= [%d{HH\:mm\:ss}] %c{1} - %m%n
4747
log4j.appender.service.datePattern='.'yyyy-MM-dd
4848
log4j.appender.service.Threshold = INFO
4949
log4j.appender.service.append=true
50-
log4j.appender.service.File=${catalina.home}/logs/perfect-ssm/service.log
50+
log4j.appender.service.File=${catalina.home}/logs/blog-demo/service.log
5151

5252
log4j.logger.debug=debug
5353
log4j.appender.debug=org.apache.log4j.DailyRollingFileAppender
@@ -56,7 +56,7 @@ log4j.appender.debug.layout.ConversionPattern= [%d{HH\:mm\:ss}] %c{1} - %m%n
5656
log4j.appender.debug.datePattern='.'yyyy-MM-dd
5757
log4j.appender.debug.Threshold = DEBUG
5858
log4j.appender.debug.append=true
59-
log4j.appender.debug.File=${catalina.home}/logs/perfect-ssm/debug.log
59+
log4j.appender.debug.File=${catalina.home}/logs/blog-demo/debug.log
6060

6161
log4j.logger.java.sql.ResultSet=INFO
6262
log4j.logger.org.apache=INFO

src/main/resources/spring-mybatis.xml

+14-8
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,22 @@
2121
<!-- 加载外部属性文件 -->
2222
<context:property-placeholder location="classpath:db.properties"/>
2323
<!-- 配置数据源:DriverManagerDataSource,底层对JDBC封装,和C3P0类似 -->
24-
<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
24+
<bean id="dataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
2525
<property name="driverClassName" value="${jdbc.driverClass}"></property>
2626
<property name="url" value="${jdbc.url}"></property>
2727
<property name="username" value="${jdbc.username}"></property>
2828
<property name="password" value="${jdbc.pwd}"></property>
29+
<!--c3po连接池-->
30+
<!-- 初始化连接大小 -->
31+
<property name="initialSize" value="${initialSize}" />
32+
<!-- 连接池最大数量 -->
33+
<property name="maxActive" value="${maxActive}" />
34+
<!-- 连接池最大空闲 -->
35+
<property name="maxIdle" value="${maxIdle}" />
36+
<!-- 连接池最小空闲 -->
37+
<property name="minIdle" value="${minIdle}" />
38+
<!-- 获取连接最大等待时间 -->
39+
<property name="maxWait" value="${maxWait}" />
2940
</bean>
3041

3142

@@ -84,28 +95,23 @@
8495
<property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"></property>
8596
</bean>
8697

87-
88-
<!-- 事物配置 -->
98+
<!--Spring 事物配置 -->
8999
<!-- 1.配置事物管理器 -->
90100
<bean id="tx" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
91101
<!-- 指定数据源 -->
92102
<property name="dataSource" ref="dataSource"/>
93103
</bean>
94-
95104
<!-- 2.配置增强切面 -->
96105
<tx:advice id="txAdvice" transaction-manager="tx">
97106
<tx:attributes>
98107
<tx:method name="*"/>
99108
</tx:attributes>
100109
</tx:advice>
101-
102-
<!-- 3.配置AOP -->
110+
<!-- 3.引用切面-->
103111
<aop:config>
104112
<!-- 配置切点表达式 -->
105113
<aop:pointcut expression="execution(* java.Service.*.*(..))" id="pointcut"/>
106114
<!-- 配置增强切面 -->
107115
<aop:advisor advice-ref="txAdvice" pointcut-ref="pointcut" order="1"/>
108116
</aop:config>
109-
110-
111117
</beans>

0 commit comments

Comments
 (0)