Skip to content

Commit fb41e01

Browse files
committed
fix bugs
1 parent da85955 commit fb41e01

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

env/wei.properties

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
server.address=anhuinorthen.com
2-
db.name=weiled_anhuinorthen
3-
db.username=weiled_admin
4-
db.password=CmT]8KZ^6ftM
1+
server.address=198.252.69.49
2+
db.name=weiled_db
3+
db.username=weiled_usr
4+
db.password=weiwei
55
project.name=anhuinorthen
66
log.file.name=/home/weiled/anhuinorthen.log

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<url>http://www.easykoo.com</url>
1010
<properties>
1111
<dao.target.dir>src/main/java</dao.target.dir>
12-
<compiler.version>1.7</compiler.version>
12+
<compiler.version>1.6</compiler.version>
1313
<spring.version>3.2.4.RELEASE</spring.version>
1414
<mysql.version>5.1.26</mysql.version>
1515
<mybatis.version>3.2.2</mybatis.version>

src/main/java/com/easykoo/service/AccountServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public boolean checkEmail(String email) {
139139

140140
@Override
141141
public boolean checkPassword(Integer accountId, String password) {
142-
Map<String, Object> params = new HashMap<>();
142+
Map<String, Object> params = new HashMap<String, Object>();
143143
params.put("accountId", accountId);
144144
params.put("password", EncryptUtils.MD5(password));
145145
return accountSecurityMapper.checkPassword(params);

src/main/resources/spring-mybatis.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ http://www.springframework.org/schema/aop/spring-aop-3.2.xsd
1212
<!-- <bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean"> <property name="jndiName" value="${jndiName}"></property> </bean> -->
1313

1414
<!-- 配置数据源 -->
15-
<bean name="dataSource1" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
15+
<bean name="dataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
1616
<property name="url" value="${jdbc.url}" />
1717
<property name="username" value="${jdbc.username}" />
1818
<property name="password" value="${jdbc.password}" />
@@ -52,7 +52,7 @@ http://www.springframework.org/schema/aop/spring-aop-3.2.xsd
5252
<property name="filters" value="mergeStat" />
5353
</bean>
5454

55-
<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource">
55+
<bean id="dataSource1" class="org.apache.commons.dbcp.BasicDataSource">
5656
<property name="driverClassName" value="${jdbc.driver}"></property>
5757
<property name="url" value="${jdbc.url}"></property>
5858
<property name="username" value="${jdbc.username}"></property>

0 commit comments

Comments
 (0)