diff --git a/common/bin/javadoc.bat b/common/bin/javadoc.bat
index 087a0262..7d769b24 100644
--- a/common/bin/javadoc.bat
+++ b/common/bin/javadoc.bat
@@ -12,6 +12,6 @@ echo.
 cd %~dp0
 
 cd ..
-call mvn clean javadoc:jar
+call mvn clean package -Pjavadoc
 
 pause
\ No newline at end of file
diff --git a/common/pom.xml b/common/pom.xml
index 5bdf3407..12b3057e 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	
 	<parent>
-        <groupId>com.jeesite</groupId>
-        <artifactId>jeesite-parent</artifactId>
-        <version>4.0.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
-    </parent>
+		<groupId>com.jeesite</groupId>
+		<artifactId>jeesite-parent</artifactId>
+		<version>4.0.4-SNAPSHOT</version>
+		<relativePath>../parent/pom.xml</relativePath>
+	</parent>
 	
 	<artifactId>jeesite-common</artifactId>
 	<packaging>jar</packaging>
@@ -161,8 +161,8 @@
 		
 		<!-- Apache HTTP -->
 		<dependency>
-		  <groupId>org.apache.httpcomponents</groupId>
-		  <artifactId>httpclient</artifactId>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
 		</dependency>
 		
 		<!-- Jsoup HTTP -->
diff --git a/modules/core/bin/javadoc.bat b/modules/core/bin/javadoc.bat
index 087a0262..7d769b24 100644
--- a/modules/core/bin/javadoc.bat
+++ b/modules/core/bin/javadoc.bat
@@ -12,6 +12,6 @@ echo.
 cd %~dp0
 
 cd ..
-call mvn clean javadoc:jar
+call mvn clean package -Pjavadoc
 
 pause
\ No newline at end of file
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 96e5db9f..25517679 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	
 	<parent>
-        <groupId>com.jeesite</groupId>
-        <artifactId>jeesite-parent</artifactId>
-        <version>4.0.4-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
-    </parent>
+		<groupId>com.jeesite</groupId>
+		<artifactId>jeesite-parent</artifactId>
+		<version>4.0.4-SNAPSHOT</version>
+		<relativePath>../../parent/pom.xml</relativePath>
+	</parent>
 	
 	<artifactId>jeesite-module-core</artifactId>
 	<packaging>jar</packaging>
@@ -75,7 +75,7 @@
 			<snapshots><enabled>false</enabled></snapshots>
 		</repository>
 		<repository>
-            <id>sonatype-repos-s</id>
+		    <id>sonatype-repos-s</id>
 			<name>Sonatype Repository</name>
 			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
 			<releases><enabled>false</enabled></releases>
@@ -93,7 +93,7 @@
 			<releases><enabled>true</enabled></releases>
 			<snapshots><enabled>false</enabled></snapshots>
 		</pluginRepository>
-        
+		
 	</pluginRepositories>
 
 </project>
diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index d9893211..e555da80 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -44,7 +44,7 @@ jdbc:
 #      minIdle: 3
 #      maxActive: 20
   
-  # JTA 分布式事务
+  # JTA 分布式事务（v4.0.4+）
   jta:
     enabled: false
 
@@ -73,7 +73,7 @@ redis:
     maxIdle: 3
     maxTotal: 20
 
-  # 是否启用Redis系统缓存及会话
+  # 是否启用Redis系统缓存及会话（专业版）
   cacheAndSession: false
   
   # 定义Key的前缀标识
@@ -152,10 +152,10 @@ user:
       remarks: ""
     }]
 
-  # 多租户模式（SAAS模式）
+  # 多租户模式（SAAS模式）（专业版）
   useCorpModel: false
   
-# 任务调度
+# 任务调度（个人版+）
 job:
 
   # 是否自动启动任务调度（可关闭）
@@ -372,7 +372,7 @@ error:
 
 file:
 
