diff --git a/.classpath b/.classpath
index 9b3fc69..a15b51e 100644
--- a/.classpath
+++ b/.classpath
@@ -24,7 +24,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v8.0"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"/>
 	<classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/json-lib-2.4-jdk15.jar" sourcepath="E:/web/开发库/json-lib-2.4-jdk15-sources.jar"/>
 	<classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/json.jar"/>
 	<classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/ueditor-1.1.2.jar"/>
diff --git a/pom.xml b/pom.xml
index 606b13f..4faeb6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,21 +5,43 @@
   <artifactId>Blog</artifactId>
   <packaging>war</packaging>
   <version>0.0.1-SNAPSHOT</version>
+  <properties>
+        <!-- spring版本号 -->
+        <spring.version>4.2.8.RELEASE</spring.version>
+        <!-- junit版本号 -->
+        <junit.version>4.10</junit.version>
+        <!-- mybatis版本号 -->
+        <mybatis.version>3.2.8</mybatis.version>
+        
+        <mysql.version>5.1.40</mysql.version>
+        
+        <javaee.version>6.0</javaee.version>
+        <!-- druid版本号 -->
+        <druid-version>1.0.20</druid-version>
+        
+        <fastjson.version>1.2.20</fastjson.version>
+        <!-- Shiro -->
+        <Shiro.version>1.2.5</Shiro.version>
+        <!-- lucene -->
+        <lucene.version>5.3.1</lucene.version>
+        <jsoup.version>1.9.2</jsoup.version>
+        <jsp.version>2.3.1</jsp.version>
+  </properties>
   
   <dependencies>
   
   	<!-- 添加sevlet支持 -->
-  	<dependency>
+  <!-- 	<dependency>
 	    <groupId>javax.servlet</groupId>
 	    <artifactId>javax.servlet-api</artifactId>
 	    <version>3.1.0</version>
-	</dependency>
+	</dependency> -->
 	<!-- 添加jsp支持 -->
-	<dependency>
+<!-- 	<dependency>
 	    <groupId>javax.servlet.jsp</groupId>
 	    <artifactId>javax.servlet.jsp-api</artifactId>
-	    <version>2.3.1</version>
-	</dependency>
+	    <version>${jsp.version}</version>
+	</dependency> -->
 	<!-- 添加jstl支持 -->
 	<dependency>
 	    <groupId>javax.servlet</groupId>
@@ -31,60 +53,60 @@
   	<dependency>
 	    <groupId>org.springframework</groupId>
 	    <artifactId>spring-core</artifactId>
-	    <version>4.3.0.RELEASE</version>
+	    <version>${spring.version}</version>
 	</dependency>
   	<dependency>
 	    <groupId>org.springframework</groupId>
 	    <artifactId>spring-beans</artifactId>
-	    <version>4.3.0.RELEASE</version>
+	    <version>${spring.version}</version>
 	</dependency>
 	<dependency>
   		<groupId>org.springframework</groupId>
   		<artifactId>spring-context</artifactId>
-  		<version>4.3.0.RELEASE</version>
+  		<version>${spring.version}</version>
   	</dependency>
   	<dependency>
   		<groupId>org.springframework</groupId>
   		<artifactId>spring-context-support</artifactId>
-  		<version>4.3.0.RELEASE</version>
+  		<version>${spring.version}</version>
   	</dependency>
   	<dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-web</artifactId>
-		<version>4.3.0.RELEASE</version>
+		<version>${spring.version}</version>
 	</dependency>
   	
   	<dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-webmvc</artifactId>
-		<version>4.3.0.RELEASE</version>
+		<version>${spring.version}</version>
 	</dependency>
 	<dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-tx</artifactId>
-        <version>4.3.0.RELEASE</version>
+        <version>${spring.version}</version>
     </dependency>
     <dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-jdbc</artifactId>
-		<version>4.3.0.RELEASE</version>
+		<version>${spring.version}</version>
 	</dependency>
 	<dependency>
     <groupId>org.springframework</groupId>
 	    <artifactId>spring-aop</artifactId>
