From a8b07ffc679a9662f9b6a94a097f8b491ff232e8 Mon Sep 17 00:00:00 2001
From: dupengyue <dupengyue@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 07 三月 2017 11:33:25 +0800
Subject: [PATCH] 框架搭建完成,工作交接

---
 VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Department.java          |   11 +
 VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/Visiting.java           |   10 +
 VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/checking/entity/CheckingCompany.java |   11 +
 VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Image.java               |   11 +
 VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/VisitStat.java          |   11 +
 VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Post.java                |   11 +
 VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Person.java              |   10 +
 VisitFace/face_discern/.classpath                                                                   |    3 
 VisitFace/face_discern/.settings/org.eclipse.wst.common.project.facet.core.xml                      |    4 
 VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/EmployeeFace.java        |   11 +
 VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/VisitMatter.java        |   11 +
 VisitFace/face_discern/pom.xml                                                                      |    4 
 VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Place.java               |   11 +
 VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/Visit.java              |   10 +
 VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/calling/entity/calling.java          |   10 +
 VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Company.java             |   18 ++
 VisitFace/face_discern/src/main/webapp/WEB-INF/web.xml                                              |   65 +++++++++-
 VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/VisitorType.java         |   11 +
 VisitFace/face_discern/src/main/resources/log4j.properties                                          |   44 ++----
 VisitFace/face_discern/.settings/org.eclipse.wst.common.component                                   |    2 
 VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/VisitFace.java           |   11 +
 VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/baseapi/user/PlaceMapper.java        |    3 
 VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/checking/entity/Checking.java        |   10 +
 23 files changed, 231 insertions(+), 72 deletions(-)

diff --git a/VisitFace/face_discern/.classpath b/VisitFace/face_discern/.classpath
index e099bc2..9557d6b 100644
--- a/VisitFace/face_discern/.classpath
+++ b/VisitFace/face_discern/.classpath
@@ -20,9 +20,10 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.springsource.sts.ide.tomcat.runtimeTarget/Pivotal tc Server Developer Edition (Runtime) v3.2">
 		<attributes>
 			<attribute name="owner.project.facets" value="jst.web"/>
 		</attributes>
diff --git a/VisitFace/face_discern/.settings/org.eclipse.wst.common.component b/VisitFace/face_discern/.settings/org.eclipse.wst.common.component
index 9e3c9a8..7140756 100644
--- a/VisitFace/face_discern/.settings/org.eclipse.wst.common.component
+++ b/VisitFace/face_discern/.settings/org.eclipse.wst.common.component
@@ -5,6 +5,6 @@
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
         <property name="java-output-path" value="/face_discern/target/classes"/>
-        <property name="context-root" value="jf-console"/>
+        <property name="context-root" value="face_discern"/>
     </wb-module>
 </project-modules>
diff --git a/VisitFace/face_discern/.settings/org.eclipse.wst.common.project.facet.core.xml b/VisitFace/face_discern/.settings/org.eclipse.wst.common.project.facet.core.xml
index 7121ebb..bc1d81c 100644
--- a/VisitFace/face_discern/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/VisitFace/face_discern/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <runtime name="Apache Tomcat v7.0"/>
+  <runtime name="Pivotal tc Server Developer Edition (Runtime) v3.2"/>
   <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.7"/>
   <installed facet="jst.web" version="2.5"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="jst.jaxrs" version="2.0"/>
-  <installed facet="java" version="1.7"/>
 </faceted-project>
diff --git a/VisitFace/face_discern/pom.xml b/VisitFace/face_discern/pom.xml
index 2dbdfed..a081935 100644
--- a/VisitFace/face_discern/pom.xml
+++ b/VisitFace/face_discern/pom.xml
@@ -321,6 +321,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
- 
-  
\ No newline at end of file
+</project>
\ No newline at end of file
diff --git a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/baseapi/user/PlaceMapper.java b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/baseapi/user/PlaceMapper.java
index e243c37..4c3ebce 100644
--- a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/baseapi/user/PlaceMapper.java
+++ b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/baseapi/user/PlaceMapper.java
@@ -14,4 +14,7 @@
     int updateByPrimaryKeySelective(Place record);
 
     int updateByPrimaryKey(Place record);