-  # 文件上传跟路径，设置路径中不允许包含“userfiles”，在指定目录中系统会自动创建userfiles目录，如果不设置默认为contextPath路径
+  # 文件上传根路径，设置路径中不允许包含“userfiles”，在指定目录中系统会自动创建userfiles目录，如果不设置默认为contextPath路径
 #  baseDir: D:/jeesite
 
   # 上传文件的相对路径（支持：yyyy, MM, dd, HH, mm, ss, E）
@@ -396,6 +396,7 @@ file:
 #===== Message settings =====#
 #============================#
 
+# 消息提醒中心（专业版）
 msg:
 
   # 是否开启实时发送消息（保存消息后立即检查未读消息并发送），分布式部署下请单独配置消息发送服务，不建议开启此选项。
diff --git a/modules/template/bin/javadoc.bat b/modules/template/bin/javadoc.bat
index 087a0262..7d769b24 100644
--- a/modules/template/bin/javadoc.bat
+++ b/modules/template/bin/javadoc.bat
@@ -12,6 +12,6 @@ echo.
 cd %~dp0
 
 cd ..
-call mvn clean javadoc:jar
+call mvn clean package -Pjavadoc
 
 pause
\ No newline at end of file
diff --git a/modules/template/pom.xml b/modules/template/pom.xml
index bd1d876b..f716c11c 100644
--- a/modules/template/pom.xml
+++ b/modules/template/pom.xml
@@ -4,19 +4,19 @@
 	<modelVersion>4.0.0</modelVersion>
 	
 	<parent>
-        <groupId>com.jeesite</groupId>
-        <artifactId>jeesite-parent</artifactId>
-        <version>4.0.4-SNAPSHOT</version>
+		<groupId>com.jeesite</groupId>
+		<artifactId>jeesite-parent</artifactId>
+		<version>4.0.4-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 		
 		<!-- ====== 这是一个新增模块示例项目，你可以拷贝此项目，修改 artifactId 为您的模块即可 ====== -->
 		
-        <!-- <relativePath>../parent/pom.xml</relativePath>					/jeesite -->
-        <!-- <relativePath>../../parent/pom.xml</relativePath>				/jeesite/modules -->
-        <!-- <relativePath>../../jeesite/parent/pom.xml</relativePath>		/jeesite-xxx -->
-        <!-- <relativePath>../../../jeesite/parent/pom.xml</relativePath>	/jeesite-xxx/modules -->
+		<!-- <relativePath>../parent/pom.xml</relativePath>					/jeesite -->
+		<!-- <relativePath>../../parent/pom.xml</relativePath>				/jeesite/modules -->
+		<!-- <relativePath>../../jeesite/parent/pom.xml</relativePath>		/jeesite-xxx -->
+		<!-- <relativePath>../../../jeesite/parent/pom.xml</relativePath>	/jeesite-xxx/modules -->
 		
-    </parent>
+	</parent>
 	
 	<artifactId>jeesite-module-template</artifactId>
 	<packaging>jar</packaging>
diff --git a/parent/pom.xml b/parent/pom.xml
index 5af2cb5b..02f53717 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,6 +41,7 @@
 		
 		<!-- environment setting -->
 		<java.version>1.7</java.version>
+		<maven.test.skip>true</maven.test.skip> 
 		<eclipse-plugin-download-sources>false</eclipse-plugin-download-sources>
 		<eclipse-plugin-download-javadocs>false</eclipse-plugin-download-javadocs>
 		
@@ -96,8 +97,8 @@
 							<finalName>jeesite</finalName>
 							<outputDirectory>${project.build.directory}/${project.artifactId}/WEB-INF/lib</outputDirectory>
 							<includes>