-	    <version>4.3.0.RELEASE</version>
+	    <version>${spring.version}</version>
 	</dependency>
 	<dependency>
 	    <groupId>org.springframework</groupId>
 	    <artifactId>spring-aspects</artifactId>
-	    <version>4.3.0.RELEASE</version>
+	    <version>${spring.version}</version>
 	</dependency>
 	
 	<!-- 添加mybatis支持 -->
   	<dependency>
 	    <groupId>org.mybatis</groupId>
 	    <artifactId>mybatis</artifactId>
-	    <version>3.4.0</version>
+	    <version>${mybatis.version}</version>
 	</dependency>
 	<dependency>
 	    <groupId>org.mybatis</groupId>
@@ -96,14 +118,14 @@
 	<dependency>
 	    <groupId>mysql</groupId>
 	    <artifactId>mysql-connector-java</artifactId>
-	    <version>5.1.30</version>
+	    <version>${mysql.version}</version>
 	</dependency>
 	
 	<!-- 添加阿里巴巴连接池Druid支持 -->
 	<dependency>
 	    <groupId>com.alibaba</groupId>
 	    <artifactId>druid</artifactId>
-	    <version>1.0.16</version>
+	    <version>${druid-version}</version>
 	</dependency>
   	
   	<!-- 添加log4j日志 -->
@@ -122,44 +144,44 @@
   	<dependency>
 	    <groupId>org.apache.shiro</groupId>
 	    <artifactId>shiro-core</artifactId>
-	    <version>1.2.5</version>
+	    <version>${Shiro.version}</version>
 	</dependency>
 	<dependency>
 	    <groupId>org.apache.shiro</groupId>
 	    <artifactId>shiro-web</artifactId>
-	    <version>1.2.5</version>
+	    <version>${Shiro.version}</version>
 	</dependency>
 	<dependency>
 	    <groupId>org.apache.shiro</groupId>
 	    <artifactId>shiro-spring</artifactId>
-	    <version>1.2.5</version>
+	    <version>${Shiro.version}</version>
 	</dependency>
 	
 	<!-- 添加lucene支持 -->
   	<dependency>
 	    <groupId>org.apache.lucene</groupId>
 	    <artifactId>lucene-core</artifactId>
-	    <version>5.3.1</version>
+	    <version>${lucene.version}</version>
 	</dependency>
 	<dependency>
 	    <groupId>org.apache.lucene</groupId>
 	    <artifactId>lucene-queryparser</artifactId>
-	    <version>5.3.1</version>
+	    <version>${lucene.version}</version>
 	</dependency>
 	<dependency>
 	    <groupId>org.apache.lucene</groupId>
 	    <artifactId>lucene-analyzers-common</artifactId>
-	    <version>5.3.1</version>
+	    <version>${lucene.version}</version>
 	</dependency>
 	<dependency>
 	    <groupId>org.apache.lucene</groupId>
 	    <artifactId>lucene-highlighter</artifactId>
-	    <version>5.3.1</version>
+	    <version>${lucene.version}</version>
 	</dependency>
 	<dependency>
 	    <groupId>org.apache.lucene</groupId>
 	    <artifactId>lucene-analyzers-smartcn</artifactId>
-	    <version>5.3.1</version>
+	    <version>${lucene.version}</version>
 	</dependency>
 	
 	<!-- apache共公包 -->
@@ -206,7 +228,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     
@@ -214,8 +236,23 @@
     <dependency>
 	    <groupId>org.jsoup</groupId>
 	    <artifactId>jsoup</artifactId>
-	    <version>1.9.2</version>
+	    <version>${jsoup.version}</version>
 	</dependency>
+    <dependency>
+    	<groupId>cn.songxinqiang</groupId>
+    	<artifactId>com.baidu.ueditor</artifactId>
+    	<version>1.1.2-offical</version>
+    </dependency>
+    <dependency>
+    	<groupId>com.hynnet</groupId>
+    	<artifactId>json-lib</artifactId>
+    	<version>2.4</version>
+    </dependency>
+    <dependency>
+    	<groupId>org.json</groupId>
+    	<artifactId>json</artifactId>
+    	<version>20151123</version>
+    </dependency>
   </dependencies>
   <build>
     <finalName>Blog</finalName>
