mvn clean install success

231c3598 · 胡小根 · 231c3598 · 231c3598 · 231c3598 · 231c3598
Commit 231c3598 authored Oct 06, 2016 by 胡小根
46 changed files
--- a/.gitignore
+++ b/.gitignore
+# Java
+*.class
+
+# Eclipse
+.classpath
+.project
+.settings/
+
+# Intellij
+.idea/
+*.iml
+*.iws
+
+# Mac
+.DS_Store
+
+# Maven
+log/
+target/
+
+# svn
+.svn/
+
+scandir/
+rebel.xml
+
+#lilei environment
+dep2.sh
+
+web/src/main/filters/dev.properties
+
+.idea/
--- a/.gitmodules
+++ b/.gitmodules
+[submodule "docs/wiki"]
+	path = docs/wiki
+	url = https://hxgqh.gitbooks.io/crm/content/
--- a/dao/pom.xml
+++ b/dao/pom.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
+        <artifactId>SpringMVCProjectTemplate</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+	</parent>
+
+    <artifactId>dao</artifactId>
+    <packaging>jar</packaging>
+
+	<name>dao</name>
+    <description>dao</description>
+	<url>http://maven.apache.org</url>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
+			<artifactId>domain</artifactId>
+			<version>${SpringMVCProjectTemplate.domain.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<finalName>dao</finalName>
+		<resources>
+			<resource>
+				<directory>${basedir}/src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+	</build>
+
+</project>
--- a/deploy.sh
+++ b/deploy.sh
+#!/bin/bash
+TOMCAT_HOME=/home/worker/local/apache-tomcat-7.0.52
--- a/docs/sap/linux/libsapjco3.so
+++ b/docs/sap/linux/libsapjco3.so
--- a/docs/sap/linux/sapjco3.jar
+++ b/docs/sap/linux/sapjco3.jar
--- a/docs/sap/mac/libsapjco3.jnilib
+++ b/docs/sap/mac/libsapjco3.jnilib
--- a/docs/sap/mac/macForSap.docx
+++ b/docs/sap/mac/macForSap.docx
--- a/docs/sap/mac/sapjco3-darwinintel64-3.zip
+++ b/docs/sap/mac/sapjco3-darwinintel64-3.zip
--- a/docs/sap/mac/sapjco3.jar
+++ b/docs/sap/mac/sapjco3.jar
--- a/docs/sap/mac/~$cForSap.docx
+++ b/docs/sap/mac/~$cForSap.docx
--- a/docs/规范/Java代码规范.pdf
+++ b/docs/规范/Java代码规范.pdf
--- a/domain/pom.xml
+++ b/domain/pom.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
+        <artifactId>SpringMVCProjectTemplate</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+	</parent>
+
+    <artifactId>domain</artifactId>
+    <packaging>jar</packaging>
+
+	<name>domain</name>
+    <description>domain</description>
+	<url>http://maven.apache.org</url>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+
+	<build>
+		<finalName>domain</finalName>
+		<resources>
+			<resource>
+				<directory>${basedir}/src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+	</build>
+
+</project>
--- a/operator.md
+++ b/operator.md
+##部门
+1. id ==> code code 从16位变为128位 【done】
+2. 增加启用\禁用
+3. department_type_id 0:部门 1:分部
+4. 三级结构缺失
+
+##operator
+
+###创建者
+1. 创建人 【done】
+2. 创建人经理 【done】
+3. 创建人本分部 [done]
+4. 创建人本部门 【done】
+5. 创建人上级部门【done】
+6. 分部 [done]
+7. 部门 [done]
+8. 角色 [done]
+9. 人力资源 [done]
+10. 所有人 [done]
+
+###人力资源字段
+1. 人力资源字段本人
+2. 人力资源字段经理
+3. 人力资源字段本分部
+4. 人力资源字段本部门
+5. 人力资源字段上级部门
+6. 分部
+7. 部门
+8. 角色
+9. 角色人员
+
+###节点操作者
+1. 节点操作者本人
+2. 节点操作者经理
+
+##操作条件
+###创建人
+1. 创建人 【done】
+2. 创建人经理 【done】
+3. 创建部门 【done】
+4. 创建人本分部 【done】
+
+###表单条件
+1. 数字 [lt\lte\gt\gte] [done]
+2. 日期 [lt\lte\gt\gte] [done]
+3. 时间 [lt\lte\gt\gte] [done]
+3. 字符串 [done] eq\neq\contain\no-contain
+4. 外链 [in\not-in] [done]
+
+
+##会签操作
+1. 表明一个节点
\ No newline at end of file
--- a/pom.xml
+++ b/pom.xml
--- a/service/lib/sapjco3.jar
+++ b/service/lib/sapjco3.jar
--- a/service/pom.xml
+++ b/service/pom.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
+		<artifactId>SpringMVCProjectTemplate</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>service</artifactId>
+	<packaging>jar</packaging>
+
+	<name>service</name>
+	<description>service</description>
+	<url>http://maven.apache.org</url>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
+			<artifactId>dao</artifactId>
+			<version>${SpringMVCProjectTemplate.dao.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
+			<artifactId>domain</artifactId>
+			<version>${SpringMVCProjectTemplate.dao.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sap</groupId>
+			<artifactId>sapjco3</artifactId>
+			<version>0.9.32</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/lib/sapjco3.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+			<version>${poi.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<finalName>service</finalName>
+		<resources>
+			<resource>
+				<directory>${basedir}/src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+	</build>
+
+</project>
--- a/service/src/main/resources/locale/errorcode_zh_CN.properties
+++ b/service/src/main/resources/locale/errorcode_zh_CN.properties
+-100=请先删除相关联的数据！
--- a/src/main/resources/generatorConfig.xml
+++ b/src/main/resources/generatorConfig.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE generatorConfiguration
+        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+
+<generatorConfiguration>
+    <classPathEntry location="/Users/hxgqh/.m2/repository/mysql/mysql-connector-java/5.1.38/mysql-connector-java-5.1.38.jar" />
+
+    <context id="testTables" targetRuntime="MyBatis3">
+        <jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver"
+                        connectionURL="jdbc:oracle:thin:@bcs.hitevision.com:1521:crmd02"
+                        userId="crm"
+                        password="sohu2020"/>
+
+        <!-- 指定生成的类型为java类型，避免数据库中number等类型字段 -->
+        <javaTypeResolver>
+            <property name="forceBigDecimals"
+                      value="false"/>
+        </javaTypeResolver>
+
+        <!-- 生成model模型，对应的包，存放位置可以指定具体的路径,如/ProjectName/src，也可以使用MAVEN来自动生成 -->
+        <javaModelGenerator targetPackage="com.haomostudio.model"
+                            targetProject="\domain\src">
+            <property name="enableSubPackages"
+                      value="true"/>
+        </javaModelGenerator>
+
+        <!--对应的xml mapper文件  -->
+        <sqlMapGenerator targetPackage="com.haomostudio.dao"
+                         targetProject="\web\src\main\resources\mybatis">
+            <property name="enableSubPackages"
+                      value="true"/>
+        </sqlMapGenerator>
+
+        <!-- 对应的dao接口 -->
+        <javaClientGenerator type="XMLMAPPER"
+                             targetPackage="com.jacksoft.mybatis.generator.dao"
+                             targetProject="\dao\src">
+            <property name="enableSubPackages"
+                      value="true"/>
+        </javaClientGenerator>
+
+
+        <table tableName="user"
+               domainObjectName="User"/>
+    </context>
+</generatorConfiguration>
--- a/web/pom.xml
+++ b/web/pom.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
+		<artifactId>SpringMVCProjectTemplate</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>web</artifactId>
+	<packaging>war</packaging>
+
+	<name>web</name>
+	<url>http://maven.apache.org</url>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
+			<artifactId>service</artifactId>
+			<version>${SpringMVCProjectTemplate.service.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
+			<artifactId>dao</artifactId>
+			<version>${SpringMVCProjectTemplate.dao.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
+			<artifactId>domain</artifactId>
+			<version>${SpringMVCProjectTemplate.domain.version}</version>
+		</dependency>
+	</dependencies>
+
+	<profiles>
+		<!-- 开发环境 -->
+		<profile>
+			<id>dev</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<properties>
+				<profiles.active>dev</profiles.active>
+			</properties>
+			<build>
+				<filters>
+					<filter>${basedir}/src/main/filters/dev.properties</filter>
+				</filters>
+			</build>
+		</profile>
+		<!-- 测试环境 -->
+		<profile>
+			<id>test</id>
+			<properties>
+				<profiles.active>test</profiles.active>
+			</properties>
+			<build>
+				<filters>
+					<filter>${basedir}/src/main/filters/test.properties</filter>
+				</filters>
+			</build>
+		</profile>
+		<!-- 仿真环境 -->
+		<profile>
+			<id>simu</id>
+			<properties>
+				<profiles.active>simu</profiles.active>
+			</properties>
+			<build>
+				<filters>
+					<filter>${basedir}/src/main/filters/simu.properties</filter>
+				</filters>
+			</build>
+		</profile>
+		<!-- 生产环境 -->
+		<profile>
+			<id>prd</id>
+			<properties>
+				<profiles.active>prd</profiles.active>
+			</properties>
+			<build>
+				<filters>
+					<filter>${basedir}/src/main/filters/prd.properties</filter>
+				</filters>
+			</build>
+		</profile>
+	</profiles>
+
+	<build>
+		<finalName>web</finalName>
+		<resources>
+			<resource>
+				<directory>${basedir}/src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+	</build>
+
+</project>
--- a/web/src/main/filters/.gitignore
+++ b/web/src/main/filters/.gitignore
+#dev.properties
\ No newline at end of file
--- a/web/src/main/filters/bak.dev.properties
+++ b/web/src/main/filters/bak.dev.properties
+jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
+jdbc.url=jdbc:oracle:thin:@bcs.hitevision.com:1521:crmd02
+jdbc.username=crm
+jdbc.password=sohu2020
+
+jndiName = ${symbol_dollar}{jndiName}
+
+temp_file_path=/tmp/
+script_file_path=/data/backend/scripts/
+sea_file_url=http://bcs.hitevision.com:8002/api2/
+
+db_schema=CRM
+logbackLogFilePath=/data/backend/logs/
\ No newline at end of file
--- a/web/src/main/filters/prd.properties
+++ b/web/src/main/filters/prd.properties
+jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
+jdbc.url=jdbc:oracle:thin:@172.21.20.36:1521:crmp01
+jdbc.username=crm
+jdbc.password=sina2020
+
+jndiName = ${symbol_dollar}{jndiName}
+
+temp_file_path=/tmp/
+script_file_path=/data/worker/scripts/
+sea_file_url=http://172.21.20.36:8002/api2/
+db_schema=CRM
+logbackLogFilePath=/data/backend/logs/
\ No newline at end of file
--- a/web/src/main/filters/simu.properties
+++ b/web/src/main/filters/simu.properties
+jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
+jdbc.url=jdbc:oracle:thin:@172.21.20.35:1521:crmd02
+jdbc.username=crm
+jdbc.password=sohu2020
+
+jndiName = ${symbol_dollar}{jndiName}
+
+temp_file_path=/tmp/
+script_file_path=/data/backend/scripts/
+sea_file_url=http://172.21.20.35:8002/api2/
+
+db_schema=CRM
+logbackLogFilePath=/data/backend/logs/
\ No newline at end of file
--- a/web/src/main/filters/test.properties
+++ b/web/src/main/filters/test.properties
+jdbc.driverClassName=com.mysql.jdbc.Driver
+jdbc.url=jdbc:mysql://127.0.0.1:3306/crm_dev?useUnicode=true&amp;characterEncoding=utf-8&amp;zeroDateTimeBehavior=convertToNull
+jdbc.username=root
+jdbc.password=123456
\ No newline at end of file
--- a/web/src/main/resources/.gitignore
+++ b/web/src/main/resources/.gitignore
+generatorConfig.xml
\ No newline at end of file
--- a/web/src/main/resources/application-files.properties
+++ b/web/src/main/resources/application-files.properties
+#\u6839\u636E\u4E0D\u540C\u73AF\u5883\u8BBE\u7F6E\u9700\u8981\u8BFB\u53D6\u7684\u914D\u7F6E\u6587\u4EF6
+A=application.properties
+B=application.local.properties
\ No newline at end of file
--- a/web/src/main/resources/application.properties
+++ b/web/src/main/resources/application.properties
+#hibernate settings
+hibernate.show_sql=false
+hibernate.format_sql=false
+
+#dbcp settings
+dbcp.initialSize=5
+dbcp.maxActive=20
+dbcp.maxIdle=10
+
+#versions
+system.version=${project.version}
+spring.version=${spring.version}
+hibernate.version=${hibernate.version}
+activiti.version=${activiti.version}
+db.type=${db.type}
+
+#\u7F13\u5B58\u56FE\u7247:http://www.kafeitu.me/activiti/2013/02/14/improve-performance-for-reading-diagram.html
+export.diagram.path=/tmp/kft-activiti-demo
+diagram.http.url=http://localhost:10000
+diagram.activityFontName=\u5B8B\u4F53
+diagram.labelFontName=\u5B8B\u4F53
+
+#init demo data
+create.demo.users=true
+create.demo.models=true
+
+# \u7528\u81EA\u52A8\u90E8\u7F72\u4EE3\u66FF\u4E86,\u6240\u4EE5\u5173\u95ED
+create.demo.definitions=false
\ No newline at end of file
--- a/web/src/main/resources/config/application.properties
+++ b/web/src/main/resources/config/application.properties
+#mysql database setting
+jdbc.driver=com.mysql.jdbc.Driver
+jdbc.url=jdbc:mysql://10.28.163.192:3306/smartchatNew?useUnicode=true&amp;characterEncoding=UTF-8
+jdbc.username=knowledge
+jdbc.password=knowledge
+
+#connection pool settings
+jdbc.pool.maxIdle=10
+jdbc.pool.maxActive=50
+
+#jimidb redis settings
+jimdb_configId=/redis/cluster/17
+jimdb_token=1417623612434
+
+#jimdb_configId_remote=/redis/cluster/17
+#jimdb_token_remote=1417623612434
+
+#auth settings
+passport.checkLogin.loginUrl=http://passport.jd.com/new/login.aspx
+passport.checkLogin.logoutUrl=https://passport.jd.com/uc/login?ltype=logout
+
+#saf settings
+saf.zk.url=192.168.150.119:2181,192.168.150.120:2181,192.168.150.121:2181
+
+#import params
+maxUploadSize=51200000
+maxInMemorySize=5120000
+uploadTempDir=/tempDir
+
+#gateway directory
+gw.jsf.alias=gateway-cd
\ No newline at end of file
--- a/web/src/main/resources/config/config.properties
+++ b/web/src/main/resources/config/config.properties
+#application configs
+
+#jdbc druid config
+jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
+jdbc.url=jdbc:oracle:thin:@localhost:1521:orcl
+jdbc.username=root
+jdbc.password=123456
+
+
--- a/web/src/main/resources/config/data-access.properties
+++ b/web/src/main/resources/config/data-access.properties
+jdbc.driverClassName=${connection.driver_class}
+jdbc.url=${connection.url}
+jdbc.username=${connection.username}
+jdbc.password=${connection.password}
+
+jndiName = ${symbol_dollar}{jndiName}
\ No newline at end of file
--- a/web/src/main/resources/config/important.properties
+++ b/web/src/main/resources/config/important.properties
+#数据库配置
+jimi_username=knowledge
+jimi_password=knowledge
+
+#校验登陆的cookie名
+passport.checkLogin.cookieName=thor
+#passport登陆的校验key
+passport.checkLogin.authenticationKey=C196FA243B92A634E69E58421D3A69881E0361DE75D6C663
\ No newline at end of file
--- a/web/src/main/resources/config/mysqlGeneratorConfig.xml
+++ b/web/src/main/resources/config/mysqlGeneratorConfig.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE generatorConfiguration
+        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+
+<generatorConfiguration>
+    <classPathEntry location="/Users/hxgqh/.m2/repository" />
+
+    <context id="mysqlTables" targetRuntime="MyBatis3">
+        <jdbcConnection driverClass="com.mysql.jdbc.Driver" connectionURL="jdbc:mysql://localhost:3306/zhuluoxi"
+                        userId="root" password="123456"/>
+
+        <!-- 指定生成的类型为java类型，避免数据库中number等类型字段 -->
+        <javaTypeResolver>
+            <property name="forceBigDecimals" value="false"/>
+        </javaTypeResolver>
+
+        <!-- 生成model模型，对应的包，存放位置可以指定具体的路径,如/ProjectName/src，也可以使用MAVEN来自动生成 -->
+        <javaModelGenerator targetPackage="com.haomostudio.model" targetProject="\domain\src">
+            <property name="enableSubPackages" value="true"/>
+        </javaModelGenerator>
+
+        <!--对应的xml mapper文件  -->
+        <sqlMapGenerator targetPackage="com.haomostudio.dao" targetProject="\web\src\main\resources\mybatis">
+            <property name="enableSubPackages" value="true"/>
+        </sqlMapGenerator>
+
+        <!-- 对应的dao接口 -->
+        <javaClientGenerator type="XMLMAPPER" targetPackage="com.jacksoft.mybatis.generator.dao" targetProject="\dao\src">
+            <property name="enableSubPackages" value="true"/>
+        </javaClientGenerator>
+
+
+        <table tableName="user" domainObjectName="User"/>
+    </context>
+</generatorConfiguration>
--- a/web/src/main/resources/config/oracleGeneratorConfig.xml
+++ b/web/src/main/resources/config/oracleGeneratorConfig.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE generatorConfiguration
+        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+
+<generatorConfiguration>
+    <classPathEntry location="/Users/hxgqh/.m2/repository/mysql/mysql-connector-java/5.1.38/mysql-connector-java-5.1.38.jar" />
+
+    <context id="testTables" targetRuntime="MyBatis3">
+        <jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver"
+                        connectionURL="jdbc:oracle:thin:@bcs.hitevision.com:1521:crmd02"
+                        userId="crm"
+                        password="sohu2020"/>
+
+        <!-- 指定生成的类型为java类型，避免数据库中number等类型字段 -->
+        <javaTypeResolver>
+            <property name="forceBigDecimals"
+                      value="false"/>
+        </javaTypeResolver>
+
+        <!-- 生成model模型，对应的包，存放位置可以指定具体的路径,如/ProjectName/src，也可以使用MAVEN来自动生成 -->
+        <javaModelGenerator targetPackage="com.haomostudio.model"
+                            targetProject="\domain\src">
+            <property name="enableSubPackages"
+                      value="true"/>
+        </javaModelGenerator>
+
+        <!--对应的xml mapper文件  -->
+        <sqlMapGenerator targetPackage="com.haomostudio.dao"
+                         targetProject="\web\src\main\resources\mybatis">
+            <property name="enableSubPackages"
+                      value="true"/>
+        </sqlMapGenerator>
+
+        <!-- 对应的dao接口 -->
+        <javaClientGenerator type="XMLMAPPER"
+                             targetPackage="com.jacksoft.mybatis.generator.dao"
+                             targetProject="\dao\src">
+            <property name="enableSubPackages"
+                      value="true"/>
+        </javaClientGenerator>
+
+
+        <table tableName="user"
+               domainObjectName="User"/>
+    </context>
+</generatorConfiguration>
--- a/web/src/main/resources/database.properties
+++ b/web/src/main/resources/database.properties
--- a/web/src/main/resources/logback.xml
+++ b/web/src/main/resources/logback.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false" scan="true" scanPeriod="3 seconds">
+
+    <!-- 通过<property>元素定义的值实际上会被插入logger上下文 -->
+    <property name="LOG_DIR" value="${logbackLogFilePath}"/>
+
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{80} %L - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+        </filter>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+        </filter>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>WARN</level>
+            <onMatch>ACCEPT</onMatch>
+        </filter>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+        </filter>
+    </appender>
+
+    <appender name="errorFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_DIR}error_log/error.log</file>
+
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{80} %L - %msg%n</pattern>
+        </encoder>
+
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_DIR}/error_log/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>180</maxHistory>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="warnFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_DIR}warn_log/warn.log</file>
+
+        <encoder charset="UTF-8">
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{80} %L - %msg%n</pattern>
+        </encoder>
+
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>WARN</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_DIR}/warn_log/warn.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>180</maxHistory>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="infoFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_DIR}info_log/info.log</file>
+
+        <encoder charset="UTF-8">
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{80} %L - %msg%n</pattern>
+        </encoder>
+
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_DIR}/info_log/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>180</maxHistory>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="debugFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_DIR}debug_log/debug.log</file>
+
+        <encoder charset="UTF-8">
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{80} %L - %msg%n</pattern>
+        </encoder>
+
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_DIR}/debug_log/debug.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>180</maxHistory>
+        </rollingPolicy>
+    </appender>
+
+    <logger name="org.springframework" level="debug" additivity="false"/>
+    <logger name="org.quartz" level="debug" additivity="false"/>
+
+    <logger name="org.apache.http.wire" level="debug" additivity="false"/>
+    <logger name="org.apache.http.headers" level="debug" additivity="false"/>
+    <logger name="org.apache.http.impl" level="debug" additivity="false"/>
+    <logger name="org.apache.http.client" level="debug" additivity="false"/>
+
+    <root level="debug">
+        <appender-ref ref="console"/>
+        <appender-ref ref="errorFile"/>
+        <appender-ref ref="warnFile"/>
+        <appender-ref ref="infoFile"/>
+        <appender-ref ref="debugFile"/>
+    </root>
+</configuration>
\ No newline at end of file
--- a/web/src/main/resources/sap.properties
+++ b/web/src/main/resources/sap.properties
--- a/web/src/main/resources/spring/business-config.xml
+++ b/web/src/main/resources/spring/business-config.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 基础设施层与服务层 -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:context="http://www.springframework.org/schema/context" xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:jpa="http://www.springframework.org/schema/data/jpa"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+	<!-- 引入数据源配置 -->
+	<import resource="datasource-config.xml" />
+	<import resource="crm-redis-config.xml" />
+
+	<!-- 扫描spring组件 -->
+    <context:annotation-config />
+	<context:component-scan base-package="com.haomostudio" />
+
+	<!--
+		class:  指定用来创建 sqlSession的工厂
+		dataSource:  使用的数据源
+	-->
+	<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
+		<property name="dataSource" ref="crmDataSource" />
+        <property name="mapperLocations">
+            <list>
+                <value>classpath*:mybatis/*/*Mapper.xml</value>
+            </list>
+        </property>
+        <property name="configLocation" value="classpath:spring/sql-map-config.xml"/>
+	</bean>
+
+
+    <bean id="crmSqlSessionTemplate" class="org.mybatis.spring.SqlSessionTemplate"> <!--scope="prototype"-->
+        <constructor-arg ref="sqlSessionFactory" />
+    </bean>
+
+	<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
+		<property name="basePackage" value="com.haomostudio.*.dao" />
+		<property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
+	</bean>
+
+	<!-- JDBC事务管理 -->
+	<bean id="transactionManager"
+		class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+		<property name="dataSource" ref="crmDataSource" />
+	</bean>
+
+	<!-- 注解实现事务 -->
+	<tx:annotation-driven transaction-manager="transactionManager" />
+
+	<bean id="objectMapper" class="com.fasterxml.jackson.databind.ObjectMapper"/>
+</beans>
--- a/web/src/main/resources/spring/crm-redis-config.xml
+++ b/web/src/main/resources/spring/crm-redis-config.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+       <bean id="redisServer" class="com.haomostudio.redis.RedisServiceImpl" init-method="init">
+           <property name="redisIp" value="${redis.ip}"></property>
+           <property name="redisPort" value="${redis.port}"></property>
+       </bean>
+</beans>
--- a/web/src/main/resources/spring/datasource-config.xml
+++ b/web/src/main/resources/spring/datasource-config.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:jdbc="http://www.springframework.org/schema/jdbc" xmlns:jee="http://www.springframework.org/schema/jee"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+         http://www.springframework.org/schema/beans/spring-beans.xsd
+         http://www.springframework.org/schema/context
+         http://www.springframework.org/schema/context/spring-context.xsd">
+
+	<!-- 数据源配置 -->
+	<bean id="crmDataSource" class="org.apache.tomcat.jdbc.pool.DataSource"
+		p:driverClassName="${jdbc.driverClassName}" p:url="${jdbc.url}"
+		p:username="${jdbc.username}" p:password="${jdbc.password}"
+		p:validationQuery="select 1" p:testWhileIdle="true"
+		  p:timeBetweenEvictionRunsMillis="3600000"
+          p:maxActive="300"
+          p:maxIdle="100"
+          p:minIdle="20"
+          p:removeAbandoned="true"
+          p:removeAbandonedTimeout="180"
+          p:logAbandoned="true"
+		  p:initialSize="20"
+		  p:minEvictableIdleTimeMillis="1800000"
+		  p:testOnBorrow="true"
+	/>
+
+	<!-- 开发，测试，生产，仿真环境数据连接池配置 -->
+	<beans profile="dev,test,prd,simu">
+		<!-- 加载配置属性文件 -->
+		<context:property-placeholder
+			location="classpath:config/data-access.properties" />
+	</beans>
+
+	<!-- 仿真，生产环境数据源jndi配置-->
+	<!-- <beans profile="prd,simu">
+		<context:property-placeholder location="classpath:properties/jndi_connection.properties" />
+		<bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
+			<property name="jndiName">
+				<value>${symbol_dollar}{jndiName}</value>
+			</property>
+		</bean>
+	</beans> -->
+	 
+</beans>
\ No newline at end of file
--- a/web/src/main/resources/spring/spring-mvc-config.xml
+++ b/web/src/main/resources/spring/spring-mvc-config.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xsi:schemaLocation="http://www.springframework.org/schema/mvc
+                    http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
+                    http://www.springframework.org/schema/beans
+                    http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+                    http://www.springframework.org/schema/context
+                    http://www.springframework.org/schema/context/spring-context-4.0.xsd
+                    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd">
+
+    <!-- 自动扫描且只扫描@Controller -->
+    <context:component-scan base-package="com.haomostudio" use-default-filters="false">
+        <context:include-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
+        <context:include-filter type="annotation"
+                                expression="org.springframework.web.bind.annotation.ControllerAdvice"/>
+    </context:component-scan>
+
+    <mvc:interceptors>
+        <bean class="com.haomostudio.SpringMVCProjectTemplate.web.servlet.AuthenticationInterceptor"/>
+    </mvc:interceptors>
+
+    <!-- 定义首页 -->
+    <!--
+    <mvc:view-controller path="/" view-name="redirect:/login.jsp" />
+     -->
+    <mvc:default-servlet-handler/>
+
+    <!-- 定义JSP -->
+    <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+        <property name="prefix" value="/WEB-INF/views/"/>
+        <property name="suffix" value=".jsp"/>
+    </bean>
+
+    <!-- 定义HTML -->
+    <bean id="htmlResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+        <property name="prefix" value="/"/>
+        <property name="suffix" value=".html"/>
+    </bean>
+    <!-- 支持上传文件 -->
+    <bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver"/>
+
+    <bean id="handlerExceptionResolver" class="com.haomostudio.SpringMVCProjectTemplate.web.servlet.DefaultHandlerExceptionResolver"/>
+    <mvc:annotation-driven>
+        <mvc:message-converters register-defaults="true">
+            <bean class="org.springframework.http.converter.BufferedImageHttpMessageConverter"/>
+            <bean class="org.springframework.http.converter.ByteArrayHttpMessageConverter"/>
+            <!-- 将StringHttpMessageConverter的默认编码设为UTF-8 -->
+            <bean class="org.springframework.http.converter.StringHttpMessageConverter">
+                <constructor-arg value="UTF-8"/>
+            </bean>
+            <!-- 将Jackson2HttpMessageConverter的默认格式化输出设为true -->
+            <bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
+                <property name="prettyPrint" value="false"/>
+                <property name="objectMapper">
+                    <bean class="com.fasterxml.jackson.databind.ObjectMapper">
+                        <property name="dateFormat">
+                            <bean class="java.text.SimpleDateFormat">
+                                <constructor-arg type="java.lang.String" value="yyyy-MM-dd HH:mm:ss"/>
+                            </bean>
+                        </property>
+                    </bean>
+                </property>
+            </bean>
+        </mvc:message-converters>
+    </mvc:annotation-driven>
+
+    <!-- 支持上传文件 -->
+    <!-- aop动态代理 -->
+    <aop:aspectj-autoproxy proxy-target-class="true"/>
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="fileEncoding" value="UTF-8"/>
+        <property name="ignoreUnresolvablePlaceholders" value="true"/>
+        <property name="locations">
+            <list>
+                <value>classpath:config/application.properties</value>
+                <value>classpath:config/important.properties</value>
+            </list>
+        </property>
+    </bean>
+
+</beans>
--- a/web/src/main/resources/spring/spring-mvc-modeler.xml
+++ b/web/src/main/resources/spring/spring-mvc-modeler.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+        http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
+
+	<!-- 自动扫描且只扫描@Controller -->
+	<context:component-scan base-package="org.activiti.rest.editor,org.activiti.rest.diagram">
+		<context:include-filter type="annotation" expression="org.springframework.stereotype.Controller" />
+	</context:component-scan>
+
+	<mvc:annotation-driven />
+</beans>
\ No newline at end of file
--- a/web/src/main/resources/spring/spring-mvc-rest.xml
+++ b/web/src/main/resources/spring/spring-mvc-rest.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+        http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
+
+
+
+	<!-- 自动扫描且只扫描@Controller -->
+	<context:component-scan base-package="org.activiti.rest">
+		<context:include-filter type="annotation" expression="org.springframework.stereotype.Controller" />
+	</context:component-scan>
+
+	<mvc:annotation-driven />
+</beans>
\ No newline at end of file
--- a/web/src/main/resources/spring/sql-map-config.xml
+++ b/web/src/main/resources/spring/sql-map-config.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dtd/mybatis-3-config.dtd">
+<configuration>
+    <settings>
+        <setting name="cacheEnabled" value="true" />
+        <setting name="lazyLoadingEnabled" value="true" />
+        <setting name="multipleResultSetsEnabled" value="true" />
+        <setting name="useColumnLabel" value="true" />
+        <setting name="defaultExecutorType" value="REUSE" />
+        <setting name="defaultStatementTimeout" value="25000" />
+        <setting name="callSettersOnNulls" value="true"/>
+    </settings>
+</configuration>
\ No newline at end of file
--- a/web/src/main/resources/stencilset.json
+++ b/web/src/main/resources/stencilset.json
--- a/web/src/main/resources/webapp/WEB-INF/web.xml
+++ b/web/src/main/resources/webapp/WEB-INF/web.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="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_2_5.xsd" version="2.5">
+    <display-name>crm-web</display-name>
+
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
+
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>classpath:spring/*-config.xml</param-value>
+    </context-param>
+    <context-param>
+        <param-name>spring.profiles.default</param-name>
+        <param-value>production</param-value>
+    </context-param>
+    <context-param>
+        <param-name>quartz:shutdown-on-unload</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <param-name>quartz:wait-on-shutdown</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <param-name>quartz:start-on-load</param-name>
+        <param-value>true</param-value>
+    </context-param>
+
+    <listener>
+        <listener-class>org.quartz.ee.servlet.QuartzInitializerListener</listener-class>
+    </listener>
+
+    <servlet>
+        <servlet-name>springServlet</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <init-param>
+            <param-name>contextConfigLocation</param-name>
+            <param-value>classpath:spring/spring-mvc-config.xml</param-value>
+        </init-param>
+        <init-param>
+            <param-name>detectAllHandlerExceptionResolvers</param-name><!-- 取消其自动注册的异常解析器 -->
+            <param-value>false</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>springServlet</servlet-name>
+        <url-pattern>/</url-pattern>
+    </servlet-mapping>
+
+    <!-- Modeler的Rest服务 -->
+    <servlet>
+        <servlet-name>ModelRestServlet</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <init-param>
+            <param-name>contextConfigLocation</param-name>
+            <param-value>classpath:spring/spring-mvc-modeler.xml</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>ModelRestServlet</servlet-name>
+        <url-pattern>/service/*</url-pattern>
+    </servlet-mapping>
+
+    <!-- Rest接口 -->
+    <servlet>
+        <servlet-name>RestServlet</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <init-param>
+            <param-name>contextConfigLocation</param-name>
+            <param-value>classpath:spring/spring-mvc-rest.xml</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>RestServlet</servlet-name>
+        <url-pattern>/rest/*</url-pattern>
+    </servlet-mapping>
+
+    <filter>
+        <filter-name>encodingFilter</filter-name>
+        <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+        <init-param>
+            <param-name>encoding</param-name>
+            <param-value>UTF-8</param-value>
+        </init-param>
+        <init-param>
+            <param-name>forceEncoding</param-name>
+            <param-value>true</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>encodingFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <!--<filter>-->
+      <!--<filter-name>openEntityManagerInViewFilter</filter-name>-->
+      <!--<filter-class>org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter</filter-class>-->
+    <!--</filter>-->
+    <!--<filter-mapping>-->
+      <!--<filter-name>openEntityManagerInViewFilter</filter-name>-->
+      <!--<url-pattern>/*</url-pattern>-->
+    <!--</filter-mapping>-->
+    <!--
+    <filter>
+      <filter-name>shiroFilter</filter-name>
+      <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+      <init-param>
+        <param-name>targetFilterLifecycle</param-name>
+        <param-value>true</param-value>
+      </init-param>
+    </filter>
+    <filter-mapping>
+      <filter-name>shiroFilter</filter-name>
+      <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter>
+      <filter-name>sitemeshFilter</filter-name>
+      <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class>
+    </filter>
+    <filter-mapping>
+      <filter-name>sitemeshFilter</filter-name>
+      <url-pattern>/*</url-pattern>
+    </filter-mapping>
+     -->
+
+    <!--
+    <servlet-mapping>
+        <servlet-name>default</servlet-name>
+        <url-pattern>/static/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>default</servlet-name>
+      <url-pattern>/assets/*</url-pattern>
+    </servlet-mapping>
+      -->
+
+    <!--<servlet-mapping>-->
+        <!--<servlet-name>default</servlet-name>-->
+        <!--<url-pattern>/apply/*</url-pattern>-->
+    <!--</servlet-mapping>-->
+
+    <!--<servlet-mapping>-->
+        <!--<servlet-name>jsp</servlet-name>-->
+        <!--<url-pattern>/WEB-INF/views/error/*</url-pattern>-->
+    <!--</servlet-mapping>-->
+
+    <session-config>
+        <session-timeout>20</session-timeout>
+    </session-config>
+
+    <!--<error-page>-->
+        <!--<exception-type>java.lang.Throwable</exception-type>-->
+        <!--<location>/WEB-INF/views/error/500.jsp</location>-->
+    <!--</error-page>-->
+    <!--<error-page>-->
+        <!--<error-code>500</error-code>-->
+        <!--<location>/WEB-INF/views/error/500.jsp</location>-->
+    <!--</error-page>-->
+    <!--<error-page>-->
+        <!--<error-code>404</error-code>-->
+        <!--<location>/WEB-INF/views/error/404.jsp</location>-->
+    <!--</error-page>-->
+
+</web-app>
\ No newline at end of file