-					        	<include>com/thinkgem/jeesite/**</include>
-					       	</includes> -->
+								<include>com/thinkgem/jeesite/**</include>
+							</includes> -->
 							<archive>
 								<manifest>
 									<!-- Add directory entries -->
@@ -110,7 +111,7 @@
 					</execution>
 				</executions>
 			</plugin>
-		
+			
 			<!-- resource插件 -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -142,7 +143,7 @@
 			</plugin>
 			
 		</plugins>
-	
+		
 		<pluginManagement>
 		
 			<plugins>
@@ -198,6 +199,9 @@
 							<goals>
 								<goal>jar</goal>
 							</goals>
+							<configuration>
+								<additionalparam>-Xdoclint:none</additionalparam>
+							</configuration>  
 						</execution>
 					</executions>
 				</plugin>
@@ -297,7 +301,7 @@
 			<snapshots><enabled>false</enabled></snapshots>
 		</repository>
 		<repository>
-            <id>sonatype-repos-s</id>
+			<id>sonatype-repos-s</id>
 			<name>Sonatype Repository</name>
 			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
 			<releases><enabled>false</enabled></releases>
@@ -315,47 +319,51 @@
 			<releases><enabled>true</enabled></releases>
 			<snapshots><enabled>false</enabled></snapshots>
 		</pluginRepository>
-        
+		
 	</pluginRepositories>
 	
 	<profiles>
-	
+		
 		<!-- 打包项目 -->
 		<profile>
-	    	<id>package</id>
-	    	<build>
-	    		<plugins>
-					<!-- Java Document Generate
+			<id>javadoc</id>
+			<build>
+				<plugins>
+					<!-- Java Document Generate -->
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-					</plugin> -->
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		
+		<!-- 打包项目 -->
+		<profile>
+			<id>package</id>
+			<build>
+				<plugins>
 					<!-- YUI Compressor (CSS/JS压缩) -->
 					<plugin>
 						<groupId>net.alchim31.maven</groupId>
 						<artifactId>yuicompressor-maven-plugin</artifactId>
 					</plugin>
 				</plugins>
-	    	</build>
+			</build>
 		</profile>
 		
 		<!-- 部署项目 -->
 		<profile>
-	    	<id>deploy</id>
-	    	<build>
-	    		<plugins>
-					<!-- Java Document Generate
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-javadoc-plugin</artifactId>
-					</plugin> -->
+			<id>deploy</id>
+			<build>
+				<plugins>
 					<!-- YUI Compressor (CSS/JS压缩) -->
 					<plugin>
 						<groupId>net.alchim31.maven</groupId>
 						<artifactId>yuicompressor-maven-plugin</artifactId>
 					</plugin>
 				</plugins>
-	    	</build>
+			</build>
 			<distributionManagement>
 				<repository>
 					<id>sonatype-repos</id>
diff --git a/web/.settings/org.eclipse.wst.common.component b/web/.settings/org.eclipse.wst.common.component
index a716e20a..f12d36fd 100644
--- a/web/.settings/org.eclipse.wst.common.component
+++ b/web/.settings/org.eclipse.wst.common.component
@@ -11,10 +11,10 @@
         </dependent-module>
         <property name="component.exclusion.patterns"/>
         <property name="java-output-path" value="/src/main/webapp/WEB-INF/classes"/>
-        <property name="context-root" value="js"/>
+        <property name="context-root" value="jeesite-web"/>
 		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
 		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
   </wb-module>
 </project-modules>
diff --git a/web/pom.xml b/web/pom.xml
index 349b6f37..0c205f05 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	
 	<parent>
-        <groupId>com.jeesite</groupId>
-        <artifactId>jeesite-parent</artifactId>
-        <version>4.0.4-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
-    </parent>
+		<groupId>com.jeesite</groupId>
+		<artifactId>jeesite-parent</artifactId>
+		<version>4.0.4-SNAPSHOT</version>
+		<relativePath>../parent/pom.xml</relativePath>
+	</parent>
 	
 	<artifactId>jeesite-web</artifactId>
 	<packaging>war</packaging>
@@ -132,7 +132,7 @@
 			<snapshots><enabled>false</enabled></snapshots>
 		</repository>
 		<repository>
-            <id>sonatype-repos-s</id>
+		    <id>sonatype-repos-s</id>
 			<name>Sonatype Repository</name>
 			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
 			<releases><enabled>false</enabled></releases>
@@ -150,7 +150,7 @@
 			<releases><enabled>true</enabled></releases>
 			<snapshots><enabled>false</enabled></snapshots>
 		</pluginRepository>
-        
+		
 	</pluginRepositories>
 	
 </project>
diff --git a/web/src/main/resources/config/jeesite.yml b/web/src/main/resources/config/jeesite.yml
index 6055d7c3..9e72f44d 100644
--- a/web/src/main/resources/config/jeesite.yml
+++ b/web/src/main/resources/config/jeesite.yml
@@ -28,7 +28,7 @@ jdbc:
   username: root
   password: 123456
   testSql: SELECT 1
-#
+
 #  # Oracle 数据库配置
 #  type: oracle
 #  driver: oracle.jdbc.driver.OracleDriver
@@ -36,7 +36,7 @@ jdbc:
 #  username: jeesite
 #  password: jeesite
 #  testSql: SELECT 1 FROM DUAL
-#
+
 #  # Sql Server 数据库配置
 #  type: mssql
 #  driver: net.sourceforge.jtds.jdbc.Driver
@@ -44,7 +44,7 @@ jdbc:
 #  username: jeesite
 #  password: jeesite
 #  testSql: SELECT 1
-#  
+
 #  # PostgreSql 数据库配置（注意：一定要创建的schema与username相同，否则将找不到数据表字典信息）
 #  type: postgresql
 #  driver: org.postgresql.Driver
@@ -52,7 +52,7 @@ jdbc:
 #  username: jeesite
 #  password: jeesite
 #  testSql: SELECT 1
-#
+
 #  # 连接信息加密
 #  encrypt:
 #  
@@ -70,7 +70,7 @@ jdbc:
 #    minIdle: 3
 #    # 最大连接数
 #    maxActive: 20
-#
+
 #  # 多数据源名称列表，启用方式：@MyBatisDao(dataSourceName="ds2")
 #  dataSourceNames: ds2
 #  
@@ -89,20 +89,20 @@ jdbc:
 #      init: 1
 #      minIdle: 3
 #      maxActive: 20
-#  
-#  # JTA 分布式事务
+  
+#  # JTA 分布式事务（v4.0.4+）
 #  jta:
 #    enabled: false
-#
+
 #  # 表名前缀
 #  tablePrefix: js_
-#
+
 #  # Druid连接池监控
 #  druid:
 #    stat:
 #      enabled: true
-#  
-## Redis 配置
+
+# Redis 配置
 #redis: 
 #  
 #  # Redis 连接参数
@@ -119,7 +119,7 @@ jdbc:
 #    maxIdle: 3
 #    maxTotal: 20
 #
-#  # 是否启用Redis系统缓存及会话
+#  # 是否启用Redis系统缓存及会话（专业版）
 #  cacheAndSession: false
 #  
 #  # 定义Key的前缀标识
@@ -140,8 +140,8 @@ jdbc:
 #
 #  # 分页默认大小
 #  pageSize: 20
-#
-## 用户相关参数
+
+# 用户相关参数
 #user:
 #
 #  # 指定超级管理员编号（研发团队使用的账号）
@@ -197,11 +197,11 @@ jdbc:
 #      expandLevel: -1,
 #      remarks: ""
 #    }]
-#
-#  # 多租户模式（SAAS模式）
-#  useCorpModel: true
-#
-## 任务调度
+
+#  # 多租户模式（SAAS模式）（专业版）
+#  useCorpModel: false
+
+# 任务调度（个人版+）
 #job:
 #
 #  # 是否自动启动任务调度（可关闭）
@@ -379,7 +379,7 @@ jdbc:
 
 #file:
 #
-#  # 文件上传跟路径，设置路径中不允许包含“userfiles”，在指定目录中系统会自动创建userfiles目录，如果不设置默认为contextPath路径
+#  # 文件上传根路径，设置路径中不允许包含“userfiles”，在指定目录中系统会自动创建userfiles目录，如果不设置默认为contextPath路径
 ##  baseDir: D:/jeesite
 #
 #  # 上传文件的相对路径（支持：yyyy, MM, dd, HH, mm, ss, E）
@@ -403,6 +403,7 @@ jdbc:
 #===== Message settings =====#
 #============================#
 
+# 消息提醒中心（专业版）
 #msg:
 #
 #  # 是否开启实时发送消息（保存消息后立即检查未读消息并发送），分布式部署下请单独配置消息发送服务，不建议开启此选项。