diff --git a/src/main/java/ssm/blog/controller/IndexController.java b/src/main/java/ssm/blog/controller/IndexController.java
index e935326..61f8bfe 100644
--- a/src/main/java/ssm/blog/controller/IndexController.java
+++ b/src/main/java/ssm/blog/controller/IndexController.java
@@ -99,4 +99,11 @@ public ModelAndView index(
 		return modelAndView;
 
 	}
+	/*
+	 * ��̨��ַ�ض���
+	 */
+	@RequestMapping("/admin")
+	public String admin(){
+		return "redirect:/admin/main.jsp";
+	}
 }
diff --git a/src/main/java/ssm/blog/listener/InitBloggerData.java b/src/main/java/ssm/blog/listener/InitBloggerData.java
index 0e64559..4c781ad 100644
--- a/src/main/java/ssm/blog/listener/InitBloggerData.java
+++ b/src/main/java/ssm/blog/listener/InitBloggerData.java
@@ -35,9 +35,11 @@ public void contextInitialized(ServletContextEvent sce) {
 		//��ȡ������Ϣ
 		Blogger blogger = bloggerService.getBloggerData();
 		//��������Ҳ��ȡ���ˣ��Ƚ����У�����Ҳ����Ҫ��������԰�������յ�
-		blogger.setPassword(null);
-		//��������Ϣ����application����
-		application.setAttribute("blogger", blogger);
+		if (null != blogger) {
+			blogger.setPassword(null);
+			//��������Ϣ����application����
+			application.setAttribute("blogger", blogger);
+		}
 		
 		//ͬ�ϣ���ȡ����������Ϣ
 		LinkService linkService = (LinkService) applicationContext.getBean("linkService");
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
index faa47a3..6463e9a 100644
--- a/src/main/resources/applicationContext.xml
+++ b/src/main/resources/applicationContext.xml
@@ -17,12 +17,32 @@
 
 	<!-- 自动扫描包中的bean -->
 	<context:component-scan base-package="ssm.blog.*" />
-
+	<!-- 加载配置文件 -->
+	<bean
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="locations">
+			<list>
+				<value>classpath*:jdbc.properties</value>
+			</list>
+		</property>
+	</bean>
 	<!-- 配置数据源，使用阿里巴巴连接池Druid -->
 	<bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource">
-		<property name="url" value="jdbc:mysql://localhost:3306/db_blog"/>
-		<property name="username" value="root"/>
-		<property name="password" value="root"/>
+		<property name="url" value="${jdbc.url}" />
+		<property name="username" value="${jdbc.user}" />
+		<property name="password" value="${jdbc.password}" />
+		<property name="filters" value="stat" />
+		<property name="maxActive" value="20" />
+		<property name="initialSize" value="1" />
+		<property name="maxWait" value="60000" />
+		<property name="minIdle" value="1" />
+		<property name="timeBetweenEvictionRunsMillis" value="60000" />
+		<property name="minEvictableIdleTimeMillis" value="300000" />
+		<property name="testWhileIdle" value="true" />
+		<property name="testOnBorrow" value="false" />
+		<property name="testOnReturn" value="false" />
+		<property name="poolPreparedStatements" value="true" />
+		<property name="maxOpenPreparedStatements" value="20" />
 	</bean>
 
 	<!-- 配置mybatis的sqlSessionFactory -->
@@ -61,7 +81,7 @@
 		<!-- 身份认证失败，则跳转到登录页面的配置 -->
 		<property name="loginUrl" value="/login.jsp" />
 		<!-- 权限认证失败，则跳转到指定页面，因为个人博客就一个人登陆，就不需要权限了 -->
-		<!-- <property name="unauthorizedUrl" value="/unauthorized.jsp" />  -->
+		<!-- <property name="unauthorizedUrl" value="/unauthorized.jsp" /> -->
 		<!-- Shiro连接约束配置,即过滤链的定义 -->
 		<property name="filterChainDefinitions">
 			<value>
diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties
new file mode 100755
index 0000000..f4155e2
--- /dev/null
+++ b/src/main/resources/jdbc.properties
@@ -0,0 +1,3 @@
+jdbc.url=jdbc:mysql://127.0.0.1:3306/db_blog
+jdbc.user=root
+jdbc.password=
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 2a2f62b..ce0a04a 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -2,7 +2,7 @@
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
   <display-name>Blog</display-name>
   <welcome-file-list>
-    <welcome-file>a.jsp</welcome-file>
+    <welcome-file>index.html</welcome-file>
   </welcome-file-list>
  
   <!-- spring监听器 -->
@@ -33,7 +33,7 @@
   </servlet>
   <servlet-mapping>
   	<servlet-name>springMVC</servlet-name>
-  	<url-pattern>*.do</url-pattern>
+  	<url-pattern>/</url-pattern>
   </servlet-mapping>
   <servlet-mapping>
   	<servlet-name>springMVC</servlet-name>
diff --git a/target/classes/applicationContext.xml b/target/classes/applicationContext.xml
index faa47a3..6463e9a 100644
--- a/target/classes/applicationContext.xml
+++ b/target/classes/applicationContext.xml
@@ -17,12 +17,32 @@
 
 	<!-- 自动扫描包中的bean -->
 	<context:component-scan base-package="ssm.blog.*" />
-
+	<!-- 加载配置文件 -->
+	<bean
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="locations">
+			<list>
+				<value>classpath*:jdbc.properties</value>
+			</list>
+		</property>
+	</bean>
 	<!-- 配置数据源，使用阿里巴巴连接池Druid -->
 	<bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource">
-		<property name="url" value="jdbc:mysql://localhost:3306/db_blog"/>
-		<property name="username" value="root"/>
-		<property name="password" value="root"/>
+		<property name="url" value="${jdbc.url}" />
+		<property name="username" value="${jdbc.user}" />
+		<property name="password" value="${jdbc.password}" />
+		<property name="filters" value="stat" />
+		<property name="maxActive" value="20" />
+		<property name="initialSize" value="1" />
+		<property name="maxWait" value="60000" />
+		<property name="minIdle" value="1" />
+		<property name="timeBetweenEvictionRunsMillis" value="60000" />
+		<property name="minEvictableIdleTimeMillis" value="300000" />
+		<property name="testWhileIdle" value="true" />
+		<property name="testOnBorrow" value="false" />
+		<property name="testOnReturn" value="false" />
+		<property name="poolPreparedStatements" value="true" />
+		<property name="maxOpenPreparedStatements" value="20" />
 	</bean>
 
 	<!-- 配置mybatis的sqlSessionFactory -->
@@ -61,7 +81,7 @@
 		<!-- 身份认证失败，则跳转到登录页面的配置 -->
 		<property name="loginUrl" value="/login.jsp" />
 		<!-- 权限认证失败，则跳转到指定页面，因为个人博客就一个人登陆，就不需要权限了 -->
-		<!-- <property name="unauthorizedUrl" value="/unauthorized.jsp" />  -->
+		<!-- <property name="unauthorizedUrl" value="/unauthorized.jsp" /> -->
 		<!-- Shiro连接约束配置,即过滤链的定义 -->
 		<property name="filterChainDefinitions">
 			<value>
diff --git a/target/classes/ssm/blog/controller/IndexController.class b/target/classes/ssm/blog/controller/IndexController.class
index 5db43c9..bf985f0 100644
Binary files a/target/classes/ssm/blog/controller/IndexController.class and b/target/classes/ssm/blog/controller/IndexController.class differ
diff --git a/target/classes/ssm/blog/listener/InitBloggerData.class b/target/classes/ssm/blog/listener/InitBloggerData.class
index 8a3c09c..3c698de 100644
Binary files a/target/classes/ssm/blog/listener/InitBloggerData.class and b/target/classes/ssm/blog/listener/InitBloggerData.class differ