diff --git a/.classpath b/.classpath
index dd47d24025f55238b67a7bb60389e97ce2aa99b1..5a160151985f3d194c70a52b1d3349866a2b0e0b 100644
--- a/.classpath
+++ b/.classpath
@@ -6,7 +6,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/.gitignore b/.gitignore
index 8bfda72c88944fd36d40e3c5a86aaa8fca40529a..67bd3da4d76e1c094512baa51ad4f795bf415140 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,9 @@
-/target/
-/jfinalide.properties
-.idea*
-JFinalOA.iml
+/target/
+/jfinalide.properties
+.idea*
+JFinalOA.iml
+.classpath
+.gitignore
+.project
+.settings/*
+/.settings
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
index f897a7f1cb2389f85fe6381425d29f0a9866fb65..14b697b7bbb0d85e8d8ee19141a2a92d9ce211be 100644
--- a/.settings/org.eclipse.m2e.core.prefs
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -1,4 +1,4 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 572d7156d7372bbd6ca8162eaf234d067c628a55..e62e10c255ea77ddd1addda86ff29b1a59481302 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,7 +4,6 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <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="/WEB-INF/classes" source-path="/src/test/java"/>
         <property name="java-output-path" value="/OA/target/classes"/>
         <property name="context-root" value="JFinalOA"/>
     </wb-module>
diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs
index 04cad8cb752a9761c4e5167d0301d3a27674430f..6f1cba68d5f82a12e1f80e8798437495567e43e7 100644
--- a/.settings/org.eclipse.wst.validation.prefs
+++ b/.settings/org.eclipse.wst.validation.prefs
@@ -1,2 +1,2 @@
-disabled=06target
-eclipse.preferences.version=1
+disabled=06target
+eclipse.preferences.version=1
diff --git a/pom.xml b/pom.xml
index 84cb46a5950dbd83060aaa69925f4683ad6b2a69..0871ce34e746fe3297167a1eb8012173aad953ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,172 +1,212 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.pointlion.sys</groupId>
-  <artifactId>JFinalOA</artifactId>
-  <packaging>war</packaging>
-  <version>0.0.1-SNAPSHOT</version>
-  <name>JFinalOA Maven Webapp</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-	<dependency>
-	    <groupId>org.apache.tomcat</groupId>
-	    <artifactId>tomcat-servlet-api</artifactId>
-	    <version>9.0.5</version>
-	    <scope>provided</scope>
-	</dependency>
-	<dependency>
-			<groupId>javax.websocket</groupId>
-			<artifactId>javax.websocket-api</artifactId>
-			<version>1.1</version>
-			<scope>provided</scope>
-	</dependency>
-	<dependency>
-	    <groupId>org.apache.shiro</groupId>
-	    <artifactId>shiro-web</artifactId>
-	    <version>1.4.0</version>
-	</dependency>
-	<dependency>
-	    <groupId>com.jfinal</groupId>
-	    <artifactId>jfinal</artifactId>
-	    <version>3.4</version>
-	</dependency>
-	<dependency>
-	    <groupId>org.activiti</groupId>
-	    <artifactId>activiti-engine</artifactId>
-	    <version>5.21.0</version>
-	</dependency>
-	<dependency>
-	    <groupId>net.iharder</groupId>
-	    <artifactId>base64</artifactId>
-	    <version>2.3.9</version>
-	</dependency>
-	<dependency>
-	    <groupId>log4j</groupId>
-	    <artifactId>log4j</artifactId>
-	    <version>1.2.17</version>
-	</dependency>
-	<dependency>
-	    <groupId>commons-logging</groupId>
-	    <artifactId>commons-logging</artifactId>
-	    <version>1.2</version>
-	</dependency>
-	<dependency>
-	    <groupId>commons-io</groupId>
-	    <artifactId>commons-io</artifactId>
-	    <version>2.6</version>
-	</dependency>
-	<dependency>
-	    <groupId>org.activiti</groupId>
-	    <artifactId>activiti-modeler</artifactId>
-	    <version>5.21.0</version>
-	</dependency>
-	<dependency>
-	    <groupId>org.activiti</groupId>
-	    <artifactId>activiti-json-converter</artifactId>
-	    <version>5.21.0</version>
-	</dependency>
-	<dependency>
-	    <groupId>commons-codec</groupId>
-	    <artifactId>commons-codec</artifactId>
-	    <version>1.11</version>
-	</dependency>
-	<dependency>
-	    <groupId>org.apache.poi</groupId>
-	    <artifactId>poi</artifactId>
-	    <version>3.17</version>
-	</dependency>
-	<dependency>
-	    <groupId>org.apache.poi</groupId>
-	    <artifactId>poi-ooxml</artifactId>
-	    <version>3.17</version>
-	</dependency>
-	<dependency>
-	    <groupId>com.alibaba</groupId>
-	    <artifactId>druid</artifactId>
-	    <version>1.1.8</version>
-	</dependency>
-	<dependency>
-	    <groupId>com.mchange</groupId>
-	    <artifactId>c3p0</artifactId>
-	    <version>0.9.5.2</version>
-	</dependency>
-	<dependency>
-	    <groupId>mysql</groupId>
-	    <artifactId>mysql-connector-java</artifactId>
-	    <version>5.1.46</version>
-	</dependency>
-	<dependency>
-		  <groupId>org.apache.commons</groupId>
-		  <artifactId>commons-lang3</artifactId>
-		  <version>3.5</version>
-	</dependency>
-	<dependency>
-		  <groupId>com.google.guava</groupId>
-		  <artifactId>guava</artifactId>
-		  <version>19.0</version>
-	</dependency>
-  </dependencies>
-  <build>
-    <finalName>JFinalOA</finalName>
-    <pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.6.1</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-					<encoding>UTF-8</encoding>
-					<!-- java8 保留参数名编译参数 -->
-					<!-- compilerArgument>-parameters</compilerArgument -->
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<version>2.1.2</version>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>jar-no-fork</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.5</version>
-                <configuration>
-                    <webAppSourceDirectory>src/main/webapp</webAppSourceDirectory>
-                    <connectors>
-                        <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                            <port>8080</port>
-                        </connector>
-                    </connectors>
-                </configuration>
-            </plugin>
-            <plugin>
-	            <groupId>org.apache.tomcat.maven</groupId>
-	            <artifactId>tomcat7-maven-plugin</artifactId>
-	            <version>2.2</version>
-	               <configuration>
-	                  <port>8080</port>
-	                  <server>tomcat7</server>
-	               </configuration>
-	                <executions>
-	                    <execution>
-	                        <phase>package</phase>
-	                        <goals>
-	                            <goal>run</goal>
-	                        </goals>
-	                    </execution>
-	                </executions>
-	        </plugin>
-		</plugins>
-    </pluginManagement>
-  </build>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.pointlion.sys</groupId>
+	<artifactId>JFinalOA</artifactId>
+	<packaging>war</packaging>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>JFinalOA Maven Webapp</name>
+	<url>http://maven.apache.org</url>
+	<profiles>
+		<profile>
+			<!-- 本地56环境 -->
+			<id>dev</id>
+			<properties>
+				<repository_url>http://192.168.1.56</repository_url>
+				<db-url><![CDATA[jdbc:mysql://localhost/jfinaloa?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=UTC&nullNamePatternMatchesAll=true&autoReconnect=true]]></db-url>
+				<db-username>root</db-username>
+				<db-password>root</db-password>
+				<db-type>mysql</db-type>
+				<db-name>jfinaloa</db-name>
+				<dev-model>true</dev-model>
+				<workspace-path>E:/workspaces/workspaceLion/LionOA/OA</workspace-path>
+				<log4j-level>debug</log4j-level>
+			</properties>
+			<!-- 默认激活本环境 -->
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+		</profile>
+	</profiles>
+	<repositories>
+		<repository>
+			<id>nexus</id>
+			<name>nexus</name>
+			<url>${repository_url}:8080/nexus/content/groups/public/</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-servlet-api</artifactId>
+			<version>9.0.5</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.websocket</groupId>
+			<artifactId>javax.websocket-api</artifactId>
+			<version>1.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-web</artifactId>
+			<version>1.4.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.jfinal</groupId>
+			<artifactId>jfinal</artifactId>
+			<version>3.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-engine</artifactId>
+			<version>5.21.0</version>
+		</dependency>
+		<dependency>
+			<groupId>net.iharder</groupId>
+			<artifactId>base64</artifactId>
+			<version>2.3.9</version>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.17</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.6</version>
+		</dependency>
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-modeler</artifactId>
+			<version>5.21.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-json-converter</artifactId>
+			<version>5.21.0</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.11</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>3.17</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+			<version>3.17</version>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>druid</artifactId>
+			<version>1.1.8</version>
+		</dependency>
+		<dependency>
+			<groupId>com.mchange</groupId>
+			<artifactId>c3p0</artifactId>
+			<version>0.9.5.2</version>
+		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.46</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.5</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>19.0</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+		<finalName>JFinalOA</finalName>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.6.1</version>
+					<configuration>
+						<source>1.7</source>
+						<target>1.7</target>
+						<encoding>UTF-8</encoding>
+						<!-- java8 保留参数名编译参数 -->
+						<!-- compilerArgument>-parameters</compilerArgument -->
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-source-plugin</artifactId>
+					<version>2.1.2</version>
+					<executions>
+						<execution>
+							<id>attach-sources</id>
+							<phase>verify</phase>
+							<goals>
+								<goal>jar-no-fork</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.mortbay.jetty</groupId>
+					<artifactId>maven-jetty-plugin</artifactId>
+					<version>6.1.5</version>
+					<configuration>
+						<webAppSourceDirectory>src/main/webapp</webAppSourceDirectory>
+						<connectors>
+							<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+								<port>8080</port>
+							</connector>
+						</connectors>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.tomcat.maven</groupId>
+					<artifactId>tomcat7-maven-plugin</artifactId>
+					<version>2.2</version>
+					<configuration>
+						<port>8080</port>
+						<server>tomcat7</server>
+					</configuration>
+					<executions>
+						<execution>
+							<phase>package</phase>
+							<goals>
+								<goal>run</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+</project>
diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties
index 94c6ac238d9a21a1d09a69a8cf515b61f9026594..80d67bab94773720ae51def42cd0c09b66fe422c 100644
--- a/src/main/resources/config.properties
+++ b/src/main/resources/config.properties
@@ -1,9 +1,9 @@
-#database config
-#sqlserver,mysql,oracle
-dbType = mysql
-dbname = jfinaloa
-jdbcUrl = jdbc:mysql://localhost/jfinaloa?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=UTC&nullNamePatternMatchesAll=true&autoReconnect=true
-user = root
-password =root
-devMode =true
-workSpacePath = E:/workspaces/workspaceLion/LionOA/OA
\ No newline at end of file
+#database config
+#sqlserver,mysql,oracle
+dbType = ${db-type}
+dbname = ${db-name}
+jdbcUrl = ${db-url}
+user = ${db-username}
+password =${db-password}
+devMode =${dev-model}
+workSpacePath = ${workspace-path}
\ No newline at end of file
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index b203e2b60557fb48bd94d77d8e8c5f1e0d22d9fb..31df1bd4e32a98e6cdfcae29e25a3c4a2413fd38 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -1,11 +1,11 @@
 #log4j.rootLogger=debug,stdout,logfile
-log4j.rootLogger=info, stdout ,logfile
+log4j.rootLogger=${log4j-level}, stdout ,logfile
 #log4j.rootLogger=error, stdout ,logfile
-#\u63A7\u5236\u53F0\u914D\u7F6E
+#\u63a7\u5236\u53f0\u914d\u7f6e
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %p [%c.%M] - %m%n
-#\u65E5\u5FD7\u914D\u7F6E
+#\u65e5\u5fd7\u914d\u7f6e
 log4j.appender.logfile=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.logfile.DatePattern='_'yyyy-MM-dd'.log'
 log4j.appender.logfile.File=../PointLionLogs/PointLion.log