From 8ce1930813956133fc6ce7af16b76da3754f437e Mon Sep 17 00:00:00 2001
From: rekoe <koukou890@qq.com>
Date: Thu, 31 Mar 2016 15:12:57 +0800
Subject: [PATCH] fix

---
 pom.xml                            | 10 +++++-----
 src/main/resources/conf.properties | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index e6e7659..b72be24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,16 +202,16 @@
 	</dependencies>
 	<build>
 		<sourceDirectory>src/main/java</sourceDirectory>
+		<finalName>rk_svnadmin</finalName>
 		<resources>
 			<resource>
 				<directory>src/main/resources</directory>
 				<includes>
-					<include>com/rekoe/mvc/*.*</include>
+					<include>com/shanggame/mvc/*.*</include>
 				</includes>
 				<filtering>false</filtering>
 			</resource>
 		</resources>
-		<finalName>rk_svnadmin</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -263,9 +263,9 @@
 							<targetPath>WEB-INF/classes</targetPath>
 							<includes>
 								<include>msg/**/*</include>
-								<include>log4j.properties</include>
-								<include>oauth_consumer.properties</include>
-								<include>quartz.properties</include>
+								<include>ioc/**/*</include>
+								<include>*.properties</include>
+								<include>init_system_h2.sql</include>
 								<include>shiro.ini</include>
 								<include>ehcache.xml</include>
 							</includes>
diff --git a/src/main/resources/conf.properties b/src/main/resources/conf.properties
index 83bc27a..1916c06 100644
--- a/src/main/resources/conf.properties
+++ b/src/main/resources/conf.properties
@@ -1,11 +1,11 @@
-db.url=jdbc:mysql://127.0.0.1:3306/rk_svnadmin?useUnicode=true&characterEncoding=utf-8
+db.url=jdbc:mysql://192.168.1.223:3306/rk_svnadmin?useUnicode=true&characterEncoding=utf-8
 db.username=root
-db.password=
+db.password=root
 db.maxActive=50
-mail.HostName=smtp.exmail.qq.com
+
+mail.HostName=smtp.mxhichina.com
 mail.SmtpPort=465
-mail.UserName=nutzbook@wendal.net
-mail.Password=book@2015
+mail.UserName=webmaster@rekoe.com
+mail.Password=Rk@5382211
 mail.SSLOnConnect=true
-mail.From=nutzbook@wendal.net
-mail.to=koukou890@qq.com
\ No newline at end of file
+mail.From=webmaster@rekoe.com
\ No newline at end of file