+
+	Integer qureyCompanyIDByAuthorizationID(String authorizationid);
+
 }
\ No newline at end of file
diff --git a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/calling/entity/calling.java b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/calling/entity/calling.java
index 12bb63a..342d750 100644
--- a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/calling/entity/calling.java
+++ b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/calling/entity/calling.java
@@ -1,9 +1,15 @@
 package cn.com.basic.face.discern.calling.entity;
 
+import java.io.Serializable;
 import java.util.Date;
 
-public class calling {
-    private Integer id;
+public class calling implements Serializable{
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private Integer id;
 
     private Date calldt;
 
diff --git a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/checking/entity/Checking.java b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/checking/entity/Checking.java
index 4d2a414..6fbf1dc 100644
--- a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/checking/entity/Checking.java
+++ b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/checking/entity/Checking.java
@@ -1,9 +1,15 @@
 package cn.com.basic.face.discern.checking.entity;
 
+import java.io.Serializable;
 import java.util.Date;
 
-public class Checking {
-    private Integer id;
+public class Checking implements Serializable{
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private Integer id;
 
     private Byte statusid;
 
diff --git a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/checking/entity/CheckingCompany.java b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/checking/entity/CheckingCompany.java
index 3c9ec62..5a069e3 100644
--- a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/checking/entity/CheckingCompany.java
+++ b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/checking/entity/CheckingCompany.java
@@ -1,7 +1,14 @@
 package cn.com.basic.face.discern.checking.entity;
 
-public class CheckingCompany {
-    private Integer personid;
+import java.io.Serializable;
+
+public class CheckingCompany implements Serializable{
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private Integer personid;
 
     private Integer companyid;
 
diff --git a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Company.java b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Company.java
index 36a16f2..a986932 100644
--- a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Company.java
+++ b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Company.java
@@ -1,7 +1,21 @@
 package cn.com.basic.face.discern.user.entity;
 
-public class Company {
-    private Integer id;
+import java.io.Serializable;
+
+/**
+ * @简介:
+ * @author dpy
+ * @内容说明:
+ * @版本:
+ *
+ */
+public class Company implements Serializable{
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private Integer id;
 
     private String name;
 
diff --git a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Department.java b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Department.java
index 6e29304..9464c95 100644
--- a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Department.java
+++ b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Department.java
@@ -1,7 +1,14 @@
 package cn.com.basic.face.discern.user.entity;
 
-public class Department {
-    private Integer id;
+import java.io.Serializable;
+
+public class Department implements Serializable{
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private Integer id;
 
     private String label;
 
diff --git a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/EmployeeFace.java b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/EmployeeFace.java
index b99e9cc..7348612 100644
--- a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/EmployeeFace.java
+++ b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/EmployeeFace.java
@@ -1,7 +1,14 @@
 package cn.com.basic.face.discern.user.entity;
 
-public class EmployeeFace {
-    private Integer id;
+import java.io.Serializable;
+
+public class EmployeeFace implements Serializable{
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private Integer id;
 
     private Integer registercompanyid;
 
diff --git a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Image.java b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Image.java
index 2329469..f399a5a 100644
--- a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Image.java
+++ b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Image.java
@@ -1,7 +1,14 @@
 package cn.com.basic.face.discern.user.entity;
 
-public class Image {
-    private Integer personid;
+import java.io.Serializable;
+
+public class Image implements Serializable{
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private Integer personid;
 
     private String imagetye;
 
diff --git a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Person.java b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Person.java
index 7090feb..59072c1 100644
--- a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Person.java
+++ b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Person.java
@@ -1,9 +1,15 @@
 package cn.com.basic.face.discern.user.entity;
 
+import java.io.Serializable;
 import java.util.Date;
 
-public class Person {
-    private Integer id;
+public class Person implements Serializable{
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private Integer id;
 
     private String name;
 
diff --git a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Place.java b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Place.java
index 7524a98..ed5495d 100644
--- a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Place.java
+++ b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Place.java
@@ -1,7 +1,14 @@
 package cn.com.basic.face.discern.user.entity;
 
-public class Place {
-    private Integer id;
+import java.io.Serializable;
+
+public class Place implements Serializable{
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private Integer id;
 
     private Integer companyid;
 
diff --git a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Post.java b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Post.java
index 387a2d4..d4f30eb 100644
--- a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Post.java
+++ b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/Post.java
@@ -1,7 +1,14 @@
 package cn.com.basic.face.discern.user.entity;
 
-public class Post {
-    private Integer id;
+import java.io.Serializable;
+
+public class Post implements Serializable{
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private Integer id;
 
     private String label;
 
diff --git a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/VisitFace.java b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/VisitFace.java
index d2025ea..4770bdb 100644
--- a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/VisitFace.java
+++ b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/VisitFace.java
@@ -1,7 +1,14 @@
 package cn.com.basic.face.discern.user.entity;
 
-public class VisitFace {
-    private Integer id;
+import java.io.Serializable;
+
+public class VisitFace implements Serializable{
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private Integer id;
 
     private Integer personid;
 
diff --git a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/VisitorType.java b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/VisitorType.java
index 2b93c83..33f30fe 100644
--- a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/VisitorType.java
+++ b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/user/entity/VisitorType.java
@@ -1,7 +1,14 @@
 package cn.com.basic.face.discern.user.entity;
 
-public class VisitorType {
-    private Integer id;
+import java.io.Serializable;
+
+public class VisitorType implements Serializable{
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private Integer id;
 
     private String label;
 
diff --git a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/Visit.java b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/Visit.java
index 0f3378e..b47435b 100644
--- a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/Visit.java
+++ b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/Visit.java
@@ -1,9 +1,15 @@
 package cn.com.basic.face.discern.visit.entity;
 
+import java.io.Serializable;
 import java.util.Date;
 
-public class Visit {
-    private Integer id;
+public class Visit implements Serializable{
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private Integer id;
 
     private Integer visitorpersonid;
 
diff --git a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/VisitMatter.java b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/VisitMatter.java
index bdf4659..3c950af 100644
--- a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/VisitMatter.java
+++ b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/VisitMatter.java
@@ -1,7 +1,14 @@
 package cn.com.basic.face.discern.visit.entity;
 
-public class VisitMatter {
-    private Integer id;
+import java.io.Serializable;
+
+public class VisitMatter implements Serializable{
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private Integer id;
 
     private Integer companyid;
 
diff --git a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/VisitStat.java b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/VisitStat.java
index 94060b8..b95ecd6 100644
--- a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/VisitStat.java
+++ b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/VisitStat.java
@@ -1,7 +1,14 @@
 package cn.com.basic.face.discern.visit.entity;
 
-public class VisitStat {
-    private Integer personid;
+import java.io.Serializable;
+
+public class VisitStat implements Serializable{
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private Integer personid;
 
     private Integer registercompanyid;
 
diff --git a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/Visiting.java b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/Visiting.java
index 5bc44bc..fe0fb8a 100644
--- a/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/Visiting.java
+++ b/VisitFace/face_discern/src/main/java/cn/com/basic/face/discern/visit/entity/Visiting.java
@@ -1,9 +1,15 @@
 package cn.com.basic.face.discern.visit.entity;
 
+import java.io.Serializable;
 import java.util.Date;
 
-public class Visiting {
-    private Integer id;
+public class Visiting implements Serializable{
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private Integer id;
 
     private Integer visitid;
 
diff --git a/VisitFace/face_discern/src/main/resources/log4j.properties b/VisitFace/face_discern/src/main/resources/log4j.properties
index 004ed21..206dcfd 100644
--- a/VisitFace/face_discern/src/main/resources/log4j.properties
+++ b/VisitFace/face_discern/src/main/resources/log4j.properties
@@ -1,31 +1,21 @@
-log4j.rootLogger=DEBUG,myLogger,logFile
-log4j.appender.myLogger=org.apache.log4j.ConsoleAppender
-log4j.appender.myLogger.Threshold=DEBUG
-log4j.appender.myLogger.ImmediateFlush=true
-log4j.appender.myLogger.Target=System.out
-log4j.appender.myLogger.layout=org.apache.log4j.PatternLayout
-log4j.appender.myLogger.layout.ConversionPattern=[%-5p] %d(%r) --> [%t] %l: %m %x %n
+log4j.rootLogger=DEBUG,stdout,R
 
-log4j.logger.org.mybatis=debug 
+log4j.logger.com.trusdom=DEBUG
+log4j.logger.java.sql=DEBUG
 
-log4j.logger.java.sql.PreparedStatement=DEBUG 
-log4j.logger.java.sql.Statement=DEBUG 
-log4j.logger.java.sql.Connection=DEBUG 
-log4j.logger.java.sql.ResultSet=DEBUG
+#### First appender writes to console
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 
-log4j.logger.com.mchange.v2=ERROR
-log4j.logger.org.springframework=ERROR
-log4j.logger.org.mybatis.spring.mapper=ERROR
+# Pattern to output the caller's file name and line number.
+log4j.appender.stdout.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %-5p [%t] %c (%M:%L) - %m%n
 
-log4j.logger.com.atguigu=debug
-
-
-
-
-log4j.appender.logFile=org.apache.log4j.FileAppender
-log4j.appender.logFile.Threshold=DEBUG
-log4j.appender.logFile.ImmediateFlush=true
-log4j.appender.logFile.Append=true
-log4j.appender.logFile.File=D:/myserver/var/log/face_discern_log/face_discern_log.log4j
-log4j.appender.logFile.layout=org.apache.log4j.PatternLayout
-log4j.appender.logFile.layout.ConversionPattern=[%-5p] %d(%r) --> [%t] %l: %m %x %n
\ No newline at end of file
+#### Second appender writes to a file
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=/usr/local/tomcat/logs/cbip-company-co.log
+# Control the maximum log file size
+log4j.appender.R.MaxFileSize=1000KB
+# Archive log files (one backup file here)
+log4j.appender.R.MaxBackupIndex=20
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %-5p [%t] %c (%M:%L) - %m%n
\ No newline at end of file
diff --git a/VisitFace/face_discern/src/main/webapp/WEB-INF/web.xml b/VisitFace/face_discern/src/main/webapp/WEB-INF/web.xml
index 04563ea..a99acfc 100644
--- a/VisitFace/face_discern/src/main/webapp/WEB-INF/web.xml
+++ b/VisitFace/face_discern/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,60 @@
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
+<?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"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+	id="WebApp_ID" version="2.5">
+	<display-name>face_discern</display-name>
 
-<web-app>
-  <display-name>Archetype Created Web Application</display-name>
-</web-app>
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>classpath:/spring/spring-context.xml</param-value>
+	</context-param>
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+
+	<filter>
+		<filter-name>CharacterEncodingFilter</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>CharacterEncodingFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<filter>
+		<filter-name>HiddenHttpMethodFilter</filter-name>
+		<filter-class>org.springframework.web.filter.HiddenHttpMethodFilter</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>HiddenHttpMethodFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<servlet>
+		<servlet-name>springDispatcherServlet</servlet-name>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+		<init-param>
+			<param-name>contextConfigLocation</param-name>
+			<param-value>classpath:/spring/springmvc-context.xml</param-value>
+		</init-param>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>springDispatcherServlet</servlet-name>
+		<url-pattern>/</url-pattern>
+	</servlet-mapping>
+
+
+	<welcome-file-list>
+		<welcome-file>index.jsp</welcome-file>
+	</welcome-file-list>
+</web-app>
\ No newline at end of file

--
Gitblit v1.8.0